summaryrefslogtreecommitdiff
path: root/engine/battle/common_text.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-11 21:30:31 -0700
committerYamaArashi <shadow962@live.com>2016-06-11 21:33:57 -0700
commit4c5c98cb2a1bc747a0eb397cb75e48dc8a098494 (patch)
tree2872a6436075c0d6132671e98af44f0a1429e498 /engine/battle/common_text.asm
parent54143d33fc1211fb0c949ba62633d1c8d94f2717 (diff)
sync engine code with pokered
Diffstat (limited to 'engine/battle/common_text.asm')
-rw-r--r--engine/battle/common_text.asm4
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