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,88 +1,88 @@
_SSAnne10Text8:: ; 81aaa (20:5aaa)
_SSAnne10Text8::
text "MACHOKE: Gwoh!"
line "Goggoh!@@"
_SSAnne10BattleText1:: ; 81ac3 (20:5ac3)
_SSAnne10BattleText1::
text "You know what they"
line "say about sailors"
cont "and fighting!"
done
_SSAnne10EndBattleText1:: ; 81af7 (20:5af7)
_SSAnne10EndBattleText1::
text "Right!"
line "Good fight, mate!"
prompt
_SSAnne10AfterBattleText1:: ; 81b11 (20:5b11)
_SSAnne10AfterBattleText1::
text "Haha! Want to be"
line "a sailor, mate?"
done
_SSAnne10BattleText2:: ; 81b33 (20:5b33)
_SSAnne10BattleText2::
text "My sailor's pride"
line "is at stake!"
done
_SSAnne10EndBattleText2:: ; 81b52 (20:5b52)
_SSAnne10EndBattleText2::
text "Your"
line "spirit sank me!"
prompt
_SSAnne10AfterBattleText2:: ; 81b68 (20:5b68)
_SSAnne10AfterBattleText2::
text "Did you see the"
line "FISHING GURU in"
cont "VERMILION CITY?"
done
_SSAnne10BattleText3:: ; 81b99 (20:5b99)
_SSAnne10BattleText3::
text "Us sailors have"
line "#MON too!"
done
_SSAnne10EndBattleText3:: ; 81bb4 (20:5bb4)
_SSAnne10EndBattleText3::
text "OK, "
line "you're not bad."
prompt
_SSAnne10AfterBattleText3:: ; 81bc9 (20:5bc9)
_SSAnne10AfterBattleText3::
text "We caught all our"
line "#MON while"
cont "out at sea!"
done
_SSAnne10BattleText4:: ; 81bf3 (20:5bf3)
_SSAnne10BattleText4::
text "I like feisty"
line "kids like you!@@"
_SSAnne10EndBattleText4:: ; 81c12 (20:5c12)
_SSAnne10EndBattleText4::
text "Argh!"
line "Lost it!"
prompt
_SSAnne10AfterBattleText4:: ; 81c22 (20:5c22)
_SSAnne10AfterBattleText4::
text "Sea #MON live"
line "in deep water."
cont "You'll need a ROD!"
done
_SSAnne10BattleText5:: ; 81c52 (20:5c52)
_SSAnne10BattleText5::
text "Matey, you're"
line "walking the plank"
cont "if you lose!"
done
_SSAnne10EndBattleText5:: ; 81c7f (20:5c7f)
_SSAnne10EndBattleText5::
text "Argh!"
line "Beaten by a kid!"
prompt
_SSAnne10AfterBattleText5:: ; 81c97 (20:5c97)
_SSAnne10AfterBattleText5::
text "Jellyfish some-"
line "times drift into"
cont "the ship."
done
_SSAnne10BattleText6:: ; 81cc3 (20:5cc3)
_SSAnne10BattleText6::
text "Hello stranger!"
line "Stop and chat!"
@ -90,19 +90,19 @@ _SSAnne10BattleText6:: ; 81cc3 (20:5cc3)
line "are from the sea!"
done
_SSAnne10EndBattleText6:: ; 81d01 (20:5d01)
_SSAnne10EndBattleText6::
text "Darn!"
line "I let that one"
cont "get away!"
prompt
_SSAnne10AfterBattleText6:: ; 81d21 (20:5d21)
_SSAnne10AfterBattleText6::
text "I was going to"
line "make you my"
cont "assistant too!"
done
_SSAnne10Text7:: ; 81d4c (20:5d4c)
_SSAnne10Text7::
text "My buddy, MACHOKE,"
line "is super strong!"