This commit is contained in:
ProjectRevoTPP
2017-06-15 22:08:57 -04:00
18 changed files with 16571 additions and 12707 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,415 +0,0 @@
.align 2
gMonFootprintTable:: @ 83B4EE4
.4byte gMonFootprint_Bulbasaur
.4byte gMonFootprint_Bulbasaur
.4byte gMonFootprint_Ivysaur
.4byte gMonFootprint_Venusaur
.4byte gMonFootprint_Charmander
.4byte gMonFootprint_Charmeleon
.4byte gMonFootprint_Charizard
.4byte gMonFootprint_Squirtle
.4byte gMonFootprint_Wartortle
.4byte gMonFootprint_Blastoise
.4byte gMonFootprint_Caterpie
.4byte gMonFootprint_Metapod
.4byte gMonFootprint_Butterfree
.4byte gMonFootprint_Weedle
.4byte gMonFootprint_Kakuna
.4byte gMonFootprint_Beedrill
.4byte gMonFootprint_Pidgey
.4byte gMonFootprint_Pidgeotto
.4byte gMonFootprint_Pidgeot
.4byte gMonFootprint_Rattata
.4byte gMonFootprint_Raticate
.4byte gMonFootprint_Spearow
.4byte gMonFootprint_Fearow
.4byte gMonFootprint_Ekans
.4byte gMonFootprint_Arbok
.4byte gMonFootprint_Pikachu
.4byte gMonFootprint_Raichu
.4byte gMonFootprint_Sandshrew
.4byte gMonFootprint_Sandslash
.4byte gMonFootprint_NidoranF
.4byte gMonFootprint_Nidorina
.4byte gMonFootprint_Nidoqueen
.4byte gMonFootprint_NidoranM
.4byte gMonFootprint_Nidorino
.4byte gMonFootprint_Nidoking
.4byte gMonFootprint_Clefairy
.4byte gMonFootprint_Clefable
.4byte gMonFootprint_Vulpix
.4byte gMonFootprint_Ninetales
.4byte gMonFootprint_Jigglypuff
.4byte gMonFootprint_Wigglytuff
.4byte gMonFootprint_Zubat
.4byte gMonFootprint_Golbat
.4byte gMonFootprint_Oddish
.4byte gMonFootprint_Gloom
.4byte gMonFootprint_Vileplume
.4byte gMonFootprint_Paras
.4byte gMonFootprint_Parasect
.4byte gMonFootprint_Venonat
.4byte gMonFootprint_Venomoth
.4byte gMonFootprint_Diglett
.4byte gMonFootprint_Dugtrio
.4byte gMonFootprint_Meowth
.4byte gMonFootprint_Persian
.4byte gMonFootprint_Psyduck
.4byte gMonFootprint_Golduck
.4byte gMonFootprint_Mankey
.4byte gMonFootprint_Primeape
.4byte gMonFootprint_Growlithe
.4byte gMonFootprint_Arcanine
.4byte gMonFootprint_Poliwag
.4byte gMonFootprint_Poliwhirl
.4byte gMonFootprint_Poliwrath
.4byte gMonFootprint_Abra
.4byte gMonFootprint_Kadabra
.4byte gMonFootprint_Alakazam
.4byte gMonFootprint_Machop
.4byte gMonFootprint_Machoke
.4byte gMonFootprint_Machamp
.4byte gMonFootprint_Bellsprout
.4byte gMonFootprint_Weepinbell
.4byte gMonFootprint_Victreebel
.4byte gMonFootprint_Tentacool
.4byte gMonFootprint_Tentacruel
.4byte gMonFootprint_Geodude
.4byte gMonFootprint_Graveler
.4byte gMonFootprint_Golem
.4byte gMonFootprint_Ponyta
.4byte gMonFootprint_Rapidash
.4byte gMonFootprint_Slowpoke
.4byte gMonFootprint_Slowbro
.4byte gMonFootprint_Magnemite
.4byte gMonFootprint_Magneton
.4byte gMonFootprint_Farfetchd
.4byte gMonFootprint_Doduo
.4byte gMonFootprint_Dodrio
.4byte gMonFootprint_Seel
.4byte gMonFootprint_Dewgong
.4byte gMonFootprint_Grimer
.4byte gMonFootprint_Muk
.4byte gMonFootprint_Shellder
.4byte gMonFootprint_Cloyster
.4byte gMonFootprint_Gastly
.4byte gMonFootprint_Haunter
.4byte gMonFootprint_Gengar
.4byte gMonFootprint_Onix
.4byte gMonFootprint_Drowzee
.4byte gMonFootprint_Hypno
.4byte gMonFootprint_Krabby
.4byte gMonFootprint_Kingler
.4byte gMonFootprint_Voltorb
.4byte gMonFootprint_Electrode
.4byte gMonFootprint_Exeggcute
.4byte gMonFootprint_Exeggutor
.4byte gMonFootprint_Cubone
.4byte gMonFootprint_Marowak
.4byte gMonFootprint_Hitmonlee
.4byte gMonFootprint_Hitmonchan
.4byte gMonFootprint_Lickitung
.4byte gMonFootprint_Koffing
.4byte gMonFootprint_Weezing
.4byte gMonFootprint_Rhyhorn
.4byte gMonFootprint_Rhydon
.4byte gMonFootprint_Chansey
.4byte gMonFootprint_Tangela
.4byte gMonFootprint_Kangaskhan
.4byte gMonFootprint_Horsea
.4byte gMonFootprint_Seadra
.4byte gMonFootprint_Goldeen
.4byte gMonFootprint_Seaking
.4byte gMonFootprint_Staryu
.4byte gMonFootprint_Starmie
.4byte gMonFootprint_Mrmime
.4byte gMonFootprint_Scyther
.4byte gMonFootprint_Jynx
.4byte gMonFootprint_Electabuzz
.4byte gMonFootprint_Magmar
.4byte gMonFootprint_Pinsir
.4byte gMonFootprint_Tauros
.4byte gMonFootprint_Magikarp
.4byte gMonFootprint_Gyarados
.4byte gMonFootprint_Lapras
.4byte gMonFootprint_Ditto
.4byte gMonFootprint_Eevee
.4byte gMonFootprint_Vaporeon
.4byte gMonFootprint_Jolteon
.4byte gMonFootprint_Flareon
.4byte gMonFootprint_Porygon
.4byte gMonFootprint_Omanyte
.4byte gMonFootprint_Omastar
.4byte gMonFootprint_Kabuto
.4byte gMonFootprint_Kabutops
.4byte gMonFootprint_Aerodactyl
.4byte gMonFootprint_Snorlax
.4byte gMonFootprint_Articuno
.4byte gMonFootprint_Zapdos
.4byte gMonFootprint_Moltres
.4byte gMonFootprint_Dratini
.4byte gMonFootprint_Dragonair
.4byte gMonFootprint_Dragonite
.4byte gMonFootprint_Mewtwo
.4byte gMonFootprint_Mew
.4byte gMonFootprint_Chikorita
.4byte gMonFootprint_Bayleef
.4byte gMonFootprint_Meganium
.4byte gMonFootprint_Cyndaquil
.4byte gMonFootprint_Quilava
.4byte gMonFootprint_Typhlosion
.4byte gMonFootprint_Totodile
.4byte gMonFootprint_Croconaw
.4byte gMonFootprint_Feraligatr
.4byte gMonFootprint_Sentret
.4byte gMonFootprint_Furret
.4byte gMonFootprint_Hoothoot
.4byte gMonFootprint_Noctowl
.4byte gMonFootprint_Ledyba
.4byte gMonFootprint_Ledian
.4byte gMonFootprint_Spinarak
.4byte gMonFootprint_Ariados
.4byte gMonFootprint_Crobat
.4byte gMonFootprint_Chinchou
.4byte gMonFootprint_Lanturn
.4byte gMonFootprint_Pichu
.4byte gMonFootprint_Cleffa
.4byte gMonFootprint_Igglybuff
.4byte gMonFootprint_Togepi
.4byte gMonFootprint_Togetic
.4byte gMonFootprint_Natu
.4byte gMonFootprint_Xatu
.4byte gMonFootprint_Mareep
.4byte gMonFootprint_Flaaffy
.4byte gMonFootprint_Ampharos
.4byte gMonFootprint_Bellossom
.4byte gMonFootprint_Marill
.4byte gMonFootprint_Azumarill
.4byte gMonFootprint_Sudowoodo
.4byte gMonFootprint_Politoed
.4byte gMonFootprint_Hoppip
.4byte gMonFootprint_Skiploom
.4byte gMonFootprint_Jumpluff
.4byte gMonFootprint_Aipom
.4byte gMonFootprint_Sunkern
.4byte gMonFootprint_Sunflora
.4byte gMonFootprint_Yanma
.4byte gMonFootprint_Wooper
.4byte gMonFootprint_Quagsire
.4byte gMonFootprint_Espeon
.4byte gMonFootprint_Umbreon
.4byte gMonFootprint_Murkrow
.4byte gMonFootprint_Slowking
.4byte gMonFootprint_Misdreavus
.4byte gMonFootprint_Unown
.4byte gMonFootprint_Wobbuffet
.4byte gMonFootprint_Girafarig
.4byte gMonFootprint_Pineco
.4byte gMonFootprint_Forretress
.4byte gMonFootprint_Dunsparce
.4byte gMonFootprint_Gligar
.4byte gMonFootprint_Steelix
.4byte gMonFootprint_Snubbull
.4byte gMonFootprint_Granbull
.4byte gMonFootprint_Qwilfish
.4byte gMonFootprint_Scizor
.4byte gMonFootprint_Shuckle
.4byte gMonFootprint_Heracross
.4byte gMonFootprint_Sneasel
.4byte gMonFootprint_Teddiursa
.4byte gMonFootprint_Ursaring
.4byte gMonFootprint_Slugma
.4byte gMonFootprint_Magcargo
.4byte gMonFootprint_Swinub
.4byte gMonFootprint_Piloswine
.4byte gMonFootprint_Corsola
.4byte gMonFootprint_Remoraid
.4byte gMonFootprint_Octillery
.4byte gMonFootprint_Delibird
.4byte gMonFootprint_Mantine
.4byte gMonFootprint_Skarmory
.4byte gMonFootprint_Houndour
.4byte gMonFootprint_Houndoom
.4byte gMonFootprint_Kingdra
.4byte gMonFootprint_Phanpy
.4byte gMonFootprint_Donphan
.4byte gMonFootprint_Porygon2
.4byte gMonFootprint_Stantler
.4byte gMonFootprint_Smeargle
.4byte gMonFootprint_Tyrogue
.4byte gMonFootprint_Hitmontop
.4byte gMonFootprint_Smoochum
.4byte gMonFootprint_Elekid
.4byte gMonFootprint_Magby
.4byte gMonFootprint_Miltank
.4byte gMonFootprint_Blissey
.4byte gMonFootprint_Raikou
.4byte gMonFootprint_Entei
.4byte gMonFootprint_Suicune
.4byte gMonFootprint_Larvitar
.4byte gMonFootprint_Pupitar
.4byte gMonFootprint_Tyranitar
.4byte gMonFootprint_Lugia
.4byte gMonFootprint_HoOh
.4byte gMonFootprint_Celebi
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_Treecko
.4byte gMonFootprint_Grovyle
.4byte gMonFootprint_Sceptile
.4byte gMonFootprint_Torchic
.4byte gMonFootprint_Combusken
.4byte gMonFootprint_Blaziken
.4byte gMonFootprint_Mudkip
.4byte gMonFootprint_Marshtomp
.4byte gMonFootprint_Swampert
.4byte gMonFootprint_Poochyena
.4byte gMonFootprint_Mightyena
.4byte gMonFootprint_Zigzagoon
.4byte gMonFootprint_Linoone
.4byte gMonFootprint_Wurmple
.4byte gMonFootprint_Silcoon
.4byte gMonFootprint_Beautifly
.4byte gMonFootprint_Cascoon
.4byte gMonFootprint_Dustox
.4byte gMonFootprint_Lotad
.4byte gMonFootprint_Lombre
.4byte gMonFootprint_Ludicolo
.4byte gMonFootprint_Seedot
.4byte gMonFootprint_Nuzleaf
.4byte gMonFootprint_Shiftry
.4byte gMonFootprint_Nincada
.4byte gMonFootprint_Ninjask
.4byte gMonFootprint_Shedinja
.4byte gMonFootprint_Taillow
.4byte gMonFootprint_Swellow
.4byte gMonFootprint_Shroomish
.4byte gMonFootprint_Breloom
.4byte gMonFootprint_Spinda
.4byte gMonFootprint_Wingull
.4byte gMonFootprint_Pelipper
.4byte gMonFootprint_Surskit
.4byte gMonFootprint_Masquerain
.4byte gMonFootprint_Wailmer
.4byte gMonFootprint_Wailord
.4byte gMonFootprint_Skitty
.4byte gMonFootprint_Delcatty
.4byte gMonFootprint_Kecleon
.4byte gMonFootprint_Baltoy
.4byte gMonFootprint_Claydol
.4byte gMonFootprint_Nosepass
.4byte gMonFootprint_Torkoal
.4byte gMonFootprint_Sableye
.4byte gMonFootprint_Barboach
.4byte gMonFootprint_Whiscash
.4byte gMonFootprint_Luvdisc
.4byte gMonFootprint_Corphish
.4byte gMonFootprint_Crawdaunt
.4byte gMonFootprint_Feebas
.4byte gMonFootprint_Milotic
.4byte gMonFootprint_Carvanha
.4byte gMonFootprint_Sharpedo
.4byte gMonFootprint_Trapinch
.4byte gMonFootprint_Vibrava
.4byte gMonFootprint_Flygon
.4byte gMonFootprint_Makuhita
.4byte gMonFootprint_Hariyama
.4byte gMonFootprint_Electrike
.4byte gMonFootprint_Manectric
.4byte gMonFootprint_Numel
.4byte gMonFootprint_Camerupt
.4byte gMonFootprint_Spheal
.4byte gMonFootprint_Sealeo
.4byte gMonFootprint_Walrein
.4byte gMonFootprint_Cacnea
.4byte gMonFootprint_Cacturne
.4byte gMonFootprint_Snorunt
.4byte gMonFootprint_Glalie
.4byte gMonFootprint_Lunatone
.4byte gMonFootprint_Solrock
.4byte gMonFootprint_Azurill
.4byte gMonFootprint_Spoink
.4byte gMonFootprint_Grumpig
.4byte gMonFootprint_Plusle
.4byte gMonFootprint_Minun
.4byte gMonFootprint_Mawile
.4byte gMonFootprint_Meditite
.4byte gMonFootprint_Medicham
.4byte gMonFootprint_Swablu
.4byte gMonFootprint_Altaria
.4byte gMonFootprint_Wynaut
.4byte gMonFootprint_Duskull
.4byte gMonFootprint_Dusclops
.4byte gMonFootprint_Roselia
.4byte gMonFootprint_Slakoth
.4byte gMonFootprint_Vigoroth
.4byte gMonFootprint_Slaking
.4byte gMonFootprint_Gulpin
.4byte gMonFootprint_Swalot
.4byte gMonFootprint_Tropius
.4byte gMonFootprint_Whismur
.4byte gMonFootprint_Loudred
.4byte gMonFootprint_Exploud
.4byte gMonFootprint_Clamperl
.4byte gMonFootprint_Huntail
.4byte gMonFootprint_Gorebyss
.4byte gMonFootprint_Absol
.4byte gMonFootprint_Shuppet
.4byte gMonFootprint_Banette
.4byte gMonFootprint_Seviper
.4byte gMonFootprint_Zangoose
.4byte gMonFootprint_Relicanth
.4byte gMonFootprint_Aron
.4byte gMonFootprint_Lairon
.4byte gMonFootprint_Aggron
.4byte gMonFootprint_Castform
.4byte gMonFootprint_Volbeat
.4byte gMonFootprint_Illumise
.4byte gMonFootprint_Lileep
.4byte gMonFootprint_Cradily
.4byte gMonFootprint_Anorith
.4byte gMonFootprint_Armaldo
.4byte gMonFootprint_Ralts
.4byte gMonFootprint_Kirlia
.4byte gMonFootprint_Gardevoir
.4byte gMonFootprint_Bagon
.4byte gMonFootprint_Shelgon
.4byte gMonFootprint_Salamence
.4byte gMonFootprint_Beldum
.4byte gMonFootprint_Metang
.4byte gMonFootprint_Metagross
.4byte gMonFootprint_Regirock
.4byte gMonFootprint_Regice
.4byte gMonFootprint_Registeel
.4byte gMonFootprint_Kyogre
.4byte gMonFootprint_Groudon
.4byte gMonFootprint_Rayquaza
.4byte gMonFootprint_Latias
.4byte gMonFootprint_Latios
.4byte gMonFootprint_Jirachi
.4byte gMonFootprint_Deoxys
.4byte gMonFootprint_Chimecho
.4byte gMonFootprint_Bulbasaur

