summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/graphics.s177
-rw-r--r--data/graphics/pokemon/icon_palette_indices.inc442
-rw-r--r--data/graphics/pokemon/icon_palette_table.inc11
-rw-r--r--data/graphics/pokemon/icon_table.inc442
-rw-r--r--data/party_menu.s65
-rw-r--r--data/pokedex.s209
-rw-r--r--data/pokemon_icon.s27
-rw-r--r--data/pokemon_storage_system.s141
-rw-r--r--data/pokenav.s499
-rw-r--r--data/rayquaza_scene.s160
-rw-r--r--data/script_pokemon_util_80F87D8.s2
-rw-r--r--data/start_menu.s29
-rw-r--r--data/starter_choose.s8
-rw-r--r--data/strings.s60
-rw-r--r--data/text_window.s161
-rw-r--r--data/trainer_card.s73
-rw-r--r--data/unk_sprite_file.s30
-rw-r--r--data/use_pokeblock.s7
18 files changed, 1224 insertions, 1319 deletions
diff --git a/data/graphics.s b/data/graphics.s
index aebe35093..c0d0719e4 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -821,10 +821,25 @@ gUnknown_08D96AB4:: @ 8D96AB4
.incbin "baserom.gba", 0xd96ab4, 0xec
gUnknown_08D96BA0:: @ 8D96BA0
- .incbin "baserom.gba", 0xd96ba0, 0xfe4
+ .incbin "baserom.gba", 0xd96ba0, 0x138
+
+gUnknown_08D96CD8:: @ 8D96CD8
+ .incbin "baserom.gba", 0xd96cd8, 0x294
+
+gUnknown_08D96F6C:: @ 8D96F6C
+ .incbin "baserom.gba", 0xd96f6c, 0x24
+
+gUnknown_08D96F90:: @ 8D96F90
+ .incbin "baserom.gba", 0xd96f90, 0x1F8
+
+gUnknown_08D97188:: @ 8D97188
+ .incbin "baserom.gba", 0xd97188, 0x28
+
+gUnknown_08D971B0:: @ 8D971B0
+ .incbin "baserom.gba", 0xd971b0, 0x9D4
gUnknown_08D97B84:: @ 8D97B84
- .incbin "baserom.gba", 0xd97b84, 0x188
+ .incbin "baserom.gba", 0xd97b84, 0x188
gUnknown_08D97D0C:: @ 8D97D0C
.incbin "baserom.gba", 0xd97d0c, 0x830
@@ -973,8 +988,29 @@ gUnknown_08D9C13C:: @ 8D9C13C
@ 8D9C3A8
.include "data/graphics/berries/berry_graphics.inc"
-@ 8DA1E78
- .incbin "baserom.gba", 0xda1e78, 0x1548
+gUnknown_08DA1E78:: @ 8DA1E78
+ .incbin "baserom.gba", 0xda1e78, 0xBE4
+
+gUnknown_08DA2A5C:: @ 8DA2A5C
+ .incbin "baserom.gba", 0xDA2A5C, 0xCC
+
+gUnknown_08DA2B28:: @ 8DA2B28
+ .incbin "baserom.gba", 0xDA2B28, 0x1F4
+
+gUnknown_08DA2D1C:: @ 8DA2D1C
+ .incbin "baserom.gba", 0xDA2D1C, 0x534
+
+gUnknown_08DA3250:: @ 8DA3250
+ .incbin "baserom.gba", 0xDA3250, 0x54
+
+gUnknown_08DA32A4:: @ 8DA32A4
+ .incbin "baserom.gba", 0xDA32A4, 0xCC
+
+gUnknown_08DA3370:: @ 8DA3370
+ .incbin "baserom.gba", 0xDA3370, 0x28
+
+gUnknown_08DA3398:: @ 8DA3398
+ .incbin "baserom.gba", 0xDA3398, 0x28
gUnknown_08DA33C0:: @ 8DA33C0
.incbin "baserom.gba", 0xda33c0, 0x428
@@ -989,7 +1025,13 @@ gUnknown_08DA3988:: @ 8DA3988
.incbin "baserom.gba", 0xda3988, 0x100
gUnknown_08DA3A88:: @ 8DA3A88
- .incbin "baserom.gba", 0xda3a88, 0x20c
+ .incbin "baserom.gba", 0xda3a88, 0x138
+
+gUnknown_08DA3BC0:: @ 8DA3BC0
+ .incbin "baserom.gba", 0xDA3BC0, 0xBC
+
+gUnknown_08DA3C7C:: @ 8DA3C7C
+ .incbin "baserom.gba", 0xDA3C7C, 0x18
gUnknown_08DA3C94:: @ 8DA3C94
.incbin "baserom.gba", 0xda3c94, 0x1114
@@ -1004,7 +1046,13 @@ gUnknown_08DA4F70:: @ 8DA4F70
.incbin "baserom.gba", 0xda4f70, 0x1148
gUnknown_08DA60B8:: @ 8DA60B8
- .incbin "baserom.gba", 0xda60b8, 0x904
+ .incbin "baserom.gba", 0xda60b8, 0x388
+
+gUnknown_08DA6440:: @ 8DA6440
+ .incbin "baserom.gba", 0xDA6440, 0x46C
+
+gUnknown_08DA68AC:: @ 8DA68AC
+ .incbin "baserom.gba", 0xDA68AC, 0x110
gUnknown_08DA69BC:: @ 8DA69BC
.incbin "baserom.gba", 0xda69bc, 0xb6c
@@ -1043,7 +1091,37 @@ gUnknown_08DA8D6C:: @ 8DA8D6C
.incbin "baserom.gba", 0xda8d6c, 0x118
gUnknown_08DA8E84:: @ 8DA8E84
- .incbin "baserom.gba", 0xda8e84, 0x1a30
+ .incbin "baserom.gba", 0xda8e84, 0x54
+
+gUnknown_08DA8ED8:: @ 8DA8ED8
+ .incbin "baserom.gba", 0xDA8ED8, 0x798
+
+gUnknown_08DA9670:: @ 8DA9670
+ .incbin "baserom.gba", 0xDA9670, 0x44
+
+gUnknown_08DA96B4:: @ 8DA96B4
+ .incbin "baserom.gba", 0xDA96B4, 0x248
+
+gUnknown_08DA98FC:: @ 8DA98FC
+ .incbin "baserom.gba", 0xDA98FC, 0xCA8
+
+gUnknown_08DAA5A4:: @ 8DAA5A4
+ .incbin "baserom.gba", 0xDAA5A4, 0x1F0
+
+gUnknown_08DAA794:: @ 8DAA794
+ .incbin "baserom.gba", 0xDAA794, 0x98
+
+gUnknown_08DAA82C:: @ 8DAA82C
+ .incbin "baserom.gba", 0xDAA82C, 0x28
+
+gUnknown_08DAA854:: @ 8DAA854
+ .incbin "baserom.gba", 0xDAA854, 0x28
+
+gUnknown_08DAA87C:: @ 8DAA87C
+ .incbin "baserom.gba", 0xDAA87C, 0x28
+
+gUnknown_08DAA8A4:: @ 8DAA8A4
+ .incbin "baserom.gba", 0xDAA8A4, 0x10
gUnknown_08DAA8B4:: @ 8DAA8B4
.incbin "baserom.gba", 0xdaa8b4, 0x270
@@ -1217,10 +1295,10 @@ gUnknown_08DC0754:: @ 8DC0754
.incbin "baserom.gba", 0xdc0754, 0x440
gUnknown_08DC0B94:: @ 8DC0B94
- .incbin "baserom.gba", 0xdc0b94, 0xb62
+ .incbin "baserom.gba", 0xdc0b94, 0xb60
-gUnknown_08DC16F6:: @ 8DC16F6
- .incbin "baserom.gba", 0xdc16f6, 0x60
+gUnknown_08DC16F4:: @ 8DC16F4
+ .incbin "baserom.gba", 0xdc16f4, 0x62
gUnknown_08DC1756:: @ 8DC1756
.incbin "baserom.gba", 0xdc1756, 0x60
@@ -1232,7 +1310,10 @@ gUnknown_08DC1876:: @ 8DC1876
.incbin "baserom.gba", 0xdc1876, 0xbe
gUnknown_08DC1934:: @ 8DC1934
- .incbin "baserom.gba", 0xdc1934, 0x10d4
+ .incbin "baserom.gba", 0xdc1934, 0xA18
+
+gUnknown_08DC234C:: @ 8DC234C
+ .incbin "baserom.gba", 0xDC234C, 0x6BC
gUnknown_08DC2A08:: @ 8DC2A08
.incbin "baserom.gba", 0xdc2a08, 0x114
@@ -1365,7 +1446,43 @@ gUnknown_08DC7D84:: @ 8DC7D84
.incbin "baserom.gba", 0xdc7d84, 0x17c
gUnknown_08DC7F00:: @ 8DC7F00
- .incbin "baserom.gba", 0xdc7f00, 0x11c0
+ .incbin "baserom.gba", 0xdc7f00, 0xA0
+
+gUnknown_08DC7FA0:: @ 8DC7FA0
+ .incbin "baserom.gba", 0xdc7fa0, 0x13C
+
+gUnknown_08DC80DC:: @ 8DC80DC
+ .incbin "baserom.gba", 0xdc80dc, 0x12C
+
+gUnknown_08DC8208:: @ 8DC8208
+ .incbin "baserom.gba", 0xdc8208, 0x184
+
+gUnknown_08DC838C:: @ 8DC838C
+ .incbin "baserom.gba", 0xdc838c, 0x120
+
+gUnknown_08DC84AC:: @ 8DC84AC
+ .incbin "baserom.gba", 0xdc84ac, 0x1A0
+
+gUnknown_08DC864C:: @ 8DC864C
+ .incbin "baserom.gba", 0xdc864c, 0x1AC
+
+gUnknown_08DC87F8:: @ 8DC87F8
+ .incbin "baserom.gba", 0xdc87f8, 0x2AC
+
+gUnknown_08DC8AA4:: @ 8DC8AA4
+ .incbin "baserom.gba", 0xdc8aa4, 0x170
+
+gUnknown_08DC8C14:: @ 8DC8C14
+ .incbin "baserom.gba", 0xdc8c14, 0x13C
+
+gUnknown_08DC8D50:: @ 8DC8D50
+ .incbin "baserom.gba", 0xdc8d50, 0x114
+
+gUnknown_08DC8E64:: @ 8DC8E64
+ .incbin "baserom.gba", 0xdc8e64, 0x100
+
+gUnknown_08DC8F64:: @ 8DC8F64
+ .incbin "baserom.gba", 0xdc8f64, 0x15C
gUnknown_08DC90C0:: @ 8DC90C0
.incbin "baserom.gba", 0xdc90c0, 0x20
@@ -1377,7 +1494,10 @@ gUnknown_08DC9130:: @ 8DC9130
.incbin "baserom.gba", 0xdc9130, 0xb8
gUnknown_08DC91E8:: @ 8DC91E8
- .incbin "baserom.gba", 0xdc91e8, 0x420
+ .incbin "baserom.gba", 0xdc91e8, 0x20
+
+gUnknown_08DC9208:: @ 8DC9208
+ .incbin "baserom.gba", 0xdc9208, 0x400
gUnknown_08DC9608:: @ 8DC9608
.incbin "baserom.gba", 0xdc9608, 0x20
@@ -1443,10 +1563,19 @@ gUnknown_08DCC648:: @ 8DCC648
.incbin "baserom.gba", 0xdcc648, 0x2c0
gUnknown_08DCC908:: @ 8DCC908
- .incbin "baserom.gba", 0xdcc908, 0x2b0
+ .incbin "baserom.gba", 0xdcc908, 0x290
+
+gUnknown_08DCCB98:: @ 8DCCB98
+ .incbin "baserom.gba", 0xdccb98, 0x20
gUnknown_08DCCBB8:: @ 8DCCBB8
- .incbin "baserom.gba", 0xdccbb8, 0x3a4
+ .incbin "baserom.gba", 0xdccbb8, 0x184
+
+gUnknown_08DCCD3C:: @ 8DCCD3C
+ .incbin "baserom.gba", 0xdccd3c, 0x20
+
+gUnknown_08DCCD5C:: @ 8DCCD5C
+ .incbin "baserom.gba", 0xdccd5c, 0x200
gUnknown_08DCCF5C:: @ 8DCCF5C
.incbin "baserom.gba", 0xdccf5c, 0x20
@@ -1473,22 +1602,28 @@ gUnknown_08DCEC70:: @ 8DCEC70
.incbin "baserom.gba", 0xdcec70, 0x13e0
gUnknown_08DD0050:: @ 8DD0050
- .incbin "baserom.gba", 0xdd0050, 0x1a68
+ .incbin "baserom.gba", 0xdd0050, 0x1A08
+
+gUnknown_08DD1A58:: @ 8DD1A58
+ .incbin "baserom.gba", 0xdd1a58, 0x60
gUnknown_08DD1AB8:: @ 8DD1AB8
- .incbin "baserom.gba", 0xdd1ab8, 0x4c0
+ .incbin "baserom.gba", 0xdd1ab8, 0x4C0
gUnknown_08DD1F78:: @ 8DD1F78
- .incbin "baserom.gba", 0xdd1f78, 0x98
+ .incbin "baserom.gba", 0xdd1f78, 0x98
gUnknown_08DD2010:: @ 8DD2010
- .incbin "baserom.gba", 0xdd2010, 0x1a0
+ .incbin "baserom.gba", 0xdd2010, 0x1A0
gUnknown_08DD21B0:: @ 8DD21B0
- .incbin "baserom.gba", 0xdd21b0, 0xdc
+ .incbin "baserom.gba", 0xdd21b0, 0xDC
gUnknown_08DD228C:: @ 8DD228C
- .incbin "baserom.gba", 0xdd228c, 0x1e0
+ .incbin "baserom.gba", 0xdd228c, 0x180
+
+gUnknown_08DD240C:: @ 8DD240C
+ .incbin "baserom.gba", 0xdd240c, 0x60
gUnknown_08DD246C:: @ 8DD246C
.incbin "baserom.gba", 0xdd246c, 0x674
diff --git a/data/graphics/pokemon/icon_palette_indices.inc b/data/graphics/pokemon/icon_palette_indices.inc
deleted file mode 100644
index f1d57466c..000000000
--- a/data/graphics/pokemon/icon_palette_indices.inc
+++ /dev/null
@@ -1,442 +0,0 @@
- .align 2
-gMonIconPaletteIndices:: @ 857C388
- .byte 0 @ ??????????
- .byte 1 @ Bulbasaur
- .byte 1 @ Ivysaur
- .byte 1 @ Venusaur
- .byte 0 @ Charmander
- .byte 0 @ Charmeleon
- .byte 0 @ Charizard
- .byte 0 @ Squirtle
- .byte 2 @ Wartortle
- .byte 2 @ Blastoise
- .byte 1 @ Caterpie
- .byte 1 @ Metapod
- .byte 0 @ Butterfree
- .byte 1 @ Weedle
- .byte 2 @ Kakuna
- .byte 2 @ Beedrill
- .byte 0 @ Pidgey
- .byte 0 @ Pidgeotto
- .byte 0 @ Pidgeot
- .byte 2 @ Rattata
- .byte 1 @ Raticate
- .byte 0 @ Spearow
- .byte 0 @ Fearow
- .byte 2 @ Ekans
- .byte 2 @ Arbok
- .byte 2 @ Pikachu
- .byte 0 @ Raichu
- .byte 2 @ Sandshrew
- .byte 2 @ Sandslash
- .byte 2 @ Nidoran♀
- .byte 2 @ Nidorina
- .byte 2 @ Nidoqueen
- .byte 2 @ Nidoran♂
- .byte 2 @ Nidorino
- .byte 2 @ Nidoking
- .byte 0 @ Clefairy
- .byte 0 @ Clefable
- .byte 2 @ Vulpix
- .byte 1 @ Ninetales
- .byte 0 @ Jigglypuff
- .byte 0 @ Wigglytuff
- .byte 2 @ Zubat
- .byte 2 @ Golbat
- .byte 1 @ Oddish
- .byte 0 @ Gloom
- .byte 0 @ Vileplume
- .byte 0 @ Paras
- .byte 0 @ Parasect
- .byte 0 @ Venonat
- .byte 2 @ Venomoth
- .byte 2 @ Diglett
- .byte 2 @ Dugtrio
- .byte 1 @ Meowth
- .byte 1 @ Persian
- .byte 1 @ Psyduck
- .byte 2 @ Golduck
- .byte 1 @ Mankey
- .byte 2 @ Primeape
- .byte 0 @ Growlithe
- .byte 0 @ Arcanine
- .byte 0 @ Poliwag
- .byte 0 @ Poliwhirl
- .byte 0 @ Poliwrath
- .byte 2 @ Abra
- .byte 2 @ Kadabra
- .byte 2 @ Alakazam
- .byte 0 @ Machop
- .byte 2 @ Machoke
- .byte 0 @ Machamp
- .byte 1 @ Bellsprout
- .byte 1 @ Weepinbell
- .byte 1 @ Victreebel
- .byte 2 @ Tentacool
- .byte 2 @ Tentacruel
- .byte 1 @ Geodude
- .byte 1 @ Graveler
- .byte 1 @ Golem
- .byte 0 @ Ponyta
- .byte 0 @ Rapidash
- .byte 0 @ Slowpoke
- .byte 0 @ Slowbro
- .byte 0 @ Magnemite
- .byte 0 @ Magneton
- .byte 1 @ Farfetch'd
- .byte 2 @ Doduo
- .byte 2 @ Dodrio
- .byte 2 @ Seel
- .byte 2 @ Dewgong
- .byte 2 @ Grimer
- .byte 2 @ Muk
- .byte 2 @ Shellder
- .byte 2 @ Cloyster
- .byte 2 @ Gastly
- .byte 2 @ Haunter
- .byte 2 @ Gengar
- .byte 2 @ Onix
- .byte 2 @ Drowzee
- .byte 1 @ Hypno
- .byte 2 @ Krabby
- .byte 2 @ Kingler
- .byte 0 @ Voltorb
- .byte 0 @ Electrode
- .byte 0 @ Exeggcute
- .byte 1 @ Exeggutor
- .byte 1 @ Cubone
- .byte 1 @ Marowak
- .byte 2 @ Hitmonlee
- .byte 2 @ Hitmonchan
- .byte 1 @ Lickitung
- .byte 2 @ Koffing
- .byte 2 @ Weezing
- .byte 1 @ Rhyhorn
- .byte 1 @ Rhydon
- .byte 0 @ Chansey
- .byte 0 @ Tangela
- .byte 1 @ Kangaskhan
- .byte 0 @ Horsea
- .byte 0 @ Seadra
- .byte 0 @ Goldeen
- .byte 0 @ Seaking
- .byte 2 @ Staryu
- .byte 2 @ Starmie
- .byte 0 @ Mr. mime
- .byte 1 @ Scyther
- .byte 2 @ Jynx
- .byte 1 @ Electabuzz
- .byte 0 @ Magmar
- .byte 2 @ Pinsir
- .byte 2 @ Tauros
- .byte 0 @ Magikarp
- .byte 0 @ Gyarados
- .byte 2 @ Lapras
- .byte 2 @ Ditto
- .byte 2 @ Eevee
- .byte 0 @ Vaporeon
- .byte 0 @ Jolteon
- .byte 0 @ Flareon
- .byte 0 @ Porygon
- .byte 0 @ Omanyte
- .byte 0 @ Omastar
- .byte 2 @ Kabuto
- .byte 2 @ Kabutops
- .byte 0 @ Aerodactyl
- .byte 1 @ Snorlax
- .byte 0 @ Articuno
- .byte 0 @ Zapdos
- .byte 0 @ Moltres
- .byte 0 @ Dratini
- .byte 0 @ Dragonair
- .byte 2 @ Dragonite
- .byte 2 @ Mewtwo
- .byte 0 @ Mew
- .byte 1 @ Chikorita
- .byte 1 @ Bayleef
- .byte 1 @ Meganium
- .byte 1 @ Cyndaquil
- .byte 1 @ Quilava
- .byte 1 @ Typhlosion
- .byte 2 @ Totodile
- .byte 2 @ Croconaw
- .byte 2 @ Feraligatr
- .byte 2 @ Sentret
- .byte 2 @ Furret
- .byte 2 @ Hoothoot
- .byte 2 @ Noctowl
- .byte 0 @ Ledyba
- .byte 0 @ Ledian
- .byte 1 @ Spinarak
- .byte 0 @ Ariados
- .byte 2 @ Crobat
- .byte 2 @ Chinchou
- .byte 0 @ Lanturn
- .byte 0 @ Pichu
- .byte 0 @ Cleffa
- .byte 1 @ Igglybuff
- .byte 2 @ Togepi
- .byte 2 @ Togetic
- .byte 0 @ Natu
- .byte 0 @ Xatu
- .byte 2 @ Mareep
- .byte 0 @ Flaaffy
- .byte 0 @ Ampharos
- .byte 1 @ Bellossom
- .byte 2 @ Marill
- .byte 2 @ Azumarill
- .byte 1 @ Sudowoodo
- .byte 1 @ Politoed
- .byte 1 @ Hoppip
- .byte 1 @ Skiploom
- .byte 2 @ Jumpluff
- .byte 2 @ Aipom
- .byte 1 @ Sunkern
- .byte 1 @ Sunflora
- .byte 1 @ Yanma
- .byte 0 @ Wooper
- .byte 0 @ Quagsire
- .byte 2 @ Espeon
- .byte 2 @ Umbreon
- .byte 2 @ Murkrow
- .byte 0 @ Slowking
- .byte 0 @ Misdreavus
- .byte 0 @ Unown A
- .byte 0 @ Wobbuffet
- .byte 1 @ Girafarig
- .byte 0 @ Pineco
- .byte 2 @ Forretress
- .byte 2 @ Dunsparce
- .byte 2 @ Gligar
- .byte 0 @ Steelix
- .byte 0 @ Snubbull
- .byte 2 @ Granbull
- .byte 0 @ Qwilfish
- .byte 0 @ Scizor
- .byte 1 @ Shuckle
- .byte 2 @ Heracross
- .byte 0 @ Sneasel
- .byte 0 @ Teddiursa
- .byte 2 @ Ursaring
- .byte 0 @ Slugma
- .byte 0 @ Magcargo
- .byte 2 @ Swinub
- .byte 2 @ Piloswine
- .byte 0 @ Corsola
- .byte 0 @ Remoraid
- .byte 0 @ Octillery
- .byte 0 @ Delibird
- .byte 2 @ Mantine
- .byte 0 @ Skarmory
- .byte 0 @ Houndour
- .byte 0 @ Houndoom
- .byte 0 @ Kingdra
- .byte 0 @ Phanpy
- .byte 0 @ Donphan
- .byte 0 @ Porygon2
- .byte 2 @ Stantler
- .byte 1 @ Smeargle
- .byte 2 @ Tyrogue
- .byte 2 @ Hitmontop
- .byte 1 @ Smoochum
- .byte 1 @ Elekid
- .byte 1 @ Magby
- .byte 1 @ Miltank
- .byte 1 @ Blissey
- .byte 0 @ Raikou
- .byte 2 @ Entei
- .byte 0 @ Suicune
- .byte 1 @ Larvitar
- .byte 0 @ Pupitar
- .byte 1 @ Tyranitar
- .byte 0 @ Lugia
- .byte 1 @ Ho-Oh
- .byte 1 @ Celebi
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 1 @ Treecko
- .byte 0 @ Grovyle
- .byte 1 @ Sceptile
- .byte 0 @ Torchic
- .byte 0 @ Combusken
- .byte 0 @ Blaziken
- .byte 0 @ Mudkip
- .byte 0 @ Marshtomp
- .byte 0 @ Swampert
- .byte 2 @ Poochyena
- .byte 2 @ Mightyena
- .byte 2 @ Zigzagoon
- .byte 2 @ Linoone
- .byte 0 @ Wurmple
- .byte 2 @ Silcoon
- .byte 0 @ Beautifly
- .byte 2 @ Cascoon
- .byte 1 @ Dustox
- .byte 1 @ Lotad
- .byte 1 @ Lombre
- .byte 1 @ Ludicolo
- .byte 1 @ Seedot
- .byte 1 @ Nuzleaf
- .byte 0 @ Shiftry
- .byte 1 @ Nincada
- .byte 1 @ Ninjask
- .byte 1 @ Shedinja
- .byte 2 @ Taillow
- .byte 2 @ Swellow
- .byte 1 @ Shroomish
- .byte 1 @ Breloom
- .byte 1 @ Spinda
- .byte 0 @ Wingull
- .byte 0 @ Pelipper
- .byte 2 @ Surskit
- .byte 0 @ Masquerain
- .byte 2 @ Wailmer
- .byte 0 @ Wailord
- .byte 0 @ Skitty
- .byte 2 @ Delcatty
- .byte 1 @ Kecleon
- .byte 1 @ Baltoy
- .byte 0 @ Claydol
- .byte 0 @ Nosepass
- .byte 1 @ Torkoal
- .byte 2 @ Sableye
- .byte 0 @ Barboach
- .byte 0 @ Whiscash
- .byte 0 @ Luvdisc
- .byte 0 @ Corphish
- .byte 0 @ Crawdaunt
- .byte 2 @ Feebas
- .byte 0 @ Milotic
- .byte 0 @ Carvanha
- .byte 0 @ Sharpedo
- .byte 1 @ Trapinch
- .byte 1 @ Vibrava
- .byte 1 @ Flygon
- .byte 2 @ Makuhita
- .byte 1 @ Hariyama
- .byte 1 @ Electrike
- .byte 0 @ Manectric
- .byte 1 @ Numel
- .byte 0 @ Camerupt
- .byte 2 @ Spheal
- .byte 2 @ Sealeo
- .byte 0 @ Walrein
- .byte 1 @ Cacnea
- .byte 1 @ Cacturne
- .byte 2 @ Snorunt
- .byte 0 @ Glalie
- .byte 1 @ Lunatone
- .byte 0 @ Solrock
- .byte 2 @ Azurill
- .byte 0 @ Spoink
- .byte 2 @ Grumpig
- .byte 0 @ Plusle
- .byte 0 @ Minun
- .byte 2 @ Mawile
- .byte 0 @ Meditite
- .byte 0 @ Medicham
- .byte 0 @ Swablu
- .byte 0 @ Altaria
- .byte 0 @ Wynaut
- .byte 0 @ Duskull
- .byte 0 @ Dusclops
- .byte 0 @ Roselia
- .byte 2 @ Slakoth
- .byte 2 @ Vigoroth
- .byte 1 @ Slaking
- .byte 1 @ Gulpin
- .byte 2 @ Swalot
- .byte 1 @ Tropius
- .byte 0 @ Whismur
- .byte 2 @ Loudred
- .byte 2 @ Exploud
- .byte 0 @ Clamperl
- .byte 0 @ Huntail
- .byte 0 @ Gorebyss
- .byte 0 @ Absol
- .byte 0 @ Shuppet
- .byte 0 @ Banette
- .byte 2 @ Seviper
- .byte 0 @ Zangoose
- .byte 1 @ Relicanth
- .byte 2 @ Aron
- .byte 2 @ Lairon
- .byte 2 @ Aggron
- .byte 0 @ Castform
- .byte 0 @ Volbeat
- .byte 2 @ Illumise
- .byte 2 @ Lileep
- .byte 0 @ Cradily
- .byte 0 @ Anorith
- .byte 0 @ Armaldo
- .byte 1 @ Ralts
- .byte 1 @ Kirlia
- .byte 1 @ Gardevoir
- .byte 2 @ Bagon
- .byte 2 @ Shelgon
- .byte 0 @ Salamence
- .byte 0 @ Beldum
- .byte 0 @ Metang
- .byte 0 @ Metagross
- .byte 2 @ Regirock
- .byte 2 @ Regice
- .byte 2 @ Registeel
- .byte 2 @ Kyogre
- .byte 0 @ Groudon
- .byte 1 @ Rayquaza
- .byte 0 @ Latias
- .byte 2 @ Latios
- .byte 0 @ Jirachi
- .byte 0 @ Deoxys
- .byte 0 @ Chimecho
- .byte 1 @ Egg
- .byte 0 @ Unown B
- .byte 0 @ Unown C
- .byte 0 @ Unown D
- .byte 0 @ Unown E
- .byte 0 @ Unown F
- .byte 0 @ Unown G
- .byte 0 @ Unown H
- .byte 0 @ Unown I
- .byte 0 @ Unown J
- .byte 0 @ Unown K
- .byte 0 @ Unown L
- .byte 0 @ Unown M
- .byte 0 @ Unown N
- .byte 0 @ Unown O
- .byte 0 @ Unown P
- .byte 0 @ Unown Q
- .byte 0 @ Unown R
- .byte 0 @ Unown S
- .byte 0 @ Unown T
- .byte 0 @ Unown U
- .byte 0 @ Unown V
- .byte 0 @ Unown W
- .byte 0 @ Unown X
- .byte 0 @ Unown Y
- .byte 0 @ Unown Z
- .byte 0 @ Unown Exclamation Mark
- .byte 0 @ Unown Question Mark
diff --git a/data/graphics/pokemon/icon_palette_table.inc b/data/graphics/pokemon/icon_palette_table.inc
deleted file mode 100644
index eb7919423..000000000
--- a/data/graphics/pokemon/icon_palette_table.inc
+++ /dev/null
@@ -1,11 +0,0 @@
- .align 2
-gMonIconPaletteTable:: @ 857C540
- obj_pal gMonIconPalettes + 0 * 32, 56000
- obj_pal gMonIconPalettes + 1 * 32, 56001
- obj_pal gMonIconPalettes + 2 * 32, 56002
-
-@ These palettes are actually part of the title screen BG palette and are not
-@ used for Pokémon icons.
- obj_pal gMonIconPalettes + 3 * 32, 56003
- obj_pal gMonIconPalettes + 4 * 32, 56004
- obj_pal gMonIconPalettes + 5 * 32, 56005
diff --git a/data/graphics/pokemon/icon_table.inc b/data/graphics/pokemon/icon_table.inc
deleted file mode 100644
index 06a86de43..000000000
--- a/data/graphics/pokemon/icon_table.inc
+++ /dev/null
@@ -1,442 +0,0 @@
- .align 2
-gMonIconTable:: @ 857BCA8
- .4byte gMonIcon_Bulbasaur
- .4byte gMonIcon_Bulbasaur
- .4byte gMonIcon_Ivysaur
- .4byte gMonIcon_Venusaur
- .4byte gMonIcon_Charmander
- .4byte gMonIcon_Charmeleon
- .4byte gMonIcon_Charizard
- .4byte gMonIcon_Squirtle
- .4byte gMonIcon_Wartortle
- .4byte gMonIcon_Blastoise
- .4byte gMonIcon_Caterpie
- .4byte gMonIcon_Metapod
- .4byte gMonIcon_Butterfree
- .4byte gMonIcon_Weedle
- .4byte gMonIcon_Kakuna
- .4byte gMonIcon_Beedrill
- .4byte gMonIcon_Pidgey
- .4byte gMonIcon_Pidgeotto
- .4byte gMonIcon_Pidgeot
- .4byte gMonIcon_Rattata
- .4byte gMonIcon_Raticate
- .4byte gMonIcon_Spearow
- .4byte gMonIcon_Fearow
- .4byte gMonIcon_Ekans
- .4byte gMonIcon_Arbok
- .4byte gMonIcon_Pikachu
- .4byte gMonIcon_Raichu
- .4byte gMonIcon_Sandshrew
- .4byte gMonIcon_Sandslash
- .4byte gMonIcon_NidoranF
- .4byte gMonIcon_Nidorina
- .4byte gMonIcon_Nidoqueen
- .4byte gMonIcon_NidoranM
- .4byte gMonIcon_Nidorino
- .4byte gMonIcon_Nidoking
- .4byte gMonIcon_Clefairy
- .4byte gMonIcon_Clefable
- .4byte gMonIcon_Vulpix
- .4byte gMonIcon_Ninetales
- .4byte gMonIcon_Jigglypuff
- .4byte gMonIcon_Wigglytuff
- .4byte gMonIcon_Zubat
- .4byte gMonIcon_Golbat
- .4byte gMonIcon_Oddish
- .4byte gMonIcon_Gloom
- .4byte gMonIcon_Vileplume
- .4byte gMonIcon_Paras
- .4byte gMonIcon_Parasect
- .4byte gMonIcon_Venonat
- .4byte gMonIcon_Venomoth
- .4byte gMonIcon_Diglett
- .4byte gMonIcon_Dugtrio
- .4byte gMonIcon_Meowth
- .4byte gMonIcon_Persian
- .4byte gMonIcon_Psyduck
- .4byte gMonIcon_Golduck
- .4byte gMonIcon_Mankey
- .4byte gMonIcon_Primeape
- .4byte gMonIcon_Growlithe
- .4byte gMonIcon_Arcanine
- .4byte gMonIcon_Poliwag
- .4byte gMonIcon_Poliwhirl
- .4byte gMonIcon_Poliwrath
- .4byte gMonIcon_Abra
- .4byte gMonIcon_Kadabra
- .4byte gMonIcon_Alakazam
- .4byte gMonIcon_Machop
- .4byte gMonIcon_Machoke
- .4byte gMonIcon_Machamp
- .4byte gMonIcon_Bellsprout
- .4byte gMonIcon_Weepinbell
- .4byte gMonIcon_Victreebel
- .4byte gMonIcon_Tentacool
- .4byte gMonIcon_Tentacruel
- .4byte gMonIcon_Geodude
- .4byte gMonIcon_Graveler
- .4byte gMonIcon_Golem
- .4byte gMonIcon_Ponyta
- .4byte gMonIcon_Rapidash
- .4byte gMonIcon_Slowpoke
- .4byte gMonIcon_Slowbro
- .4byte gMonIcon_Magnemite
- .4byte gMonIcon_Magneton
- .4byte gMonIcon_Farfetchd
- .4byte gMonIcon_Doduo
- .4byte gMonIcon_Dodrio
- .4byte gMonIcon_Seel
- .4byte gMonIcon_Dewgong
- .4byte gMonIcon_Grimer
- .4byte gMonIcon_Muk
- .4byte gMonIcon_Shellder
- .4byte gMonIcon_Cloyster
- .4byte gMonIcon_Gastly
- .4byte gMonIcon_Haunter
- .4byte gMonIcon_Gengar
- .4byte gMonIcon_Onix
- .4byte gMonIcon_Drowzee
- .4byte gMonIcon_Hypno
- .4byte gMonIcon_Krabby
- .4byte gMonIcon_Kingler
- .4byte gMonIcon_Voltorb
- .4byte gMonIcon_Electrode
- .4byte gMonIcon_Exeggcute
- .4byte gMonIcon_Exeggutor
- .4byte gMonIcon_Cubone
- .4byte gMonIcon_Marowak
- .4byte gMonIcon_Hitmonlee
- .4byte gMonIcon_Hitmonchan
- .4byte gMonIcon_Lickitung
- .4byte gMonIcon_Koffing
- .4byte gMonIcon_Weezing
- .4byte gMonIcon_Rhyhorn
- .4byte gMonIcon_Rhydon
- .4byte gMonIcon_Chansey
- .4byte gMonIcon_Tangela
- .4byte gMonIcon_Kangaskhan
- .4byte gMonIcon_Horsea
- .4byte gMonIcon_Seadra
- .4byte gMonIcon_Goldeen
- .4byte gMonIcon_Seaking
- .4byte gMonIcon_Staryu
- .4byte gMonIcon_Starmie
- .4byte gMonIcon_Mrmime
- .4byte gMonIcon_Scyther
- .4byte gMonIcon_Jynx
- .4byte gMonIcon_Electabuzz
- .4byte gMonIcon_Magmar
- .4byte gMonIcon_Pinsir
- .4byte gMonIcon_Tauros
- .4byte gMonIcon_Magikarp
- .4byte gMonIcon_Gyarados
- .4byte gMonIcon_Lapras
- .4byte gMonIcon_Ditto
- .4byte gMonIcon_Eevee
- .4byte gMonIcon_Vaporeon
- .4byte gMonIcon_Jolteon
- .4byte gMonIcon_Flareon
- .4byte gMonIcon_Porygon
- .4byte gMonIcon_Omanyte
- .4byte gMonIcon_Omastar
- .4byte gMonIcon_Kabuto
- .4byte gMonIcon_Kabutops
- .4byte gMonIcon_Aerodactyl
- .4byte gMonIcon_Snorlax
- .4byte gMonIcon_Articuno
- .4byte gMonIcon_Zapdos
- .4byte gMonIcon_Moltres
- .4byte gMonIcon_Dratini
- .4byte gMonIcon_Dragonair
- .4byte gMonIcon_Dragonite
- .4byte gMonIcon_Mewtwo
- .4byte gMonIcon_Mew
- .4byte gMonIcon_Chikorita
- .4byte gMonIcon_Bayleef
- .4byte gMonIcon_Meganium
- .4byte gMonIcon_Cyndaquil
- .4byte gMonIcon_Quilava
- .4byte gMonIcon_Typhlosion
- .4byte gMonIcon_Totodile
- .4byte gMonIcon_Croconaw
- .4byte gMonIcon_Feraligatr
- .4byte gMonIcon_Sentret
- .4byte gMonIcon_Furret
- .4byte gMonIcon_Hoothoot
- .4byte gMonIcon_Noctowl
- .4byte gMonIcon_Ledyba
- .4byte gMonIcon_Ledian
- .4byte gMonIcon_Spinarak
- .4byte gMonIcon_Ariados
- .4byte gMonIcon_Crobat
- .4byte gMonIcon_Chinchou
- .4byte gMonIcon_Lanturn
- .4byte gMonIcon_Pichu
- .4byte gMonIcon_Cleffa
- .4byte gMonIcon_Igglybuff
- .4byte gMonIcon_Togepi
- .4byte gMonIcon_Togetic
- .4byte gMonIcon_Natu
- .4byte gMonIcon_Xatu
- .4byte gMonIcon_Mareep
- .4byte gMonIcon_Flaaffy
- .4byte gMonIcon_Ampharos
- .4byte gMonIcon_Bellossom
- .4byte gMonIcon_Marill
- .4byte gMonIcon_Azumarill
- .4byte gMonIcon_Sudowoodo
- .4byte gMonIcon_Politoed
- .4byte gMonIcon_Hoppip
- .4byte gMonIcon_Skiploom
- .4byte gMonIcon_Jumpluff
- .4byte gMonIcon_Aipom
- .4byte gMonIcon_Sunkern
- .4byte gMonIcon_Sunflora
- .4byte gMonIcon_Yanma
- .4byte gMonIcon_Wooper
- .4byte gMonIcon_Quagsire
- .4byte gMonIcon_Espeon
- .4byte gMonIcon_Umbreon
- .4byte gMonIcon_Murkrow
- .4byte gMonIcon_Slowking
- .4byte gMonIcon_Misdreavus
- .4byte gMonIcon_UnownA
- .4byte gMonIcon_Wobbuffet
- .4byte gMonIcon_Girafarig
- .4byte gMonIcon_Pineco
- .4byte gMonIcon_Forretress
- .4byte gMonIcon_Dunsparce
- .4byte gMonIcon_Gligar
- .4byte gMonIcon_Steelix
- .4byte gMonIcon_Snubbull
- .4byte gMonIcon_Granbull
- .4byte gMonIcon_Qwilfish
- .4byte gMonIcon_Scizor
- .4byte gMonIcon_Shuckle
- .4byte gMonIcon_Heracross
- .4byte gMonIcon_Sneasel
- .4byte gMonIcon_Teddiursa
- .4byte gMonIcon_Ursaring
- .4byte gMonIcon_Slugma
- .4byte gMonIcon_Magcargo
- .4byte gMonIcon_Swinub
- .4byte gMonIcon_Piloswine
- .4byte gMonIcon_Corsola
- .4byte gMonIcon_Remoraid
- .4byte gMonIcon_Octillery
- .4byte gMonIcon_Delibird
- .4byte gMonIcon_Mantine
- .4byte gMonIcon_Skarmory
- .4byte gMonIcon_Houndour
- .4byte gMonIcon_Houndoom
- .4byte gMonIcon_Kingdra
- .4byte gMonIcon_Phanpy
- .4byte gMonIcon_Donphan
- .4byte gMonIcon_Porygon2
- .4byte gMonIcon_Stantler
- .4byte gMonIcon_Smeargle
- .4byte gMonIcon_Tyrogue
- .4byte gMonIcon_Hitmontop
- .4byte gMonIcon_Smoochum
- .4byte gMonIcon_Elekid
- .4byte gMonIcon_Magby
- .4byte gMonIcon_Miltank
- .4byte gMonIcon_Blissey
- .4byte gMonIcon_Raikou
- .4byte gMonIcon_Entei
- .4byte gMonIcon_Suicune
- .4byte gMonIcon_Larvitar
- .4byte gMonIcon_Pupitar
- .4byte gMonIcon_Tyranitar
- .4byte gMonIcon_Lugia
- .4byte gMonIcon_HoOh
- .4byte gMonIcon_Celebi
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_Treecko
- .4byte gMonIcon_Grovyle
- .4byte gMonIcon_Sceptile
- .4byte gMonIcon_Torchic
- .4byte gMonIcon_Combusken
- .4byte gMonIcon_Blaziken
- .4byte gMonIcon_Mudkip
- .4byte gMonIcon_Marshtomp
- .4byte gMonIcon_Swampert
- .4byte gMonIcon_Poochyena
- .4byte gMonIcon_Mightyena
- .4byte gMonIcon_Zigzagoon
- .4byte gMonIcon_Linoone
- .4byte gMonIcon_Wurmple
- .4byte gMonIcon_Silcoon
- .4byte gMonIcon_Beautifly
- .4byte gMonIcon_Cascoon
- .4byte gMonIcon_Dustox
- .4byte gMonIcon_Lotad
- .4byte gMonIcon_Lombre
- .4byte gMonIcon_Ludicolo
- .4byte gMonIcon_Seedot
- .4byte gMonIcon_Nuzleaf
- .4byte gMonIcon_Shiftry
- .4byte gMonIcon_Nincada
- .4byte gMonIcon_Ninjask
- .4byte gMonIcon_Shedinja
- .4byte gMonIcon_Taillow
- .4byte gMonIcon_Swellow
- .4byte gMonIcon_Shroomish
- .4byte gMonIcon_Breloom
- .4byte gMonIcon_Spinda
- .4byte gMonIcon_Wingull
- .4byte gMonIcon_Pelipper
- .4byte gMonIcon_Surskit
- .4byte gMonIcon_Masquerain
- .4byte gMonIcon_Wailmer
- .4byte gMonIcon_Wailord
- .4byte gMonIcon_Skitty
- .4byte gMonIcon_Delcatty
- .4byte gMonIcon_Kecleon
- .4byte gMonIcon_Baltoy
- .4byte gMonIcon_Claydol
- .4byte gMonIcon_Nosepass
- .4byte gMonIcon_Torkoal
- .4byte gMonIcon_Sableye
- .4byte gMonIcon_Barboach
- .4byte gMonIcon_Whiscash
- .4byte gMonIcon_Luvdisc
- .4byte gMonIcon_Corphish
- .4byte gMonIcon_Crawdaunt
- .4byte gMonIcon_Feebas
- .4byte gMonIcon_Milotic
- .4byte gMonIcon_Carvanha
- .4byte gMonIcon_Sharpedo
- .4byte gMonIcon_Trapinch
- .4byte gMonIcon_Vibrava
- .4byte gMonIcon_Flygon
- .4byte gMonIcon_Makuhita
- .4byte gMonIcon_Hariyama
- .4byte gMonIcon_Electrike
- .4byte gMonIcon_Manectric
- .4byte gMonIcon_Numel
- .4byte gMonIcon_Camerupt
- .4byte gMonIcon_Spheal
- .4byte gMonIcon_Sealeo
- .4byte gMonIcon_Walrein
- .4byte gMonIcon_Cacnea
- .4byte gMonIcon_Cacturne
- .4byte gMonIcon_Snorunt
- .4byte gMonIcon_Glalie
- .4byte gMonIcon_Lunatone
- .4byte gMonIcon_Solrock
- .4byte gMonIcon_Azurill
- .4byte gMonIcon_Spoink
- .4byte gMonIcon_Grumpig
- .4byte gMonIcon_Plusle
- .4byte gMonIcon_Minun
- .4byte gMonIcon_Mawile
- .4byte gMonIcon_Meditite
- .4byte gMonIcon_Medicham
- .4byte gMonIcon_Swablu
- .4byte gMonIcon_Altaria
- .4byte gMonIcon_Wynaut
- .4byte gMonIcon_Duskull
- .4byte gMonIcon_Dusclops
- .4byte gMonIcon_Roselia
- .4byte gMonIcon_Slakoth
- .4byte gMonIcon_Vigoroth
- .4byte gMonIcon_Slaking
- .4byte gMonIcon_Gulpin
- .4byte gMonIcon_Swalot
- .4byte gMonIcon_Tropius
- .4byte gMonIcon_Whismur
- .4byte gMonIcon_Loudred
- .4byte gMonIcon_Exploud
- .4byte gMonIcon_Clamperl
- .4byte gMonIcon_Huntail
- .4byte gMonIcon_Gorebyss
- .4byte gMonIcon_Absol
- .4byte gMonIcon_Shuppet
- .4byte gMonIcon_Banette
- .4byte gMonIcon_Seviper
- .4byte gMonIcon_Zangoose
- .4byte gMonIcon_Relicanth
- .4byte gMonIcon_Aron
- .4byte gMonIcon_Lairon
- .4byte gMonIcon_Aggron
- .4byte gMonIcon_Castform
- .4byte gMonIcon_Volbeat
- .4byte gMonIcon_Illumise
- .4byte gMonIcon_Lileep
- .4byte gMonIcon_Cradily
- .4byte gMonIcon_Anorith
- .4byte gMonIcon_Armaldo
- .4byte gMonIcon_Ralts
- .4byte gMonIcon_Kirlia
- .4byte gMonIcon_Gardevoir
- .4byte gMonIcon_Bagon
- .4byte gMonIcon_Shelgon
- .4byte gMonIcon_Salamence
- .4byte gMonIcon_Beldum
- .4byte gMonIcon_Metang
- .4byte gMonIcon_Metagross
- .4byte gMonIcon_Regirock
- .4byte gMonIcon_Regice
- .4byte gMonIcon_Registeel
- .4byte gMonIcon_Kyogre
- .4byte gMonIcon_Groudon
- .4byte gMonIcon_Rayquaza
- .4byte gMonIcon_Latias
- .4byte gMonIcon_Latios
- .4byte gMonIcon_Jirachi
- .4byte gMonIcon_Deoxys
- .4byte gMonIcon_Chimecho
- .4byte gMonIcon_Egg
- .4byte gMonIcon_UnownB
- .4byte gMonIcon_UnownC
- .4byte gMonIcon_UnownD
- .4byte gMonIcon_UnownE
- .4byte gMonIcon_UnownF
- .4byte gMonIcon_UnownG
- .4byte gMonIcon_UnownH
- .4byte gMonIcon_UnownI
- .4byte gMonIcon_UnownJ
- .4byte gMonIcon_UnownK
- .4byte gMonIcon_UnownL
- .4byte gMonIcon_UnownM
- .4byte gMonIcon_UnownN
- .4byte gMonIcon_UnownO
- .4byte gMonIcon_UnownP
- .4byte gMonIcon_UnownQ
- .4byte gMonIcon_UnownR
- .4byte gMonIcon_UnownS
- .4byte gMonIcon_UnownT
- .4byte gMonIcon_UnownU
- .4byte gMonIcon_UnownV
- .4byte gMonIcon_UnownW
- .4byte gMonIcon_UnownX
- .4byte gMonIcon_UnownY
- .4byte gMonIcon_UnownZ
- .4byte gMonIcon_UnownExclamationMark
- .4byte gMonIcon_UnownQuestionMark
diff --git a/data/party_menu.s b/data/party_menu.s
index 36ee4f960..a21b985c1 100644
--- a/data/party_menu.s
+++ b/data/party_menu.s
@@ -166,10 +166,51 @@ gUnknown_08615AF1:: @ 8615AF1
.incbin "baserom.gba", 0x615af1, 0x3
gUnknown_08615AF4:: @ 8615AF4
- .incbin "baserom.gba", 0x615af4, 0x6c
+ .4byte gUnknown_085E9E43
+ .4byte gUnknown_085EA010
+ .4byte gUnknown_085EA02A
+ .4byte gUnknown_085E9E55
+ .4byte gUnknown_085E9E64
+ .4byte gUnknown_085E9E79
+ .4byte gUnknown_085E9E8F
+ .4byte gUnknown_085E9EBC
+ .4byte gUnknown_085E9ED4
+ .4byte gUnknown_085E9EE9
+ .4byte gUnknown_085E9FDB
+ .4byte gUnknown_085EA046
+ .4byte gUnknown_085EA05B
+ .4byte gUnknown_085E9F01
+ .4byte gUnknown_085E9F58
+ .4byte gUnknown_085E9F6F
+ .4byte gUnknown_085E9F81
+ .4byte gUnknown_085E9F90
+ .4byte gUnknown_085E9FA7
+ .4byte gUnknown_085E9FC2
+ .4byte gText_EmptyString2
+ .4byte gUnknown_085E9EA6
+ .4byte gUnknown_085E9F16
+ .4byte gUnknown_085E9F2A
+ .4byte gUnknown_085E9F42
+ .4byte gUnknown_085E9FF9
+ .4byte gUnknown_085EA073
gUnknown_08615B60:: @ 8615B60
- .incbin "baserom.gba", 0x615b60, 0xa8
+ .4byte gUnknown_085EA091
+ .4byte gUnknown_085EA099
+ .4byte gUnknown_085EA09E
+ .4byte gUnknown_085EA0A4
+ .4byte gUnknown_085EA0AB
+ .4byte gUnknown_085EA0E7
+ .4byte gUnknown_085EA0B1
+ .4byte gUnknown_085EA0B6
+ .4byte gUnknown_085EA0BF
+ .4byte gUnknown_085EA0C5
+ .4byte gUnknown_085EA0CF
+ .4byte gUnknown_085EA0D7
+ .4byte gUnknown_085EA0DC
+
+gUnknown_08615B94:: @ 8615B94
+ .incbin "baserom.gba", 0x615b94, 0x74
gUnknown_08615C08:: @ 8615C08
.incbin "baserom.gba", 0x615c08, 0x130
@@ -187,22 +228,28 @@ gUnknown_08615D9C:: @ 8615D9C
.incbin "baserom.gba", 0x615d9c, 0x70
gUnknown_08615E0C:: @ 8615E0C
- .incbin "baserom.gba", 0x615e0c, 0xa4
+ .incbin "baserom.gba", 0x615e0c, 0x24
+
+gUnknown_08615E30:: @ 8615E30
+ .incbin "baserom.gba", 0x615e30, 0x40
+
+gUnknown_08615E70:: @ 8615E70
+ .incbin "baserom.gba", 0x615e70, 0x40
gUnknown_08615EB0:: @ 8615EB0
- .incbin "baserom.gba", 0x615eb0, 0x8
+ obj_tiles gUnknown_08615E30, 0x40, 55120
gUnknown_08615EB8:: @ 8615EB8
- .incbin "baserom.gba", 0x615eb8, 0x8
+ obj_pal gUnknown_08615E70, 55120
gUnknown_08615EC0:: @ 8615EC0
.incbin "baserom.gba", 0x615ec0, 0x38
gUnknown_08615EF8:: @ 8615EF8
- .incbin "baserom.gba", 0x615ef8, 0x8
+ obj_tiles gUnknown_08D96CD8, 0x400, 1200
gUnknown_08615F00:: @ 8615F00
- .incbin "baserom.gba", 0x615f00, 0x8
+ obj_pal gUnknown_08D96F6C, 1200
gUnknown_08615F08:: @ 8615F08
.incbin "baserom.gba", 0x615f08, 0x68
@@ -214,10 +261,10 @@ gUnknown_08615F78:: @ 8615F78
.incbin "baserom.gba", 0x615f78, 0x80
gUnknown_08615FF8:: @ 8615FF8
- .incbin "baserom.gba", 0x615ff8, 0x8
+ obj_tiles gUnknown_08D96F90, 0x400, 1202
gUnknown_08616000:: @ 8616000
- .incbin "baserom.gba", 0x616000, 0x8
+ obj_pal gUnknown_08D97188, 1202
gUnknown_08616008:: @ 8616008
.incbin "baserom.gba", 0x616008, 0x18
diff --git a/data/pokedex.s b/data/pokedex.s
index 3ba94dbc5..d0c286ab6 100644
--- a/data/pokedex.s
+++ b/data/pokedex.s
@@ -3,60 +3,24 @@
.section .rodata
.align 2, 0
-
-gUnknown_0855C6A4:: @ 855C6A4
- .incbin "baserom.gba", 0x55c6a4, 0x336
-
-gUnknown_0855C9DA:: @ 855C9DA
- .incbin "baserom.gba", 0x55c9da, 0x304
-
-gUnknown_0855CCDE:: @ 855CCDE
- .incbin "baserom.gba", 0x55ccde, 0x4b6
-
-gUnknown_0855D194:: @ 855D194
- .incbin "baserom.gba", 0x55d194, 0x18
-
-gUnknown_0855D1AC:: @ 855D1AC
- .incbin "baserom.gba", 0x55d1ac, 0x18
-
-gUnknown_0855D1C4:: @ 855D1C4
- .incbin "baserom.gba", 0x55d1c4, 0x18
-
-gUnknown_0855D1DC:: @ 855D1DC
- .incbin "baserom.gba", 0x55d1dc, 0x18
-
-gUnknown_0855D1F4:: @ 855D1F4
- .incbin "baserom.gba", 0x55d1f4, 0x18
-
-gUnknown_0855D20C:: @ 855D20C
- .incbin "baserom.gba", 0x55d20c, 0x18
-
-gUnknown_0855D224:: @ 855D224
- .incbin "baserom.gba", 0x55d224, 0x18
-
-gUnknown_0855D23C:: @ 855D23C
- .incbin "baserom.gba", 0x55d23c, 0x18
-
-gUnknown_0855D254:: @ 855D254
- .incbin "baserom.gba", 0x55d254, 0x18
-
-gUnknown_0855D26C:: @ 855D26C
- .incbin "baserom.gba", 0x55d26c, 0x10
-
-gUnknown_0855D27C:: @ 855D27C
- .incbin "baserom.gba", 0x55d27c, 0x10
-
-gUnknown_0855D28C:: @ 855D28C
- .incbin "baserom.gba", 0x55d28c, 0x5
-
-gUnknown_0855D291:: @ 855D291
- .incbin "baserom.gba", 0x55d291, 0x7
-
-gUnknown_0855D298:: @ 855D298
- .incbin "baserom.gba", 0x55d298, 0x10
-
-gUnknown_0855D2A8:: @ 855D2A8
- .incbin "baserom.gba", 0x55d2a8, 0x10
+
+.macro unk_dex_struct texts, a2, a3, a4
+ .4byte \texts
+ .byte \a2, \a3, \a4
+ .byte 0 @padding
+.endm
+
+.macro unk_dex_struct_2 text, a2, a3, a4, a5, a6, a7
+ .4byte \text
+ .byte \a2, \a3, \a4, \a5, \a6, \a7
+ .2byte 0 @padding
+.endm
+
+.macro unk_dex_struct_3 text, a2, a3, a4
+ .4byte \text
+ .byte \a2, \a3, \a4
+ .byte 0 @padding
+.endm
gUnknown_0855D2B8:: @ 855D2B8
.incbin "baserom.gba", 0x55d2b8, 0x6
@@ -64,8 +28,10 @@ gUnknown_0855D2B8:: @ 855D2B8
gUnknown_0855D2BE:: @ 855D2BE
.incbin "baserom.gba", 0x55d2be, 0x40
-gUnknown_0855D2FE:: @ 855D2FE
- .incbin "baserom.gba", 0x55d2fe, 0xe
+sText_TenDashes:: @ 855D2FE
+ .string "----------$"
+
+.align 2
gUnknown_0855D30C:: @ 855D30C
.string "$"
@@ -101,10 +67,18 @@ gUnknown_0856ED08:: @ 856ED08
.incbin "baserom.gba", 0x56ed08, 0x28
gUnknown_0856ED30:: @ 856ED30
- .incbin "baserom.gba", 0x56ed30, 0x18
+ unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5
+ unk_dex_struct_3 gUnknown_085E87D6, 6, 0, 5
+ unk_dex_struct_3 gUnknown_085E87EF, 12, 0, 5
gUnknown_0856ED48:: @ 856ED48
- .incbin "baserom.gba", 0x56ed48, 0x54
+ unk_dex_struct_2 gUnknown_085E8840, 0, 2, 5, 5, 2, 12
+ unk_dex_struct_2 gUnknown_085E887C, 0, 4, 5, 5, 4, 12
+ unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 5, 6, 6
+ unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 11, 6, 6
+ unk_dex_struct_2 gUnknown_085E881F, 0, 8, 5, 5, 8, 12
+ unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12
+ unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0
gUnknown_0856ED9C:: @ 856ED9C
.incbin "baserom.gba", 0x56ed9c, 0x1c
@@ -119,19 +93,119 @@ gUnknown_0856EDF0:: @ 856EDF0
.incbin "baserom.gba", 0x56edf0, 0x1c
gUnknown_0856EE0C:: @ 856EE0C
- .incbin "baserom.gba", 0x56ee0c, 0x18
+ .4byte gUnknown_085E89A4
+ .4byte gUnknown_085E88DF
+ .4byte gUnknown_085E89BB
+ .4byte gUnknown_085E88E9
+ .4byte NULL
+ .4byte NULL
gUnknown_0856EE24:: @ 856EE24
- .incbin "baserom.gba", 0x56ee24, 0x38
+ .4byte gUnknown_085E89D4
+ .4byte gUnknown_085E88F6
+ .4byte gUnknown_085E8A02
+ .4byte gUnknown_085E8905
+ .4byte gUnknown_085E8A37
+ .4byte gUnknown_085E8911
+ .4byte gUnknown_085E8A73
+ .4byte gUnknown_085E891F
+ .4byte gUnknown_085E8AAF
+ .4byte gUnknown_085E892D
+ .4byte gUnknown_085E8AEA
+ .4byte gUnknown_085E893A
+ .4byte 0
+ .4byte 0
gUnknown_0856EE5C:: @ 856EE5C
- .incbin "baserom.gba", 0x56ee5c, 0x58
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8B26
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8948
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E894C
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8950
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8954
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8958
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E895C
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8960
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8964
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8968
+ .4byte 0
+ .4byte 0
gUnknown_0856EEB4:: @ 856EEB4
- .incbin "baserom.gba", 0x56eeb4, 0x60
-
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8B26
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E896B
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E896F
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8974
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E897B
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8981
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8987
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E898D
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8994
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8999
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E899F
+ .4byte 0
+ .4byte 0
+
+@ read from type table for each type except ???, entry is 7 byte of length
gUnknown_0856EF14:: @ 856EF14
- .incbin "baserom.gba", 0x56ef14, 0x98
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8B35
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 0
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 7
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 14
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 21
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 28
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 35
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 42
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 49
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 56
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 70
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 77
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 84
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 91
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 98
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 105
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 112
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 119
+ .4byte 0
+ .4byte 0
gUnknown_0856EFAC:: @ 856EFAC
.incbin "baserom.gba", 0x56efac, 0x2
@@ -143,7 +217,12 @@ gUnknown_0856EFB4:: @ 856EFB4
.incbin "baserom.gba", 0x56efb4, 0x14
gUnknown_0856EFC8:: @ 856EFC8
- .incbin "baserom.gba", 0x56efc8, 0x30
+ unk_dex_struct gUnknown_0856EE5C, 6, 7, 10
+ unk_dex_struct gUnknown_0856EEB4, 8, 9, 11
+ unk_dex_struct gUnknown_0856EF14, 10,11, 18
+ unk_dex_struct gUnknown_0856EF14, 12, 13, 18
+ unk_dex_struct gUnknown_0856EE24, 4, 5, 6
+ unk_dex_struct gUnknown_0856EE0C, 2, 3, 2
gUnknown_0856EFF8:: @ 856EFF8
.incbin "baserom.gba", 0x56eff8, 0x10
diff --git a/data/pokemon_icon.s b/data/pokemon_icon.s
deleted file mode 100644
index 9d6c7ac2e..000000000
--- a/data/pokemon_icon.s
+++ /dev/null
@@ -1,27 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-@ 857BCA8
- .include "data/graphics/pokemon/icon_table.inc"
-
-@ 857C388
- .include "data/graphics/pokemon/icon_palette_indices.inc"
-
-@ 857C540
- .include "data/graphics/pokemon/icon_palette_table.inc"
-
-gUnknown_0857C570:: @ 857C570
- .incbin "baserom.gba", 0x57c570, 0x44
-
-gUnknown_0857C5B4:: @ 857C5B4
- .incbin "baserom.gba", 0x57c5b4, 0x14
- .incbin "baserom.gba", 0x57c5c8, 0x20
-
-gUnknown_0857C5E8:: @ 857C5E8
- .incbin "baserom.gba", 0x57c5e8, 0x8
-
-gUnknown_0857C5F0:: @ 857C5F0
- .incbin "baserom.gba", 0x57c5f0, 0x18
diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s
index 4f2815713..4c630c923 100644
--- a/data/pokemon_storage_system.s
+++ b/data/pokemon_storage_system.s
@@ -4,21 +4,6 @@
.section .rodata
.align 2, 0
-gUnknown_085716C0:: @ 85716C0
- .incbin "baserom.gba", 0x5716c0, 0x28
-
-gUnknown_085716E8:: @ 85716E8
- .incbin "baserom.gba", 0x5716e8, 0x28
-
-gUnknown_08571710:: @ 8571710
- .incbin "baserom.gba", 0x571710, 0x24
-
-gUnknown_08571734:: @ 8571734
- .incbin "baserom.gba", 0x571734, 0x3
-
-gUnknown_08571737:: @ 8571737
- .incbin "baserom.gba", 0x571737, 0x5
-
gUnknown_0857173C:: @ 857173C
.incbin "baserom.gba", 0x57173c, 0x20
@@ -59,7 +44,13 @@ gUnknown_085724A4:: @ 85724A4
.incbin "baserom.gba", 0x5724a4, 0x18
gUnknown_085724BC:: @ 85724BC
- .incbin "baserom.gba", 0x5724bc, 0x238
+ .incbin "baserom.gba", 0x5724bc, 0x18
+
+gUnknown_085724D4:: @ 85724D4
+ .incbin "baserom.gba", 0x5724d4, 0x20
+
+gUnknown_085724F4:: @ 85724F4
+ .incbin "baserom.gba", 0x5724f4, 0x200
gUnknown_085726F4:: @ 85726F4
.incbin "baserom.gba", 0x5726f4, 0x20
@@ -71,28 +62,126 @@ gUnknown_08572734:: @ 8572734
.incbin "baserom.gba", 0x572734, 0x10
gUnknown_08572744:: @ 8572744
- .incbin "baserom.gba", 0x572744, 0x8
+ obj_pal gUnknown_085724D4, 0xDACA
gUnknown_0857274C:: @ 857274C
- .incbin "baserom.gba", 0x57274c, 0x8
+ obj_tiles gUnknown_085724F4, 0x1C0, 5
gUnknown_08572754:: @ 8572754
- .incbin "baserom.gba", 0x572754, 0x18
+ spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857276C:: @ 857276C
- .incbin "baserom.gba", 0x57276c, 0xf8
+ .4byte gUnknown_085EB7EF, 0
+ .4byte gUnknown_085EB802, 0
+ .4byte gUnknown_085EB81A, 0
+ .4byte gUnknown_085EB82F, 0
+ .4byte gUnknown_085EB843, 1
+ .4byte gUnknown_085EB853, 0
+ .4byte gUnknown_085EB866, 0
+ .4byte gUnknown_085EB87C, 1
+ .4byte gUnknown_085EB88E, 0
+ .4byte gUnknown_085EB89F, 0
+ .4byte gUnknown_085EB8B5, 4
+ .4byte gUnknown_085EB8C6, 6
+ .4byte gUnknown_085EB8D3, 0
+ .4byte gUnknown_085EB8E6, 0
+ .4byte gUnknown_085EB900, 0
+ .4byte gUnknown_085EB913, 0
+ .4byte gUnknown_085EB92D, 0
+ .4byte gUnknown_085EB946, 0
+ .4byte gUnknown_085EB960, 0
+ .4byte gUnknown_085EB979, 1
+ .4byte gUnknown_085EB987, 0
+ .4byte gUnknown_085EB9A1, 0
+ .4byte gUnknown_085EB9AB, 0
+ .4byte gUnknown_085EB843, 7
+ .4byte gUnknown_085EB9C3, 0
+ .4byte gUnknown_085EB9D6, 7
+ .4byte gUnknown_085EB9EE, 0
+ .4byte gUnknown_085EB9FF, 0
+ .4byte gUnknown_085EBA19, 7
+ .4byte gUnknown_085EBA29, 7
+ .4byte gUnknown_085EBA38, 0
+
+ .align 2
gUnknown_08572864:: @ 8572864
- .incbin "baserom.gba", 0x572864, 0x58
+ window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C
+
+ .align 2
+gOamData_857286C:: @ 857286C
+ .2byte 0x0000
+ .2byte 0xC000
+ .2byte 0x0000
+
+ .align 2
+gOamData_8572874:: @ 8572874
+ .2byte 0x4000
+ .2byte 0x0000
+ .2byte 0x0000
+
+ .align 2
+gSpriteAnim_857287C:: @ 857287C
+ obj_image_anim_frame 0, 5
+ obj_image_anim_end
+
+ .align 2
+gSpriteAnim_8572884:: @ 8572884
+ obj_image_anim_frame 2, 8
+ obj_image_anim_frame 4, 8
+ obj_image_anim_frame 6, 8
+ obj_image_anim_jump 0
+
+ .align 2
+gSpriteAnim_8572894:: @ 8572894
+ obj_image_anim_frame 8, 5
+ obj_image_anim_end
+
+ .align 2
+gSpriteAnim_857289C:: @ 857289C
+ obj_image_anim_frame 10, 8
+ obj_image_anim_frame 4, 8
+ obj_image_anim_frame 12, 8
+ obj_image_anim_jump 0
+
+ .align 2
+gSpriteAnimTable_85728AC:: @ 85728AC
+ .4byte gSpriteAnim_857287C
+ .4byte gSpriteAnim_8572884
+ .4byte gSpriteAnim_8572894
+ .4byte gSpriteAnim_857289C
gUnknown_085728BC:: @ 85728BC
- .incbin "baserom.gba", 0x5728bc, 0x18
+ spr_template 5, 0xDACA, gOamData_8572874, gSpriteAnimTable_85728AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ .align 2
gUnknown_085728D4:: @ 85728D4
- .incbin "baserom.gba", 0x5728d4, 0x48
-
-gUnknown_0857291C:: @ 857291C
- .incbin "baserom.gba", 0x57291c, 0x4c58
+ spr_template 0x12, 0xDAC0, gOamData_85728EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+ .align 2
+gOamData_85728EC:: @ 85728EC
+ .2byte 0x0000
+ .2byte 0x8000
+ .2byte 0x0000
+
+ .align 2
+gSpriteAffineAnim_85728F4:: @ 85728F4
+ obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120
+ obj_rot_scal_anim_end
+
+ .align 2
+gSpriteAffineAnim_8572904:: @ 8572904
+ obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
+ obj_rot_scal_anim_frame 0x10, 0x10, 0, 15
+ obj_rot_scal_anim_end
+
+ .align 2
+gSpriteAffineAnimTable_857291C:: @ 857291C
+ .4byte gSpriteAffineAnim_85728F4
+ .4byte gSpriteAffineAnim_8572904
+
+gUnknown_08572924:: @ 8572924
+ .incbin "baserom.gba", 0x572924, 0x4c50
gUnknown_08577574:: @ 8577574
.incbin "baserom.gba", 0x577574, 0x44
diff --git a/data/pokenav.s b/data/pokenav.s
index 8e8e24b65..3f07eb0d5 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -4,7 +4,117 @@
.section .rodata
gUnknown_0861F3EC:: @ 861F3EC
- .incbin "baserom.gba", 0x61f3ec, 0x618
+ .4byte sub_81C9298
+ .4byte sub_81C941C
+ .4byte sub_81C9924
+ .4byte sub_81C9990
+ .4byte sub_81C99C0
+ .4byte sub_81C9430
+ .4byte sub_81C99D4
+ .4byte sub_81C9298
+ .4byte sub_81C941C
+ .4byte sub_81C9940
+ .4byte sub_81C9990
+ .4byte sub_81C99C0
+ .4byte sub_81C9430
+ .4byte sub_81C99D4
+ .4byte sub_81C9338
+ .4byte sub_81C941C
+ .4byte sub_81C9940
+ .4byte sub_81C9990
+ .4byte sub_81C99C0
+ .4byte sub_81C9430
+ .4byte sub_81C99D4
+ .4byte sub_81C9368
+ .4byte sub_81C941C
+ .4byte sub_81C9940
+ .4byte sub_81C9990
+ .4byte sub_81C99C0
+ .4byte sub_81C9430
+ .4byte sub_81C99D4
+ .4byte sub_81C92CC
+ .4byte sub_81C941C
+ .4byte sub_81C9940
+ .4byte sub_81C9990
+ .4byte sub_81C99C0
+ .4byte sub_81C9430
+ .4byte sub_81C99D4
+ .4byte sub_81C9304
+ .4byte sub_81C941C
+ .4byte sub_81C9940
+ .4byte sub_81C9990
+ .4byte sub_81C99C0
+ .4byte sub_81C9430
+ .4byte sub_81C99D4
+ .4byte sub_81CC4D4
+ .4byte sub_81CC554
+ .4byte sub_81CC5F4
+ .4byte sub_81CC62C
+ .4byte sub_81CC65C
+ .4byte sub_81CC524
+ .4byte sub_81CC670
+ .4byte sub_81CCFD8
+ .4byte sub_81CD070
+ .4byte sub_81CDDD4
+ .4byte sub_81CDE2C
+ .4byte sub_81CDE64
+ .4byte sub_81CD1C0
+ .4byte sub_81CECA0
+ .4byte sub_81CEF3C
+ .4byte sub_81CEFDC
+ .4byte sub_81CF330
+ .4byte sub_81CF3A0
+ .4byte sub_81CF3D0
+ .4byte sub_81CEFF0
+ .4byte sub_81CF3F8
+ .4byte sub_81CD024
+ .4byte sub_81CD070
+ .4byte sub_81CDDD4
+ .4byte sub_81CDE2C
+ .4byte sub_81CDE64
+ .4byte sub_81CD1C0
+ .4byte sub_81CECA0
+ .4byte sub_81CEF98
+ .4byte sub_81CEFDC
+ .4byte sub_81CF368
+ .4byte sub_81CF3A0
+ .4byte sub_81CF3D0
+ .4byte sub_81CEFF0
+ .4byte sub_81CF3F8
+ .4byte sub_81CAAE8
+ .4byte sub_81CAB24
+ .4byte sub_81CB260
+ .4byte sub_81CB29C
+ .4byte sub_81CB2CC
+ .4byte sub_81CAB38
+ .4byte sub_81CB2E0
+ .4byte sub_81CF9BC
+ .4byte sub_81CFA34
+ .4byte sub_81CFDD0
+ .4byte sub_81CFE40
+ .4byte sub_81CFE70
+ .4byte sub_81CFA48
+ .4byte sub_81CFE98
+ .4byte sub_81D0450
+ .4byte sub_81D04A0
+ .4byte sub_81D0978
+ .4byte sub_81D09B0
+ .4byte sub_81D09E0
+ .4byte sub_81D04B8
+ .4byte sub_81D09F4
+ .4byte sub_81CFA04
+ .4byte sub_81CFA34
+ .4byte sub_81CFE08
+ .4byte sub_81CFE40
+ .4byte sub_81CFE70
+ .4byte sub_81CFA48
+ .4byte sub_81CFE98
+
+gUnknown_0861F590:: @ 861F590
+ .incbin "baserom.gba", 0x61F590, 0x20
+
+gUnknown_0861F5B0:: @ 861F5B0
+ .incbin "baserom.gba", 0x61f5b0, 0x454
gUnknown_0861FA04:: @ 861FA04
.incbin "baserom.gba", 0x61fa04, 0x4
@@ -13,31 +123,86 @@ gUnknown_0861FA08:: @ 861FA08
.incbin "baserom.gba", 0x61fa08, 0x10
gUnknown_0861FA18:: @ 861FA18
- .incbin "baserom.gba", 0x61fa18, 0x30
+ .4byte gUnknown_085EBED5
+ .4byte gUnknown_085EBED9
+ .4byte gUnknown_085EBEE9
+ .4byte gUnknown_085EBEF9
+ .4byte gUnknown_085EBF0E
+ .4byte gUnknown_085EBF22
+ .4byte gUnknown_085EBF39
+ .4byte gUnknown_085EBF49
+ .4byte gUnknown_085EBF57
+ .4byte gUnknown_085EBF60
+ .4byte gUnknown_085EBF73
+ .4byte gUnknown_085EBF84
gUnknown_0861FA48:: @ 861FA48
.incbin "baserom.gba", 0x61fa48, 0x4
gUnknown_0861FA4C:: @ 861FA4C
- .incbin "baserom.gba", 0x61fa4c, 0x8
+ obj_tiles gUnknown_0861F5B0, 0x1000, 0
gUnknown_0861FA54:: @ 861FA54
- .incbin "baserom.gba", 0x61fa54, 0x10
+ obj_pal gUnknown_0861F590, 0
+ obj_pal NULL, 0
gUnknown_0861FA64:: @ 861FA64
- .incbin "baserom.gba", 0x61fa64, 0x8
+ obj_tiles gUnknown_08DC87F8, 0xC00, 2
gUnknown_0861FA6C:: @ 861FA6C
- .incbin "baserom.gba", 0x61fa6c, 0x30
+ obj_tiles gUnknown_08DC864C, 0x20, 3
+ obj_tiles gUnknown_08DC8208, 0x20, 1
+ obj_tiles gUnknown_08DC8AA4, 0x20, 2
+ obj_tiles gUnknown_08DC84AC, 0x20, 4
+ obj_tiles gUnknown_08DC87F8, 0x20, 0
+ obj_tiles gUnknown_08DC87F8, 0x40, 0
gUnknown_0861FA9C:: @ 861FA9C
- .incbin "baserom.gba", 0x61fa9c, 0x68
+ .4byte gUnknown_08DC8F64, 1
+ .4byte gUnknown_08DC8C14, 1
+ .4byte gUnknown_08DC8E64, 4
+ .4byte gUnknown_08DC7FA0, 1
+ .4byte gUnknown_08DC838C, 2
+ .4byte gUnknown_08DC80DC, 0
+ .4byte gUnknown_08DC8D50, 0
+
+gUnknown_0861FAD4:: @ 861FAD4
+ .2byte 0x0
+ .2byte 0x8000
+ .2byte 0x0
+ .2byte 0x0
+
+gUnknown_0861FADC::
+ obj_image_anim_frame 0, 8
+ obj_image_anim_frame 16, 8
+ obj_image_anim_frame 32, 8
+ obj_image_anim_frame 48, 8
+ obj_image_anim_frame 64, 8
+ obj_image_anim_frame 80, 8
+ obj_image_anim_frame 96, 8
+ obj_image_anim_frame 112, 8
+ obj_image_anim_jump 0
+
+gUnknown_0861FB00::
+ .4byte gUnknown_0861FADC
gUnknown_0861FB04:: @ 861FB04
- .incbin "baserom.gba", 0x61fb04, 0x28
-
+ spr_template 0, 0, gUnknown_0861FAD4, gUnknown_0861FB00, NULL, gDummySpriteAffineAnimTable, sub_81C7CB4
+
+gUnknown_0861FB1C::
+ .2byte 0x4000
+ .2byte 0xC000
+ .2byte 0x400
+ .2byte 0x0
+
+gUnknown_0861FB24::
+ .2byte 0x4000
+ .2byte 0x8000
+ .2byte 0x400
+ .2byte 0x0
+
gUnknown_0861FB2C:: @ 861FB2C
- .incbin "baserom.gba", 0x61fb2c, 0x18
+ spr_template 2, 1, gUnknown_0861FB1C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0861FB44:: @ 861FB44
.incbin "baserom.gba", 0x61fb44, 0xa0
@@ -172,7 +337,22 @@ gUnknown_08622794:: @ 8622794
.incbin "baserom.gba", 0x622794, 0x4
gUnknown_08622798:: @ 8622798
- .incbin "baserom.gba", 0x622798, 0x40
+ .4byte NULL
+ .4byte sub_81CB510
+ .4byte sub_81CB588
+ .4byte sub_81CB600
+ .4byte sub_81CB678
+ .4byte sub_81CB6F0
+ .4byte sub_81CB734
+ .4byte sub_81CB75C
+ .4byte sub_81CB7A0
+ .4byte sub_81CB824
+ .4byte sub_81CB888
+ .4byte sub_81CB93C
+ .4byte sub_81CBAD4
+ .4byte sub_81CB9C8
+ .4byte sub_81CBA68
+ .4byte sub_81CBB74
gUnknown_086227D8:: @ 86227D8
.incbin "baserom.gba", 0x6227d8, 0x8
@@ -205,28 +385,126 @@ gUnknown_08622868:: @ 8622868
.incbin "baserom.gba", 0x622868, 0x20
gUnknown_08622888:: @ 8622888
- .incbin "baserom.gba", 0x622888, 0x850
+ .incbin "baserom.gba", 0x622888, 0x1F4
+
+gUnknown_08622A7C:: @ 8622A7C
+ .incbin "baserom.gba", 0x622a7c, 0x44
+
+gUnknown_08622AC0:: @ 8622AC0
+ .incbin "baserom.gba", 0x622ac0, 0x48
+
+gUnknown_08622B08:: @ 8622B08
+ .incbin "baserom.gba", 0x622b08, 0x50
+
+gUnknown_08622B58:: @ 8622B58
+ .incbin "baserom.gba", 0x622b58, 0x60
+
+gUnknown_08622BB8:: @ 8622BB8
+ .incbin "baserom.gba", 0x622bb8, 0x4C
+
+gUnknown_08622C04:: @ 8622C04
+ .incbin "baserom.gba", 0x622c04, 0x54
+
+gUnknown_08622C58:: @ 8622C58
+ .incbin "baserom.gba", 0x622c58, 0x54
+
+gUnknown_08622CAC:: @ 8622CAC
+ .incbin "baserom.gba", 0x622cac, 0x40
+
+gUnknown_08622CEC:: @ 8622CEC
+ .incbin "baserom.gba", 0x622cec, 0x58
+
+gUnknown_08622D44:: @ 8622D44
+ .incbin "baserom.gba", 0x622d44, 0x54
+
+gUnknown_08622D98:: @ 8622D98
+ .incbin "baserom.gba", 0x622d98, 0x30
+
+gUnknown_08622DC8:: @ 8622DC8
+ .incbin "baserom.gba", 0x622dc8, 0x4C
+
+gUnknown_08622E14:: @ 8622E14
+ .incbin "baserom.gba", 0x622e14, 0x58
+
+gUnknown_08622E6C:: @ 8622E6C
+ .incbin "baserom.gba", 0x622e6c, 0x30
+
+gUnknown_08622E9C:: @ 8622E9C
+ .incbin "baserom.gba", 0x622e9c, 0x38
+
+gUnknown_08622ED4:: @ 8622ED4
+ .incbin "baserom.gba", 0x622ed4, 0x40
+
+gUnknown_08622F14:: @ 8622F14
+ .incbin "baserom.gba", 0x622f14, 0x48
+
+gUnknown_08622F5C:: @ 8622F5C
+ .incbin "baserom.gba", 0x622f5c, 0x44
+
+gUnknown_08622FA0:: @ 8622FA0
+ .incbin "baserom.gba", 0x622fa0, 0x38
+
+gUnknown_08622FD8:: @ 8622FD8
+ .incbin "baserom.gba", 0x622fd8, 0x48
+
+gUnknown_08623020:: @ 8623020
+ .incbin "baserom.gba", 0x623020, 0x5C
+
+gUnknown_0862307C:: @ 862307C
+ .incbin "baserom.gba", 0x62307c, 0x5C
gUnknown_086230D8:: @ 86230D8
.incbin "baserom.gba", 0x6230d8, 0xc
gUnknown_086230E4:: @ 86230E4
- .incbin "baserom.gba", 0x6230e4, 0x14
+ .4byte NULL
+ .4byte sub_81CC848
+ .4byte sub_81CC878
+ .4byte sub_81CC8D8
+ .4byte sub_81CC95C
gUnknown_086230F8:: @ 86230F8
- .incbin "baserom.gba", 0x6230f8, 0x8
+ obj_tiles gUnknown_08DC9208, 0x800, 6
gUnknown_08623100:: @ 8623100
- .incbin "baserom.gba", 0x623100, 0x10
+ obj_pal gUnknown_08DC91E8, 11
+ obj_pal NULL, 0
gUnknown_08623110:: @ 8623110
.incbin "baserom.gba", 0x623110, 0x8
gUnknown_08623118:: @ 8623118
- .incbin "baserom.gba", 0x623118, 0xb8
+ .4byte 0, gUnknown_08622E6C
+ .4byte 1, gUnknown_08622D98
+ .4byte 2, gUnknown_08622E9C
+ .4byte 3, gUnknown_08622A7C
+ .4byte 4, gUnknown_08622AC0
+ .4byte 5, gUnknown_08622FA0
+ .4byte 6, gUnknown_08622CAC
+ .4byte 7, gUnknown_0862307C
+ .4byte 8, gUnknown_08622B58
+ .4byte 0x10008, gUnknown_08622BB8
+ .4byte 9, gUnknown_08622D44
+ .4byte 0x10009, gUnknown_08622CEC
+ .4byte 0xA, gUnknown_08622C04
+ .4byte 0x1000A, gUnknown_08622C58
+ .4byte 0xB, gUnknown_08622B08
+ .4byte 0xC, gUnknown_08622E14
+ .4byte 0x1000C, gUnknown_08622DC8
+ .4byte 0xD, gUnknown_08623020
+ .4byte 0x1000D, gUnknown_08622FD8
+ .4byte 0xE, gUnknown_08622ED4
+ .4byte 0xF, gUnknown_08622F14
+ .4byte 0x1000F, gUnknown_08622F5C
+
+gUnknown_086231C8:: @ 86231C8
+ .2byte 0x4000
+ .2byte 0x4000
+ .2byte 0x400
+ .2byte 0x0
gUnknown_086231D0:: @ 86231D0
- .incbin "baserom.gba", 0x6231d0, 0x18
+ spr_template 6, 11, gUnknown_086231C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81CCEF4
gUnknown_086231E8:: @ 86231E8
.incbin "baserom.gba", 0x6231e8, 0x20
@@ -259,7 +537,13 @@ gUnknown_0862337C:: @ 862337C
.incbin "baserom.gba", 0x62337c, 0x8
gUnknown_08623384:: @ 8623384
- .incbin "baserom.gba", 0x623384, 0x1c
+ .4byte NULL
+ .4byte sub_81CE37C
+ .4byte sub_81CE2D0
+ .4byte sub_81CE4D8
+ .4byte sub_81CE5E4
+ .4byte sub_81CE6BC
+ .4byte sub_81CE700
gUnknown_086233A0:: @ 86233A0
.incbin "baserom.gba", 0x6233a0, 0x14
@@ -286,7 +570,13 @@ gUnknown_08623594:: @ 8623594
.incbin "baserom.gba", 0x623594, 0x4
gUnknown_08623598:: @ 8623598
- .incbin "baserom.gba", 0x623598, 0x1c
+ .4byte NULL
+ .4byte sub_81CF578
+ .4byte sub_81CF5F0
+ .4byte sub_81CF668
+ .4byte sub_81CF6E0
+ .4byte sub_81CF758
+ .4byte sub_81CF798
gUnknown_086235B4:: @ 86235B4
.incbin "baserom.gba", 0x6235b4, 0x8
@@ -346,13 +636,28 @@ gUnknown_086237F8:: @ 86237F8
.include "data/text/gift_ribbon_descriptions.inc"
gUnknown_08623FF8:: @ 8623FF8
- .incbin "baserom.gba", 0x623ff8, 0xa0
+ .incbin "baserom.gba", 0x623ff8, 0x20
+
+gUnknown_08624018:: @ 8624018
+ .incbin "baserom.gba", 0x624018, 0x20
+
+gUnknown_08624038:: @ 8624038
+ .incbin "baserom.gba", 0x624038, 0x20
+
+gUnknown_08624058:: @ 8624058
+ .incbin "baserom.gba", 0x624058, 0x20
+
+gUnknown_08624078:: @ 8624078
+ .incbin "baserom.gba", 0x624078, 0x20
gUnknown_08624098:: @ 8624098
- .incbin "baserom.gba", 0x624098, 0x20
+ .incbin "baserom.gba", 0x624098, 0x20
gUnknown_086240B8:: @ 86240B8
- .incbin "baserom.gba", 0x6240b8, 0xae0
+ .incbin "baserom.gba", 0x6240b8, 0x1C8
+
+gUnknown_08624280:: @ 8624280
+ .incbin "baserom.gba", 0x624280, 0x918
gUnknown_08624B98:: @ 8624B98
.incbin "baserom.gba", 0x624b98, 0x8
@@ -385,25 +690,128 @@ gUnknown_08624BF8:: @ 8624BF8
.incbin "baserom.gba", 0x624bf8, 0x80
gUnknown_08624C78:: @ 8624C78
- .incbin "baserom.gba", 0x624c78, 0x8
+ obj_tiles gUnknown_08624280, 0x1800, 9
gUnknown_08624C80:: @ 8624C80
- .incbin "baserom.gba", 0x624c80, 0x84
-
+ obj_pal gUnknown_08623FF8, 15
+ obj_pal gUnknown_08624018, 16
+ obj_pal gUnknown_08624038, 17
+ obj_pal gUnknown_08624058, 18
+ obj_pal gUnknown_08624078, 19
+ obj_pal NULL, 0
+
+gUnknown_08624CB0:: @ 8624CB0
+ .incbin "baserom.gba", 0x624cb0, 0x54
+
gUnknown_08624D04:: @ 8624D04
- .incbin "baserom.gba", 0x624d04, 0x5a4
+ .incbin "baserom.gba", 0x624d04, 0x78
+
+gUnknown_08624D7C:: @ 8624D7C
+ .incbin "baserom.gba", 0x624d7c, 0x60
+
+gUnknown_08624DDC:: @ 8624DDC
+ .incbin "baserom.gba", 0x624ddc, 0x14
+
+gUnknown_08624DF0:: @ 8624DF0
+ .incbin "baserom.gba", 0x624df0, 0x2C
+
+gUnknown_08624E1C:: @ 8624E1C
+ .incbin "baserom.gba", 0x624e1c, 0x50
+
+gUnknown_08624E6C:: @ 8624E6C
+ .incbin "baserom.gba", 0x624e6c, 0x90
+
+gUnknown_08624EFC:: @ 8624EFC
+ .incbin "baserom.gba", 0x624efc, 0x90
+
+gUnknown_08624F8C:: @ 8624F8C
+ .incbin "baserom.gba", 0x624f8c, 0x60
+
+gUnknown_08624FEC:: @ 8624FEC
+ .incbin "baserom.gba", 0x624fec, 0x54
+
+gUnknown_08625040:: @ 8625040
+ .incbin "baserom.gba", 0x625040, 0x38
+
+gUnknown_08625078:: @ 8625078
+ .incbin "baserom.gba", 0x625078, 0x3C
+
+gUnknown_086250B4:: @ 86250B4
+ .incbin "baserom.gba", 0x6250b4, 0x3C
+
+gUnknown_086250F0:: @ 86250F0
+ .incbin "baserom.gba", 0x6250f0, 0x3C
+
+gUnknown_0862512C:: @ 862512C
+ .incbin "baserom.gba", 0x62512c, 0x3C
+
+gUnknown_08625168:: @ 8625168
+ .incbin "baserom.gba", 0x625168, 0x3C
+
+gUnknown_086251A4:: @ 86251A4
+ .incbin "baserom.gba", 0x6251a4, 0x3C
+
+gUnknown_086251E0:: @ 86251E0
+ .incbin "baserom.gba", 0x6251e0, 0x24
+
+gUnknown_08625204:: @ 8625204
+ .incbin "baserom.gba", 0x625204, 0x24
+
+gUnknown_08625228:: @ 8625228
+ .incbin "baserom.gba", 0x625228, 0x24
+
+gUnknown_0862524C:: @ 862524C
+ .incbin "baserom.gba", 0x62524c, 0x24
+
+gUnknown_08625270:: @ 8625270
+ .incbin "baserom.gba", 0x625270, 0x24
+
+gUnknown_08625294:: @ 8625294
+ .incbin "baserom.gba", 0x625294, 0x14
gUnknown_086252A8:: @ 86252A8
- .incbin "baserom.gba", 0x6252a8, 0x54
+ .4byte gUnknown_08624D7C
+ .4byte gUnknown_08624DF0
+ .4byte gUnknown_08624F8C
+ .4byte gUnknown_08624EFC
+ .4byte gUnknown_08624FEC
+ .4byte gUnknown_08624DDC
+ .4byte gUnknown_08624E1C
+ .4byte gUnknown_08624E6C
+ .4byte gUnknown_08625040
+ .4byte gUnknown_08625078
+ .4byte gUnknown_086250B4
+ .4byte gUnknown_086250F0
+ .4byte gUnknown_0862512C
+ .4byte gUnknown_08625168
+ .4byte gUnknown_086251A4
+ .4byte gUnknown_086251E0
+ .4byte gUnknown_08625204
+ .4byte gUnknown_08625228
+ .4byte gUnknown_0862524C
+ .4byte gUnknown_08625270
+ .4byte gUnknown_08625294
gUnknown_086252FC:: @ 86252FC
- .incbin "baserom.gba", 0x6252fc, 0x14
+ .4byte sub_81D1628
+ .4byte sub_81D164C
+ .4byte sub_81D1670
+ .4byte sub_81D1694
+ .4byte sub_81D16CC
gUnknown_08625310:: @ 8625310
- .incbin "baserom.gba", 0x625310, 0x14
+ .4byte sub_81D1714
+ .4byte sub_81D1718
+ .4byte sub_81D171C
+ .4byte sub_81D1750
+ .4byte sub_81D1754
gUnknown_08625324:: @ 8625324
- .incbin "baserom.gba", 0x625324, 0x14
+ .4byte sub_81D178C
+ .4byte sub_81D1790
+ .4byte sub_81D17C0
+ .4byte sub_81D17E0
+ .4byte sub_81D17E4
gUnknown_08625338:: @ 8625338
.incbin "baserom.gba", 0x625338, 0x14
@@ -475,7 +883,12 @@ gUnknown_08625B2C:: @ 8625B2C
.incbin "baserom.gba", 0x625b2c, 0x28
gUnknown_08625B54:: @ 8625B54
- .incbin "baserom.gba", 0x625b54, 0x18
+ .4byte gUnknown_085EEA46
+ .4byte gUnknown_085EEA4E
+ .4byte gUnknown_085EEA55
+ .4byte gUnknown_085EEA63
+ .4byte gUnknown_085EEA6B
+ .4byte gUnknown_085EEA5D
gUnknown_08625B6C:: @ 8625B6C
.incbin "baserom.gba", 0x625b6c, 0x520
@@ -502,10 +915,30 @@ gUnknown_0862A5F8:: @ 862A5F8
.incbin "baserom.gba", 0x62a5f8, 0x20
gUnknown_0862A618:: @ 862A618
- .incbin "baserom.gba", 0x62a618, 0x48
+ .4byte sub_81D581C
+ .4byte sub_81D58D8
+ .4byte sub_81D5924
+ .4byte sub_81D59D0
+ .4byte sub_81D5A70
+ .4byte sub_81D5AB4
+ .4byte sub_81D5AD0
+ .4byte sub_81D5B2C
+ .4byte sub_81D5BBC
+ .4byte sub_81D5C00
+ .4byte sub_81D5C5C
+ .4byte sub_81D62B4
+ .4byte sub_81D64AC
+ .4byte sub_81D64DC
+ .4byte sub_81D64FC
+ .4byte sub_81D6518
+ .4byte sub_81D6568
+ .4byte sub_81D65A0
gUnknown_0862A660:: @ 862A660
- .incbin "baserom.gba", 0x62a660, 0x10
+ .4byte gUnknown_085EB32D
+ .4byte gUnknown_085EB33E
+ .4byte gUnknown_085EB350
+ .4byte gUnknown_085EB361
gUnknown_0862A670:: @ 862A670
.incbin "baserom.gba", 0x62a670, 0x18
diff --git a/data/rayquaza_scene.s b/data/rayquaza_scene.s
deleted file mode 100644
index 51a285285..000000000
--- a/data/rayquaza_scene.s
+++ /dev/null
@@ -1,160 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-gUnknown_0862A6A0:: @ 862A6A0
- .incbin "baserom.gba", 0x62a6a0, 0x8c
-
-gUnknown_0862A72C:: @ 862A72C
- .incbin "baserom.gba", 0x62a72c, 0x24
-
-gUnknown_0862A750:: @ 862A750
- .incbin "baserom.gba", 0x62a750, 0x24
-
-gUnknown_0862A774:: @ 862A774
- .incbin "baserom.gba", 0x62a774, 0xa8
-
-gUnknown_0862A81C:: @ 862A81C
- .incbin "baserom.gba", 0x62a81c, 0x30
-
-gUnknown_0862A84C:: @ 862A84C
- .incbin "baserom.gba", 0x62a84c, 0x18
-
-gUnknown_0862A864:: @ 862A864
- .incbin "baserom.gba", 0x62a864, 0x18
-
-gUnknown_0862A87C:: @ 862A87C
- .incbin "baserom.gba", 0x62a87c, 0xc
-
-gUnknown_0862A888:: @ 862A888
- .incbin "baserom.gba", 0x62a888, 0x3c
-
-gUnknown_0862A8C4:: @ 862A8C4
- .incbin "baserom.gba", 0x62a8c4, 0x8
-
-gUnknown_0862A8CC:: @ 862A8CC
- .incbin "baserom.gba", 0x62a8cc, 0x8
-
-gUnknown_0862A8D4:: @ 862A8D4
- .incbin "baserom.gba", 0x62a8d4, 0x24
-
-gUnknown_0862A8F8:: @ 862A8F8
- .incbin "baserom.gba", 0x62a8f8, 0x8
-
-gUnknown_0862A900:: @ 862A900
- .incbin "baserom.gba", 0x62a900, 0x24
-
-gUnknown_0862A924:: @ 862A924
- .incbin "baserom.gba", 0x62a924, 0x8
-
-gUnknown_0862A92C:: @ 862A92C
- .incbin "baserom.gba", 0x62a92c, 0xa8
-
-gUnknown_0862A9D4:: @ 862A9D4
- .incbin "baserom.gba", 0x62a9d4, 0x8
-
-gUnknown_0862A9DC:: @ 862A9DC
- .incbin "baserom.gba", 0x62a9dc, 0x8
-
-gUnknown_0862A9E4:: @ 862A9E4
- .incbin "baserom.gba", 0x62a9e4, 0x30
-
-gUnknown_0862AA14:: @ 862AA14
- .incbin "baserom.gba", 0x62aa14, 0x8
-
-gUnknown_0862AA1C:: @ 862AA1C
- .incbin "baserom.gba", 0x62aa1c, 0x18
-
-gUnknown_0862AA34:: @ 862AA34
- .incbin "baserom.gba", 0x62aa34, 0x8
-
-gUnknown_0862AA3C:: @ 862AA3C
- .incbin "baserom.gba", 0x62aa3c, 0x18
-
-gUnknown_0862AA54:: @ 862AA54
- .incbin "baserom.gba", 0x62aa54, 0x3c
-
-gUnknown_0862AA90:: @ 862AA90
- .incbin "baserom.gba", 0x62aa90, 0x8
-
-gUnknown_0862AA98:: @ 862AA98
- .incbin "baserom.gba", 0x62aa98, 0x8
-
-gUnknown_0862AAA0:: @ 862AAA0
- .incbin "baserom.gba", 0x62aaa0, 0x18
-
-gUnknown_0862AAB8:: @ 862AAB8
- .incbin "baserom.gba", 0x62aab8, 0x14
-
-gUnknown_0862AACC:: @ 862AACC
- .incbin "baserom.gba", 0x62aacc, 0x30
-
-gUnknown_0862AAFC:: @ 862AAFC
- .incbin "baserom.gba", 0x62aafc, 0x8
-
-gUnknown_0862AB04:: @ 862AB04
- .incbin "baserom.gba", 0x62ab04, 0x8
-
-gUnknown_0862AB0C:: @ 862AB0C
- .incbin "baserom.gba", 0x62ab0c, 0x8
-
-gUnknown_0862AB14:: @ 862AB14
- .incbin "baserom.gba", 0x62ab14, 0x18
-
-gUnknown_0862AB2C:: @ 862AB2C
- .incbin "baserom.gba", 0x62ab2c, 0x18
-
-gUnknown_0862AB44:: @ 862AB44
- .incbin "baserom.gba", 0x62ab44, 0xe4
-
-gUnknown_0862AC28:: @ 862AC28
- .incbin "baserom.gba", 0x62ac28, 0x8
-
-gUnknown_0862AC30:: @ 862AC30
- .incbin "baserom.gba", 0x62ac30, 0x8
-
-gUnknown_0862AC38:: @ 862AC38
- .incbin "baserom.gba", 0x62ac38, 0x8
-
-gUnknown_0862AC40:: @ 862AC40
- .incbin "baserom.gba", 0x62ac40, 0x8
-
-gUnknown_0862AC48:: @ 862AC48
- .incbin "baserom.gba", 0x62ac48, 0x8
-
-gUnknown_0862AC50:: @ 862AC50
- .incbin "baserom.gba", 0x62ac50, 0x8
-
-gUnknown_0862AC58:: @ 862AC58
- .incbin "baserom.gba", 0x62ac58, 0x8
-
-gUnknown_0862AC60:: @ 862AC60
- .incbin "baserom.gba", 0x62ac60, 0x8
-
-gUnknown_0862AC68:: @ 862AC68
- .incbin "baserom.gba", 0x62ac68, 0x8
-
-gUnknown_0862AC70:: @ 862AC70
- .incbin "baserom.gba", 0x62ac70, 0x8
-
-gUnknown_0862AC78:: @ 862AC78
- .incbin "baserom.gba", 0x62ac78, 0x18
-
-gUnknown_0862AC90:: @ 862AC90
- .incbin "baserom.gba", 0x62ac90, 0x18
-
-gUnknown_0862ACA8:: @ 862ACA8
- .incbin "baserom.gba", 0x62aca8, 0x18
-
-gUnknown_0862ACC0:: @ 862ACC0
- .incbin "baserom.gba", 0x62acc0, 0x18
-
-gUnknown_0862ACD8:: @ 862ACD8
- .incbin "baserom.gba", 0x62acd8, 0x18
-
-gUnknown_0862ACF0:: @ 862ACF0
- .incbin "baserom.gba", 0x62acf0, 0x18
-
-gUnknown_0862AD08:: @ 862AD08
- .incbin "baserom.gba", 0x62ad08, 0xc
diff --git a/data/script_pokemon_util_80F87D8.s b/data/script_pokemon_util_80F87D8.s
index beda525c8..360a6f50a 100644
--- a/data/script_pokemon_util_80F87D8.s
+++ b/data/script_pokemon_util_80F87D8.s
@@ -4,4 +4,4 @@
.section .rodata
.align 2, 0
gUnknown_0858D8EC:: @ 858D8EC
- .incbin "baserom.gba", 0x58d8ec, 0x4
+ .byte 3, 4, 5, 14
diff --git a/data/start_menu.s b/data/start_menu.s
deleted file mode 100644
index 07e428d0d..000000000
--- a/data/start_menu.s
+++ /dev/null
@@ -1,29 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-gSafariBallsWindowTemplate:: @ 8510508
- .incbin "baserom.gba", 0x510508, 0x8
-
-gUnknown_08510510:: @ 8510510
- .incbin "baserom.gba", 0x510510, 0x20
-
-gPyramidFloorWindowTemplate_2:: @ 8510530
- .incbin "baserom.gba", 0x510530, 0x8
-
-gPyramidFloorWindowTemplate_1:: @ 8510538
- .incbin "baserom.gba", 0x510538, 0x8
-
-sStartMenuItems:: @ 8510540
- .incbin "baserom.gba", 0x510540, 0x68
-
-gUnknown_085105A8:: @ 85105A8
- .incbin "baserom.gba", 0x5105a8, 0x4
-
-gUnknown_085105AC:: @ 85105AC
- .incbin "baserom.gba", 0x5105ac, 0x10
-
-gUnknown_085105BC:: @ 85105BC
- .incbin "baserom.gba", 0x5105bc, 0x8
diff --git a/data/starter_choose.s b/data/starter_choose.s
index a951a8987..d20b4f99a 100644
--- a/data/starter_choose.s
+++ b/data/starter_choose.s
@@ -1,7 +1,6 @@
-@ the fourth big chunk of data
-
.include "asm/macros.inc"
.include "constants/constants.inc"
+ .include "include/constants/species.h"
.section .rodata
@@ -33,8 +32,11 @@ gStarterChoose_LabelCoords:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6
sStarterMon:: @ 85B1DF8
- .incbin "baserom.gba", 0x5b1df8, 0x8
+ .2byte SPECIES_TREECKO
+ .2byte SPECIES_TORCHIC
+ .2byte SPECIES_MUDKIP
+.align 2
gUnknown_085B1E00:: @ 85B1E00
.incbin "baserom.gba", 0x5b1e00, 0xc
diff --git a/data/strings.s b/data/strings.s
index e217a81e0..1d6444cd8 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -2705,34 +2705,34 @@ gUnknown_085EBB4F:: @ 85EBB4F
gUnknown_085EBB56:: @ 85EBB56
.string "What would you like to do?$"
-gUnknown_085EBB71:: @ 85EBB71
+gText_WithdrawPokemon:: @ 85EBB71
.string "WITHDRAW POKéMON$"
-gUnknown_085EBB82:: @ 85EBB82
+gText_DepositPokemon:: @ 85EBB82
.string "DEPOSIT POKéMON$"
-gUnknown_085EBB92:: @ 85EBB92
+gText_MovePokemon:: @ 85EBB92
.string "MOVE POKéMON$"
-gUnknown_085EBB9F:: @ 85EBB9F
+gText_MoveItems:: @ 85EBB9F
.string "MOVE ITEMS$"
-gUnknown_085EBBAA:: @ 85EBBAA
+gText_SeeYa:: @ 85EBBAA
.string "SEE YA!$"
-gUnknown_085EBBB2:: @ 85EBBB2
+gText_WithdrawMonDescription:: @ 85EBBB2
.string "Move POKéMON stored in BOXES to\nyour party.$"
-gUnknown_085EBBDE:: @ 85EBBDE
+gText_DepositMonDescription:: @ 85EBBDE
.string "Store POKéMON in your party in BOXES.$"
-gUnknown_085EBC04:: @ 85EBC04
+gText_MoveMonDescription:: @ 85EBC04
.string "Organize the POKéMON in BOXES and\nin your party.$"
-gUnknown_085EBC35:: @ 85EBC35
+gText_MoveItemsDescription:: @ 85EBC35
.string "Move items held by any POKéMON\nin a BOX or your party.$"
-gUnknown_085EBC6C:: @ 85EBC6C
+gText_SeeYaDescription:: @ 85EBC6C
.string "Return to the previous menu.$"
gText_JustOnePkmn:: @ 85EBC89
@@ -3521,10 +3521,10 @@ gText_Var1sTrainerCard:: @ 85ECFA6
gText_HallOfFameDebut:: @ 85ECFB8
.string "HALL OF FAME DEBUT $"
-gUnknown_085ECFCD:: @ 85ECFCD
+gText_LinkBattles:: @ 85ECFCD
.string "LINK BATTLES$"
-gUnknown_085ECFDA:: @ 85ECFDA
+gText_LinkCableBattles:: @ 85ECFDA
.string "LINK CABLE BATTLES$"
gText_WinsLosses:: @ 85ECFED
@@ -4488,34 +4488,34 @@ gUnknown_085EE6AD:: @ 85EE6AD
gUnknown_085EE6B6:: @ 85EE6B6
.string "Updated time$"
-gUnknown_085EE6C3:: @ 85EE6C3
+gText_MenuPokedex:: @ 85EE6C3
.string "POKéDEX$"
-gUnknown_085EE6CB:: @ 85EE6CB
+gText_MenuPokemon:: @ 85EE6CB
.string "POKéMON$"
-gUnknown_085EE6D3:: @ 85EE6D3
+gText_MenuBag:: @ 85EE6D3
.string "BAG$"
-gUnknown_085EE6D7:: @ 85EE6D7
+gText_MenuPokenav:: @ 85EE6D7
.string "POKéNAV$"
-gUnknown_085EE6DF:: @ 85EE6DF
+gText_MenuPlayer:: @ 85EE6DF
.string "{PLAYER}$"
-gUnknown_085EE6E2:: @ 85EE6E2
+gText_MenuSave:: @ 85EE6E2
.string "SAVE$"
-gUnknown_085EE6E7:: @ 85EE6E7
+gText_MenuOption:: @ 85EE6E7
.string "OPTION$"
-gUnknown_085EE6EE:: @ 85EE6EE
+gText_MenuExit:: @ 85EE6EE
.string "EXIT$"
-gUnknown_085EE6F3:: @ 85EE6F3
+gText_MenuRetire:: @ 85EE6F3
.string "RETIRE$"
-gUnknown_085EE6FA:: @ 85EE6FA
+gText_MenuRest:: @ 85EE6FA
.string "REST$"
gText_SafariBallStock:: @ 85EE6FF
@@ -4524,28 +4524,28 @@ gText_SafariBallStock:: @ 85EE6FF
gText_BattlePyramidFloor:: @ 85EE716
.string "Battle Pyramid\n{STR_VAR_1}$"
-gUnknown_085EE728:: @ 85EE728
+gText_Floor1:: @ 85EE728
.string "Floor 1$"
-gUnknown_085EE730:: @ 85EE730
+gText_Floor2:: @ 85EE730
.string "Floor 2$"
-gUnknown_085EE738:: @ 85EE738
+gText_Floor3:: @ 85EE738
.string "Floor 3$"
-gUnknown_085EE740:: @ 85EE740
+gText_Floor4:: @ 85EE740
.string "Floor 4$"
-gUnknown_085EE748:: @ 85EE748
+gText_Floor5:: @ 85EE748
.string "Floor 5$"
-gUnknown_085EE750:: @ 85EE750
+gText_Floor6:: @ 85EE750
.string "Floor 6$"
-gUnknown_085EE758:: @ 85EE758
+gText_Floor7:: @ 85EE758
.string "Floor 7$"
-gUnknown_085EE760:: @ 85EE760
+gText_Peak:: @ 85EE760
.string "Peak$"
gText_LinkStandby2:: @ 85EE765
diff --git a/data/text_window.s b/data/text_window.s
index a7389572b..26c231f90 100644
--- a/data/text_window.s
+++ b/data/text_window.s
@@ -5,13 +5,166 @@
.align 2, 0
gUnknown_0850E87C:: @ 850E87C
- .incbin "baserom.gba", 0x50e87c, 0x1680
+ .incbin "baserom.gba", 0x50e87c, 0x120
+
+gUnknown_0850E99C:: @ 850E99C
+ .incbin "baserom.gba", 0x50e99c, 0x120
+
+gUnknown_0850EABC:: @ 850EABC
+ .incbin "baserom.gba", 0x50eabc, 0x120
+
+gUnknown_0850EBDC:: @ 850EBDC
+ .incbin "baserom.gba", 0x50ebdc, 0x120
+
+gUnknown_0850ECFC:: @ 850ECFC
+ .incbin "baserom.gba", 0x50ecfc, 0x120
+
+gUnknown_0850EE1C:: @ 850EE1C
+ .incbin "baserom.gba", 0x50ee1c, 0x120
+
+gUnknown_0850EF3C:: @ 850EF3C
+ .incbin "baserom.gba", 0x50ef3c, 0x120
+
+gUnknown_0850F05C:: @ 850F05C
+ .incbin "baserom.gba", 0x50f05c, 0x120
+
+gUnknown_0850F17C:: @ 850F17C
+ .incbin "baserom.gba", 0x50f17c, 0x120
+
+gUnknown_0850F29C:: @ 850F29C
+ .incbin "baserom.gba", 0x50f29c, 0x120
+
+gUnknown_0850F3BC:: @ 850F3BC
+ .incbin "baserom.gba", 0x50f3bc, 0x120
+
+gUnknown_0850F4DC:: @ 850F4DC
+ .incbin "baserom.gba", 0x50f4dc, 0x120
+
+gUnknown_0850F5FC:: @ 850F5FC
+ .incbin "baserom.gba", 0x50f5fc, 0x120
+
+gUnknown_0850F71C:: @ 850F71C
+ .incbin "baserom.gba", 0x50f71c, 0x120
+
+gUnknown_0850F83C:: @ 850F83C
+ .incbin "baserom.gba", 0x50f83c, 0x120
+
+gUnknown_0850F95C:: @ 850F95C
+ .incbin "baserom.gba", 0x50f95c, 0x120
+
+gUnknown_0850FA7C:: @ 850FA7C
+ .incbin "baserom.gba", 0x50fa7c, 0x120
+
+gUnknown_0850FB9C:: @ 850FB9C
+ .incbin "baserom.gba", 0x50fb9c, 0x120
+
+gUnknown_0850FCBC:: @ 850FCBC
+ .incbin "baserom.gba", 0x50fcbc, 0x120
+
+gUnknown_0850FDDC:: @ 850FDDC
+ .incbin "baserom.gba", 0x50fddc, 0x120
gUnknown_0850FEFC:: @ 850FEFC
- .incbin "baserom.gba", 0x50fefc, 0x280
+ .incbin "baserom.gba", 0x50fefc, 0x20
+
+gUnknown_0850FF1C:: @ 850FF1C
+ .incbin "baserom.gba", 0x50ff1c, 0x20
+
+gUnknown_0850FF3C:: @ 850FF3C
+ .incbin "baserom.gba", 0x50ff3c, 0x20
+
+gUnknown_0850FF5C:: @ 850FF5C
+ .incbin "baserom.gba", 0x50ff5c, 0x20
+
+gUnknown_0850FF7C:: @ 850FF7C
+ .incbin "baserom.gba", 0x50ff7c, 0x20
+
+gUnknown_0850FF9C:: @ 850FF9C
+ .incbin "baserom.gba", 0x50ff9c, 0x20
+
+gUnknown_0850FFBC:: @ 850FFBC
+ .incbin "baserom.gba", 0x50ffbc, 0x20
+
+gUnknown_0850FFDC:: @ 850FFDC
+ .incbin "baserom.gba", 0x50ffdc, 0x20
+
+gUnknown_0850FFFC:: @ 850FFFC
+ .incbin "baserom.gba", 0x50fffc, 0x20
+
+gUnknown_0851001C:: @ 851001C
+ .incbin "baserom.gba", 0x51001c, 0x20
+
+gUnknown_0851003C:: @ 851003C
+ .incbin "baserom.gba", 0x51003c, 0x20
+
+gUnknown_0851005C:: @ 851005C
+ .incbin "baserom.gba", 0x51005c, 0x20
+
+gUnknown_0851007C:: @ 851007C
+ .incbin "baserom.gba", 0x51007c, 0x20
+
+gUnknown_0851009C:: @ 851009C
+ .incbin "baserom.gba", 0x51009c, 0x20
+
+gUnknown_085100BC:: @ 85100BC
+ .incbin "baserom.gba", 0x5100bc, 0x20
+
+gUnknown_085100DC:: @ 85100DC
+ .incbin "baserom.gba", 0x5100dc, 0x20
+
+gUnknown_085100FC:: @ 85100FC
+ .incbin "baserom.gba", 0x5100fc, 0x20
+
+gUnknown_0851011C:: @ 851011C
+ .incbin "baserom.gba", 0x51011c, 0x20
+
+gUnknown_0851013C:: @ 851013C
+ .incbin "baserom.gba", 0x51013c, 0x20
+
+gUnknown_0851015C:: @ 851015C
+ .incbin "baserom.gba", 0x51015c, 0x20
gUnknown_0851017C:: @ 851017C
- .incbin "baserom.gba", 0x51017c, 0xa0
+ .incbin "baserom.gba", 0x51017c, 0xA0
gUnknown_0851021C:: @ 851021C
- .incbin "baserom.gba", 0x51021c, 0xa0
+ .4byte gUnknown_0850E87C
+ .4byte gUnknown_0850FEFC
+ .4byte gUnknown_0850E99C
+ .4byte gUnknown_0850FF1C
+ .4byte gUnknown_0850EABC
+ .4byte gUnknown_0850FF3C
+ .4byte gUnknown_0850EBDC
+ .4byte gUnknown_0850FF5C
+ .4byte gUnknown_0850ECFC
+ .4byte gUnknown_0850FF7C
+ .4byte gUnknown_0850EE1C
+ .4byte gUnknown_0850FF9C
+ .4byte gUnknown_0850EF3C
+ .4byte gUnknown_0850FFBC
+ .4byte gUnknown_0850F05C
+ .4byte gUnknown_0850FFDC
+ .4byte gUnknown_0850F17C
+ .4byte gUnknown_0850FFFC
+ .4byte gUnknown_0850F29C
+ .4byte gUnknown_0851001C
+ .4byte gUnknown_0850F3BC
+ .4byte gUnknown_0851003C
+ .4byte gUnknown_0850F4DC
+ .4byte gUnknown_0851005C
+ .4byte gUnknown_0850F5FC
+ .4byte gUnknown_0851007C
+ .4byte gUnknown_0850F71C
+ .4byte gUnknown_0851009C
+ .4byte gUnknown_0850F83C
+ .4byte gUnknown_085100BC
+ .4byte gUnknown_0850F95C
+ .4byte gUnknown_085100DC
+ .4byte gUnknown_0850FA7C
+ .4byte gUnknown_085100FC
+ .4byte gUnknown_0850FB9C
+ .4byte gUnknown_0851011C
+ .4byte gUnknown_0850FCBC
+ .4byte gUnknown_0851013C
+ .4byte gUnknown_0850FDDC
+ .4byte gUnknown_0851015C
diff --git a/data/trainer_card.s b/data/trainer_card.s
index 0d48cd0b6..d97e3f254 100644
--- a/data/trainer_card.s
+++ b/data/trainer_card.s
@@ -5,7 +5,31 @@
.align 2, 0
gUnknown_0856F018:: @ 856F018
- .incbin "baserom.gba", 0x56f018, 0x494
+ .incbin "baserom.gba", 0x56f018, 0x194
+
+gUnknown_0856F1AC:: @ 856F1AC
+ .incbin "baserom.gba", 0x56f1ac, 0x60
+
+gUnknown_0856F20C:: @ 856F20C
+ .incbin "baserom.gba", 0x56f20c, 0x60
+
+gUnknown_0856F26C:: @ 856F26C
+ .incbin "baserom.gba", 0x56f26c, 0x60
+
+gUnknown_0856F2CC:: @ 856F2CC
+ .incbin "baserom.gba", 0x56f2cc, 0x60
+
+gUnknown_0856F32C:: @ 856F32C
+ .incbin "baserom.gba", 0x56f32c, 0x60
+
+gUnknown_0856F38C:: @ 856F38C
+ .incbin "baserom.gba", 0x56f38c, 0x60
+
+gUnknown_0856F3EC:: @ 856F3EC
+ .incbin "baserom.gba", 0x56f3ec, 0x60
+
+gUnknown_0856F44C:: @ 856F44C
+ .incbin "baserom.gba", 0x56f44c, 0x60
gUnknown_0856F4AC:: @ 856F4AC
.incbin "baserom.gba", 0x56f4ac, 0x20
@@ -47,16 +71,27 @@ gUnknown_0856FAC4:: @ 856FAC4
.incbin "baserom.gba", 0x56fac4, 0x20
gUnknown_0856FAE4:: @ 856FAE4
- .incbin "baserom.gba", 0x56fae4, 0x14
+ .4byte gUnknown_08DD1A58
+ .4byte gUnknown_0856F1AC
+ .4byte gUnknown_0856F26C
+ .4byte gUnknown_0856F32C
+ .4byte gUnknown_0856F3EC
gUnknown_0856FAF8:: @ 856FAF8
- .incbin "baserom.gba", 0x56faf8, 0x14
+ .4byte gUnknown_08DD240C
+ .4byte gUnknown_0856F20C
+ .4byte gUnknown_0856F2CC
+ .4byte gUnknown_0856F38C
+ .4byte gUnknown_0856F44C
gUnknown_0856FB0C:: @ 856FB0C
.incbin "baserom.gba", 0x56fb0c, 0x3
gUnknown_0856FB0F:: @ 856FB0F
- .incbin "baserom.gba", 0x56fb0f, 0x9
+ .incbin "baserom.gba", 0x56fb0f, 0x3
+
+gUnknown_0856FB12:: @ 856FB12
+ .incbin "baserom.gba", 0x56fb12, 0x6
gUnknown_0856FB18:: @ 856FB18
.incbin "baserom.gba", 0x56fb18, 0x8
@@ -65,10 +100,16 @@ gUnknown_0856FB20:: @ 856FB20
.incbin "baserom.gba", 0x56fb20, 0x8
gUnknown_0856FB28:: @ 856FB28
- .incbin "baserom.gba", 0x56fb28, 0x18
+ .4byte sub_80C4998
+ .4byte sub_80C49D8
+ .4byte sub_80C4B08
+ .4byte sub_80C4C1C
+ .4byte sub_80C4C84
+ .4byte sub_80C4DB0
gUnknown_0856FB40:: @ 856FB40
- .incbin "baserom.gba", 0x56fb40, 0x8
+ .4byte gUnknown_0856FB0C
+ .4byte gUnknown_0856FB12
gUnknown_0856FB48:: @ 856FB48
.incbin "baserom.gba", 0x56fb48, 0x2
@@ -86,7 +127,9 @@ gUnknown_0856FB57:: @ 856FB57
.incbin "baserom.gba", 0x56fb57, 0x5
gUnknown_0856FB5C:: @ 856FB5C
- .incbin "baserom.gba", 0x56fb5c, 0xc
+ .4byte gText_LinkBattles
+ .4byte gText_LinkCableBattles
+ .4byte gText_LinkBattles
gUnknown_0856FB68:: @ 856FB68
.incbin "baserom.gba", 0x56fb68, 0x6
@@ -161,7 +204,21 @@ gUnknown_085715FC:: @ 85715FC
.incbin "baserom.gba", 0x5715fc, 0x18
gUnknown_08571614:: @ 8571614
- .incbin "baserom.gba", 0x571614, 0x3c
+ .4byte gUnknown_085EDA96
+ .4byte gUnknown_085ED932
+ .4byte gUnknown_085ED94D
+ .4byte gUnknown_085ED961
+ .4byte gUnknown_085ED977
+ .4byte gUnknown_085ED993
+ .4byte gUnknown_085ED9AF
+ .4byte gUnknown_085ED9C7
+ .4byte gUnknown_085ED9E5
+ .4byte gUnknown_085EDA02
+ .4byte gUnknown_085EDA21
+ .4byte gUnknown_085EDA3C
+ .4byte gUnknown_085EDA5E
+ .4byte gUnknown_085EDA78
+ .4byte gUnknown_085ED931
gUnknown_08571650:: @ 8571650
.incbin "baserom.gba", 0x571650, 0x70
diff --git a/data/unk_sprite_file.s b/data/unk_sprite_file.s
index 837e87c3f..d4e53df1e 100644
--- a/data/unk_sprite_file.s
+++ b/data/unk_sprite_file.s
@@ -7,16 +7,36 @@ gUnknown_0862AD54:: @ 862AD54
.incbin "baserom.gba", 0x62ad54, 0x1dc
gUnknown_0862AF30:: @ 862AF30
- .incbin "baserom.gba", 0x62af30, 0x60c
+ .incbin "baserom.gba", 0x62af30, 0x1AC
+
+gUnknown_0862B0DC:: @ 862B0DC
+ .incbin "baserom.gba", 0x62b0dc, 0x460
gUnknown_0862B53C:: @ 862B53C
- .incbin "baserom.gba", 0x62b53c, 0x1e8
+ .incbin "baserom.gba", 0x62b53c, 0x1E0
+
+gUnknown_0862B71C:: @ 862B71C
+ .incbin "baserom.gba", 0x62b71c, 0x8
gUnknown_0862B724:: @ 862B724
- .incbin "baserom.gba", 0x62b724, 0x8
+ obj_tiles gUnknown_0862B0DC, 0x1800, 11920
gUnknown_0862B72C:: @ 862B72C
- .incbin "baserom.gba", 0x62b72c, 0x2c
+ obj_pal gUnknown_0862B53C, 11920
+
+gUnknown_0862B734:: @ 862B734
+ .incbin "baserom.gba", 0x62b734, 0x8
+
+gUnknown_0862B73C:: @ 862B73C
+ .incbin "baserom.gba", 0x62b73c, 0x8
+
+gUnknown_0862B744:: @ 862B744
+ .incbin "baserom.gba", 0x62b744, 0x8
+
+gUnknown_0862B74C:: @ 862B74C
+ .4byte gUnknown_0862B734
+ .4byte gUnknown_0862B73C
+ .4byte gUnknown_0862B744
gUnknown_0862B758:: @ 862B758
- .incbin "baserom.gba", 0x62b758, 0x18
+ spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s
index a45ea27e1..ed9a6c29a 100644
--- a/data/use_pokeblock.s
+++ b/data/use_pokeblock.s
@@ -47,10 +47,10 @@ sContestStatNames:: @ 85DFD04
.4byte gText_Beauty3
gUnknown_085DFD18:: @ 85DFD18
- .incbin "baserom.gba", 0x5dfd18, 0x8
+ obj_tiles gUnknown_08DCCD5C, 0x200, 0
gUnknown_085DFD20:: @ 85DFD20
- .incbin "baserom.gba", 0x5dfd20, 0x8
+ obj_pal gUnknown_08DCCD3C, 0
gUnknown_085DFD28:: @ 85DFD28
.incbin "baserom.gba", 0x5dfd28, 0x34
@@ -62,4 +62,5 @@ gUnknown_085DFDA0:: @ 85DFDA0
.incbin "baserom.gba", 0x5dfda0, 0x18
gUnknown_085DFDB8:: @ 85DFDB8
- .incbin "baserom.gba", 0x5dfdb8, 0x8
+ .4byte gUnknown_08DCCB98
+ .4byte 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 20:40:15 +0000