Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx

1 files changed, 61 insertions, 254 deletions

diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm
index 58f55b85..9aaac71c 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -1,22 +1,10 @@
-_OaksLabGaryText1:: ; 94d5b (25:4d5b)
+_OaksLabGaryText1::
 	text $53,": Yo"
 	line $52,"! Gramps"
 	cont "isn't around!"
-
-IF DEF(_YELLOW)
-	para "I ran here 'cos"
-	line "he said he had a"
-	cont "#MON for me."
-ENDC
 	done
 
-_OaksLabText40:: ; 94d79 (25:4d79)
-IF DEF(_YELLOW)
-	text $53,": Humph!"
-	line "I'll get a better"
-	cont "#MON than you!"
-	done
-ELSE
+_OaksLabText40::
 	text $53,": Heh, I"
 	line "don't need to be"
 	cont "greedy like you!"
@@ -24,105 +12,74 @@ ELSE
 	para "Go ahead and"
 	line "choose, ", $52, "!"
 	done
-ENDC
 
-_OaksLabText41:: ; 94dbd (25:4dbd)
-IF DEF(_YELLOW)
-	text $53,": Heh, my"
-ELSE
+_OaksLabText41::
 	text $53,": My"
-ENDC
 	line "#MON looks a"
 	cont "lot stronger."
 	done
 
-_OaksLabText39:: ; 94ddf (25:4ddf)
-IF DEF(_YELLOW)
-	text "That's a #"
-	line "BALL. There's a"
-	cont "#MON inside!"
-	done
-ELSE
+_OaksLabText39::
 	text "Those are #"
 	line "BALLs. They"
 	cont "contain #MON!"
 	done
-ENDC
 
-IF DEF(_YELLOW)
-_OaksLabPikachuText::
-	text "OAK: Go ahead,"
-	line "it's yours!"
-	done
-ENDC
-
-_OaksLabCharmanderText:: ; 94e06 (25:4e06)
+_OaksLabCharmanderText::
 	text "So! You want the"
 	line "fire #MON,"
 	cont "CHARMANDER?"
 	done
 
-_OaksLabSquirtleText:: ; 94e2f (25:4e2f)
+_OaksLabSquirtleText::
 	text "So! You want the"
 	line "water #MON,"
 	cont "SQUIRTLE?"
 	done
 
-_OaksLabBulbasaurText:: ; 94e57 (25:4e57)
+_OaksLabBulbasaurText::
 	text "So! You want the"
 	line "plant #MON,"
 	cont "BULBASAUR?"
 	done
 
-_OaksLabMonEnergeticText:: ; 94e80 (25:4e80)
+_OaksLabMonEnergeticText::
 	text "This #MON is"
 	line "really energetic!"
 	prompt
 
-_OaksLabReceivedMonText:: ; 94ea0 (25:4ea0)
+_OaksLabReceivedMonText::
 	text $52, " received"
 	line "a @"
 	TX_RAM wcd6d
 	text "!@@"
 
-_OaksLabLastMonText:: ; 94eb6 (25:4eb6)
+_OaksLabLastMonText::
 	text "That's PROF.OAK's"
 	line "last #MON!"
 	done
 
-_OaksLabText_1d2f0:: ; 94ed2 (25:4ed2)
+_OaksLabText_1d2f0::
 	text "OAK: Now, ", $52, ","
 	line "which #MON do"
 	cont "you want?"
 	done
 
-_OaksLabText_1d2f5:: ; 94ef8 (25:4ef8)
+_OaksLabText_1d2f5::
 	text "OAK: If a wild"
 	line "#MON appears,"
 	cont "your #MON can"
 	cont "fight against it!"
-
-IF DEF(_YELLOW)
-	para "Afterward, go on"
-	line "to the next town."
-ENDC
 	done
 
-_OaksLabText_1d2fa:: ; 94f36 (25:4f36)
-IF DEF(_YELLOW)
-	text "OAK: You should"
-	line "talk to it and"
-	cont "see how it feels."
-	done
-ELSE
+_OaksLabText_1d2fa::
 	text "OAK: ", $52, ","
 	line "raise your young"
 	cont "#MON by making"
 	cont "it fight!"
 	done
