diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-13 00:44:06 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-13 00:44:06 -0500 |
| commit | 9c5473e965520f672640daf4ee76622640e0de15 (patch) | |
| tree | 33d513a05a026cb6c094eb7ee73ad52ee36d0888 /home/init.asm | |
| parent | 1c1fe276ca59726bb0008c60006c6b48cd093573 (diff) | |
| parent | 40802da3cf27a453f62c8c4b712e876b06a9d834 (diff) | |
Merge pull request #326 from PikalaxALT/master
Reopen #325
Diffstat (limited to 'home/init.asm')
| -rw-r--r-- | home/init.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/init.asm b/home/init.asm index 8325f6294..753138748 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,8 +1,8 @@ Reset:: ; 150 di - call SoundRestart + call MapSetup_Sound_Off xor a - ld [$ffde], a + ld [hMapAnims], a call ClearPalettes xor a ld [rIF], a @@ -109,7 +109,7 @@ Init:: ; 17d call LoadPushOAM xor a - ld [$ffde], a + ld [hMapAnims], a ld [hSCX], a ld [hSCY], a ld [rJOYP], a @@ -137,7 +137,7 @@ Init:: ; 17d ld [rLCDC], a ld a, -1 - ld [$ffcb], a + ld [hLinkPlayerNumber], a callba Function9890 @@ -168,7 +168,7 @@ Init:: ; 17d predef Function9853 - call SoundRestart + call MapSetup_Sound_Off xor a ld [wMapMusic], a jp GameInit |