diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /text/maps/silph_co_5f_1.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/silph_co_5f_1.asm')
| -rw-r--r-- | text/maps/silph_co_5f_1.asm | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/text/maps/silph_co_5f_1.asm b/text/maps/silph_co_5f_1.asm index 7435c910..dab42539 100644 --- a/text/maps/silph_co_5f_1.asm +++ b/text/maps/silph_co_5f_1.asm @@ -1,56 +1,51 @@ -_SilphCo5Text_1a010:: ; 82936 (20:6936) +_SilphCo5Text_1a010:: text "TEAM ROCKET is" line "in an uproar over" cont "some intruder." cont "That's you right?" done -_SilphCo5Text_1a015:: ; 82978 (20:6978) +_SilphCo5Text_1a015:: text "TEAM ROCKET took" line "off! You're our" cont "hero! Thank you!" done -_SilphCo5BattleText2:: ; 829aa (20:69aa) +_SilphCo5BattleText2:: text "I heard a kid was" line "wandering around." done -_SilphCo5EndBattleText2:: ; 829cf (20:69cf) +_SilphCo5EndBattleText2:: text "Boom!" prompt -_SilphCo5AfterBattleText2:: ; 829d6 (20:69d6) +_SilphCo5AfterBattleText2:: text "It's not smart" line "to pick a fight" cont "with TEAM ROCKET!" done -_SilphCo5BattleText3:: ; 82a07 (20:6a07) +_SilphCo5BattleText3:: text "We study #" line "BALL technology" cont "on this floor!" done -_SilphCo5EndBattleText3:: ; 82a32 (20:6a32) +_SilphCo5EndBattleText3:: text "Dang!" line "Blast it!" prompt -_SilphCo5AfterBattleText3:: ; 82a43 (20:6a43) +_SilphCo5AfterBattleText3:: text "We worked on the" line "ultimate #" cont "BALL which would" cont "catch anything!" done -_SilphCo5BattleText4:: ; 82a81 (20:6a81) +_SilphCo5BattleText4:: text "Whaaat? There" line "shouldn't be any" -IF DEF(_YELLOW) - cont "children here!" -ELSE cont "children here?" -ENDC done - |