diff options
Diffstat (limited to 'asm/battle_controller_linkpartner.s')
| -rw-r--r-- | asm/battle_controller_linkpartner.s | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/asm/battle_controller_linkpartner.s b/asm/battle_controller_linkpartner.s index d5c6fd8e6..dbe8052b9 100644 --- a/asm/battle_controller_linkpartner.s +++ b/asm/battle_controller_linkpartner.s @@ -184,7 +184,7 @@ sub_814B004: @ 814B004 beq _0814B05C _0814B028: ldr r2, =gSprites - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 @@ -202,7 +202,7 @@ _0814B028: .pool _0814B05C: ldr r2, =gSprites - ldr r5, =gUnknown_03005D70 + ldr r5, =gHealthBoxesIds ldr r0, =gActiveBank ldrb r3, [r0] adds r0, r3, r5 @@ -368,7 +368,7 @@ _0814B136: lsls r0, 2 add r0, r10 bl DestroySprite - ldr r4, =gUnknown_03005D70 + ldr r4, =gHealthBoxesIds ldrb r0, [r7] mov r1, r8 eors r1, r0 @@ -406,7 +406,7 @@ _0814B1F0: ldr r1, =gSprites adds r0, r1 bl DestroySprite - ldr r5, =gUnknown_03005D70 + ldr r5, =gHealthBoxesIds ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] @@ -486,7 +486,7 @@ bx_t4_healthbar_update: @ 814B2D0 push {r4-r6,lr} ldr r5, =gActiveBank ldrb r0, [r5] - ldr r6, =gUnknown_03005D70 + ldr r6, =gHealthBoxesIds adds r1, r0, r6 ldrb r1, [r1] movs r2, 0 @@ -583,7 +583,7 @@ sub_814B340: @ 814B340 lsls r0, 2 adds r0, r6 bl DestroySprite - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -630,7 +630,7 @@ sub_814B3DC: @ 814B3DC lsls r0, 2 adds r0, r4 bl DestroySprite - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -721,7 +721,7 @@ _0814B4DA: sub_814B4E0: @ 814B4E0 push {r4,lr} ldr r2, =gSprites - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 @@ -868,7 +868,7 @@ sub_814B5A8: @ 814B5A8 adds r0, r1 movs r1, 0 bl StartSpriteAnim - ldr r4, =gUnknown_03005D70 + ldr r4, =gHealthBoxesIds ldrb r1, [r7] adds r0, r1, r4 ldrb r0, [r0] @@ -3510,7 +3510,7 @@ _0814CE5C: lsls r0, 2 adds r0, r4 bl DestroySprite - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -4475,7 +4475,7 @@ sub_814D63C: @ 814D63C 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] @@ -4497,7 +4497,7 @@ _0814D6CC: 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] @@ -4538,7 +4538,7 @@ sub_814D738: @ 814D738 lsls r0, 24 cmp r0, 0 bne _0814D78C - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] |