diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
| commit | ce3ec76762d9e2f0c560e2ea7868678418883143 (patch) | |
| tree | 13bd307196f870d59157ab803c858c205eba6921 /engine/battle/common_text.asm | |
| parent | Remove more address comments (diff) | |
| parent | Merge pull request #16 from YamaArashi/master (diff) | |
| download | pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.tar.gz pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.tar.xz pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.zip | |
Merge branch 'master' of https://github.com/pret/pokeyellow into merge-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 |