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.
This commit is contained in:
yenatch 2014-01-27 16:22:41 -05:00
parent 6bde08504f
commit 1b9ee46af9
277 changed files with 4346 additions and 4358 deletions

View file

@ -1,10 +1,10 @@
_OaksLabGaryText1: ; 94d5b (25:4d5b)
_OaksLabGaryText1:: ; 94d5b (25:4d5b)
text $53, ": Yo"
line $52, "! Gramps"
cont "isn't around!"
done
_OaksLabText40: ; 94d79 (25:4d79)
_OaksLabText40:: ; 94d79 (25:4d79)
text $53, ": Heh, I"
line "don't need to be"
cont "greedy like you!"
@ -13,73 +13,73 @@ _OaksLabText40: ; 94d79 (25:4d79)
line "choose, ", $52, "!"
done
_OaksLabText41: ; 94dbd (25:4dbd)
_OaksLabText41:: ; 94dbd (25:4dbd)
text $53, ": My"
line "#MON looks a"
cont "lot stronger."
done
_OaksLabText39: ; 94ddf (25:4ddf)
_OaksLabText39:: ; 94ddf (25:4ddf)
text "Those are #"
line "BALLs. They"
cont "contain #MON!"
done
_OaksLabCharmanderText: ; 94e06 (25:4e06)
_OaksLabCharmanderText:: ; 94e06 (25:4e06)
text "So! You want the"
line "fire #MON,"
cont "CHARMANDER?"
done
_OaksLabSquirtleText: ; 94e2f (25:4e2f)
_OaksLabSquirtleText:: ; 94e2f (25:4e2f)
text "So! You want the"
line "water #MON,"
cont "SQUIRTLE?"
done
_OaksLabBulbasaurText: ; 94e57 (25:4e57)
_OaksLabBulbasaurText:: ; 94e57 (25:4e57)
text "So! You want the"
line "plant #MON,"
cont "BULBASAUR?"
done
_OaksLabMonEnergeticText: ; 94e80 (25:4e80)
_OaksLabMonEnergeticText:: ; 94e80 (25:4e80)
text "This #MON is"
line "really energetic!"
prompt
_OaksLabReceivedMonText: ; 94ea0 (25:4ea0)
_OaksLabReceivedMonText:: ; 94ea0 (25:4ea0)
text $52, " received"
line "a @"
TX_RAM $cd6d
text "!@@"
_OaksLabLastMonText: ; 94eb6 (25:4eb6)
_OaksLabLastMonText:: ; 94eb6 (25:4eb6)
text "That's PROF.OAK's"
line "last #MON!"
done
_UnnamedText_1d2f0: ; 94ed2 (25:4ed2)
_UnnamedText_1d2f0:: ; 94ed2 (25:4ed2)
text "OAK: Now, ", $52, ","
line "which #MON do"
cont "you want?"
done
_UnnamedText_1d2f5: ; 94ef8 (25:4ef8)
_UnnamedText_1d2f5:: ; 94ef8 (25:4ef8)
text "OAK: If a wild"
line "#MON appears,"
cont "your #MON can"
cont "fight against it!"
done
_UnnamedText_1d2fa: ; 94f36 (25:4f36)
_UnnamedText_1d2fa:: ; 94f36 (25:4f36)
text "OAK: ", $52, ","
line "raise your young"
cont "#MON by making"
cont "it fight!"
done
_OaksLabDeliverParcelText1: ; 94f69 (25:4f69)
_OaksLabDeliverParcelText1:: ; 94f69 (25:4f69)
text "OAK: Oh, ", $52, "!"
para "How is my old"
@ -98,7 +98,7 @@ _OaksLabDeliverParcelText1: ; 94f69 (25:4f69)
para $52, " delivered"
line "OAK's PARCEL.@@"
_OaksLabDeliverParcelText2: ; 9500f (25:500f)
_OaksLabDeliverParcelText2:: ; 9500f (25:500f)
db $0
para "Ah! This is the"
line "custom # BALL"
@ -106,13 +106,13 @@ _OaksLabDeliverParcelText2: ; 9500f (25:500f)
cont "Thank you!"
done
_OaksLabAroundWorldText: ; 95045 (25:5045)
_OaksLabAroundWorldText:: ; 95045 (25:5045)
text "#MON around the"
line "world wait for"
cont "you, ", $52, "!"
done
_OaksLabGivePokeballsText1: ; 9506d (25:506d)
_OaksLabGivePokeballsText1:: ; 9506d (25:506d)
text "OAK: You can't get"
line "detailed data on"
cont "#MON by just"
@ -126,7 +126,7 @@ _OaksLabGivePokeballsText1: ; 9506d (25:506d)
para $52, " got 5"
line "# BALLs!@@"
_OaksLabGivePokeballsText2: ; 950f2 (25:50f2)
_OaksLabGivePokeballsText2:: ; 950f2 (25:50f2)
db $0
para "When a wild"
line "#MON appears,"
@ -144,7 +144,7 @@ _OaksLabGivePokeballsText2: ; 950f2 (25:50f2)
cont "have to be lucky!"
done
_OaksLabPleaseVisitText: ; 9519e (25:519e)
_OaksLabPleaseVisitText:: ; 9519e (25:519e)
text "OAK: Come see me"
line "sometimes."
@ -153,7 +153,7 @@ _OaksLabPleaseVisitText: ; 9519e (25:519e)
cont "coming along."
done
_UnnamedText_1d31d: ; 951e9 (25:51e9)
_UnnamedText_1d31d:: ; 951e9 (25:51e9)
text "OAK: Good to see "
line "you! How is your "
cont "#DEX coming? "
@ -161,17 +161,17 @@ _UnnamedText_1d31d: ; 951e9 (25:51e9)
cont "a look!"
prompt
_UnnamedText_1d32c: ; 95236 (25:5236)
_UnnamedText_1d32c:: ; 95236 (25:5236)
text "It's encyclopedia-"
line "like, but the"
cont "pages are blank!"
done
_OaksLabText8: ; 95268 (25:5268)
_OaksLabText8:: ; 95268 (25:5268)
text "?"
done
_UnnamedText_1d340: ; 9526b (25:526b)
_UnnamedText_1d340:: ; 9526b (25:526b)
text "PROF.OAK is the"
line "authority on"
cont "#MON!"
@ -181,13 +181,13 @@ _UnnamedText_1d340: ; 9526b (25:526b)
cont "in high regard!"
done
_OaksLabRivalWaitingText: ; 952bb (25:52bb)
_OaksLabRivalWaitingText:: ; 952bb (25:52bb)
text $53, ": Gramps!"
line "I'm fed up with"
cont "waiting!"
done
_OaksLabChooseMonText: ; 952df (25:52df)
_OaksLabChooseMonText:: ; 952df (25:52df)
text "OAK: ", $53, "?"
line "Let me think..."
@ -215,35 +215,35 @@ _OaksLabChooseMonText: ; 952df (25:52df)
cont "one! Choose!"
done
_OaksLabRivalInterjectionText: ; 953dc (25:53dc)
_OaksLabRivalInterjectionText:: ; 953dc (25:53dc)
text $53, ": Hey!"
line "Gramps! What"
cont "about me?"
done
_OaksLabBePatientText: ; 953fc (25:53fc)
_OaksLabBePatientText:: ; 953fc (25:53fc)
text "OAK: Be patient!"
line $53, ", you can"
cont "have one too!"
done
_OaksLabLeavingText: ; 95427 (25:5427)
_OaksLabLeavingText:: ; 95427 (25:5427)
text "OAK: Hey! Don't go"
line "away yet!"
done
_OaksLabRivalPickingMonText: ; 95444 (25:5444)
_OaksLabRivalPickingMonText:: ; 95444 (25:5444)
text $53, ": I'll take"
line "this one, then!"
done
_OaksLabRivalReceivedMonText: ; 95461 (25:5461)
_OaksLabRivalReceivedMonText:: ; 95461 (25:5461)
text $53, " received"
line "a @"
TX_RAM $cd6d
text "!@@"
_OaksLabRivalChallengeText: ; 95477 (25:5477)
_OaksLabRivalChallengeText:: ; 95477 (25:5477)
text $53, ": Wait"
line $52, "!"
cont "Let's check out"
@ -253,19 +253,19 @@ _OaksLabRivalChallengeText: ; 95477 (25:5477)
line "you on!"
done
_UnnamedText_1d3be: ; 954b6 (25:54b6)
_UnnamedText_1d3be:: ; 954b6 (25:54b6)
text "WHAT?"
line "Unbelievable!"
cont "I picked the"
cont "wrong #MON!"
prompt
_UnnamedText_1d3c3: ; 954e4 (25:54e4)
_UnnamedText_1d3c3:: ; 954e4 (25:54e4)
text $53, ": Yeah! Am"
line "I great or what?"
prompt
_OaksLabRivalToughenUpText: ; 95502 (25:5502)
_OaksLabRivalToughenUpText:: ; 95502 (25:5502)
text $53, ": Okay!"
line "I'll make my"
cont "#MON fight to"
@ -275,22 +275,22 @@ _OaksLabRivalToughenUpText: ; 95502 (25:5502)
line "Smell you later!"
done
_OaksLabText21: ; 95551 (25:5551)
_OaksLabText21:: ; 95551 (25:5551)
text $53, ": Gramps!"
done
_OaksLabText22: ; 9555d (25:555d)
_OaksLabText22:: ; 9555d (25:555d)
text $53, ": What did"
line "you call me for?"
done
_OaksLabText23: ; 9557b (25:557b)
_OaksLabText23:: ; 9557b (25:557b)
text "OAK: Oh right! I"
line "have a request"
cont "of you two."
done
_OaksLabText24: ; 955a8 (25:55a8)
_OaksLabText24:: ; 955a8 (25:55a8)
text "On the desk there"
line "is my invention,"
cont "#DEX!"
@ -304,7 +304,7 @@ _OaksLabText24: ; 955a8 (25:55a8)
line "encyclopedia!"
done
_OaksLabText25: ; 9562a (25:562a)
_OaksLabText25:: ; 9562a (25:562a)
text "OAK: ", $52, " and"
line $53, "! Take"
cont "these with you!"
@ -312,7 +312,7 @@ _OaksLabText25: ; 9562a (25:562a)
para $52, " got"
line "#DEX from OAK!@@"
_OaksLabText26: ; 95664 (25:5664)
_OaksLabText26:: ; 95664 (25:5664)
text "To make a complete"
line "guide on all the"
cont "#MON in the"
@ -335,7 +335,7 @@ _OaksLabText26: ; 95664 (25:5664)
cont "#MON history!"
done
_OaksLabText27: ; 95741 (25:5741)
_OaksLabText27:: ; 95741 (25:5741)
text $53, ": Alright"
line "Gramps! Leave it"
cont "all to me!"
@ -353,12 +353,12 @@ _OaksLabText27: ; 95741 (25:5741)
cont $52, "! Hahaha!"
done
_UnnamedText_1d405: ; 957eb (25:57eb)
_UnnamedText_1d405:: ; 957eb (25:57eb)
text "I study #MON as"
line "PROF.OAK's AIDE."
done
_UnnamedText_441cc: ; 9580c (25:580c)
_UnnamedText_441cc:: ; 9580c (25:580c)
text "#DEX comp-"
line "letion is:"
@ -373,41 +373,41 @@ _UnnamedText_441cc: ; 9580c (25:580c)
line "Rating:"
prompt
_UnnamedText_44201: ; 95858 (25:5858)
_UnnamedText_44201:: ; 95858 (25:5858)
text "You still have"
line "lots to do."
cont "Look for #MON"
cont "in grassy areas!"
done
_UnnamedText_44206: ; 95893 (25:5893)
_UnnamedText_44206:: ; 95893 (25:5893)
text "You're on the"
line "right track! "
cont "Get a FLASH HM"
cont "from my AIDE!"
done
_UnnamedText_4420b: ; 958cc (25:58cc)
_UnnamedText_4420b:: ; 958cc (25:58cc)
text "You still need"
line "more #MON!"
cont "Try to catch"
cont "other species!"
done
_UnnamedText_44210: ; 95903 (25:5903)
_UnnamedText_44210:: ; 95903 (25:5903)
text "Good, you're"
line "trying hard!"
cont "Get an ITEMFINDER"
cont "from my AIDE!"
done
_UnnamedText_44215: ; 9593d (25:593d)
_UnnamedText_44215:: ; 9593d (25:593d)
text "Looking good!"
line "Go find my AIDE"
cont "when you get 50!"
done
_UnnamedText_4421a: ; 9596d (25:596d)
_UnnamedText_4421a:: ; 9596d (25:596d)
text "You finally got at"
line "least 50 species!"
cont "Be sure to get"
@ -415,62 +415,62 @@ _UnnamedText_4421a: ; 9596d (25:596d)
cont "AIDE!"
done
_UnnamedText_4421f: ; 959b8 (25:59b8)
_UnnamedText_4421f:: ; 959b8 (25:59b8)
text "Ho! This is geting"
line "even better!"
done
_UnnamedText_44224: ; 959d9 (25:59d9)
_UnnamedText_44224:: ; 959d9 (25:59d9)
text "Very good!"
line "Go fish for some"
cont "marine #MON!"
done
_UnnamedText_44229: ; 95a03 (25:5a03)
_UnnamedText_44229:: ; 95a03 (25:5a03)
text "Wonderful!"
line "Do you like to"
cont "collect things?"
done
_UnnamedText_4422e: ; 95a2e (25:5a2e)
_UnnamedText_4422e:: ; 95a2e (25:5a2e)
text "I'm impressed!"
line "It must have been"
cont "difficult to do!"
done
_UnnamedText_44233: ; 95a60 (25:5a60)
_UnnamedText_44233:: ; 95a60 (25:5a60)
text "You finally got at"
line "least 100 species!"
cont "I can't believe"
cont "how good you are!"
done
_UnnamedText_44238: ; 95aa8 (25:5aa8)
_UnnamedText_44238:: ; 95aa8 (25:5aa8)
text "You even have the"
line "evolved forms of"
cont "#MON! Super!"
done
_UnnamedText_4423d: ; 95ad9 (25:5ad9)
_UnnamedText_4423d:: ; 95ad9 (25:5ad9)
text "Excellent! Trade"
line "with friends to"
cont "get some more!"
done
_UnnamedText_44242: ; 95b0a (25:5b0a)
_UnnamedText_44242:: ; 95b0a (25:5b0a)
text "Outstanding!"
line "You've become a"
cont "real pro at this!"
done
_UnnamedText_44247: ; 95b39 (25:5b39)
_UnnamedText_44247:: ; 95b39 (25:5b39)
text "I have nothing"
line "left to say!"
cont "You're the"
cont "authority now!"
done
_UnnamedText_4424c: ; 95b6f (25:5b6f)
_UnnamedText_4424c:: ; 95b6f (25:5b6f)
text "Your #DEX is"
line "entirely complete!"
cont "Congratulations!"