aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CeladonMart3F_2.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2023-11-20 00:33:27 -0600
committerdannye <33dannye@gmail.com>2023-11-20 20:23:27 -0600
commit298e99d3776580585c3f434e5d93137ae431bdd3 (patch)
treea808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/CeladonMart3F_2.asm
parentAdd sound bits documentation for wOptions (#110) (diff)
parentName 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff)
downloadpokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz
pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz
pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/CeladonMart3F_2.asm')
-rw-r--r--scripts/CeladonMart3F_2.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/CeladonMart3F_2.asm b/scripts/CeladonMart3F_2.asm
index 239f84d1..81c219e4 100644
--- a/scripts/CeladonMart3F_2.asm
+++ b/scripts/CeladonMart3F_2.asm
@@ -1,36 +1,36 @@
-Func_f1e30::
+CeladonMart3FPrintClerkText::
CheckEvent EVENT_GOT_TM18
jr nz, .got_item
- ld hl, TM18PreReceiveText
+ ld hl, .TM18PreReceiveText
call PrintText
lb bc, TM_COUNTER, 1
call GiveItem
jr nc, .bag_full
SetEvent EVENT_GOT_TM18
- ld hl, ReceivedTM18Text
+ ld hl, .ReceivedTM18Text
jr .done
.bag_full
- ld hl, TM18NoRoomText
+ ld hl, .TM18NoRoomText
jr .done
.got_item
- ld hl, TM18ExplanationText
+ ld hl, .TM18ExplanationText
.done
call PrintText
ret
-TM18PreReceiveText:
- text_far _TM18PreReceiveText
+.TM18PreReceiveText:
+ text_far _CeladonMart3FClerkTM18PreReceiveText
text_end
-ReceivedTM18Text:
- text_far _ReceivedTM18Text
+.ReceivedTM18Text:
+ text_far _CeladonMart3FClerkReceivedTM18Text
sound_get_item_1
text_end
-TM18ExplanationText:
- text_far _TM18ExplanationText
+.TM18ExplanationText:
+ text_far _CeladonMart3FClerkTM18ExplanationText
text_end
-TM18NoRoomText:
- text_far _TM18NoRoomText
+.TM18NoRoomText:
+ text_far _CeladonMart3FClerkTM18NoRoomText
text_end