diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/MrPsychicsHouse.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
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 |