diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom5.s | 54 | ||||
| -rw-r--r-- | asm/rom_8040EB4.s | 4 |
2 files changed, 29 insertions, 29 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index c085f778f..de694322b 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -71261,11 +71261,11 @@ _0809DBDC: add r1, r12 b _0809DDEE .align 2, 0 -_0809DC08: .4byte gUnknown_083C133C +_0809DC08: .4byte gSummaryScreenTextTiles _0809DC0C: .4byte 0x0600d000 _0809DC10: .4byte 0x040000d4 _0809DC14: .4byte 0x800000a0 -_0809DC18: .4byte gUnknown_083C147C +_0809DC18: .4byte gSummaryScreenButtonTiles _0809DC1C: .4byte 0x0600d140 _0809DC20: .4byte 0x80000080 _0809DC24: .4byte 0x02018000 @@ -79506,7 +79506,7 @@ _080A1DBA: bx r0 .align 2, 0 _080A1DC0: .4byte 0x00007533 -_080A1DC4: .4byte gUnknown_083C131C +_080A1DC4: .4byte gSummaryScreenMonMarkingsPalette _080A1DC8: .4byte 0x020384f4 thumb_func_end sub_80A1D84 @@ -224568,8 +224568,8 @@ sub_80E8218: @ 80E8218 pop {r0} bx r0 .align 2, 0 -_080E8260: .4byte gUnknown_083DBBB4 -_080E8264: .4byte gUnknown_083DBBDC +_080E8260: .4byte gSpriteSheets_Interview +_080E8264: .4byte gSpritePalettes_Interview thumb_func_end sub_80E8218 thumb_func_start sub_80E8268 @@ -300744,11 +300744,11 @@ sub_810CE78: @ 810CE78 pop {r0} bx r0 .align 2, 0 -_0810CEE8: .4byte gUnknown_083F828C +_0810CEE8: .4byte gCaveTransitionTiles _0810CEEC: .4byte 0x0600c000 -_0810CEF0: .4byte gUnknown_083F80AC +_0810CEF0: .4byte gCaveTransitionTilemap _0810CEF4: .4byte 0x0600f800 -_0810CEF8: .4byte gUnknown_083F804C +_0810CEF8: .4byte gCaveTransitionPalette_White _0810CEFC: .4byte gUnknown_083F809C _0810CF00: .4byte REG_BLDCNT _0810CF04: .4byte 0x00003e41 @@ -300845,7 +300845,7 @@ _0810CFB6: pop {r0} bx r0 .align 2, 0 -_0810CFBC: .4byte gUnknown_083F804C +_0810CFBC: .4byte gCaveTransitionPalette_White _0810CFC0: .4byte sub_810CFC4 thumb_func_end sub_810CF5C @@ -300963,15 +300963,15 @@ sub_810D028: @ 810D028 pop {r0} bx r0 .align 2, 0 -_0810D098: .4byte gUnknown_083F828C +_0810D098: .4byte gCaveTransitionTiles _0810D09C: .4byte 0x0600c000 -_0810D0A0: .4byte gUnknown_083F80AC +_0810D0A0: .4byte gCaveTransitionTilemap _0810D0A4: .4byte 0x0600f800 _0810D0A8: .4byte REG_BLDCNT _0810D0AC: .4byte REG_BG0CNT _0810D0B0: .4byte 0x00001f0c -_0810D0B4: .4byte gUnknown_083F804C -_0810D0B8: .4byte gUnknown_083F806C +_0810D0B4: .4byte gCaveTransitionPalette_White +_0810D0B8: .4byte gCaveTransitionPalette_Black _0810D0BC: .4byte 0x03004b20 _0810D0C0: .4byte sub_810D0C4 thumb_func_end sub_810D028 @@ -301067,7 +301067,7 @@ _0810D172: pop {r0} bx r0 .align 2, 0 -_0810D178: .4byte gUnknown_083F806C +_0810D178: .4byte gCaveTransitionPalette_Black _0810D17C: .4byte 0x03001770 thumb_func_end sub_810D128 @@ -343201,7 +343201,7 @@ _081220B8: pop {r1} bx r1 .align 2, 0 -_081220C0: .4byte gUnknown_08405EC4 +_081220C0: .4byte gBattleTowerBanlist _081220C4: .4byte 0x0000ffff thumb_func_end sub_8122030 @@ -345635,11 +345635,11 @@ _081233EC: .align 2, 0 _08123454: .4byte gUnknown_08401CF8 _08123458: .4byte gUnknown_08401D18 -_0812345C: .4byte gUnknown_08401820 +_0812345C: .4byte gCableCarMtChimneyTilemap _08123460: .4byte 0x02019000 -_08123464: .4byte gUnknown_08401978 -_08123468: .4byte gUnknown_08401AFC -_0812346C: .4byte gUnknown_08401CD4 +_08123464: .4byte gCableCarTreeTilemap +_08123468: .4byte gCableCarMountainTilemap +_0812346C: .4byte gCableCarPylonStemTilemap _08123470: .4byte 0x000009d8 _08123474: .4byte gCableCarBG_Pal _08123478: .4byte gCableCarBG_Gfx @@ -345770,7 +345770,7 @@ _0812357C: .4byte 0x02019168 _08123580: .4byte 0x0600f000 _08123584: .4byte 0x02039274 _08123588: .4byte 0x000008fc -_0812358C: .4byte gUnknown_08401CC0 +_0812358C: .4byte gCableCarPylonHookTilemapEntries _08123590: .4byte 0x03001770 _08123594: .4byte 0x0000043c _08123598: @@ -346437,7 +346437,7 @@ _08123AD6: bx r0 .align 2, 0 _08123AE8: .4byte 0x000008fc -_08123AEC: .4byte gUnknown_08401CC0 +_08123AEC: .4byte gCableCarPylonHookTilemapEntries _08123AF0: .4byte 0x020199d8 _08123AF4: .4byte 0x030024d0 thumb_func_end sub_81239E4 @@ -346553,7 +346553,7 @@ _08123BB0: ldr r2, _08123BD8 b _08123BEA .align 2, 0 -_08123BD4: .4byte gUnknown_08401CC4 +_08123BD4: .4byte gCableCarPylonHookTilemapEntries + 0x4 _08123BD8: .4byte 0x00000942 _08123BDC: ldr r2, _08123C08 @@ -346579,7 +346579,7 @@ _08123BEE: ldrsh r0, [r4, r1] b _08123C26 .align 2, 0 -_08123C08: .4byte gUnknown_08401CC8 +_08123C08: .4byte gCableCarPylonHookTilemapEntries + 0x8 _08123C0C: .4byte 0x00000904 _08123C10: .4byte 0x00000944 _08123C14: .4byte 0x02039274 @@ -382892,7 +382892,7 @@ _081350CE: pop {r1} bx r1 .align 2, 0 -_081350D8: .4byte gUnknown_08405EC4 +_081350D8: .4byte gBattleTowerBanlist _081350DC: .4byte 0x0000ffff thumb_func_end sub_813509C @@ -383142,7 +383142,7 @@ _081352CE: pop {r0} bx r0 .align 2, 0 -_081352DC: .4byte gUnknown_08405EC4 +_081352DC: .4byte gBattleTowerBanlist _081352E0: .4byte 0x0000ffff thumb_func_end sub_8135200 @@ -383259,7 +383259,7 @@ _081353C4: .4byte 0x03004360 _081353C8: .4byte 0x0202e8dc _081353CC: .4byte 0x020231cc _081353D0: .4byte 0x0202e8cc -_081353D4: .4byte gUnknown_08405EC4 +_081353D4: .4byte gBattleTowerBanlist _081353D8: .4byte 0x0000ffff _081353DC: .4byte gUnknown_08400E2C _081353E0: .4byte gUnknown_08400E32 @@ -426155,7 +426155,7 @@ _0814AA98: _0814AAA8: .4byte gUnknown_0842F790 _0814AAAC: .4byte 0x0203a3d0 _0814AAB0: .4byte 0x02020004 -_0814AAB4: .4byte gUnknown_0842F5C0 +_0814AAB4: .4byte gSubspriteTables_842F5C0 _0814AAB8: .4byte 0x0203a3d1 thumb_func_end sub_814A958 diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 756c90d7f..8084bab9a 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -19757,7 +19757,7 @@ sub_804AA0C: @ 804AA0C bx r0 .align 2, 0 _0804AA7C: .4byte 0x03004824 -_0804AA80: .4byte gUnknown_0820C308 +_0804AA80: .4byte gTradeMessageWindowRects _0804AA84: .4byte gUnknown_0820C2F0 thumb_func_end sub_804AA0C @@ -20575,7 +20575,7 @@ _0804B0B2: pop {r0} bx r0 .align 2, 0 -_0804B0B8: .4byte gUnknown_08215A98 +_0804B0B8: .4byte gTradeGlow2PaletteAnimTable thumb_func_end sub_804B07C thumb_func_start sub_804B0BC |