View File

@@ -1,538 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.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
.align 2
gSpriteTemplate_83A053C:: @ 83A053C
spr_template 4096, 4096, gOamData_83A040C, gSpriteAnimTable_83A04D8, NULL, gDummySpriteAffineAnimTable, sub_808EF8C
.align 2
gSpriteTemplate_83A0554:: @ 83A0554
spr_template 4096, 4096, gOamData_83A0414, gSpriteAnimTable_83A04E0, NULL, gDummySpriteAffineAnimTable, sub_808F08C
.align 2
gSpriteTemplate_83A056C:: @ 83A056C
spr_template 4096, 4096, gOamData_83A041C, gSpriteAnimTable_83A04DC, NULL, gDummySpriteAffineAnimTable, sub_808F0B4
.align 2
gSpriteTemplate_83A0584:: @ 83A0584
spr_template 4096, 4096, gOamData_83A0424, gSpriteAnimTable_83A04F0, NULL, gDummySpriteAffineAnimTable, sub_808ED94
.align 2
gSpriteTemplate_83A059C:: @ 83A059C
spr_template 4096, 4096, gOamData_83A042C, gSpriteAnimTable_83A04F8, NULL, gDummySpriteAffineAnimTable, sub_808ED94
.align 2
gSpriteTemplate_83A05B4:: @ 83A05B4
spr_template 4096, 4096, gOamData_83A042C, gSpriteAnimTable_83A0520, NULL, gDummySpriteAffineAnimTable, sub_808F168
.align 2
gUnknown_083A05CC:: @ 83A05CC
obj_tiles gPokedexMenu2_Gfx, 0x1F00, 0x1000
null_obj_tiles
.align 2
gUnknown_083A05DC:: @ 83A05DC
obj_pal gPokedexMenu_Pal, 0x1000
null_obj_pal
gUnknown_083A05EC:: @ 83A05EC
.byte 2, 4, 8, 16, 32
gUnknown_083A05F1:: @ 83A05F1
.byte 16, 8, 4, 2, 1
.align 2
gUnknown_083A05F8:: @ 83A05F8
.string "$"
@ 83A05F9
.include "data/pokedex_entries.inc"
gUnknown_083B4EC4:: @ 83B4EC4
.space 32
@ 83B4EE4
.include "data/graphics/pokemon/footprint_table.inc"
gUnknown_083B5558:: @ 83B5558
.string "{CLEAR_TO 0}$"
.incbin "graphics/unknown/unknown_3B555C.bin"
.align 2
gOamData_83B557C:: @ 83B557C
.2byte 0x0000
.2byte 0xC000
.2byte 0x0400
.align 2
gUnknown_083B5584:: @ 83B5584
.4byte 0x02008000
.4byte 0x0200c000
.4byte 0x02010000
.4byte 0x02014000
.align 2
gSpriteImageTable_83B5594:: @ 83B5594
obj_frame_tiles 0x02008000, 0x800
obj_frame_tiles 0x02008800, 0x800
obj_frame_tiles 0x02009000, 0x800
obj_frame_tiles 0x02009800, 0x800
obj_frame_tiles 0x0200A000, 0x800
obj_frame_tiles 0x0200A800, 0x800
obj_frame_tiles 0x0200B000, 0x800
obj_frame_tiles 0x0200B800, 0x800
obj_frame_tiles 0x0200C000, 0x800
obj_frame_tiles 0x0200C800, 0x800
obj_frame_tiles 0x0200D000, 0x800
obj_frame_tiles 0x0200D800, 0x800
obj_frame_tiles 0x0200E000, 0x800
obj_frame_tiles 0x0200E800, 0x800
obj_frame_tiles 0x0200F000, 0x800
obj_frame_tiles 0x0200F800, 0x800
.align 2
gSpriteImageTable_83B5614:: @ 83B5614
obj_frame_tiles 0x0200C000, 0x800
obj_frame_tiles 0x0200C800, 0x800
obj_frame_tiles 0x0200D000, 0x800
obj_frame_tiles 0x0200D800, 0x800
obj_frame_tiles 0x0200E000, 0x800
obj_frame_tiles 0x0200E800, 0x800
obj_frame_tiles 0x0200F000, 0x800
obj_frame_tiles 0x0200F800, 0x800
obj_frame_tiles 0x02010000, 0x800
obj_frame_tiles 0x02010800, 0x800
obj_frame_tiles 0x02011000, 0x800
obj_frame_tiles 0x02011800, 0x800
obj_frame_tiles 0x02012000, 0x800
obj_frame_tiles 0x02012800, 0x800
obj_frame_tiles 0x02013000, 0x800
obj_frame_tiles 0x02013800, 0x800
.align 2
gSpriteImageTable_83B5694:: @ 83B5694
obj_frame_tiles 0x02010000, 0x800
obj_frame_tiles 0x02010800, 0x800
obj_frame_tiles 0x02011000, 0x800
obj_frame_tiles 0x02011800, 0x800
obj_frame_tiles 0x02012000, 0x800
obj_frame_tiles 0x02012800, 0x800
obj_frame_tiles 0x02013000, 0x800
obj_frame_tiles 0x02013800, 0x800
obj_frame_tiles 0x02014000, 0x800
obj_frame_tiles 0x02014800, 0x800
obj_frame_tiles 0x02015000, 0x800
obj_frame_tiles 0x02015800, 0x800
obj_frame_tiles 0x02016000, 0x800
obj_frame_tiles 0x02016800, 0x800
obj_frame_tiles 0x02017000, 0x800
obj_frame_tiles 0x02017800, 0x800
.align 2
gSpriteImageTable_83B5714:: @ 83B5714
obj_frame_tiles 0x02014000, 0x800
obj_frame_tiles 0x02014800, 0x800
obj_frame_tiles 0x02015000, 0x800
obj_frame_tiles 0x02015800, 0x800
obj_frame_tiles 0x02016000, 0x800
obj_frame_tiles 0x02016800, 0x800
obj_frame_tiles 0x02017000, 0x800
obj_frame_tiles 0x02017800, 0x800
obj_frame_tiles 0x02018000, 0x800
obj_frame_tiles 0x02018800, 0x800
obj_frame_tiles 0x02019000, 0x800
obj_frame_tiles 0x02019800, 0x800
obj_frame_tiles 0x0201A000, 0x800
obj_frame_tiles 0x0201A800, 0x800
obj_frame_tiles 0x0201B000, 0x800
obj_frame_tiles 0x0201B800, 0x800
.align 2
gUnknown_083B5794:: @ 83B5794
.4byte gSpriteImageTable_83B5594
.4byte gSpriteImageTable_83B5614
.4byte gSpriteImageTable_83B5694
.4byte gSpriteImageTable_83B5714
.align 2
gUnknown_083B57A4:: @ 83B57A4
spr_template 0xFFFF, 0, gOamData_83B557C, NULL, gSpriteImageTable_83B5594, gDummySpriteAffineAnimTable, nullsub_59
gUnknown_083B57BC:: @ 83B57BC
.byte 0, 0, 0, 0
.byte 187, 3, 213, 3
.byte 190, 3, 216, 3
.byte 193, 3, 219, 3
.byte 196, 3, 222, 3
.byte 199, 3, 225, 3
.byte 202, 3, 228, 3
.byte 205, 3, 231, 3
.byte 208, 3, 234, 3
.byte 211, 2, 237, 2
.align 2
gUnknown_083B57E4:: @ 83B57E4
.4byte DexText_SearchForPoke
.2byte 0, 5
.4byte DexText_SwitchDex
.2byte 6, 5
.4byte DexText_ReturnToDex
.2byte 12, 5
.align 2
gUnknown_083B57FC:: @ 83B57FC
.4byte DexText_ListByABC
.byte 0, 2, 5, 5, 2, 12, 0, 0
.4byte DexText_ListByColor
.byte 0, 4, 5, 5, 4, 12, 0, 0
.4byte DexText_ListByType
.byte 0, 6, 5, 5, 6, 6, 0, 0
.4byte DexText_ListByType
.byte 0, 6, 5, 11, 6, 6, 0, 0
.4byte DexText_SelectDexList
.byte 0, 8, 5, 5, 8, 12, 0, 0
.4byte DexText_SelectDexMode
.byte 0, 10, 5, 5, 10, 12, 0, 0
.4byte DexText_ExecuteSearchSwitch
.byte 0, 12, 5, 0, 0, 0, 0, 0
gUnknown_083B5850:: @ 83B5850
.byte 0xFF, 0xFF, 0xFF, 1
.byte 0xFF, 0xFF, 0, 2
.byte 0xFF, 3, 1, 4
.byte 2, 0xFF, 1, 4
.byte 0xFF, 0xFF, 2, 5
.byte 0xFF, 0xFF, 4, 6
.byte 0xFF, 0xFF, 5, 0xFF
gUnknown_083B586C:: @ 83B586C
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 5
.byte 0xFF, 0xFF, 4, 6
.byte 0xFF, 0xFF, 5, 0xFF
gUnknown_083B5888:: @ 83B5888
.byte 0xFF, 0xFF, 0xFF, 1
.byte 0xFF, 0xFF, 0, 2
.byte 0xFF, 3, 1, 4
.byte 2, 0xFF, 1, 4
.byte 0xFF, 0xFF, 2, 6
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 4, 0xFF
gUnknown_083B58A4:: @ 83B58A4
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 6
.byte 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 4, 0xFF
.align 2
gUnknown_083B58C0:: @ 83B58C0
.4byte DexText_HoennDex2, DexText_HoennDex
.4byte DexText_NationalDex2, DexText_NationalDex
.4byte 0x0, 0x0
.align 2
gUnknown_083B58D8:: @ 83B58D8
.4byte DexText_ListByNumber, DexText_NumericalMode
.4byte DexText_ListByABC2, DexText_ABCMode
.4byte DexText_ListByHeavyToLightest, DexText_HeaviestMode
.4byte DexText_ListByLightToHeaviest, DexText_LightestMode
.4byte DexText_ListByTallToSmallest, DexText_TallestMode
.4byte DexText_ListBySmallToTallest, DexText_SmallestMode
.4byte 0x0, 0x0
.align 2
gUnknown_083B5910:: @ 83B5910
.4byte DexText_Terminator5, DexText_DontSpecify
.4byte DexText_Terminator5, DexText_ABC
.4byte DexText_Terminator5, DexText_DEF
.4byte DexText_Terminator5, DexText_GHI
.4byte DexText_Terminator5, DexText_JKL
.4byte DexText_Terminator5, DexText_MNO
.4byte DexText_Terminator5, DexText_PQR
.4byte DexText_Terminator5, DexText_STU
.4byte DexText_Terminator5, DexText_VWX
.4byte DexText_Terminator5, DexText_YZ
.4byte 0x0, 0x0
.align 2
gUnknown_083B5968:: @ 83B5968
.4byte DexText_Terminator5, DexText_DontSpecify
.4byte DexText_Terminator5, DexText_Red
.4byte DexText_Terminator5, DexText_Blue
.4byte DexText_Terminator5, DexText_Yellow
.4byte DexText_Terminator5, DexText_Green
.4byte DexText_Terminator5, DexText_Black
.4byte DexText_Terminator5, DexText_Brown
.4byte DexText_Terminator5, DexText_Purple
.4byte DexText_Terminator5, DexText_Gray
.4byte DexText_Terminator5, DexText_White
.4byte DexText_Terminator5, DexText_Pink
.4byte 0x0, 0x0
.align 2
gUnknown_083B59C8:: @ 83B59C8
.4byte DexText_Terminator5, DexText_None
.4byte DexText_Terminator5, gTypeNames + TYPE_NORMAL * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_FIGHTING * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_FLYING * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_POISON * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_GROUND * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_ROCK * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_BUG * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_GHOST * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_STEEL * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_FIRE * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_WATER * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_GRASS * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_ELECTRIC * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_PSYCHIC * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_ICE * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_DRAGON * 7
.4byte DexText_Terminator5, gTypeNames + TYPE_DARK * 7
.4byte 0x0, 0x0
gUnknown_083B5A60:: @ 83B5A60
.byte 0, 1
gUnknown_083B5A62:: @ 83B5A62
.byte 0, 1, 2, 3, 4, 5
gUnknown_083B5A68:: @ 83B5A68
.byte -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17
.align 2
gUnknown_083B5A7C:: @ 83B5A7C
.4byte gUnknown_083B5910
.byte 6, 7, 10, 0
.4byte gUnknown_083B5968
.byte 8, 9, 11, 0
.4byte gUnknown_083B59C8
.byte 10, 11, 18, 0
.4byte gUnknown_083B59C8
.byte 12, 13, 18, 0
.4byte gUnknown_083B58D8
.byte 4, 5, 6, 0
.4byte gUnknown_083B58C0
.byte 2, 3, 2, 0
gUnknown_083B5AAC:: @ 83B5AAC
.string "{STR_VAR_1}{CLEAR_TO 43}$"
gUnknown_083B5AB2:: @ 83B5AB2
.string "{STR_VAR_1}{CLEAR_TO 96}$"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

