diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-10 00:00:12 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-10 00:00:12 -0500 |
| commit | 66bc517605860c9f716a176ed467d34097985895 (patch) | |
| tree | 4c126cbb3bbdb2b0a236375c2140e7a6c25260a6 /home/init.asm | |
| parent | 8a6d46f3d9ba4fb6939eb9ea9949f47aa8608d4a (diff) | |
| parent | 2b018159997e3b580efd114ff4e3548a0de3cbc5 (diff) | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Diffstat (limited to 'home/init.asm')
| -rw-r--r-- | home/init.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/home/init.asm b/home/init.asm index 624a4d6a..cb5c6583 100644 --- a/home/init.asm +++ b/home/init.asm @@ -98,8 +98,8 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB ld a, BANK(SFX_Shooting_Star) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, $9c ld [H_AUTOBGTRANSFERDEST + 1], a xor a @@ -127,11 +127,11 @@ ClearVram: StopAllSounds:: ld a, BANK(Audio1_UpdateMusic) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a xor a - ld [wMusicHeaderPointer], a - ld [wc0ee], a - ld [wcfca], a + ld [wAudioFadeOutControl], a + ld [wNewSoundID], a + ld [wLastMusicSoundID], a dec a jp PlaySound |