diff options
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index e12719153..821a7bbb2 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -8142,7 +8142,7 @@ _0805BCBE: ldrb r0, [r1] mov r1, r8 strb r0, [r1] - ldr r3, =gUnknown_02038408 + ldr r3, =gMovePowerMoveAnim ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -8156,7 +8156,7 @@ _0805BCBE: lsls r0, 8 orrs r2, r0 strh r2, [r3] - ldr r3, =gUnknown_02038404 + ldr r3, =gMoveDmgMoveAnim ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -8182,7 +8182,7 @@ _0805BCBE: lsls r0, 24 orrs r2, r0 str r2, [r3] - ldr r2, =gUnknown_0203841A + ldr r2, =gHappinessMoveAnim ldrb r0, [r5] lsls r0, 9 mov r1, r12 @@ -8190,7 +8190,7 @@ _0805BCBE: adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r4, =gUnknown_0203841C + ldr r4, =gWeatherMoveAnim ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -8204,7 +8204,7 @@ _0805BCBE: lsls r0, 8 orrs r2, r0 strh r2, [r4] - ldr r7, =gUnknown_02038400 + ldr r7, =gDisableStructMoveAnim ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -8353,10 +8353,10 @@ _0805BE94: strb r1, [r0, 0x4] b _0805BF70 _0805BEBE: - ldr r0, =gUnknown_020383F8 + ldr r0, =gAnimScriptCallback ldr r0, [r0] bl _call_via_r0 - ldr r0, =gUnknown_020383FD + ldr r0, =gAnimScriptActive ldrb r0, [r0] cmp r0, 0 bne _0805BF70 |