aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SeafoamIslandsB4F.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-05 19:58:21 -0400
committerGitHub <noreply@github.com>2020-07-05 19:58:21 -0400
commitc57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch)
tree531d6b30d5a606ae963024825ed6e614843000a6 /scripts/SeafoamIslandsB4F.asm
parentMerge pull request #257 from Rangi42/master (diff)
parentdb $f6 == script_cable_club_receptionist (diff)
downloadpokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.gz
pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.xz
pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.zip
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'scripts/SeafoamIslandsB4F.asm')
-rwxr-xr-xscripts/SeafoamIslandsB4F.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm
index d08628d0..9bc6b21e 100755
--- a/scripts/SeafoamIslandsB4F.asm
+++ b/scripts/SeafoamIslandsB4F.asm
@@ -149,7 +149,7 @@ ArticunoTrainerHeader:
db $ff
ArticunoText:
- TX_ASM
+ text_asm
ld hl, ArticunoTrainerHeader
call TalkToTrainer
ld a, $4
@@ -157,17 +157,17 @@ ArticunoText:
jp TextScriptEnd
ArticunoBattleText:
- TX_FAR _ArticunoBattleText
- TX_ASM
+ text_far _ArticunoBattleText
+ text_asm
ld a, ARTICUNO
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
SeafoamIslands5Text4:
- TX_FAR _SeafoamIslands5Text4
- db "@"
+ text_far _SeafoamIslands5Text4
+ text_end
SeafoamIslands5Text5:
- TX_FAR _SeafoamIslands5Text5
- db "@"
+ text_far _SeafoamIslands5Text5
+ text_end