diff options
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 1ae03fe5e..c009baf03 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -2396,7 +2396,7 @@ _0802F6A4: .4byte sub_8011A1C thumb_func_start sub_802F6A8 sub_802F6A8: @ 802F6A8 push {lr} - ldr r0, _0802F6D0 @ =gUnknown_2037AB8 + ldr r0, _0802F6D0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2415,7 +2415,7 @@ sub_802F6A8: @ 802F6A8 bl sub_800AAC0 b _0802F6E0 .align 2, 0 -_0802F6D0: .4byte gUnknown_2037AB8 +_0802F6D0: .4byte gPaletteFade _0802F6D4: .4byte gBattleTypeFlags _0802F6D8: .4byte gUnknown_3003F3C _0802F6DC: @@ -4293,7 +4293,7 @@ _08030622: thumb_func_start sub_8030628 sub_8030628: @ 8030628 push {r4,lr} - ldr r0, _0803066C @ =gUnknown_2037AB8 + ldr r0, _0803066C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4325,7 +4325,7 @@ _08030666: pop {r0} bx r0 .align 2, 0 -_0803066C: .4byte gUnknown_2037AB8 +_0803066C: .4byte gPaletteFade _08030670: .4byte gUnknown_3004FE0 _08030674: .4byte gActiveBattler _08030678: .4byte sub_8030684 @@ -4341,7 +4341,7 @@ sub_8030684: @ 8030684 ldr r0, _080306B8 @ =sub_8011100 cmp r1, r0 bne _080306F4 - ldr r0, _080306BC @ =gUnknown_2037AB8 + ldr r0, _080306BC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4360,7 +4360,7 @@ sub_8030684: @ 8030684 .align 2, 0 _080306B4: .4byte gMain _080306B8: .4byte sub_8011100 -_080306BC: .4byte gUnknown_2037AB8 +_080306BC: .4byte gPaletteFade _080306C0: .4byte gUnknown_203B0C0 _080306C4: .4byte gUnknown_203B0C1 _080306C8: .4byte gUnknown_203B0DC @@ -4395,7 +4395,7 @@ _080306FC: .4byte gActiveBattler thumb_func_start sub_8030700 sub_8030700: @ 8030700 push {lr} - ldr r0, _0803072C @ =gUnknown_2037AB8 + ldr r0, _0803072C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4415,7 +4415,7 @@ _08030728: pop {r0} bx r0 .align 2, 0 -_0803072C: .4byte gUnknown_2037AB8 +_0803072C: .4byte gPaletteFade _08030730: .4byte gUnknown_3004FE0 _08030734: .4byte gActiveBattler _08030738: .4byte CompleteWhenChoseItem @@ -4429,7 +4429,7 @@ CompleteWhenChoseItem: @ 803073C ldr r0, _0803076C @ =sub_8011100 cmp r1, r0 bne _08030762 - ldr r0, _08030770 @ =gUnknown_2037AB8 + ldr r0, _08030770 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4446,7 +4446,7 @@ _08030762: .align 2, 0 _08030768: .4byte gMain _0803076C: .4byte sub_8011100 -_08030770: .4byte gUnknown_2037AB8 +_08030770: .4byte gPaletteFade _08030774: .4byte gUnknown_203AD30 thumb_func_end CompleteWhenChoseItem @@ -4570,7 +4570,7 @@ _08030848: ldrh r1, [r4] movs r0, 0xD muls r1, r0 - ldr r0, _080308A4 @ =gUnknown_8247094 + ldr r0, _080308A4 @ =gMoveNames adds r1, r0 adds r0, r6, 0 bl StringAppend @@ -4599,7 +4599,7 @@ _08030894: .4byte gUnknown_2022BC8 _08030898: .4byte gUnknown_3004FF8 _0803089C: .4byte gDisplayedStringBattle _080308A0: .4byte gUnknown_83FE770 -_080308A4: .4byte gUnknown_8247094 +_080308A4: .4byte gMoveNames thumb_func_end sub_8030830 thumb_func_start MoveSelectionDisplayPpString |