diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
| commit | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch) | |
| tree | 459220542fcbfbd48b9725b48597b5740ee1ec0f /engine/battle/common_text.asm | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'engine/battle/common_text.asm')
| -rw-r--r-- | engine/battle/common_text.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 0ca9ce96..a0c44346 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -9,8 +9,8 @@ PrintBeginningBattleText: ; f4000 (3d:4000) jr c, .pokemonTower .notPokemonTower ld a,[wBattleType] - cp $4 ; new battle type? - jr nz,.notnewbattletype + cp BATTLE_TYPE_PIKACHU + jr nz,.notPikachuBattle callab IsPlayerPikachuAsleepInParty ld e,$24 jr c,.asm_f4026 @@ -18,7 +18,7 @@ PrintBeginningBattleText: ; f4000 (3d:4000) .asm_f4026 callab PlayPikachuSoundClip jr .continue -.notnewbattletype +.notPikachuBattle ld a, [wEnemyMonSpecies2] call PlayCry .continue |