summaryrefslogtreecommitdiff
path: root/scripts/SilphCo10F.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/SilphCo10F.asm
parent2718c36065e7eb201a149938bcdd51987c4e56b6 (diff)
parent5fe8aab3445cb76d8e1c4be954c0392f40798950 (diff)
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'scripts/SilphCo10F.asm')
-rwxr-xr-xscripts/SilphCo10F.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/scripts/SilphCo10F.asm b/scripts/SilphCo10F.asm
index 92d95de1..140584f1 100755
--- a/scripts/SilphCo10F.asm
+++ b/scripts/SilphCo10F.asm
@@ -68,19 +68,19 @@ SilphCo10TrainerHeader1:
db $ff
SilphCo10Text1:
- TX_ASM
+ text_asm
ld hl, SilphCo10TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphCo10Text2:
- TX_ASM
+ text_asm
ld hl, SilphCo10TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphCo10Text3:
- TX_ASM
+ text_asm
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ld hl, SilphCo10Text_5a1d8
jr nz, .asm_cf85f
@@ -90,33 +90,33 @@ SilphCo10Text3:
jp TextScriptEnd
SilphCo10Text_5a1d3:
- TX_FAR _SilphCo10Text_5a1d3
- db "@"
+ text_far _SilphCo10Text_5a1d3
+ text_end
SilphCo10Text_5a1d8:
- TX_FAR _SilphCo10Text_5a1d8
- db "@"
+ text_far _SilphCo10Text_5a1d8
+ text_end
SilphCo10BattleText1:
- TX_FAR _SilphCo10BattleText1
- db "@"
+ text_far _SilphCo10BattleText1
+ text_end
SilphCo10EndBattleText1:
- TX_FAR _SilphCo10EndBattleText1
- db "@"
+ text_far _SilphCo10EndBattleText1
+ text_end
SilphCo10AfterBattleText1:
- TX_FAR _SilphCo10AfterBattleText1
- db "@"
+ text_far _SilphCo10AfterBattleText1
+ text_end
SilphCo10BattleText2:
- TX_FAR _SilphCo10BattleText2
- db "@"
+ text_far _SilphCo10BattleText2
+ text_end
SilphCo10EndBattleText2:
- TX_FAR _SilphCo10EndBattleText2
- db "@"
+ text_far _SilphCo10EndBattleText2
+ text_end
SilphCo10AfterBattleText2:
- TX_FAR _SilphCo10AfterBattleText2
- db "@"
+ text_far _SilphCo10AfterBattleText2
+ text_end