diff options
Diffstat (limited to 'scripts/SSAnne2F.asm')
| -rw-r--r-- | scripts/SSAnne2F.asm | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index 32ea70d1..23594d48 100644 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -25,9 +25,7 @@ SSAnne2FDefaultScript: ld hl, .PlayerCoordinatesArray call ArePlayerCoordsInArray ret nc - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -99,23 +97,8 @@ SSAnne2FRivalStartBattleScript: call Delay3 ld a, OPP_RIVAL2 ld [wCurOpponent], a - - ; select which team to use during the encounter - ld a, [wRivalStarter] - cp STARTER2 - jr nz, .NotSquirtle ld a, $1 - jr .done -.NotSquirtle - cp STARTER3 - jr nz, .Charmander - ld a, $2 - jr .done -.Charmander - ld a, $3 -.done ld [wTrainerNo], a - call SSAnne2FSetFacingDirectionScript ld a, SCRIPT_SSANNE2F_RIVAL_AFTER_BATTLE ld [wSSAnne2FCurScript], a @@ -145,9 +128,7 @@ SSAnne2FRivalAfterBattleScript: ld a, SSANNE2F_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound + call StopAllMusic farcall Music_RivalAlternateStart ld a, SCRIPT_SSANNE2F_RIVAL_EXIT ld [wSSAnne2FCurScript], a |