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,170 +1,170 @@
_Route13BattleText2: ; 903ed (24:43ed)
_Route13BattleText2:: ; 903ed (24:43ed)
text "My bird #MON"
line "want to scrap!"
done
_Route13EndBattleText2: ; 9040a (24:440a)
_Route13EndBattleText2:: ; 9040a (24:440a)
text "My"
line "bird combo lost?"
prompt
_Route13AfterBattleText2: ; 9041f (24:441f)
_Route13AfterBattleText2:: ; 9041f (24:441f)
text "My #MON look"
line "happy even though"
cont "they lost."
done
_Route13BattleText3: ; 9044a (24:444a)
_Route13BattleText3:: ; 9044a (24:444a)
text "I'm told I'm good"
line "for a kid!"
done
_Route13EndBattleText3: ; 90466 (24:4466)
_Route13EndBattleText3:: ; 90466 (24:4466)
text "Ohh!"
line "I lost!"
prompt
_Route13AfterBattleText3: ; 90474 (24:4474)
_Route13AfterBattleText3:: ; 90474 (24:4474)
text "I want to become"
line "a good trainer."
cont "I'll train hard."
done
_Route13BattleText4: ; 904a6 (24:44a6)
_Route13BattleText4:: ; 904a6 (24:44a6)
text "Wow! Your BADGEs"
line "are too cool!"
done
_Route13EndBattleText4: ; 904c6 (24:44c6)
_Route13EndBattleText4:: ; 904c6 (24:44c6)
text "Not"
line "enough!"
prompt
_Route13AfterBattleText4: ; 904d3 (24:44d3)
_Route13AfterBattleText4:: ; 904d3 (24:44d3)
text "You got those"
line "BADGEs from GYM"
cont "LEADERs. I know!"
done
_Route13BattleText5: ; 90503 (24:4503)
_Route13BattleText5:: ; 90503 (24:4503)
text "My cute #MON"
line "wish to make your"
cont "acquaintance."
done
_Route13EndBattleText5: ; 90531 (24:4531)
_Route13EndBattleText5:: ; 90531 (24:4531)
text "Wow!"
line "You totally won!"
prompt
_Route13AfterBattleText5: ; 90548 (24:4548)
_Route13AfterBattleText5:: ; 90548 (24:4548)
text "You have to make"
line "#MON fight to"
cont "toughen them up!"
done
_Route13BattleText6: ; 90579 (24:4579)
_Route13BattleText6:: ; 90579 (24:4579)
text "I found CARBOS in"
line "a cave once."
done
_Route13EndBattleText6: ; 90599 (24:4599)
_Route13EndBattleText6:: ; 90599 (24:4599)
text "Just"
line "messed up!"
prompt
_Route13AfterBattleText6: ; 905aa (24:45aa)
_Route13AfterBattleText6:: ; 905aa (24:45aa)
text "CARBOS boosted"
line "the SPEED of my"
cont "#MON."
done
_Route13BattleText7: ; 905d0 (24:45d0)
_Route13BattleText7:: ; 905d0 (24:45d0)
text "The wind's blowing"
line "my way!"
done
_Route13EndBattleText7: ; 905eb (24:45eb)
_Route13EndBattleText7:: ; 905eb (24:45eb)
text "The"
line "wind turned!"
prompt
_Route13AfterBattleText7: ; 905fd (24:45fd)
_Route13AfterBattleText7:: ; 905fd (24:45fd)
text "I'm beat. I guess"
line "I'll FLY home."
done
_Route13BattleText8: ; 9061d (24:461d)
_Route13BattleText8:: ; 9061d (24:461d)
text "Sure, I'll play"
line "with you!"
done
_Route13EndBattleText8: ; 90637 (24:4637)
_Route13EndBattleText8:: ; 90637 (24:4637)
text "Oh!"
line "You little brute!"
prompt
_Route13AfterBattleText8: ; 9064e (24:464e)
_Route13AfterBattleText8:: ; 9064e (24:464e)
text "I wonder which is"
line "stronger, male or"
cont "female #MON?"
done
_Route13BattleText9: ; 90680 (24:4680)
_Route13BattleText9:: ; 90680 (24:4680)
text "Do you want to"
line "#MON with me?"
done
_Route13EndBattleText9: ; 9069e (24:469e)
_Route13EndBattleText9:: ; 9069e (24:469e)
text "It's over"
line "already?"
prompt
_Route13AfterBattleText9: ; 906b1 (24:46b1)
_Route13AfterBattleText9:: ; 906b1 (24:46b1)
text "I don't know"
line "anything about"
cont "#MON. I just"
cont "like cool ones!"
done
_Route13BattleText10: ; 906ea (24:46ea)
_Route13BattleText10:: ; 906ea (24:46ea)
text "What're you"
line "lookin' at?"
done
_Route13EndBattleText10: ; 90702 (24:4702)
_Route13EndBattleText10:: ; 90702 (24:4702)
text "Dang!"
line "Stripped gears!"
prompt
_Route13AfterBattleText10: ; 90719 (24:4719)
_Route13AfterBattleText10:: ; 90719 (24:4719)
text "Get lost!"
done
_Route13BattleText11: ; 90724 (24:4724)
_Route13BattleText11:: ; 90724 (24:4724)
text "I always go with"
line "bird #MON!"
done
_Route13EndBattleText11: ; 90741 (24:4741)
_Route13EndBattleText11:: ; 90741 (24:4741)
text "Out"
line "of power!"
prompt
_Route13AfterBattleText11: ; 90750 (24:4750)
_Route13AfterBattleText11:: ; 90750 (24:4750)
text "I wish I could"
line "fly like PIDGEY"
cont "and PIDGEOTTO..."
done
_Route13Text11: ; 90781 (24:4781)
_Route13Text11:: ; 90781 (24:4781)
text "TRAINER TIPS"
para "Look to the left"
line "of that post!"
done
_Route13Text12: ; 907ae (24:47ae)
_Route13Text12:: ; 907ae (24:47ae)
text "TRAINER TIPS"
para "Use SELECT to"
@ -172,7 +172,7 @@ _Route13Text12: ; 907ae (24:47ae)
cont "the ITEM window!"
done
_Route13Text13: ; 907eb (24:47eb)
_Route13Text13:: ; 907eb (24:47eb)
text "ROUTE 13"
line "North to SILENCE"
cont "BRIDGE"