diff options
Diffstat (limited to 'asm/battle_controller_linkopponent.s')
| -rw-r--r-- | asm/battle_controller_linkopponent.s | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index e9ce01f0a..e07ec2dbb 100644 --- a/asm/battle_controller_linkopponent.s +++ b/asm/battle_controller_linkopponent.s @@ -215,7 +215,7 @@ sub_8064520: @ 8064520 beq _08064584 _0806454C: ldr r2, =gSprites - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldr r3, =gActiveBank ldrb r0, [r3] adds r0, r1 @@ -234,7 +234,7 @@ _0806454C: .pool _08064584: ldr r3, =gSprites - ldr r6, =gUnknown_03005D70 + ldr r6, =gHealthBoxesIds ldr r2, =gActiveBank ldrb r4, [r2] adds r0, r4, r6 @@ -541,7 +541,7 @@ _080647B4: ands r0, r1 cmp r0, 0 bne _0806484A - ldr r4, =gUnknown_03005D70 + ldr r4, =gHealthBoxesIds mov r1, r9 ldrb r0, [r1] adds r1, r7, 0 @@ -569,7 +569,7 @@ _080647B4: ldrb r0, [r0] bl sub_80729D0 _0806484A: - ldr r5, =gUnknown_03005D70 + ldr r5, =gHealthBoxesIds ldr r4, =gActiveBank ldrb r1, [r4] adds r0, r1, r5 @@ -962,7 +962,7 @@ sub_8064BC0: @ 8064BC0 push {r4-r6,lr} ldr r6, =gActiveBank ldrb r0, [r6] - ldr r5, =gUnknown_03005D70 + ldr r5, =gHealthBoxesIds adds r1, r0, r5 ldrb r1, [r1] movs r2, 0 @@ -1014,7 +1014,7 @@ sub_8064C14: @ 8064C14 lsls r0, 31 cmp r0, 0 bne _08064C42 - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds adds r0, r3, r0 ldrb r0, [r0] bl sub_8072984 @@ -1061,7 +1061,7 @@ sub_8064C58: @ 8064C58 bl DestroySprite ldrb r0, [r6] bl sub_805EEE0 - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -1152,7 +1152,7 @@ _08064D5A: sub_8064D60: @ 8064D60 push {r4,lr} ldr r2, =gSprites - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 @@ -1308,7 +1308,7 @@ sub_8064E50: @ 8064E50 adds r0, r7 movs r1, 0 bl StartSpriteAnim - ldr r4, =gUnknown_03005D70 + ldr r4, =gHealthBoxesIds ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] @@ -3943,7 +3943,7 @@ _0806666C: bl DestroySprite ldrb r0, [r6] bl sub_805EEE0 - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -5166,7 +5166,7 @@ sub_80670A0: @ 80670A0 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -5188,7 +5188,7 @@ _08067130: adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -5229,7 +5229,7 @@ sub_806719C: @ 806719C lsls r0, 24 cmp r0, 0 bne _080671F0 - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] |