aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CeladonMansion1F.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2023-07-13 20:27:56 -0500
committerGitHub <noreply@github.com>2023-07-13 21:27:56 -0400
commitd001ced41b53271373753de835a9c3b3413dc318 (patch)
treeff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/CeladonMansion1F.asm
parentMake wCurrentBoxNum a byte instead of word (#414) (diff)
downloadpokeyellow-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/CeladonMansion1F.asm')
-rw-r--r--scripts/CeladonMansion1F.asm31
1 files changed, 16 insertions, 15 deletions
diff --git a/scripts/CeladonMansion1F.asm b/scripts/CeladonMansion1F.asm
index fa901ff9..4ef67258 100644
--- a/scripts/CeladonMansion1F.asm
+++ b/scripts/CeladonMansion1F.asm
@@ -2,38 +2,39 @@ CeladonMansion1F_Script:
jp EnableAutoTextBoxDrawing
CeladonMansion1F_TextPointers:
- dw CeladonMansion1Text1
- dw CeladonMansion1Text2
- dw CeladonMansion1Text3
- dw CeladonMansion1Text4
- dw CeladonMansion1Text5
+ def_text_pointers
+ dw_const CeladonMansion1FMeowthText, TEXT_CELADONMANSION1F_MEOWTH
+ dw_const CeladonMansion1FGrannyText, TEXT_CELADONMANSION1F_GRANNY
+ dw_const CeladonMansion1FClefairyText, TEXT_CELADONMANSION1F_CLEFAIRY
+ dw_const CeladonMansion1FNidoranFText, TEXT_CELADONMANSION1F_NIDORANF
+ dw_const CeladonMansion1FManagersSuiteSignText, TEXT_CELADONMANSION1F_MANAGERS_SUITE_SIGN
CeladonMansion1_PlayCryScript:
call PlayCry
jp TextScriptEnd
-CeladonMansion1Text1:
- text_far _CeladonMansion1Text1
+CeladonMansion1FMeowthText:
+ text_far _CeladonMansion1FMeowthText
text_asm
ld a, MEOWTH
jp CeladonMansion1_PlayCryScript
-CeladonMansion1Text2:
- text_far _CeladonMansion1Text2
+CeladonMansion1FGrannyText:
+ text_far _CeladonMansion1FGrannyText
text_end
-CeladonMansion1Text3:
- text_far _CeladonMansion1Text3
+CeladonMansion1FClefairyText:
+ text_far _CeladonMansion1FClefairyText
text_asm
ld a, CLEFAIRY
jp CeladonMansion1_PlayCryScript
-CeladonMansion1Text4:
- text_far _CeladonMansion1Text4
+CeladonMansion1FNidoranFText:
+ text_far _CeladonMansion1FNidoranFText
text_asm
ld a, NIDORAN_F
jp CeladonMansion1_PlayCryScript
-CeladonMansion1Text5:
- text_far _CeladonMansion1Text5
+CeladonMansion1FManagersSuiteSignText:
+ text_far _CeladonMansion1FManagersSuiteSignText
text_end