diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-12 11:55:37 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-12 11:55:37 +0800 |
| commit | ff795fa8347f111163ef033a4ae132a3a3caf1eb (patch) | |
| tree | aa6ff23d6868485cd744da353610f7bae7c3ffb7 /asm | |
| parent | c46e6fa3d923641c875c68027947896f78b68c1c (diff) | |
| parent | ce18093251f35ad6369d9d42d84e8fe60d398891 (diff) | |
Merge branch 'master' into battle
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 |