diff options
Diffstat (limited to 'asm')
-rw-r--r-- | asm/rom3.s | 122 | ||||
-rw-r--r-- | asm/rom4.s | 10 | ||||
-rw-r--r-- | asm/rom5.s | 72 |
3 files changed, 102 insertions, 102 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 862a7bc0f..a32cec299 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -8430,7 +8430,7 @@ _0800D7E4: .4byte gBattleTerrainTiles_Building _0800D7E8: .4byte 0x06008000 _0800D7EC: .4byte gBattleTerrainTilemap_Building _0800D7F0: .4byte 0x0600d000 -_0800D7F4: .4byte gUnknown_08E62AC0 +_0800D7F4: .4byte gBattleTerrainPalette_BattleTower _0800D7F8: movs r0, 0x80 lsls r0, 5 @@ -8455,7 +8455,7 @@ _0800D824: .4byte gBattleTerrainTiles_Cave _0800D828: .4byte 0x06008000 _0800D82C: .4byte gBattleTerrainTilemap_Cave _0800D830: .4byte 0x0600d000 -_0800D834: .4byte gUnknown_08E636E0 +_0800D834: .4byte gBattleTerrainPalette_Groudon _0800D838: ldr r0, _0800D84C ldr r1, _0800D850 @@ -8470,7 +8470,7 @@ _0800D84C: .4byte gBattleTerrainTiles_Water _0800D850: .4byte 0x06008000 _0800D854: .4byte gBattleTerrainTilemap_Water _0800D858: .4byte 0x0600d000 -_0800D85C: .4byte gUnknown_08E636A4 +_0800D85C: .4byte gBattleTerrainPalette_Kyogre _0800D860: movs r0, 0x8 ands r0, r1 @@ -8501,7 +8501,7 @@ _0800D898: .4byte gBattleTerrainTiles_Building _0800D89C: .4byte 0x06008000 _0800D8A0: .4byte gBattleTerrainTilemap_Building _0800D8A4: .4byte 0x0600d000 -_0800D8A8: .4byte gUnknown_08E63774 +_0800D8A8: .4byte gBattleTerrainPalette_BuildingLeader _0800D8AC: cmp r0, 0x20 bne _0800D8D8 @@ -8514,11 +8514,11 @@ _0800D8AC: ldr r0, _0800D8D4 b _0800DA66 .align 2, 0 -_0800D8C4: .4byte gUnknown_08E62DAC +_0800D8C4: .4byte gBattleTerrainTiles_Stadium _0800D8C8: .4byte 0x06008000 -_0800D8CC: .4byte gUnknown_08E633B4 +_0800D8CC: .4byte gBattleTerrainTilemap_Stadium _0800D8D0: .4byte 0x0600d000 -_0800D8D4: .4byte gUnknown_08E639A8 +_0800D8D4: .4byte gBattleTerrainPalette_StadiumSteven _0800D8D8: bl sav1_map_get_battletype lsls r0, 24 @@ -8592,7 +8592,7 @@ _0800D978: .4byte gBattleTerrainTiles_Building _0800D97C: .4byte 0x06008000 _0800D980: .4byte gBattleTerrainTilemap_Building _0800D984: .4byte 0x0600d000 -_0800D988: .4byte gUnknown_08E63738 +_0800D988: .4byte gBattleTerrainPalette_BuildingGym _0800D98C: ldr r0, _0800D9A0 ldr r1, _0800D9A4 @@ -8603,11 +8603,11 @@ _0800D98C: ldr r0, _0800D9B0 b _0800DA66 .align 2, 0 -_0800D9A0: .4byte gUnknown_08E62DAC +_0800D9A0: .4byte gBattleTerrainTiles_Stadium _0800D9A4: .4byte 0x06008000 -_0800D9A8: .4byte gUnknown_08E633B4 +_0800D9A8: .4byte gBattleTerrainTilemap_Stadium _0800D9AC: .4byte 0x0600d000 -_0800D9B0: .4byte gUnknown_08E63810 +_0800D9B0: .4byte gBattleTerrainPalette_StadiumMagma _0800D9B4: ldr r0, _0800D9C8 ldr r1, _0800D9CC @@ -8618,11 +8618,11 @@ _0800D9B4: ldr r0, _0800D9D8 b _0800DA66 .align 2, 0 -_0800D9C8: .4byte gUnknown_08E62DAC +_0800D9C8: .4byte gBattleTerrainTiles_Stadium _0800D9CC: .4byte 0x06008000 -_0800D9D0: .4byte gUnknown_08E633B4 +_0800D9D0: .4byte gBattleTerrainTilemap_Stadium _0800D9D4: .4byte 0x0600d000 -_0800D9D8: .4byte gUnknown_08E637B0 +_0800D9D8: .4byte gBattleTerrainPalette_StadiumAqua _0800D9DC: ldr r0, _0800D9F0 ldr r1, _0800D9F4 @@ -8633,11 +8633,11 @@ _0800D9DC: ldr r0, _0800DA00 b _0800DA66 .align 2, 0 -_0800D9F0: .4byte gUnknown_08E62DAC +_0800D9F0: .4byte gBattleTerrainTiles_Stadium _0800D9F4: .4byte 0x06008000 -_0800D9F8: .4byte gUnknown_08E633B4 +_0800D9F8: .4byte gBattleTerrainTilemap_Stadium _0800D9FC: .4byte 0x0600d000 -_0800DA00: .4byte gUnknown_08E6387C +_0800DA00: .4byte gBattleTerrainPalette_StadiumSidney _0800DA04: ldr r0, _0800DA18 ldr r1, _0800DA1C @@ -8648,11 +8648,11 @@ _0800DA04: ldr r0, _0800DA28 b _0800DA66 .align 2, 0 -_0800DA18: .4byte gUnknown_08E62DAC +_0800DA18: .4byte gBattleTerrainTiles_Stadium _0800DA1C: .4byte 0x06008000 -_0800DA20: .4byte gUnknown_08E633B4 +_0800DA20: .4byte gBattleTerrainTilemap_Stadium _0800DA24: .4byte 0x0600d000 -_0800DA28: .4byte gUnknown_08E638CC +_0800DA28: .4byte gBattleTerrainPalette_StadiumPhoebe _0800DA2C: ldr r0, _0800DA40 ldr r1, _0800DA44 @@ -8663,11 +8663,11 @@ _0800DA2C: ldr r0, _0800DA50 b _0800DA66 .align 2, 0 -_0800DA40: .4byte gUnknown_08E62DAC +_0800DA40: .4byte gBattleTerrainTiles_Stadium _0800DA44: .4byte 0x06008000 -_0800DA48: .4byte gUnknown_08E633B4 +_0800DA48: .4byte gBattleTerrainTilemap_Stadium _0800DA4C: .4byte 0x0600d000 -_0800DA50: .4byte gUnknown_08E63914 +_0800DA50: .4byte gBattleTerrainPalette_StadiumGlacia _0800DA54: ldr r0, _0800DA70 ldr r1, _0800DA74 @@ -8682,11 +8682,11 @@ _0800DA66: bl LoadCompressedPalette b _0800DA9E .align 2, 0 -_0800DA70: .4byte gUnknown_08E62DAC +_0800DA70: .4byte gBattleTerrainTiles_Stadium _0800DA74: .4byte 0x06008000 -_0800DA78: .4byte gUnknown_08E633B4 +_0800DA78: .4byte gBattleTerrainTilemap_Stadium _0800DA7C: .4byte 0x0600d000 -_0800DA80: .4byte gUnknown_08E63958 +_0800DA80: .4byte gBattleTerrainPalette_StadiumDrake _0800DA84: ldr r0, _0800DAA4 ldr r1, _0800DAA8 @@ -8707,7 +8707,7 @@ _0800DAA4: .4byte gBattleTerrainTiles_Building _0800DAA8: .4byte 0x06008000 _0800DAAC: .4byte gBattleTerrainTilemap_Building _0800DAB0: .4byte 0x0600d000 -_0800DAB4: .4byte gUnknown_08E62AC0 +_0800DAB4: .4byte gBattleTerrainPalette_BattleTower thumb_func_end sub_800D7B8 thumb_func_start sub_800DAB8 @@ -9673,14 +9673,14 @@ sub_800E23C: @ 800E23C b _0800E3FC .align 2, 0 _0800E29C: .4byte 0x020239f8 -_0800E2A0: .4byte gUnknown_08E5DA10 +_0800E2A0: .4byte gVersusFrameGfx _0800E2A4: .4byte 0x06004000 -_0800E2A8: .4byte gUnknown_08E5DAF8 +_0800E2A8: .4byte gVersusFrameTilemap _0800E2AC: .4byte 0x0600e000 _0800E2B0: .4byte 0x0600f000 _0800E2B4: .4byte gUnknown_08E5DC2C _0800E2B8: .4byte 0x06010000 -_0800E2BC: .4byte gUnknown_08E5DC04 +_0800E2BC: .4byte gVersusFramePal _0800E2C0: .4byte REG_BG1CNT _0800E2C4: .4byte 0x00005c04 _0800E2C8: .4byte REG_WININ @@ -9926,7 +9926,7 @@ _0800E4C0: .align 2, 0 _0800E4E4: .4byte gTrainers _0800E4E8: .4byte 0x0202ff5e -_0800E4EC: .4byte gUnknown_08E62DAC +_0800E4EC: .4byte gBattleTerrainTiles_Stadium _0800E4F0: bl sav1_map_get_battletype lsls r0, 24 @@ -9970,32 +9970,32 @@ _0800E54C: ldr r0, _0800E550 b _0800E57E .align 2, 0 -_0800E550: .4byte gUnknown_08E62DAC +_0800E550: .4byte gBattleTerrainTiles_Stadium _0800E554: ldr r0, _0800E558 b _0800E57E .align 2, 0 -_0800E558: .4byte gUnknown_08E62DAC +_0800E558: .4byte gBattleTerrainTiles_Stadium _0800E55C: ldr r0, _0800E560 b _0800E57E .align 2, 0 -_0800E560: .4byte gUnknown_08E62DAC +_0800E560: .4byte gBattleTerrainTiles_Stadium _0800E564: ldr r0, _0800E568 b _0800E57E .align 2, 0 -_0800E568: .4byte gUnknown_08E62DAC +_0800E568: .4byte gBattleTerrainTiles_Stadium _0800E56C: ldr r0, _0800E570 b _0800E57E .align 2, 0 -_0800E570: .4byte gUnknown_08E62DAC +_0800E570: .4byte gBattleTerrainTiles_Stadium _0800E574: ldr r0, _0800E578 b _0800E57E .align 2, 0 -_0800E578: .4byte gUnknown_08E62DAC +_0800E578: .4byte gBattleTerrainTiles_Stadium _0800E57C: ldr r0, _0800E588 _0800E57E: @@ -10057,7 +10057,7 @@ _0800E5CC: .align 2, 0 _0800E5F0: .4byte gTrainers _0800E5F4: .4byte 0x0202ff5e -_0800E5F8: .4byte gUnknown_08E633B4 +_0800E5F8: .4byte gBattleTerrainTilemap_Stadium _0800E5FC: bl sav1_map_get_battletype lsls r0, 24 @@ -10102,32 +10102,32 @@ _0800E658: ldr r0, _0800E65C b _0800E68A .align 2, 0 -_0800E65C: .4byte gUnknown_08E633B4 +_0800E65C: .4byte gBattleTerrainTilemap_Stadium _0800E660: ldr r0, _0800E664 b _0800E68A .align 2, 0 -_0800E664: .4byte gUnknown_08E633B4 +_0800E664: .4byte gBattleTerrainTilemap_Stadium _0800E668: ldr r0, _0800E66C b _0800E68A .align 2, 0 -_0800E66C: .4byte gUnknown_08E633B4 +_0800E66C: .4byte gBattleTerrainTilemap_Stadium _0800E670: ldr r0, _0800E674 b _0800E68A .align 2, 0 -_0800E674: .4byte gUnknown_08E633B4 +_0800E674: .4byte gBattleTerrainTilemap_Stadium _0800E678: ldr r0, _0800E67C b _0800E68A .align 2, 0 -_0800E67C: .4byte gUnknown_08E633B4 +_0800E67C: .4byte gBattleTerrainTilemap_Stadium _0800E680: ldr r0, _0800E684 b _0800E68A .align 2, 0 -_0800E684: .4byte gUnknown_08E633B4 +_0800E684: .4byte gBattleTerrainTilemap_Stadium _0800E688: ldr r0, _0800E694 _0800E68A: @@ -10161,12 +10161,12 @@ _0800E6AA: _0800E6C0: .4byte 0x020239f8 _0800E6C4: .4byte 0x00000902 _0800E6C8: .4byte gGameVersion -_0800E6CC: .4byte gUnknown_08E636E0 +_0800E6CC: .4byte gBattleTerrainPalette_Groudon _0800E6D0: ldr r0, _0800E6D4 b _0800E7A6 .align 2, 0 -_0800E6D4: .4byte gUnknown_08E636A4 +_0800E6D4: .4byte gBattleTerrainPalette_Kyogre _0800E6D8: movs r0, 0x8 ands r0, r1 @@ -10187,14 +10187,14 @@ _0800E6D8: .align 2, 0 _0800E6F8: .4byte gTrainers _0800E6FC: .4byte 0x0202ff5e -_0800E700: .4byte gUnknown_08E63774 +_0800E700: .4byte gBattleTerrainPalette_BuildingLeader _0800E704: cmp r0, 0x20 bne _0800E710 ldr r0, _0800E70C b _0800E7A6 .align 2, 0 -_0800E70C: .4byte gUnknown_08E639A8 +_0800E70C: .4byte gBattleTerrainPalette_StadiumSteven _0800E710: bl sav1_map_get_battletype lsls r0, 24 @@ -10237,37 +10237,37 @@ _0800E76C: ldr r0, _0800E770 b _0800E7A6 .align 2, 0 -_0800E770: .4byte gUnknown_08E63738 +_0800E770: .4byte gBattleTerrainPalette_BuildingGym _0800E774: ldr r0, _0800E778 b _0800E7A6 .align 2, 0 -_0800E778: .4byte gUnknown_08E63810 +_0800E778: .4byte gBattleTerrainPalette_StadiumMagma _0800E77C: ldr r0, _0800E780 b _0800E7A6 .align 2, 0 -_0800E780: .4byte gUnknown_08E637B0 +_0800E780: .4byte gBattleTerrainPalette_StadiumAqua _0800E784: ldr r0, _0800E788 b _0800E7A6 .align 2, 0 -_0800E788: .4byte gUnknown_08E6387C +_0800E788: .4byte gBattleTerrainPalette_StadiumSidney _0800E78C: ldr r0, _0800E790 b _0800E7A6 .align 2, 0 -_0800E790: .4byte gUnknown_08E638CC +_0800E790: .4byte gBattleTerrainPalette_StadiumPhoebe _0800E794: ldr r0, _0800E798 b _0800E7A6 .align 2, 0 -_0800E798: .4byte gUnknown_08E63914 +_0800E798: .4byte gBattleTerrainPalette_StadiumGlacia _0800E79C: ldr r0, _0800E7A0 b _0800E7A6 .align 2, 0 -_0800E7A0: .4byte gUnknown_08E63958 +_0800E7A0: .4byte gBattleTerrainPalette_StadiumDrake _0800E7A4: ldr r0, _0800E7B0 _0800E7A6: @@ -10276,7 +10276,7 @@ _0800E7A6: bl LoadCompressedPalette b _0800E7BC .align 2, 0 -_0800E7B0: .4byte gUnknown_08E62AC0 +_0800E7B0: .4byte gBattleTerrainPalette_BattleTower _0800E7B4: bl sub_800D74C b _0800E7BC @@ -67969,7 +67969,7 @@ _0802BB8C: .4byte gBattleTerrainTiles_Building _0802BB90: .4byte 0x06008000 _0802BB94: .4byte gBattleTerrainTilemap_Building _0802BB98: .4byte 0x0600d000 -_0802BB9C: .4byte gUnknown_08E62AC0 +_0802BB9C: .4byte gBattleTerrainPalette_BattleTower _0802BBA0: .4byte REG_BG3CNT _0802BBA4: .4byte 0x00005a0b _0802BBA8: .4byte 0x030041b0 @@ -80675,7 +80675,7 @@ _08032376: ldr r0, _08032384 b _08032396 .align 2, 0 -_08032384: .4byte gUnknown_08D2D4CC +_08032384: .4byte gSubstituteDollTilemap _08032388: adds r0, r5, 0 bl battle_side_get_owner @@ -80691,7 +80691,7 @@ _08032396: bl LZDecompressVram b _080323BA .align 2, 0 -_080323A4: .4byte gUnknown_08D2D28C +_080323A4: .4byte gSubstituteDollGfx _080323A8: .4byte gUnknown_081FAF4C _080323AC: ldr r0, _080323F4 @@ -80731,9 +80731,9 @@ _080323D4: bl LoadCompressedPalette b _08032456 .align 2, 0 -_080323F4: .4byte gUnknown_08D2D4CC +_080323F4: .4byte gSubstituteDollTilemap _080323F8: .4byte gUnknown_081FAF4C -_080323FC: .4byte gUnknown_08D2D268 +_080323FC: .4byte gSubstituteDollPal _08032400: .4byte 0x040000d4 _08032404: .4byte 0x84000200 _08032408: diff --git a/asm/rom4.s b/asm/rom4.s index 14fe79e77..1cf090b5a 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -58703,14 +58703,14 @@ _0806D7BA: bx r1 .align 2, 0 _0806D7C4: .4byte 0x00007fff -_0806D7C8: .4byte gUnknown_08E71354 -_0806D7CC: .4byte gUnknown_08E71788 +_0806D7C8: .4byte gPartyMenuMisc_Gfx +_0806D7CC: .4byte gPartyMenuMisc_Tilemap _0806D7D0: .4byte 0x06003800 -_0806D7D4: .4byte gUnknown_08E716A0 +_0806D7D4: .4byte gPartyMenuMisc_Pal _0806D7D8: .4byte gFontDefaultPalette -_0806D7DC: .4byte gUnknown_08E71894 +_0806D7DC: .4byte gPartyMenuHpBar_Gfx _0806D7E0: .4byte 0x06006000 -_0806D7E4: .4byte gUnknown_08E71934 +_0806D7E4: .4byte gPartyMenuOrderText_Gfx _0806D7E8: .4byte 0x06006180 _0806D7EC: .4byte gStatusGfx_Icons _0806D7F0: .4byte 0x06007180 diff --git a/asm/rom5.s b/asm/rom5.s index ae74d1da6..feb8c8ef7 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -71643,7 +71643,7 @@ _0809DF54: bl LZDecompressVram b _0809E030 .align 2, 0 -_0809DF60: .4byte gUnknown_08E72A78 +_0809DF60: .4byte gStatusScreen_Gfx _0809DF64: ldr r0, _0809DF6C ldr r1, _0809DF70 @@ -71665,7 +71665,7 @@ _0809DF88: bl LZDecompressVram b _0809E030 .align 2, 0 -_0809DF94: .4byte gUnknown_08E73D08 +_0809DF94: .4byte gStatusScreen_Tilemap _0809DF98: .4byte 0x06004800 _0809DF9C: ldr r0, _0809DFA4 @@ -71692,7 +71692,7 @@ _0809DFC4: bl LoadCompressedPalette b _0809E030 .align 2, 0 -_0809DFD0: .4byte gUnknown_08E73468 +_0809DFD0: .4byte gStatusScreen_Pal _0809DFD4: ldr r0, _0809DFDC bl LoadCompressedObjectPic @@ -71736,7 +71736,7 @@ _0809E010: movs r0, 0x1 b _0809E03C .align 2, 0 -_0809E028: .4byte gUnknown_08E726E4 +_0809E028: .4byte gMoveTypes_Pal _0809E02C: .4byte 0x02018000 _0809E030: ldr r1, _0809E040 @@ -82572,7 +82572,7 @@ _080A355C: bl LZDecompressVram b _080A35EA .align 2, 0 -_080A3568: .4byte gUnknown_08E76728 +_080A3568: .4byte gBagScreen_Gfx _080A356C: .4byte 0x06004000 _080A3570: ldr r0, _080A3580 @@ -82602,7 +82602,7 @@ _080A3598: .align 2, 0 _080A35A4: .4byte gSaveBlock2 _080A35A8: .4byte 0x03000701 -_080A35AC: .4byte gUnknown_08E76F94 +_080A35AC: .4byte gBagScreenMale_Pal _080A35B0: ldr r0, _080A35BC movs r1, 0 @@ -82610,7 +82610,7 @@ _080A35B0: bl LoadCompressedPalette b _080A35EA .align 2, 0 -_080A35BC: .4byte gUnknown_08E76FCC +_080A35BC: .4byte gBagScreenFemale_Pal _080A35C0: ldr r0, _080A35D8 ldrb r0, [r0, 0x8] @@ -98862,8 +98862,8 @@ _080AB2DC: pop {r0} bx r0 .align 2, 0 -_080AB300: .4byte gUnknown_08D17D6C -_080AB304: .4byte gUnknown_08D18818 +_080AB300: .4byte gContestMiscGfx +_080AB304: .4byte gContestAudienceGfx _080AB308: .4byte 0x06002000 _080AB30C: .4byte gUnknown_08D1725C _080AB310: .4byte 0x0600d000 @@ -99430,7 +99430,7 @@ _080AB7A0: bl LZDecompressVram b _080AB946 .align 2, 0 -_080AB7AC: .4byte gUnknown_08D17D6C +_080AB7AC: .4byte gContestMiscGfx _080AB7B0: ldr r0, _080AB7EC ldr r4, _080AB7F0 @@ -99464,7 +99464,7 @@ _080AB7E6: ldr r0, [r1, 0x8] b _080AB946 .align 2, 0 -_080AB7EC: .4byte gUnknown_08D18818 +_080AB7EC: .4byte gContestAudienceGfx _080AB7F0: .4byte 0x06002000 _080AB7F4: .4byte 0x02015800 _080AB7F8: .4byte 0x040000d4 @@ -111900,7 +111900,7 @@ _080B19BC: .4byte 0x02019204 _080B19C0: .4byte 0x02020004 _080B19C4: .4byte 0x06010000 _080B19C8: .4byte REG_BG0CNT -_080B19CC: .4byte gUnknown_08E6978C +_080B19CC: .4byte gContestApplauseMeterGfx thumb_func_end sub_80B1928 thumb_func_start unref_sub_80B19D0 @@ -112814,14 +112814,14 @@ sub_80B208C: @ 80B208C b _080B20BA .align 2, 0 _080B20B0: .4byte 0x02019260 -_080B20B4: .4byte gUnknown_08E69478 +_080B20B4: .4byte gContestNextTurnNumbersGfx _080B20B8: ldr r0, _080B20C0 _080B20BA: pop {r1} bx r1 .align 2, 0 -_080B20C0: .4byte gUnknown_08E69578 +_080B20C0: .4byte gContestNextTurnRandomGfx thumb_func_end sub_80B208C thumb_func_start unref_sub_80B20C4 @@ -115013,9 +115013,9 @@ _080B3204: .4byte REG_BG1HOFS _080B3208: .4byte 0x0202f388 _080B320C: .4byte 0x040000d4 _080B3210: .4byte 0x85000100 -_080B3214: .4byte gUnknown_08E77804 +_080B3214: .4byte gBuyMenuFrame_Gfx _080B3218: .4byte 0x06007c00 -_080B321C: .4byte gUnknown_08E77928 +_080B321C: .4byte gBuyMenuFrame_Tilemap _080B3220: .4byte 0x02018000 _080B3224: .4byte gMenuMoneyPal _080B3228: .4byte gWindowConfig_81E6DFC @@ -178143,7 +178143,7 @@ _080D1B24: .align 2, 0 _080D1B34: .4byte 0x000027de _080D1B38: .4byte 0x00002710 -_080D1B3C: .4byte gUnknown_08D229BC +_080D1B3C: .4byte gBattleAnimSpritePalette_206 _080D1B40: .4byte 0x02018000 _080D1B44: .4byte 0xffffc800 _080D1B48: .4byte 0x02014800 @@ -178977,9 +178977,9 @@ _080D21CC: .4byte 0x030041b4 _080D21D0: .4byte REG_BG1HOFS _080D21D4: .4byte 0x040000d4 _080D21D8: .4byte 0x85000400 -_080D21DC: .4byte gUnknown_08D24124 -_080D21E0: .4byte gUnknown_08D2368C -_080D21E4: .4byte gUnknown_08D240FC +_080D21DC: .4byte gAttractTilemap +_080D21E0: .4byte gAttractGfx +_080D21E4: .4byte gAttractPal _080D21E8: .4byte 0x03004b20 _080D21EC: .4byte sub_80D21F0 thumb_func_end sub_80D2100 @@ -179287,7 +179287,7 @@ _080D2448: .4byte 0x030041b4 _080D244C: .4byte REG_BG1HOFS _080D2450: .4byte 0x040000d4 _080D2454: .4byte 0x85000400 -_080D2458: .4byte gUnknown_08E6E4C8 +_080D2458: .4byte gBattleAnimBackgroundTilemap_ScaryFaceContest _080D245C: ldr r0, _080D2478 ldrb r0, [r0] @@ -179303,7 +179303,7 @@ _080D246E: b _080D2488 .align 2, 0 _080D2478: .4byte 0x0202f7c9 -_080D247C: .4byte gUnknown_08E6E100 +_080D247C: .4byte gBattleAnimBackgroundTilemap_ScaryFacePlayer _080D2480: ldr r0, _080D24CC ldr r1, [sp, 0x4] @@ -179341,9 +179341,9 @@ _080D24B6: pop {r0} bx r0 .align 2, 0 -_080D24CC: .4byte gUnknown_08E6E2E4 -_080D24D0: .4byte gUnknown_08D24DA4 -_080D24D4: .4byte gUnknown_08D24D7C +_080D24CC: .4byte gBattleAnimBackgroundTilemap_ScaryFaceOpponent +_080D24D0: .4byte gBattleAnimBackgroundImage_ScaryFace +_080D24D4: .4byte gBattleAnimBackgroundPalette_ScaryFace _080D24D8: .4byte 0x03004b20 _080D24DC: .4byte sub_80D24E0 thumb_func_end sub_80D23B4 @@ -182092,9 +182092,9 @@ _080D39CE: b _080D3A0E .align 2, 0 _080D39F0: .4byte gUnknown_08E70F0C -_080D39F4: .4byte gUnknown_08E6F620 +_080D39F4: .4byte gBattleAnimBackgroundImage_Surf _080D39F8: .4byte 0x03004b00 -_080D39FC: .4byte gUnknown_08E70940 +_080D39FC: .4byte gBattleAnimBackgroundPalette_Surf _080D3A00: ldr r0, _080D3A78 mov r1, sp @@ -191440,7 +191440,7 @@ _080D81C0: .4byte 0x040000d4 _080D81C4: .4byte 0x85000400 _080D81C8: .4byte gWeatherFog1Tiles _080D81CC: .4byte 0x80000400 -_080D81D0: .4byte gUnknown_08E6DE48 +_080D81D0: .4byte gWeatherFog1Tilemap _080D81D4: .4byte gUnknown_083970E8 _080D81D8: .4byte 0x03004b20 _080D81DC: .4byte sub_80D81E0 @@ -191834,7 +191834,7 @@ _080D84F8: .4byte 0x040000d4 _080D84FC: .4byte 0x85000400 _080D8500: .4byte gWeatherFog1Tiles _080D8504: .4byte 0x80000400 -_080D8508: .4byte gUnknown_08E6DE48 +_080D8508: .4byte gWeatherFog1Tilemap _080D850C: .4byte gUnknown_083970E8 _080D8510: .4byte 0x03004b20 _080D8514: .4byte 0x0000ffff @@ -201714,9 +201714,9 @@ _080DD164: .4byte 0x030041b4 _080DD168: .4byte REG_BG1HOFS _080DD16C: .4byte 0x040000d4 _080DD170: .4byte 0x85000400 -_080DD174: .4byte gUnknown_08E67ED8 -_080DD178: .4byte gUnknown_08E68054 -_080DD17C: .4byte gUnknown_08E68580 +_080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew +_080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew +_080DD17C: .4byte gBattleAnimSpritePalette_261 _080DD180: .4byte 0x03004b00 _080DD184: .4byte 0x0202f7c8 _080DD188: .4byte 0x03004b20 @@ -298048,7 +298048,7 @@ _0810B9D0: bl LZDecompressVram b _0810BA0E .align 2, 0 -_0810B9DC: .4byte gUnknown_08E77AE4 +_0810B9DC: .4byte gMenuPokeblock_Gfx _0810B9E0: .4byte 0x06008000 _0810B9E4: ldr r0, _0810B9F0 @@ -298056,7 +298056,7 @@ _0810B9E4: bl sub_800D238 b _0810BA0E .align 2, 0 -_0810B9F0: .4byte gUnknown_08E78078 +_0810B9F0: .4byte gMenuPokeblock_Tilemap _0810B9F4: .4byte 0x020221cc _0810B9F8: ldr r0, _0810BA04 @@ -298065,7 +298065,7 @@ _0810B9F8: bl LoadCompressedPalette b _0810BA0E .align 2, 0 -_0810BA04: .4byte gUnknown_08E77D20 +_0810BA04: .4byte gMenuPokeblock_Pal _0810BA08: ldr r0, _0810BA1C bl LoadCompressedObjectPic @@ -420341,7 +420341,7 @@ _08147C60: movs r0, 0x1 b _08147C86 .align 2, 0 -_08147C78: .4byte gUnknown_08E62AC0 +_08147C78: .4byte gBattleTerrainPalette_BattleTower _08147C7C: .4byte 0x02000000 _08147C80: .4byte 0x0001ffff _08147C84: |