2412
include/graphics.h Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -66,7 +66,7 @@ u8 sub_8072A18(const u8 *, u8, u16, u8, u32);
u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32);
int sub_8072AB0(const u8 *, u8, u16, u8, u8, u32);
void MenuPrint_RightAligned(u8 *, u8, u8);
void sub_8072B80(u8 *, u8, u8, u8 *);
void sub_8072B80(const u8 *, u8, u8, const u8 *);
void sub_8072BD8(const u8 *, u8, u8, u16);
u8 *sub_8072C14(u8 *, s32, u8, u8);
u8 *sub_8072C44(u8 *, s32, u8, u8);

View File

@@ -3,156 +3,16 @@
#include "sprite.h"
struct PokedexListItem
{
u16 dexNum;
u16 seen:1;
u16 owned:1;
};
struct PokedexView
{
struct PokedexListItem unk0[386];
u16 unk608;
u8 unk60A_1:1;
u8 unk60A_2:1;
u8 unk60B;
u16 unk60C;
u16 selectedPokemon;
u16 unk610;
u16 dexMode; //National or Hoenn
u16 unk614;
u16 dexOrder;
u16 unk618;
u16 unk61A;
u16 unk61C;
u16 unk61E[4];
u16 unk626; //sprite id of selected Pokemon
u16 unk628;
u16 unk62A;
u8 unk62C;
u8 unk62D;
u8 unk62E;
u8 unk62F;
s16 unk630;
s16 unk632;
u16 unk634;
u16 unk636;
u16 unk638;
u16 unk63A[4];
u8 filler642[8];
u8 unk64A;
u8 unk64B;
u8 unk64C_1:1;
u8 selectedScreen;
u8 unk64E;
u8 unk64F;
u8 menuIsOpen; //menuIsOpen
u8 unk651;
u16 menuCursorPos; //Menu cursor position
s16 menuY; //Menu Y position (inverted because we use REG_BG0VOFS for this)
u8 unk656[8];
u8 unk65E[8];
};
void ResetPokedex(void);
void sub_808C0A0(void);
void sub_808C0B8(void);
void ClearPokedexView(struct PokedexView *pokedexView);
void CB2_InitPokedex(void);
u8 unref_sub_808C540(void (*func)(u8));
void MainCB(void);
void Task_PokedexShowMainScreen(u8 taskId);
void Task_PokedexMainScreen(u8 taskId);
void sub_808C898(u8 taskId);
void Task_PokedexMainScreenMenu(u8 taskId);
void sub_808CA64(u8 taskId);
void sub_808CAE4(u8 taskId);
void sub_808CB8C(u8 taskId);
void Task_ClosePokedex(u8 taskId);
void sub_808CCC4(u8 taskId);
void Task_PokedexResultsScreen(u8 taskId);
void sub_808CEF8(u8 taskId);
void Task_PokedexResultsScreenMenu(u8 taskId);
void sub_808D118(u8 taskId);
void sub_808D198(u8 taskId);
void Task_PokedexResultsScreenReturnToMainScreen(u8 taskId);
void Task_PokedexResultsScreenExitPokedex(u8 taskId);
bool8 sub_808D344(u8 a);
void sub_808D640(void);
void SortPokedex(u8 dexMode, u8 sortMode);
void sub_808DBE8(u8 a, u16 b, u16 c);
void sub_808DEB0(u16 a, u8 b, u8 c, u16 d);
void sub_808DF88(u16 a, u8 b, u8 c, u16 d);
u8 sub_808DFE4(u16 a, u8 b, u8 c);
void sub_808E090(u8 a, u8 b, u16 c);
void sub_808E0CC(u16 a, u16 b);
bool8 sub_808E208(u8 a, u8 b, u8 c);
void sub_808E398(u8 a, u16 b);
u16 sub_808E48C(u16 a, u16 b);
void sub_808E6BC(void);
u8 sub_808E71C(void);
u8 sub_808E82C(void);
u16 sub_808E888(u16 a1);
u32 sub_808E8C8(u16 a, u16 b, u16 c);
void sub_808E978(u8 a);
void nullsub_58(struct Sprite *sprite);
void sub_808ED94(struct Sprite *sprite);
void sub_808EDB8(struct Sprite *sprite);
void sub_808EE28(struct Sprite *sprite);
void sub_808EF38(struct Sprite *sprite);
void sub_808EF8C(struct Sprite *sprite);
void sub_808F08C(struct Sprite *sprite);
void sub_808F0B4(struct Sprite *sprite);
void sub_808F168(struct Sprite *sprite);
u8 sub_808F210(struct PokedexListItem *item, u8 b);
bool8 sub_808F250(u8 taskId);
u8 sub_808F284(struct PokedexListItem *item, u8 b);
void Task_InitPageScreenMultistep(u8 taskId);
void Task_PageScreenProcessInput(u8 taskId);
void sub_808F888(u8 taskId);
void Task_ClosePageScreen(u8 taskId);
void Task_InitAreaScreenMultistep(u8 taskId);
void Task_AreaScreenProcessInput(u8 taskId);
void sub_808FA00(u8 taskId);
void Task_InitCryScreenMultistep(u8 taskId);
void Task_CryScreenProcessInput(u8 taskId);
void sub_808FFBC(u8 taskId);
void sub_8090040(u8 a);
void Task_InitSizeScreenMultistep(u8 taskId);
void Task_SizeScreenProcessInput(u8 taskId);
void sub_8090498(u8 taskId);
void sub_80904FC(u16 a);
void sub_8090540(u16 a);
void sub_8090584(u8 a, u16 b);
void sub_8090644(u8 a, u16 b);
u8 sub_809070C(u16 dexNum, u32 b, u32 c);
// ASM
void sub_8090750(u8);
void sub_8090A3C(u8);
void sub_8090C68(void);
u8 *GetPokemonCategory(u16);
const u8 *GetPokemonCategory(u16);
u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
s8 GetNationalPokedexFlag(u16, u8);
u16 GetNationalPokedexCount(u8);
u16 GetHoennPokedexCount(u8);
bool8 sub_8090FC0(void);
u16 sub_8090FF4(void);
void sub_8091060(u16);
void sub_8091154(u16 order, int i, int i1);
void sub_80911C8(u16 num, int i, int i1);
void sub_8091260(u16 num, int i, int i1, int i2);
void sub_8091304(u8 name[12], int i, int i1);
void sub_8091458(u16 height, int i, int i1);
void sub_8091564(u16 weight, int i, int i1);
void sub_8091738(u16, u16, u16);
void sub_80917CC(int i, int i1);
u16 sub_8091818(u8, u16, u16, u16);
u16 sub_80918EC(u16 a, s16 b, s16 c, u16 d); //Not sure of return type
u8 sub_8091A4C(u8 gender, int i, int i1, int i2);
#endif // GUARD_POKEDEX_H

