diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/MrPsychicsHouse.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'scripts/MrPsychicsHouse.asm')
| -rw-r--r-- | scripts/MrPsychicsHouse.asm | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/scripts/MrPsychicsHouse.asm b/scripts/MrPsychicsHouse.asm index 399edfbd..f5cb4b0d 100644 --- a/scripts/MrPsychicsHouse.asm +++ b/scripts/MrPsychicsHouse.asm @@ -2,44 +2,45 @@ MrPsychicsHouse_Script: jp EnableAutoTextBoxDrawing MrPsychicsHouse_TextPointers: - dw SaffronHouse2Text1 + def_text_pointers + dw_const MrPsychicsHouseMrPsychicText, TEXT_MRPSYCHICSHOUSE_MR_PSYCHIC -SaffronHouse2Text1: +MrPsychicsHouseMrPsychicText: text_asm CheckEvent EVENT_GOT_TM29 jr nz, .got_item - ld hl, TM29PreReceiveText + ld hl, .YouWantedThisText call PrintText lb bc, TM_PSYCHIC_M, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedTM29Text + ld hl, .ReceivedTM29Text call PrintText SetEvent EVENT_GOT_TM29 jr .done .bag_full - ld hl, TM29NoRoomText + ld hl, .TM29NoRoomText call PrintText jr .done .got_item - ld hl, TM29ExplanationText + ld hl, .TM29ExplanationText call PrintText .done jp TextScriptEnd -TM29PreReceiveText: - text_far _TM29PreReceiveText +.YouWantedThisText: + text_far _MrPsychicsHouseMrPsychicYouWantedThisText text_end -ReceivedTM29Text: - text_far _ReceivedTM29Text +.ReceivedTM29Text: + text_far _MrPsychicsHouseMrPsychicReceivedTM29Text sound_get_item_1 text_end -TM29ExplanationText: - text_far _TM29ExplanationText +.TM29ExplanationText: + text_far _MrPsychicsHouseMrPsychicTM29ExplanationText text_end -TM29NoRoomText: - text_far _TM29NoRoomText +.TM29NoRoomText: + text_far _MrPsychicsHouseMrPsychicTM29NoRoomText text_end |