2009-09-16 03:04:22 +00:00
|
|
|
first_move_id,second_move_id
|
|
|
|
|
1,3
|
Re-rip Gen III contest effects
Gen III contest effects were part of the initial data import from brown
veekun and so have probably never gotten a proper rip.
This commit re-rips contest effect stats, types, combos, and the mapping
between contest effects and moves.
None of the stats changed (jam & appeal); a few moves got assigned
different contest effects (specifically: smokescreen, flash, spite, and
shadow ball); and several combos changed.
For example, Hail was listed as comboing into the following moves
(this is also what Bulbapedia says):
Ice Beam, Blizzard, Aurora Beam, Haze, Powder Snow, Icy Wind,
Ice Ball, Weather Ball, Sheer Cold, Icicle Spear
However, the actual list is much shorter:
Blizzard, Powder Snow, Weather Ball
I verified on my Ruby cart that Hail->Ice Beam and Hail->Icy Wind are
not real combos, and that Hail->Blizzard is.
n.b. There are a bunch of unused contest effects in the game: out of 48
effects, 15 are not used by any move. The pokedex doesn't currently
include these. I elected not to add them, partly because i didn't want
to have to rip flavor text for them, but mostly because if i were going
to go that route i would probably reassign contest_effects.id to match
their internal ids, which would have made for uglier diffs.
Fixes #280
2020-03-02 03:24:57 +00:00
|
|
|
1,21
|
2009-09-16 03:04:22 +00:00
|
|
|
1,185
|
|
|
|
|
7,8
|
|
|
|
|
7,9
|
|
|
|
|
8,7
|
|
|
|
|
8,9
|
|
|
|
|
9,7
|
|
|
|
|
9,8
|
|
|
|
|
10,154
|
|
|
|
|
10,163
|
|
|
|
|
11,12
|
|
|
|
|
11,20
|
|
|
|
|
14,15
|
|
|
|
|
14,152
|
|
|
|
|
14,163
|
|
|
|
|
14,206
|
|
|
|
|
14,210
|
|
|
|
|
14,306
|
|
|
|
|
28,189
|
|
|
|
|
30,31
|
|
|
|
|
30,32
|
|
|
|
|
43,10
|
|
|
|
|
43,23
|
|
|
|
|
43,30
|
|
|
|
|
43,33
|
|
|
|
|
43,44
|
|
|
|
|
43,137
|
|
|
|
|
43,184
|
|
|
|
|
43,185
|
|
|
|
|
47,195
|
|
|
|
|
47,287
|
|
|
|
|
57,291
|
|
|
|
|
64,31
|
|
|
|
|
64,65
|
|
|
|
|
74,22
|
|
|
|
|
74,71
|
|
|
|
|
74,72
|
|
|
|
|
74,75
|
|
|
|
|
74,76
|
|
|
|
|
74,80
|
|
|
|
|
74,202
|
|
|
|
|
74,331
|
|
|
|
|
74,338
|
|
|
|
|
74,345
|
Re-rip Gen III contest effects
Gen III contest effects were part of the initial data import from brown
veekun and so have probably never gotten a proper rip.
This commit re-rips contest effect stats, types, combos, and the mapping
between contest effects and moves.
None of the stats changed (jam & appeal); a few moves got assigned
different contest effects (specifically: smokescreen, flash, spite, and
shadow ball); and several combos changed.
For example, Hail was listed as comboing into the following moves
(this is also what Bulbapedia says):
Ice Beam, Blizzard, Aurora Beam, Haze, Powder Snow, Icy Wind,
Ice Ball, Weather Ball, Sheer Cold, Icicle Spear
However, the actual list is much shorter:
Blizzard, Powder Snow, Weather Ball
I verified on my Ruby cart that Hail->Ice Beam and Hail->Icy Wind are
not real combos, and that Hail->Blizzard is.
n.b. There are a bunch of unused contest effects in the game: out of 48
effects, 15 are not used by any move. The pokedex doesn't currently
include these. I elected not to add them, partly because i didn't want
to have to rip flavor text for them, but mostly because if i were going
to go that route i would probably reassign contest_effects.id to match
their internal ids, which would have made for uglier diffs.
Fixes #280
2020-03-02 03:24:57 +00:00
|
|
|
81,169
|
2009-09-16 03:04:22 +00:00
|
|
|
82,225
|
|
|
|
|
82,337
|
|
|
|
|
82,349
|
|
|
|
|
88,157
|
|
|
|
|
88,317
|
|
|
|
|
89,90
|
|
|
|
|
89,284
|
|
|
|
|
93,94
|
|
|
|
|
93,100
|
|
|
|
|
93,134
|
|
|
|
|
93,248
|
|
|
|
|
94,93
|
|
|
|
|
94,100
|
|
|
|
|
94,134
|
|
|
|
|
94,248
|
|
|
|
|
95,138
|
|
|
|
|
95,171
|
|
|
|
|
99,37
|
|
|
|
|
99,43
|
|
|
|
|
99,184
|
|
|
|
|
104,97
|
|
|
|
|
104,98
|
|
|
|
|
104,100
|
|
|
|
|
106,33
|
|
|
|
|
106,36
|
|
|
|
|
106,38
|
|
|
|
|
106,182
|
|
|
|
|
106,205
|
|
|
|
|
111,33
|
|
|
|
|
111,205
|
|
|
|
|
116,2
|
|
|
|
|
116,5
|
|
|
|
|
116,25
|
Re-rip Gen III contest effects
Gen III contest effects were part of the initial data import from brown
veekun and so have probably never gotten a proper rip.
This commit re-rips contest effect stats, types, combos, and the mapping
between contest effects and moves.
None of the stats changed (jam & appeal); a few moves got assigned
different contest effects (specifically: smokescreen, flash, spite, and
shadow ball); and several combos changed.
For example, Hail was listed as comboing into the following moves
(this is also what Bulbapedia says):
Ice Beam, Blizzard, Aurora Beam, Haze, Powder Snow, Icy Wind,
Ice Ball, Weather Ball, Sheer Cold, Icicle Spear
However, the actual list is much shorter:
Blizzard, Powder Snow, Weather Ball
I verified on my Ruby cart that Hail->Ice Beam and Hail->Icy Wind are
not real combos, and that Hail->Blizzard is.
n.b. There are a bunch of unused contest effects in the game: out of 48
effects, 15 are not used by any move. The pokedex doesn't currently
include these. I elected not to add them, partly because i didn't want
to have to rip flavor text for them, but mostly because if i were going
to go that route i would probably reassign contest_effects.id to match
their internal ids, which would have made for uglier diffs.
Fixes #280
2020-03-02 03:24:57 +00:00
|
|
|
116,29
|
2009-09-16 03:04:22 +00:00
|
|
|
116,36
|
|
|
|
|
116,38
|
|
|
|
|
116,167
|
|
|
|
|
116,198
|
|
|
|
|
116,223
|
|
|
|
|
116,238
|
|
|
|
|
116,264
|
|
|
|
|
116,280
|
|
|
|
|
116,292
|
|
|
|
|
116,327
|
|
|
|
|
123,108
|
|
|
|
|
124,188
|
|
|
|
|
125,155
|
|
|
|
|
125,198
|
|
|
|
|
134,93
|
|
|
|
|
134,94
|
|
|
|
|
134,100
|
|
|
|
|
134,248
|
|
|
|
|
135,121
|
|
|
|
|
155,125
|
|
|
|
|
155,198
|
|
|
|
|
156,173
|
|
|
|
|
156,214
|
|
|
|
|
170,5
|
|
|
|
|
170,25
|
|
|
|
|
170,26
|
|
|
|
|
170,66
|
|
|
|
|
170,136
|
|
|
|
|
170,223
|
|
|
|
|
174,180
|
|
|
|
|
174,194
|
|
|
|
|
174,212
|
|
|
|
|
174,288
|
|
|
|
|
181,59
|
|
|
|
|
184,43
|
|
|
|
|
184,44
|
|
|
|
|
184,162
|
|
|
|
|
184,242
|
|
|
|
|
187,156
|
|
|
|
|
188,124
|
|
|
|
|
189,28
|
|
|
|
|
189,300
|
|
|
|
|
198,125
|
|
|
|
|
198,155
|
|
|
|
|
199,87
|
|
|
|
|
199,161
|
|
|
|
|
199,190
|
|
|
|
|
199,192
|
|
|
|
|
199,276
|
|
|
|
|
201,28
|
|
|
|
|
201,189
|
|
|
|
|
201,311
|
|
|
|
|
201,328
|
|
|
|
|
203,175
|
|
|
|
|
203,179
|
|
|
|
|
203,194
|
|
|
|
|
203,220
|
|
|
|
|
203,283
|
|
|
|
|
203,284
|
|
|
|
|
204,39
|
|
|
|
|
204,45
|
|
|
|
|
204,156
|
|
|
|
|
204,186
|
|
|
|
|
204,260
|
|
|
|
|
212,194
|
|
|
|
|
212,195
|
|
|
|
|
225,82
|
|
|
|
|
225,337
|
|
|
|
|
225,349
|
|
|
|
|
230,77
|
|
|
|
|
230,78
|
|
|
|
|
230,79
|
|
|
|
|
240,55
|
|
|
|
|
240,56
|
|
|
|
|
240,57
|
|
|
|
|
240,61
|
|
|
|
|
240,87
|
Re-rip Gen III contest effects
Gen III contest effects were part of the initial data import from brown
veekun and so have probably never gotten a proper rip.
This commit re-rips contest effect stats, types, combos, and the mapping
between contest effects and moves.
None of the stats changed (jam & appeal); a few moves got assigned
different contest effects (specifically: smokescreen, flash, spite, and
shadow ball); and several combos changed.
For example, Hail was listed as comboing into the following moves
(this is also what Bulbapedia says):
Ice Beam, Blizzard, Aurora Beam, Haze, Powder Snow, Icy Wind,
Ice Ball, Weather Ball, Sheer Cold, Icicle Spear
However, the actual list is much shorter:
Blizzard, Powder Snow, Weather Ball
I verified on my Ruby cart that Hail->Ice Beam and Hail->Icy Wind are
not real combos, and that Hail->Blizzard is.
n.b. There are a bunch of unused contest effects in the game: out of 48
effects, 15 are not used by any move. The pokedex doesn't currently
include these. I elected not to add them, partly because i didn't want
to have to rip flavor text for them, but mostly because if i were going
to go that route i would probably reassign contest_effects.id to match
their internal ids, which would have made for uglier diffs.
Fixes #280
2020-03-02 03:24:57 +00:00
|
|
|
240,110
|
2009-09-16 03:04:22 +00:00
|
|
|
240,127
|
|
|
|
|
240,128
|
|
|
|
|
240,145
|
|
|
|
|
240,152
|
|
|
|
|
240,190
|
Re-rip Gen III contest effects
Gen III contest effects were part of the initial data import from brown
veekun and so have probably never gotten a proper rip.
This commit re-rips contest effect stats, types, combos, and the mapping
between contest effects and moves.
None of the stats changed (jam & appeal); a few moves got assigned
different contest effects (specifically: smokescreen, flash, spite, and
shadow ball); and several combos changed.
For example, Hail was listed as comboing into the following moves
(this is also what Bulbapedia says):
Ice Beam, Blizzard, Aurora Beam, Haze, Powder Snow, Icy Wind,
Ice Ball, Weather Ball, Sheer Cold, Icicle Spear
However, the actual list is much shorter:
Blizzard, Powder Snow, Weather Ball
I verified on my Ruby cart that Hail->Ice Beam and Hail->Icy Wind are
not real combos, and that Hail->Blizzard is.
n.b. There are a bunch of unused contest effects in the game: out of 48
effects, 15 are not used by any move. The pokedex doesn't currently
include these. I elected not to add them, partly because i didn't want
to have to rip flavor text for them, but mostly because if i were going
to go that route i would probably reassign contest_effects.id to match
their internal ids, which would have made for uglier diffs.
Fixes #280
2020-03-02 03:24:57 +00:00
|
|
|
240,250
|
2009-09-16 03:04:22 +00:00
|
|
|
240,291
|
|
|
|
|
240,308
|
|
|
|
|
240,311
|
|
|
|
|
240,323
|
|
|
|
|
240,330
|
|
|
|
|
240,346
|
|
|
|
|
240,352
|
|
|
|
|
241,7
|
|
|
|
|
241,52
|
|
|
|
|
241,53
|
|
|
|
|
241,76
|
|
|
|
|
241,83
|
|
|
|
|
241,126
|
|
|
|
|
241,172
|
|
|
|
|
241,221
|
|
|
|
|
241,234
|
|
|
|
|
241,235
|
|
|
|
|
241,236
|
|
|
|
|
241,257
|
Re-rip Gen III contest effects
Gen III contest effects were part of the initial data import from brown
veekun and so have probably never gotten a proper rip.
This commit re-rips contest effect stats, types, combos, and the mapping
between contest effects and moves.
None of the stats changed (jam & appeal); a few moves got assigned
different contest effects (specifically: smokescreen, flash, spite, and
shadow ball); and several combos changed.
For example, Hail was listed as comboing into the following moves
(this is also what Bulbapedia says):
Ice Beam, Blizzard, Aurora Beam, Haze, Powder Snow, Icy Wind,
Ice Ball, Weather Ball, Sheer Cold, Icicle Spear
However, the actual list is much shorter:
Blizzard, Powder Snow, Weather Ball
I verified on my Ruby cart that Hail->Ice Beam and Hail->Icy Wind are
not real combos, and that Hail->Blizzard is.
n.b. There are a bunch of unused contest effects in the game: out of 48
effects, 15 are not used by any move. The pokedex doesn't currently
include these. I elected not to add them, partly because i didn't want
to have to rip flavor text for them, but mostly because if i were going
to go that route i would probably reassign contest_effects.id to match
their internal ids, which would have made for uglier diffs.
Fixes #280
2020-03-02 03:24:57 +00:00
|
|
|
241,261
|
2009-09-16 03:04:22 +00:00
|
|
|
241,284
|
|
|
|
|
241,299
|
|
|
|
|
241,307
|
|
|
|
|
241,311
|
|
|
|
|
241,315
|
|
|
|
|
252,69
|
|
|
|
|
252,185
|
|
|
|
|
252,233
|
|
|
|
|
252,282
|
|
|
|
|
252,292
|
|
|
|
|
254,255
|
|
|
|
|
254,256
|
|
|
|
|
258,59
|
|
|
|
|
258,181
|
|
|
|
|
258,311
|
|
|
|
|
268,9
|
|
|
|
|
268,84
|
|
|
|
|
268,85
|
|
|
|
|
268,86
|
|
|
|
|
268,87
|
|
|
|
|
268,209
|
|
|
|
|
268,344
|
|
|
|
|
268,351
|
|
|
|
|
269,68
|
|
|
|
|
269,197
|
|
|
|
|
269,243
|
|
|
|
|
281,156
|
|
|
|
|
281,303
|
|
|
|
|
291,57
|
|
|
|
|
300,55
|
|
|
|
|
300,189
|
|
|
|
|
300,346
|
|
|
|
|
319,232
|
|
|
|
|
346,55
|
|
|
|
|
346,287
|
|
|
|
|
346,300
|
|
|
|
|
347,60
|
|
|
|
|
347,93
|
|
|
|
|
347,94
|
|
|
|
|
347,96
|
|
|
|
|
347,113
|
|
|
|
|
347,115
|
|
|
|
|
347,138
|
|
|
|
|
347,149
|
|
|
|
|
347,248
|
|
|
|
|
347,295
|
|
|
|
|
347,296
|
|
|
|
|
347,354
|
|
|
|
|
349,82
|
|
|
|
|
349,225
|
|
|
|
|
349,337
|