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 @@
_FightingDojoText_5ce8e:: ; a1852 (28:5852)
_FightingDojoText_5ce8e::
text "Grunt!"
para "I am the KARATE"
@ -12,12 +12,12 @@ _FightingDojoText_5ce8e:: ; a1852 (28:5852)
para "Fwaaa!"
done
_FightingDojoText_5ce93:: ; a18ba (28:58ba)
_FightingDojoText_5ce93::
text "Hwa!"
line "Arrgh! Beaten!"
prompt
_FightingDojoText_5ce98:: ; a18cf (28:58cf)
_FightingDojoText_5ce98::
text "Indeed, I have"
line "lost!"
@ -34,24 +34,24 @@ _FightingDojoText_5ce98:: ; a18cf (28:58cf)
line "one you like!"
done
_FightingDojoText_5ce9d:: ; a1972 (28:5972)
_FightingDojoText_5ce9d::
text "Ho!"
para "Stay and train at"
line "Karate with us!"
done
_FightingDojoBattleText1:: ; a1999 (28:5999)
_FightingDojoBattleText1::
text "Hoargh! Take your"
line "shoes off!"
done
_FightingDojoEndBattleText1:: ; a19b7 (28:59b7)
_FightingDojoEndBattleText1::
text "I give"
line "up!"
prompt
_FightingDojoAfterBattleText1:: ; a19c3 (28:59c3)
_FightingDojoAfterBattleText1::
text "You wait 'til you"
line "see our Master!"
@ -59,22 +59,22 @@ _FightingDojoAfterBattleText1:: ; a19c3 (28:59c3)
line "compared to him!"
done
_FightingDojoBattleText2:: ; a1a05 (28:5a05)
_FightingDojoBattleText2::
text "I hear you're"
line "good! Show me!"
done
_FightingDojoEndBattleText2:: ; a1a22 (28:5a22)
_FightingDojoEndBattleText2::
text "Judge!"
line "1 point!"
prompt
_FightingDojoAfterBattleText2:: ; a1a33 (28:5a33)
_FightingDojoAfterBattleText2::
text "Our Master is a"
line "pro fighter!"
done
_FightingDojoBattleText3:: ; a1a51 (28:5a51)
_FightingDojoBattleText3::
text "Nothing tough"
line "frightens me!"
@ -82,18 +82,18 @@ _FightingDojoBattleText3:: ; a1a51 (28:5a51)
line "for training!"
done
_FightingDojoEndBattleText3:: ; a1a8d (28:5a8d)
_FightingDojoEndBattleText3::
text "Yow!"
line "Stubbed fingers!"
prompt
_FightingDojoAfterBattleText3:: ; a1aa4 (28:5aa4)
_FightingDojoAfterBattleText3::
text "The only thing"
line "that frightens us"
cont "is psychic power!"
done
_FightingDojoBattleText4:: ; a1ad8 (28:5ad8)
_FightingDojoBattleText4::
text "Hoohah!"
para "You're trespassing"
@ -101,38 +101,30 @@ _FightingDojoBattleText4:: ; a1ad8 (28:5ad8)
cont "DOJO!"
done
_FightingDojoEndBattleText4:: ; a1b09 (28:5b09)
_FightingDojoEndBattleText4::
text "Oof!"
line "I give up!"
prompt
_FightingDojoAfterBattleText4:: ; a1b1a (28:5b1a)
_FightingDojoAfterBattleText4::
text "The prime fighters"
line "across the land"
cont "train here."
done
_WantHitmonleeText:: ; a1b4a (28:5b4a)
_WantHitmonleeText::
text "You want the"
IF DEF(_YELLOW)
line "hard-kicking"
ELSE
line "hard kicking"
ENDC
cont "HITMONLEE?"
done
_WantHitmonchanText:: ; a1b70 (28:5b70)
_WantHitmonchanText::
text "You want the"
IF DEF(_YELLOW)
line "piston-punching"
ELSE
line "piston punching"
ENDC
cont "HITMONCHAN?"
done
_OtherHitmonText:: ; a1b9a (28:5b9a)
_OtherHitmonText::
text "Better not get"
line "greedy..."
done