-ENDC
 
-_OaksLabDeliverParcelText1:: ; 94f69 (25:4f69)
+_OaksLabDeliverParcelText1::
 	text "OAK: Oh, ", $52, "!"
 
 	para "How is my old"
@@ -141,29 +98,21 @@ _OaksLabDeliverParcelText1:: ; 94f69 (25:4f69)
 	para $52, " delivered"
 	line "OAK's PARCEL.@@"
 
-_OaksLabDeliverParcelText2:: ; 9500f (25:500f)
+_OaksLabDeliverParcelText2::
 	db $0
 	para "Ah! This is the"
 	line "custom # BALL"
 	cont "I ordered!"
-IF DEF(_YELLOW)
-	cont "Thanks, ",$52,"!"
-
-	para "By the way, I must"
-	line "ask you to do"
-	cont "something for me."
-ELSE
 	cont "Thank you!"
-ENDC
 	done
 
-_OaksLabAroundWorldText:: ; 95045 (25:5045)
+_OaksLabAroundWorldText::
 	text "#MON around the"
 	line "world wait for"
 	cont "you, ", $52, "!"
 	done
 
-_OaksLabGivePokeballsText1:: ; 9506d (25:506d)
+_OaksLabGivePokeballsText1::
 	text "OAK: You can't get"
 	line "detailed data on"
 	cont "#MON by just"
@@ -177,18 +126,13 @@ _OaksLabGivePokeballsText1:: ; 9506d (25:506d)
 	para $52, " got 5"
 	line "# BALLs!@@"
 
-_OaksLabGivePokeballsText2:: ; 950f2 (25:50f2)
+_OaksLabGivePokeballsText2::
 	db $0
 	para "When a wild"
 	line "#MON appears,"
 	cont "it's fair game."
 
-IF DEF(_YELLOW)
-	para "Just like I showed"
-	line "you, throw a #"
-ELSE
 	para "Just throw a #"
-ENDC
 	line "BALL at it and try"
 	line "to catch it!"
 
@@ -200,7 +144,7 @@ ENDC
 	cont "have to be lucky!"
 	done
 
-_OaksLabPleaseVisitText:: ; 9519e (25:519e)
+_OaksLabPleaseVisitText::
 	text "OAK: Come see me"
 	line "sometimes."
 
@@ -209,7 +153,7 @@ _OaksLabPleaseVisitText:: ; 9519e (25:519e)
 	cont "coming along."
 	done
 
-_OaksLabText_1d31d:: ; 951e9 (25:51e9)
+_OaksLabText_1d31d::
 	text "OAK: Good to see "
 	line "you! How is your "
 	cont "#DEX coming? "
@@ -217,17 +161,17 @@ _OaksLabText_1d31d:: ; 951e9 (25:51e9)
 	cont "a look!"
 	prompt
 
-_OaksLabText_1d32c:: ; 95236 (25:5236)
+_OaksLabText_1d32c::
 	text "It's encyclopedia-"
 	line "like, but the"
 	cont "pages are blank!"
 	done
 
-_OaksLabText8:: ; 95268 (25:5268)
+_OaksLabText8::
 	text "?"
 	done
 
-_OaksLabText_1d340:: ; 9526b (25:526b)
+_OaksLabText_1d340::
 	text "PROF.OAK is the"
 	line "authority on"
 	cont "#MON!"
@@ -237,36 +181,13 @@ _OaksLabText_1d340:: ; 9526b (25:526b)
 	cont "in high regard!"
 	done
 
-_OaksLabRivalWaitingText:: ; 952bb (25:52bb)
+_OaksLabRivalWaitingText::
 	text $53, ": Gramps!"
 	line "I'm fed up with"
 	cont "waiting!"
 	done
 
