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/silph_co_2f.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/silph_co_2f.asm')
| -rw-r--r-- | text/maps/silph_co_2f.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index c442c3e6..a7535af6 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -1,4 +1,4 @@ -_UnnamedText_59ded: ; 82454 (20:6454) +_UnnamedText_59ded:: ; 82454 (20:6454) text "Eeek!" line "No! Stop! Help!" @@ -9,13 +9,13 @@ _UnnamedText_59ded: ; 82454 (20:6454) cont "please take this!" prompt -_ReceivedTM36Text: ; 824ba (20:64ba) +_ReceivedTM36Text:: ; 824ba (20:64ba) text $52, " got" line "@" TX_RAM $cf4b text "!@@" -_TM36ExplanationText: ; 824c9 (20:64c9) +_TM36ExplanationText:: ; 824c9 (20:64c9) text "TM36 is" line "SELFDESTRUCT!" @@ -25,53 +25,53 @@ _TM36ExplanationText: ; 824c9 (20:64c9) cont "Be careful." done -_TM36NoRoomText: ; 8251c (20:651c) +_TM36NoRoomText:: ; 8251c (20:651c) text "You don't have any" line "room for this." done -_SilphCo2BattleText1: ; 8253e (20:653e) +_SilphCo2BattleText1:: ; 8253e (20:653e) text "Help! I'm a SILPH" line "employee." done -_SilphCo2EndBattleText1: ; 8255a (20:655a) +_SilphCo2EndBattleText1:: ; 8255a (20:655a) text "How" line "did you know I" cont "was a ROCKET?" prompt -_SilphCo2AfterBattleText1: ; 8257c (20:657c) +_SilphCo2AfterBattleText1:: ; 8257c (20:657c) text "I work for both" line "SILPH and TEAM" cont "ROCKET!" done -_SilphCo2BattleText2: ; 825a4 (20:65a4) +_SilphCo2BattleText2:: ; 825a4 (20:65a4) text "It's off limits" line "here! Go home!" done -_SilphCo2EndBattleText2: ; 825c3 (20:65c3) +_SilphCo2EndBattleText2:: ; 825c3 (20:65c3) text "You're" line "good." prompt -_SilphCo2AfterBattleText2: ; 825d0 (20:65d0) +_SilphCo2AfterBattleText2:: ; 825d0 (20:65d0) text "Can you solve the" line "maze in here?" done -_SilphCo2BattleText3: ; 825f1 (20:65f1) +_SilphCo2BattleText3:: ; 825f1 (20:65f1) text "No kids are" line "allowed in here!" done -_SilphCo2EndBattleText3: ; 8260f (20:660f) +_SilphCo2EndBattleText3:: ; 8260f (20:660f) text "Tough!" prompt -_SilphCo2AfterBattleText3: ; 82617 (20:6617) +_SilphCo2AfterBattleText3:: ; 82617 (20:6617) text "Diamond shaped" line "tiles are" cont "teleport blocks!" @@ -80,16 +80,16 @@ _SilphCo2AfterBattleText3: ; 82617 (20:6617) line "transporters!" done -_SilphCo2BattleText4: ; 8265f (20:665f) +_SilphCo2BattleText4:: ; 8265f (20:665f) text "Hey kid! What are" line "you doing here?" done -_SilphCo2EndBattleText4: ; 82682 (20:6682) +_SilphCo2EndBattleText4:: ; 82682 (20:6682) text "I goofed!" prompt -_SilphCo2AfterBattleText4: ; 8268d (20:668d) +_SilphCo2AfterBattleText4:: ; 8268d (20:668d) text "SILPH CO. will" line "be merged with" cont "TEAM ROCKET!" |
