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,60 +1,60 @@
_SaffronCityText1: ; a62e7 (29:62e7)
_SaffronCityText1:: ; a62e7 (29:62e7)
text "What do you want?"
line "Get lost!"
done
_SaffronCityText2: ; a6304 (29:6304)
_SaffronCityText2:: ; a6304 (29:6304)
text "BOSS said he'll"
line "take this town!"
done
_SaffronCityText3: ; a6324 (29:6324)
_SaffronCityText3:: ; a6324 (29:6324)
text "Get out of the"
line "way!"
done
_SaffronCityText4: ; a6339 (29:6339)
_SaffronCityText4:: ; a6339 (29:6339)
text "SAFFRON belongs"
line "to TEAM ROCKET!"
done
_SaffronCityText5: ; a635a (29:635a)
_SaffronCityText5:: ; a635a (29:635a)
text "Being evil makes"
line "me feel so alive!"
done
_SaffronCityText6: ; a637e (29:637e)
_SaffronCityText6:: ; a637e (29:637e)
text "Ow! Watch where"
line "you're walking!"
done
_SaffronCityText7: ; a639e (29:639e)
_SaffronCityText7:: ; a639e (29:639e)
text "With SILPH under"
line "control, we can"
cont "exploit #MON"
cont "around the world!"
done
_SaffronCityText8: ; a63df (29:63df)
_SaffronCityText8:: ; a63df (29:63df)
text "You beat TEAM"
line "ROCKET all alone?"
cont "That's amazing!"
done
_SaffronCityText9: ; a640f (29:640f)
_SaffronCityText9:: ; a640f (29:640f)
text "Yeah! TEAM ROCKET"
line "is gone!"
cont "It's safe to go"
cont "out again!"
done
_SaffronCityText10: ; a6445 (29:6445)
_SaffronCityText10:: ; a6445 (29:6445)
text "People should be"
line "flocking back to"
cont "SAFFRON now."
done
_SaffronCityText11: ; a6475 (29:6475)
_SaffronCityText11:: ; a6475 (29:6475)
text "I flew here on my"
line "PIDGEOT when I"
cont "read about SILPH."
@ -64,16 +64,16 @@ _SaffronCityText11: ; a6475 (29:6475)
cont "media action."
done
_SaffronCityText12: ; a64d6 (29:64d6)
_SaffronCityText12:: ; a64d6 (29:64d6)
text "PIDGEOT: Bi bibii!@@"
_SaffronCityText13: ; a64eb (29:64eb)
_SaffronCityText13:: ; a64eb (29:64eb)
text "I saw ROCKET"
line "BOSS escaping"
cont "SILPH's building."
done
_SaffronCityText14: ; a6518 (29:6518)
_SaffronCityText14:: ; a6518 (29:6518)
text "I'm a security"
line "guard."
@ -81,7 +81,7 @@ _SaffronCityText14: ; a6518 (29:6518)
line "don't allow in!"
done
_SaffronCityText15: ; a654f (29:654f)
_SaffronCityText15:: ; a654f (29:654f)
text "..."
line "Snore..."
@ -89,17 +89,17 @@ _SaffronCityText15: ; a654f (29:654f)
line "a snooze!"
done
_SaffronCityText16: ; a6577 (29:6577)
_SaffronCityText16:: ; a6577 (29:6577)
text "SAFFRON CITY"
line "Shining, Golden"
cont "Land of Commerce"
done
_SaffronCityText17: ; a65a6 (29:65a6)
_SaffronCityText17:: ; a65a6 (29:65a6)
text "FIGHTING DOJO"
done
_SaffronCityText18: ; a65b5 (29:65b5)
_SaffronCityText18:: ; a65b5 (29:65b5)
text "SAFFRON CITY"
line "#MON GYM"
cont "LEADER: SABRINA"
@ -108,7 +108,7 @@ _SaffronCityText18: ; a65b5 (29:65b5)
line "Psychic #MON!"
done
_SaffronCityText20: ; a65f8 (29:65f8)
_SaffronCityText20:: ; a65f8 (29:65f8)
text "TRAINER TIPS"
para "FULL HEAL cures"
@ -120,7 +120,7 @@ _SaffronCityText20: ; a65f8 (29:65f8)
cont "more convenient."
done
_SaffronCityText21: ; a6667 (29:6667)
_SaffronCityText21:: ; a6667 (29:6667)
text "TRAINER TIPS"
para "New GREAT BALL"
@ -132,17 +132,17 @@ _SaffronCityText21: ; a6667 (29:6667)
cont "#MON."
done
_SaffronCityText22: ; a66c7 (29:66c7)
_SaffronCityText22:: ; a66c7 (29:66c7)
text "SILPH CO."
line "OFFICE BUILDING"
done
_SaffronCityText24: ; a66e2 (29:66e2)
_SaffronCityText24:: ; a66e2 (29:66e2)
text "MR.PSYCHIC's"
line "HOUSE"
done
_SaffronCityText25: ; a66f5 (29:66f5)
_SaffronCityText25:: ; a66f5 (29:66f5)
text "SILPH's latest"
line "product!"