diff options
Diffstat (limited to 'asm/recorded_battle.s')
| -rw-r--r-- | asm/recorded_battle.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/recorded_battle.s b/asm/recorded_battle.s index 5a4a811e6..53824dfea 100644 --- a/asm/recorded_battle.s +++ b/asm/recorded_battle.s @@ -883,7 +883,7 @@ _081854E2: ldr r2, =0x000004f6 adds r0, r7, r2 strh r1, [r0] - ldr r3, =gUnknown_02038BCE + ldr r3, =gPartnerTrainerId ldrh r1, [r3] movs r4, 0x9F lsls r4, 3 @@ -1196,7 +1196,7 @@ _081857B6: b _08185856 .pool _081857E4: - ldr r3, =gUnknown_02038BCE + ldr r3, =gPartnerTrainerId ldrh r3, [r3] adds r0, r1, r3 lsls r0, 16 @@ -1207,7 +1207,7 @@ _081857E4: ldr r4, =0x00000504 adds r3, r7, r4 mov r10, r9 - ldr r5, =gUnknown_02038BCE + ldr r5, =gPartnerTrainerId mov r12, r5 ldr r0, =0xfffffed4 mov r8, r0 @@ -1231,7 +1231,7 @@ _08185804: ble _08185804 mov r0, r9 ldr r1, [r0] - ldr r2, =gUnknown_02038BCE + ldr r2, =gPartnerTrainerId ldrh r0, [r2] ldr r3, =0xfffffed4 adds r0, r3 @@ -1246,7 +1246,7 @@ _08185804: strb r1, [r0] mov r0, r9 ldr r1, [r0] - ldr r4, =gUnknown_02038BCE + ldr r4, =gPartnerTrainerId ldrh r0, [r4] adds r0, r3 muls r0, r2 @@ -1374,7 +1374,7 @@ _08185936: b _081859AC .pool _0818597C: - ldr r3, =gUnknown_02038BCE + ldr r3, =gPartnerTrainerId ldrh r0, [r3] cmp r0, r1 bls _081859C0 @@ -1395,7 +1395,7 @@ _0818597C: adds r1, r7, r5 strb r0, [r1] ldr r2, [r4] - ldr r0, =gUnknown_02038BCE + ldr r0, =gPartnerTrainerId ldrh r1, [r0] adds r1, r3 _081859AC: @@ -1546,7 +1546,7 @@ sub_8185AB0: @ 8185AB0 strh r1, [r0] ldr r0, =gTrainerBattleOpponent_B strh r1, [r0] - ldr r0, =gUnknown_02038BCE + ldr r0, =gPartnerTrainerId strh r1, [r0] bl sub_8185EFC ldr r0, =gUnknown_0203C7B0 @@ -1725,7 +1725,7 @@ _08185C2A: adds r0, r7, r3 ldrh r0, [r0] strh r0, [r1] - ldr r1, =gUnknown_02038BCE + ldr r1, =gPartnerTrainerId adds r2, 0x4 adds r0, r7, r2 ldrh r0, [r0] @@ -1905,7 +1905,7 @@ sub_8185E24: @ 8185E24 ldr r0, =gUnknown_0203C7B0 str r5, [r0] movs r0, 0 - bl PlayNewMapMusic__default_for_battle + bl PlayMapChosenOrBattleBGM ldr r0, =sub_8185E8C bl SetMainCallback2 _08185E6E: |