aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/FuchsiaCity.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/FuchsiaCity.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/FuchsiaCity.asm')
-rw-r--r--scripts/FuchsiaCity.asm171
1 files changed, 83 insertions, 88 deletions
diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm
index ac9f273b..8f1f9690 100644
--- a/scripts/FuchsiaCity.asm
+++ b/scripts/FuchsiaCity.asm
@@ -2,168 +2,163 @@ FuchsiaCity_Script:
jp EnableAutoTextBoxDrawing
FuchsiaCity_TextPointers:
- dw FuchsiaCityText1
- dw FuchsiaCityText2
- dw FuchsiaCityText3
- dw FuchsiaCityText4
- dw FuchsiaCityText5
- dw FuchsiaCityText6
- dw FuchsiaCityText7
- dw FuchsiaCityText8
- dw FuchsiaCityText9
- dw FuchsiaCityText10
- dw FuchsiaCityText11
- dw FuchsiaCityText12
- dw FuchsiaCityText13
- dw MartSignText
- dw PokeCenterSignText
- dw FuchsiaCityText16
- dw FuchsiaCityText17
- dw FuchsiaCityText18
- dw FuchsiaCityText19
- dw FuchsiaCityText20
- dw FuchsiaCityText21
- dw FuchsiaCityText22
- dw FuchsiaCityText23
- dw FuchsiaCityText24
+ def_text_pointers
+ dw_const FuchsiaCityYoungster1Text, TEXT_FUCHSIACITY_YOUNGSTER1
+ dw_const FuchsiaCityGamblerText, TEXT_FUCHSIACITY_GAMBLER
+ dw_const FuchsiaCityErikText, TEXT_FUCHSIACITY_ERIK
+ dw_const FuchsiaCityYoungster2Text, TEXT_FUCHSIACITY_YOUNGSTER2
+ dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_CHANSEY
+ dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_VOLTORB
+ dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_KANGASKHAN
+ dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_SLOWPOKE
+ dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_LAPRAS
+ dw_const FuchsiaCityPokemonText, TEXT_FUCHSIACITY_FOSSIL
+ dw_const FuchsiaCitySignText, TEXT_FUCHSIACITY_SIGN1
+ dw_const FuchsiaCitySignText, TEXT_FUCHSIACITY_SIGN2
+ dw_const FuchsiaCitySafariGameSignText, TEXT_FUCHSIACITY_SAFARI_GAME_SIGN
+ dw_const MartSignText, TEXT_FUCHSIACITY_MART_SIGN
+ dw_const PokeCenterSignText, TEXT_FUCHSIACITY_POKECENTER_SIGN
+ dw_const FuchsiaCityWardensHomeSignText, TEXT_FUCHSIACITY_WARDENS_HOME_SIGN
+ dw_const FuchsiaCitySafariZoneSignText, TEXT_FUCHSIACITY_SAFARI_ZONE_SIGN
+ dw_const FuchsiaCityGymSignText, TEXT_FUCHSIACITY_GYM_SIGN
+ dw_const FuchsiaCityChanseySignText, TEXT_FUCHSIACITY_CHANSEY_SIGN
+ dw_const FuchsiaCityVoltorbSignText, TEXT_FUCHSIACITY_VOLTORB_SIGN
+ dw_const FuchsiaCityKangaskhanSignText, TEXT_FUCHSIACITY_KANGASKHAN_SIGN
+ dw_const FuchsiaCitySlowpokeSignText, TEXT_FUCHSIACITY_SLOWPOKE_SIGN
+ dw_const FuchsiaCityLaprasSignText, TEXT_FUCHSIACITY_LAPRAS_SIGN
+ dw_const FuchsiaCityFossilSignText, TEXT_FUCHSIACITY_FOSSIL_SIGN
-FuchsiaCityText1:
- text_far _FuchsiaCityText1
+FuchsiaCityYoungster1Text:
+ text_far _FuchsiaCityYoungster1Text
text_end
-FuchsiaCityText2:
- text_far _FuchsiaCityText2
+FuchsiaCityGamblerText:
+ text_far _FuchsiaCityGamblerText
text_end
-FuchsiaCityText3:
- text_far _FuchsiaCityText3
+FuchsiaCityErikText:
+ text_far _FuchsiaCityErikText
text_end
-FuchsiaCityText4:
- text_far _FuchsiaCityText4
+FuchsiaCityYoungster2Text:
+ text_far _FuchsiaCityYoungster2Text
text_end
-FuchsiaCityText5:
-FuchsiaCityText6:
-FuchsiaCityText7:
-FuchsiaCityText8:
-FuchsiaCityText9:
-FuchsiaCityText10:
- text_far _FuchsiaCityText5
+FuchsiaCityPokemonText:
+ text_far _FuchsiaCityPokemonText
text_end
-FuchsiaCityText12:
-FuchsiaCityText11:
- text_far _FuchsiaCityText11
+FuchsiaCitySignText:
+ text_far _FuchsiaCitySignText
text_end
-FuchsiaCityText13:
- text_far _FuchsiaCityText13
+FuchsiaCitySafariGameSignText:
+ text_far _FuchsiaCitySafariGameSignText
text_end
-FuchsiaCityText16:
- text_far _FuchsiaCityText16
+FuchsiaCityWardensHomeSignText:
+ text_far _FuchsiaCityWardensHomeSignText
text_end
-FuchsiaCityText17:
- text_far _FuchsiaCityText17
+FuchsiaCitySafariZoneSignText:
+ text_far _FuchsiaCitySafariZoneSignText
text_end
-FuchsiaCityText18:
- text_far _FuchsiaCityText18
+FuchsiaCityGymSignText:
+ text_far _FuchsiaCityGymSignText
text_end
-FuchsiaCityText19:
+FuchsiaCityChanseySignText:
text_asm
- ld hl, FuchsiaCityChanseyText
+ ld hl, .Text
call PrintText
ld a, CHANSEY
call DisplayPokedex
jp TextScriptEnd
-FuchsiaCityChanseyText:
- text_far _FuchsiaCityChanseyText
+.Text:
+ text_far _FuchsiaCityChanseySignText
text_end
-FuchsiaCityText20:
+FuchsiaCityVoltorbSignText:
text_asm
- ld hl, FuchsiaCityVoltorbText
+ ld hl, .Text
call PrintText
ld a, VOLTORB
call DisplayPokedex
jp TextScriptEnd
-FuchsiaCityVoltorbText:
- text_far _FuchsiaCityVoltorbText
+.Text:
+ text_far _FuchsiaCityVoltorbSignText
text_end
-FuchsiaCityText21:
+FuchsiaCityKangaskhanSignText:
text_asm
- ld hl, FuchsiaCityKangaskhanText
+ ld hl, .Text
call PrintText
ld a, KANGASKHAN
call DisplayPokedex
jp TextScriptEnd
-FuchsiaCityKangaskhanText:
- text_far _FuchsiaCityKangaskhanText
+.Text:
+ text_far _FuchsiaCityKangaskhanSignText
text_end
-FuchsiaCityText22:
+FuchsiaCitySlowpokeSignText:
text_asm
- ld hl, FuchsiaCitySlowpokeText
+ ld hl, .Text
call PrintText
ld a, SLOWPOKE
call DisplayPokedex
jp TextScriptEnd
-FuchsiaCitySlowpokeText:
- text_far _FuchsiaCitySlowpokeText
+.Text:
+ text_far _FuchsiaCitySlowpokeSignText
text_end
-FuchsiaCityText23:
+FuchsiaCityLaprasSignText:
text_asm
- ld hl, FuchsiaCityLaprasText
+ ld hl, .Text
call PrintText
ld a, LAPRAS
call DisplayPokedex
jp TextScriptEnd
-FuchsiaCityLaprasText:
- text_far _FuchsiaCityLaprasText
+.Text:
+ text_far _FuchsiaCityLaprasSignText
text_end
-FuchsiaCityText24:
+FuchsiaCityFossilSignText:
text_asm
CheckEvent EVENT_GOT_DOME_FOSSIL
- jr nz, .asm_3b4e8
+ jr nz, .got_dome_fossil
CheckEventReuseA EVENT_GOT_HELIX_FOSSIL
- jr nz, .asm_667d5
- ld hl, FuchsiaCityText_19b2a
+ jr nz, .got_helix_fossil
+ ld hl, .UndeterminedText
call PrintText
- jr .asm_4343f
-.asm_3b4e8
- ld hl, FuchsiaCityOmanyteText
+ jr .done
+.got_dome_fossil
+ ld hl, .OmanyteText
call PrintText
ld a, OMANYTE
- jr .asm_81556
-.asm_667d5
- ld hl, FuchsiaCityKabutoText
+ jr .display
+.got_helix_fossil
+ ld hl, .KabutoText
call PrintText
ld a, KABUTO
-.asm_81556
+.display
call DisplayPokedex
-.asm_4343f
+.done
jp TextScriptEnd
-FuchsiaCityOmanyteText:
- text_far _FuchsiaCityOmanyteText
+.OmanyteText:
+ text_far _FuchsiaCityFossilSignOmanyteText
text_end
-FuchsiaCityKabutoText:
- text_far _FuchsiaCityKabutoText
+.KabutoText:
+ text_far _FuchsiaCityFossilSignKabutoText
text_end
-FuchsiaCityText_19b2a:
- text_far _FuchsiaCityText_19b2a
+.UndeterminedText:
+ text_far _FuchsiaCityFossilSignUndeterminedText
text_end