diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-03 21:27:34 +0100 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-03 21:27:34 +0100 |
commit | 828892df213c383731996783e620b4c345867a46 (patch) | |
tree | 35d7ec42704fa8472caa0ca6d1bef6540a51a29d /asm | |
parent | b953d0cb3875b37cc8372c34a5605fd976b7a95e (diff) |
remaining work and tidy up previously dumped stuff in graphics.s
Diffstat (limited to 'asm')
-rw-r--r-- | asm/rom5.s | 30 | ||||
-rw-r--r-- | asm/rom_8040EB4.s | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index da7a1ede5..f7fcad083 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -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 @@ -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 @@ -226246,7 +226246,7 @@ _080E8F40: .4byte gUnknown_08E953D0 _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 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 |