aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/PokemonTower5F.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/PokemonTower5F.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/PokemonTower5F.asm')
-rwxr-xr-xscripts/PokemonTower5F.asm64
1 files changed, 32 insertions, 32 deletions
diff --git a/scripts/PokemonTower5F.asm b/scripts/PokemonTower5F.asm
index 299261e9..de09ec49 100755
--- a/scripts/PokemonTower5F.asm
+++ b/scripts/PokemonTower5F.asm
@@ -96,81 +96,81 @@ PokemonTower5TrainerHeader3:
db $ff
PokemonTower5Text1:
- TX_FAR _PokemonTower5Text1
- db "@"
+ text_far _PokemonTower5Text1
+ text_end
PokemonTower5Text2:
- TX_ASM
+ text_asm
ld hl, PokemonTower5TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
PokemonTower5BattleText1:
- TX_FAR _PokemonTower5BattleText1
- db "@"
+ text_far _PokemonTower5BattleText1
+ text_end
PokemonTower5EndBattleText1:
- TX_FAR _PokemonTower5EndBattleText1
- db "@"
+ text_far _PokemonTower5EndBattleText1
+ text_end
PokemonTower5AfterBattleText1:
- TX_FAR _PokemonTower5AfterBattleText1
- db "@"
+ text_far _PokemonTower5AfterBattleText1
+ text_end
PokemonTower5Text3:
- TX_ASM
+ text_asm
ld hl, PokemonTower5TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
PokemonTower5BattleText2:
- TX_FAR _PokemonTower5BattleText2
- db "@"
+ text_far _PokemonTower5BattleText2
+ text_end
PokemonTower5EndBattleText2:
- TX_FAR _PokemonTower5EndBattleText2
- db "@"
+ text_far _PokemonTower5EndBattleText2
+ text_end
PokemonTower5AfterBattleText2:
- TX_FAR _PokemonTower5AfterBattleText2
- db "@"
+ text_far _PokemonTower5AfterBattleText2
+ text_end
PokemonTower5Text4:
- TX_ASM
+ text_asm
ld hl, PokemonTower5TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
PokemonTower5BattleText3:
- TX_FAR _PokemonTower5BattleText3
- db "@"
+ text_far _PokemonTower5BattleText3
+ text_end
PokemonTower5EndBattleText3:
- TX_FAR _PokemonTower5EndBattleText3
- db "@"
+ text_far _PokemonTower5EndBattleText3
+ text_end
PokemonTower5AfterBattleText3:
- TX_FAR _PokemonTower5AfterBattleText3
- db "@"
+ text_far _PokemonTower5AfterBattleText3
+ text_end
PokemonTower5Text5:
- TX_ASM
+ text_asm
ld hl, PokemonTower5TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
PokemonTower5BattleText4:
- TX_FAR _PokemonTower5BattleText4
- db "@"
+ text_far _PokemonTower5BattleText4
+ text_end
PokemonTower5EndBattleText4:
- TX_FAR _PokemonTower5EndBattleText4
- db "@"
+ text_far _PokemonTower5EndBattleText4
+ text_end
PokemonTower5AfterBattleText4:
- TX_FAR _PokemonTower5AfterBattleText4
- db "@"
+ text_far _PokemonTower5AfterBattleText4
+ text_end
PokemonTower5Text7:
- TX_FAR _PokemonTower5Text7
- db "@"
+ text_far _PokemonTower5Text7
+ text_end