-_OaksLabChooseMonText:: ; 952df (25:52df)
-IF DEF(_YELLOW)
-	text "OAK: Hmm? ",$53,"?"
-	line "Why are you here"
-	cont "already?"
-
-	para "I said for you to"
-	line "come by later..."
-
-	para "Ah, whatever!"
-	line "Just wait there."
-
-	para "Look, ",$52,"! Do"
-	line "you see that ball"
-	cont "on the table?"
-
-	para "It's called a #"
-	line "BALL. It holds a"
-	cont "#MON inside."
-
-	para "You may have it!"
-	line "Go on, take it!"
-	done
-ELSE
+_OaksLabChooseMonText::
 	text "OAK: ", $53, "?"
 	line "Let me think..."
 
@@ -293,97 +214,36 @@ ELSE
 	cont "but you can have"
 	cont "one! Choose!"
 	done
-ENDC
 
-_OaksLabRivalInterjectionText:: ; 953dc (25:53dc)
+_OaksLabRivalInterjectionText::
 	text $53, ": Hey!"
 	line "Gramps! What"
 	cont "about me?"
 	done
 
-_OaksLabBePatientText:: ; 953fc (25:53fc)
-IF DEF(_YELLOW)
-	text "OAK: Be patient,"
-	line $53,", I'll give"
-	cont "you one later."
-	done
-ELSE
+_OaksLabBePatientText::
 	text "OAK: Be patient!"
 	line $53, ", you can"
 	cont "have one too!"
 	done
-ENDC
-
-IF DEF(_YELLOW)
-_OaksLabRivalTakesText1::
-	text $53,": No way!"
-	line $52,", I want"
-	cont "this #MON!"
-	prompt
-
-_OaksLabRivalTakesText2::
-	text $53," snatched"
-	line "the #MON!@@"
-
-_OaksLabRivalTakesText3::
-	text "OAK: ",$53,"! What"
-	line "are you doing?"
-	prompt
-
-_OaksLabRivalTakesText4::
-	text $53,": Gramps, I"
-	line "want this one!"
-	prompt
-
-_OaksLabRivalTakesText5::
-	text "OAK: But, I... Oh,"
-	line "all right then."
-	cont "That #MON is"
-	cont "yours."
-
-	para "I was going to"
-	line "give you one"
-	cont "anyway..."
-
-	para $52,", come over"
-	line "here."
-	done
-
-_OaksLabOakGivesText::
-	text "OAK: ",$52,", this"
-	line "is the #MON I"
-	cont "caught earlier."
 
-	para "You can have it."
-	line "I caught it in"
-	cont "the wild and it's"
-	cont "not tame yet."
-	prompt
-
-_OaksLabReceivedText::
-	text $52," received"
-	line "a "
-	TX_RAM $CD6D
-	text "!@@"
-ENDC
-
-_OaksLabLeavingText:: ; 95427 (25:5427)
+_OaksLabLeavingText::
 	text "OAK: Hey! Don't go"
 	line "away yet!"
 	done
 
-_OaksLabRivalPickingMonText:: ; 95444 (25:5444)
+_OaksLabRivalPickingMonText::
 	text $53, ": I'll take"
 	line "this one, then!"
 	done
 
-_OaksLabRivalReceivedMonText:: ; 95461 (25:5461)
+_OaksLabRivalReceivedMonText::
 	text $53, " received"
 	line "a @"
 	TX_RAM wcd6d
 	text "!@@"
 
-_OaksLabRivalChallengeText:: ; 95477 (25:5477)
+_OaksLabRivalChallengeText::
 	text $53, ": Wait"
 	line $52, "!"
 	cont "Let's check out"
@@ -393,19 +253,19 @@ _OaksLabRivalChallengeText:: ; 95477 (25:5477)
 	line "you on!"
 	done
 
-_OaksLabText_1d3be:: ; 954b6 (25:54b6)
+_OaksLabText_1d3be::
 	text "WHAT?"
 	line "Unbelievable!"
 	cont "I picked the"
 	cont "wrong #MON!"
 	prompt
 
