summaryrefslogtreecommitdiff
path: root/text/maps/fuchsia_city.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-01-27 16:22:41 -0500
committeryenatch <yenatch@gmail.com>2014-01-27 16:24:13 -0500
commit1b9ee46af9f8baac0d266a54130115a719788377 (patch)
tree8ac61c0752dc74da0677cb26fe4db6362db5b2b7 /text/maps/fuchsia_city.asm
parent6bde08504fdc336b1d458bab0bed4ef649cae25a (diff)
Get rid of globals.asm. Use ::s to export labels between objects.
globals.asm was a hack that: - gave rgbasm an extra 100k lines to read - increased reliance on the python preprocessor - made the makefile a mess - gave object creation an extra step - wasn't even necessary This speeds up build time by at least a third.
Diffstat (limited to 'text/maps/fuchsia_city.asm')
-rw-r--r--text/maps/fuchsia_city.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm
index c0ca41be..07909c04 100644
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/fuchsia_city.asm
@@ -1,11 +1,11 @@
-_FuchsiaCityText1: ; a5e9c (29:5e9c)
+_FuchsiaCityText1:: ; a5e9c (29:5e9c)
text "Did you try the"
line "SAFARI GAME? Some"
cont "#MON can only"
cont "be caught there."
done
-_FuchsiaCityText2: ; a5ede (29:5ede)
+_FuchsiaCityText2:: ; a5ede (29:5ede)
text "SAFARI ZONE has a"
line "zoo in front of"
cont "the entrance."
@@ -15,44 +15,44 @@ _FuchsiaCityText2: ; a5ede (29:5ede)
cont "catching #MON."
done
-_FuchsiaCityText3: ; a5f3e (29:5f3e)
+_FuchsiaCityText3:: ; a5f3e (29:5f3e)
text "ERIK: Where's"
line "SARA? I said I'd"
cont "meet her here."
done
-_FuchsiaCityText4: ; a5f6b (29:5f6b)
+_FuchsiaCityText4:: ; a5f6b (29:5f6b)
text "That item ball in"
line "there is really a"
cont "#MON."
done
-_FuchsiaCityText5: ; a5f96 (29:5f96)
+_FuchsiaCityText5:: ; a5f96 (29:5f96)
text "!"
done
-_FuchsiaCityText11: ; a5f99 (29:5f99)
+_FuchsiaCityText11:: ; a5f99 (29:5f99)
text "FUCHSIA CITY"
line "Behold! It's"
cont "Passion Pink!"
done
-_FuchsiaCityText13: ; a5fc1 (29:5fc1)
+_FuchsiaCityText13:: ; a5fc1 (29:5fc1)
text "SAFARI GAME"
line "#MON-U-CATCH!"
done
-_FuchsiaCityText16: ; a5fdc (29:5fdc)
+_FuchsiaCityText16:: ; a5fdc (29:5fdc)
text "SAFARI ZONE"
line "WARDEN's HOME"
done
-_FuchsiaCityText17: ; a5ff6 (29:5ff6)
+_FuchsiaCityText17:: ; a5ff6 (29:5ff6)
text "#MON PARADISE"
line "SAFARI ZONE"
done
-_FuchsiaCityText18: ; a6011 (29:6011)
+_FuchsiaCityText18:: ; a6011 (29:6011)
text "FUCHSIA CITY"
line "#MON GYM"
cont "LEADER: KOGA"
@@ -61,21 +61,21 @@ _FuchsiaCityText18: ; a6011 (29:6011)
line "Ninja Master"
done
-_FuchsiaCityChanseyText: ; a6050 (29:6050)
+_FuchsiaCityChanseyText:: ; a6050 (29:6050)
text "Name: CHANSEY"
para "Catching one is"
line "all up to chance."
prompt
-_FuchsiaCityVoltorbText: ; a6081 (29:6081)
+_FuchsiaCityVoltorbText:: ; a6081 (29:6081)
text "Name: VOLTORB"
para "The very image of"
line "a # BALL."
prompt
-_FuchsiaCityKangaskhanText: ; a60ac (29:60ac)
+_FuchsiaCityKangaskhanText:: ; a60ac (29:60ac)
text "Name: KANGASKHAN"
para "A maternal #MON"
@@ -84,21 +84,21 @@ _FuchsiaCityKangaskhanText: ; a60ac (29:60ac)
cont "on its belly."
prompt
-_FuchsiaCitySlowpokeText: ; a60fd (29:60fd)
+_FuchsiaCitySlowpokeText:: ; a60fd (29:60fd)
text "Name: SLOWPOKE"
para "Friendly and very"
line "slow moving."
prompt
-_FuchsiaCityLaprasText: ; a612c (29:612c)
+_FuchsiaCityLaprasText:: ; a612c (29:612c)
text "Name: LAPRAS"
para "A.K.A. the king"
line "of the seas."
prompt
-_FuchsiaCityOmanyteText: ; a6157 (29:6157)
+_FuchsiaCityOmanyteText:: ; a6157 (29:6157)
text "Name: OMANYTE"
para "A #MON that"
@@ -106,7 +106,7 @@ _FuchsiaCityOmanyteText: ; a6157 (29:6157)
cont "from a fossil."
prompt
-_FuchsiaCityKabutoText: ; a6191 (29:6191)
+_FuchsiaCityKabutoText:: ; a6191 (29:6191)
text "Name: KABUTO"
para "A #MON that"
@@ -114,7 +114,7 @@ _FuchsiaCityKabutoText: ; a6191 (29:6191)
cont "from a fossil."
prompt
-_UnnamedText_19b2a: ; a61ca (29:61ca)
+_UnnamedText_19b2a:: ; a61ca (29:61ca)
text "..."
done