diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-04 17:09:35 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-04 21:14:46 -0400 |
| commit | 139a28ff9906d728a6820fe678a2a616eb309421 (patch) | |
| tree | 9a4339b97e16e10c5b007e836f1f3fadd33bd9f4 /scripts/MrFujisHouse.asm | |
| parent | Merge pull request #257 from Rangi42/master (diff) | |
| download | pokeyellow-139a28ff9906d728a6820fe678a2a616eb309421.tar.gz pokeyellow-139a28ff9906d728a6820fe678a2a616eb309421.tar.xz pokeyellow-139a28ff9906d728a6820fe678a2a616eb309421.zip | |
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'scripts/MrFujisHouse.asm')
| -rwxr-xr-x | scripts/MrFujisHouse.asm | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/scripts/MrFujisHouse.asm b/scripts/MrFujisHouse.asm index 98190cd8..88f36e4f 100755 --- a/scripts/MrFujisHouse.asm +++ b/scripts/MrFujisHouse.asm @@ -11,7 +11,7 @@ MrFujisHouse_TextPointers: dw LavenderHouse1Text6 LavenderHouse1Text1: - TX_ASM + text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .asm_72e5d ld hl, LavenderHouse1Text_1d8d1 @@ -24,15 +24,15 @@ LavenderHouse1Text1: jp TextScriptEnd LavenderHouse1Text_1d8d1: - TX_FAR _LavenderHouse1Text_1d8d1 - db "@" + text_far _LavenderHouse1Text_1d8d1 + text_end LavenderHouse1Text_1d8d6: - TX_FAR _LavenderHouse1Text_1d8d6 - db "@" + text_far _LavenderHouse1Text_1d8d6 + text_end LavenderHouse1Text2: - TX_ASM + text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .asm_06470 ld hl, LavenderHouse1Text_1d8f4 @@ -45,29 +45,29 @@ LavenderHouse1Text2: jp TextScriptEnd LavenderHouse1Text_1d8f4: - TX_FAR _LavenderHouse1Text_1d8f4 - db "@" + text_far _LavenderHouse1Text_1d8f4 + text_end LavenderHouse1Text_1d8f9: - TX_FAR _LavenderHouse1Text_1d8f9 - db "@" + text_far _LavenderHouse1Text_1d8f9 + text_end LavenderHouse1Text3: - TX_FAR _LavenderHouse1Text3 - TX_ASM + text_far _LavenderHouse1Text3 + text_asm ld a, PSYDUCK call PlayCry jp TextScriptEnd LavenderHouse1Text4: - TX_FAR _LavenderHouse1Text4 - TX_ASM + text_far _LavenderHouse1Text4 + text_asm ld a, NIDORINO call PlayCry jp TextScriptEnd LavenderHouse1Text5: - TX_ASM + text_asm CheckEvent EVENT_GOT_POKE_FLUTE jr nz, .asm_15ac2 ld hl, LavenderHouse1Text_1d94c @@ -90,23 +90,23 @@ LavenderHouse1Text5: jp TextScriptEnd LavenderHouse1Text_1d94c: - TX_FAR _LavenderHouse1Text_1d94c - db "@" + text_far _LavenderHouse1Text_1d94c + text_end ReceivedFluteText: - TX_FAR _ReceivedFluteText - TX_SFX_KEY_ITEM - TX_FAR _FluteExplanationText - db "@" + text_far _ReceivedFluteText + sound_get_key_item + text_far _FluteExplanationText + text_end FluteNoRoomText: - TX_FAR _FluteNoRoomText - db "@" + text_far _FluteNoRoomText + text_end MrFujiAfterFluteText: - TX_FAR _MrFujiAfterFluteText - db "@" + text_far _MrFujiAfterFluteText + text_end LavenderHouse1Text6: - TX_FAR _LavenderHouse1Text6 - db "@" + text_far _LavenderHouse1Text6 + text_end |