aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/champion.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/champion.asm
parentadded a couple of new moves constants (diff)
downloadpokeyellow-1b9ee46af9f8baac0d266a54130115a719788377.tar.gz
pokeyellow-1b9ee46af9f8baac0d266a54130115a719788377.tar.xz
pokeyellow-1b9ee46af9f8baac0d266a54130115a719788377.zip
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/champion.asm')
-rw-r--r--text/maps/champion.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/text/maps/champion.asm b/text/maps/champion.asm
index 71a0ca6f..87b93300 100644
--- a/text/maps/champion.asm
+++ b/text/maps/champion.asm
@@ -1,4 +1,4 @@
-_UnnamedText_760f4: ; 860e1 (21:60e1)
+_UnnamedText_760f4:: ; 860e1 (21:60e1)
text $53, ": Hey!"
para "I was looking"
@@ -35,7 +35,7 @@ _UnnamedText_760f4: ; 860e1 (21:60e1)
cont "in the world!"
done
-_UnnamedText_760f9: ; 8623b (21:623b)
+_UnnamedText_760f9:: ; 8623b (21:623b)
text "NO!"
line "That can't be!"
cont "You beat my best!"
@@ -49,7 +49,7 @@ _UnnamedText_760f9: ; 8623b (21:623b)
cont "It's not fair!"
prompt
-_UnnamedText_760fe: ; 862b4 (21:62b4)
+_UnnamedText_760fe:: ; 862b4 (21:62b4)
text "Hahaha!"
line "I won, I won!"
@@ -65,7 +65,7 @@ _UnnamedText_760fe: ; 862b4 (21:62b4)
line "Hahaha!"
prompt
-_UnnamedText_76103: ; 8632f (21:632f)
+_UnnamedText_76103:: ; 8632f (21:632f)
text "Why?"
line "Why did I lose?"
@@ -81,11 +81,11 @@ _UnnamedText_76103: ; 8632f (21:632f)
line "like to admit it."
done
-_GaryText2: ; 863c1 (21:63c1)
+_GaryText2:: ; 863c1 (21:63c1)
text "OAK: ", $52, "!"
done
-_UnnamedText_76120: ; 863ca (21:63ca)
+_UnnamedText_76120:: ; 863ca (21:63ca)
text "OAK: So, you won!"
line "Congratulations!"
cont "You're the new"
@@ -103,7 +103,7 @@ _UnnamedText_76120: ; 863ca (21:63ca)
line "come of age!"
done
-_UnnamedText_76125: ; 86463 (21:6463)
+_UnnamedText_76125:: ; 86463 (21:6463)
text "OAK: ", $53, "! I'm"
line "disappointed!"
@@ -129,7 +129,7 @@ _UnnamedText_76125: ; 86463 (21:6463)
cont "a champ again!"
done
-_UnnamedText_7612a: ; 86567 (21:6567)
+_UnnamedText_7612a:: ; 86567 (21:6567)
text "OAK: ", $52, "!"
para "You understand"