diff options
-rw-r--r-- | asm/rom5.s | 10 | ||||
-rw-r--r-- | data/data2.s | 12 | ||||
-rw-r--r-- | data/pokedex_orders.s | 1191 | ||||
-rw-r--r-- | data/species_id_conversion_tables.s (renamed from data/pokedex_order.s) | 0 |
4 files changed, 1199 insertions, 14 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 3a4002165..9ec501bc6 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -38487,7 +38487,7 @@ _0808D914: .align 2, 0 _0808D928: .4byte 0x0202ffb4 _0808D92C: .4byte 0x0000060c -_0808D930: .4byte gUnknown_0839FAC4 +_0808D930: .4byte gPokedexOrder_Alphabetical _0808D934: ldr r4, _0808D9B0 lsls r0, r4, 16 @@ -38554,7 +38554,7 @@ _0808D99E: _0808D9B0: .4byte 0x00000181 _0808D9B4: .4byte 0x0202ffb4 _0808D9B8: .4byte 0x0000060c -_0808D9BC: .4byte gUnknown_0839FDFA +_0808D9BC: .4byte gPokedexOrder_Weight _0808D9C0: .4byte 0xffff0000 _0808D9C4: movs r4, 0 @@ -38628,7 +38628,7 @@ _0808DA3A: _0808DA4C: .4byte 0x0202ffb4 _0808DA50: .4byte 0x0000060c _0808DA54: .4byte 0x00000181 -_0808DA58: .4byte gUnknown_0839FDFA +_0808DA58: .4byte gPokedexOrder_Weight _0808DA5C: ldr r4, _0808DAD8 lsls r0, r4, 16 @@ -38695,7 +38695,7 @@ _0808DAC6: _0808DAD8: .4byte 0x00000181 _0808DADC: .4byte 0x0202ffb4 _0808DAE0: .4byte 0x0000060c -_0808DAE4: .4byte gUnknown_083A00FE +_0808DAE4: .4byte gPokedexOrder_Height _0808DAE8: .4byte 0xffff0000 _0808DAEC: movs r4, 0 @@ -38821,7 +38821,7 @@ _0808DBC4: _0808DBD4: .4byte 0x0202ffb4 _0808DBD8: .4byte 0x0000060c _0808DBDC: .4byte 0x00000181 -_0808DBE0: .4byte gUnknown_083A00FE +_0808DBE0: .4byte gPokedexOrder_Height _0808DBE4: .4byte 0x0000ffff thumb_func_end sub_808D690 diff --git a/data/data2.s b/data/data2.s index a9d70b78a..ea3af1fbe 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1859,7 +1859,7 @@ gUnknown_081FC1D0:: @ 81FC1D0 .space 2 @ 81FC1E0 - .include "data/pokedex_order.s" + .include "data/species_id_conversion_tables.s" @ 81FCB84 .include "data/spinda_spot_graphics.s" @@ -11611,14 +11611,8 @@ gUnknown_0839F988:: @ 839F988 gUnknown_0839FA7C:: @ 839FA7C .incbin "graphics/pokedex/noball.4bpp.lz" -gUnknown_0839FAC4:: @ 839FAC4 - .incbin "baserom.gba", 0x0039fac4, 0x336 - -gUnknown_0839FDFA:: @ 839FDFA - .incbin "baserom.gba", 0x0039fdfa, 0x304 - -gUnknown_083A00FE:: @ 83A00FE - .incbin "baserom.gba", 0x003a00fe, 0x306 +@ 839FAC4 + .include "data/pokedex_orders.s" .align 2 gOamData_83A0404:: @ 83A0404 diff --git a/data/pokedex_orders.s b/data/pokedex_orders.s new file mode 100644 index 000000000..db1cf7e07 --- /dev/null +++ b/data/pokedex_orders.s @@ -0,0 +1,1191 @@ + .align 1 +gPokedexOrder_Alphabetical:: @ 839FAC4 + .2byte 387 + .2byte 388 + .2byte 389 + .2byte 390 + .2byte 391 + .2byte 392 + .2byte 393 + .2byte 394 + .2byte 395 + .2byte 396 + .2byte 397 + .2byte 398 + .2byte 399 + .2byte 400 + .2byte 401 + .2byte 402 + .2byte 403 + .2byte 404 + .2byte 405 + .2byte 406 + .2byte 407 + .2byte 408 + .2byte 409 + .2byte 410 + .2byte 411 + .2byte 63 @ Abra + .2byte 359 @ Absol + .2byte 142 @ Aerodactyl + .2byte 306 @ Aggron + .2byte 190 @ Aipom + .2byte 65 @ Alakazam + .2byte 334 @ Altaria + .2byte 181 @ Ampharos + .2byte 347 @ Anorith + .2byte 24 @ Arbok + .2byte 59 @ Arcanine + .2byte 168 @ Ariados + .2byte 348 @ Armaldo + .2byte 304 @ Aron + .2byte 144 @ Articuno + .2byte 184 @ Azumarill + .2byte 298 @ Azurill + .2byte 371 @ Bagon + .2byte 343 @ Baltoy + .2byte 354 @ Banette + .2byte 339 @ Barboach + .2byte 153 @ Bayleef + .2byte 267 @ Beautifly + .2byte 15 @ Beedrill + .2byte 374 @ Beldum + .2byte 182 @ Bellossom + .2byte 69 @ Bellsprout + .2byte 9 @ Blastoise + .2byte 257 @ Blaziken + .2byte 242 @ Blissey + .2byte 286 @ Breloom + .2byte 1 @ Bulbasaur + .2byte 12 @ Butterfree + .2byte 331 @ Cacnea + .2byte 332 @ Cacturne + .2byte 323 @ Camerupt + .2byte 318 @ Carvanha + .2byte 268 @ Cascoon + .2byte 351 @ Castform + .2byte 10 @ Caterpie + .2byte 251 @ Celebi + .2byte 113 @ Chansey + .2byte 6 @ Charizard + .2byte 4 @ Charmander + .2byte 5 @ Charmeleon + .2byte 152 @ Chikorita + .2byte 358 @ Chimecho + .2byte 170 @ Chinchou + .2byte 366 @ Clamperl + .2byte 344 @ Claydol + .2byte 36 @ Clefable + .2byte 35 @ Clefairy + .2byte 173 @ Cleffa + .2byte 91 @ Cloyster + .2byte 256 @ Combusken + .2byte 341 @ Corphish + .2byte 222 @ Corsola + .2byte 346 @ Cradily + .2byte 342 @ Crawdaunt + .2byte 169 @ Crobat + .2byte 159 @ Croconaw + .2byte 104 @ Cubone + .2byte 155 @ Cyndaquil + .2byte 301 @ Delcatty + .2byte 225 @ Delibird + .2byte 386 @ Deoxys + .2byte 87 @ Dewgong + .2byte 50 @ Diglett + .2byte 132 @ Ditto + .2byte 85 @ Dodrio + .2byte 84 @ Doduo + .2byte 232 @ Donphan + .2byte 148 @ Dragonair + .2byte 149 @ Dragonite + .2byte 147 @ Dratini + .2byte 96 @ Drowzee + .2byte 51 @ Dugtrio + .2byte 206 @ Dunsparce + .2byte 356 @ Dusclops + .2byte 355 @ Duskull + .2byte 269 @ Dustox + .2byte 133 @ Eevee + .2byte 23 @ Ekans + .2byte 125 @ Electabuzz + .2byte 309 @ Electrike + .2byte 101 @ Electrode + .2byte 239 @ Elekid + .2byte 244 @ Entei + .2byte 196 @ Espeon + .2byte 102 @ Exeggcute + .2byte 103 @ Exeggutor + .2byte 295 @ Exploud + .2byte 83 @ Farfetch’d + .2byte 22 @ Fearow + .2byte 349 @ Feebas + .2byte 160 @ Feraligatr + .2byte 180 @ Flaaffy + .2byte 136 @ Flareon + .2byte 330 @ Flygon + .2byte 205 @ Forretress + .2byte 162 @ Furret + .2byte 282 @ Gardevoir + .2byte 92 @ Gastly + .2byte 94 @ Gengar + .2byte 74 @ Geodude + .2byte 203 @ Girafarig + .2byte 362 @ Glalie + .2byte 207 @ Gligar + .2byte 44 @ Gloom + .2byte 42 @ Golbat + .2byte 118 @ Goldeen + .2byte 55 @ Golduck + .2byte 76 @ Golem + .2byte 368 @ Gorebyss + .2byte 210 @ Granbull + .2byte 75 @ Graveler + .2byte 88 @ Grimer + .2byte 383 @ Groudon + .2byte 253 @ Grovyle + .2byte 58 @ Growlithe + .2byte 326 @ Grumpig + .2byte 316 @ Gulpin + .2byte 130 @ Gyarados + .2byte 297 @ Hariyama + .2byte 93 @ Haunter + .2byte 214 @ Heracross + .2byte 107 @ Hitmonchan + .2byte 106 @ Hitmonlee + .2byte 237 @ Hitmontop + .2byte 250 @ Ho-Oh + .2byte 163 @ Hoothoot + .2byte 187 @ Hoppip + .2byte 116 @ Horsea + .2byte 229 @ Houndoom + .2byte 228 @ Houndour + .2byte 367 @ Huntail + .2byte 97 @ Hypno + .2byte 174 @ Igglybuff + .2byte 314 @ Illumise + .2byte 2 @ Ivysaur + .2byte 39 @ Jigglypuff + .2byte 385 @ Jirachi + .2byte 135 @ Jolteon + .2byte 189 @ Jumpluff + .2byte 124 @ Jynx + .2byte 140 @ Kabuto + .2byte 141 @ Kabutops + .2byte 64 @ Kadabra + .2byte 14 @ Kakuna + .2byte 115 @ Kangaskhan + .2byte 352 @ Kecleon + .2byte 230 @ Kingdra + .2byte 99 @ Kingler + .2byte 281 @ Kirlia + .2byte 109 @ Koffing + .2byte 98 @ Krabby + .2byte 382 @ Kyogre + .2byte 305 @ Lairon + .2byte 171 @ Lanturn + .2byte 131 @ Lapras + .2byte 246 @ Larvitar + .2byte 380 @ Latias + .2byte 381 @ Latios + .2byte 166 @ Ledian + .2byte 165 @ Ledyba + .2byte 108 @ Lickitung + .2byte 345 @ Lileep + .2byte 264 @ Linoone + .2byte 271 @ Lombre + .2byte 270 @ Lotad + .2byte 294 @ Loudred + .2byte 272 @ Ludicolo + .2byte 249 @ Lugia + .2byte 337 @ Lunatone + .2byte 370 @ Luvdisc + .2byte 68 @ Machamp + .2byte 67 @ Machoke + .2byte 66 @ Machop + .2byte 240 @ Magby + .2byte 219 @ Magcargo + .2byte 129 @ Magikarp + .2byte 126 @ Magmar + .2byte 81 @ Magnemite + .2byte 82 @ Magneton + .2byte 296 @ Makuhita + .2byte 310 @ Manectric + .2byte 56 @ Mankey + .2byte 226 @ Mantine + .2byte 179 @ Mareep + .2byte 183 @ Marill + .2byte 105 @ Marowak + .2byte 259 @ Marshtomp + .2byte 284 @ Masquerain + .2byte 303 @ Mawile + .2byte 308 @ Medicham + .2byte 307 @ Meditite + .2byte 154 @ Meganium + .2byte 52 @ Meowth + .2byte 376 @ Metagross + .2byte 375 @ Metang + .2byte 11 @ Metapod + .2byte 151 @ Mew + .2byte 150 @ Mewtwo + .2byte 262 @ Mightyena + .2byte 350 @ Milotic + .2byte 241 @ Miltank + .2byte 312 @ Minun + .2byte 200 @ Misdreavus + .2byte 146 @ Moltres + .2byte 122 @ Mr. mime + .2byte 258 @ Mudkip + .2byte 89 @ Muk + .2byte 198 @ Murkrow + .2byte 177 @ Natu + .2byte 34 @ Nidoking + .2byte 31 @ Nidoqueen + .2byte 29 @ Nidoran♀ + .2byte 32 @ Nidoran♂ + .2byte 30 @ Nidorina + .2byte 33 @ Nidorino + .2byte 290 @ Nincada + .2byte 38 @ Ninetales + .2byte 291 @ Ninjask + .2byte 164 @ Noctowl + .2byte 299 @ Nosepass + .2byte 322 @ Numel + .2byte 274 @ Nuzleaf + .2byte 224 @ Octillery + .2byte 43 @ Oddish + .2byte 138 @ Omanyte + .2byte 139 @ Omastar + .2byte 95 @ Onix + .2byte 46 @ Paras + .2byte 47 @ Parasect + .2byte 279 @ Pelipper + .2byte 53 @ Persian + .2byte 231 @ Phanpy + .2byte 172 @ Pichu + .2byte 18 @ Pidgeot + .2byte 17 @ Pidgeotto + .2byte 16 @ Pidgey + .2byte 25 @ Pikachu + .2byte 221 @ Piloswine + .2byte 204 @ Pineco + .2byte 127 @ Pinsir + .2byte 311 @ Plusle + .2byte 186 @ Politoed + .2byte 60 @ Poliwag + .2byte 61 @ Poliwhirl + .2byte 62 @ Poliwrath + .2byte 77 @ Ponyta + .2byte 261 @ Poochyena + .2byte 137 @ Porygon + .2byte 233 @ Porygon2 + .2byte 57 @ Primeape + .2byte 54 @ Psyduck + .2byte 247 @ Pupitar + .2byte 195 @ Quagsire + .2byte 156 @ Quilava + .2byte 211 @ Qwilfish + .2byte 26 @ Raichu + .2byte 243 @ Raikou + .2byte 280 @ Ralts + .2byte 78 @ Rapidash + .2byte 20 @ Raticate + .2byte 19 @ Rattata + .2byte 384 @ Rayquaza + .2byte 378 @ Regice + .2byte 377 @ Regirock + .2byte 379 @ Registeel + .2byte 369 @ Relicanth + .2byte 223 @ Remoraid + .2byte 112 @ Rhydon + .2byte 111 @ Rhyhorn + .2byte 315 @ Roselia + .2byte 302 @ Sableye + .2byte 373 @ Salamence + .2byte 27 @ Sandshrew + .2byte 28 @ Sandslash + .2byte 254 @ Sceptile + .2byte 212 @ Scizor + .2byte 123 @ Scyther + .2byte 117 @ Seadra + .2byte 119 @ Seaking + .2byte 364 @ Sealeo + .2byte 273 @ Seedot + .2byte 86 @ Seel + .2byte 161 @ Sentret + .2byte 336 @ Seviper + .2byte 319 @ Sharpedo + .2byte 292 @ Shedinja + .2byte 372 @ Shelgon + .2byte 90 @ Shellder + .2byte 275 @ Shiftry + .2byte 285 @ Shroomish + .2byte 213 @ Shuckle + .2byte 353 @ Shuppet + .2byte 266 @ Silcoon + .2byte 227 @ Skarmory + .2byte 188 @ Skiploom + .2byte 300 @ Skitty + .2byte 289 @ Slaking + .2byte 287 @ Slakoth + .2byte 80 @ Slowbro + .2byte 199 @ Slowking + .2byte 79 @ Slowpoke + .2byte 218 @ Slugma + .2byte 235 @ Smeargle + .2byte 238 @ Smoochum + .2byte 215 @ Sneasel + .2byte 143 @ Snorlax + .2byte 361 @ Snorunt + .2byte 209 @ Snubbull + .2byte 338 @ Solrock + .2byte 21 @ Spearow + .2byte 363 @ Spheal + .2byte 167 @ Spinarak + .2byte 327 @ Spinda + .2byte 325 @ Spoink + .2byte 7 @ Squirtle + .2byte 234 @ Stantler + .2byte 121 @ Starmie + .2byte 120 @ Staryu + .2byte 208 @ Steelix + .2byte 185 @ Sudowoodo + .2byte 245 @ Suicune + .2byte 192 @ Sunflora + .2byte 191 @ Sunkern + .2byte 283 @ Surskit + .2byte 333 @ Swablu + .2byte 317 @ Swalot + .2byte 260 @ Swampert + .2byte 277 @ Swellow + .2byte 220 @ Swinub + .2byte 276 @ Taillow + .2byte 114 @ Tangela + .2byte 128 @ Tauros + .2byte 216 @ Teddiursa + .2byte 72 @ Tentacool + .2byte 73 @ Tentacruel + .2byte 175 @ Togepi + .2byte 176 @ Togetic + .2byte 255 @ Torchic + .2byte 324 @ Torkoal + .2byte 158 @ Totodile + .2byte 328 @ Trapinch + .2byte 252 @ Treecko + .2byte 357 @ Tropius + .2byte 157 @ Typhlosion + .2byte 248 @ Tyranitar + .2byte 236 @ Tyrogue + .2byte 197 @ Umbreon + .2byte 201 @ Unown + .2byte 217 @ Ursaring + .2byte 134 @ Vaporeon + .2byte 49 @ Venomoth + .2byte 48 @ Venonat + .2byte 3 @ Venusaur + .2byte 329 @ Vibrava + .2byte 71 @ Victreebel + .2byte 288 @ Vigoroth + .2byte 45 @ Vileplume + .2byte 313 @ Volbeat + .2byte 100 @ Voltorb + .2byte 37 @ Vulpix + .2byte 320 @ Wailmer + .2byte 321 @ Wailord + .2byte 365 @ Walrein + .2byte 8 @ Wartortle + .2byte 13 @ Weedle + .2byte 70 @ Weepinbell + .2byte 110 @ Weezing + .2byte 340 @ Whiscash + .2byte 293 @ Whismur + .2byte 40 @ Wigglytuff + .2byte 278 @ Wingull + .2byte 202 @ Wobbuffet + .2byte 194 @ Wooper + .2byte 265 @ Wurmple + .2byte 360 @ Wynaut + .2byte 178 @ Xatu + .2byte 193 @ Yanma + .2byte 335 @ Zangoose + .2byte 145 @ Zapdos + .2byte 263 @ Zigzagoon + .2byte 41 @ Zubat + + .align 1 +gPokedexOrder_Weight:: @ 839FDFA + .2byte 92 @ Gastly + .2byte 93 @ Haunter + .2byte 187 @ Hoppip + .2byte 50 @ Diglett + .2byte 351 @ Castform + .2byte 109 @ Koffing + .2byte 174 @ Igglybuff + .2byte 200 @ Misdreavus + .2byte 358 @ Chimecho + .2byte 188 @ Skiploom + .2byte 385 @ Jirachi + .2byte 333 @ Swablu + .2byte 292 @ Shedinja + .2byte 175 @ Togepi + .2byte 283 @ Surskit + .2byte 16 @ Pidgey + .2byte 191 @ Sunkern + .2byte 339 @ Barboach + .2byte 172 @ Pichu + .2byte 298 @ Azurill + .2byte 315 @ Roselia + .2byte 177 @ Natu + .2byte 21 @ Spearow + .2byte 198 @ Murkrow + .2byte 353 @ Shuppet + .2byte 276 @ Taillow + .2byte 102 @ Exeggcute + .2byte 255 @ Torchic + .2byte 270 @ Lotad + .2byte 10 @ Caterpie + .2byte 189 @ Jumpluff + .2byte 173 @ Cleffa + .2byte 13 @ Weedle + .2byte 176 @ Togetic + .2byte 147 @ Dratini + .2byte 19 @ Rattata + .2byte 284 @ Masquerain + .2byte 265 @ Wurmple + .2byte 211 @ Qwilfish + .2byte 151 @ Mew + .2byte 90 @ Shellder + .2byte 273 @ Seedot + .2byte 132 @ Ditto + .2byte 69 @ Bellsprout + .2byte 311 @ Plusle + .2byte 52 @ Meowth + .2byte 312 @ Minun + .2byte 285 @ Shroomish + .2byte 251 @ Celebi + .2byte 222 @ Corsola + .2byte 252 @ Treecko + .2byte 327 @ Spinda + .2byte 201 @ Unown + .2byte 46 @ Paras + .2byte 43 @ Oddish + .2byte 39 @ Jigglypuff + .2byte 290 @ Nincada + .2byte 182 @ Bellossom + .2byte 81 @ Magnemite + .2byte 25 @ Pikachu + .2byte 238 @ Smoochum + .2byte 161 @ Sentret + .2byte 70 @ Weepinbell + .2byte 152 @ Chikorita + .2byte 220 @ Swinub + .2byte 133 @ Eevee + .2byte 98 @ Krabby + .2byte 104 @ Cubone + .2byte 280 @ Ralts + .2byte 1 @ Bulbasaur + .2byte 23 @ Ekans + .2byte 29 @ Nidoran♀ + .2byte 204 @ Pineco + .2byte 349 @ Feebas + .2byte 138 @ Omanyte + .2byte 41 @ Zubat + .2byte 35 @ Clefairy + .2byte 258 @ Mudkip + .2byte 209 @ Snubbull + .2byte 179 @ Mareep + .2byte 155 @ Cyndaquil + .2byte 116 @ Horsea + .2byte 4 @ Charmander + .2byte 192 @ Sunflora + .2byte 183 @ Marill + .2byte 194 @ Wooper + .2byte 167 @ Spinarak + .2byte 44 @ Gloom + .2byte 370 @ Luvdisc + .2byte 216 @ Teddiursa + .2byte 32 @ Nidoran♂ + .2byte 7 @ Squirtle + .2byte 278 @ Wingull + .2byte 158 @ Totodile + .2byte 110 @ Weezing + .2byte 37 @ Vulpix + .2byte 11 @ Metapod + .2byte 266 @ Silcoon + .2byte 129 @ Magikarp + .2byte 14 @ Kakuna + .2byte 316 @ Gulpin + .2byte 100 @ Voltorb + .2byte 165 @ Ledyba + .2byte 228 @ Houndour + .2byte 300 @ Skitty + .2byte 302 @ Sableye + .2byte 307 @ Meditite + .2byte 341 @ Corphish + .2byte 190 @ Aipom + .2byte 268 @ Cascoon + .2byte 303 @ Mawile + .2byte 140 @ Kabuto + .2byte 40 @ Wigglytuff + .2byte 27 @ Sandshrew + .2byte 223 @ Remoraid + .2byte 291 @ Ninjask + .2byte 170 @ Chinchou + .2byte 60 @ Poliwag + .2byte 347 @ Anorith + .2byte 49 @ Venomoth + .2byte 354 @ Banette + .2byte 2 @ Ivysaur + .2byte 180 @ Flaaffy + .2byte 261 @ Poochyena + .2byte 360 @ Wynaut + .2byte 206 @ Dunsparce + .2byte 178 @ Xatu + .2byte 355 @ Duskull + .2byte 83 @ Farfetch’d + .2byte 328 @ Trapinch + .2byte 118 @ Goldeen + .2byte 309 @ Electrike + .2byte 329 @ Vibrava + .2byte 71 @ Victreebel + .2byte 153 @ Bayleef + .2byte 225 @ Delibird + .2byte 293 @ Whismur + .2byte 148 @ Dragonair + .2byte 361 @ Snorunt + .2byte 263 @ Zigzagoon + .2byte 314 @ Illumise + .2byte 313 @ Volbeat + .2byte 20 @ Raticate + .2byte 45 @ Vileplume + .2byte 156 @ Quilava + .2byte 5 @ Charmeleon + .2byte 58 @ Growlithe + .2byte 256 @ Combusken + .2byte 66 @ Machop + .2byte 63 @ Abra + .2byte 33 @ Nidorino + .2byte 54 @ Psyduck + .2byte 277 @ Swellow + .2byte 38 @ Ninetales + .2byte 30 @ Nidorina + .2byte 61 @ Poliwhirl + .2byte 74 @ Geodude + .2byte 281 @ Kirlia + .2byte 213 @ Shuckle + .2byte 334 @ Altaria + .2byte 318 @ Carvanha + .2byte 236 @ Tyrogue + .2byte 163 @ Hoothoot + .2byte 240 @ Magby + .2byte 343 @ Baltoy + .2byte 253 @ Grovyle + .2byte 352 @ Kecleon + .2byte 171 @ Lanturn + .2byte 8 @ Wartortle + .2byte 368 @ Gorebyss + .2byte 369 @ Relicanth + .2byte 239 @ Elekid + .2byte 340 @ Whiscash + .2byte 345 @ Lileep + .2byte 322 @ Numel + .2byte 287 @ Slakoth + .2byte 135 @ Jolteon + .2byte 159 @ Croconaw + .2byte 136 @ Flareon + .2byte 117 @ Seadra + .2byte 196 @ Espeon + .2byte 367 @ Huntail + .2byte 197 @ Umbreon + .2byte 259 @ Marshtomp + .2byte 274 @ Nuzleaf + .2byte 215 @ Sneasel + .2byte 56 @ Mankey + .2byte 279 @ Pelipper + .2byte 267 @ Beautifly + .2byte 224 @ Octillery + .2byte 184 @ Azumarill + .2byte 202 @ Wobbuffet + .2byte 134 @ Vaporeon + .2byte 28 @ Sandslash + .2byte 47 @ Parasect + .2byte 15 @ Beedrill + .2byte 89 @ Muk + .2byte 17 @ Pidgeotto + .2byte 88 @ Grimer + .2byte 26 @ Raichu + .2byte 77 @ Ponyta + .2byte 125 @ Electabuzz + .2byte 48 @ Venonat + .2byte 325 @ Spoink + .2byte 356 @ Dusclops + .2byte 308 @ Medicham + .2byte 269 @ Dustox + .2byte 53 @ Persian + .2byte 12 @ Butterfree + .2byte 57 @ Primeape + .2byte 96 @ Drowzee + .2byte 162 @ Furret + .2byte 233 @ Porygon2 + .2byte 271 @ Lombre + .2byte 264 @ Linoone + .2byte 301 @ Delcatty + .2byte 342 @ Crawdaunt + .2byte 51 @ Dugtrio + .2byte 168 @ Ariados + .2byte 231 @ Phanpy + .2byte 186 @ Politoed + .2byte 120 @ Staryu + .2byte 113 @ Chansey + .2byte 139 @ Omastar + .2byte 114 @ Tangela + .2byte 218 @ Slugma + .2byte 229 @ Houndoom + .2byte 166 @ Ledian + .2byte 79 @ Slowpoke + .2byte 137 @ Porygon + .2byte 262 @ Mightyena + .2byte 193 @ Yanma + .2byte 22 @ Fearow + .2byte 185 @ Sudowoodo + .2byte 119 @ Seaking + .2byte 286 @ Breloom + .2byte 84 @ Doduo + .2byte 18 @ Pidgeot + .2byte 363 @ Spheal + .2byte 36 @ Clefable + .2byte 380 @ Latias + .2byte 310 @ Manectric + .2byte 335 @ Zangoose + .2byte 141 @ Kabutops + .2byte 94 @ Gengar + .2byte 294 @ Loudred + .2byte 124 @ Jynx + .2byte 164 @ Noctowl + .2byte 203 @ Girafarig + .2byte 371 @ Bagon + .2byte 126 @ Magmar + .2byte 105 @ Marowak + .2byte 72 @ Tentacool + .2byte 288 @ Vigoroth + .2byte 242 @ Blissey + .2byte 359 @ Absol + .2byte 65 @ Alakazam + .2byte 237 @ Hitmontop + .2byte 282 @ Gardevoir + .2byte 210 @ Granbull + .2byte 106 @ Hitmonlee + .2byte 107 @ Hitmonchan + .2byte 227 @ Skarmory + .2byte 331 @ Cacnea + .2byte 257 @ Blaziken + .2byte 254 @ Sceptile + .2byte 336 @ Seviper + .2byte 366 @ Clamperl + .2byte 145 @ Zapdos + .2byte 214 @ Heracross + .2byte 62 @ Poliwrath + .2byte 122 @ Mr. mime + .2byte 127 @ Pinsir + .2byte 272 @ Ludicolo + .2byte 73 @ Tentacruel + .2byte 42 @ Golbat + .2byte 219 @ Magcargo + .2byte 144 @ Articuno + .2byte 221 @ Piloswine + .2byte 123 @ Scyther + .2byte 64 @ Kadabra + .2byte 235 @ Smeargle + .2byte 142 @ Aerodactyl + .2byte 275 @ Shiftry + .2byte 99 @ Kingler + .2byte 31 @ Nidoqueen + .2byte 82 @ Magneton + .2byte 304 @ Aron + .2byte 381 @ Latios + .2byte 146 @ Moltres + .2byte 346 @ Cradily + .2byte 386 @ Deoxys + .2byte 181 @ Ampharos + .2byte 34 @ Nidoking + .2byte 207 @ Gligar + .2byte 24 @ Arbok + .2byte 108 @ Lickitung + .2byte 101 @ Electrode + .2byte 348 @ Armaldo + .2byte 67 @ Machoke + .2byte 234 @ Stantler + .2byte 326 @ Grumpig + .2byte 246 @ Larvitar + .2byte 169 @ Crobat + .2byte 195 @ Quagsire + .2byte 241 @ Miltank + .2byte 97 @ Hypno + .2byte 55 @ Golduck + .2byte 332 @ Cacturne + .2byte 80 @ Slowbro + .2byte 157 @ Typhlosion + .2byte 199 @ Slowking + .2byte 115 @ Kangaskhan + .2byte 121 @ Starmie + .2byte 317 @ Swalot + .2byte 324 @ Torkoal + .2byte 260 @ Swampert + .2byte 330 @ Flygon + .2byte 295 @ Exploud + .2byte 85 @ Dodrio + .2byte 9 @ Blastoise + .2byte 296 @ Makuhita + .2byte 364 @ Sealeo + .2byte 128 @ Tauros + .2byte 319 @ Sharpedo + .2byte 160 @ Feraligatr + .2byte 86 @ Seel + .2byte 6 @ Charizard + .2byte 78 @ Rapidash + .2byte 374 @ Beldum + .2byte 299 @ Nosepass + .2byte 3 @ Venusaur + .2byte 357 @ Tropius + .2byte 154 @ Meganium + .2byte 373 @ Salamence + .2byte 75 @ Graveler + .2byte 344 @ Claydol + .2byte 372 @ Shelgon + .2byte 111 @ Rhyhorn + .2byte 212 @ Scizor + .2byte 87 @ Dewgong + .2byte 112 @ Rhydon + .2byte 232 @ Donphan + .2byte 103 @ Exeggutor + .2byte 305 @ Lairon + .2byte 150 @ Mewtwo + .2byte 217 @ Ursaring + .2byte 205 @ Forretress + .2byte 68 @ Machamp + .2byte 320 @ Wailmer + .2byte 289 @ Slaking + .2byte 91 @ Cloyster + .2byte 365 @ Walrein + .2byte 247 @ Pupitar + .2byte 230 @ Kingdra + .2byte 338 @ Solrock + .2byte 59 @ Arcanine + .2byte 350 @ Milotic + .2byte 337 @ Lunatone + .2byte 378 @ Regice + .2byte 243 @ Raikou + .2byte 245 @ Suicune + .2byte 244 @ Entei + .2byte 250 @ Ho-Oh + .2byte 248 @ Tyranitar + .2byte 375 @ Metang + .2byte 379 @ Registeel + .2byte 384 @ Rayquaza + .2byte 95 @ Onix + .2byte 149 @ Dragonite + .2byte 249 @ Lugia + .2byte 131 @ Lapras + .2byte 323 @ Camerupt + .2byte 226 @ Mantine + .2byte 377 @ Regirock + .2byte 130 @ Gyarados + .2byte 297 @ Hariyama + .2byte 362 @ Glalie + .2byte 76 @ Golem + .2byte 382 @ Kyogre + .2byte 306 @ Aggron + .2byte 321 @ Wailord + .2byte 208 @ Steelix + .2byte 143 @ Snorlax + .2byte 376 @ Metagross + .2byte 383 @ Groudon + + .align 1 +gPokedexOrder_Height:: @ 83A00FE + .2byte 50 @ Diglett + .2byte 298 @ Azurill + .2byte 177 @ Natu + .2byte 13 @ Weedle + .2byte 172 @ Pichu + .2byte 173 @ Cleffa + .2byte 175 @ Togepi + .2byte 351 @ Castform + .2byte 174 @ Igglybuff + .2byte 10 @ Caterpie + .2byte 276 @ Taillow + .2byte 132 @ Ditto + .2byte 133 @ Eevee + .2byte 315 @ Roselia + .2byte 21 @ Spearow + .2byte 16 @ Pidgey + .2byte 191 @ Sunkern + .2byte 90 @ Shellder + .2byte 19 @ Rattata + .2byte 81 @ Magnemite + .2byte 46 @ Paras + .2byte 265 @ Wurmple + .2byte 385 @ Jirachi + .2byte 104 @ Cubone + .2byte 258 @ Mudkip + .2byte 194 @ Wooper + .2byte 116 @ Horsea + .2byte 52 @ Meowth + .2byte 29 @ Nidoran♀ + .2byte 220 @ Swinub + .2byte 151 @ Mew + .2byte 333 @ Swablu + .2byte 304 @ Aron + .2byte 311 @ Plusle + .2byte 312 @ Minun + .2byte 102 @ Exeggcute + .2byte 25 @ Pikachu + .2byte 182 @ Bellossom + .2byte 316 @ Gulpin + .2byte 263 @ Zigzagoon + .2byte 285 @ Shroomish + .2byte 138 @ Omanyte + .2byte 331 @ Cacnea + .2byte 98 @ Krabby + .2byte 280 @ Ralts + .2byte 187 @ Hoppip + .2byte 255 @ Torchic + .2byte 366 @ Clamperl + .2byte 74 @ Geodude + .2byte 183 @ Marill + .2byte 339 @ Barboach + .2byte 238 @ Smoochum + .2byte 100 @ Voltorb + .2byte 290 @ Nincada + .2byte 302 @ Sableye + .2byte 198 @ Murkrow + .2byte 211 @ Qwilfish + .2byte 7 @ Squirtle + .2byte 252 @ Treecko + .2byte 343 @ Baltoy + .2byte 43 @ Oddish + .2byte 270 @ Lotad + .2byte 39 @ Jigglypuff + .2byte 283 @ Surskit + .2byte 155 @ Cyndaquil + .2byte 140 @ Kabuto + .2byte 264 @ Linoone + .2byte 324 @ Torkoal + .2byte 32 @ Nidoran♂ + .2byte 167 @ Spinarak + .2byte 56 @ Mankey + .2byte 273 @ Seedot + .2byte 261 @ Poochyena + .2byte 231 @ Phanpy + .2byte 201 @ Unown + .2byte 170 @ Chinchou + .2byte 233 @ Porygon2 + .2byte 60 @ Poliwag + .2byte 371 @ Bagon + .2byte 349 @ Feebas + .2byte 353 @ Shuppet + .2byte 158 @ Totodile + .2byte 251 @ Celebi + .2byte 360 @ Wynaut + .2byte 27 @ Sandshrew + .2byte 358 @ Chimecho + .2byte 370 @ Luvdisc + .2byte 228 @ Houndour + .2byte 266 @ Silcoon + .2byte 309 @ Electrike + .2byte 4 @ Charmander + .2byte 307 @ Meditite + .2byte 278 @ Wingull + .2byte 223 @ Remoraid + .2byte 341 @ Corphish + .2byte 222 @ Corsola + .2byte 314 @ Illumise + .2byte 209 @ Snubbull + .2byte 37 @ Vulpix + .2byte 246 @ Larvitar + .2byte 374 @ Beldum + .2byte 293 @ Whismur + .2byte 204 @ Pineco + .2byte 239 @ Elekid + .2byte 35 @ Clefairy + .2byte 213 @ Shuckle + .2byte 216 @ Teddiursa + .2byte 14 @ Kakuna + .2byte 300 @ Skitty + .2byte 176 @ Togetic + .2byte 118 @ Goldeen + .2byte 303 @ Mawile + .2byte 179 @ Mareep + .2byte 188 @ Skiploom + .2byte 109 @ Koffing + .2byte 51 @ Dugtrio + .2byte 268 @ Cascoon + .2byte 322 @ Numel + .2byte 347 @ Anorith + .2byte 313 @ Volbeat + .2byte 163 @ Hoothoot + .2byte 328 @ Trapinch + .2byte 325 @ Spoink + .2byte 11 @ Metapod + .2byte 69 @ Bellsprout + .2byte 361 @ Snorunt + .2byte 20 @ Raticate + .2byte 259 @ Marshtomp + .2byte 277 @ Swellow + .2byte 240 @ Magby + .2byte 58 @ Growlithe + .2byte 200 @ Misdreavus + .2byte 1 @ Bulbasaur + .2byte 236 @ Tyrogue + .2byte 218 @ Slugma + .2byte 287 @ Slakoth + .2byte 281 @ Kirlia + .2byte 190 @ Aipom + .2byte 135 @ Jolteon + .2byte 30 @ Nidorina + .2byte 184 @ Azumarill + .2byte 292 @ Shedinja + .2byte 66 @ Machop + .2byte 291 @ Ninjask + .2byte 284 @ Masquerain + .2byte 355 @ Duskull + .2byte 192 @ Sunflora + .2byte 189 @ Jumpluff + .2byte 120 @ Staryu + .2byte 180 @ Flaaffy + .2byte 363 @ Spheal + .2byte 54 @ Psyduck + .2byte 219 @ Magcargo + .2byte 83 @ Farfetch’d + .2byte 41 @ Zubat + .2byte 137 @ Porygon + .2byte 161 @ Sentret + .2byte 318 @ Carvanha + .2byte 44 @ Gloom + .2byte 26 @ Raichu + .2byte 129 @ Magikarp + .2byte 215 @ Sneasel + .2byte 305 @ Lairon + .2byte 256 @ Combusken + .2byte 224 @ Octillery + .2byte 33 @ Nidorino + .2byte 136 @ Flareon + .2byte 225 @ Delibird + .2byte 72 @ Tentacool + .2byte 63 @ Abra + .2byte 253 @ Grovyle + .2byte 340 @ Whiscash + .2byte 156 @ Quilava + .2byte 196 @ Espeon + .2byte 88 @ Grimer + .2byte 152 @ Chikorita + .2byte 326 @ Grumpig + .2byte 299 @ Nosepass + .2byte 53 @ Persian + .2byte 262 @ Mightyena + .2byte 48 @ Venonat + .2byte 82 @ Magneton + .2byte 77 @ Ponyta + .2byte 296 @ Makuhita + .2byte 337 @ Lunatone + .2byte 28 @ Sandslash + .2byte 96 @ Drowzee + .2byte 114 @ Tangela + .2byte 57 @ Primeape + .2byte 165 @ Ledyba + .2byte 40 @ Wigglytuff + .2byte 47 @ Parasect + .2byte 139 @ Omastar + .2byte 294 @ Loudred + .2byte 8 @ Wartortle + .2byte 75 @ Graveler + .2byte 197 @ Umbreon + .2byte 345 @ Lileep + .2byte 61 @ Poliwhirl + .2byte 134 @ Vaporeon + .2byte 15 @ Beedrill + .2byte 105 @ Marowak + .2byte 70 @ Weepinbell + .2byte 369 @ Relicanth + .2byte 111 @ Rhyhorn + .2byte 2 @ Ivysaur + .2byte 352 @ Kecleon + .2byte 274 @ Nuzleaf + .2byte 267 @ Beautifly + .2byte 17 @ Pidgeotto + .2byte 168 @ Ariados + .2byte 86 @ Seel + .2byte 186 @ Politoed + .2byte 159 @ Croconaw + .2byte 113 @ Chansey + .2byte 354 @ Banette + .2byte 232 @ Donphan + .2byte 121 @ Starmie + .2byte 5 @ Charmeleon + .2byte 221 @ Piloswine + .2byte 12 @ Butterfree + .2byte 329 @ Vibrava + .2byte 125 @ Electabuzz + .2byte 342 @ Crawdaunt + .2byte 301 @ Delcatty + .2byte 334 @ Altaria + .2byte 372 @ Shelgon + .2byte 38 @ Ninetales + .2byte 207 @ Gligar + .2byte 364 @ Sealeo + .2byte 327 @ Spinda + .2byte 247 @ Pupitar + .2byte 79 @ Slowpoke + .2byte 338 @ Solrock + .2byte 241 @ Miltank + .2byte 22 @ Fearow + .2byte 45 @ Vileplume + .2byte 89 @ Muk + .2byte 205 @ Forretress + .2byte 185 @ Sudowoodo + .2byte 359 @ Absol + .2byte 193 @ Yanma + .2byte 269 @ Dustox + .2byte 108 @ Lickitung + .2byte 235 @ Smeargle + .2byte 171 @ Lanturn + .2byte 101 @ Electrode + .2byte 271 @ Lombre + .2byte 286 @ Breloom + .2byte 153 @ Bayleef + .2byte 117 @ Seadra + .2byte 110 @ Weezing + .2byte 279 @ Pelipper + .2byte 375 @ Metang + .2byte 31 @ Nidoqueen + .2byte 332 @ Cacturne + .2byte 275 @ Shiftry + .2byte 308 @ Medicham + .2byte 335 @ Zangoose + .2byte 141 @ Kabutops + .2byte 99 @ Kingler + .2byte 64 @ Kadabra + .2byte 119 @ Seaking + .2byte 36 @ Clefable + .2byte 126 @ Magmar + .2byte 202 @ Wobbuffet + .2byte 92 @ Gastly + .2byte 122 @ Mr. mime + .2byte 62 @ Poliwrath + .2byte 128 @ Tauros + .2byte 380 @ Latias + .2byte 181 @ Ampharos + .2byte 288 @ Vigoroth + .2byte 166 @ Ledian + .2byte 76 @ Golem + .2byte 365 @ Walrein + .2byte 84 @ Doduo + .2byte 229 @ Houndoom + .2byte 34 @ Nidoking + .2byte 124 @ Jynx + .2byte 107 @ Hitmonchan + .2byte 234 @ Stantler + .2byte 210 @ Granbull + .2byte 237 @ Hitmontop + .2byte 195 @ Quagsire + .2byte 344 @ Claydol + .2byte 260 @ Swampert + .2byte 242 @ Blissey + .2byte 272 @ Ludicolo + .2byte 295 @ Exploud + .2byte 206 @ Dunsparce + .2byte 127 @ Pinsir + .2byte 91 @ Cloyster + .2byte 67 @ Machoke + .2byte 203 @ Girafarig + .2byte 18 @ Pidgeot + .2byte 178 @ Xatu + .2byte 346 @ Cradily + .2byte 106 @ Hitmonlee + .2byte 49 @ Venomoth + .2byte 94 @ Gengar + .2byte 214 @ Heracross + .2byte 362 @ Glalie + .2byte 123 @ Scyther + .2byte 373 @ Salamence + .2byte 310 @ Manectric + .2byte 348 @ Armaldo + .2byte 65 @ Alakazam + .2byte 97 @ Hypno + .2byte 164 @ Noctowl + .2byte 73 @ Tentacruel + .2byte 356 @ Dusclops + .2byte 145 @ Zapdos + .2byte 42 @ Golbat + .2byte 376 @ Metagross + .2byte 282 @ Gardevoir + .2byte 9 @ Blastoise + .2byte 80 @ Slowbro + .2byte 93 @ Haunter + .2byte 68 @ Machamp + .2byte 377 @ Regirock + .2byte 317 @ Swalot + .2byte 254 @ Sceptile + .2byte 227 @ Skarmory + .2byte 55 @ Golduck + .2byte 386 @ Deoxys + .2byte 71 @ Victreebel + .2byte 78 @ Rapidash + .2byte 6 @ Charizard + .2byte 367 @ Huntail + .2byte 87 @ Dewgong + .2byte 144 @ Articuno + .2byte 157 @ Typhlosion + .2byte 142 @ Aerodactyl + .2byte 368 @ Gorebyss + .2byte 217 @ Ursaring + .2byte 154 @ Meganium + .2byte 378 @ Regice + .2byte 212 @ Scizor + .2byte 230 @ Kingdra + .2byte 147 @ Dratini + .2byte 85 @ Dodrio + .2byte 319 @ Sharpedo + .2byte 169 @ Crobat + .2byte 162 @ Furret + .2byte 59 @ Arcanine + .2byte 243 @ Raikou + .2byte 257 @ Blaziken + .2byte 323 @ Camerupt + .2byte 112 @ Rhydon + .2byte 379 @ Registeel + .2byte 23 @ Ekans + .2byte 330 @ Flygon + .2byte 357 @ Tropius + .2byte 381 @ Latios + .2byte 245 @ Suicune + .2byte 146 @ Moltres + .2byte 3 @ Venusaur + .2byte 103 @ Exeggutor + .2byte 199 @ Slowking + .2byte 248 @ Tyranitar + .2byte 289 @ Slaking + .2byte 320 @ Wailmer + .2byte 150 @ Mewtwo + .2byte 306 @ Aggron + .2byte 143 @ Snorlax + .2byte 226 @ Mantine + .2byte 244 @ Entei + .2byte 149 @ Dragonite + .2byte 115 @ Kangaskhan + .2byte 297 @ Hariyama + .2byte 160 @ Feraligatr + .2byte 131 @ Lapras + .2byte 336 @ Seviper + .2byte 24 @ Arbok + .2byte 383 @ Groudon + .2byte 250 @ Ho-Oh + .2byte 148 @ Dragonair + .2byte 382 @ Kyogre + .2byte 249 @ Lugia + .2byte 350 @ Milotic + .2byte 130 @ Gyarados + .2byte 384 @ Rayquaza + .2byte 95 @ Onix + .2byte 208 @ Steelix + .2byte 321 @ Wailord diff --git a/data/pokedex_order.s b/data/species_id_conversion_tables.s index 88725d2bd..88725d2bd 100644 --- a/data/pokedex_order.s +++ b/data/species_id_conversion_tables.s |