diff options
Diffstat (limited to 'scripts/CeladonMart3F_2.asm')
| -rwxr-xr-x | scripts/CeladonMart3F_2.asm | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/scripts/CeladonMart3F_2.asm b/scripts/CeladonMart3F_2.asm index 8c99e0e0..239f84d1 100755 --- a/scripts/CeladonMart3F_2.asm +++ b/scripts/CeladonMart3F_2.asm @@ -1,38 +1,36 @@ -Func_f1e30 +Func_f1e30:: CheckEvent EVENT_GOT_TM18 - jr nz, .asm_f1e54 - ld hl, CeladonMart3Text_f1e5b + jr nz, .got_item + ld hl, TM18PreReceiveText call PrintText - lb bc, TM_18, 1 + lb bc, TM_COUNTER, 1 call GiveItem - jr nc, .asm_f1e4f + jr nc, .bag_full SetEvent EVENT_GOT_TM18 - ld hl, CeladonMart3Text_f1e60 - jr .asm_f1e57 - -.asm_f1e4f - ld hl, CeladonMart3Text_f1e6b - jr .asm_f1e57 - -.asm_f1e54 - ld hl, CeladonMart3Text_f1e66 -.asm_f1e57 + ld hl, ReceivedTM18Text + jr .done +.bag_full + ld hl, TM18NoRoomText + jr .done +.got_item + ld hl, TM18ExplanationText +.done call PrintText ret -CeladonMart3Text_f1e5b: - TX_FAR _TM18PreReceiveText - db "@" +TM18PreReceiveText: + text_far _TM18PreReceiveText + text_end -CeladonMart3Text_f1e60: - TX_FAR _ReceivedTM18Text - TX_SFX_ITEM_1 - db "@" +ReceivedTM18Text: + text_far _ReceivedTM18Text + sound_get_item_1 + text_end -CeladonMart3Text_f1e66: - TX_FAR _TM18ExplanationText - db "@" +TM18ExplanationText: + text_far _TM18ExplanationText + text_end -CeladonMart3Text_f1e6b: - TX_FAR _TM18NoRoomText - db "@" +TM18NoRoomText: + text_far _TM18NoRoomText + text_end |