diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /asm/pokedex_cry_screen.s | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/pokedex_cry_screen.s')
| -rw-r--r-- | asm/pokedex_cry_screen.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index f6d5ec271..846b20881 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -239,7 +239,7 @@ sub_8145534: @ 8145534 lsls r0, 16 lsrs r4, r0, 16 adds r5, r4, 0 - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM ldr r0, [r0, 0x4] cmp r0, 0 bge _08145582 @@ -675,9 +675,9 @@ _08145884: b _081458F8 .pool _081458B0: - ldr r0, =gUnknown_085B8C80 + ldr r0, =gCryMeterNeedleSpriteSheets bl LoadSpriteSheets - ldr r0, =gUnknown_085B8C90 + ldr r0, =gCryMeterNeedleSpritePalettes bl LoadSpritePalettes ldr r0, =gUnknown_085B8C68 ldrb r1, [r4, 0x4] |