diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-10-14 11:53:12 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-10-14 11:53:12 -0700 |
| commit | 80329c54897a545b9b8b3e82b686b09f295bb67a (patch) | |
| tree | 322ca10c3e768cabfba250f1c7879b246a0781b6 /home | |
| parent | 94d4c89e093b76a0964114bd7a370046e70e965e (diff) | |
| parent | cf966bb824ce0ffe384291cd51aa96a2dd86e839 (diff) | |
Merge pull request #210 from yenatch/master
contest mons, fixed dumb labels, fixed more lz dumps, game freak logo, roofs
Diffstat (limited to 'home')
| -rw-r--r-- | home/init.asm | 4 | ||||
| -rw-r--r-- | home/joypad.asm | 2 | ||||
| -rw-r--r-- | home/map.asm | 4 | ||||
| -rw-r--r-- | home/menu.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 2 | ||||
| -rw-r--r-- | home/vblank.asm | 28 |
6 files changed, 20 insertions, 22 deletions
diff --git a/home/init.asm b/home/init.asm index ead75975c..46ff1de4b 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,6 +1,6 @@ Reset: ; 150 di - call CleanSoundRestart + call SoundRestart xor a ld [$ffde], a call ClearPalettes @@ -170,7 +170,7 @@ Init: ; 17d ld a, $30 call Predef - call CleanSoundRestart + call SoundRestart xor a ld [CurMusic], a jp GameInit diff --git a/home/joypad.asm b/home/joypad.asm index 198e1c47b..efe70e809 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -394,7 +394,7 @@ Functionaaf: ; aaf call Functionac6 push de ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX pop de ret diff --git a/home/map.asm b/home/map.asm index d4cfe1be9..f78340849 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1418,9 +1418,7 @@ Function2821: ; 2821 jr .asm_2875 .asm_286f - ld a, $7 - ld hl, $4000 - rst FarCall + callba LoadMapGroupRoof .asm_2875 xor a diff --git a/home/menu.asm b/home/menu.asm index c761a927c..b3a3de377 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -532,7 +532,7 @@ Function1ff8: ; 1ff8 PlayClickSFX: ; 2009 push de ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX pop de ret ; 0x2012 diff --git a/home/text.asm b/home/text.asm index e010de6d4..d5123b849 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1091,7 +1091,7 @@ Text_PlaySound:: ; 1500 ld e, [hl] inc hl ld d, [hl] - call StartSFX + call PlaySFX call WaitSFX pop de diff --git a/home/vblank.asm b/home/vblank.asm index 71114964e..f9e68785d 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -167,9 +167,9 @@ VBlank0: ; 2b1 call Joypad ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ld a, [$ff8a] rst Bankswitch ; restore bank @@ -189,9 +189,9 @@ VBlank2: ; 325 ld [$ff8a], a ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] @@ -265,9 +265,9 @@ VBlank1: ; 337 ei ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -369,9 +369,9 @@ VBlank3: ; 396 ei ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -434,9 +434,9 @@ VBlank4: ; 3df call AskSerial ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -486,9 +486,9 @@ VBlank5: ; 400 ei ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -531,9 +531,9 @@ VBlank6: ; 436 ld [VBlankOccurred], a ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch |