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_6f.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_6f.asm')
| -rw-r--r-- | text/maps/silph_co_6f.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/text/maps/silph_co_6f.asm b/text/maps/silph_co_6f.asm index c60695ee..5f74da46 100644 --- a/text/maps/silph_co_6f.asm +++ b/text/maps/silph_co_6f.asm @@ -1,77 +1,77 @@ -_UnnamedText_1a24a: ; 84176 (21:4176) +_UnnamedText_1a24a:: ; 84176 (21:4176) text "The ROCKETs came" line "and took over the" cont "building!" done -_UnnamedText_1a24f: ; 841a4 (21:41a4) +_UnnamedText_1a24f:: ; 841a4 (21:41a4) text "Well, better get" line "back to work!" done -_UnnamedText_1a261: ; 841c4 (21:41c4) +_UnnamedText_1a261:: ; 841c4 (21:41c4) text "Oh dear, oh dear." line "Help me please!" done -_UnnamedText_1a266: ; 841e7 (21:41e7) +_UnnamedText_1a266:: ; 841e7 (21:41e7) text "We got engaged!" line "Heheh!" done -_UnnamedText_1a278: ; 841ff (21:41ff) +_UnnamedText_1a278:: ; 841ff (21:41ff) text "Look at him! He's" line "such a coward!" done -_UnnamedText_1a27d: ; 84220 (21:4220) +_UnnamedText_1a27d:: ; 84220 (21:4220) text "I feel so sorry" line "for him, I have" cont "to marry him!" done -_UnnamedText_1a28f: ; 8424f (21:424f) +_UnnamedText_1a28f:: ; 8424f (21:424f) text "TEAM ROCKET is" line "trying to conquer" cont "the world with" cont "#MON!" done -_UnnamedText_1a294: ; 84286 (21:4286) +_UnnamedText_1a294:: ; 84286 (21:4286) text "TEAM ROCKET ran" line "because of you!" done -_UnnamedText_1a2a6: ; 842a7 (21:42a7) +_UnnamedText_1a2a6:: ; 842a7 (21:42a7) text "They must have" line "targeted SILPH" cont "for our #MON" cont "products." done -_UnnamedText_1a2ab: ; 842dd (21:42dd) +_UnnamedText_1a2ab:: ; 842dd (21:42dd) text "Come work for" line "SILPH when you" cont "get older!" done -_SilphCo6BattleText2: ; 84306 (21:4306) +_SilphCo6BattleText2:: ; 84306 (21:4306) text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo6EndBattleText2: ; 8432a (21:432a) +_SilphCo6EndBattleText2:: ; 8432a (21:432a) text "Flame" line "out!" prompt -_SilphCo6AfterBattleText2: ; 84336 (21:4336) +_SilphCo6AfterBattleText2:: ; 84336 (21:4336) text "No matter!" line "My brothers will" cont "avenge me!" done -_SilphCo6BattleText3: ; 8435e (21:435e) +_SilphCo6BattleText3:: ; 8435e (21:435e) text "That rotten" line "PRESIDENT!" @@ -80,27 +80,27 @@ _SilphCo6BattleText3: ; 8435e (21:435e) cont "TIKSI BRANCH!" done -_SilphCo6EndBattleText3: ; 843a4 (21:43a4) +_SilphCo6EndBattleText3:: ; 843a4 (21:43a4) text "Shoot!" prompt -_SilphCo6AfterBattleText3: ; 843ac (21:43ac) +_SilphCo6AfterBattleText3:: ; 843ac (21:43ac) text "TIKSI BRANCH?" line "It's in Russian" cont "no man's land!" done -_SilphCo6BattleText4: ; 843d8 (21:43d8) +_SilphCo6BattleText4:: ; 843d8 (21:43d8) text "You dare betray" line "TEAM ROCKET?" done -_SilphCo6EndBattleText4: ; 843f6 (21:43f6) +_SilphCo6EndBattleText4:: ; 843f6 (21:43f6) text "You" line "traitor!" prompt -_SilphCo6AfterBattleText4: ; 84404 (21:4404) +_SilphCo6AfterBattleText4:: ; 84404 (21:4404) text "If you stand for" line "justice, you" cont "betray evil!" |
