aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/route_22.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-08 01:52:50 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-01 17:16:11 -0400
commit10af88ddd712415f2a0a2b6124187d51075c95d5 (patch)
tree0fe1145438b5cc645f95fe190b9f418cf73dedc7 /text/maps/route_22.asm
parentAttempt to make Yellow buildable, part 2. (diff)
downloadpokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.tar.gz
pokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.tar.xz
pokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.zip
text.o
Conflicts: main.asm text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm wram.asm yellow/text.asm
Diffstat (limited to 'text/maps/route_22.asm')
-rw-r--r--text/maps/route_22.asm66
1 files changed, 33 insertions, 33 deletions
diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
index 9935ce80..052fd331 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -1,3 +1,36 @@
+_Route22RivalDefeatedText1:: ; 923f4 (24:63f4)
+ text "Awww!"
+ line "You just lucked"
+ cont "out!"
+ prompt
+
+_Route22Text_511bc:: ; 92410 (24:6410)
+ text $53, ": What?"
+ line "Why do I have 2"
+ cont "#MON?"
+
+ para "You should catch"
+ cont "some more too!"
+ prompt
+
+_Route22RivalDefeatedText2:: ; 92583 (24:6583)
+ text "What!?"
+
+ para "I was just"
+ line "careless!"
+ prompt
+
+_Route22Text_511d0:: ; 925a0 (24:65a0)
+ text $53, ": Hahaha!"
+ line $52, "! That's"
+ cont "your best? You're"
+ cont "nowhere near as"
+ cont "good as me, pal!"
+
+ para "Go train some"
+ line "more! You loser!"
+ prompt
+
_Route22RivalBeforeBattleText1:: ; 922cd (24:62cd)
text $53, ": Hey!"
line $52, "!"
@@ -31,21 +64,6 @@ _Route22RivalAfterBattleText1:: ; 9236f (24:636f)
cont "a move on!"
done
-_Route22RivalDefeatedText1:: ; 923f4 (24:63f4)
- text "Awww!"
- line "You just lucked"
- cont "out!"
- prompt
-
-_Route22Text_511bc:: ; 92410 (24:6410)
- text $53, ": What?"
- line "Why do I have 2"
- cont "#MON?"
-
- para "You should catch"
- cont "some more too!"
- prompt
-
_Route22RivalBeforeBattleText2:: ; 92450 (24:6450)
text $53, ": What?"
line $52, "! What a"
@@ -86,24 +104,6 @@ _Route22RivalAfterBattleText2:: ; 92506 (24:6506)
cont "here. Smell ya!"
done
-_Route22RivalDefeatedText2:: ; 92583 (24:6583)
- text "What!?"
-
- para "I was just"
- line "careless!"
- prompt
-
-_Route22Text_511d0:: ; 925a0 (24:65a0)
- text $53, ": Hahaha!"
- line $52, "! That's"
- cont "your best? You're"
- cont "nowhere near as"
- cont "good as me, pal!"
-
- para "Go train some"
- line "more! You loser!"
- prompt
-
_Route22FrontGateText:: ; 92606 (24:6606)
text "#MON LEAGUE"
line "Front Gate"