diff options
Diffstat (limited to 'asm/battle_5.s')
| -rw-r--r-- | asm/battle_5.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_5.s b/asm/battle_5.s index 718ded432..064171dd8 100644 --- a/asm/battle_5.s +++ b/asm/battle_5.s @@ -96,7 +96,7 @@ _08056F3E: adds r1, r0 ldr r0, [r2] adds r0, r1 - bl create_enemy_party + bl CreateSecretBaseEnemyParty _08056FFA: pop {r4-r6} pop {r0} @@ -253,7 +253,7 @@ _0805714A: ldr r1, =gPlayerParty adds r0, r1 movs r1, 0x8 - bl happiness_algorithm + bl AdjustFriendship b _080571CE .pool _08057198: @@ -266,7 +266,7 @@ _08057198: ldr r1, =gPlayerParty adds r0, r1 movs r1, 0x6 - bl happiness_algorithm + bl AdjustFriendship b _080571CE .pool _080571B8: @@ -279,7 +279,7 @@ _080571B8: ldr r1, =gPlayerParty adds r0, r1 movs r1, 0x6 - bl happiness_algorithm + bl AdjustFriendship _080571CE: pop {r4,r5} pop {r0} @@ -555,7 +555,7 @@ _08057406: ldrb r1, [r4] movs r0, 0x58 muls r0, r1 - ldr r1, =gUnknown_020240D0 + ldr r1, =gBattleMons + 0x4C adds r0, r1 str r0, [sp] movs r0, 0 |