diff options
| author | yenatch <yenatch@gmail.com> | 2014-01-27 16:22:41 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-01-27 16:24:13 -0500 |
| commit | 1b9ee46af9f8baac0d266a54130115a719788377 (patch) | |
| tree | 8ac61c0752dc74da0677cb26fe4db6362db5b2b7 /text/maps/route_24_2.asm | |
| parent | added a couple of new moves constants (diff) | |
| download | pokeyellow-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/route_24_2.asm')
| -rw-r--r-- | text/maps/route_24_2.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/text/maps/route_24_2.asm b/text/maps/route_24_2.asm index abf38c71..9a7613bb 100644 --- a/text/maps/route_24_2.asm +++ b/text/maps/route_24_2.asm @@ -1,75 +1,75 @@ -_Route24EndBattleText1: ; 94000 (25:4000) +_Route24EndBattleText1:: ; 94000 (25:4000) text "I" line "thought not!" prompt -_Route24AfterBattleText1: ; 94010 (25:4010) +_Route24AfterBattleText1:: ; 94010 (25:4010) text "I hid because the" line "people on the" cont "bridge scared me!" done -_Route24BattleText2: ; 94043 (25:4043) +_Route24BattleText2:: ; 94043 (25:4043) text "OK! I'm No. 5!" line "I'll stomp you!" done -_Route24EndBattleText2: ; 94061 (25:4061) +_Route24EndBattleText2:: ; 94061 (25:4061) text "Whoa!" line "Too much!" prompt -_Route24AfterBattleText2: ; 94072 (25:4072) +_Route24AfterBattleText2:: ; 94072 (25:4072) text "I did my best, I" line "have no regrets!" done -_Route24BattleText3: ; 94095 (25:4095) +_Route24BattleText3:: ; 94095 (25:4095) text "I'm No. 4!" line "Getting tired?" done -_Route24EndBattleText3: ; 940af (25:40af) +_Route24EndBattleText3:: ; 940af (25:40af) text "I lost" line "too!" prompt -_Route24AfterBattleText3: ; 940bc (25:40bc) +_Route24AfterBattleText3:: ; 940bc (25:40bc) text "I did my best, so" line "I've no regrets!" done -_Route24BattleText4: ; 940df (25:40df) +_Route24BattleText4:: ; 940df (25:40df) text "Here's No. 3!" line "I won't be easy!" done -_Route24EndBattleText4: ; 940fd (25:40fd) +_Route24EndBattleText4:: ; 940fd (25:40fd) text "Ow!" line "Stomped flat!" prompt -_Route24AfterBattleText4: ; 94110 (25:4110) +_Route24AfterBattleText4:: ; 94110 (25:4110) text "I did my best, I" line "have no regrets!" done -_Route24BattleText5: ; 94133 (25:4133) +_Route24BattleText5:: ; 94133 (25:4133) text "I'm second!" line "Now it's serious!" done -_Route24EndBattleText5: ; 94150 (25:4150) +_Route24EndBattleText5:: ; 94150 (25:4150) text "How could I" line "lose?" prompt -_Route24AfterBattleText5: ; 94163 (25:4163) +_Route24AfterBattleText5:: ; 94163 (25:4163) text "I did my best, I" line "have no regrets!" done -_Route24BattleText6: ; 94186 (25:4186) +_Route24BattleText6:: ; 94186 (25:4186) text "This is NUGGET" line "BRIDGE! Beat us 5" cont "trainers and win" @@ -79,12 +79,12 @@ _Route24BattleText6: ; 94186 (25:4186) line "what it takes?" done -_Route24EndBattleText6: ; 941e8 (25:41e8) +_Route24EndBattleText6:: ; 941e8 (25:41e8) text "Whoo!" line "Good stuff!" prompt -_Route24AfterBattleText6: ; 941fb (25:41fb) +_Route24AfterBattleText6:: ; 941fb (25:41fb) text "I did my best, I" line "have no regrets!" done |
