diff options
Diffstat (limited to 'scripts/CeruleanCity.asm')
| -rwxr-xr-x | scripts/CeruleanCity.asm | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index 7505cb20..5a8ce978 100755 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -35,10 +35,6 @@ CeruleanCityScript4: ret CeruleanCityScript0: -IF DEF(_DEBUG) - call DebugPressedOrHeldB - ret nz -ENDC CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF jr nz, .asm_194f7 ld hl, CeruleanCityCoords1 @@ -68,9 +64,7 @@ ENDC ld a, [wWalkBikeSurfState] and a jr z, .asm_19512 - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound + call StopAllMusic .asm_19512 ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -140,23 +134,8 @@ CeruleanCityScript1: call SaveEndBattleTextPointers ld a, OPP_RIVAL1 ld [wCurOpponent], a - - ; select which team to use during the encounter - ld a, [wRivalStarter] - cp STARTER2 - jr nz, .NotSquirtle - ld a, $7 - jr .done -.NotSquirtle - cp STARTER3 - jr nz, .Charmander - ld a, $8 - jr .done -.Charmander - ld a, $9 -.done + ld a, 3 ld [wTrainerNo], a - xor a ldh [hJoyHeld], a call CeruleanCityScript_1955d @@ -175,9 +154,7 @@ CeruleanCityScript2: ld a, $1 ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound + call StopAllMusic farcall Music_RivalAlternateStart ld a, $1 ldh [hSpriteIndex], a |