diff options
Diffstat (limited to 'asm')
-rw-r--r-- | asm/rom3.s | 122 | ||||
-rw-r--r-- | asm/rom4.s | 12 | ||||
-rw-r--r-- | asm/rom5.s | 246 | ||||
-rw-r--r-- | asm/rom_8040EB4.s | 2 |
4 files changed, 191 insertions, 191 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..f125cead0 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -41238,7 +41238,7 @@ sub_8065348: @ 8065348 pop {r0} bx r0 .align 2, 0 -_08065364: .4byte gUnknown_08EA0108 +_08065364: .4byte gTextWindowMainFrame_Gfx _08065368: .4byte 0x030005ae thumb_func_end sub_8065348 @@ -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 b1257dc97..f7fcad083 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -37871,7 +37871,7 @@ _0808D400: .4byte 0x0202ffb4 _0808D404: .4byte 0x0000064a _0808D408: .4byte REG_BG2VOFS _0808D40C: .4byte 0x0000062d -_0808D410: .4byte gUnknown_08E86758 +_0808D410: .4byte gPokedexMenu_Gfx _0808D414: .4byte gUnknown_08E96738 _0808D418: .4byte 0x06006800 _0808D41C: .4byte gUnknown_08E9C6DC @@ -38137,7 +38137,7 @@ _0808D66E: bl LoadPalette b _0808D686 .align 2, 0 -_0808D678: .4byte gUnknown_08E87AF6 +_0808D678: .4byte gPokedexMenu_Pal + 0x2 _0808D67C: ldr r0, _0808D68C movs r1, 0x1 @@ -41844,7 +41844,7 @@ _0808F38C: adds r1, r3 b _0808F682 .align 2, 0 -_0808F3B8: .4byte gUnknown_08E86758 +_0808F3B8: .4byte gPokedexMenu_Gfx _0808F3BC: .4byte gUnknown_08E96BD4 _0808F3C0: .4byte 0x06007800 _0808F3C4: .4byte 0x0202ffbc @@ -42742,7 +42742,7 @@ _0808FB28: adds r1, r3 b _0808FDA0 .align 2, 0 -_0808FB44: .4byte gUnknown_08E86758 +_0808FB44: .4byte gPokedexMenu_Gfx _0808FB48: .4byte gUnknown_0839F8A0 _0808FB4C: .4byte 0x06007000 _0808FB50: .4byte 0x03001770 @@ -43422,7 +43422,7 @@ _08090120: adds r1, r2 b _08090368 .align 2, 0 -_0809013C: .4byte gUnknown_08E86758 +_0809013C: .4byte gPokedexMenu_Gfx _08090140: .4byte gUnknown_0839F988 _08090144: .4byte 0x06007000 _08090148: .4byte 0x03001770 @@ -44278,13 +44278,13 @@ _08090800: strh r0, [r4, 0x8] b _08090A26 .align 2, 0 -_08090840: .4byte gUnknown_08E86758 +_08090840: .4byte gPokedexMenu_Gfx _08090844: .4byte 0x06004000 _08090848: .4byte gUnknown_08E96BD4 _0809084C: .4byte 0x06007800 _08090850: .4byte 0x0000027f _08090854: .4byte 0x03004b20 -_08090858: .4byte gUnknown_08E87AF6 +_08090858: .4byte gPokedexMenu_Pal + 0x2 _0809085C: ldr r4, _0809088C adds r0, r4, 0 @@ -44637,7 +44637,7 @@ _08090B44: b _08090B7A .align 2, 0 _08090B68: .4byte 0x03004b20 -_08090B6C: .4byte gUnknown_08E87AF6 +_08090B6C: .4byte gPokedexMenu_Pal + 0x2 _08090B70: ldr r0, _08090B88 movs r1, 0x51 @@ -44651,7 +44651,7 @@ _08090B7A: pop {r0} bx r0 .align 2, 0 -_08090B88: .4byte gUnknown_08E87B56 +_08090B88: .4byte gPokedexMenu2_Pal + 0x2 thumb_func_end sub_8090A3C thumb_func_start sub_8090B8C @@ -47220,10 +47220,10 @@ _08091F10: _08091F1C: .4byte 0x0202f388 _08091F20: .4byte 0x0202ffb4 _08091F24: .4byte 0x0000064a -_08091F28: .4byte gUnknown_08E87DB0 +_08091F28: .4byte gPokedexMenuSearch_Gfx _08091F2C: .4byte gUnknown_08E96D2C _08091F30: .4byte 0x06007800 -_08091F34: .4byte gUnknown_08E882D8 + 0x2 +_08091F34: .4byte gPokedexMenuSearch_Pal + 0x2 _08091F38: .4byte 0x06007a80 _08091F3C: .4byte 0x06007b00 _08091F40: .4byte 0x06007ac0 @@ -51246,7 +51246,7 @@ _08093E4E: bx r0 .align 2, 0 _08093E84: .4byte gUnknown_083B5F6C -_08093E88: .4byte gUnknown_08E8B4E0 +_08093E88: .4byte gMenuTrainerCard_Gfx _08093E8C: .4byte 0x040000d4 _08093E90: .4byte 0x80000800 _08093E94: .4byte gBadgesTiles @@ -59324,13 +59324,13 @@ sub_8097E70: @ 8097E70 pop {r0} bx r0 .align 2, 0 -_08097F2C: .4byte gUnknown_08E8DEC0 +_08097F2C: .4byte gPSSMenuHeader_Gfx _08097F30: .4byte 0x06005000 -_08097F34: .4byte gUnknown_08E8E128 +_08097F34: .4byte gPSSMenuHeader_Tilemap _08097F38: .4byte 0x02039760 _08097F3C: .4byte 0x06007800 -_08097F40: .4byte gUnknown_08E8E0E8 -_08097F44: .4byte gUnknown_08E8E108 +_08097F40: .4byte gPSSMenu1_Pal +_08097F44: .4byte gPSSMenu2_Pal _08097F48: .4byte gUnknown_083B6D74 _08097F4C: .4byte gUnknown_083B6D94 _08097F50: .4byte gUnknownPalette_81E6692+0x2 @@ -59972,12 +59972,12 @@ sub_8098400: @ 8098400 .align 2, 0 _0809847C: .4byte REG_BG1CNT _08098480: .4byte 0x00000f01 -_08098484: .4byte gUnknown_08E8E244 +_08098484: .4byte gPSSMenuMisc_Gfx _08098488: .4byte 0x06006800 -_0809848C: .4byte gUnknown_08E8E6E8 +_0809848C: .4byte gPSSMenuMisc_Tilemap _08098490: .4byte 0x020000a8 -_08098494: .4byte gUnknown_08E8E6A8 -_08098498: .4byte gUnknown_08E8E6C8 +_08098494: .4byte gPSSMenu3_Pal +_08098498: .4byte gPSSMenu4_Pal _0809849C: .4byte 0x06007800 _080984A0: .4byte 0x040000d4 _080984A4: .4byte 0x81000400 @@ -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 @@ -123913,7 +123913,7 @@ sub_80B7568: @ 80B7568 pop {r0} bx r0 .align 2, 0 -_080B759C: .4byte gUnknown_08E85998 +_080B759C: .4byte gNamingScreenMenu_Gfx _080B75A0: .4byte 0x0202e9d4 _080B75A4: .4byte 0x040000d4 _080B75A8: .4byte 0x80000400 @@ -124780,7 +124780,7 @@ _080B7BAA: pop {r0} bx r0 .align 2, 0 -_080B7BD8: .4byte gUnknown_08EA2A44 +_080B7BD8: .4byte gDecoration10000_Gfx _080B7BDC: .4byte 0x06008000 _080B7BE0: .4byte 0xfffff000 _080B7BE4: .4byte 0x0600f800 @@ -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 @@ -182154,7 +182154,7 @@ _080D3A0E: strh r0, [r7, 0xE] b _080D3AEE .align 2, 0 -_080D3A78: .4byte gUnknown_08E6A704 +_080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal _080D3A7C: .4byte sub_80D3D68 _080D3A80: .4byte 0x03004b20 _080D3A84: .4byte 0x0000ffb0 @@ -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 @@ -214534,7 +214534,7 @@ _080E3550: _080E3568: .4byte 0x02024a6a _080E356C: .4byte 0x03004360 _080E3570: .4byte 0x02024be0 -_080E3574: .4byte gUnknown_08D2DCDC +_080E3574: .4byte gBattleStatMask1_Tilemap _080E3578: ldr r0, _080E35B0 ldr r1, [sp, 0x4] @@ -214562,44 +214562,44 @@ _080E3598: ldr r0, _080E35B8 b _080E35FE .align 2, 0 -_080E35B0: .4byte gUnknown_08D2DDF8 -_080E35B4: .4byte gUnknown_08D2DACC -_080E35B8: .4byte gUnknown_08D2DF34 +_080E35B0: .4byte gBattleStatMask2_Tilemap +_080E35B4: .4byte gBattleStatMask_Gfx +_080E35B8: .4byte gBattleStatMask2_Pal _080E35BC: cmp r0, 0x1 bne _080E35C8 ldr r0, _080E35C4 b _080E35FE .align 2, 0 -_080E35C4: .4byte gUnknown_08D2DF14 +_080E35C4: .4byte gBattleStatMask1_Pal _080E35C8: cmp r0, 0x2 bne _080E35D4 ldr r0, _080E35D0 b _080E35FE .align 2, 0 -_080E35D0: .4byte gUnknown_08D2DF54 +_080E35D0: .4byte gBattleStatMask3_Pal _080E35D4: cmp r0, 0x3 bne _080E35E0 ldr r0, _080E35DC b _080E35FE .align 2, 0 -_080E35DC: .4byte gUnknown_08D2DF74 +_080E35DC: .4byte gBattleStatMask4_Pal _080E35E0: cmp r0, 0x4 bne _080E35EC ldr r0, _080E35E8 b _080E35FE .align 2, 0 -_080E35E8: .4byte gUnknown_08D2DFB4 +_080E35E8: .4byte gBattleStatMask6_Pal _080E35EC: cmp r0, 0x5 bne _080E35F8 ldr r0, _080E35F4 b _080E35FE .align 2, 0 -_080E35F4: .4byte gUnknown_08D2DFD4 +_080E35F4: .4byte gBattleStatMask7_Pal _080E35F8: cmp r0, 0x6 bne _080E3610 @@ -214612,7 +214612,7 @@ _080E35FE: bl LoadCompressedPalette b _080E361E .align 2, 0 -_080E360C: .4byte gUnknown_08D2DFF4 +_080E360C: .4byte gBattleStatMask8_Pal _080E3610: ldr r0, _080E3644 mov r1, sp @@ -214641,7 +214641,7 @@ _080E361E: strh r1, [r0, 0xA] b _080E3668 .align 2, 0 -_080E3644: .4byte gUnknown_08D2DF94 +_080E3644: .4byte gBattleStatMask5_Pal _080E3648: .4byte 0x030042c0 _080E364C: .4byte 0x030041b4 _080E3650: .4byte 0x03004b20 @@ -226243,10 +226243,10 @@ _080E8F34: .4byte 0x00000d09 _080E8F38: .4byte gUnknown_08E945D0 _080E8F3C: .4byte gUnknown_083DB694 _080E8F40: .4byte gUnknown_08E953D0 -_080E8F44: .4byte gUnknown_08E8EE18 +_080E8F44: .4byte gMenuWordGroupFrame_Gfx _080E8F48: .4byte 0x06008000 _080E8F4C: .4byte 0x06006800 -_080E8F50: .4byte gUnknown_08E8F178 +_080E8F50: .4byte gMenuWordGroupFrame1_Pal _080E8F54: .4byte REG_BG2CNT _080E8F58: .4byte 0x00000e02 _080E8F5C: .4byte 0x06007000 @@ -226445,8 +226445,8 @@ _080E90DA: pop {r0} bx r0 .align 2, 0 -_080E90F4: .4byte gUnknown_08E8F19A -_080E90F8: .4byte gUnknown_08E8F1A0 +_080E90F4: .4byte gMenuWordGroupFrame2_Pal + 0x2 +_080E90F8: .4byte gMenuWordGroupFrame2_Pal + 0x8 _080E90FC: .4byte gUnknown_083DB694 _080E9100: .4byte 0x00009c34 _080E9104: .4byte 0x00009c32 @@ -238212,7 +238212,7 @@ _080EEE90: bl LZ77UnCompVram b _080EEF18 .align 2, 0 -_080EEE9C: .4byte gUnknown_08E88D4C +_080EEE9C: .4byte gPokenavHoennMapMisc_Gfx _080EEEA0: .4byte 0x0600c000 _080EEEA4: ldr r0, _080EEEB0 @@ -238229,7 +238229,7 @@ _080EEEB8: bl LoadPalette b _080EEF18 .align 2, 0 -_080EEEC4: .4byte gUnknown_08E89628 +_080EEEC4: .4byte gPokenavHoennMap1_Pal _080EEEC8: movs r0, 0 bl sub_80EF58C @@ -239546,7 +239546,7 @@ _080EF92C: bl LZ77UnCompVram b _080EF9DC .align 2, 0 -_080EF938: .4byte gUnknown_08E892C4 +_080EF938: .4byte gPokenavHoennMapSquares_Gfx _080EF93C: .4byte 0x06005000 _080EF940: ldr r0, _080EF950 @@ -239556,7 +239556,7 @@ _080EF940: bl sub_80EFC3C b _080EF9DC .align 2, 0 -_080EF950: .4byte gUnknown_08E89648 +_080EF950: .4byte gPokenavHoennMapSquares_Pal _080EF954: bl sub_80EFC64 lsls r0, 24 @@ -240428,7 +240428,7 @@ _080F0028: bl LZ77UnCompVram b _080F0154 .align 2, 0 -_080F0034: .4byte gUnknown_08E89AD8 +_080F0034: .4byte gPokenavConditionView_Gfx _080F0038: .4byte 0x06005000 _080F003C: ldr r0, _080F0050 @@ -240442,7 +240442,7 @@ _080F003C: .align 2, 0 _080F0050: .4byte gUnknown_08E9AC4C _080F0054: .4byte 0x0600f000 -_080F0058: .4byte gUnknown_08E8A1C0 +_080F0058: .4byte gPokenavConditionMenu2_Pal _080F005C: ldr r0, _080F0088 ldr r0, [r0] @@ -240507,7 +240507,7 @@ _080F00AC: .align 2, 0 _080F00EC: .4byte gUnknown_083E0254 _080F00F0: .4byte gUnknownPalette_81E6692 -_080F00F4: .4byte gUnknown_08E8A1C0 + 0x2 +_080F00F4: .4byte gPokenavConditionMenu2_Pal + 0x2 _080F00F8: ldr r0, _080F0110 ldr r0, [r0] @@ -240825,7 +240825,7 @@ _080F0380: bl LZ77UnCompVram b _080F0618 .align 2, 0 -_080F038C: .4byte gUnknown_08E9FA08 +_080F038C: .4byte gPokenavConditionSearch2_Gfx _080F0390: .4byte 0x06008000 _080F0394: ldr r6, _080F03FC @@ -240878,7 +240878,7 @@ _080F03FC: .4byte gUnknown_083E02B4 _080F0400: .4byte gUnknown_083E0334 _080F0404: .4byte gUnknown_083DFEC4 _080F0408: .4byte 0x000087ca -_080F040C: .4byte gUnknown_083E0294 +_080F040C: .4byte gPokenavConditionSearch2_Pal _080F0410: .4byte 0x0202eac8 _080F0414: .4byte gUnknownPalette_81E6692 _080F0418: @@ -242536,7 +242536,7 @@ _080F116C: bl LZ77UnCompVram b _080F1218 .align 2, 0 -_080F1178: .4byte gUnknown_08E9FB1C +_080F1178: .4byte gPokenavRibbonView_Gfx _080F117C: .4byte 0x06008000 _080F1180: ldr r0, _080F118C @@ -242571,7 +242571,7 @@ _080F1194: bl LoadPalette b _080F1218 .align 2, 0 -_080F11CC: .4byte gUnknown_08E9FAFC +_080F11CC: .4byte gPokenavRibbonView_Pal _080F11D0: .4byte gUnknown_083E03A8 _080F11D4: .4byte gUnknown_083E3C60 _080F11D8: .4byte gUnknownPalette_81E6692 @@ -242873,7 +242873,7 @@ _080F1424: .4byte 0x0600b800 _080F1428: .4byte 0x040000d4 _080F142C: .4byte 0x84000140 _080F1430: .4byte 0x0202eac8 -_080F1434: .4byte gUnknown_08E9FB18 +_080F1434: .4byte gPokenavRibbonView_Pal + 0x1C thumb_func_end sub_80F13FC thumb_func_start sub_80F1438 @@ -243159,7 +243159,7 @@ _080F1670: ldr r0, [r0, 0x8] b _080F16F0 .align 2, 0 -_080F1684: .4byte gUnknown_08EA0028 +_080F1684: .4byte gPokenavRibbonPokeView_Gfx _080F1688: .4byte 0x0600e000 _080F168C: .4byte 0x040000d4 _080F1690: .4byte 0x80000070 @@ -243347,7 +243347,7 @@ _080F17FE: bl LZ77UnCompVram b _080F1914 .align 2, 0 -_080F1808: .4byte gUnknown_08E89AD8 +_080F1808: .4byte gPokenavConditionView_Gfx _080F180C: .4byte 0x06005000 _080F1810: ldr r0, _080F1824 @@ -243361,7 +243361,7 @@ _080F1810: .align 2, 0 _080F1824: .4byte gUnknown_08E9AC4C _080F1828: .4byte 0x0600f000 -_080F182C: .4byte gUnknown_08E8A1C0 +_080F182C: .4byte gPokenavConditionMenu2_Pal _080F1830: ldr r0, _080F1850 ldr r3, _080F1854 @@ -243417,7 +243417,7 @@ _080F186C: .align 2, 0 _080F18AC: .4byte gUnknown_083E0254 _080F18B0: .4byte gUnknownPalette_81E6692 -_080F18B4: .4byte gUnknown_08E8A1C0 + 0x2 +_080F18B4: .4byte gPokenavConditionMenu2_Pal + 0x2 _080F18B8: ldr r0, _080F18D0 ldr r0, [r0] @@ -243754,7 +243754,7 @@ _080F1B34: lsls r2, 2 b _080F1B44 .align 2, 0 -_080F1B3C: .4byte gUnknown_08E884CC +_080F1B3C: .4byte gPokenavMenuOptions_Gfx _080F1B40: ldr r0, _080F1B4C ldr r2, _080F1B50 @@ -243763,7 +243763,7 @@ _080F1B44: bl LZ77UnCompWram b _080F1B6C .align 2, 0 -_080F1B4C: .4byte gUnknown_08E89668 +_080F1B4C: .4byte gPokenavConditionMenu_Gfx _080F1B50: .4byte 0x00001788 _080F1B54: ldr r0, _080F1B64 @@ -243773,7 +243773,7 @@ _080F1B54: movs r0, 0 b _080F1B7C .align 2, 0 -_080F1B64: .4byte gUnknown_08E8AD04 +_080F1B64: .4byte gPokenavConditionSearch_Gfx _080F1B68: .4byte 0x00002388 _080F1B6C: ldr r0, _080F1B84 @@ -245105,9 +245105,9 @@ _080F2532: ldr r0, _080F2554 b _080F257A .align 2, 0 -_080F254C: .4byte gUnknown_08E88A28 +_080F254C: .4byte gPokenavMenuOptions1_Pal _080F2550: .4byte 0xffff0000 -_080F2554: .4byte gUnknown_08E88A48 +_080F2554: .4byte gPokenavMenuOptions2_Pal _080F2558: ldr r0, _080F2564 str r0, [sp] @@ -245116,7 +245116,7 @@ _080F2558: strh r0, [r1, 0x4] b _080F2580 .align 2, 0 -_080F2564: .4byte gUnknown_08E89958 +_080F2564: .4byte gPokenavConditionMenu_Pal _080F2568: ldr r0, _080F2590 str r0, [sp] @@ -245139,8 +245139,8 @@ _080F2586: pop {r0} bx r0 .align 2, 0 -_080F2590: .4byte gUnknown_08E8B1C4 -_080F2594: .4byte gUnknown_08E8B1E4 +_080F2590: .4byte gPokenavCondition6_Pal +_080F2594: .4byte gPokenavCondition7_Pal thumb_func_end sub_80F2514 thumb_func_start sub_80F2598 @@ -245326,7 +245326,7 @@ _080F2704: ldr r2, _080F2718 b _080F279C .align 2, 0 -_080F2710: .4byte gUnknown_08E88358 +_080F2710: .4byte gPokenavMainMenu_Gfx _080F2714: .4byte gUnknown_083DFEC4 _080F2718: .4byte 0x00003b98 _080F271C: @@ -245336,7 +245336,7 @@ _080F271C: ldr r2, _080F2730 b _080F279C .align 2, 0 -_080F2728: .4byte gUnknown_08E89978 +_080F2728: .4byte gPokenavConditionMenuHeader_Gfx _080F272C: .4byte gUnknown_083DFEC4 _080F2730: .4byte 0x00004198 _080F2734: @@ -245346,7 +245346,7 @@ _080F2734: ldr r2, _080F2748 b _080F279C .align 2, 0 -_080F2740: .4byte gUnknown_08E8B3A0 +_080F2740: .4byte gPokenavRibbonsHeader_Gfx _080F2744: .4byte gUnknown_083DFEC4 _080F2748: .4byte 0x00004d98 _080F274C: @@ -245356,7 +245356,7 @@ _080F274C: ldr r2, _080F2760 b _080F279C .align 2, 0 -_080F2758: .4byte gUnknown_08E88A88 +_080F2758: .4byte gPokenavHoennMapHeader_Gfx _080F275C: .4byte gUnknown_083DFEC4 _080F2760: .4byte 0x00005398 _080F2764: @@ -245366,7 +245366,7 @@ _080F2764: ldr r2, _080F2778 b _080F279C .align 2, 0 -_080F2770: .4byte gUnknown_08E8A1E0 +_080F2770: .4byte gPokenavConditionMenuOptions_Gfx _080F2774: .4byte gUnknown_083DFEC4 _080F2778: .4byte 0x00005f98 _080F277C: @@ -245376,7 +245376,7 @@ _080F277C: ldr r2, _080F2790 b _080F279C .align 2, 0 -_080F2788: .4byte gUnknown_08E8A5D8 +_080F2788: .4byte gPokenavConditionMenuOptions2_Gfx _080F278C: .4byte gUnknown_083DFEC4 _080F2790: .4byte 0x00006798 _080F2794: @@ -245389,7 +245389,7 @@ _080F279C: bl LZ77UnCompWram b _080F27C0 .align 2, 0 -_080F27A4: .4byte gUnknown_08E8B204 +_080F27A4: .4byte gPokenavTrainersEyesHeader_Gfx _080F27A8: .4byte gUnknown_083DFEC4 _080F27AC: .4byte 0x00004798 _080F27B0: @@ -255407,7 +255407,7 @@ _080F7558: b _080F75FE .align 2, 0 _080F7580: .4byte 0x020388b8 -_080F7584: .4byte gUnknown_08E8A7C4 +_080F7584: .4byte gPokenavConditionMenuMisc_Gfx _080F7588: .4byte 0x03001770 _080F758C: movs r0, 0x80 @@ -255740,7 +255740,7 @@ _080F7770: b _080F787A .align 2, 0 _080F7820: .4byte 0x020388b8 -_080F7824: .4byte gUnknown_08E8A7C4 +_080F7824: .4byte gPokenavConditionMenuMisc_Gfx _080F7828: .4byte gUnknown_08E966B8 _080F782C: .4byte gUnknown_083E5214 _080F7830: .4byte gSpriteAnimTable_83E52AC @@ -286892,7 +286892,7 @@ sub_81063C0: @ 81063C0 pop {r0} bx r0 .align 2, 0 -_081063F0: .4byte gUnknown_08E99848 +_081063F0: .4byte gSlotMachineReelTimeLights_Gfx _081063F4: .4byte 0x02010000 _081063F8: .4byte gUnknown_083EDE8C _081063FC: .4byte gUnknown_083EDC2C @@ -286980,7 +286980,7 @@ _08106468: pop {r0} bx r0 .align 2, 0 -_081064A0: .4byte gUnknown_08E8F844 +_081064A0: .4byte gSlotMachine_Gfx _081064A4: .4byte 0x02010000 _081064A8: .4byte 0x040000d4 _081064AC: .4byte 0x80000800 @@ -295790,9 +295790,9 @@ _0810A77C: .align 2, 0 _0810A7F8: .4byte 0x040000d4 _0810A7FC: .4byte 0x81000800 -_0810A800: .4byte gUnknown_08E8F1B8 +_0810A800: .4byte gMiscClock_Gfx _0810A804: .4byte 0x0202e8cc -_0810A808: .4byte gUnknown_08E8F804 +_0810A808: .4byte gMiscClockMale_Pal _0810A80C: ldr r0, _0810A850 movs r1, 0 @@ -295819,7 +295819,7 @@ _0810A816: pop {r0} bx r0 .align 2, 0 -_0810A850: .4byte gUnknown_08E8F824 +_0810A850: .4byte gMiscClockFemale_Pal _0810A854: .4byte gUnknown_083F7A90 _0810A858: .4byte gUnknown_083F7AA0 _0810A85C: .4byte gWindowConfig_81E6C3C @@ -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 @@ -345641,8 +345641,8 @@ _08123464: .4byte gCableCarTreeTilemap _08123468: .4byte gCableCarMountainTilemap _0812346C: .4byte gCableCarPylonStemTilemap _08123470: .4byte 0x000009d8 -_08123474: .4byte gUnknown_08E7EB9C -_08123478: .4byte gUnknown_08E7EC3C +_08123474: .4byte gCableCarBG_Pal +_08123478: .4byte gCableCarBG_Gfx _0812347C: .4byte 0x03001770 _08123480: .4byte 0x0000043c _08123484: @@ -395734,9 +395734,9 @@ sub_813B808: @ 813B808 pop {r0} bx r0 .align 2, 0 -_0813B848: .4byte gUnknown_08E9C798 -_0813B84C: .4byte gUnknown_08E9CA24 -_0813B850: .4byte gUnknown_08E9CA44 +_0813B848: .4byte gIntroCopyright_Gfx +_0813B84C: .4byte gIntroCopyright_Pal +_0813B850: .4byte gIntroCopyright_Tilemap thumb_func_end sub_813B808 thumb_func_start SerialCb_CopyrightScreen @@ -411575,7 +411575,7 @@ _0814350A: pop {r0} bx r0 .align 2, 0 -_0814354C: .4byte gUnknown_08E8E8B0 +_0814354C: .4byte gHallOfFame_Gfx _08143550: .4byte 0x040000d4 _08143554: .4byte 0x81000800 _08143558: .4byte 0x06003800 @@ -411583,7 +411583,7 @@ _0814355C: .4byte 0x02000000 _08143560: .4byte 0x06003b80 _08143564: .4byte 0x06003000 _08143568: .4byte 0x000003ff -_0814356C: .4byte gUnknown_08E8EA78 +_0814356C: .4byte gHallOfFame_Pal thumb_func_end sub_81433E0 thumb_func_start sub_8143570 @@ -415141,8 +415141,8 @@ _081451D0: pop {r0} bx r0 .align 2, 0 -_081451EC: .4byte gUnknown_08EA260C -_081451F0: .4byte gUnknown_08E9CA24 +_081451EC: .4byte gCreditsCopyrightEnd_Gfx +_081451F0: .4byte gIntroCopyright_Pal _081451F4: .4byte 0x000003ff _081451F8: .4byte 0x060001c8 _081451FC: .4byte 0x06000248 @@ -417285,7 +417285,7 @@ _081462FC: bl LZDecompressVram b _081463CA .align 2, 0 -_08146308: .4byte gUnknown_08E783FC +_08146308: .4byte gBerryCheck_Gfx _0814630C: ldr r0, _0814631C ldr r1, _08146320 @@ -417364,7 +417364,7 @@ _081463A4: adds r1, r2 b _081463D0 .align 2, 0 -_081463B8: .4byte gUnknown_08E7883C +_081463B8: .4byte gBerryCheck_Pal _081463BC: .4byte 0x02000000 _081463C0: .4byte 0x0001ffff _081463C4: @@ -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: diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 8084bab9a..3ed3333d8 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -9374,7 +9374,7 @@ _080457BA: bx r0 .align 2, 0 _080457C8: .4byte 0x02020004 -_080457CC: .4byte gUnknown_08E903F8 +_080457CC: .4byte gBattleInterfaceStatusIcons_DynPal _080457D0: .4byte 0x0202ecc8 _080457D4: .4byte 0x05000200 _080457D8: .4byte 0x06010000 |