diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-05 19:58:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-05 19:58:21 -0400 |
commit | c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch) | |
tree | 531d6b30d5a606ae963024825ed6e614843000a6 /scripts/SilphCo3F.asm | |
parent | 2718c36065e7eb201a149938bcdd51987c4e56b6 (diff) | |
parent | 5fe8aab3445cb76d8e1c4be954c0392f40798950 (diff) |
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'scripts/SilphCo3F.asm')
-rwxr-xr-x | scripts/SilphCo3F.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/scripts/SilphCo3F.asm b/scripts/SilphCo3F.asm index 3b6b1da8..ddd40048 100755 --- a/scripts/SilphCo3F.asm +++ b/scripts/SilphCo3F.asm @@ -82,7 +82,7 @@ SilphCo3TrainerHeader1: db $ff SilphCo3Text1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SilphCo3Text_59ffe jr nz, .asm_59fee @@ -92,45 +92,45 @@ SilphCo3Text1: jp TextScriptEnd SilphCo3Text_59ff9: - TX_FAR _SilphCo3Text_59ff9 - db "@" + text_far _SilphCo3Text_59ff9 + text_end SilphCo3Text_59ffe: - TX_FAR _SilphCo3Text_59ffe - db "@" + text_far _SilphCo3Text_59ffe + text_end SilphCo3Text2: - TX_ASM + text_asm ld hl, SilphCo3TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo3BattleText1: - TX_FAR _SilphCo3BattleText1 - db "@" + text_far _SilphCo3BattleText1 + text_end SilphCo3EndBattleText1: - TX_FAR _SilphCo3EndBattleText1 - db "@" + text_far _SilphCo3EndBattleText1 + text_end SilphCo3AfterBattleText1: - TX_FAR _SilphCo3AfterBattleText1 - db "@" + text_far _SilphCo3AfterBattleText1 + text_end SilphCo3Text3: - TX_ASM + text_asm ld hl, SilphCo3TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo3BattleText2: - TX_FAR _SilphCo3BattleText2 - db "@" + text_far _SilphCo3BattleText2 + text_end SilphCo3EndBattleText2: - TX_FAR _SilphCo3EndBattleText2 - db "@" + text_far _SilphCo3EndBattleText2 + text_end SilphCo3AfterBattleText2: - TX_FAR _SilphCo3AfterBattleText2 - db "@" + text_far _SilphCo3AfterBattleText2 + text_end |