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,9 +1,9 @@
_CeladonMartRoofText_484ee:: ; 9cbb5 (27:4bb5)
_CeladonMartRoofText_484ee::
text "Give her which"
line "drink?"
done
_CeladonMartRoofText_484f3:: ; 9cbcc (27:4bcc)
_CeladonMartRoofText_484f3::
text "Yay!"
para "FRESH WATER!"
@ -13,13 +13,13 @@ _CeladonMartRoofText_484f3:: ; 9cbcc (27:4bcc)
para "You can have this"
line "from me!@@"
_CeladonMartRoofText_484f9:: ; 9cc06 (27:4c06)
_CeladonMartRoofText_484f9::
text $52, " received"
line "@"
TX_RAM wcf4b
text "!@@"
_CeladonMartRoofText_484fe:: ; 9cc1a (27:4c1a)
_CeladonMartRoofText_484fe::
db $0
para "@"
TX_RAM wcf4b
@ -29,7 +29,7 @@ _CeladonMartRoofText_484fe:: ; 9cc1a (27:4c1a)
para "It can freeze the"
line "target sometimes!@@"
_CeladonMartRoofText_48504:: ; 9cc5a (27:4c5a)
_CeladonMartRoofText_48504::
text "Yay!"
para "SODA POP!"
@ -39,27 +39,23 @@ _CeladonMartRoofText_48504:: ; 9cc5a (27:4c5a)
para "You can have this"
line "from me!@@"
_CeladonMartRoofText_4850a:: ; 9cc91 (27:4c91)
_CeladonMartRoofText_4850a::
text $52, " received"
line "@"
TX_RAM wcf4b
text "!@@"
_CeladonMartRoofText_4850f:: ; 9cca5 (27:4ca5)
_CeladonMartRoofText_4850f::
db $0
para "@"
TX_RAM wcf4b
text " contains"
IF DEF(_YELLOW)
line "ROCK SLIDE!@@"
ELSE
line "ROCK SLIDE!"
para "It can spook the"
line "target sometimes!@@"
ENDC
_CeladonMartRoofText_48515:: ; 9cce6 (27:4ce6)
_CeladonMartRoofText_48515::
text "Yay!"
para "LEMONADE!"
@ -69,25 +65,25 @@ _CeladonMartRoofText_48515:: ; 9cce6 (27:4ce6)
para "You can have this"
line "from me!@@"
_ReceivedTM49Text:: ; 9cd1d (27:4d1d)
_ReceivedTM49Text::
text $52, " received"
line "TM49!@@"
_CeladonMartRoofText_48520:: ; 9cd30 (27:4d30)
_CeladonMartRoofText_48520::
db $0
para "TM49 contains"
line "TRI ATTACK!@@"
_CeladonMartRoofText_48526:: ; 9cd4d (27:4d4d)
_CeladonMartRoofText_48526::
text "You don't have"
line "space for this!@@"
_CeladonMartRoofText_4852c:: ; 9cd6d (27:4d6d)
_CeladonMartRoofText_4852c::
text "No thank you!"
line "I'm not thirsty"
cont "after all!@@"
_CeladonMartRoofText1:: ; 9cd97 (27:4d97)
_CeladonMartRoofText1::
text "My sister is a"
line "trainer, believe"
cont "it or not."
@ -97,13 +93,13 @@ _CeladonMartRoofText1:: ; 9cd97 (27:4d97)
cont "drives me nuts!"
done
_CeladonMartRoofText_48598:: ; 9cdee (27:4dee)
_CeladonMartRoofText_48598::
text "I'm thirsty!"
line "I want something"
cont "to drink!"
done
_CeladonMartRoofText4:: ; 9ce16 (27:4e16)
_CeladonMartRoofText4::
text "I'm thirsty!"
line "I want something"
cont "to drink!"
@ -111,33 +107,33 @@ _CeladonMartRoofText4:: ; 9ce16 (27:4e16)
para "Give her a drink?"
done
_CeladonMartRoofText6:: ; 9ce50 (27:4e50)
_CeladonMartRoofText6::
text "ROOFTOP SQUARE:"
line "VENDING MACHINES"
done
_VendingMachineText1:: ; 9ce72 (27:4e72)
_VendingMachineText1::
text "A vending machine!"
line "Here's the menu!"
prompt
_VendingMachineText4:: ; 9ce96 (27:4e96)
_VendingMachineText4::
text "Oops, not enough"
line "money!"
done
_VendingMachineText5:: ; 9ceaf (27:4eaf)
_VendingMachineText5::
TX_RAM wcf4b
db $0
line "popped out!"
done
_VendingMachineText6:: ; 9cec0 (27:4ec0)
_VendingMachineText6::
text "There's no more"
line "room for stuff!"
done
_VendingMachineText7:: ; 9cee0 (27:4ee0)
_VendingMachineText7::
text "Not thirsty!"
done