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 @@
_SilphCoPresidentText:: ; 84e9b (21:4e9b)
_SilphCoPresidentText::
text "PRESIDENT: Thank"
line "you for saving"
cont "SILPH!"
@ -19,13 +19,13 @@ _SilphCoPresidentText:: ; 84e9b (21:4e9b)
line "will do!"
prompt
_ReceivedSilphCoMasterBallText:: ; 84f63 (21:4f63)
_ReceivedSilphCoMasterBallText::
text $52, " got a"
line "@"
TX_RAM wcf4b
text "!@@"
_SilphCo10Text_6231c:: ; 84f74 (21:4f74)
_SilphCo10Text_6231c::
text "PRESIDENT: You"
line "can't buy that"
cont "anywhere!"
@ -43,12 +43,12 @@ _SilphCo10Text_6231c:: ; 84f74 (21:4f74)
cont "it, though."
done
_SilphCoMasterBallNoRoomText:: ; 85013 (21:5013)
_SilphCoMasterBallNoRoomText::
text "You have no"
line "room for this."
done
_SilphCo11Text2:: ; 8502f (21:502f)
_SilphCo11Text2::
text "SECRETARY: Thank"
line "you for rescuing"
cont "all of us!"
@ -57,12 +57,8 @@ _SilphCo11Text2:: ; 8502f (21:502f)
line "courage."
done
_SilphCo11Text3:: ; 85075 (21:5075)
IF DEF(_YELLOW)
text "Ah, ", $52, "!"
ELSE
_SilphCo11Text3::
text "Ah ", $52, "!"
ENDC
line "So we meet again!"
para "The PRESIDENT and"
@ -74,20 +70,16 @@ ENDC
line "out of grown-up"
cont "matters..."
IF DEF(_YELLOW)
para "or, experience a"
ELSE
para "Or, experience a"
ENDC
line "world of pain!"
done
_SilphCo10Text_62330:: ; 85119 (21:5119)
_SilphCo10Text_62330::
text "Arrgh!!"
line "I lost again!?"
prompt
_SilphCo10Text_62335:: ; 85131 (21:5131)
_SilphCo10Text_62335::
text "Blast it all!"
line "You ruined our"
cont "plans for SILPH!"
@ -104,39 +96,39 @@ _SilphCo10Text_62335:: ; 85131 (21:5131)
line "shall return!"
done
_SilphCo11BattleText1:: ; 851d6 (21:51d6)
_SilphCo11BattleText1::
text "Stop right there!"
line "Don't you move!"
done
_SilphCo11EndBattleText1:: ; 851f8 (21:51f8)
_SilphCo11EndBattleText1::
text "Don't..."
line "Please!"
prompt
_SilphCo11AfterBattleText1:: ; 85209 (21:5209)
_SilphCo11AfterBattleText1::
text "So, you want to"
line "see my BOSS?"
done
_SilphCo11BattleText2:: ; 85227 (21:5227)
_SilphCo11BattleText2::
text "Halt! Do you have"
line "an appointment"
cont "with my BOSS?"
done
_SilphCo11EndBattleText2:: ; 85257 (21:5257)
_SilphCo11EndBattleText2::
text "Gaah!"
line "Demolished!"
prompt
_SilphCo11AfterBattleText2:: ; 8526a (21:526a)
_SilphCo11AfterBattleText2::
text "Watch your step,"
line "my BOSS likes his"
cont "#MON tough!"
done
_SilphCo10Text_6237b:: ; 8529a (21:529a)
_SilphCo10Text_6237b::
text "The monitor has"
line "#MON on it!"
done