Merge branch 'master' into battle

2019-10-12 11:55:37 +08:00
parent c46e6fa3d9 ce18093251
commit ff795fa834
357 changed files with 28905 additions and 1399 deletions
@@ -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