summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-06-14 18:15:36 -0500
committercamthesaxman <cameronghall@cox.net>2017-06-14 18:15:36 -0500
commitaba52dbd95939761886a918f2a4c5ddad34b70a1 (patch)
treee3de787556804fcb79bd6358e892ff9a956e8038
parentb7031c448aa22422a5e409d545c9da12325381cf (diff)
convert some data to C
Diffstat
-rw-r--r--data/pokedex.s201
-rw-r--r--data/pokedex_orders.inc1191
-rw-r--r--ld_script.txt1
-rw-r--r--src/pokedex.c2090
4 files changed, 1760 insertions, 1723 deletions
diff --git a/data/pokedex.s b/data/pokedex.s
index a9ee7a9be..a014c6af9 100644
--- a/data/pokedex.s
+++ b/data/pokedex.s
@@ -4,207 +4,6 @@
.section .rodata
.align 2
-gUnknown_0839F67C:: @ 839F67C
- .incbin "graphics/pokedex/search.gbapal"
-
- .align 2
-gUnknown_0839F73C:: @ 839F73C
- .incbin "graphics/pokedex/national.gbapal"
-
- .space 0xA4
-
- .align 2
-gUnknown_0839F8A0:: @ 839F8A0
- .incbin "graphics/pokedex/pokedex_cry_layout.bin.lz"
-
- .align 2
-gUnknown_0839F988:: @ 839F988
- .incbin "graphics/pokedex/pokedex_size_layout.bin.lz"
-
-gUnknown_0839FA7C:: @ 839FA7C
- .incbin "graphics/pokedex/noball.4bpp.lz"
-
-@ 839FAC4
- .include "data/pokedex_orders.inc"
-
- .align 2
-gOamData_83A0404:: @ 83A0404
- .2byte 0x00A0
- .2byte 0x0000
- .2byte 0x0400
-
- .align 2
-gOamData_83A040C:: @ 83A040C
- .2byte 0x40A0
- .2byte 0x0000
- .2byte 0x0000
-
- .align 2
-gOamData_83A0414:: @ 83A0414
- .2byte 0x40A0
- .2byte 0xC000
- .2byte 0x0000
-
- .align 2
-gOamData_83A041C:: @ 83A041C
- .2byte 0x08A0
- .2byte 0x8000
- .2byte 0x0400
-
- .align 2
-gOamData_83A0424:: @ 83A0424
- .2byte 0x40A0
- .2byte 0xC000
- .2byte 0x0000
-
- .align 2
-gOamData_83A042C:: @ 83A042C
- .2byte 0x80A0
- .2byte 0x0000
- .2byte 0x0000
-
- .align 2
-gSpriteAnim_83A0434:: @ 83A0434
- obj_image_anim_frame 3, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A043C:: @ 83A043C
- obj_image_anim_frame 1, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A0444:: @ 83A0444
- obj_image_anim_frame 16, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A044C:: @ 83A044C
- obj_image_anim_frame 32, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A0454:: @ 83A0454
- obj_image_anim_frame 64, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A045C:: @ 83A045C
- obj_image_anim_frame 96, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A0464:: @ 83A0464
- obj_image_anim_frame 128, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A046C:: @ 83A046C
- obj_image_anim_frame 160, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A0474:: @ 83A0474
- obj_image_anim_frame 192, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A047C:: @ 83A047C
- obj_image_anim_frame 224, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A0484:: @ 83A0484
- obj_image_anim_frame 226, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A048C:: @ 83A048C
- obj_image_anim_frame 228, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A0494:: @ 83A0494
- obj_image_anim_frame 230, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A049C:: @ 83A049C
- obj_image_anim_frame 232, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A04A4:: @ 83A04A4
- obj_image_anim_frame 234, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A04AC:: @ 83A04AC
- obj_image_anim_frame 236, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A04B4:: @ 83A04B4
- obj_image_anim_frame 238, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A04BC:: @ 83A04BC
- obj_image_anim_frame 240, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A04C4:: @ 83A04C4
- obj_image_anim_frame 242, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83A04CC:: @ 83A04CC
- obj_image_anim_frame 4, 30
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_83A04D4:: @ 83A04D4
- .4byte gSpriteAnim_83A0434
-
- .align 2
-gSpriteAnimTable_83A04D8:: @ 83A04D8
- .4byte gSpriteAnim_83A043C
-
- .align 2
-gSpriteAnimTable_83A04DC:: @ 83A04DC
- .4byte gSpriteAnim_83A0444
-
- .align 2
-gSpriteAnimTable_83A04E0:: @ 83A04E0
- .4byte gSpriteAnim_83A044C
- .4byte gSpriteAnim_83A0454
- .4byte gSpriteAnim_83A045C
- .4byte gSpriteAnim_83A0464
-
- .align 2
-gSpriteAnimTable_83A04F0:: @ 83A04F0
- .4byte gSpriteAnim_83A046C
- .4byte gSpriteAnim_83A0474
-
- .align 2
-gSpriteAnimTable_83A04F8:: @ 83A04F8
- .4byte gSpriteAnim_83A047C
- .4byte gSpriteAnim_83A0484
- .4byte gSpriteAnim_83A048C
- .4byte gSpriteAnim_83A0494
- .4byte gSpriteAnim_83A049C
- .4byte gSpriteAnim_83A04A4
- .4byte gSpriteAnim_83A04AC
- .4byte gSpriteAnim_83A04B4
- .4byte gSpriteAnim_83A04BC
- .4byte gSpriteAnim_83A04C4
-
- .align 2
-gSpriteAnimTable_83A0520:: @ 83A0520
- .4byte gSpriteAnim_83A04CC
-
- .align 2
gSpriteTemplate_83A0524:: @ 83A0524
spr_template 4096, 4096, gOamData_83A0404, gSpriteAnimTable_83A04D4, NULL, gDummySpriteAffineAnimTable, sub_808EF38
diff --git a/data/pokedex_orders.inc b/data/pokedex_orders.inc
deleted file mode 100644
index db1cf7e07..000000000
--- a/data/pokedex_orders.inc
+++ /dev/null
@@ -1,1191 +0,0 @@
- .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/ld_script.txt b/ld_script.txt
index a876843bb..b7071f418 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -399,6 +399,7 @@ SECTIONS {
data/field_effect.o(.rodata);
data/pokemon_menu.o(.rodata);
data/option_menu.o(.rodata);
+ src/pokedex.o(.rodata);
data/pokedex.o(.rodata);
data/trainer_card.o(.rodata);
src/battle_party_menu.o(.rodata);
diff --git a/src/pokedex.c b/src/pokedex.c
index d799f6a19..dd0c669d4 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -104,11 +104,6 @@ extern u8 gUnknown_08E96738[];
extern u8 gUnknown_08E96888[];
extern u8 gUnknown_08E96994[];
extern u8 gUnknown_08E9C6DC[];
-extern u8 gUnknown_0839FA7C[];
-extern u16 gUnknown_0839F67C[];
-extern u8 gUnknown_0839F73C[];
-extern u8 gUnknown_0839F8A0[];
-extern u8 gUnknown_0839F988[];
extern struct SpriteTemplate gSpriteTemplate_83A0524;
extern struct SpriteTemplate gSpriteTemplate_83A053C;
extern struct SpriteTemplate gSpriteTemplate_83A0554;
@@ -170,9 +165,1442 @@ extern void DisableNationalPokedex(void);
extern void sub_805469C(void);
extern u16 HoennToNationalOrder(u16);
extern u16 NationalToHoennOrder(u16);
-extern u16 gPokedexOrder_Alphabetical[];
-extern u16 gPokedexOrder_Weight[];
-extern u16 gPokedexOrder_Height[];
+
+const u16 gUnknown_0839F67C[] = INCBIN_U16("graphics/pokedex/search.gbapal");
+const u16 gUnknown_0839F73C[] = INCBIN_U16("graphics/pokedex/national.gbapal");
+const u8 gEmptySpacce_839F7FC[0xA4] = {0};
+const u8 gUnknown_0839F8A0[] = INCBIN_U8("graphics/pokedex/pokedex_cry_layout.bin.lz");
+const u8 gUnknown_0839F988[] = INCBIN_U8("graphics/pokedex/pokedex_size_layout.bin.lz");
+const u8 gUnknown_0839FA7C[] = INCBIN_U8("graphics/pokedex/noball.4bpp.lz");
+const u16 gPokedexOrder_Alphabetical[] =
+{
+ 387,
+ 388,
+ 389,
+ 390,
+ 391,
+ 392,
+ 393,
+ 394,
+ 395,
+ 396,
+ 397,
+ 398,
+ 399,
+ 400,
+ 401,
+ 402,
+ 403,
+ 404,
+ 405,
+ 406,
+ 407,
+ 408,
+ 409,
+ 410,
+ 411,
+ 63, // Abra
+ 359, // Absol
+ 142, // Aerodactyl
+ 306, // Aggron
+ 190, // Aipom
+ 65, // Alakazam
+ 334, // Altaria
+ 181, // Ampharos
+ 347, // Anorith
+ 24, // Arbok
+ 59, // Arcanine
+ 168, // Ariados
+ 348, // Armaldo
+ 304, // Aron
+ 144, // Articuno
+ 184, // Azumarill
+ 298, // Azurill
+ 371, // Bagon
+ 343, // Baltoy
+ 354, // Banette
+ 339, // Barboach
+ 153, // Bayleef
+ 267, // Beautifly
+ 15, // Beedrill
+ 374, // Beldum
+ 182, // Bellossom
+ 69, // Bellsprout
+ 9, // Blastoise
+ 257, // Blaziken
+ 242, // Blissey
+ 286, // Breloom
+ 1, // Bulbasaur
+ 12, // Butterfree
+ 331, // Cacnea
+ 332, // Cacturne
+ 323, // Camerupt
+ 318, // Carvanha
+ 268, // Cascoon
+ 351, // Castform
+ 10, // Caterpie
+ 251, // Celebi
+ 113, // Chansey
+ 6, // Charizard
+ 4, // Charmander
+ 5, // Charmeleon
+ 152, // Chikorita
+ 358, // Chimecho
+ 170, // Chinchou
+ 366, // Clamperl
+ 344, // Claydol
+ 36, // Clefable
+ 35, // Clefairy
+ 173, // Cleffa
+ 91, // Cloyster
+ 256, // Combusken
+ 341, // Corphish
+ 222, // Corsola
+ 346, // Cradily
+ 342, // Crawdaunt
+ 169, // Crobat
+ 159, // Croconaw
+ 104, // Cubone
+ 155, // Cyndaquil
+ 301, // Delcatty
+ 225, // Delibird
+ 386, // Deoxys
+ 87, // Dewgong
+ 50, // Diglett
+ 132, // Ditto
+ 85, // Dodrio
+ 84, // Doduo
+ 232, // Donphan
+ 148, // Dragonair
+ 149, // Dragonite
+ 147, // Dratini
+ 96, // Drowzee
+ 51, // Dugtrio
+ 206, // Dunsparce
+ 356, // Dusclops
+ 355, // Duskull
+ 269, // Dustox
+ 133, // Eevee
+ 23, // Ekans
+ 125, // Electabuzz
+ 309, // Electrike
+ 101, // Electrode
+ 239, // Elekid
+ 244, // Entei
+ 196, // Espeon
+ 102, // Exeggcute
+ 103, // Exeggutor
+ 295, // Exploud
+ 83, // Farfetch’d
+ 22, // Fearow
+ 349, // Feebas
+ 160, // Feraligatr
+ 180, // Flaaffy
+ 136, // Flareon
+ 330, // Flygon
+ 205, // Forretress
+ 162, // Furret
+ 282, // Gardevoir
+ 92, // Gastly
+ 94, // Gengar
+ 74, // Geodude
+ 203, // Girafarig
+ 362, // Glalie
+ 207, // Gligar
+ 44, // Gloom
+ 42, // Golbat
+ 118, // Goldeen
+ 55, // Golduck
+ 76, // Golem
+ 368, // Gorebyss
+ 210, // Granbull
+ 75, // Graveler
+ 88, // Grimer
+ 383, // Groudon
+ 253, // Grovyle
+ 58, // Growlithe
+ 326, // Grumpig
+ 316, // Gulpin
+ 130, // Gyarados
+ 297, // Hariyama
+ 93, // Haunter
+ 214, // Heracross
+ 107, // Hitmonchan
+ 106, // Hitmonlee
+ 237, // Hitmontop
+ 250, // Ho-Oh
+ 163, // Hoothoot
+ 187, // Hoppip
+ 116, // Horsea
+ 229, // Houndoom
+ 228, // Houndour
+ 367, // Huntail
+ 97, // Hypno
+ 174, // Igglybuff
+ 314, // Illumise
+ 2, // Ivysaur
+ 39, // Jigglypuff
+ 385, // Jirachi
+ 135, // Jolteon
+ 189, // Jumpluff
+ 124, // Jynx
+ 140, // Kabuto
+ 141, // Kabutops
+ 64, // Kadabra
+ 14, // Kakuna
+ 115, // Kangaskhan
+ 352, // Kecleon
+ 230, // Kingdra
+ 99, // Kingler
+ 281, // Kirlia
+ 109, // Koffing
+ 98, // Krabby
+ 382, // Kyogre
+ 305, // Lairon
+ 171, // Lanturn
+ 131, // Lapras
+ 246, // Larvitar
+ 380, // Latias
+ 381, // Latios
+ 166, // Ledian
+ 165, // Ledyba
+ 108, // Lickitung
+ 345, // Lileep
+ 264, // Linoone
+ 271, // Lombre
+ 270, // Lotad
+ 294, // Loudred
+ 272, // Ludicolo
+ 249, // Lugia
+ 337, // Lunatone
+ 370, // Luvdisc
+ 68, // Machamp
+ 67, // Machoke
+ 66, // Machop
+ 240, // Magby
+ 219, // Magcargo
+ 129, // Magikarp
+ 126, // Magmar
+ 81, // Magnemite
+ 82, // Magneton
+ 296, // Makuhita
+ 310, // Manectric
+ 56, // Mankey
+ 226, // Mantine
+ 179, // Mareep
+ 183, // Marill
+ 105, // Marowak
+ 259, // Marshtomp
+ 284, // Masquerain
+ 303, // Mawile
+ 308, // Medicham
+ 307, // Meditite
+ 154, // Meganium
+ 52, // Meowth
+ 376, // Metagross
+ 375, // Metang
+ 11, // Metapod
+ 151, // Mew
+ 150, // Mewtwo
+ 262, // Mightyena
+ 350, // Milotic
+ 241, // Miltank
+ 312, // Minun
+ 200, // Misdreavus
+ 146, // Moltres
+ 122, // Mr. mime
+ 258, // Mudkip
+ 89, // Muk
+ 198, // Murkrow
+ 177, // Natu
+ 34, // Nidoking
+ 31, // Nidoqueen
+ 29, // Nidoran♀
+ 32, // Nidoran♂
+ 30, // Nidorina
+ 33, // Nidorino
+ 290, // Nincada
+ 38, // Ninetales
+ 291, // Ninjask
+ 164, // Noctowl
+ 299, // Nosepass
+ 322, // Numel
+ 274, // Nuzleaf
+ 224, // Octillery
+ 43, // Oddish
+ 138, // Omanyte
+ 139, // Omastar
+ 95, // Onix
+ 46, // Paras
+ 47, // Parasect
+ 279, // Pelipper
+ 53, // Persian
+ 231, // Phanpy
+ 172, // Pichu
+ 18, // Pidgeot
+ 17, // Pidgeotto
+ 16, // Pidgey
+ 25, // Pikachu
+ 221, // Piloswine
+ 204, // Pineco
+ 127, // Pinsir
+ 311, // Plusle
+ 186, // Politoed
+ 60, // Poliwag
+ 61, // Poliwhirl
+ 62, // Poliwrath
+ 77, // Ponyta
+ 261, // Poochyena
+ 137, // Porygon
+ 233, // Porygon2
+ 57, // Primeape
+ 54, // Psyduck
+ 247, // Pupitar
+ 195, // Quagsire
+ 156, // Quilava
+ 211, // Qwilfish
+ 26, // Raichu
+ 243, // Raikou
+ 280, // Ralts
+ 78, // Rapidash
+ 20, // Raticate
+ 19, // Rattata
+ 384, // Rayquaza
+ 378, // Regice
+ 377, // Regirock
+ 379, // Registeel
+ 369, // Relicanth
+ 223, // Remoraid
+ 112, // Rhydon
+ 111, // Rhyhorn
+ 315, // Roselia
+ 302, // Sableye
+ 373, // Salamence
+ 27, // Sandshrew
+ 28, // Sandslash
+ 254, // Sceptile
+ 212, // Scizor
+ 123, // Scyther
+ 117, // Seadra
+ 119, // Seaking
+ 364, // Sealeo
+ 273, // Seedot
+ 86, // Seel
+ 161, // Sentret
+ 336, // Seviper
+ 319, // Sharpedo
+ 292, // Shedinja
+ 372, // Shelgon
+ 90, // Shellder
+ 275, // Shiftry
+ 285, // Shroomish
+ 213, // Shuckle
+ 353, // Shuppet
+ 266, // Silcoon
+ 227, // Skarmory
+ 188, // Skiploom
+ 300, // Skitty
+ 289, // Slaking
+ 287, // Slakoth
+ 80, // Slowbro
+ 199, // Slowking
+ 79, // Slowpoke
+ 218, // Slugma
+ 235, // Smeargle
+ 238, // Smoochum
+ 215, // Sneasel
+ 143, // Snorlax
+ 361, // Snorunt
+ 209, // Snubbull
+ 338, // Solrock
+ 21, // Spearow
+ 363, // Spheal
+ 167, // Spinarak
+ 327, // Spinda
+ 325, // Spoink
+ 7, // Squirtle
+ 234, // Stantler
+ 121, // Starmie
+ 120, // Staryu
+ 208, // Steelix
+ 185, // Sudowoodo
+ 245, // Suicune
+ 192, // Sunflora
+ 191, // Sunkern
+ 283, // Surskit
+ 333, // Swablu
+ 317, // Swalot
+ 260, // Swampert
+ 277, // Swellow
+ 220, // Swinub
+ 276, // Taillow
+ 114, // Tangela
+ 128, // Tauros
+ 216, // Teddiursa
+ 72, // Tentacool
+ 73, // Tentacruel
+ 175, // Togepi
+ 176, // Togetic
+ 255, // Torchic
+ 324, // Torkoal
+ 158, // Totodile
+ 328, // Trapinch
+ 252, // Treecko
+ 357, // Tropius
+ 157, // Typhlosion
+ 248, // Tyranitar
+ 236, // Tyrogue
+ 197, // Umbreon
+ 201, // Unown
+ 217, // Ursaring
+ 134, // Vaporeon
+ 49, // Venomoth
+ 48, // Venonat
+ 3, // Venusaur
+ 329, // Vibrava
+ 71, // Victreebel
+ 288, // Vigoroth
+ 45, // Vileplume
+ 313, // Volbeat
+ 100, // Voltorb
+ 37, // Vulpix
+ 320, // Wailmer
+ 321, // Wailord
+ 365, // Walrein
+ 8, // Wartortle
+ 13, // Weedle
+ 70, // Weepinbell
+ 110, // Weezing
+ 340, // Whiscash
+ 293, // Whismur
+ 40, // Wigglytuff
+ 278, // Wingull
+ 202, // Wobbuffet
+ 194, // Wooper
+ 265, // Wurmple
+ 360, // Wynaut
+ 178, // Xatu
+ 193, // Yanma
+ 335, // Zangoose
+ 145, // Zapdos
+ 263, // Zigzagoon
+ 41, // Zubat
+};
+const u16 gPokedexOrder_Weight[] =
+{
+ 92, // Gastly
+ 93, // Haunter
+ 187, // Hoppip
+ 50, // Diglett
+ 351, // Castform
+ 109, // Koffing
+ 174, // Igglybuff
+ 200, // Misdreavus
+ 358, // Chimecho
+ 188, // Skiploom
+ 385, // Jirachi
+ 333, // Swablu
+ 292, // Shedinja
+ 175, // Togepi
+ 283, // Surskit
+ 16, // Pidgey
+ 191, // Sunkern
+ 339, // Barboach
+ 172, // Pichu
+ 298, // Azurill
+ 315, // Roselia
+ 177, // Natu
+ 21, // Spearow
+ 198, // Murkrow
+ 353, // Shuppet
+ 276, // Taillow
+ 102, // Exeggcute
+ 255, // Torchic
+ 270, // Lotad
+ 10, // Caterpie
+ 189, // Jumpluff
+ 173, // Cleffa
+ 13, // Weedle
+ 176, // Togetic
+ 147, // Dratini
+ 19, // Rattata
+ 284, // Masquerain
+ 265, // Wurmple
+ 211, // Qwilfish
+ 151, // Mew
+ 90, // Shellder
+ 273, // Seedot
+ 132, // Ditto
+ 69, // Bellsprout
+ 311, // Plusle
+ 52, // Meowth
+ 312, // Minun
+ 285, // Shroomish
+ 251, // Celebi
+ 222, // Corsola
+ 252, // Treecko
+ 327, // Spinda
+ 201, // Unown
+ 46, // Paras
+ 43, // Oddish
+ 39, // Jigglypuff
+ 290, // Nincada
+ 182, // Bellossom
+ 81, // Magnemite
+ 25, // Pikachu
+ 238, // Smoochum
+ 161, // Sentret
+ 70, // Weepinbell
+ 152, // Chikorita
+ 220, // Swinub
+ 133, // Eevee
+ 98, // Krabby
+ 104, // Cubone
+ 280, // Ralts
+ 1, // Bulbasaur
+ 23, // Ekans
+ 29, // Nidoran♀
+ 204, // Pineco
+ 349, // Feebas
+ 138, // Omanyte
+ 41, // Zubat
+ 35, // Clefairy
+ 258, // Mudkip
+ 209, // Snubbull
+ 179, // Mareep
+ 155, // Cyndaquil
+ 116, // Horsea
+ 4, // Charmander
+ 192, // Sunflora
+ 183, // Marill
+ 194, // Wooper
+ 167, // Spinarak
+ 44, // Gloom
+ 370, // Luvdisc
+ 216, // Teddiursa
+ 32, // Nidoran♂
+ 7, // Squirtle
+ 278, // Wingull
+ 158, // Totodile
+ 110, // Weezing
+ 37, // Vulpix
+ 11, // Metapod
+ 266, // Silcoon
+ 129, // Magikarp
+ 14, // Kakuna
+ 316, // Gulpin
+ 100, // Voltorb
+ 165, // Ledyba
+ 228, // Houndour
+ 300, // Skitty
+ 302, // Sableye
+ 307, // Meditite
+ 341, // Corphish
+ 190, // Aipom
+ 268, // Cascoon
+ 303, // Mawile
+ 140, // Kabuto
+ 40, // Wigglytuff
+ 27, // Sandshrew
+ 223, // Remoraid
+ 291, // Ninjask
+ 170, // Chinchou
+ 60, // Poliwag
+ 347, // Anorith
+ 49, // Venomoth
+ 354, // Banette
+ 2, // Ivysaur
+ 180, // Flaaffy
+ 261, // Poochyena
+ 360, // Wynaut
+ 206, // Dunsparce
+ 178, // Xatu
+ 355, // Duskull
+ 83, // Farfetch’d
+ 328, // Trapinch
+ 118, // Goldeen
+ 309, // Electrike
+ 329, // Vibrava
+ 71, // Victreebel
+ 153, // Bayleef
+ 225, // Delibird
+ 293, // Whismur
+ 148, // Dragonair
+ 361, // Snorunt
+ 263, // Zigzagoon
+ 314, // Illumise
+ 313, // Volbeat
+ 20, // Raticate
+ 45, // Vileplume
+ 156, // Quilava
+ 5, // Charmeleon
+ 58, // Growlithe
+ 256, // Combusken
+ 66, // Machop
+ 63, // Abra
+ 33, // Nidorino
+ 54, // Psyduck
+ 277, // Swellow
+ 38, // Ninetales
+ 30, // Nidorina
+ 61, // Poliwhirl
+ 74, // Geodude
+ 281, // Kirlia
+ 213, // Shuckle
+ 334, // Altaria
+ 318, // Carvanha
+ 236, // Tyrogue
+ 163, // Hoothoot
+ 240, // Magby
+ 343, // Baltoy
+ 253, // Grovyle
+ 352, // Kecleon
+ 171, // Lanturn
+ 8, // Wartortle
+ 368, // Gorebyss
+ 369, // Relicanth
+ 239, // Elekid
+ 340, // Whiscash
+ 345, // Lileep
+ 322, // Numel
+ 287, // Slakoth
+ 135, // Jolteon
+ 159, // Croconaw
+ 136, // Flareon
+ 117, // Seadra
+ 196, // Espeon
+ 367, // Huntail
+ 197, // Umbreon
+ 259, // Marshtomp
+ 274, // Nuzleaf
+ 215, // Sneasel
+ 56, // Mankey
+ 279, // Pelipper
+ 267, // Beautifly
+ 224, // Octillery
+ 184, // Azumarill
+ 202, // Wobbuffet
+ 134, // Vaporeon
+ 28, // Sandslash
+ 47, // Parasect
+ 15, // Beedrill
+ 89, // Muk
+ 17, // Pidgeotto
+ 88, // Grimer
+ 26, // Raichu
+ 77, // Ponyta
+ 125, // Electabuzz
+ 48, // Venonat
+ 325, // Spoink
+ 356, // Dusclops
+ 308, // Medicham
+ 269, // Dustox
+ 53, // Persian
+ 12, // Butterfree
+ 57, // Primeape
+ 96, // Drowzee
+ 162, // Furret
+ 233, // Porygon2
+ 271, // Lombre
+ 264, // Linoone
+ 301, // Delcatty
+ 342, // Crawdaunt
+ 51, // Dugtrio
+ 168, // Ariados
+ 231, // Phanpy
+ 186, // Politoed
+ 120, // Staryu
+ 113, // Chansey
+ 139, // Omastar
+ 114, // Tangela
+ 218, // Slugma
+ 229, // Houndoom
+ 166, // Ledian
+ 79, // Slowpoke
+ 137, // Porygon
+ 262, // Mightyena
+ 193, // Yanma
+ 22, // Fearow
+ 185, // Sudowoodo
+ 119, // Seaking
+ 286, // Breloom
+ 84, // Doduo
+ 18, // Pidgeot
+ 363, // Spheal
+ 36, // Clefable
+ 380, // Latias
+ 310, // Manectric
+ 335, // Zangoose
+ 141, // Kabutops
+ 94, // Gengar
+ 294, // Loudred
+ 124, // Jynx
+ 164, // Noctowl
+ 203, // Girafarig
+ 371, // Bagon
+ 126, // Magmar
+ 105, // Marowak
+ 72, // Tentacool
+ 288, // Vigoroth
+ 242, // Blissey
+ 359, // Absol
+ 65, // Alakazam
+ 237, // Hitmontop
+ 282, // Gardevoir
+ 210, // Granbull
+ 106, // Hitmonlee
+ 107, // Hitmonchan
+ 227, // Skarmory
+ 331, // Cacnea
+ 257, // Blaziken
+ 254, // Sceptile
+ 336, // Seviper
+ 366, // Clamperl
+ 145, // Zapdos
+ 214, // Heracross
+ 62, // Poliwrath
+ 122, // Mr. mime
+ 127, // Pinsir
+ 272, // Ludicolo
+ 73, // Tentacruel
+ 42, // Golbat
+ 219, // Magcargo
+ 144, // Articuno
+ 221, // Piloswine
+ 123, // Scyther
+ 64, // Kadabra
+ 235, // Smeargle
+ 142, // Aerodactyl
+ 275, // Shiftry
+ 99, // Kingler
+ 31, // Nidoqueen
+ 82, // Magneton
+ 304, // Aron
+ 381, // Latios
+ 146, // Moltres
+ 346, // Cradily
+ 386, // Deoxys
+ 181, // Ampharos
+ 34, // Nidoking
+ 207, // Gligar
+ 24, // Arbok
+ 108, // Lickitung
+ 101, // Electrode
+ 348, // Armaldo
+ 67, // Machoke
+ 234, // Stantler
+ 326, // Grumpig
+ 246, // Larvitar
+ 169, // Crobat
+ 195, // Quagsire
+ 241, // Miltank
+ 97, // Hypno
+ 55, // Golduck
+ 332, // Cacturne
+ 80, // Slowbro
+ 157, // Typhlosion
+ 199, // Slowking
+ 115, // Kangaskhan
+ 121, // Starmie
+ 317, // Swalot
+ 324, // Torkoal
+ 260, // Swampert
+ 330, // Flygon
+ 295, // Exploud
+ 85, // Dodrio
+ 9, // Blastoise
+ 296, // Makuhita
+ 364, // Sealeo
+ 128, // Tauros
+ 319, // Sharpedo
+ 160, // Feraligatr
+ 86, // Seel
+ 6, // Charizard
+ 78, // Rapidash
+ 374, // Beldum
+ 299, // Nosepass
+ 3, // Venusaur
+ 357, // Tropius
+ 154, // Meganium
+ 373, // Salamence
+ 75, // Graveler
+ 344, // Claydol
+ 372, // Shelgon
+ 111, // Rhyhorn
+ 212, // Scizor
+ 87, // Dewgong
+ 112, // Rhydon
+ 232, // Donphan
+ 103, // Exeggutor
+ 305, // Lairon
+ 150, // Mewtwo
+ 217, // Ursaring
+ 205, // Forretress
+ 68, // Machamp
+ 320, // Wailmer
+ 289, // Slaking
+ 91, // Cloyster
+ 365, // Walrein
+ 247, // Pupitar
+ 230, // Kingdra
+ 338, // Solrock
+ 59, // Arcanine
+ 350, // Milotic
+ 337, // Lunatone
+ 378, // Regice
+ 243, // Raikou
+ 245, // Suicune
+ 244, // Entei
+ 250, // Ho-Oh
+ 248, // Tyranitar
+ 375, // Metang
+ 379, // Registeel
+ 384, // Rayquaza
+ 95, // Onix
+ 149, // Dragonite
+ 249, // Lugia
+ 131, // Lapras
+ 323, // Camerupt
+ 226, // Mantine
+ 377, // Regirock
+ 130, // Gyarados
+ 297, // Hariyama
+ 362, // Glalie
+ 76, // Golem
+ 382, // Kyogre
+ 306, // Aggron
+ 321, // Wailord
+ 208, // Steelix
+ 143, // Snorlax
+ 376, // Metagross
+ 383, // Groudon
+};
+const u16 gPokedexOrder_Height[] =
+{
+ 50, // Diglett
+ 298, // Azurill
+ 177, // Natu
+ 13, // Weedle
+ 172, // Pichu
+ 173, // Cleffa
+ 175, // Togepi
+ 351, // Castform
+ 174, // Igglybuff
+ 10, // Caterpie
+ 276, // Taillow
+ 132, // Ditto
+ 133, // Eevee
+ 315, // Roselia
+ 21, // Spearow
+ 16, // Pidgey
+ 191, // Sunkern
+ 90, // Shellder
+ 19, // Rattata
+ 81, // Magnemite
+ 46, // Paras
+ 265, // Wurmple
+ 385, // Jirachi
+ 104, // Cubone
+ 258, // Mudkip
+ 194, // Wooper
+ 116, // Horsea
+ 52, // Meowth
+ 29, // Nidoran♀
+ 220, // Swinub
+ 151, // Mew
+ 333, // Swablu
+ 304, // Aron
+ 311, // Plusle
+ 312, // Minun
+ 102, // Exeggcute
+ 25, // Pikachu
+ 182, // Bellossom
+ 316, // Gulpin
+ 263, // Zigzagoon
+ 285, // Shroomish
+ 138, // Omanyte
+ 331, // Cacnea
+ 98, // Krabby
+ 280, // Ralts
+ 187, // Hoppip
+ 255, // Torchic
+ 366, // Clamperl
+ 74, // Geodude
+ 183, // Marill
+ 339, // Barboach
+ 238, // Smoochum
+ 100, // Voltorb
+ 290, // Nincada
+ 302, // Sableye
+ 198, // Murkrow
+ 211, // Qwilfish
+ 7, // Squirtle
+ 252, // Treecko
+ 343, // Baltoy
+ 43, // Oddish
+ 270, // Lotad
+ 39, // Jigglypuff
+ 283, // Surskit
+ 155, // Cyndaquil
+ 140, // Kabuto
+ 264, // Linoone
+ 324, // Torkoal
+ 32, // Nidoran♂
+ 167, // Spinarak
+ 56, // Mankey
+ 273, // Seedot
+ 261, // Poochyena
+ 231, // Phanpy
+ 201, // Unown
+ 170, // Chinchou
+ 233, // Porygon2
+ 60, // Poliwag
+ 371, // Bagon
+ 349, // Feebas
+ 353, // Shuppet
+ 158, // Totodile
+ 251, // Celebi
+ 360, // Wynaut
+ 27, // Sandshrew
+ 358, // Chimecho
+ 370, // Luvdisc
+ 228, // Houndour
+ 266, // Silcoon
+ 309, // Electrike
+ 4, // Charmander
+ 307, // Meditite
+ 278, // Wingull
+ 223, // Remoraid
+ 341, // Corphish
+ 222, // Corsola
+ 314, // Illumise
+ 209, // Snubbull
+ 37, // Vulpix
+ 246, // Larvitar
+ 374, // Beldum
+ 293, // Whismur
+ 204, // Pineco
+ 239, // Elekid
+ 35, // Clefairy
+ 213, // Shuckle
+ 216, // Teddiursa
+ 14, // Kakuna
+ 300, // Skitty
+ 176, // Togetic
+ 118, // Goldeen
+ 303, // Mawile
+ 179, // Mareep
+ 188, // Skiploom
+ 109, // Koffing
+ 51, // Dugtrio
+ 268, // Cascoon
+ 322, // Numel
+ 347, // Anorith
+ 313, // Volbeat
+ 163, // Hoothoot
+ 328, // Trapinch
+ 325, // Spoink
+ 11, // Metapod
+ 69, // Bellsprout
+ 361, // Snorunt
+ 20, // Raticate
+ 259, // Marshtomp
+ 277, // Swellow
+ 240, // Magby
+ 58, // Growlithe
+ 200, // Misdreavus
+ 1, // Bulbasaur
+ 236, // Tyrogue
+ 218, // Slugma
+ 287, // Slakoth
+ 281, // Kirlia
+ 190, // Aipom
+ 135, // Jolteon
+ 30, // Nidorina
+ 184, // Azumarill
+ 292, // Shedinja
+ 66, // Machop
+ 291, // Ninjask
+ 284, // Masquerain
+ 355, // Duskull
+ 192, // Sunflora
+ 189, // Jumpluff
+ 120, // Staryu
+ 180, // Flaaffy
+ 363, // Spheal
+ 54, // Psyduck
+ 219, // Magcargo
+ 83, // Farfetch’d
+ 41, // Zubat
+ 137, // Porygon
+ 161, // Sentret
+ 318, // Carvanha
+ 44, // Gloom
+ 26, // Raichu
+ 129, // Magikarp
+ 215, // Sneasel
+ 305, // Lairon
+ 256, // Combusken
+ 224, // Octillery
+ 33, // Nidorino
+ 136, // Flareon
+ 225, // Delibird
+ 72, // Tentacool
+ 63, // Abra
+ 253, // Grovyle
+ 340, // Whiscash
+ 156, // Quilava
+ 196, // Espeon
+ 88, // Grimer
+ 152, // Chikorita
+ 326, // Grumpig
+ 299, // Nosepass
+ 53, // Persian
+ 262, // Mightyena
+ 48, // Venonat
+ 82, // Magneton
+ 77, // Ponyta
+ 296, // Makuhita
+ 337, // Lunatone
+ 28, // Sandslash
+ 96, // Drowzee
+ 114, // Tangela
+ 57, // Primeape
+ 165, // Ledyba
+ 40, // Wigglytuff
+ 47, // Parasect
+ 139, // Omastar
+ 294, // Loudred
+ 8, // Wartortle
+ 75, // Graveler
+ 197, // Umbreon
+ 345, // Lileep
+ 61, // Poliwhirl
+ 134, // Vaporeon
+ 15, // Beedrill
+ 105, // Marowak
+ 70, // Weepinbell
+ 369, // Relicanth
+ 111, // Rhyhorn
+ 2, // Ivysaur
+ 352, // Kecleon
+ 274, // Nuzleaf
+ 267, // Beautifly
+ 17, // Pidgeotto
+ 168, // Ariados
+ 86, // Seel
+ 186, // Politoed
+ 159, // Croconaw
+ 113, // Chansey
+ 354, // Banette
+ 232, // Donphan
+ 121, // Starmie
+ 5, // Charmeleon
+ 221, // Piloswine
+ 12, // Butterfree
+ 329, // Vibrava
+ 125, // Electabuzz
+ 342, // Crawdaunt
+ 301, // Delcatty
+ 334, // Altaria
+ 372, // Shelgon
+ 38, // Ninetales
+ 207, // Gligar
+ 364, // Sealeo
+ 327, // Spinda
+ 247, // Pupitar
+ 79, // Slowpoke
+ 338, // Solrock
+ 241, // Miltank
+ 22, // Fearow
+ 45, // Vileplume
+ 89, // Muk
+ 205, // Forretress
+ 185, // Sudowoodo
+ 359, // Absol
+ 193, // Yanma
+ 269, // Dustox
+ 108, // Lickitung
+ 235, // Smeargle
+ 171, // Lanturn
+ 101, // Electrode
+ 271, // Lombre
+ 286, // Breloom
+ 153, // Bayleef
+ 117, // Seadra
+ 110, // Weezing
+ 279, // Pelipper
+ 375, // Metang
+ 31, // Nidoqueen
+ 332, // Cacturne
+ 275, // Shiftry
+ 308, // Medicham
+ 335, // Zangoose
+ 141, // Kabutops
+ 99, // Kingler
+ 64, // Kadabra
+ 119, // Seaking
+ 36, // Clefable
+ 126, // Magmar
+ 202, // Wobbuffet
+ 92, // Gastly
+ 122, // Mr. mime
+ 62, // Poliwrath
+ 128, // Tauros
+ 380, // Latias
+ 181, // Ampharos
+ 288, // Vigoroth
+ 166, // Ledian
+ 76, // Golem
+ 365, // Walrein
+ 84, // Doduo
+ 229, // Houndoom
+ 34, // Nidoking
+ 124, // Jynx
+ 107, // Hitmonchan
+ 234, // Stantler
+ 210, // Granbull
+ 237, // Hitmontop
+ 195, // Quagsire
+ 344, // Claydol
+ 260, // Swampert
+ 242, // Blissey
+ 272, // Ludicolo
+ 295, // Exploud
+ 206, // Dunsparce
+ 127, // Pinsir
+ 91, // Cloyster
+ 67, // Machoke
+ 203, // Girafarig
+ 18, // Pidgeot
+ 178, // Xatu
+ 346, // Cradily
+ 106, // Hitmonlee
+ 49, // Venomoth
+ 94, // Gengar
+ 214, // Heracross
+ 362, // Glalie
+ 123, // Scyther
+ 373, // Salamence
+ 310, // Manectric
+ 348, // Armaldo
+ 65, // Alakazam
+ 97, // Hypno
+ 164, // Noctowl
+ 73, // Tentacruel
+ 356, // Dusclops
+ 145, // Zapdos
+ 42, // Golbat
+ 376, // Metagross
+ 282, // Gardevoir
+ 9, // Blastoise
+ 80, // Slowbro
+ 93, // Haunter
+ 68, // Machamp
+ 377, // Regirock
+ 317, // Swalot
+ 254, // Sceptile
+ 227, // Skarmory
+ 55, // Golduck
+ 386, // Deoxys
+ 71, // Victreebel
+ 78, // Rapidash
+ 6, // Charizard
+ 367, // Huntail
+ 87, // Dewgong
+ 144, // Articuno
+ 157, // Typhlosion
+ 142, // Aerodactyl
+ 368, // Gorebyss
+ 217, // Ursaring
+ 154, // Meganium
+ 378, // Regice
+ 212, // Scizor
+ 230, // Kingdra
+ 147, // Dratini
+ 85, // Dodrio
+ 319, // Sharpedo
+ 169, // Crobat
+ 162, // Furret
+ 59, // Arcanine
+ 243, // Raikou
+ 257, // Blaziken
+ 323, // Camerupt
+ 112, // Rhydon
+ 379, // Registeel
+ 23, // Ekans
+ 330, // Flygon
+ 357, // Tropius
+ 381, // Latios
+ 245, // Suicune
+ 146, // Moltres
+ 3, // Venusaur
+ 103, // Exeggutor
+ 199, // Slowking
+ 248, // Tyranitar
+ 289, // Slaking
+ 320, // Wailmer
+ 150, // Mewtwo
+ 306, // Aggron
+ 143, // Snorlax
+ 226, // Mantine
+ 244, // Entei
+ 149, // Dragonite
+ 115, // Kangaskhan
+ 297, // Hariyama
+ 160, // Feraligatr
+ 131, // Lapras
+ 336, // Seviper
+ 24, // Arbok
+ 383, // Groudon
+ 250, // Ho-Oh
+ 148, // Dragonair
+ 382, // Kyogre
+ 249, // Lugia
+ 350, // Milotic
+ 130, // Gyarados
+ 384, // Rayquaza
+ 95, // Onix
+ 208, // Steelix
+ 321, // Wailord
+};
+const struct OamData gOamData_83A0404 =
+{
+ .y = 160,
+ .affineMode = 0,
+ .objMode = 0,
+ .mosaic = 0,
+ .bpp = 0,
+ .shape = 0,
+ .x = 0,
+ .matrixNum = 0,
+ .size = 0,
+ .tileNum = 0,
+ .priority = 1,
+ .paletteNum = 0,
+ .affineParam = 0,
+};
+const struct OamData gOamData_83A040C =
+{
+ .y = 160,
+ .affineMode = 0,
+ .objMode = 0,
+ .mosaic = 0,
+ .bpp = 0,
+ .shape = 1,
+ .x = 0,
+ .matrixNum = 0,
+ .size = 0,
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0,
+ .affineParam = 0,
+};
+const struct OamData gOamData_83A0414 =
+{
+ .y = 160,
+ .affineMode = 0,
+ .objMode = 0,
+ .mosaic = 0,
+ .bpp = 0,
+ .shape = 1,
+ .x = 0,
+ .matrixNum = 0,
+ .size = 3,
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0,
+ .affineParam = 0,
+};
+const struct OamData gOamData_83A041C =
+{
+ .y = 160,
+ .affineMode = 0,
+ .objMode = 2,
+ .mosaic = 0,
+ .bpp = 0,
+ .shape = 0,
+ .x = 0,
+ .matrixNum = 0,
+ .size = 2,
+ .tileNum = 0,
+ .priority = 1,
+ .paletteNum = 0,
+ .affineParam = 0,
+};
+const struct OamData gOamData_83A0424 =
+{
+ .y = 160,
+ .affineMode = 0,
+ .objMode = 0,
+ .mosaic = 0,
+ .bpp = 0,
+ .shape = 1,
+ .x = 0,
+ .matrixNum = 0,
+ .size = 3,
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0,
+ .affineParam = 0,
+};
+const struct OamData gOamData_83A042C =
+{
+ .y = 160,
+ .affineMode = 0,
+ .objMode = 0,
+ .mosaic = 0,
+ .bpp = 0,
+ .shape = 2,
+ .x = 0,
+ .matrixNum = 0,
+ .size = 0,
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0,
+ .affineParam = 0,
+};
+const union AnimCmd gSpriteAnim_83A0434[] =
+{
+ ANIMCMD_FRAME(3, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A043C[] =
+{
+ ANIMCMD_FRAME(1, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A0444[] =
+{
+ ANIMCMD_FRAME(16, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A044C[] =
+{
+ ANIMCMD_FRAME(32, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A0454[] =
+{
+ ANIMCMD_FRAME(64, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A045C[] =
+{
+ ANIMCMD_FRAME(96, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A0464[] =
+{
+ ANIMCMD_FRAME(128, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A046C[] =
+{
+ ANIMCMD_FRAME(160, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A0474[] =
+{
+ ANIMCMD_FRAME(192, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A047C[] =
+{
+ ANIMCMD_FRAME(224, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A0484[] =
+{
+ ANIMCMD_FRAME(226, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A048C[] =
+{
+ ANIMCMD_FRAME(228, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A0494[] =
+{
+ ANIMCMD_FRAME(230, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A049C[] =
+{
+ ANIMCMD_FRAME(232, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A04A4[] =
+{
+ ANIMCMD_FRAME(234, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A04AC[] =
+{
+ ANIMCMD_FRAME(236, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A04B4[] =
+{
+ ANIMCMD_FRAME(238, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A04BC[] =
+{
+ ANIMCMD_FRAME(240, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A04C4[] =
+{
+ ANIMCMD_FRAME(242, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd gSpriteAnim_83A04CC[] =
+{
+ ANIMCMD_FRAME(4, 30),
+ ANIMCMD_END,
+};
+const union AnimCmd *const gSpriteAnimTable_83A04D4[] =
+{
+ gSpriteAnim_83A0434,
+};
+const union AnimCmd *const gSpriteAnimTable_83A04D8[] =
+{
+ gSpriteAnim_83A043C,
+};
+const union AnimCmd *const gSpriteAnimTable_83A04DC[] =
+{
+ gSpriteAnim_83A0444,
+};
+const union AnimCmd *const gSpriteAnimTable_83A04E0[] =
+{
+ gSpriteAnim_83A044C,
+ gSpriteAnim_83A0454,
+ gSpriteAnim_83A045C,
+ gSpriteAnim_83A0464,
+};
+const union AnimCmd *const gSpriteAnimTable_83A04F0[] =
+{
+ gSpriteAnim_83A046C,
+ gSpriteAnim_83A0474,
+};
+const union AnimCmd *const gSpriteAnimTable_83A04F8[] =
+{
+ gSpriteAnim_83A047C,
+ gSpriteAnim_83A0484,
+ gSpriteAnim_83A048C,
+ gSpriteAnim_83A0494,
+ gSpriteAnim_83A049C,
+ gSpriteAnim_83A04A4,
+ gSpriteAnim_83A04AC,
+ gSpriteAnim_83A04B4,
+ gSpriteAnim_83A04BC,
+ gSpriteAnim_83A04C4,
+};
+const union AnimCmd *const gSpriteAnimTable_83A0520[] =
+{
+ gSpriteAnim_83A04CC,
+};
void sub_8090B8C(u8);
void sub_8090C28(struct Sprite *);
@@ -896,11 +2324,11 @@ bool8 sub_808D344(u8 a)
void sub_808D640(void)
{
if (gPokedexView->unk64C_1)
- LoadPalette(gUnknown_0839F67C + 1, 1, 0xBE);
+ LoadPalette(gUnknown_0839F67C + 1, 1, sizeof(gUnknown_0839F67C) - sizeof(u16));
else if (!IsNationalPokedexEnabled())
LoadPalette(gPokedexMenu_Pal + 1, 1, 0xBE);
else
- LoadPalette(gUnknown_0839F73C + 0x2, 1, 0xBE);
+ LoadPalette(gUnknown_0839F73C + 1, 1, sizeof(gUnknown_0839F73C) - sizeof(u16));
}
void SortPokedex(u8 dexMode, u8 sortMode)
@@ -3154,115 +4582,115 @@ __attribute__((naked))
void sub_8090750(u8 taskId)
{
asm(".syntax unified\n\
- push {r4-r7,lr}\n\
- sub sp, 0x8\n\
- lsls r0, 24\n\
- lsrs r7, r0, 24\n\
- ldr r1, _08090778 @ =gTasks\n\
- lsls r0, r7, 2\n\
- adds r0, r7\n\
- lsls r0, 3\n\
- adds r0, r1\n\
- ldrh r6, [r0, 0xA]\n\
- movs r2, 0x8\n\
- ldrsh r0, [r0, r2]\n\
- adds r4, r1, 0\n\
- cmp r0, 0x6\n\
- bhi _0809079C\n\
- lsls r0, 2\n\
- ldr r1, _0809077C @ =_08090780\n\
- adds r0, r1\n\
- ldr r0, [r0]\n\
- mov pc, r0\n\
- .align 2, 0\n\
+ push {r4-r7,lr}\n\
+ sub sp, 0x8\n\
+ lsls r0, 24\n\
+ lsrs r7, r0, 24\n\
+ ldr r1, _08090778 @ =gTasks\n\
+ lsls r0, r7, 2\n\
+ adds r0, r7\n\
+ lsls r0, 3\n\
+ adds r0, r1\n\
+ ldrh r6, [r0, 0xA]\n\
+ movs r2, 0x8\n\
+ ldrsh r0, [r0, r2]\n\
+ adds r4, r1, 0\n\
+ cmp r0, 0x6\n\
+ bhi _0809079C\n\
+ lsls r0, 2\n\
+ ldr r1, _0809077C @ =_08090780\n\
+ adds r0, r1\n\
+ ldr r0, [r0]\n\
+ mov pc, r0\n\
+ .align 2, 0\n\
_08090778: .4byte gTasks\n\
_0809077C: .4byte _08090780\n\
- .align 2, 0\n\
+ .align 2, 0\n\
_08090780:\n\
- .4byte _0809079C\n\
- .4byte _080907E0\n\
- .4byte _0809085C\n\
- .4byte _080908A0\n\
- .4byte _08090960\n\
- .4byte _080909B8\n\
- .4byte _080909F4\n\
+ .4byte _0809079C\n\
+ .4byte _080907E0\n\
+ .4byte _0809085C\n\
+ .4byte _080908A0\n\
+ .4byte _08090960\n\
+ .4byte _080909B8\n\
+ .4byte _080909F4\n\
_0809079C:\n\
- ldr r0, _080907D0 @ =gPaletteFade\n\
- ldrb r1, [r0, 0x7]\n\
- movs r0, 0x80\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- beq _080907AA\n\
- b _08090A26\n\
+ ldr r0, _080907D0 @ =gPaletteFade\n\
+ ldrb r1, [r0, 0x7]\n\
+ movs r0, 0x80\n\
+ ands r0, r1\n\
+ cmp r0, 0\n\
+ beq _080907AA\n\
+ b _08090A26\n\
_080907AA:\n\
- ldr r1, _080907D4 @ =gUnknown_03005CEC\n\
- ldr r0, _080907D8 @ =gMain\n\
- ldr r0, [r0, 0xC]\n\
- str r0, [r1]\n\
- movs r0, 0\n\
- bl SetVBlankCallback\n\
- movs r0, 0x80\n\
- lsls r0, 1\n\
- bl sub_8091060\n\
- ldr r1, _080907DC @ =gTasks\n\
- lsls r0, r7, 2\n\
- adds r0, r7\n\
- lsls r0, 3\n\
- adds r0, r1\n\
- movs r1, 0x1\n\
- strh r1, [r0, 0x8]\n\
- b _08090A26\n\
- .align 2, 0\n\
+ ldr r1, _080907D4 @ =gUnknown_03005CEC\n\
+ ldr r0, _080907D8 @ =gMain\n\
+ ldr r0, [r0, 0xC]\n\
+ str r0, [r1]\n\
+ movs r0, 0\n\
+ bl SetVBlankCallback\n\
+ movs r0, 0x80\n\
+ lsls r0, 1\n\
+ bl sub_8091060\n\
+ ldr r1, _080907DC @ =gTasks\n\
+ lsls r0, r7, 2\n\
+ adds r0, r7\n\
+ lsls r0, 3\n\
+ adds r0, r1\n\
+ movs r1, 0x1\n\
+ strh r1, [r0, 0x8]\n\
+ b _08090A26\n\
+ .align 2, 0\n\
_080907D0: .4byte gPaletteFade\n\
_080907D4: .4byte gUnknown_03005CEC\n\
_080907D8: .4byte gMain\n\
_080907DC: .4byte gTasks\n\
_080907E0:\n\
- ldr r0, _08090840 @ =gPokedexMenu_Gfx\n\
- ldr r1, _08090844 @ =0x06004000\n\
- bl LZ77UnCompVram\n\
- ldr r0, _08090848 @ =gUnknown_08E96BD4\n\
- ldr r4, _0809084C @ =0x06007800\n\
- adds r1, r4, 0\n\
- bl LZ77UnCompVram\n\
- movs r2, 0\n\
- lsls r5, r7, 2\n\
- mov r12, r5\n\
- movs r0, 0x80\n\
- lsls r0, 6\n\
- adds r6, r0, 0\n\
- ldr r3, _08090850 @ =0x0000027f\n\
+ ldr r0, _08090840 @ =gPokedexMenu_Gfx\n\
+ ldr r1, _08090844 @ =0x06004000\n\
+ bl LZ77UnCompVram\n\
+ ldr r0, _08090848 @ =gUnknown_08E96BD4\n\
+ ldr r4, _0809084C @ =0x06007800\n\
+ adds r1, r4, 0\n\
+ bl LZ77UnCompVram\n\
+ movs r2, 0\n\
+ lsls r5, r7, 2\n\
+ mov r12, r5\n\
+ movs r0, 0x80\n\
+ lsls r0, 6\n\
+ adds r6, r0, 0\n\
+ ldr r3, _08090850 @ =0x0000027f\n\
_08090800:\n\
- lsls r0, r2, 1\n\
- adds r0, r4\n\
- ldrh r5, [r0]\n\
- adds r1, r6, r5\n\
- strh r1, [r0]\n\
- adds r0, r2, 0x1\n\
- lsls r0, 16\n\
- lsrs r2, r0, 16\n\
- cmp r2, r3\n\
- bls _08090800\n\
- ldr r0, _08090854 @ =gTasks\n\
- mov r1, r12\n\
- adds r4, r1, r7\n\
- lsls r4, 3\n\
- adds r4, r0\n\
- ldrh r0, [r4, 0xA]\n\
- movs r2, 0xFF\n\
- lsls r2, 2\n\
- movs r1, 0x2\n\
- bl sub_8091738\n\
- bl ResetPaletteFade\n\
- ldr r0, _08090858 @ =gPokedexMenu_Pal + 0x2\n\
- movs r1, 0x21\n\
- movs r2, 0x9E\n\
- bl LoadPalette\n\
- ldrh r0, [r4, 0x8]\n\
- adds r0, 0x1\n\
- strh r0, [r4, 0x8]\n\
- b _08090A26\n\
- .align 2, 0\n\
+ lsls r0, r2, 1\n\
+ adds r0, r4\n\
+ ldrh r5, [r0]\n\
+ adds r1, r6, r5\n\
+ strh r1, [r0]\n\
+ adds r0, r2, 0x1\n\
+ lsls r0, 16\n\
+ lsrs r2, r0, 16\n\
+ cmp r2, r3\n\
+ bls _08090800\n\
+ ldr r0, _08090854 @ =gTasks\n\
+ mov r1, r12\n\
+ adds r4, r1, r7\n\
+ lsls r4, 3\n\
+ adds r4, r0\n\
+ ldrh r0, [r4, 0xA]\n\
+ movs r2, 0xFF\n\
+ lsls r2, 2\n\
+ movs r1, 0x2\n\
+ bl sub_8091738\n\
+ bl ResetPaletteFade\n\
+ ldr r0, _08090858 @ =gPokedexMenu_Pal + 0x2\n\
+ movs r1, 0x21\n\
+ movs r2, 0x9E\n\
+ bl LoadPalette\n\
+ ldrh r0, [r4, 0x8]\n\
+ adds r0, 0x1\n\
+ strh r0, [r4, 0x8]\n\
+ b _08090A26\n\
+ .align 2, 0\n\
_08090840: .4byte gPokedexMenu_Gfx\n\
_08090844: .4byte 0x06004000\n\
_08090848: .4byte gUnknown_08E96BD4\n\
@@ -3271,213 +4699,213 @@ _08090850: .4byte 0x0000027f\n\
_08090854: .4byte gTasks\n\
_08090858: .4byte gPokedexMenu_Pal + 0x2\n\
_0809085C:\n\
- ldr r4, _0809088C @ =gWindowConfig_81E7064\n\
- adds r0, r4, 0\n\
- bl SetUpWindowConfig\n\
- adds r0, r4, 0\n\
- bl InitMenuWindow\n\
- ldr r2, _08090890 @ =0x0600c000\n\
- add r1, sp, 0x4\n\
- movs r0, 0\n\
- strh r0, [r1]\n\
- ldr r0, _08090894 @ =0x040000d4\n\
- str r1, [r0]\n\
- str r2, [r0, 0x4]\n\
- ldr r1, _08090898 @ =0x81000100\n\
- str r1, [r0, 0x8]\n\
- ldr r0, [r0, 0x8]\n\
- ldr r1, _0809089C @ =gTasks\n\
- lsls r0, r7, 2\n\
- adds r0, r7\n\
- lsls r0, 3\n\
- adds r0, r1\n\
- b _080909E0\n\
- .align 2, 0\n\
+ ldr r4, _0809088C @ =gWindowConfig_81E7064\n\
+ adds r0, r4, 0\n\
+ bl SetUpWindowConfig\n\
+ adds r0, r4, 0\n\
+ bl InitMenuWindow\n\
+ ldr r2, _08090890 @ =0x0600c000\n\
+ add r1, sp, 0x4\n\
+ movs r0, 0\n\
+ strh r0, [r1]\n\
+ ldr r0, _08090894 @ =0x040000d4\n\
+ str r1, [r0]\n\
+ str r2, [r0, 0x4]\n\
+ ldr r1, _08090898 @ =0x81000100\n\
+ str r1, [r0, 0x8]\n\
+ ldr r0, [r0, 0x8]\n\
+ ldr r1, _0809089C @ =gTasks\n\
+ lsls r0, r7, 2\n\
+ adds r0, r7\n\
+ lsls r0, 3\n\
+ adds r0, r1\n\
+ b _080909E0\n\
+ .align 2, 0\n\
_0809088C: .4byte gWindowConfig_81E7064\n\
_08090890: .4byte 0x0600c000\n\
_08090894: .4byte 0x040000d4\n\
_08090898: .4byte 0x81000100\n\
_0809089C: .4byte gTasks\n\
_080908A0:\n\
- ldr r0, _080908C8 @ =gDexText_RegisterComplete\n\
- movs r1, 0x2\n\
- movs r2, 0\n\
- movs r3, 0xD0\n\
- bl sub_8072BD8\n\
- bl IsNationalPokedexEnabled\n\
- cmp r0, 0\n\
- bne _080908CC\n\
- adds r0, r6, 0\n\
- bl NationalToHoennOrder\n\
- lsls r0, 16\n\
- lsrs r0, 16\n\
- movs r1, 0xD\n\
- movs r2, 0x3\n\
- bl sub_8091154\n\
- b _080908D6\n\
- .align 2, 0\n\
+ ldr r0, _080908C8 @ =gDexText_RegisterComplete\n\
+ movs r1, 0x2\n\
+ movs r2, 0\n\
+ movs r3, 0xD0\n\
+ bl sub_8072BD8\n\
+ bl IsNationalPokedexEnabled\n\
+ cmp r0, 0\n\
+ bne _080908CC\n\
+ adds r0, r6, 0\n\
+ bl NationalToHoennOrder\n\
+ lsls r0, 16\n\
+ lsrs r0, 16\n\
+ movs r1, 0xD\n\
+ movs r2, 0x3\n\
+ bl sub_8091154\n\
+ b _080908D6\n\
+ .align 2, 0\n\
_080908C8: .4byte gDexText_RegisterComplete\n\
_080908CC:\n\
- adds r0, r6, 0\n\
- movs r1, 0xD\n\
- movs r2, 0x3\n\
- bl sub_8091154\n\
+ adds r0, r6, 0\n\
+ movs r1, 0xD\n\
+ movs r2, 0x3\n\
+ bl sub_8091154\n\
_080908D6:\n\
- adds r0, r6, 0\n\
- movs r1, 0x10\n\
- movs r2, 0x3\n\
- bl sub_80911C8\n\
- ldr r0, _0809094C @ =gDexText_UnknownPoke\n\
- movs r1, 0xB\n\
- movs r2, 0x5\n\
- bl MenuPrint\n\
- ldr r0, _08090950 @ =gDexText_UnknownHeight\n\
- movs r1, 0x10\n\
- movs r2, 0x7\n\
- bl MenuPrint\n\
- ldr r0, _08090954 @ =gDexText_UnknownWeight\n\
- movs r1, 0x10\n\
- movs r2, 0x9\n\
- bl MenuPrint\n\
- lsls r4, r6, 3\n\
- adds r4, r6\n\
- lsls r4, 2\n\
- ldr r6, _08090958 @ =gPokedexEntries\n\
- adds r5, r4, r6\n\
- adds r0, r5, 0\n\
- movs r1, 0xB\n\
- movs r2, 0x5\n\
- bl sub_8091304\n\
- ldrh r0, [r5, 0xC]\n\
- movs r1, 0x10\n\
- movs r2, 0x7\n\
- bl sub_8091458\n\
- ldrh r0, [r5, 0xE]\n\
- movs r1, 0x10\n\
- movs r2, 0x9\n\
- bl sub_8091564\n\
- adds r6, 0x10\n\
- adds r4, r6\n\
- ldr r0, [r4]\n\
- movs r1, 0x2\n\
- movs r2, 0xD\n\
- bl MenuPrint\n\
- movs r1, 0xFF\n\
- lsls r1, 2\n\
- movs r0, 0xE\n\
- bl sub_80917CC\n\
- ldr r1, _0809095C @ =gTasks\n\
- lsls r0, r7, 2\n\
- adds r0, r7\n\
- lsls r0, 3\n\
- adds r0, r1\n\
- b _080909E0\n\
- .align 2, 0\n\
+ adds r0, r6, 0\n\
+ movs r1, 0x10\n\
+ movs r2, 0x3\n\
+ bl sub_80911C8\n\
+ ldr r0, _0809094C @ =gDexText_UnknownPoke\n\
+ movs r1, 0xB\n\
+ movs r2, 0x5\n\
+ bl MenuPrint\n\
+ ldr r0, _08090950 @ =gDexText_UnknownHeight\n\
+ movs r1, 0x10\n\
+ movs r2, 0x7\n\
+ bl MenuPrint\n\
+ ldr r0, _08090954 @ =gDexText_UnknownWeight\n\
+ movs r1, 0x10\n\
+ movs r2, 0x9\n\
+ bl MenuPrint\n\
+ lsls r4, r6, 3\n\
+ adds r4, r6\n\
+ lsls r4, 2\n\
+ ldr r6, _08090958 @ =gPokedexEntries\n\
+ adds r5, r4, r6\n\
+ adds r0, r5, 0\n\
+ movs r1, 0xB\n\
+ movs r2, 0x5\n\
+ bl sub_8091304\n\
+ ldrh r0, [r5, 0xC]\n\
+ movs r1, 0x10\n\
+ movs r2, 0x7\n\
+ bl sub_8091458\n\
+ ldrh r0, [r5, 0xE]\n\
+ movs r1, 0x10\n\
+ movs r2, 0x9\n\
+ bl sub_8091564\n\
+ adds r6, 0x10\n\
+ adds r4, r6\n\
+ ldr r0, [r4]\n\
+ movs r1, 0x2\n\
+ movs r2, 0xD\n\
+ bl MenuPrint\n\
+ movs r1, 0xFF\n\
+ lsls r1, 2\n\
+ movs r0, 0xE\n\
+ bl sub_80917CC\n\
+ ldr r1, _0809095C @ =gTasks\n\
+ lsls r0, r7, 2\n\
+ adds r0, r7\n\
+ lsls r0, 3\n\
+ adds r0, r1\n\
+ b _080909E0\n\
+ .align 2, 0\n\
_0809094C: .4byte gDexText_UnknownPoke\n\
_08090950: .4byte gDexText_UnknownHeight\n\
_08090954: .4byte gDexText_UnknownWeight\n\
_08090958: .4byte gPokedexEntries\n\
_0809095C: .4byte gTasks\n\
_08090960:\n\
- adds r0, r6, 0\n\
- movs r1, 0x30\n\
- movs r2, 0x38\n\
- movs r3, 0\n\
- bl sub_80918EC\n\
- adds r4, r0, 0\n\
- lsls r4, 24\n\
- lsrs r4, 24\n\
- ldr r0, _080909AC @ =gSprites\n\
- lsls r1, r4, 4\n\
- adds r1, r4\n\
- lsls r1, 2\n\
- adds r1, r0\n\
- ldrb r2, [r1, 0x5]\n\
- movs r0, 0xD\n\
- negs r0, r0\n\
- ands r0, r2\n\
- strb r0, [r1, 0x5]\n\
- movs r0, 0x1\n\
- negs r0, r0\n\
- movs r1, 0\n\
- str r1, [sp]\n\
- movs r2, 0x10\n\
- movs r3, 0\n\
- bl BeginNormalPaletteFade\n\
- ldr r0, _080909B0 @ =gUnknown_03005CEC\n\
- ldr r0, [r0]\n\
- bl SetVBlankCallback\n\
- ldr r1, _080909B4 @ =gTasks\n\
- lsls r0, r7, 2\n\
- adds r0, r7\n\
- lsls r0, 3\n\
- adds r0, r1\n\
- strh r4, [r0, 0xE]\n\
- b _080909E0\n\
- .align 2, 0\n\
+ adds r0, r6, 0\n\
+ movs r1, 0x30\n\
+ movs r2, 0x38\n\
+ movs r3, 0\n\
+ bl sub_80918EC\n\
+ adds r4, r0, 0\n\
+ lsls r4, 24\n\
+ lsrs r4, 24\n\
+ ldr r0, _080909AC @ =gSprites\n\
+ lsls r1, r4, 4\n\
+ adds r1, r4\n\
+ lsls r1, 2\n\
+ adds r1, r0\n\
+ ldrb r2, [r1, 0x5]\n\
+ movs r0, 0xD\n\
+ negs r0, r0\n\
+ ands r0, r2\n\
+ strb r0, [r1, 0x5]\n\
+ movs r0, 0x1\n\
+ negs r0, r0\n\
+ movs r1, 0\n\
+ str r1, [sp]\n\
+ movs r2, 0x10\n\
+ movs r3, 0\n\
+ bl BeginNormalPaletteFade\n\
+ ldr r0, _080909B0 @ =gUnknown_03005CEC\n\
+ ldr r0, [r0]\n\
+ bl SetVBlankCallback\n\
+ ldr r1, _080909B4 @ =gTasks\n\
+ lsls r0, r7, 2\n\
+ adds r0, r7\n\
+ lsls r0, 3\n\
+ adds r0, r1\n\
+ strh r4, [r0, 0xE]\n\
+ b _080909E0\n\
+ .align 2, 0\n\
_080909AC: .4byte gSprites\n\
_080909B0: .4byte gUnknown_03005CEC\n\
_080909B4: .4byte gTasks\n\
_080909B8:\n\
- ldr r0, _080909E8 @ =REG_BLDCNT\n\
- movs r1, 0\n\
- strh r1, [r0]\n\
- adds r0, 0x2\n\
- strh r1, [r0]\n\
- adds r0, 0x2\n\
- strh r1, [r0]\n\
- ldr r1, _080909EC @ =REG_BG3CNT\n\
- ldr r2, _080909F0 @ =0x00000f07\n\
- adds r0, r2, 0\n\
- strh r0, [r1]\n\
- subs r1, 0xE\n\
- movs r5, 0xE2\n\
- lsls r5, 5\n\
- adds r0, r5, 0\n\
- strh r0, [r1]\n\
- lsls r0, r7, 2\n\
- adds r0, r7\n\
- lsls r0, 3\n\
- adds r0, r4\n\
+ ldr r0, _080909E8 @ =REG_BLDCNT\n\
+ movs r1, 0\n\
+ strh r1, [r0]\n\
+ adds r0, 0x2\n\
+ strh r1, [r0]\n\
+ adds r0, 0x2\n\
+ strh r1, [r0]\n\
+ ldr r1, _080909EC @ =REG_BG3CNT\n\
+ ldr r2, _080909F0 @ =0x00000f07\n\
+ adds r0, r2, 0\n\
+ strh r0, [r1]\n\
+ subs r1, 0xE\n\
+ movs r5, 0xE2\n\
+ lsls r5, 5\n\
+ adds r0, r5, 0\n\
+ strh r0, [r1]\n\
+ lsls r0, r7, 2\n\
+ adds r0, r7\n\
+ lsls r0, 3\n\
+ adds r0, r4\n\
_080909E0:\n\
- ldrh r1, [r0, 0x8]\n\
- adds r1, 0x1\n\
- strh r1, [r0, 0x8]\n\
- b _08090A26\n\
- .align 2, 0\n\
+ ldrh r1, [r0, 0x8]\n\
+ adds r1, 0x1\n\
+ strh r1, [r0, 0x8]\n\
+ b _08090A26\n\
+ .align 2, 0\n\
_080909E8: .4byte 0x04000050\n\
_080909EC: .4byte 0x0400000E\n\
_080909F0: .4byte 0x00000f07\n\
_080909F4:\n\
- ldr r0, _08090A30 @ =gPaletteFade\n\
- ldrb r1, [r0, 0x7]\n\
- movs r0, 0x80\n\
- ands r0, r1\n\
- lsls r0, 24\n\
- lsrs r5, r0, 24\n\
- cmp r5, 0\n\
- bne _08090A26\n\
- adds r0, r6, 0\n\
- bl NationalPokedexNumToSpecies\n\
- lsls r0, 16\n\
- lsrs r0, 16\n\
- movs r1, 0\n\
- bl PlayCry1\n\
- ldr r1, _08090A34 @ =gTasks\n\
- lsls r0, r7, 2\n\
- adds r0, r7\n\
- lsls r0, 3\n\
- adds r0, r1\n\
- strh r5, [r0, 0xC]\n\
- strh r5, [r0, 0x10]\n\
- ldr r1, _08090A38 @ =sub_8090A3C\n\
- str r1, [r0]\n\
+ ldr r0, _08090A30 @ =gPaletteFade\n\
+ ldrb r1, [r0, 0x7]\n\
+ movs r0, 0x80\n\
+ ands r0, r1\n\
+ lsls r0, 24\n\
+ lsrs r5, r0, 24\n\
+ cmp r5, 0\n\
+ bne _08090A26\n\
+ adds r0, r6, 0\n\
+ bl NationalPokedexNumToSpecies\n\
+ lsls r0, 16\n\
+ lsrs r0, 16\n\
+ movs r1, 0\n\
+ bl PlayCry1\n\
+ ldr r1, _08090A34 @ =gTasks\n\
+ lsls r0, r7, 2\n\
+ adds r0, r7\n\
+ lsls r0, 3\n\
+ adds r0, r1\n\
+ strh r5, [r0, 0xC]\n\
+ strh r5, [r0, 0x10]\n\
+ ldr r1, _08090A38 @ =sub_8090A3C\n\
+ str r1, [r0]\n\
_08090A26:\n\
- add sp, 0x8\n\
- pop {r4-r7}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
+ add sp, 0x8\n\
+ pop {r4-r7}\n\
+ pop {r0}\n\
+ bx r0\n\
+ .align 2, 0\n\
_08090A30: .4byte gPaletteFade\n\
_08090A34: .4byte gTasks\n\
_08090A38: .4byte sub_8090A3C\n\
@@ -4677,49 +6105,49 @@ __attribute__((naked))
void sub_8092810(u8 a, u8 b, u8 c, u8 d)
{
asm(".syntax unified\n\
- push {r4-r7,lr}\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- lsls r1, 24\n\
- lsrs r1, 24\n\
- mov r12, r1\n\
- lsls r2, 24\n\
- lsrs r1, r2, 24\n\
- lsls r3, 24\n\
- lsrs r5, r3, 8\n\
- movs r3, 0\n\
- cmp r5, 0\n\
- beq _0809285A\n\
- lsls r7, r1, 6\n\
- ldr r6, _08092860 @ =0x00000fff\n\
- lsls r4, r0, 12\n\
+ push {r4-r7,lr}\n\
+ lsls r0, 24\n\
+ lsrs r0, 24\n\
+ lsls r1, 24\n\
+ lsrs r1, 24\n\
+ mov r12, r1\n\
+ lsls r2, 24\n\
+ lsrs r1, r2, 24\n\
+ lsls r3, 24\n\
+ lsrs r5, r3, 8\n\
+ movs r3, 0\n\
+ cmp r5, 0\n\
+ beq _0809285A\n\
+ lsls r7, r1, 6\n\
+ ldr r6, _08092860 @ =0x00000fff\n\
+ lsls r4, r0, 12\n\
_08092830:\n\
- mov r0, r12\n\
- adds r1, r0, r3\n\
- lsls r1, 1\n\
- adds r1, r7, r1\n\
- ldr r0, _08092864 @ =0x06007800\n\
- adds r2, r1, r0\n\
- ldrh r0, [r2]\n\
- ands r0, r6\n\
- orrs r0, r4\n\
- strh r0, [r2]\n\
- ldr r0, _08092868 @ =0x06007840\n\
- adds r1, r0\n\
- ldrh r0, [r1]\n\
- ands r0, r6\n\
- orrs r0, r4\n\
- strh r0, [r1]\n\
- adds r0, r3, 0x1\n\
- lsls r0, 16\n\
- lsrs r3, r0, 16\n\
- cmp r0, r5\n\
- bcc _08092830\n\
+ mov r0, r12\n\
+ adds r1, r0, r3\n\
+ lsls r1, 1\n\
+ adds r1, r7, r1\n\
+ ldr r0, _08092864 @ =0x06007800\n\
+ adds r2, r1, r0\n\
+ ldrh r0, [r2]\n\
+ ands r0, r6\n\
+ orrs r0, r4\n\
+ strh r0, [r2]\n\
+ ldr r0, _08092868 @ =0x06007840\n\
+ adds r1, r0\n\
+ ldrh r0, [r1]\n\
+ ands r0, r6\n\
+ orrs r0, r4\n\
+ strh r0, [r1]\n\
+ adds r0, r3, 0x1\n\
+ lsls r0, 16\n\
+ lsrs r3, r0, 16\n\
+ cmp r0, r5\n\
+ bcc _08092830\n\
_0809285A:\n\
- pop {r4-r7}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
+ pop {r4-r7}\n\
+ pop {r0}\n\
+ bx r0\n\
+ .align 2, 0\n\
_08092860: .4byte 0x00000fff\n\
_08092864: .4byte 0x06007800\n\
_08092868: .4byte 0x06007840\n\
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 09:49:41 +0000