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,33 +1,25 @@
_CeladonCityText1:: ; a59fb (29:59fb)
_CeladonCityText1::
text "I got my KOFFING"
IF DEF(_YELLOW)
line "from my friend!"
para "We get along now,"
line "because I was"
cont "very nice to it!"
ELSE
line "in CINNABAR!"
para "It's nice, but it"
line "breathes poison"
cont "when it's angry!"
ENDC
done
_CeladonCityText2:: ; a5a4b (29:5a4b)
_CeladonCityText2::
text "Heheh! This GYM"
line "is great! It's"
cont "full of women!"
done
_CeladonCityText3:: ; a5a79 (29:5a79)
_CeladonCityText3::
text "The GAME CORNER"
line "is bad for our"
cont "city's image!"
done
_CeladonCityText4:: ; a5aa6 (29:5aa6)
_CeladonCityText4::
text "Moan! I blew it"
line "all at the slots!"
@ -36,7 +28,7 @@ _CeladonCityText4:: ; a5aa6 (29:5aa6)
cont "coins for prizes!"
done
_TM41PreText:: ; a5afd (29:5afd)
_TM41PreText::
text "Hello, there!"
para "I've seen you,"
@ -47,13 +39,13 @@ _TM41PreText:: ; a5afd (29:5afd)
line "dropping by!"
prompt
_ReceivedTM41Text:: ; a5b5a (29:5b5a)
_ReceivedTM41Text::
text $52, " received"
line "@"
TX_RAM wcf4b
text "!@@"
_TM41ExplanationText:: ; a5b6e (29:5b6e)
_TM41ExplanationText::
text "TM41 teaches"
line "SOFTBOILED!"
@ -64,12 +56,12 @@ _TM41ExplanationText:: ; a5b6e (29:5b6e)
line "CHANSEY!"
done
_TM41NoRoomText:: ; a5bb8 (29:5bb8)
_TM41NoRoomText::
text "Oh, your pack is"
line "full of items!"
done
_CeladonCityText6:: ; a5bd9 (29:5bd9)
_CeladonCityText6::
text "This is my trusted"
line "pal, POLIWRATH!"
@ -78,21 +70,21 @@ _CeladonCityText6:: ; a5bd9 (29:5bd9)
cont "used WATER STONE!"
done
_CeladonCityText7:: ; a5c30 (29:5c30)
_CeladonCityText7::
text "POLIWRATH: Ribi"
line "ribit!@@"
_CeladonCityText8:: ; a5c49 (29:5c49)
_CeladonCityText8::
text "What are you"
line "staring at?"
done
_CeladonCityText9:: ; a5c63 (29:5c63)
_CeladonCityText9::
text "Keep out of TEAM"
line "ROCKET's way!"
done
_CeladonCityText10:: ; a5c82 (29:5c82)
_CeladonCityText10::
text "TRAINER TIPS"
para "X ACCURACY boosts"
@ -108,36 +100,32 @@ _CeladonCityText10:: ; a5c82 (29:5c82)
cont "STORE!"
done
_CeladonCityText11:: ; a5d18 (29:5d18)
_CeladonCityText11::
text "CELADON CITY"
line "The City of"
cont "Rainbow Dreams"
done
_CeladonCityText13:: ; a5d41 (29:5d41)
_CeladonCityText13::
text "CELADON CITY"
line "#MON GYM"
cont "LEADER: ERIKA"
IF DEF(_YELLOW)
para "The Nature-Loving"
ELSE
para "The Nature Loving"
ENDC
line "Princess!"
done
_CeladonCityText14:: ; a5d82 (29:5d82)
_CeladonCityText14::
text "CELADON MANSION"
done
_CeladonCityText15:: ; a5d93 (29:5d93)
_CeladonCityText15::
text "Find what you"
line "need at CELADON"
cont "DEPT. STORE!"
done
_CeladonCityText16:: ; a5dbf (29:5dbf)
_CeladonCityText16::
text "TRAINER TIPS"
para "GUARD SPEC."
@ -151,19 +139,15 @@ _CeladonCityText16:: ; a5dbf (29:5dbf)
cont "STORE!"
done
_CeladonCityText17:: ; a5e3e (29:5e3e)
_CeladonCityText17::
text "Coins exchanged"
line "for prizes!"
cont "PRIZE EXCHANGE"
done
_CeladonCityText18:: ; a5e6a (29:5e6a)
_CeladonCityText18::
text "ROCKET GAME CORNER"
line "The playground"
IF DEF(_YELLOW)
cont "for grownups!"
ELSE
cont "for grown-ups!"
ENDC
done