Improve diffability with pokeyellow; remove address comments and ifs.

This commit is contained in:
IIMarckus 2015-12-06 14:04:42 -07:00
parent f3b3e21e04
commit f33bd1d89e
208 changed files with 1923 additions and 2888 deletions

View file

@ -1,4 +1,4 @@
_Route22RivalBeforeBattleText1:: ; 922cd (24:62cd)
_Route22RivalBeforeBattleText1::
text $53, ": Hey!"
line $52, "!"
@ -17,7 +17,7 @@ _Route22RivalBeforeBattleText1:: ; 922cd (24:62cd)
cont "get any stronger?"
done
_Route22RivalAfterBattleText1:: ; 9236f (24:636f)
_Route22RivalAfterBattleText1::
text "I heard #MON"
line "LEAGUE has many"
cont "tough trainers!"
@ -31,13 +31,13 @@ _Route22RivalAfterBattleText1:: ; 9236f (24:636f)
cont "a move on!"
done
_Route22RivalDefeatedText1:: ; 923f4 (24:63f4)
_Route22RivalDefeatedText1::
text "Awww!"
line "You just lucked"
cont "out!"
prompt
_Route22Text_511bc:: ; 92410 (24:6410)
_Route22Text_511bc::
text $53, ": What?"
line "Why do I have 2"
cont "#MON?"
@ -46,7 +46,7 @@ _Route22Text_511bc:: ; 92410 (24:6410)
cont "some more too!"
prompt
_Route22RivalBeforeBattleText2:: ; 92450 (24:6450)
_Route22RivalBeforeBattleText2::
text $53, ": What?"
line $52, "! What a"
cont "surprise to see"
@ -59,21 +59,15 @@ _Route22RivalBeforeBattleText2:: ; 92450 (24:6450)
line "the BADGEs too?"
cont "That's cool!"
IF DEF(_YELLOW)
para "Then I'll whip"
line "you, ", $52, ", as"
cont "a warmup for"
ELSE
para "Then I'll whip you"
line $52, " as a"
cont "warm up for"
ENDC
cont "#MON LEAGUE!"
para "Come on!"
done
_Route22RivalAfterBattleText2:: ; 92506 (24:6506)
_Route22RivalAfterBattleText2::
text "That loosened me"
line "up! I'm ready for"
cont "#MON LEAGUE!"
@ -86,14 +80,14 @@ _Route22RivalAfterBattleText2:: ; 92506 (24:6506)
cont "here. Smell ya!"
done
_Route22RivalDefeatedText2:: ; 92583 (24:6583)
_Route22RivalDefeatedText2::
text "What!?"
para "I was just"
line "careless!"
prompt
_Route22Text_511d0:: ; 925a0 (24:65a0)
_Route22Text_511d0::
text $53, ": Hahaha!"
line $52, "! That's"
cont "your best? You're"
@ -104,7 +98,7 @@ _Route22Text_511d0:: ; 925a0 (24:65a0)
line "more! You loser!"
prompt
_Route22FrontGateText:: ; 92606 (24:6606)
_Route22FrontGateText::
text "#MON LEAGUE"
line "Front Gate"
done