diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom4.s | 10 | ||||
| -rw-r--r-- | asm/rom5.s | 26 |
2 files changed, 18 insertions, 18 deletions
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 f4a7d565a..544d15489 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -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 @@ -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 @@ -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 gScaryFaceGfx -_080D24D4: .4byte gScaryFacePal +_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 |