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/pokemon_tower_7f.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/pokemon_tower_7f.asm')
| -rw-r--r-- | text/maps/pokemon_tower_7f.asm | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm index 2c1449b1..704a71eb 100644 --- a/text/maps/pokemon_tower_7f.asm +++ b/text/maps/pokemon_tower_7f.asm @@ -1,30 +1,4 @@ -IF DEF(_YELLOW) -_PokemonTowerJessieJamesText1:: - text "Stop right there!@@" - -_PokemonTowerJessieJamesText2:: - text "Grampa here wanted" - line "to complain, so" - cont "we're setting him" - cont "straight." - - para "So render yourself" - line "invisible, or" - cont "prepare to fight!" - done - -_PokemonTowerJessieJamesText3:: - text "You" - line "will regret this!" - prompt - -_PokemonTowerJessieJamesText4:: - text "Looks like TEAM" - line "ROCKET's blasting" - cont "off again!@@" -ENDC - -_TowerRescueFujiText:: ; 99c1a (26:5c1a) +_TowerRescueFujiText:: text "MR.FUJI: Heh? You" line "came to save me?" @@ -50,21 +24,21 @@ _TowerRescueFujiText:: ; 99c1a (26:5c1a) cont "of this tower." done -_PokemonTower7BattleText1:: ; 99d31 (26:5d31) +_PokemonTower7BattleText1:: text "What do you want?" line "Why are you here?" done -_PokemonTower7EndBattleText1:: ; 99d56 (26:5d56) +_PokemonTower7EndBattleText1:: text "I give up!" prompt -_PokemonTower7AfterBattleText1:: ; 99d62 (26:5d62) +_PokemonTower7AfterBattleText1:: text "I'm not going to" line "forget this!" done -_PokemonTower7BattleText2:: ; 99d80 (26:5d80) +_PokemonTower7BattleText2:: text "This old guy came" line "and complained" cont "about us harming" @@ -74,12 +48,12 @@ _PokemonTower7BattleText2:: ; 99d80 (26:5d80) line "over as adults!" done -_PokemonTower7EndBattleText2:: ; 99de1 (26:5de1) +_PokemonTower7EndBattleText2:: text "Please!" line "No more!" prompt -_PokemonTower7AfterBattleText2:: ; 99df3 (26:5df3) +_PokemonTower7AfterBattleText2:: text "#MON are only" line "good for making" cont "money!" @@ -88,18 +62,17 @@ _PokemonTower7AfterBattleText2:: ; 99df3 (26:5df3) line "business!" done -_PokemonTower7BattleText3:: ; 99e33 (26:5e33) +_PokemonTower7BattleText3:: text "You're not saving" line "anyone, kid!" done -_PokemonTower7EndBattleText3:: ; 99e52 (26:5e52) +_PokemonTower7EndBattleText3:: text "Don't" line "fight us ROCKETs!" prompt -_PokemonTower7AfterBattleText3:: ; 99e6a (26:5e6a) +_PokemonTower7AfterBattleText3:: text "You're not getting" line "away with this!" done - |