diff options
Diffstat (limited to 'scripts/PokemonTower2F.asm')
| -rw-r--r-- | scripts/PokemonTower2F.asm | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm index be3b5b89..b9a46f85 100644 --- a/scripts/PokemonTower2F.asm +++ b/scripts/PokemonTower2F.asm @@ -26,9 +26,7 @@ ENDC ld hl, CoordsData_6055e 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 @@ -75,14 +73,13 @@ PokemonTower2Script1: ld de, MovementData_605b2 CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT jr nz, .asm_60589 + callfar Func_f1e22 ld de, MovementData_605a9 .asm_60589 ld a, $1 ldh [hSpriteIndex], a call MoveSprite - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound + call StopAllMusic farcall Music_RivalAlternateStart ld a, $2 ld [wPokemonTower2FCurScript], a @@ -148,21 +145,8 @@ PokemonTower2Text1: call SaveEndBattleTextPointers 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, $4 - jr .done -.NotSquirtle - cp STARTER3 - jr nz, .Charmander - ld a, $5 - jr .done -.Charmander - ld a, $6 -.done + add $1 ld [wTrainerNo], a ld a, $1 |