diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
| commit | 8cdf73265f95e9a55112f373804867244512878d (patch) | |
| tree | 64f4263b86839e1eb9770688ad890683fa89c503 /scripts/ssanne2.asm | |
| parent | 5c86071351aefd9ac0d15eeb7894da4160cfc761 (diff) | |
| parent | 12b2aba4c3e112628a904e7336d8b2413c56da74 (diff) | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'scripts/ssanne2.asm')
| -rwxr-xr-x | scripts/ssanne2.asm | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 7bdafe2c..3a2e207a 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -24,9 +24,7 @@ SSAnne2Script0: ; 613be (18:53be) ld hl, CoordsData_61411 call ArePlayerCoordsInArray ret nc - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -99,23 +97,8 @@ SSAnne2Script1: ; 61430 (18:5430) call Delay3 ld a, OPP_SONY2 ld [wCurOpponent], a - - ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] - 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 SSAnne2Script_61416 ld a, $2 ld [W_SSANNE2CURSCRIPT], a @@ -145,9 +128,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld a, $2 ld [H_SPRITEINDEX], a call MoveSprite - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic callba Music_RivalAlternateStart ld a, $3 ld [W_SSANNE2CURSCRIPT], a |