diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:49 -0700 |
| commit | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (patch) | |
| tree | 2ffb3b9c8eca5fc4e2be2fc8aaf4965f64a13296 /engine/battle/common_text.asm | |
| parent | Merge pull request #13 from YamaArashi/master (diff) | |
| parent | more syncing with pokered (diff) | |
| download | pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.gz pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.xz pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.zip | |
Merge pull request #16 from YamaArashi/master
sync engine code with pokered
Diffstat (limited to 'engine/battle/common_text.asm')
| -rw-r--r-- | engine/battle/common_text.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 02bb1a61..d84d0300 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -1,5 +1,5 @@ PrintBeginningBattleText: - ld a, [wIsInBattle] ; W_ISINBATTLE + ld a, [wIsInBattle] dec a jr nz, .trainerBattle ld a, [wCurMap] @@ -80,7 +80,7 @@ PrintBeginningBattleText: ld [wFrequencyModifier], a ld a, $80 ld [wTempoModifier], a - ld a, $e9 ; (SFX_08_77 - SFX_Headers_08) / 3 + ld a, SFX_SILPH_SCOPE call PlaySound jp WaitForSoundToFinish .done |