View File

@@ -357,7 +357,8 @@ struct BaseStats
/* 0x16 */ u8 ability1;
/* 0x17 */ u8 ability2;
/* 0x18 */ u8 safariZoneFleeRate;
/* 0x19 */ u8 bodyColor;
/* 0x19 */ u8 bodyColor:7;
u8 unk19_7:1;
};
struct BattleMove

View File

@@ -20,22 +20,22 @@ enum
/*0x0E*/ SE_KOUKA_H,
/*0x0F*/ SE_BOWA2,
/*0x10*/ SE_POKE_DEAD,
SE_NIGERU,
SE_JIDO_DOA,
SE_NAMINORI,
SE_BAN,
SE_PIN,
SE_BOO,
SE_BOWA,
SE_JYUNI,
SE_A,
SE_I,
SE_U,
SE_E,
SE_O,
SE_N,
SE_SEIKAI,
SE_HAZURE,
/*0x11*/ SE_NIGERU,
/*0x12*/ SE_JIDO_DOA,
/*0x13*/ SE_NAMINORI,
/*0x14*/ SE_BAN,
/*0x15*/ SE_PIN,
/*0x16*/ SE_BOO,
/*0x17*/ SE_BOWA,
/*0x18*/ SE_JYUNI,
/*0x19*/ SE_A,
/*0x1A*/ SE_I,
/*0x1B*/ SE_U,
/*0x1C*/ SE_E,
/*0x1D*/ SE_O,
/*0x1E*/ SE_N,
/*0x1F*/ SE_SEIKAI,
/*0x20*/ SE_HAZURE,
SE_EXP,
SE_JITE_PYOKO,
SE_MU_PACHI,
@@ -112,11 +112,11 @@ enum
SE_JIHANKI,
SE_TAMA,
SE_Z_SCROLL,
SE_Z_PAGE,
SE_PN_ON,
SE_PN_OFF,
SE_Z_SEARCH,
SE_TAMAGO,
/*0x6D*/ SE_Z_PAGE,
/*0x6E*/ SE_PN_ON,
/*0x6F*/ SE_PN_OFF,
/*0x70*/ SE_Z_SEARCH,
/*0x71*/ SE_TAMAGO,
/*0x72*/ SE_TB_START,
/*0x73*/ SE_TB_KON,
/*0x74*/ SE_TB_KARA,

