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/CeladonMart3F.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/CeladonMart3F.asm')
| -rwxr-xr-x | scripts/CeladonMart3F.asm | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/scripts/CeladonMart3F.asm b/scripts/CeladonMart3F.asm index c8d8b509..c70f18d4 100755 --- a/scripts/CeladonMart3F.asm +++ b/scripts/CeladonMart3F.asm @@ -21,7 +21,7 @@ CeladonMart3F_TextPointers: dw CeladonMart3Text17 CeladonMart3Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM18 jr nz, .asm_a5463 ld hl, TM18PreReceiveText @@ -42,67 +42,67 @@ CeladonMart3Text1: jp TextScriptEnd TM18PreReceiveText: - TX_FAR _TM18PreReceiveText - db "@" + text_far _TM18PreReceiveText + text_end ReceivedTM18Text: - TX_FAR _ReceivedTM18Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM18Text + sound_get_item_1 + text_end TM18ExplanationText: - TX_FAR _TM18ExplanationText - db "@" + text_far _TM18ExplanationText + text_end TM18NoRoomText: - TX_FAR _TM18NoRoomText - db "@" + text_far _TM18NoRoomText + text_end CeladonMart3Text2: - TX_FAR _CeladonMart3Text2 - db "@" + text_far _CeladonMart3Text2 + text_end CeladonMart3Text3: - TX_FAR _CeladonMart3Text3 - db "@" + text_far _CeladonMart3Text3 + text_end CeladonMart3Text4: - TX_FAR _CeladonMart3Text4 - db "@" + text_far _CeladonMart3Text4 + text_end CeladonMart3Text5: - TX_FAR _CeladonMart3Text5 - db "@" + text_far _CeladonMart3Text5 + text_end CeladonMart3Text12: CeladonMart3Text10: CeladonMart3Text8: CeladonMart3Text6: - TX_FAR _CeladonMart3Text6 - db "@" + text_far _CeladonMart3Text6 + text_end CeladonMart3Text7: - TX_FAR _CeladonMart3Text7 - db "@" + text_far _CeladonMart3Text7 + text_end CeladonMart3Text9: - TX_FAR _CeladonMart3Text9 - db "@" + text_far _CeladonMart3Text9 + text_end CeladonMart3Text11: - TX_FAR _CeladonMart3Text11 - db "@" + text_far _CeladonMart3Text11 + text_end CeladonMart3Text13: - TX_FAR _CeladonMart3Text13 - db "@" + text_far _CeladonMart3Text13 + text_end CeladonMart3Text14: - TX_FAR _CeladonMart3Text14 - db "@" + text_far _CeladonMart3Text14 + text_end CeladonMart3Text17: CeladonMart3Text16: CeladonMart3Text15: - TX_FAR _CeladonMart3Text15 - db "@" + text_far _CeladonMart3Text15 + text_end |