diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
| commit | d8bb1d15e7941d9689393f1215c82788a793af50 (patch) | |
| tree | 7006f3de7d3cf5a0fce6af66bd182d3d3f985854 /asm/title_screen.s | |
| parent | 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 (diff) | |
| parent | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (diff) | |
Merge branch 'master' into mac_build_and_libc
Diffstat (limited to 'asm/title_screen.s')
| -rw-r--r-- | asm/title_screen.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/title_screen.s b/asm/title_screen.s index bc9401fb6..b5286d049 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -1169,7 +1169,7 @@ _080AAE30: _080AAE72: ldrb r0, [r3, 0x8] bl title_screen_update_rayquaza_ring_palette - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM ldr r1, =0x0000ffff ldrh r0, [r0, 0x4] cmp r0, 0 |