diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-05-30 18:20:41 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-05-30 18:20:41 -0400 |
| commit | 3330662296eabb6b3b7f0eed1c79003c8873c712 (patch) | |
| tree | dae9a2f40425a236a3ef6ecce453cf16b4359c26 /engine/evolution.asm | |
| parent | 5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (diff) | |
| parent | d00b70b33ee909ad163f2cb1c639ce799db118d0 (diff) | |
Merge pull request #9 from PikalaxALT/master
Disassemble banks 3A, 3F, and all outdoor maps
Diffstat (limited to 'engine/evolution.asm')
| -rwxr-xr-x | engine/evolution.asm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engine/evolution.asm b/engine/evolution.asm index c65cc293..780d78e7 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -1,4 +1,4 @@ -EvolveMon: ; 7bde9 (1e:7de9) +EvolveMon: ; 5da70 (17:5a70) push hl push de push bc @@ -9,9 +9,7 @@ EvolveMon: ; 7bde9 (1e:7de9) xor a ld [wLowHealthAlarm], a ld [wChannelSoundIDs + CH4], a - dec a - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ld a, SFX_TINK @@ -67,9 +65,7 @@ EvolveMon: ; 7bde9 (1e:7de9) ld a, [wEvoNewSpecies] .done ld [wWholeScreenPaletteMonSpecies], a - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld a, [wWholeScreenPaletteMonSpecies] call PlayCry ld c, 0 |