diff options
Diffstat (limited to 'asm/battle_anim_8170478.s')
| -rw-r--r-- | asm/battle_anim_8170478.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s index 690138efb..c64dd69e5 100644 --- a/asm/battle_anim_8170478.s +++ b/asm/battle_anim_8170478.s @@ -56,7 +56,7 @@ sub_8170478: @ 8170478 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds adds r4, r0 ldrb r0, [r4] ldr r1, =gSprites @@ -328,7 +328,7 @@ _08170708: movs r0, 0x4A adds r1, r4, 0 bl SetGpuReg - bl sub_80A4DF0 + bl IsContest lsls r0, 24 cmp r0, 0 bne _0817076C @@ -373,7 +373,7 @@ _0817076C: movs r1, 0x1 movs r2, 0 bl lcd_bg_operations - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds add r0, r8 ldrb r0, [r0] lsls r1, r0, 4 @@ -434,7 +434,7 @@ sub_8170834: @ 8170834 adds r7, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds adds r2, r0 ldrb r0, [r2] lsls r5, r0, 4 @@ -561,7 +561,7 @@ sub_817094C: @ 817094C push {r5,r6} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds adds r0, r1 ldrb r0, [r0] ldr r1, =gSprites @@ -996,7 +996,7 @@ sub_8170CFC: @ 8170CFC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -1016,7 +1016,7 @@ sub_8170D24: @ 8170D24 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -1136,7 +1136,7 @@ sub_8170E04: @ 8170E04 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index adds r1, r0, 0 @@ -1276,7 +1276,7 @@ _08170F50: movs r6, 0x17 movs r5, 0x5 _08170F54: - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index adds r4, r0, 0 @@ -1530,7 +1530,7 @@ _08171188: strh r0, [r4, 0x38] ldr r0, =sub_81711E8 str r0, [r4, 0x1C] - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -2695,7 +2695,7 @@ sub_8171AE4: @ 8171AE4 bl StartSpriteAffineAnim ldr r0, =sub_8171BAC str r0, [r4, 0x1C] - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 |