-_OaksLabText_1d3c3:: ; 954e4 (25:54e4)
+_OaksLabText_1d3c3::
 	text $53, ": Yeah! Am"
 	line "I great or what?"
 	prompt
 
-_OaksLabRivalToughenUpText:: ; 95502 (25:5502)
+_OaksLabRivalToughenUpText::
 	text $53, ": Okay!"
 	line "I'll make my"
 	cont "#MON fight to"
@@ -415,66 +275,22 @@ _OaksLabRivalToughenUpText:: ; 95502 (25:5502)
 	line "Smell you later!"
 	done
 
-IF DEF(_YELLOW)
-_OaksLabPikachuDislikesPokeballsText1::
-	text "OAK: What?"
-	done
-
-_OaksLabPikachuDislikesPokeballsText2::
-	text "OAK: Would you"
-	line "look at that!"
-
-	para "It's odd, but it"
-	line "appears that your"
-	cont "PIKACHU dislikes"
-	cont "# BALLs."
-
-	para "You should just"
-	line "keep it with you."
-
-	para "That should make"
-	line "it happy!"
-
-	para "You can talk to it"
-	line "and see how it"
-	cont "feels about you."
-	done
-ENDC
-
-_OaksLabText21:: ; 95551 (25:5551)
+_OaksLabText21::
 	text $53, ": Gramps!"
 	done
 
-_OaksLabText22:: ; 9555d (25:555d)
-IF DEF(_YELLOW)
-	text $53,": Gramps,"
-	line "my #MON has"
-	cont "grown stronger!"
-	cont "Check it out!"
-	done
-ELSE
+_OaksLabText22::
 	text $53, ": What did"
 	line "you call me for?"
 	done
-ENDC
 
-_OaksLabText23:: ; 9557b (25:557b)
-IF DEF(_YELLOW)
-	text "OAK: Ah, ",$53,","
-	line "good timing!"
-
-	para "I needed to ask"
-	line "both of you to do"
-	cont "something for me."
-	done
-ELSE
+_OaksLabText23::
 	text "OAK: Oh right! I"
 	line "have a request"
 	cont "of you two."
 	done
-ENDC
 
-_OaksLabText24:: ; 955a8 (25:55a8)
+_OaksLabText24::
 	text "On the desk there"
 	line "is my invention,"
 	cont "#DEX!"
@@ -488,7 +304,7 @@ _OaksLabText24:: ; 955a8 (25:55a8)
 	line "encyclopedia!"
 	done
 
-_OaksLabText25:: ; 9562a (25:562a)
+_OaksLabText25::
 	text "OAK: ", $52, " and"
 	line $53, "! Take"
 	cont "these with you!"
@@ -496,7 +312,7 @@ _OaksLabText25:: ; 9562a (25:562a)
 	para $52, " got"
 	line "#DEX from OAK!@@"
 
-_OaksLabText26:: ; 95664 (25:5664)
+_OaksLabText26::
 	text "To make a complete"
 	line "guide on all the"
 	cont "#MON in the"
@@ -519,7 +335,7 @@ _OaksLabText26:: ; 95664 (25:5664)
 	cont "#MON history!"
 	done
 
-_OaksLabText27:: ; 95741 (25:5741)
+_OaksLabText27::
 	text $53, ": Alright"
 	line "Gramps! Leave it"
 	cont "all to me!"
@@ -537,61 +353,61 @@ _OaksLabText27:: ; 95741 (25:5741)
 	cont $52, "! Hahaha!"
 	done
 
-_OaksLabText_1d405:: ; 957eb (25:57eb)
+_OaksLabText_1d405::
 	text "I study #MON as"
 	line "PROF.OAK's AIDE."
 	done
 
-_OaksLabText_441cc:: ; 9580c (25:580c)
+_OaksLabText_441cc::
 	text "#DEX comp-"
 	line "letion is:"
 
 	para "@"
-	TX_NUM $ffdb, 1, 3
+	TX_NUM hDexRatingNumMonsSeen, 1, 3
 	text " #MON seen"
 	line "@"
