summaryrefslogtreecommitdiff
path: root/data/data2.s
diff options
context:
space:
mode:
Diffstat (limited to 'data/data2.s')
-rw-r--r--data/data2.s1024
1 files changed, 760 insertions, 264 deletions
diff --git a/data/data2.s b/data/data2.s
index a6c665f1b..7d4a3ad9b 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -825,7 +825,7 @@ gSpriteTemplate_81F958C:: @ 81F958C
.align 2
gUnknown_081F95A4:: @ 81F95A4
- obj_tiles 0x08e5dc2c, 4096, 0x2710
+ obj_tiles gUnknown_08E5DC2C, 4096, 0x2710
.align 2
gBattleTerrainTable:: @ 81F95AC
@@ -929,7 +929,7 @@ gOamData_81F96F0:: @ 81F96F0
.2byte 0x2800
.align 2
- .incbin "baserom.gba", 0x1f96f8, 0x28
+ .incbin "baserom.gba", 0x001f96f8, 0x28
@ 81F9720
.include "data/type_effectiveness.s"
@@ -1541,7 +1541,7 @@ gSpriteTemplate_81FAF0C:: @ 81FAF0C
.align 2
gUnknown_081FAF24:: @ 81FAF24
- obj_tiles 0x08E6A728, 128, 0xD759
+ obj_tiles gUnknown_08E6A728, 128, 0xD759
.align 2
gOamData_81FAF2C:: @ 81FAF2C
@@ -1871,10 +1871,11 @@ gSpriteTemplate_82087AC:: @ 82087AC
gUnknown_082087C4:: @ 82087C4
.incbin "baserom.gba", 0x002087c4, 0x18
-@ 82087DC
+gUnknown_082087DC::
.include "data/crc16_table.s"
- .incbin "baserom.gba", 0x002089dc, 0x800
+gMiscBlank_Gfx::
+ .incbin "graphics/interface/blank.4bpp" @ seems to be a placeholder gfx?
@ 82091DC
.include "data/egg_moves.s"
@@ -1989,43 +1990,43 @@ gUnknown_0820A430:: @ 820A430
.align 2
gUnknown_0820A47C:: @ 820A47C
- obj_tiles 0x08d1f52c, 4096, 0xd6ff
+ obj_tiles gBattleWindowLargeGfx, 4096, 0xd6ff
.align 2
gUnknown_0820A484:: @ 820A484
- obj_tiles 0x08d1f7e0, 4096, 0xd701
+ obj_tiles gBattleWindowSmallGfx, 4096, 0xd701
.align 2
gUnknown_0820A48C:: @ 820A48C
- obj_tiles 0x08d1f96c, 2048, 0xd6ff
+ obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd6ff
.align 2
gUnknown_0820A494:: @ 820A494
- obj_tiles 0x08d1f96c, 2048, 0xd700
+ obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd700
.align 2
gUnknown_0820A49C:: @ 820A49C
- obj_tiles 0x08d1fb04, 2048, 0xd701
+ obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd701
.align 2
gUnknown_0820A4A4:: @ 820A4A4
- obj_tiles 0x08d1fb04, 2048, 0xd702
+ obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd702
.align 2
gUnknown_0820A4AC:: @ 820A4AC
- obj_tiles 0x08d1fc94, 4096, 0xd70b
+ obj_tiles gBattleWindowLarge2Gfx, 4096, 0xd70b
.align 2
gUnknown_0820A4B4:: @ 820A4B4
- obj_tiles 0x08d0314c, 256, 0xd704
- obj_tiles 0x08d0314c, 288, 0xd705
- obj_tiles 0x08d0314c, 256, 0xd706
- obj_tiles 0x08d0314c, 288, 0xd707
+ obj_tiles gBlankGfxCompressed, 256, 0xd704
+ obj_tiles gBlankGfxCompressed, 288, 0xd705
+ obj_tiles gBlankGfxCompressed, 256, 0xd706
+ obj_tiles gBlankGfxCompressed, 288, 0xd707
.align 2
gUnknown_0820A4D4:: @ 820A4D4
- obj_pal 0x08D1212C, 0xD6FF
- obj_pal 0x08D1214C, 0xD704
+ obj_pal gUnknown_08D1212C, 0xD6FF
+ obj_pal gUnknown_08D1214C, 0xD704
.align 2
gOamData_820A4E4:: @ 820A4E4
@@ -2076,7 +2077,7 @@ gSpriteTemplate_820A5B4:: @ 820A5B4
spr_template 55047, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC
.align 2
- .incbin "baserom.gba", 0x20a5cc, 0xb8
+ .incbin "baserom.gba", 0x0020a5cc, 0xb8
gUnknown_0820A684:: @ 820A684
.incbin "baserom.gba", 0x0020a684, 0x60
@@ -2089,18 +2090,18 @@ gUnknown_0820A6EC:: @ 820A6EC
.align 2
gUnknown_0820A754:: @ 820A754
- obj_tiles 0x08e6a758, 512, 0xd70c
- obj_tiles 0x08e6a758, 512, 0xd70d
+ obj_tiles gUnknown_08E6A758, 512, 0xd70c
+ obj_tiles gUnknown_08E6A758, 512, 0xd70d
.align 2
gUnknown_0820A764:: @ 820A764
- obj_pal 0x08d1212c, 0xd710
- obj_pal 0x08d1212c, 0xd711
+ obj_pal gUnknown_08D1212C, 0xd710
+ obj_pal gUnknown_08D1212C, 0xd711
.align 2
gUnknown_0820A774:: @ 820A774
- obj_pal 0x08d1214c, 0xd712
- obj_pal 0x08d1214c, 0xd713
+ obj_pal gUnknown_08D1214C, 0xd712
+ obj_pal gUnknown_08D1214C, 0xd713
gUnknown_0820A784:: @ 820A784
.incbin "baserom.gba", 0x0020a784, 0x18
@@ -2212,7 +2213,7 @@ gOamData_820A9EC:: @ 820A9EC
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x20a9f4, 0x20
+ .incbin "baserom.gba", 0x0020a9f4, 0x20
.align 2
gSpriteAnim_820AA14:: @ 820AA14
@@ -2238,7 +2239,7 @@ gSpriteAnimTable_820AA34:: @ 820AA34
.4byte gSpriteAnim_820AA28
.align 2
- .incbin "baserom.gba", 0x20aa40, 0x10
+ .incbin "baserom.gba", 0x0020aa40, 0x10
.align 2
gSpriteAffineAnim_820AA50:: @ 820AA50
@@ -2289,7 +2290,7 @@ gSpriteTemplate_820AAB4:: @ 820AAB4
spr_template 55011, 55011, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
.align 2
- .incbin "baserom.gba", 0x20abd4, 0x1c
+ .incbin "baserom.gba", 0x0020abd4, 0x1c
gUnknown_0820ABF0:: @ 820ABF0
.incbin "baserom.gba", 0x0020abf0, 0x1fe
@@ -2351,7 +2352,8 @@ gSpriteAnimTable_820C024:: @ 820C024
.4byte gSpriteAnim_820C01C
.align 2
- .incbin "baserom.gba", 0x20c03c, 0x40
+gUnknownPal_0820C03C::
+ .incbin "baserom.gba", 0x0020c03c, 0x40
.align 2
gUnknown_0820C07C:: @ 820C07C
@@ -2371,7 +2373,7 @@ gUnknown_0820C07C:: @ 820C07C
.align 2
gUnknown_0820C0E4:: @ 820C0E4
- obj_pal 0x0820c03c, 0x133d
+ obj_pal gUnknownPal_0820C03C, 0x133d
.align 2
gSpriteTemplate_820C0EC:: @ 820C0EC
@@ -3347,7 +3349,7 @@ gUnknown_08304F18:: @ 8304F18
.4byte FallarborTown_ContestLobby_MapAttributes
.4byte FallarborTown_ContestHall_MapAttributes
.4byte LilycoveCity_House2_MapAttributes
- .4byte 0x082cf564
+ .4byte UnknownMapAttributes_082CF564
.4byte VerdanturfTown_WandasHouse_MapAttributes
.4byte PacifidlogTown_House1_MapAttributes
.4byte PacifidlogTown_House2_MapAttributes
@@ -3355,8 +3357,8 @@ gUnknown_08304F18:: @ 8304F18
.4byte MossdeepCity_House4_MapAttributes
.4byte SlateportCity_SternsShipyard_1F_MapAttributes
.4byte SlateportCity_SternsShipyard_2F_MapAttributes
- .4byte 0x082d05d8
- .4byte 0x082d05fc
+ .4byte UnknownMapAttributes_082D05D8
+ .4byte UnknownMapAttributes_082D05FC
.4byte SlateportCity_PokemonFanClub_MapAttributes
.4byte SlateportCity_OceanicMuseum_1F_MapAttributes
.4byte SlateportCity_OceanicMuseum_2F_MapAttributes
@@ -3443,20 +3445,20 @@ gUnknown_08304F18:: @ 8304F18
.4byte ShoalCave_LowTideLowerRoom_MapAttributes
.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
.4byte ShoalCave_HighTideInnerRoom_MapAttributes
- .4byte 0x082e55c8 @ unused maps
- .4byte 0x082e55ec
- .4byte 0x082e5610
- .4byte 0x082e5634
- .4byte 0x082e5658
- .4byte 0x082e567c
- .4byte 0x082e56a0
- .4byte 0x082e56c4
- .4byte 0x082e56e8
- .4byte 0x082e570c
- .4byte 0x082e5730
- .4byte 0x082e5754
- .4byte 0x082e5778
- .4byte 0x082e579c
+ .4byte UnknownMapAttributes_082E55C8 @ unused maps
+ .4byte UnknownMapAttributes_082E55EC
+ .4byte UnknownMapAttributes_082E5610
+ .4byte UnknownMapAttributes_082E5634
+ .4byte UnknownMapAttributes_082E5658
+ .4byte UnknownMapAttributes_082E567C
+ .4byte UnknownMapAttributes_082E56A0
+ .4byte UnknownMapAttributes_082E56C4
+ .4byte UnknownMapAttributes_082E56E8
+ .4byte UnknownMapAttributes_082E570C
+ .4byte UnknownMapAttributes_082E5730
+ .4byte UnknownMapAttributes_082E5754
+ .4byte UnknownMapAttributes_082E5778
+ .4byte UnknownMapAttributes_082E579C
.4byte NewMauville_Entrance_MapAttributes
.4byte NewMauville_Inside_MapAttributes
.4byte AbandonedShip_Deck_MapAttributes
@@ -3515,7 +3517,7 @@ gUnknown_08304F18:: @ 8304F18
.4byte SafariZone_Northeast_MapAttributes
.4byte SafariZone_Southwest_MapAttributes
.4byte SafariZone_Southeast_MapAttributes
- .4byte 0x082edf30
+ .4byte UnknownMapAttributes_082EDF30
.4byte Route109_SeashoreHouse_MapAttributes
.4byte Route110_TrickHouseEntrance_MapAttributes
.4byte Route110_TrickHouseEnd_MapAttributes
@@ -3585,21 +3587,21 @@ gUnknown_08304F18:: @ 8304F18
.4byte SootopolisCity_House3_MapAttributes
.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
.4byte ScorchedSlab_MapAttributes
- .4byte 0x082ff894
+ .4byte UnknownMapAttributes_082FF894
.4byte RustboroCity_Flat1_1F_MapAttributes
.4byte RustboroCity_Flat1_2F_MapAttributes
.4byte EverGrandeCity_Corridor4_MapAttributes
.4byte MagmaHideout_1F_MapAttributes
.4byte MagmaHideout_B1F_MapAttributes
.4byte MagmaHideout_B2F_MapAttributes
- .4byte 0x08302970
+ .4byte UnknownMapAttributes_08302970
.4byte SkyPillar_Entrance_MapAttributes
.4byte SkyPillar_Outside_MapAttributes
.4byte SkyPillar_1F_MapAttributes
.4byte SkyPillar_2F_MapAttributes
.4byte SkyPillar_3F_MapAttributes
.4byte SkyPillar_4F_MapAttributes
- .4byte 0x083041b4
+ .4byte UnknownMapAttributes_083041B4
.4byte MossdeepCity_StevensHouse_MapAttributes
.4byte ShoalCave_LowTideIceRoom_MapAttributes
.4byte SafariZone_RestHouse_MapAttributes
@@ -7172,7 +7174,6 @@ gUnknown_08376180:: @ 8376180
.align 1
gUnknown_08376194:: @ 8376194
.2byte 16, 8, 6, 4, 2
-
Unknown_837619E:
.byte -4, -6, -8, -10, -11, -12, -12, -12, -11, -10, -9, -8, -6, -4, 0, 0
Unknown_83761AE:
@@ -7254,9 +7255,9 @@ gUnknown_083762DC:: @ 83762DC
.align 2
gUnknown_083762F0:: @ 83762F0
- .4byte 0x020231cc
- .4byte 0x020232cc
- .4byte 0x020233cc
+ .4byte gStringVar1
+ .4byte gStringVar2
+ .4byte gStringVar3
gUnknown_083762FC:: @ 83762FC
.incbin "baserom.gba", 0x003762fc, 0x68
@@ -7305,7 +7306,7 @@ gSpriteImage_8376484:: @ 8376484
.incbin "graphics/unknown_sprites/83764AC/1.4bpp"
.align 2
- .incbin "baserom.gba", 0x3764a4, 0x8
+ .incbin "baserom.gba", 0x003764a4, 0x8
.align 2
gSpriteImageTable_83764AC:: @ 83764AC
@@ -7343,15 +7344,80 @@ gSpriteTemplate_83764E8:: @ 83764E8
gUnknown_08376500:: @ 8376500
.incbin "baserom.gba", 0x00376500, 0x4
+ .align 1
gUnknown_08376504:: @ 8376504
- .incbin "baserom.gba", 0x00376504, 0xd8
+ .2byte MOVE_FOCUS_PUNCH
+ .2byte MOVE_DRAGON_CLAW
+ .2byte MOVE_WATER_PULSE
+ .2byte MOVE_CALM_MIND
+ .2byte MOVE_ROAR
+ .2byte MOVE_TOXIC
+ .2byte MOVE_HAIL
+ .2byte MOVE_BULK_UP
+ .2byte MOVE_BULLET_SEED
+ .2byte MOVE_HIDDEN_POWER
+ .2byte MOVE_SUNNY_DAY
+ .2byte MOVE_TAUNT
+ .2byte MOVE_ICE_BEAM
+ .2byte MOVE_BLIZZARD
+ .2byte MOVE_HYPER_BEAM
+ .2byte MOVE_LIGHT_SCREEN
+ .2byte MOVE_PROTECT
+ .2byte MOVE_RAIN_DANCE
+ .2byte MOVE_GIGA_DRAIN
+ .2byte MOVE_SAFEGUARD
+ .2byte MOVE_FRUSTRATION
+ .2byte MOVE_SOLAR_BEAM
+ .2byte MOVE_IRON_TAIL
+ .2byte MOVE_THUNDERBOLT
+ .2byte MOVE_THUNDER
+ .2byte MOVE_EARTHQUAKE
+ .2byte MOVE_RETURN
+ .2byte MOVE_DIG
+ .2byte MOVE_PSYCHIC
+ .2byte MOVE_SHADOW_BALL
+ .2byte MOVE_BRICK_BREAK
+ .2byte MOVE_DOUBLE_TEAM
+ .2byte MOVE_REFLECT
+ .2byte MOVE_SHOCK_WAVE
+ .2byte MOVE_FLAMETHROWER
+ .2byte MOVE_SLUDGE_BOMB
+ .2byte MOVE_SANDSTORM
+ .2byte MOVE_FIRE_BLAST
+ .2byte MOVE_ROCK_TOMB
+ .2byte MOVE_AERIAL_ACE
+ .2byte MOVE_TORMENT
+ .2byte MOVE_FACADE
+ .2byte MOVE_SECRET_POWER
+ .2byte MOVE_REST
+ .2byte MOVE_ATTRACT
+ .2byte MOVE_THIEF
+ .2byte MOVE_STEEL_WING
+ .2byte MOVE_SKILL_SWAP
+ .2byte MOVE_SNATCH
+ .2byte MOVE_OVERHEAT
+ .2byte MOVE_CUT
+ .2byte MOVE_FLY
+ .2byte MOVE_SURF
+ .2byte MOVE_STRENGTH
+ .2byte MOVE_FLASH
+ .2byte MOVE_ROCK_SMASH
+ .2byte MOVE_WATERFALL
+ .2byte MOVE_DIVE
+
+ .4byte gTileBuffer @ unreferenced?
+MenuGfx_HoldIcons:
+ .incbin "graphics/interface/hold_icons.4bpp"
+MenuPal_HoldIcons:
+ .incbin "graphics/interface/hold_icons.gbapal"
.align 2
gUnknown_083765DC:: @ 83765DC
- obj_tiles 0x0837657c, 64, 0xd750
+ obj_tiles MenuGfx_HoldIcons, 64, 0xd750
+ .align 2
gUnknown_083765E4:: @ 83765E4
- .incbin "baserom.gba", 0x003765e4, 0x8
+ obj_pal MenuPal_HoldIcons, 0xd750
.align 2
gOamData_83765EC:: @ 83765EC
@@ -7403,7 +7469,7 @@ gUnknown_08376624:: @ 8376624
.4byte OtherText_TeachWhichPoke
gUnknown_08376678:: @ 8376678
- .incbin "baserom.gba", 0x00376678, 0xc0
+ .incbin "baserom.gba", 0x00376678, 0xc0 @ 4 byte array?
gUnknown_08376738:: @ 8376738
.incbin "baserom.gba", 0x00376738, 0x120
@@ -7436,16 +7502,54 @@ gUnknown_08376A25:: @ 8376A25
.incbin "baserom.gba", 0x00376a25, 0x39
gUnknown_08376A5E:: @ 8376A5E
- .incbin "baserom.gba", 0x00376a5e, 0xf6
+ .incbin "baserom.gba", 0x00376a5e, 0xf3
+ .align 2
gUnknown_08376B54:: @ 8376B54
- .incbin "baserom.gba", 0x00376b54, 0x60
+ .4byte ether_effect_related_2
+ .4byte sub_80704F0
+Unknown_08376B5C:
+ .incbin "baserom.gba", 0x00376b5c, 0x2c
+Unknown_08376B88:
+ .incbin "baserom.gba", 0x00376b88, 0x2c
+ .align 2
gUnknown_08376BB4:: @ 8376BB4
- .incbin "baserom.gba", 0x00376bb4, 0xc0
+ .4byte 0x401, Unknown_08376B5C
+ .4byte 0x10C, Unknown_08376B88
+ .4byte 0x40C, Unknown_08376B88
+ .4byte 0x70C, Unknown_08376B88
+ .4byte 0xA0C, Unknown_08376B88
+ .4byte 0xD0C, Unknown_08376B88
+ .4byte 0x201, Unknown_08376B5C
+ .4byte 0x901, Unknown_08376B5C
+ .4byte 0x10C, Unknown_08376B88
+ .4byte 0x50C, Unknown_08376B88
+ .4byte 0x90C, Unknown_08376B88
+ .4byte 0xD0C, Unknown_08376B88
+ .4byte 0x201, Unknown_08376B5C
+ .4byte 0x901, Unknown_08376B5C
+ .4byte 0x20C, Unknown_08376B88
+ .4byte 0x50C, Unknown_08376B88
+ .4byte 0x90C, Unknown_08376B88
+ .4byte 0xC0C, Unknown_08376B88
+ .4byte 0x201, Unknown_08376B5C
+ .4byte 0x20C, Unknown_08376B88
+ .4byte 0x50C, Unknown_08376B88
+ .4byte 0x901, Unknown_08376B5C
+ .4byte 0x90C, Unknown_08376B88
+ .4byte 0xC0C, Unknown_08376B88
+ .align 2
gUnknown_08376C74:: @ 8376C74
- .incbin "baserom.gba", 0x00376c74, 0x60
+ .4byte sub_8089CD4, sub_806AFD0, 0
+ .4byte sub_8095118, sub_8094E58, 0
+ .4byte sub_80F9C6C, sub_80F9ACC, 0
+ .4byte sub_80F9C6C, sub_806AFD0, 0
+ .4byte sub_81222B0, sub_8121E78, 0
+ .4byte sub_8122A48, sub_8122854, 0xFF
+ .4byte sub_8122E0C, sub_806AFD0, 0x0F
+ .4byte sub_80F9E64, sub_80F9CE8, 0
gUnknown_08376CD4:: @ 8376CD4
.incbin "baserom.gba", 0x00376cd4, 0x18
@@ -8148,7 +8252,16 @@ gOamData_837DF3C:: @ 837DF3C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37df44, 0x10
+gOamData_837DF44:: @ 837DF44
+ .2byte 0x4000
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DF4C:: @ 837DF4C
+ .2byte 0x4000
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837DF54:: @ 837DF54
@@ -8169,7 +8282,10 @@ gOamData_837DF64:: @ 837DF64
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37df6c, 0x8
+gOamData_837DF6C:: @ 837DF6C
+ .2byte 0x8000
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837DF74:: @ 837DF74
@@ -8208,7 +8324,22 @@ gOamData_837DF9C:: @ 837DF9C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37dfa4, 0x18
+gOamData_837DFA4:: @ 837DFA4
+ .2byte 0x4100
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DFAC:: @ 837DFAC
+ .2byte 0x4100
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DFB4:: @ 837DFB4
+ .2byte 0x4100
+ .2byte 0x8000
+ .2byte 0x0800
.align 2
gOamData_837DFBC:: @ 837DFBC
@@ -8217,7 +8348,22 @@ gOamData_837DFBC:: @ 837DFBC
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37dfc4, 0x18
+gOamData_837DFC4:: @ 837DFC4
+ .2byte 0x8100
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DFCC:: @ 837DFCC
+ .2byte 0x8100
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DFD4:: @ 837DFD4
+ .2byte 0x8100
+ .2byte 0x8000
+ .2byte 0x0800
.align 2
gOamData_837DFDC:: @ 837DFDC
@@ -8250,7 +8396,16 @@ gOamData_837DFFC:: @ 837DFFC
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e004, 0x10
+gOamData_837D004:: @ 837D004
+ .2byte 0x4300
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837D00C:: @ 837D00C
+ .2byte 0x4300
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E014:: @ 837E014
@@ -8259,7 +8414,10 @@ gOamData_837E014:: @ 837E014
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e01c, 0x8
+gOamData_837E01C:: @ 837E01C
+ .2byte 0x4300
+ .2byte 0xC000
+ .2byte 0x0800
.align 2
gOamData_837E024:: @ 837E024
@@ -8268,7 +8426,10 @@ gOamData_837E024:: @ 837E024
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e02c, 0x8
+gOamData_837E02C:: @ 837E02C
+ .2byte 0x8300
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E034:: @ 837E034
@@ -8307,7 +8468,16 @@ gOamData_837E05C:: @ 837E05C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e064, 0x10
+gOamData_837E064:: @ 837E064
+ .2byte 0x4400
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E06C:: @ 837E06C
+ .2byte 0x4400
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E074:: @ 837E074
@@ -8328,7 +8498,10 @@ gOamData_837E084:: @ 837E084
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e08c, 0x8
+gOamData_837E08C:: @ 837E08C
+ .2byte 0x8400
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E094:: @ 837E094
@@ -8337,7 +8510,10 @@ gOamData_837E094:: @ 837E094
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e09c, 0x8
+gOamData_837E09C:: @ 837E09C
+ .2byte 0x8400
+ .2byte 0xC000
+ .2byte 0x0800
.align 2
gOamData_837E0A4:: @ 837E0A4
@@ -8364,7 +8540,28 @@ gOamData_837E0BC:: @ 837E0BC
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e0c4, 0x20
+gOamData_837E0C4:: @ 837E0C4
+ .2byte 0x4500
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E0CC:: @ 837E0CC
+ .2byte 0x4500
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E0D4:: @ 837E0D4
+ .2byte 0x4500
+ .2byte 0x8000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E0DC:: @ 837E0DC
+ .2byte 0x4500
+ .2byte 0xC000
+ .2byte 0x0800
.align 2
gOamData_837E0E4:: @ 837E0E4
@@ -8373,7 +8570,16 @@ gOamData_837E0E4:: @ 837E0E4
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e0ec, 0x10
+gOamData_837E0EC:: @ 837E0EC
+ .2byte 0x8500
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E0F4:: @ 837E0F4
+ .2byte 0x8500
+ .2byte 0x8000
+ .2byte 0x0800
.align 2
gOamData_837E0FC:: @ 837E0FC
@@ -8406,7 +8612,16 @@ gOamData_837E11C:: @ 837E11C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e124, 0x10
+gOamData_837E124:: @ 837E124
+ .2byte 0x4700
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E12C:: @ 837E12C
+ .2byte 0x4700
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E134:: @ 837E134
@@ -8427,7 +8642,22 @@ gOamData_837E144:: @ 837E144
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e14c, 0x18
+gOamData_837E14C:: @ 837E14C
+ .2byte 0x8700
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E154:: @ 837E154
+ .2byte 0x8700
+ .2byte 0x8000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E15C:: @ 837E15C
+ .2byte 0x8700
+ .2byte 0xC000
+ .2byte 0x0800
.align 2
gBattleAnimPicTable:: @ 837E164
@@ -9116,8 +9346,8 @@ gSpriteTemplate_837F5C8:: @ 837F5C8
.align 2
gUnknown_0837F5E0:: @ 837F5E0
- obj_tiles 0x082089dc, 2048, 0xd755
- obj_tiles 0x082089dc, 2048, 0xd756
+ obj_tiles gMiscBlank_Gfx, 2048, 0xd755
+ obj_tiles gMiscBlank_Gfx, 2048, 0xd756
.include "data/maps/events/PetalburgCity.s"
.include "data/maps/events/SlateportCity.s"
@@ -9632,10 +9862,12 @@ gSpriteTemplate_8393188:: @ 8393188
spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544
.align 2
- .incbin "baserom.gba", 0x3931a0, 0x38
+ .incbin "baserom.gba", 0x003931a0, 0x18
+Unknown_083931B8:
+ .incbin "baserom.gba", 0x003931b8, 0x20
gUnknown_083931D8:: @ 83931D8
- .incbin "baserom.gba", 0x003931d8, 0x8
+ .4byte 4, Unknown_083931B8
.align 2
gSpriteTemplate_83931E0:: @ 83931E0
@@ -9851,7 +10083,7 @@ gUnknown_08396FA8:: @ 8396FA8
.4byte DroughtPaletteData_4
.4byte DroughtPaletteData_5
- .incbin "baserom.gba", 0x00396fc0, 0x4
+ .incbin "baserom.gba", 0x00396fc0, 0x4 @ pointer to unk_2000000?
.align 2
gUnknown_08396FC4:: @ 8396FC4
@@ -10110,7 +10342,7 @@ gSpriteTemplate_839AB04:: @ 839AB04
spr_template 0xFFFF, 4608, gOamData_839AAD4, gSpriteAnimTable_839AAFC, gSpriteImageTable_839AADC, gDummySpriteAffineAnimTable, sub_807ED48
.align 2
- .incbin "baserom.gba", 0x39ab1c, 0x10
+ .incbin "baserom.gba", 0x0039ab1c, 0x10
.align 2
gOamData_839AB2C:: @ 839AB2C
@@ -10400,8 +10632,12 @@ gUnknown_0839B498:: @ 839B498
.4byte sub_8084654
.4byte sub_80846C8
+ .align 2
gUnknown_0839B4C8:: @ 839B4C8
- .incbin "baserom.gba", 0x0039b4c8, 0x10
+ .4byte sub_80845C8
+ .4byte sub_80845FC
+ .4byte sub_8084654
+ .4byte sub_80846C8
.align 2
gOamData_839B4D8:: @ 839B4D8
@@ -10586,7 +10822,7 @@ gSpriteImageTable_839F178:: @ 839F178
obj_frame_tiles gSpriteImage_839E7F4, 0x200
.align 2
- .incbin "baserom.gba", 0x39f180, 0x20
+ .incbin "baserom.gba", 0x0039f180, 0x20
gUnknown_0839F1A0:: @ 839F1A0
.incbin "baserom.gba", 0x0039f1a0, 0x28
@@ -10796,7 +11032,6 @@ gUnknown_0839F3E4:: @ 839F3E4
.align 2
gUnknown_0839F3F8:: @ 839F3F8
-Unknown_839F3F8:
.4byte sub_8088CA0
.4byte sub_8088CF8
.4byte sub_8088D3C
@@ -11103,18 +11338,23 @@ gSpriteTemplate_83A059C:: @ 83A059C
gSpriteTemplate_83A05B4:: @ 83A05B4
spr_template 4096, 4096, gOamData_83A042C, gSpriteAnimTable_83A0520, NULL, gDummySpriteAffineAnimTable, sub_808F168
+ .align 2
gUnknown_083A05CC:: @ 83A05CC
- .incbin "baserom.gba", 0x003a05cc, 0x10
-
+ obj_tiles gUnknown_08E874C8, 0x1F00, 0x1000
+ null_obj_tiles
+
+ .align 2
gUnknown_083A05DC:: @ 83A05DC
- .incbin "baserom.gba", 0x003a05dc, 0x10
-
+ obj_pal gUnknown_08E87AF4, 0x1000
+ null_obj_pal
+
gUnknown_083A05EC:: @ 83A05EC
- .incbin "baserom.gba", 0x003a05ec, 0x5
+ .byte 2, 4, 8, 16, 32
gUnknown_083A05F1:: @ 83A05F1
- .incbin "baserom.gba", 0x003a05f1, 0x7
-
+ .byte 16, 8, 4, 2, 1
+
+ .align 2
gUnknown_083A05F8:: @ 83A05F8
.string "$"
@@ -11299,14 +11539,10 @@ gUnknown_083B5FF4:: @ 83B5FF4
.align 2
gUnknown_083B600C:: @ 83B600C
- .4byte PCText_WithdrawPoke
- .4byte PCText_MovePokeToParty
- .4byte PCText_DepositPoke
- .4byte PCText_StorePokeInBox
- .4byte PCText_MovePoke
- .4byte PCText_OrganizeBoxesParty
- .4byte PCText_SeeYa
- .4byte PCText_ReturnToPrevMenu
+ .4byte PCText_WithdrawPoke, PCText_MovePokeToParty
+ .4byte PCText_DepositPoke, PCText_StorePokeInBox
+ .4byte PCText_MovePoke, PCText_OrganizeBoxesParty
+ .4byte PCText_SeeYa, PCText_ReturnToPrevMenu
.align 2
gSpriteAnim_83B602C:: @ 83B602C
@@ -11392,7 +11628,7 @@ gUnknown_083B6DB4:: @ 83B6DB4
.align 2
gUnknown_083B6DB8:: @ 83B6DB8
- .4byte 0x02039360
+ .4byte gTileBuffer
.align 2
gWaveformSpritePalette:: @ 83B6DBC
@@ -11499,11 +11735,11 @@ gOamData_83B6F2C:: @ 83B6F2C
.align 2
Unknown_83B6F34: @ 83B6F34
- .incbin "baserom.gba", 0x3b6f34, 0x10
+ .incbin "baserom.gba", 0x003b6f34, 0x10
.align 2
Unknown_83B6F44: @ 83B6F44
- .incbin "baserom.gba", 0x3b6f44, 0x18
+ .incbin "baserom.gba", 0x003b6f44, 0x18
.align 2
gUnknown_083B6F5C:: @ 83B6F5C
@@ -11839,15 +12075,18 @@ gWallpaperTable:: @ 83BB0E8
.4byte gWallpaperTilemap_Plain
.4byte gWallpaperPalettes_Plain
+PCPal_Arrow:
.incbin "graphics/pokemon_storage/arrow.gbapal"
+PCGfx_Arrow:
.incbin "graphics/pokemon_storage/arrow.4bpp"
.align 2
gUnknown_083BB288:: @ 83BB288
- obj_tiles 0x083bb208, 128, 0x0006
+ obj_tiles PCGfx_Arrow, 128, 0x0006
+ .align 2
gUnknown_083BB290:: @ 83BB290
- .incbin "baserom.gba", 0x003bb290, 0x8
+ obj_pal PCPal_Arrow, 0xDACF
.align 2
gOamData_83BB298:: @ 83BB298
@@ -12034,21 +12273,20 @@ gUnknown_083BBCA0:: @ 83BBCA0
.include "data/graphics/pokemon/icon_palette_table.s"
gUnknown_083BC5E8:: @ 83BC5E8
- .incbin "baserom.gba", 0x3BC5E8, 0x8
+ .incbin "baserom.gba", 0x003BC5E8, 0x8
Unknown_83BC5F0:
- .incbin "baserom.gba", 0x3BC5F0, 0xC
+ .incbin "baserom.gba", 0x003BC5F0, 0xC
Unknown_83BC5FC:
- .incbin "baserom.gba", 0x3BC5FC, 0xC
+ .incbin "baserom.gba", 0x003BC5FC, 0xC
Unknown_83BC608:
- .incbin "baserom.gba", 0x3BC608, 0xC
+ .incbin "baserom.gba", 0x003BC608, 0xC
Unknown_83BC614:
- .incbin "baserom.gba", 0x3BC614, 0xC
+ .incbin "baserom.gba", 0x003BC614, 0xC
Unknown_83BC620:
- .incbin "baserom.gba", 0x3BC620, 0xC
+ .incbin "baserom.gba", 0x003BC620, 0xC
.align 2
gUnknown_083BC62C:: @ 83BC62C
-Unknown_83BC62C:
.4byte Unknown_83BC5F0
.4byte Unknown_83BC5FC
.4byte Unknown_83BC608
@@ -12225,7 +12463,7 @@ gSpriteAnimTable_83C115C:: @ 83C115C
.align 2
gUnknown_083C11B8:: @ 83C11B8
- obj_tiles 0x08e71d10, 5888, 0x7532
+ obj_tiles gUnknown_08E71D10, 5888, 0x7532
.align 2
gSpriteTemplate_83C11C0:: @ 83C11C0
@@ -12305,11 +12543,11 @@ gSpriteAnimTable_83C1248:: @ 83C1248
.align 2
gUnknown_083C1270:: @ 83C1270
- obj_tiles 0x08e7274c, 1024, 0x7530
+ obj_tiles gMenuSummaryGfx, 1024, 0x7530
.align 2
gUnknown_083C1278:: @ 83C1278
- obj_pal 0x08e72848, 0x7530
+ obj_pal gMenuSummaryPal, 0x7530
.align 2
gSpriteTemplate_83C1280:: @ 83C1280
@@ -12368,11 +12606,11 @@ gSpriteAnimTable_83C12D8:: @ 83C12D8
.align 2
gUnknown_083C12F4:: @ 83C12F4
- obj_tiles 0x08e72860, 896, 0x7531
+ obj_tiles gStatusGfx_Icons, 896, 0x7531
.align 2
gUnknown_083C12FC:: @ 83C12FC
- obj_pal 0x08e72a50, 0x7531
+ obj_pal gStatusPal_Icons, 0x7531
.align 2
gSpriteTemplate_83C1304:: @ 83C1304
@@ -12568,7 +12806,7 @@ gSpriteAnimTable_83C1C84:: @ 83C1C84
.4byte gSpriteAnim_83C1C7C
.align 2
- .incbin "baserom.gba", 0x3c1c98, 0x4
+ .incbin "baserom.gba", 0x003c1c98, 0x4
.align 2
gSpriteAffineAnim_83C1C9C:: @ 83C1C9C
@@ -12653,7 +12891,7 @@ gSpriteAnimTable_83C1D68:: @ 83C1D68
.4byte gSpriteAnim_83C1D60
.align 2
- .incbin "baserom.gba", 0x3c1d6c, 0x8
+ .incbin "baserom.gba", 0x003c1d6c, 0x8
.align 2
gSpriteTemplate_83C1D74:: @ 83C1D74
@@ -12693,10 +12931,11 @@ gSpriteTemplate_83C1E04:: @ 83C1E04
.align 2
gUnknown_083C1F74:: @ 83C1F74
- obj_tiles 0x08e78bb4, 2048, 0x2710
+ obj_tiles gUnknown_08E78BB4, 2048, 0x2710
+ .align 2
gUnknown_083C1F7C:: @ 83C1F7C
- .incbin "baserom.gba", 0x003c1f7c, 0x8
+ obj_pal gUnknown_08E7883C, 0x2710
.align 2
gOamData_83C1F84:: @ 83C1F84
@@ -12782,7 +13021,13 @@ gUnknown_083C91F0:: @ 83C91F0
.4byte Unknown_83C91D6, sub_80AB02C
gUnknown_083C9228:: @ 83C9228
- .incbin "baserom.gba", 0x003c9228, 0x46
+ .incbin "baserom.gba", 0x003c9228, 0x5
+Unknown_083C922D:
+ .incbin "graphics/unknown/ball.4bpp"
+
+ .align 1
+Unknown_083C924E:
+ .incbin "graphics/unknown/ball.gbapal"
gUnknown_083C926E:: @ 83C926E
.incbin "baserom.gba", 0x003c926e, 0x8
@@ -12804,10 +13049,11 @@ gUnknown_083C92A8:: @ 83C92A8
.align 2
gUnknown_083C92B4:: @ 83C92B4
- obj_tiles 0x083c922d, 32, 0x04b0
+ obj_tiles Unknown_083C922D, 32, 0x04b0
+ .align 2
gUnknown_083C92BC:: @ 83C92BC
- .incbin "baserom.gba", 0x003c92bc, 0x8
+ obj_pal Unknown_083C924E, 0x04B0
.align 2
gOamData_83C92C4:: @ 83C92C4
@@ -12850,17 +13096,17 @@ gUnknown_083C933B:: @ 83C933B
.incbin "baserom.gba", 0x003c933b, 0x29
gUnknown_083C9364:: @ 83C9364
- .incbin "baserom.gba", 0x3C9364, 0x18
+ .incbin "baserom.gba", 0x003C9364, 0x18
Unknown_83C937C:
- .incbin "baserom.gba", 0x3C937C, 0xB
+ .incbin "baserom.gba", 0x003C937C, 0xB
Unknown_83C9387:
- .incbin "baserom.gba", 0x3C9387, 0xB
+ .incbin "baserom.gba", 0x003C9387, 0xB
Unknown_83C9392:
- .incbin "baserom.gba", 0x3C9392, 0xB
+ .incbin "baserom.gba", 0x003C9392, 0xB
Unknown_83C939D:
- .incbin "baserom.gba", 0x3C939D, 0xB
+ .incbin "baserom.gba", 0x003C939D, 0xB
Unknown_83C93A8:
- .incbin "baserom.gba", 0x3C93A8, 0xC
+ .incbin "baserom.gba", 0x003C93A8, 0xC
.align 2
gUnknown_083C93B4:: @ 83C93B4
@@ -12955,13 +13201,14 @@ gSpriteTemplate_83CA3AC:: @ 83CA3AC
.align 2
gUnknown_083CA3C4:: @ 83CA3C4
- obj_tiles 0x08e69404, 256, 0x4e26
- obj_tiles 0x08e69404, 256, 0x4e27
- obj_tiles 0x08e69404, 256, 0x4e28
- obj_tiles 0x08e69404, 256, 0x4e29
+ obj_tiles gContestNextTurnGfx, 256, 0x4e26
+ obj_tiles gContestNextTurnGfx, 256, 0x4e27
+ obj_tiles gContestNextTurnGfx, 256, 0x4e28
+ obj_tiles gContestNextTurnGfx, 256, 0x4e29
+ .align 2
gUnknown_083CA3E4:: @ 83CA3E4
- .incbin "baserom.gba", 0x003ca3e4, 0x8
+ obj_pal gContestPal, 0x4E26
.align 2
gOamData_83CA3EC:: @ 83CA3EC
@@ -12986,17 +13233,18 @@ gSpriteTemplate_83CA43C:: @ 83CA43C
spr_template 20009, 20006, gOamData_83CA3EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
- .incbin "baserom.gba", 0x3ca454, 0x10
+ .incbin "baserom.gba", 0x003ca454, 0x10
gUnknown_083CA464:: @ 83CA464
.incbin "baserom.gba", 0x003ca464, 0x8
.align 2
gUnknown_083CA46C:: @ 83CA46C
- obj_tiles 0x08e69648, 1024, 0xabe2
+ obj_tiles gContestApplauseGfx, 1024, 0xabe2
+ .align 2
gUnknown_083CA474:: @ 83CA474
- .incbin "baserom.gba", 0x003ca474, 0x8
+ obj_pal gContestPal, 0xABE2
.align 2
gOamData_83CA47C:: @ 83CA47C
@@ -13020,15 +13268,15 @@ gSpriteTemplate_83CA4A4:: @ 83CA4A4
.align 2
gUnknown_083CA4BC:: @ 83CA4BC
- obj_tiles 0x08d1c748, 2048, 0x4e25
+ obj_tiles gContestJudgeGfx, 2048, 0x4e25
.align 2
gUnknown_083CA4C4:: @ 83CA4C4
- obj_tiles 0x08d19590, 896, 0xabe0
+ obj_tiles gContestJudgeSymbolsGfx, 896, 0xabe0
.align 2
gUnknown_083CA4CC:: @ 83CA4CC
- obj_pal 0x08d19734, 0xabe0
+ obj_pal gContest3Pal, 0xabe0
.include "data/text/contest_strings.s"
@@ -13055,10 +13303,14 @@ UnknownText_UnknownFormatting3:
.align 2
gUnknown_083CC3AC:: @ 83CC3AC
- obj_tiles 0x08d16024, 512, 0x4e20
+ obj_tiles gContestNumbers_UnusedGfx, 512, 0x4e20
+ .align 2
gUnknown_083CC3B4:: @ 83CC3B4
- .incbin "baserom.gba", 0x003cc3b4, 0x20
+ obj_pal gContestNumbers_UnusedPal, 0x4E20
+ obj_pal gContestNumbers_UnusedPal, 0x4E21
+ obj_pal gContestNumbers_UnusedPal, 0x4E22
+ obj_pal gContestNumbers_UnusedPal, 0x4E23
.align 2
gSpriteAnim_83CC3D4:: @ 83CC3D4
@@ -13110,7 +13362,7 @@ gSpriteAffineAnimTable_83CC43C:: @ 83CC43C
.4byte gSpriteAffineAnim_83CC424
.align 2
- .incbin "baserom.gba", 0x3cc448, 0x4
+ .incbin "baserom.gba", 0x003cc448, 0x4
.align 2
gOamData_83CC44C:: @ 83CC44C
@@ -13136,10 +13388,10 @@ gSpriteTemplate_83CC49C:: @ 83CC49C
.align 2
gUnknown_083CC4B4:: @ 83CC4B4
- obj_tiles 0x08d0314c, 4096, 0x80e8
- obj_tiles 0x08d0314c, 4096, 0x80e9
- obj_tiles 0x08d0314c, 4096, 0x80ea
- obj_tiles 0x08d0314c, 4096, 0x80eb
+ obj_tiles gBlankGfxCompressed, 4096, 0x80e8
+ obj_tiles gBlankGfxCompressed, 4096, 0x80e9
+ obj_tiles gBlankGfxCompressed, 4096, 0x80ea
+ obj_tiles gBlankGfxCompressed, 4096, 0x80eb
gUnknown_083CC4D4:: @ 83CC4D4
.incbin "baserom.gba", 0x003cc4d4, 0x20
@@ -13265,7 +13517,7 @@ gSpriteImage_83CE154:: @ 83CE154
.incbin "graphics/unknown_sprites/83CE588/1.4bpp"
.align 2
- .incbin "baserom.gba", 0x3ce214, 0x4
+ .incbin "baserom.gba", 0x003ce214, 0x4
.align 2
gUnknown_083CE218:: @ 83CE218
@@ -13591,11 +13843,11 @@ gSpriteTemplate_83CF56C:: @ 83CF56C
.align 2
gUnknown_083CF584:: @ 83CF584
- obj_tiles 0x08e77a5c, 256, 0x2722
+ obj_tiles gMenuMoneyGfx, 256, 0x2722
.align 2
gUnknown_083CF58C:: @ 83CF58C
- obj_pal 0x08e77900, 0x2722
+ obj_pal gMenuMoneyPal, 0x2722
@ 83CF594
.include "data/contest_moves.s"
@@ -13801,9 +14053,9 @@ gUnknown_083D1454:: @ 83D1454
.align 2
gUnknown_083D1464:: @ 83D1464
- .4byte 0x020231cc
- .4byte 0x020232cc
- .4byte 0x020233cc
+ .4byte gStringVar1
+ .4byte gStringVar2
+ .4byte gStringVar3
.align 2
gUnknown_083D1470:: @ 83D1470
@@ -13953,6 +14205,7 @@ gUnknown_083D1600:: @ 83D1600
.4byte UnknownString_81ACF49
.4byte UnknownString_81AD00A
+ .align 2
gUnknown_083D1624:: @ 83D1624
.incbin "baserom.gba", 0x003d1624, 0x20
@@ -13960,7 +14213,11 @@ gUnknown_083D1644:: @ 83D1644
.incbin "baserom.gba", 0x003d1644, 0xa0
gUnknown_083D16E4:: @ 83D16E4
- .incbin "baserom.gba", 0x003d16e4, 0x60
+ .incbin "baserom.gba", 0x003d16e4, 0x40
+
+ .align 2
+gMiscBlank_Pal::
+ .incbin "graphics/interface/blank.gbapal"
.align 2
gOamData_83D1744:: @ 83D1744
@@ -13974,17 +14231,18 @@ gSpriteTemplate_83D174C:: @ 83D174C
.align 2
gUnknown_083D1764:: @ 83D1764
- obj_tiles 0x082089dc, 1024, 0x0bc1
- obj_tiles 0x082089dc, 1024, 0x0bc2
- obj_tiles 0x082089dc, 1024, 0x0bc3
- obj_tiles 0x082089dc, 1024, 0x0bc4
- obj_tiles 0x082089dc, 1024, 0x0bc5
- obj_tiles 0x082089dc, 1024, 0x0bc6
- obj_tiles 0x082089dc, 1024, 0x0bc7
- obj_tiles 0x082089dc, 1024, 0x0bc8
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc1
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc2
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc3
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc4
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc5
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc6
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc7
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc8
+ .align 2
gUnknown_083D17A4:: @ 83D17A4
- .incbin "baserom.gba", 0x003d17a4, 0x8
+ obj_pal gMiscBlank_Pal, 0x0BC1
.align 2
gOamData_83D17AC:: @ 83D17AC
@@ -13998,11 +14256,11 @@ gSpriteTemplate_83D17B4:: @ 83D17B4
.align 2
gUnknown_083D17CC:: @ 83D17CC
- obj_tiles 0x08d2d7d4, 544, 0x0bc9
+ obj_tiles gContestConfetti_Gfx, 544, 0x0bc9
.align 2
gUnknown_083D17D4:: @ 83D17D4
- obj_pal 0x08d2d8f4, 0x0bc9
+ obj_pal gContestConfetti_Pal, 0x0bc9
gUnknown_083D17DC:: @ 83D17DC
.incbin "baserom.gba", 0x003d17dc, 0x4
@@ -14024,11 +14282,11 @@ gUnknown_083D188E:: @ 83D188E
.align 2
gUnknown_083D1898:: @ 83D1898
- obj_pal 0x083d190c, 0x0080
+ obj_pal gUnknownPal_083D190C, 0x0080
.align 2
gUnknown_083D18A0:: @ 83D18A0
- obj_pal 0x083d18ec, 0x0000
+ obj_pal gUnknownPal_083D18EC, 0x0000
.align 2
gSpriteTemplate_83D18A8:: @ 83D18A8
@@ -14054,7 +14312,14 @@ gSpriteAnimTable_83D18E8:: @ 83D18E8
.4byte gSpriteAnim_83D18E0
.align 2
- .incbin "baserom.gba", 0x3d18ec, 0xa0
+gUnknownPal_083D18EC::
+ .incbin "baserom.gba", 0x003d18ec, 0x20
+
+ .align 2
+gUnknownPal_083D190C::
+ .incbin "baserom.gba", 0x003d190c, 0x20
+
+ .incbin "baserom.gba", 0x003d192c, 0x60
.align 2
gSpriteImage_83D198C:: @ 83D198C
@@ -14077,7 +14342,7 @@ gSpriteImage_83D1B8C:: @ 83D1B8C
.incbin "graphics/unknown_sprites/83D259C/4.4bpp"
.align 2
- .incbin "baserom.gba", 0x3d1c0c, 0x20
+ .incbin "baserom.gba", 0x003d1c0c, 0x20
.align 2
gFieldEffectObjectPalette7: @ 83D1C2C
@@ -14124,7 +14389,7 @@ gSpriteImage_83D20CC:: @ 83D20CC
.incbin "graphics/unknown_sprites/83D25C4/4.4bpp"
.align 2
- .incbin "baserom.gba", 0x3d214c, 0x80
+ .incbin "baserom.gba", 0x003d214c, 0x80
.align 2
gFieldEffectObjectPalette8: @ 83D21CC
@@ -14306,7 +14571,7 @@ gSpriteImage_83D27C0:: @ 83D27C0
.incbin "graphics/unknown_sprites/83D2860/2.4bpp"
.align 2
- .incbin "baserom.gba", 0x3d2840, 0x20
+ .incbin "baserom.gba", 0x003d2840, 0x20
.align 2
gSpriteImageTable_83D2860:: @ 83D2860
@@ -14450,7 +14715,7 @@ gSpriteAffineAnim_83D5EAC:: @ 83D5EAC
obj_rot_scal_anim_jump 0
.align 2
- .incbin "baserom.gba", 0x3d5ebc, 0x60
+ .incbin "baserom.gba", 0x003d5ebc, 0x60
.align 2
gSpriteAffineAnim_83D5F1C:: @ 83D5F1C
@@ -14459,7 +14724,7 @@ gSpriteAffineAnim_83D5F1C:: @ 83D5F1C
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d5f34, 0x30
+ .incbin "baserom.gba", 0x003d5f34, 0x30
.align 2
gSpriteAffineAnim_83D5F64:: @ 83D5F64
@@ -14468,7 +14733,7 @@ gSpriteAffineAnim_83D5F64:: @ 83D5F64
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d5f7c, 0xc0
+ .incbin "baserom.gba", 0x003d5f7c, 0xc0
.align 2
gSpriteAffineAnimTable_83D603C:: @ 83D603C
@@ -14480,7 +14745,7 @@ gSpriteAffineAnimTable_83D603C:: @ 83D603C
.4byte gSpriteAffineAnim_83D5F64
.align 2
- .incbin "baserom.gba", 0x3d6054, 0x38
+ .incbin "baserom.gba", 0x003d6054, 0x38
.align 2
gSpriteTemplate_83D608C:: @ 83D608C
@@ -15428,7 +15693,7 @@ gSpriteAffineAnim_83D6D2C:: @ 83D6D2C
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d6d44, 0x18
+ .incbin "baserom.gba", 0x003d6d44, 0x18
.align 2
gSpriteAffineAnim_83D6D5C:: @ 83D6D5C
@@ -15437,7 +15702,7 @@ gSpriteAffineAnim_83D6D5C:: @ 83D6D5C
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d6d74, 0x18
+ .incbin "baserom.gba", 0x003d6d74, 0x18
.align 2
gSpriteAffineAnimTable_83D6D8C:: @ 83D6D8C
@@ -15811,7 +16076,7 @@ gSpriteAffineAnim_83D7250:: @ 83D7250
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d7278, 0x48
+ .incbin "baserom.gba", 0x003d7278, 0x48
.align 2
gSpriteAffineAnimTable_83D72C0:: @ 83D72C0
@@ -15874,7 +16139,7 @@ gSpriteTemplate_83D7370:: @ 83D7370
spr_template 10064, 10064, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CF280
.align 2
- .incbin "baserom.gba", 0x3d7388, 0xc
+ .incbin "baserom.gba", 0x003d7388, 0xc
.align 2
gSpriteTemplate_83D7394:: @ 83D7394
@@ -16941,7 +17206,7 @@ gSpriteAnimTable_83D9650:: @ 83D9650
.4byte gSpriteAnim_83D9644
.align 2
- .incbin "baserom.gba", 0x3d9654, 0x28
+ .incbin "baserom.gba", 0x003d9654, 0x28
.align 2
gBattleAnimSpriteTemplate_83D967C:: @ 83D967C
@@ -17274,14 +17539,14 @@ gSpriteTemplate_83D9B40:: @ 83D9B40
spr_template 10001, 10001, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D755C
.align 2
- .incbin "baserom.gba", 0x3d9b58, 0x10
+ .incbin "baserom.gba", 0x003d9b58, 0x10
.align 2
gSpriteTemplate_83D9B68:: @ 83D9B68
spr_template 10141, 10141, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D7704
.align 2
- .incbin "baserom.gba", 0x3d9b80, 0x8
+ .incbin "baserom.gba", 0x003d9b80, 0x8
.align 2
gSpriteAnim_83D9B88:: @ 83D9B88
@@ -17310,7 +17575,7 @@ gSpriteAnim_83D9BA8:: @ 83D9BA8
obj_image_anim_jump 0
.align 2
- .incbin "baserom.gba", 0x3d9bb4, 0x4
+ .incbin "baserom.gba", 0x003d9bb4, 0x4
.align 2
gSpriteAnimTable_83D9BB8:: @ 83D9BB8
@@ -17959,7 +18224,7 @@ gBattleAnimSpriteTemplate_83DA498:: @ 83DA498
spr_template 10270, 10270, gOamData_837DF94, gSpriteAnimTable_83DA490, NULL, gDummySpriteAffineAnimTable, sub_80DA4D8
.align 2
- .incbin "baserom.gba", 0x3da4b0, 0x20
+ .incbin "baserom.gba", 0x003da4b0, 0x20
.align 2
gSpriteTemplate_83DA4D0:: @ 83DA4D0
@@ -18033,7 +18298,7 @@ gBattleAnimSpriteTemplate_83DA5D8:: @ 83DA5D8
spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA5D4, sub_80DB288
.align 2
- .incbin "baserom.gba", 0x3da5f0, 0x24
+ .incbin "baserom.gba", 0x003da5f0, 0x24
.align 2
gBattleAnimSpriteTemplate_83DA614:: @ 83DA614
@@ -18185,7 +18450,7 @@ gSpriteAnimTable_83DA85C:: @ 83DA85C
.4byte gSpriteAnim_83DA83C
.align 2
- .incbin "baserom.gba", 0x3da860, 0x28
+ .incbin "baserom.gba", 0x003da860, 0x28
gUnknown_083DA888:: @ 83DA888
.incbin "baserom.gba", 0x003da888, 0x4
@@ -18451,7 +18716,7 @@ gBattleAnimSpriteTemplate_83DACE8:: @ 83DACE8
spr_template 10261, 10261, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DD3AC
.align 2
- .incbin "baserom.gba", 0x3dad00, 0x10
+ .incbin "baserom.gba", 0x003dad00, 0x10
gUnknown_083DAD10:: @ 83DAD10
.incbin "baserom.gba", 0x003dad10, 0x8
@@ -18597,7 +18862,7 @@ gBattleAnimSpriteTemplate_83DAEDC:: @ 83DAEDC
spr_template 10177, 10177, gOamData_837DF74, gSpriteAnimTable_83DAED8, NULL, gDummySpriteAffineAnimTable, sub_80DE0FC
.align 2
- .incbin "baserom.gba", 0x3daef4, 0x14
+ .incbin "baserom.gba", 0x003daef4, 0x14
.align 2
gSpriteTemplate_83DAF08:: @ 83DAF08
@@ -19131,8 +19396,15 @@ gUnknown_083DB7EC:: @ 83DB7EC
gUnknown_083DB7F4:: @ 83DB7F4
.incbin "baserom.gba", 0x003db7f4, 0x24C
+
+ .align 2
+gMenuInterviewFrame_Pal::
.incbin "graphics/misc/interview_frame.gbapal"
+
+ .align 2
+gMenuInterviewFrame_Gfx::
.incbin "graphics/misc/interview_frame.4bpp.lz"
+
.incbin "baserom.gba", 0x003dbb94, 0x20
gUnknown_083DBBB4:: @ 83DBBB4
@@ -19244,7 +19516,7 @@ gSpriteTemplate_83DBCAC:: @ 83DBCAC
.align 2
gUnknown_083DBCC4:: @ 83DBCC4
- .incbin "baserom.gba", 0x3dbcc4, 0x1c
+ .incbin "baserom.gba", 0x003dbcc4, 0x1c
.align 2
gOamData_83DBCE0:: @ 83DBCE0
@@ -19282,10 +19554,11 @@ gSpriteTemplate_83DBD18:: @ 83DBD18
.align 2
gUnknown_083DBD30:: @ 83DBD30
- obj_tiles 0x083dba60, 2048, 0x0006
+ obj_tiles gMenuInterviewFrame_Gfx, 2048, 0x0006
+ .align 2
gUnknown_083DBD38:: @ 83DBD38
- .incbin "baserom.gba", 0x003dbd38, 0x8
+ obj_pal gMenuInterviewFrame_Pal, 0x0004
.align 2
gOamData_83DBD40:: @ 83DBD40
@@ -19299,10 +19572,11 @@ gSpriteTemplate_83DBD48:: @ 83DBD48
.align 2
gUnknown_083DBD60:: @ 83DBD60
- obj_tiles 0x08e8ea98, 4096, 0x0007
+ obj_tiles gMenuWordGroup_Gfx, 4096, 0x0007
+ .align 2
gUnknown_083DBD68:: @ 83DBD68
- .incbin "baserom.gba", 0x003dbd68, 0x8
+ obj_pal gMenuWordGroup_Pal, 0x0005
.align 2
gOamData_83DBD70:: @ 83DBD70
@@ -19626,8 +19900,15 @@ gUnknown_083E329C:: @ 83E329C
.incbin "graphics/pokenav/icon.4bpp.lz"
.incbin "graphics/pokenav/contest_pokeball.4bpp"
.incbin "baserom.gba", 0x003E3780, 0x20
+
+ .align 2
+gContestSparkle_Pal::
.incbin "graphics/pokenav/contest_sparkle.gbapal"
+
+ .align 2
+gContestSparkle_Gfx::
.incbin "graphics/pokenav/contest_sparkle.4bpp"
+
.incbin "graphics/pokenav/contest_arrows.4bpp"
.incbin "baserom.gba", 0x003E3BC0, 0x20
.incbin "graphics/unknown/unknown_3E3BE0.4bpp"
@@ -19639,10 +19920,18 @@ gUnknown_083E3C60:: @ 83E3C60
.incbin "graphics/misc/ribbons_smart.gbapal"
.incbin "graphics/misc/ribbons_tough.gbapal"
+ .align 2
gUnknown_083E3D00:: @ 83E3D00
.incbin "graphics/misc/ribbons_full.4bpp.lz"
+
+ .align 2
+gUnknownPal_083E41D8::
.incbin "graphics/unknown/unknown_3E41D8.gbapal"
+
+ .align 2
+gUnknownGfx_083E41D8::
.incbin "graphics/unknown/unknown_3E41D8.4bpp"
+
.incbin "baserom.gba", 0x003e42D8, 0x20
gUnknown_083E42F8:: @ 83E42F8
@@ -19813,10 +20102,11 @@ gSpriteTemplate_83E4454:: @ 83E4454
.align 2
gUnknown_083E446C:: @ 83E446C
- obj_tiles 0x083e41d8, 256, 0x0019
+ obj_tiles gUnknownGfx_083E41D8, 256, 0x0019
+ .align 2
gUnknown_083E4474:: @ 83E4474
- .incbin "baserom.gba", 0x003e4474, 0x8
+ obj_pal gUnknownPal_083E41D8, 0x0011
.align 2
gOamData_83E447C:: @ 83E447C
@@ -20025,11 +20315,11 @@ gSpriteTemplate_83E476C:: @ 83E476C
.align 2
gUnknown_083E4784:: @ 83E4784
- obj_tiles 0x083e37c0, 896, 0x0017
+ obj_tiles gContestSparkle_Gfx, 896, 0x0017
.align 2
gUnknown_083E478C:: @ 83E478C
- obj_pal 0x083e37a0, 0x000f
+ obj_pal gContestSparkle_Pal, 0x000f
gUnknown_083E4794:: @ 83E4794
.incbin "baserom.gba", 0x003e4794, 0x28
@@ -20059,7 +20349,7 @@ gSpriteAnimTable_83E47E4:: @ 83E47E4
.4byte gSpriteAnim_83E47C4 + 0x18
.align 2
- .incbin "baserom.gba", 0x3e47f4, 0xc
+ .incbin "baserom.gba", 0x003e47f4, 0xc
.align 2
gSpriteTemplate_83E4800:: @ 83E4800
@@ -20067,7 +20357,7 @@ gSpriteTemplate_83E4800:: @ 83E4800
.align 2
gUnknown_083E4818:: @ 83E4818
- .incbin "baserom.gba", 0x3e4818, 0x8
+ .incbin "baserom.gba", 0x003e4818, 0x8
.align 2
gSpriteAnim_83E4820:: @ 83E4820
@@ -20214,7 +20504,7 @@ gSpriteAnimTable_83E52AC:: @ 83E52AC
.4byte gSpriteAnim_83E52A4
gUnknown_083E52B4:: @ 83E52B4
- .incbin "baserom.gba", 0x3E52B4, 0x8
+ .incbin "baserom.gba", 0x003E52B4, 0x8
.align 2
gSpriteAnim_83E52BC:: @ 83E52BC
@@ -20486,7 +20776,7 @@ gSpriteImage_83E5928:: @ 83E5928
.incbin "graphics/unknown_sprites/83E59C0/1.4bpp"
.align 2
- .incbin "baserom.gba", 0x3e5948, 0x20
+ .incbin "baserom.gba", 0x003e5948, 0x20
gUnknown_083E5968:: @ 83E5968
.incbin "baserom.gba", 0x003e5968, 0x8
@@ -20559,6 +20849,9 @@ gUnknown_083E5A1C:: @ 83E5A1C
gUnknown_083E5A20:: @ 83E5A20
.incbin "baserom.gba", 0x003E5A20, 0xB0
+
+ .align 2
+gPokenavCursor_Pal::
.incbin "graphics/pokenav/cursor.gbapal"
gUnknown_083E5AF0:: @ 83E5AF0
@@ -20627,7 +20920,7 @@ gSpriteAnimTable_83E76E0:: @ 83E76E0
.align 2
gUnknown_083E76E8:: @ 83E76E8
- obj_pal 0x083e5ad0, 0x0000
+ obj_pal gPokenavCursor_Pal, 0x0000
.align 2
gSpriteTemplate_83E76F0:: @ 83E76F0
@@ -20650,6 +20943,9 @@ gUnknown_083E773C:: @ 83E773C
gUnknown_083E7774:: @ 83E7774
.incbin "baserom.gba", 0x003e7774, 0xb8
+
+ .align 2
+gPokenavMapMisc_Pal::
.incbin "graphics/pokenav/map_misc.gbapal"
gUnknown_083E784C:: @ 83E784C
@@ -20663,7 +20959,7 @@ gUnknown_083E79C0:: @ 83E79C0
.align 2
gUnknown_083E79CC:: @ 83E79CC
- obj_pal 0x083e782c, 0x0002
+ obj_pal gPokenavMapMisc_Pal, 0x0002
gUnknown_083E79D4:: @ 83E79D4
.incbin "baserom.gba", 0x003e79d4, 0x8
@@ -20805,7 +21101,13 @@ gUnknown_083EC97C:: @ 83EC97C
.incbin "baserom.gba", 0x003ec97c, 0x8
gUnknown_083EC984:: @ 83EC984
- .incbin "baserom.gba", 0x003ec984, 0x48
+ .incbin "baserom.gba", 0x003ec984, 0x8
+
+ .align 2
+gUnknown_083EC98C::
+ .incbin "baserom.gba", 0x003ec98c, 0x20
+
+ .incbin "baserom.gba", 0x003ec9ac, 0x20
.align 2
gUnknown_083EC9CC:: @ 83EC9CC
@@ -20823,7 +21125,7 @@ gSpriteImage_83EC9DC:: @ 83EC9DC
.align 2
gUnknown_083ECA5C:: @ 83ECA5C
- obj_pal 0x083ec98c, 0x0008
+ obj_pal gUnknown_083EC98C, 0x0008
gUnknown_083ECA64:: @ 83ECA64
.incbin "baserom.gba", 0x003eca64, 0x8
@@ -20966,7 +21268,7 @@ gUnknown_083ECBB4:: @ 83ECBB4
.4byte sub_81041AC
gUnknown_083ECBC4:: @ 83ECBC4
- .incbin "baserom.gba", 0x003ecbc4, 0x2
+ .2byte 0x9E
gUnknown_083ECBC6:: @ 83ECBC6
.incbin "baserom.gba", 0x003ecbc6, 0xa
@@ -21019,7 +21321,7 @@ gUnknown_083ECC54:: @ 83ECC54
.4byte nullsub_69
gUnknown_083ECC58:: @ 83ECC58
- .incbin "baserom.gba", 0x003ecc58, 0x2
+ .2byte 16
gUnknown_083ECC5A:: @ 83ECC5A
.incbin "baserom.gba", 0x003ecc5a, 0x8
@@ -21097,21 +21399,21 @@ gUnknown_083ECE7E:: @ 83ECE7E
.incbin "baserom.gba", 0x003ece7e, 0x8e
gUnknown_083ECF0C:: @ 83ECF0C
- .incbin "baserom.gba", 0x3ECF0C, 0x8C
+ .incbin "baserom.gba", 0x003ECF0C, 0x8C
Unknown_83ECF98:
- .incbin "baserom.gba", 0x3ECF98, 0x10
+ .incbin "baserom.gba", 0x003ECF98, 0x10
Unknown_83ECFA8:
- .incbin "baserom.gba", 0x3ECFA8, 0x1C
+ .incbin "baserom.gba", 0x003ECFA8, 0x1C
Unknown_83ECFC4:
- .incbin "baserom.gba", 0x3ECFC4, 0xC
+ .incbin "baserom.gba", 0x003ECFC4, 0xC
Unknown_83ECFD0:
- .incbin "baserom.gba", 0x3ECFD0, 0x18
+ .incbin "baserom.gba", 0x003ECFD0, 0x18
Unknown_83ECFE8:
- .incbin "baserom.gba", 0x3ECFE8, 0x10
+ .incbin "baserom.gba", 0x003ECFE8, 0x10
Unknown_83ECFF8:
- .incbin "baserom.gba", 0x3ECFF8, 0x28
+ .incbin "baserom.gba", 0x003ECFF8, 0x28
Unknown_83ED020:
- .incbin "baserom.gba", 0x3ED020, 0x28
+ .incbin "baserom.gba", 0x003ED020, 0x28
.align 2
gUnknown_083ED048:: @ 83ED048
@@ -21124,7 +21426,13 @@ gUnknown_083ED048:: @ 83ED048
.4byte Unknown_83ECFF8
gUnknown_083ED064:: @ 83ED064
- .incbin "baserom.gba", 0x003ed064, 0x1C
+ .4byte sub_810639C
+ .4byte sub_8106364
+ .4byte sub_8106370
+ .4byte nullsub_70
+ .4byte nullsub_70
+ .4byte sub_8106370
+ .4byte sub_8106370
.align 2
gOamData_83ED080:: @ 83ED080
@@ -21175,7 +21483,7 @@ gOamData_83ED0B8:: @ 83ED0B8
.2byte 0x0000
.align 2
- .incbin "baserom.gba", 0x3ed0c0, 0x40
+ .incbin "baserom.gba", 0x003ed0c0, 0x40
.align 2
gSpriteImageTable_83ED100:: @ 83ED100
@@ -21217,7 +21525,7 @@ gSpriteImageTable_83ED170:: @ 83ED170
obj_frame_tiles gSpriteImage_8E98868, 0x80
.align 2
- .incbin "baserom.gba", 0x3ed178, 0xb0
+ .incbin "baserom.gba", 0x003ed178, 0xb0
.align 2
gSpriteImageTable_83ED228:: @ 83ED228
@@ -21570,25 +21878,131 @@ gSpriteTemplate_83ED6CC:: @ 83ED6CC
spr_template 0xFFFF, 4, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED228, gSpriteAffineAnimTable_83ED410, sub_8105B70
.align 2
- .incbin "baserom.gba", 0x3ed6e4, 0x20
+Unknown_083ED6E4:
+ .incbin "baserom.gba", 0x003ed6e4, 0x20
gUnknown_083ED704:: @ 83ED704
- .incbin "baserom.gba", 0x003ed704, 0x38
+ .4byte 4, Unknown_083ED6E4
+Unknown_083ED70C:
+ .incbin "baserom.gba", 0x003ed70c, 0x30
gUnknown_083ED73C:: @ 83ED73C
- .incbin "baserom.gba", 0x003ed73c, 0x20
+ .4byte 6, Unknown_083ED70C
+Unknown_083ED744:
+ .incbin "baserom.gba", 0x003ed744, 0x18
gUnknown_083ED75C:: @ 83ED75C
- .incbin "baserom.gba", 0x003ed75c, 0x30
+ .4byte 3, Unknown_083ED744
+Unknown_083ED764:
+ .incbin "baserom.gba", 0x003ed764, 0x28
gUnknown_083ED78C:: @ 83ED78C
- .incbin "baserom.gba", 0x003ed78c, 0x28
+ .4byte 5, Unknown_083ED764
+Unknown_083ED794:
+ .incbin "baserom.gba", 0x003ed794, 0x20
gUnknown_083ED7B4:: @ 83ED7B4
- .incbin "baserom.gba", 0x003ed7b4, 0x20
+ .4byte 4, Unknown_083ED794
+Unknown_083ED7BC:
+ .incbin "baserom.gba", 0x003ed7bc, 0x18
gUnknown_083ED7D4:: @ 83ED7D4
- .incbin "baserom.gba", 0x003ed7d4, 0x388
+ .4byte 3, Unknown_083ED7BC
+Unknown_083ED7DC:
+ .incbin "baserom.gba", 0x003ed7dc, 0x28
+Unknown_083ED804:
+ .4byte 5, Unknown_083ED7DC
+Unknown_083ED80C:
+ .incbin "baserom.gba", 0x003ed80c, 0x20
+Unknown_083ED82C:
+ .4byte 4, Unknown_083ED80C
+Unknown_083ED834:
+ .incbin "baserom.gba", 0x003ed834, 0x20
+Unknown_083ED854:
+ .4byte 4, Unknown_083ED834
+Unknown_083ED85C:
+ .incbin "baserom.gba", 0x003ed85c, 0x20
+Unknown_083ED87C:
+ .4byte 4, Unknown_083ED85C
+Unknown_083ED884:
+ .incbin "baserom.gba", 0x003ed884, 0x30
+Unknown_083ED8B4:
+ .4byte 6, Unknown_083ED884
+Unknown_083ED8BC:
+ .incbin "baserom.gba", 0x003ed8bc, 0x8
+Unknown_083ED8C4:
+ .incbin "baserom.gba", 0x003ed8c4, 0x8
+Unknown_083ED8CC:
+ .4byte 1, Unknown_083ED8BC
+ .4byte 1, Unknown_083ED8C4
+Unknown_083ED8DC:
+ .incbin "baserom.gba", 0x003ed8dc, 0x60
+Unknown_083ED93C:
+ .4byte 12, Unknown_083ED8DC
+Unknown_083ED944:
+ .incbin "baserom.gba", 0x003ed944, 0x18
+Unknown_083ED95C:
+ .4byte 3, Unknown_083ED944
+Unknown_083ED964:
+ .incbin "baserom.gba", 0x003ed964, 0x10
+Unknown_083ED974:
+ .4byte 2, Unknown_083ED964
+Unknown_083ED97C:
+ .incbin "baserom.gba", 0x003ed97c, 0x10
+Unknown_083ED98C:
+ .4byte 2, Unknown_083ED97C
+Unknown_083ED994:
+ .incbin "baserom.gba", 0x003ed994, 0x10
+Unknown_083ED9A4:
+ .4byte 2, Unknown_083ED994
+Unknown_083ED9AC:
+ .incbin "baserom.gba", 0x003ed9ac, 0x10
+Unknown_083ED9BC:
+ .4byte 2, Unknown_083ED9AC
+Unknown_083ED9C4:
+ .incbin "baserom.gba", 0x003ed9c4, 0x10
+Unknown_083ED9D4:
+ .4byte 2, Unknown_083ED9C4
+Unknown_083ED9DC:
+ .incbin "baserom.gba", 0x003ed9dc, 0x10
+Unknown_083ED9EC:
+ .4byte 2, Unknown_083ED9DC
+Unknown_083ED9F4:
+ .incbin "baserom.gba", 0x003ed9f4, 0x10
+Unknown_083EDA04:
+ .4byte 2, Unknown_083ED9F4
+Unknown_083EDA0C:
+ .incbin "baserom.gba", 0x003eda0C, 0x10
+Unknown_083EDA1C:
+ .4byte 2, Unknown_083EDA0C
+Unknown_083EDA24:
+ .incbin "baserom.gba", 0x003eda24, 0x10
+Unknown_083EDA34:
+ .4byte 2, Unknown_083EDA24
+Unknown_083EDA3C:
+ .incbin "baserom.gba", 0x003eda3c, 0x30
+Unknown_083EDA6C:
+ .4byte 6, Unknown_083EDA3C
+Unknown_083EDA74:
+ .incbin "baserom.gba", 0x003eda74, 0x18
+Unknown_083EDA8C:
+ .4byte 3, Unknown_083EDA74
+Unknown_083EDA94:
+ .incbin "baserom.gba", 0x003eda94, 0x30
+Unknown_083EDAC4:
+ .4byte 6, Unknown_083EDA94
+Unknown_083EDACC:
+ .incbin "baserom.gba", 0x003edacc, 0x30
+Unknown_083EDAFC:
+ .4byte 6, Unknown_083EDACC
+Unknown_083EDB04:
+ .incbin "baserom.gba", 0x003edb04, 0x18
+Unknown_083EDB1C:
+ .4byte 3, Unknown_083EDB04
+Unknown_083EDB24:
+ .incbin "baserom.gba", 0x003edb24, 0x30
+Unknown_083EDB54:
+ .4byte 6, Unknown_083EDB24
.align 2
gUnknown_083EDB5C:: @ 83EDB5C
@@ -21619,8 +22033,34 @@ gUnknown_083EDB5C:: @ 83EDB5C
.4byte gSpriteTemplate_83ED63C
.4byte gDummySpriteTemplate
+ .align 2
gUnknown_083EDBC4:: @ 83EDBC4
- .incbin "baserom.gba", 0x003edbc4, 0x68
+ .4byte Unknown_083ED804
+ .4byte Unknown_083ED82C
+ .4byte Unknown_083ED854
+ .4byte Unknown_083ED8B4
+ .4byte 0 @ dummied out
+ .4byte 0 @ dummied out
+ .4byte Unknown_083ED8CC
+ .4byte 0 @ dummied out
+ .4byte Unknown_083ED93C
+ .4byte Unknown_083ED95C
+ .4byte Unknown_083ED974
+ .4byte Unknown_083ED98C
+ .4byte Unknown_083ED9A4
+ .4byte Unknown_083ED9BC
+ .4byte Unknown_083ED9D4
+ .4byte Unknown_083ED9EC
+ .4byte Unknown_083EDA04
+ .4byte Unknown_083EDA1C
+ .4byte Unknown_083EDA34
+ .4byte Unknown_083EDA6C
+ .4byte Unknown_083EDA8C
+ .4byte Unknown_083EDAC4
+ .4byte Unknown_083EDAFC
+ .4byte Unknown_083EDB1C
+ .4byte Unknown_083EDB54
+ .4byte 0 @ dummied out
gUnknown_083EDC2C:: @ 83EDC2C
.incbin "baserom.gba", 0x003edc2c, 0xb0
@@ -21663,14 +22103,13 @@ gUnknown_083EDD35:: @ 83EDD35
.incbin "baserom.gba", 0x003edd35, 0x6
gUnknown_083EDD3B:: @ 83EDD3B
-Unknown_83EDD3B:
.incbin "baserom.gba", 0x003edd3b, 0x3
Unknown_83EDD3E:
.incbin "baserom.gba", 0x003edd3e, 0x20
Unknown_83EDD5E:
.incbin "baserom.gba", 0x003edd5e, 0x20
Unknown_83EDD7E:
- .incbin "baserom.gba", 0x003edd7e, 0x22
+ .incbin "baserom.gba", 0x003edd7e, 0x20
.align 2
gUnknown_083EDDA0:: @ 83EDDA0
@@ -21943,7 +22382,13 @@ gUnknown_083F62E8:: @ 83F62E8
gUnknown_083F62EC:: @ 83F62EC
.incbin "graphics/misc/birch_bag.gbapal"
.incbin "graphics/misc/birch_grass.gbapal"
+
+ .align 2
+gBirchBallarrow_Pal::
.incbin "graphics/misc/birch_ballarrow.gbapal"
+
+ .align 2
+gBirchCircle_Pal::
.incbin "graphics/misc/birch_circle.gbapal"
gUnknown_083F636C:: @ 83F636C
@@ -21954,7 +22399,13 @@ gUnknown_083F64F8:: @ 83F64F8
gUnknown_083F66F0:: @ 83F66F0
.incbin "graphics/misc/birch_help.4bpp.lz"
+
+ .align 2
+gBirchBallarrow_Gfx::
.incbin "graphics/misc/birch_ballarrow.4bpp.lz"
+
+ .align 2
+gBirchCircle_Gfx::
.incbin "graphics/misc/birch_circle.4bpp.lz"
gUnknown_083F76B8:: @ 83F76B8
@@ -22055,13 +22506,17 @@ gSpriteAffineAnimTable_83F7790:: @ 83F7790
.4byte gSpriteAffineAnim_83F7774
gUnknown_083F7794:: @ 83F7794
- .incbin "baserom.gba", 0x003f7794, 0x10
+ obj_tiles gBirchBallarrow_Gfx, 0x0800, 0x1000
+ .space 8
gUnknown_083F77A4:: @ 83F77A4
- .incbin "baserom.gba", 0x003f77a4, 0x10
+ obj_tiles gBirchCircle_Gfx, 0x0800, 0x1001
+ .space 8
gUnknown_083F77B4:: @ 83F77B4
- .incbin "baserom.gba", 0x003f77b4, 0x18
+ obj_pal gBirchBallarrow_Pal, 0x1000
+ obj_pal gBirchCircle_Pal, 0x1001
+ .space 8
.align 2
gSpriteTemplate_83F77CC:: @ 83F77CC
@@ -22076,13 +22531,17 @@ gSpriteTemplate_83F77FC:: @ 83F77FC
spr_template 4097, 4097, gOamData_83F76DC, gSpriteAnimTable_83F7758, NULL, gSpriteAffineAnimTable_83F7790, sub_810A6C4
@ 83F7814
+ClockGfx_Misc:
.incbin "graphics/misc/clock_misc.4bpp.lz"
gUnknown_083F7A90:: @ 83F7A90
- .incbin "baserom.gba", 0x003f7a90, 0x10
+ obj_tiles ClockGfx_Misc, 0x2000, 0x1000
+ .space 8
gUnknown_083F7AA0:: @ 83F7AA0
- .incbin "baserom.gba", 0x003f7aa0, 0x18
+ obj_pal gUnknown_08E8F804, 0x1000
+ obj_pal gUnknown_08E8F824, 0x1001
+ .space 8
.align 2
gOamData_83F7AB8:: @ 83F7AB8
@@ -22156,10 +22615,8 @@ gUnknown_083F7E28:: @ 83F7E28
.align 2
gUnknown_083F7EA8:: @ 83F7EA8
- .4byte sub_80A5B40
- .4byte c2_exit_to_overworld_2_switch
- .4byte sub_802E424
- .4byte c2_exit_to_overworld_2_switch
+ .4byte sub_80A5B40, c2_exit_to_overworld_2_switch
+ .4byte sub_802E424, c2_exit_to_overworld_2_switch
.align 2
gUnknown_083F7EB8:: @ 83F7EB8
@@ -22222,16 +22679,17 @@ gSpriteAnimTable_83F7F44:: @ 83F7F44
Unknown_83F7F48:
.incbin "baserom.gba", 0x003f7f48, 0x28
+ .align 2
gUnknown_083F7F70:: @ 83F7F70
.4byte Unknown_83F7F48
.align 2
gUnknown_083F7F74:: @ 83F7F74
- obj_tiles 0x08e77d90, 2048, 0x39d0
+ obj_tiles gMenuPokeblockDevice_Gfx, 2048, 0x39d0
.align 2
gUnknown_083F7F7C:: @ 83F7F7C
- obj_pal 0x08e78050, 0x39d0
+ obj_pal gMenuPokeblockDevice_Pal, 0x39d0
.align 2
gSpriteTemplate_83F7F84:: @ 83F7F84
@@ -22390,7 +22848,13 @@ gUnknown_083F868C:: @ 83F868C
.incbin "baserom.gba", 0x003f868c, 0x30
gUnknown_083F86BC:: @ 83F86BC
- .incbin "baserom.gba", 0x003f86bc, 0x200
+ .incbin "baserom.gba", 0x003f86bc, 0x40
+
+ .align 2
+gRouletteCenter_Pal::
+ .incbin "graphics/roulette/center.gbapal"
+
+ .incbin "baserom.gba", 0x003f871c, 0x1A0
gUnknown_083F88BC:: @ 83F88BC
.incbin "baserom.gba", 0x003f88bc, 0x1a4
@@ -22935,7 +23399,7 @@ gOamData_83FA328:: @ 83FA328
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x3fa330, 0x20
+ .incbin "baserom.gba", 0x003fa330, 0x20
.align 2
gSpriteAnim_83FA350:: @ 83FA350
@@ -22970,7 +23434,12 @@ gSpriteAnim_83FA38C:: @ 83FA38C
obj_image_anim_end
.align 2
- .incbin "baserom.gba", 0x3fa3a0, 0x34
+Unknown_083FA3A0:
+ .incbin "baserom.gba", 0x003fa3a0, 0x18
+Unknown_083FA3B8:
+ .incbin "baserom.gba", 0x003fa3b8, 0x14
+Unknown_083FA3CC:
+ .incbin "baserom.gba", 0x003fa3cc, 0x8
.align 2
gSpriteAnim_83FA3D4:: @ 83FA3D4
@@ -22989,8 +23458,11 @@ gSpriteAnimTable_83FA3E8:: @ 83FA3E8
.4byte gSpriteAnim_83FA3D4
.align 2
- .incbin "baserom.gba", 0x3fa3fc, 0x10
-
+ .4byte Unknown_083FA3A0
+ .4byte Unknown_083FA3B8
+ .4byte Unknown_083FA3B8
+ .4byte Unknown_083FA3CC
+
.align 2
gSpriteTemplate_83FA40C:: @ 83FA40C
spr_template 0xFFFF, 2, gOamData_83FA328, gSpriteAnimTable_83FA3E8, 0x83FA330, gDummySpriteAffineAnimTable, SpriteCallbackDummy
@@ -23003,7 +23475,7 @@ gOamData_83FA424:: @ 83FA424
.align 2
gUnknown_083FA42C:: @ 83FA42C
- obj_tiles 0x08e82140, 2048, 0x0006
+ obj_tiles gRouletteCenter_Gfx, 2048, 0x0006
.align 2
gSpriteTemplate_83FA434:: @ 83FA434
@@ -23022,7 +23494,7 @@ gOamData_83FA454:: @ 83FA454
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x3fa45c, 0x38
+ .incbin "baserom.gba", 0x003fa45c, 0x38
.align 2
gSpriteAnim_83FA494:: @ 83FA494
@@ -23108,7 +23580,9 @@ gOamData_83FA54C:: @ 83FA54C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x3fa554, 0x28
+ .incbin "baserom.gba", 0x003fa554, 0x10
+Unknown_083FA564:
+ .incbin "baserom.gba", 0x003fa564, 0x18
.align 2
gSpriteAffineAnim_83FA57C:: @ 83FA57C
@@ -23119,14 +23593,14 @@ gSpriteAffineAnim_83FA57C:: @ 83FA57C
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3fa5a4, 0x4
+ .4byte Unknown_083FA564
.align 2
gSpriteAffineAnimTable_83FA5A8:: @ 83FA5A8
.4byte gSpriteAffineAnim_83FA57C
.align 2
- .incbin "baserom.gba", 0x3fa5ac, 0x14
+ .incbin "baserom.gba", 0x003fa5ac, 0x14
.align 2
gSpriteTemplate_83FA5C0:: @ 83FA5C0
@@ -23143,8 +23617,10 @@ gSpriteTemplate_83FA5F0:: @ 83FA5F0
gUnknown_083FA608:: @ 83FA608
.incbin "baserom.gba", 0x003fa608, 0x6
+ .align 1
gUnknown_083FA60E:: @ 83FA60E
- .incbin "baserom.gba", 0x003fa60e, 0x8
+ .2byte 0x74, 0x2C
+ .2byte 0x74, 0x70
gUnknown_083FA616:: @ 83FA616
.incbin "baserom.gba", 0x003fa616, 0x8
@@ -23686,7 +24162,7 @@ gUnknown_08401D8E:: @ 8401D8E
.incbin "baserom.gba", 0x00401d8e, 0x8
gUnknown_08401D96:: @ 8401D96
- .incbin "baserom.gba", 0x00401d96, 0x6
+ .incbin "baserom.gba", 0x00401d96, 0x4
.align 2
gUnknown_08401D9C:: @ 8401D9C
@@ -24223,7 +24699,7 @@ gBattleAnimSpriteTemplate_84026A4:: @ 84026A4
spr_template 10238, 10238, gOamData_837DF24, gSpriteAnimTable_8402698, NULL, gDummySpriteAffineAnimTable, sub_812E7A0
.align 2
- .incbin "baserom.gba", 0x4026bc, 0x20
+ .incbin "baserom.gba", 0x004026bc, 0x20
.align 2
gSpriteAnim_84026DC:: @ 84026DC
@@ -24468,7 +24944,17 @@ gBattleAnimSpriteTemplate_8402B10:: @ 8402B10
.align 2
gUnknown_08402B28:: @ 8402B28
- .incbin "baserom.gba", 0x00402b28, 0x1d0
+ .incbin "baserom.gba", 0x00402b28, 0x30
+
+ .align 2
+gDexArrows_Pal::
+ .incbin "graphics/pokedex/arrows.gbapal"
+
+ .align 2
+gDexArrows_Gfx::
+ .incbin "graphics/pokedex/arrows.4bpp"
+
+ .incbin "baserom.gba", 0x00402c78, 0x80
gUnknown_08402CF8:: @ 8402CF8
.incbin "baserom.gba", 0x00402cf8, 0x10
@@ -24511,11 +24997,11 @@ gSpriteAnimTable_8402D78:: @ 8402D78
.align 2
gUnknown_08402D80:: @ 8402D80
- obj_tiles 0x08402b78, 384, 0x1595
+ obj_tiles gDexArrows_Gfx, 384, 0x1595
.align 2
gUnknown_08402D88:: @ 8402D88
- obj_pal 0x08402b58, 0x1596
+ obj_pal gDexArrows_Pal, 0x1596
.align 2
gSpriteTemplate_8402D90:: @ 8402D90
@@ -24572,7 +25058,7 @@ gSpriteTemplate_8402E08:: @ 8402E08
spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300
.align 2
- .incbin "baserom.gba", 0x402e20, 0x4
+ .incbin "baserom.gba", 0x00402e20, 0x4
gUnknown_08402E24:: @ 8402E24
.incbin "baserom.gba", 0x00402e24, 0x15
@@ -24620,7 +25106,17 @@ gUnknown_08405EDA:: @ 8405EDA
.incbin "baserom.gba", 0x00405eda, 0xc
gUnknown_08405EE6:: @ 8405EE6
- .incbin "baserom.gba", 0x00405ee6, 0x232
+ .incbin "baserom.gba", 0x00405ee6, 0x12
+
+ .align 2
+gUnknownPal_08405EF8::
+ .incbin "baserom.gba", 0x00405ef8, 0x20
+
+ .align 2
+gUnknownPal_08405F18::
+ .incbin "baserom.gba", 0x00405f18, 0x20
+
+ .incbin "baserom.gba", 0x00405f38, 0x1E0
gUnknown_08406118:: @ 8406118
.incbin "baserom.gba", 0x00406118, 0x14
@@ -24639,11 +25135,11 @@ gUnknown_08406134:: @ 8406134
.align 2
gUnknown_08406148:: @ 8406148
- obj_pal 0x08405f18, 0x0200
+ obj_pal gUnknownPal_08405F18, 0x0200
.align 2
gUnknown_08406150:: @ 8406150
- obj_pal 0x08405ef8, 0x0000
+ obj_pal gUnknownPal_08405EF8, 0x0000
gUnknown_08406158:: @ 8406158
.incbin "baserom.gba", 0x00406158, 0x14
@@ -24900,7 +25396,7 @@ gSpriteTemplate_840AE20:: @ 840AE20
spr_template 2000, 2000, gOamData_840ADE8, gSpriteAnimTable_840AE10, NULL, gDummySpriteAffineAnimTable, sub_813D208
.align 2
- .incbin "baserom.gba", 0x40ae38, 0x48
+ .incbin "baserom.gba", 0x0040ae38, 0x48
gUnknown_0840AE80:: @ 840AE80
.incbin "baserom.gba", 0x0040ae80, 0x10
@@ -28219,7 +28715,7 @@ gSpriteAffineAnimTable_84121D8:: @ 84121D8
.align 2
gUnknown_084121DC:: @ 84121DC
- obj_tiles 0x08e781c8, 0x20, 14818
+ obj_tiles gPokeblock_Gfx, 0x20, 14818
.align 2
gSpriteTemplate_84121E4:: @ 84121E4
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 18:43:40 +0000