summaryrefslogtreecommitdiff
path: root/scripts/MrPsychicsHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/MrPsychicsHouse.asm')
-rwxr-xr-xscripts/MrPsychicsHouse.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/scripts/MrPsychicsHouse.asm b/scripts/MrPsychicsHouse.asm
index 7d4f54c0..399edfbd 100755
--- a/scripts/MrPsychicsHouse.asm
+++ b/scripts/MrPsychicsHouse.asm
@@ -5,41 +5,41 @@ MrPsychicsHouse_TextPointers:
dw SaffronHouse2Text1
SaffronHouse2Text1:
- TX_ASM
+ text_asm
CheckEvent EVENT_GOT_TM29
- jr nz, .asm_9e72b
+ jr nz, .got_item
ld hl, TM29PreReceiveText
call PrintText
- lb bc, TM_29, 1
+ lb bc, TM_PSYCHIC_M, 1
call GiveItem
- jr nc, .BagFull
+ jr nc, .bag_full
ld hl, ReceivedTM29Text
call PrintText
SetEvent EVENT_GOT_TM29
- jr .asm_fe4e1
-.BagFull
+ jr .done
+.bag_full
ld hl, TM29NoRoomText
call PrintText
- jr .asm_fe4e1
-.asm_9e72b
+ jr .done
+.got_item
ld hl, TM29ExplanationText
call PrintText
-.asm_fe4e1
+.done
jp TextScriptEnd
TM29PreReceiveText:
- TX_FAR _TM29PreReceiveText
- db "@"
+ text_far _TM29PreReceiveText
+ text_end
ReceivedTM29Text:
- TX_FAR _ReceivedTM29Text
- TX_SFX_ITEM_1
- db "@"
+ text_far _ReceivedTM29Text
+ sound_get_item_1
+ text_end
TM29ExplanationText:
- TX_FAR _TM29ExplanationText
- db "@"
+ text_far _TM29ExplanationText
+ text_end
TM29NoRoomText:
- TX_FAR _TM29NoRoomText
- db "@"
+ text_far _TM29NoRoomText
+ text_end