diff options
Diffstat (limited to 'engine/battle/common_text.asm')
| -rw-r--r-- | engine/battle/common_text.asm | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 3d46c947..02bb1a61 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -1,5 +1,5 @@ PrintBeginningBattleText: - ld a, [wIsInBattle] + ld a, [wIsInBattle] ; W_ISINBATTLE dec a jr nz, .trainerBattle ld a, [wCurMap] @@ -8,8 +8,20 @@ PrintBeginningBattleText: cp LAVENDER_HOUSE_1 jr c, .pokemonTower .notPokemonTower + ld a,[wBattleType] + cp BATTLE_TYPE_PIKACHU + jr nz,.notPikachuBattle + callab IsPlayerPikachuAsleepInParty + ld e,$24 + jr c,.asm_f4026 + ld e,$a +.asm_f4026 + callab PlayPikachuSoundClip + jr .continue +.notPikachuBattle ld a, [wEnemyMonSpecies2] call PlayCry +.continue ld hl, WildMonAppearedText ld a, [wMoveMissed] and a @@ -23,9 +35,13 @@ PrintBeginningBattleText: call DelayFrames ld hl, TrainerWantsToFightText .wildBattle + ld a, [wBattleType] + and a + jr nz, .doNotDrawPokeballs push hl callab DrawAllPokeballs pop hl +.doNotDrawPokeballs call PrintText jr .done .pokemonTower @@ -64,7 +80,7 @@ PrintBeginningBattleText: ld [wFrequencyModifier], a ld a, $80 ld [wTempoModifier], a - ld a, SFX_SILPH_SCOPE + ld a, $e9 ; (SFX_08_77 - SFX_Headers_08) / 3 call PlaySound jp WaitForSoundToFinish .done |