-	TX_NUM $ffdc, 1, 3
+	TX_NUM hDexRatingNumMonsOwned, 1, 3
 	text " #MON owned"
 
 	para "PROF.OAK's"
 	line "Rating:"
 	prompt
 
-_OaksLabText_44201:: ; 95858 (25:5858)
+_OaksLabText_44201::
 	text "You still have"
 	line "lots to do."
 	cont "Look for #MON"
 	cont "in grassy areas!"
 	done
 
-_OaksLabText_44206:: ; 95893 (25:5893)
+_OaksLabText_44206::
 	text "You're on the"
 	line "right track! "
 	cont "Get a FLASH HM"
 	cont "from my AIDE!"
 	done
 
-_OaksLabText_4420b:: ; 958cc (25:58cc)
+_OaksLabText_4420b::
 	text "You still need"
 	line "more #MON!"
 	cont "Try to catch"
 	cont "other species!"
 	done
 
-_OaksLabText_44210:: ; 95903 (25:5903)
+_OaksLabText_44210::
 	text "Good, you're"
 	line "trying hard!"
 	cont "Get an ITEMFINDER"
 	cont "from my AIDE!"
 	done
 
-_OaksLabText_44215:: ; 9593d (25:593d)
+_OaksLabText_44215::
 	text "Looking good!"
 	line "Go find my AIDE"
 	cont "when you get 50!"
 	done
 
-_OaksLabText_4421a:: ; 9596d (25:596d)
+_OaksLabText_4421a::
 	text "You finally got at"
 	line "least 50 species!"
 	cont "Be sure to get"
@@ -599,73 +415,64 @@ _OaksLabText_4421a:: ; 9596d (25:596d)
 	cont "AIDE!"
 	done
 
-_OaksLabText_4421f:: ; 959b8 (25:59b8)
-IF DEF(_YELLOW)
-	text "Oh! This is get-"
-	line "ting even better!"
-ELSE
+_OaksLabText_4421f::
 	text "Ho! This is geting"
 	line "even better!"
-ENDC
 	done
 
-_OaksLabText_44224:: ; 959d9 (25:59d9)
+_OaksLabText_44224::
 	text "Very good!"
 	line "Go fish for some"
 	cont "marine #MON!"
 	done
 
-_OaksLabText_44229:: ; 95a03 (25:5a03)
+_OaksLabText_44229::
 	text "Wonderful!"
 	line "Do you like to"
 	cont "collect things?"
 	done
 
-_OaksLabText_4422e:: ; 95a2e (25:5a2e)
+_OaksLabText_4422e::
 	text "I'm impressed!"
 	line "It must have been"
 	cont "difficult to do!"
 	done
 
-_OaksLabText_44233:: ; 95a60 (25:5a60)
+_OaksLabText_44233::
 	text "You finally got at"
 	line "least 100 species!"
 	cont "I can't believe"
 	cont "how good you are!"
 	done
 
-_OaksLabText_44238:: ; 95aa8 (25:5aa8)
+_OaksLabText_44238::
 	text "You even have the"
 	line "evolved forms of"
 	cont "#MON! Super!"
 	done
 
-_OaksLabText_4423d:: ; 95ad9 (25:5ad9)
+_OaksLabText_4423d::
 	text "Excellent! Trade"
 	line "with friends to"
 	cont "get some more!"
 	done
 
-_OaksLabText_44242:: ; 95b0a (25:5b0a)
+_OaksLabText_44242::
 	text "Outstanding!"
 	line "You've become a"
 	cont "real pro at this!"
 	done
 
-_OaksLabText_44247:: ; 95b39 (25:5b39)
+_OaksLabText_44247::
 	text "I have nothing"
 	line "left to say!"
 	cont "You're the"
 	cont "authority now!"
 	done
 
-_OaksLabText_4424c:: ; 95b6f (25:5b6f)
+_OaksLabText_4424c::
 	text "Your #DEX is"
-IF DEF(_YELLOW)
-	line "fully complete!"
-ELSE
 	line "entirely complete!"
-ENDC
 	cont "Congratulations!"
 	done