diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-11 10:47:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 10:47:30 -0400 |
| commit | f2a4a0b4b345ebd25169c9fa8164f44b6a88c457 (patch) | |
| tree | 8e1456bb87622715d99d4dd74a41c02c1e347452 /asm | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
| parent | 06bc713f9a6238c132a8504f44b2ff1a3e7c9724 (diff) | |
Merge pull request #114 from PikalaxALT/song_names
Rename song pointers
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/overworld.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 81651a0ad..c3ff5e3c8 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -2411,7 +2411,7 @@ _08055DDC: bgt _08055E24 ldr r0, _08055E1C @ =gMPlayInfo_BGM ldr r1, [r0] - ldr r0, _08055E20 @ =gSong_86E6B0C + ldr r0, _08055E20 @ =mus_win_gym cmp r1, r0 bne _08055E24 movs r0, 0x4 @@ -2421,7 +2421,7 @@ _08055DDC: _08055E14: .4byte gSaveBlock1Ptr _08055E18: .4byte 0x00004f01 _08055E1C: .4byte gMPlayInfo_BGM -_08055E20: .4byte gSong_86E6B0C +_08055E20: .4byte mus_win_gym _08055E24: bl sub_8055D8C lsls r0, 16 |