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 @@
_ViridianForestText1:: ; 8031d (20:431d)
_ViridianForestText1::
text "I came here with"
line "some friends!"
@ -6,57 +6,53 @@ _ViridianForestText1:: ; 8031d (20:431d)
line "#MON fights!"
done
_ViridianForestBattleText1:: ; 80359 (20:4359)
_ViridianForestBattleText1::
text "Hey! You have"
line "#MON! Come on!"
IF DEF(_YELLOW)
cont "Let's battle 'em!"
ELSE
cont "Let's battle'em!"
ENDC
done
_ViridianForestEndBattleText1:: ; 80387 (20:4387)
_ViridianForestEndBattleText1::
text "No!"
line "CATERPIE can't"
cont "cut it!"
prompt
_ViridianFrstAfterBattleText1:: ; 803a2 (20:43a2)
_ViridianFrstAfterBattleText1::
text "Ssh! You'll scare"
line "the bugs away!"
done
_ViridianForestBattleText2:: ; 803c3 (20:43c3)
_ViridianForestBattleText2::
text "Yo! You can't jam"
line "out if you're a"
cont "#MON trainer!"
done
_ViridianForestEndBattleText2:: ; 803f2 (20:43f2)
_ViridianForestEndBattleText2::
text "Huh?"
line "I ran out of"
cont "#MON!"
prompt
_ViridianFrstAfterBattleText2:: ; 8040b (20:440b)
_ViridianFrstAfterBattleText2::
text "Darn! I'm going"
line "to catch some"
cont "stronger ones!"
done
_ViridianForestBattleText3:: ; 80438 (20:4438)
_ViridianForestBattleText3::
text "Hey, wait up!"
line "What's the hurry?"
done
_ViridianForestEndBattleText3:: ; 80458 (20:4458)
_ViridianForestEndBattleText3::
text "I"
line "give! You're good"
cont "at this!"
prompt
_ViridianFrstAfterBattleText3:: ; 80475 (20:4475)
_ViridianFrstAfterBattleText3::
text "Sometimes, you"
line "can find stuff on"
cont "the ground!"
@ -66,43 +62,7 @@ _ViridianFrstAfterBattleText3:: ; 80475 (20:4475)
cont "dropped!"
done
if DEF(_YELLOW)
_ViridianForestBattleTextPikaGirl::
text "Hi, do you have a"
line "PIKACHU?"
done
_ViridianForestEndBattleTextPikaGirl::
text "Oh no,"
line "really?"
prompt
_ViridianForestAfterBattleTextPikaGirl::
text "I looked forever,"
line "but I never found"
cont "a PIKACHU here!"
done
_ViridianForestBattleTextSamurai::
text "I'm gonna be the"
line "best. You just"
cont "can't beat me!"
done
_ViridianForestEndBattleTextSamurai::
text "After"
line "all I did..."
prompt
_ViridianForestAfterBattleTextSamurai::
text "A METAPOD is cool"
line "because its"
cont "attack is its"
cont "defense!"
done
ENDC
_ViridianForestText8:: ; 804c7 (20:44c7)
_ViridianForestText8::
text "I ran out of #"
line "BALLs to catch"
cont "#MON with!"
@ -111,7 +71,7 @@ _ViridianForestText8:: ; 804c7 (20:44c7)
line "extras!"
done
_ViridianForestText9:: ; 8050a (20:450a)
_ViridianForestText9::
text "TRAINER TIPS"
para "If you want to"
@ -120,13 +80,13 @@ _ViridianForestText9:: ; 8050a (20:450a)
cont "grassy areas!"
done
_ViridianForestText10:: ; 80553 (20:4553)
_ViridianForestText10::
text "For poison, use"
line "ANTIDOTE! Get it"
cont "at #MON MARTs!"
done
_ViridianForestText11:: ; 80584 (20:4584)
_ViridianForestText11::
text "TRAINER TIPS"
para "Contact PROF.OAK"
@ -135,7 +95,7 @@ _ViridianForestText11:: ; 80584 (20:4584)
cont "evaluated!"
done
_ViridianForestText12:: ; 805c6 (20:45c6)
_ViridianForestText12::
text "TRAINER TIPS"
para "No stealing of"
@ -145,7 +105,7 @@ _ViridianForestText12:: ; 805c6 (20:45c6)
cont "#MON!"
done
_ViridianForestText13:: ; 80613 (20:4613)
_ViridianForestText13::
text "TRAINER TIPS"
para "Weaken #MON"
@ -156,7 +116,7 @@ _ViridianForestText13:: ; 80613 (20:4613)
line "they may escape!"
done
_ViridianForestText14:: ; 80667 (20:4667)
_ViridianForestText14::
text "LEAVING"
line "VIRIDIAN FOREST"
cont "PEWTER CITY AHEAD"