View File

@@ -2,6 +2,7 @@
#define GUARD_TEXT_H
#define CHAR_SPACE 0x00
#define CHAR_0 0xA1
#define CHAR_QUESTION_MARK 0xAC
#define CHAR_PERIOD 0xAD
#define CHAR_HYPHEN 0xAE
@@ -10,6 +11,58 @@
#define CHAR_COMMA 0xB8
#define CHAR_CURRENCY 0xB7
#define CHAR_SLASH 0xBA
#define CHAR_A 0xBB
#define CHAR_B 0xBC
#define CHAR_C 0xBD
#define CHAR_D 0xBE
#define CHAR_E 0xBF
#define CHAR_F 0xC0
#define CHAR_G 0xC1
#define CHAR_H 0xC2
#define CHAR_I 0xC3
#define CHAR_J 0xC4
#define CHAR_K 0xC5
#define CHAR_L 0xC6
#define CHAR_M 0xC7
#define CHAR_N 0xC8
#define CHAR_O 0xC9
#define CHAR_P 0xCA
#define CHAR_Q 0xCB
#define CHAR_R 0xCC
#define CHAR_S 0xCD
#define CHAR_T 0xCE
#define CHAR_U 0xCF
#define CHAR_V 0xD0
#define CHAR_W 0xD1
#define CHAR_X 0xD2
#define CHAR_Y 0xD3
#define CHAR_Z 0xD4
#define CHAR_a 0xD5
#define CHAR_b 0xD6
#define CHAR_c 0xD7
#define CHAR_d 0xD8
#define CHAR_e 0xD9
#define CHAR_f 0xDA
#define CHAR_g 0xDB
#define CHAR_h 0xDC
#define CHAR_i 0xDD
#define CHAR_j 0xDE
#define CHAR_k 0xDF
#define CHAR_l 0xE0
#define CHAR_m 0xE1
#define CHAR_n 0xE2
#define CHAR_o 0xE3
#define CHAR_p 0xE4
#define CHAR_q 0xE5
#define CHAR_r 0xE6
#define CHAR_s 0xE7
#define CHAR_t 0xE8
#define CHAR_u 0xE9
#define CHAR_v 0xEA
#define CHAR_w 0xEB
#define CHAR_x 0xEC
#define CHAR_y 0xED
#define CHAR_z 0xEE
#define CHAR_COLON 0xF0
#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code
#define PLACEHOLDER_BEGIN 0xFD // string placeholder

