diff options
Diffstat (limited to 'asm/battle_7.s')
-rw-r--r-- | asm/battle_7.s | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/asm/battle_7.s b/asm/battle_7.s index ef67d6bc0..b92d69947 100644 --- a/asm/battle_7.s +++ b/asm/battle_7.s @@ -80,12 +80,12 @@ sub_805D19C: @ 805D19C ldr r4, =gActiveBank ldrb r0, [r4] lsls r2, r0, 9 - ldr r1, =gUnknown_02023068 + ldr r1, =gBattleBufferA + 4 adds r2, r1 mov r10, r2 movs r1, 0 movs r2, 0xFF - bl sub_803FECC + bl CheckMoveLimitations lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -124,7 +124,7 @@ _0805D20E: ldrb r1, [r0] movs r0, 0x58 muls r0, r1 - ldr r1, =gUnknown_020240CC + ldr r1, =gBattleMons + 0x48 adds r0, r1 ldr r0, [r0] bl GetNatureFromPersonality @@ -194,7 +194,7 @@ _0805D27C: lsls r0, r6, 24 lsrs r0, 24 bl BattleAI_SetupAIData - bl sub_8130BA4 + bl BattleAI_ChooseMoveOrAction lsls r0, 24 lsrs r0, 24 mov r9, r0 @@ -2029,7 +2029,7 @@ _0805E24C: ldrb r0, [r4] bl battle_make_oam_normal_battle _0805E252: - ldr r2, =gUnknown_03005D70 + ldr r2, =gHealthBoxesIds ldrb r1, [r4] adds r1, r2 strb r0, [r1] @@ -2044,7 +2044,7 @@ _0805E260: ldrb r0, [r0] cmp r0, 0x1 bhi _0805E288 - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds adds r0, r1, r0 ldrb r0, [r0] movs r1, 0 @@ -2052,7 +2052,7 @@ _0805E260: b _0805E30E .pool _0805E288: - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds adds r0, r1, r0 ldrb r0, [r0] movs r1, 0x1 @@ -2071,7 +2071,7 @@ _0805E29C: ands r0, r1 cmp r0, 0 bne _0805E302 - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -2088,7 +2088,7 @@ _0805E29C: b _0805E302 .pool _0805E2E4: - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -2103,7 +2103,7 @@ _0805E2E4: movs r2, 0 bl healthbar_draw_field_maybe _0805E302: - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -2347,7 +2347,7 @@ _0805E4DE: b _0805E77A .pool _0805E51C: - bl sub_80A4DF0 + bl IsContest lsls r0, 24 cmp r0, 0 beq _0805E558 @@ -2578,7 +2578,7 @@ _0805E70A: adds r1, r2 ldr r2, =0x04000008 bl CpuSet - bl sub_80A4DF0 + bl IsContest lsls r0, 24 cmp r0, 0 bne _0805E74A @@ -2639,7 +2639,7 @@ sub_805E7DC: @ 805E7DC lsls r1, 24 cmp r1, 0 bne _0805E898 - bl sub_80A4DF0 + bl IsContest lsls r0, 24 cmp r0, 0 beq _0805E7F8 @@ -2651,7 +2651,7 @@ _0805E7F8: lsls r0, 24 lsrs r4, r0, 24 _0805E802: - bl sub_80A4DF0 + bl IsContest lsls r0, 24 cmp r0, 0 beq _0805E814 @@ -2714,7 +2714,7 @@ _0805E860: b _0805E8E6 .pool _0805E898: - bl sub_80A4DF0 + bl IsContest lsls r0, 24 cmp r0, 0 bne _0805E8E6 |