diff options
| -rwxr-xr-x | engine/evolution.asm | 10 | ||||
| -rwxr-xr-x | main.asm | 6 | ||||
| -rwxr-xr-x | scripts/rockethideout2.asm | 2 |
3 files changed, 8 insertions, 10 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 @@ -779,8 +779,10 @@ INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17",ROMX,BANK[$17] dr $5c000,$5da70 -EvolveMon: ; 5da70 (17:5a70) - dr $5da70,$5df60 + +INCLUDE "engine/evolution.asm" + + dr $5db93,$5df60 SECTION "bank18",ROMX,BANK[$18] diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index 0b45967f..621e19e6 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -313,7 +313,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) ld [W_CURMAPSCRIPT], a ret -LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) +LoadSpinnerArrowTiles: ; 45077 (11:5077) ld a, [wSpriteStateData1 + 2] srl a srl a |