View File

@@ -138,7 +138,6 @@ SECTIONS {
asm/pokemon_menu.o(.text);
src/option_menu.o(.text);
src/pokedex.o(.text);
asm/pokedex.o(.text);
src/trainer_card.o(.text);
src/save_menu_util.o(.text);
src/battle_party_menu.o(.text);
@@ -388,7 +387,7 @@ SECTIONS {
src/field_effect.o(.rodata);
data/pokemon_menu.o(.rodata);
data/option_menu.o(.rodata);
data/pokedex.o(.rodata);
src/pokedex.o(.rodata);
data/trainer_card.o(.rodata);
src/battle_party_menu.o(.rodata);
data/pokemon_storage_system.o(.rodata);

File diff suppressed because it is too large Load Diff

1192
src/data/pokedex_orders.h Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -629,7 +629,7 @@ void MenuPrint_RightAligned(u8 *str, u8 left, u8 top)
sub_8004D38(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
}
void sub_8072B80(u8 *a1, u8 a2, u8 a3, u8 *a4)
void sub_8072B80(const u8 *a1, u8 a2, u8 a3, const u8 *a4)
{
u8 buffer[64];
u8 width = GetStringWidth(gMenuWindowPtr, a4);

File diff suppressed because it is too large Load Diff

View File

@@ -1255,7 +1255,7 @@ bool8 IsHMMove2(u16 move)
bool8 sub_8040A3C(u16 species)
{
return gBaseStats[species].bodyColor >> 7; // XXX: should this be a bitfield instead?
return gBaseStats[species].unk19_7;
}
s8 sub_8040A54(struct Pokemon *mon, u8 a2)

View File

@@ -483,7 +483,7 @@ static void AddTextColorCtrlCode(u8 *string, u8 bgColor, u8 textColor, u8 shadow
static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection)
{
u8 labelText[72];
u8 *category;
const u8 *category;
u8 srcIndex;
u8 dstIndex;
u16 species;