diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-14 21:41:29 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-14 21:41:29 -0600 |
| commit | 11cb3275cc53c2bcea4fdcfe11d9d9d429ee9c02 (patch) | |
| tree | eeac196360a94773ce50b7c7c2f5204e89a8610d /asm/mauville_old_man.s | |
| parent | 404c415ef69f527adc3e795f4fd65f15c83402c4 (diff) | |
| parent | 59680b2a73bbe18566a2051102fd6424f7f13c8c (diff) | |
Merge remote-tracking branch 'Diego/master'
Diffstat (limited to 'asm/mauville_old_man.s')
| -rw-r--r-- | asm/mauville_old_man.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index 8c7037ca7..49a502d5c 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -965,7 +965,7 @@ _08120850: lsls r1, 1 adds r0, r1 strh r0, [r6, 0x6] - ldr r4, =gMPlay_SE2 + ldr r4, =gMPlayInfo_SE2 ldr r5, =0x0000ffff ldrh r2, [r6, 0x6] adds r0, r4, 0 @@ -1008,7 +1008,7 @@ _081208BC: subs r0, 0x40 _081208C0: strh r0, [r6, 0x8] - ldr r4, =gMPlay_SE2 + ldr r4, =gMPlayInfo_SE2 ldr r5, =0x0000ffff ldrh r2, [r6, 0x6] adds r0, r4, 0 @@ -1059,7 +1059,7 @@ _08120922: lsls r0, 24 cmp r0, 0 bne _08120938 - ldr r0, =gMPlay_SE2 + ldr r0, =gMPlayInfo_SE2 bl m4aMPlayStop movs r0, 0x4 _08120936: @@ -1228,7 +1228,7 @@ _08120A7E: bne _08120AB0 movs r0, 0x6 bl FadeInBGM - ldr r0, =gMPlay_SE2 + ldr r0, =gMPlayInfo_SE2 movs r1, 0x2 bl m4aMPlayFadeOutTemporarily bl EnableBothScriptContexts |