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/SilphCo2F.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/SilphCo2F.asm')
| -rwxr-xr-x | scripts/SilphCo2F.asm | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/scripts/SilphCo2F.asm b/scripts/SilphCo2F.asm index 0ff7cee3..3cc27fab 100755 --- a/scripts/SilphCo2F.asm +++ b/scripts/SilphCo2F.asm @@ -137,7 +137,7 @@ SilphCo2TrainerHeader3: db $ff SilphCo2Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM36 jr nz, .asm_59de4 ld hl, SilphCo2Text_59ded @@ -156,90 +156,90 @@ SilphCo2Text1: jp TextScriptEnd SilphCo2Text_59ded: - TX_FAR _SilphCo2Text_59ded - db "@" + text_far _SilphCo2Text_59ded + text_end ReceivedTM36Text: - TX_FAR _ReceivedTM36Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM36Text + sound_get_item_1 + text_end TM36ExplanationText: - TX_FAR _TM36ExplanationText - db "@" + text_far _TM36ExplanationText + text_end TM36NoRoomText: - TX_FAR _TM36NoRoomText - db "@" + text_far _TM36NoRoomText + text_end SilphCo2Text2: - TX_ASM + text_asm ld hl, SilphCo2TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo2Text3: - TX_ASM + text_asm ld hl, SilphCo2TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo2Text4: - TX_ASM + text_asm ld hl, SilphCo2TrainerHeader2 call TalkToTrainer jp TextScriptEnd SilphCo2Text5: - TX_ASM + text_asm ld hl, SilphCo2TrainerHeader3 call TalkToTrainer jp TextScriptEnd SilphCo2BattleText1: - TX_FAR _SilphCo2BattleText1 - db "@" + text_far _SilphCo2BattleText1 + text_end SilphCo2EndBattleText1: - TX_FAR _SilphCo2EndBattleText1 - db "@" + text_far _SilphCo2EndBattleText1 + text_end SilphCo2AfterBattleText1: - TX_FAR _SilphCo2AfterBattleText1 - db "@" + text_far _SilphCo2AfterBattleText1 + text_end SilphCo2BattleText2: - TX_FAR _SilphCo2BattleText2 - db "@" + text_far _SilphCo2BattleText2 + text_end SilphCo2EndBattleText2: - TX_FAR _SilphCo2EndBattleText2 - db "@" + text_far _SilphCo2EndBattleText2 + text_end SilphCo2AfterBattleText2: - TX_FAR _SilphCo2AfterBattleText2 - db "@" + text_far _SilphCo2AfterBattleText2 + text_end SilphCo2BattleText3: - TX_FAR _SilphCo2BattleText3 - db "@" + text_far _SilphCo2BattleText3 + text_end SilphCo2EndBattleText3: - TX_FAR _SilphCo2EndBattleText3 - db "@" + text_far _SilphCo2EndBattleText3 + text_end SilphCo2AfterBattleText3: - TX_FAR _SilphCo2AfterBattleText3 - db "@" + text_far _SilphCo2AfterBattleText3 + text_end SilphCo2BattleText4: - TX_FAR _SilphCo2BattleText4 - db "@" + text_far _SilphCo2BattleText4 + text_end SilphCo2EndBattleText4: - TX_FAR _SilphCo2EndBattleText4 - db "@" + text_far _SilphCo2EndBattleText4 + text_end SilphCo2AfterBattleText4: - TX_FAR _SilphCo2AfterBattleText4 - db "@" + text_far _SilphCo2AfterBattleText4 + text_end |