Merge branch 'master' of https://github.com/iimarckus/pokered

Doesn't build.

7 files changed, 62 insertions, 55 deletions

diff --git a/text/maps/daycare.asm b/text/maps/daycare.asm
index 929c9104..4f4b1950 100644
--- a/text/maps/daycare.asm
+++ b/text/maps/daycare.asm
@@ -1,60 +1,54 @@
-_DayCareMText_5640f::
+_DayCareIntroText::
 	text "I run a DAYCARE."
 	line "Would you like me"
 	cont "to raise one of"
 	cont "your #MON?"
 	done
 
-_DayCareMText_56414::
+_DayCareWhichMonText::
 	text "Which #MON"
 	line "should I raise?"
 	prompt
 
-_DayCareMText_56419::
+_DayCareWillLookAfterMonText::
 	text "Fine, I'll look"
 	line "after @"
 	TX_RAM wcd6d
 	db $0
 	cont "for a while."
 	prompt
-
-_DayCareMText_5641e::
+_DayCareComeSeeMeInAWhileText::
 	text "Come see me in"
 	line "a while."
 	done
-
-_DayCareMText_56423::
+_DayCareMonHasGrownText::
 	text "Your @"
 	TX_RAM wcd6d
 	db $0
 	line "has grown a lot!"
-
 	para "By level, it's"
 	line "grown by @"
-
-DayCareMText_8ac67::
-	TX_NUM wTrainerEngageDistance,$1,$3
+	TX_NUM wDayCareNumLevelsGrown,$1,$3
 	text "!"
 
 	para "Aren't I great?"
 	prompt
-
-_DayCareMText_56428::
+_DayCareOweMoneyText::
 	text "You owe me ¥@"
-	TX_BCD wcd3f, $c2
+	TX_BCD wDayCareTotalCost, $c2
 	db $0
 	line "for the return"
 	cont "of this #MON."
 	done
 
-_DayCareMText_5642d::
+_DayCareGotMonBackText::
 	text $52, " got"
 	line "@"
 	TX_RAM W_DAYCAREMONNAME
 	text " back!"
 	done
 
-_DayCareMText_56432::
+_DayCareMonNeedsMoreTimeText::
 	text "Back already?"
 	line "Your @"
 	TX_RAM wcd6d
@@ -63,37 +57,36 @@ _DayCareMText_56432::
 	cont "time with me."
 	prompt
 
-_DayCareMText_56437::
+_DayCareAllRightThenText::
 	text "All right then,"
 	line "@@"
 
-_DayCareMText_5643b::
+_DayCareComeAgainText::
 	text "Come again."
 	done
 
-_DayCareMText_56440::
+_DayCareNoRoomForMonText::
 	text "You have no room"
 	line "for this #MON!"
 	done
 
-_DayCareMText_56445::
+_DayCareOnlyHaveOneMonText::
 	text "You only have one"
 	line "#MON with you."
 	done
 
-_DayCareMText_5644a::
+_DayCareCantAcceptMonWithHMText::
 	text "I can't accept a"
 	line "#MON that"
 	cont "knows an HM move."
 	done
 
-_DayCareMText_5644f::
+_DayCareHeresYourMonText::
 	text "Thank you! Here's"
 	line "your #MON!"
 	prompt
 
-_DayCareMText_56454::
+_DayCareNotEnoughMoneyText::
 	text "Hey, you don't"
 	line "have enough ¥!"
-	done
-
+	done
\ No newline at end of file
diff --git a/text/maps/fuchsia_gym.asm b/text/maps/fuchsia_gym.asm
index de3b9e3c..f2bb8c9c 100644
--- a/text/maps/fuchsia_gym.asm
+++ b/text/maps/fuchsia_gym.asm
@@ -1,4 +1,4 @@
-_UnnamedText_75581::
+_KogaBeforeBattleText::
 	text "KOGA: Fwahahaha!"
 
 	para "A mere child like"
@@ -16,7 +16,7 @@ _UnnamedText_75581::
 	cont "techniques!"
 	done
 
-_UnnamedText_75586::
+_KogaAfterBattleText::
 	text "Humph!"
 	line "You have proven"
 	cont "your worth!"
@@ -25,7 +25,7 @@ _UnnamedText_75586::
 	line "SOULBADGE!"
 	prompt
 
-_UnnamedText_7558b::
+_KogaExplainToxicText::
 	text "When afflicted by"
 	line "TOXIC, #MON"
 	cont "suffer more and"
@@ -36,7 +36,7 @@ _UnnamedText_7558b::
 	line "terrorize foes!"
 	done
 
-_UnnamedText_75590::
+_FuchsiaGymText9::
 	text "Now that you have"
 	line "the SOULBADGE,"
 	cont "the DEFENSE of"
@@ -78,7 +78,6 @@ _FuchsiaGymBattleText1::
 	cont "#MON!"
 
 	para "It's strategy!"
-
 	para "I'll show you how"
 	line "strategy can beat"
 	cont "brute strength!"
@@ -105,14 +104,12 @@ _FuchsiaGymEndBattleText2::
 	text "I'm done"
 	line "for!"
 	prompt
-
 _FuchsiaGymAfterBattleText2::
 	text "I will keep on"
 	line "training under"
 	cont "KOGA, my ninja"
 	cont "master!"
 	done
-
 _FuchsiaGymBattleText3::
 	text "Let's see you"
 	line "beat my special"
@@ -143,7 +140,6 @@ _FuchsiaGymEndBattleText4::
 	text "Whoa!"
 	line "He's got it!"
 	prompt
-
 _FuchsiaGymAfterBattleText4::
 	text "You impressed me!"
 	line "Here's a hint!"
@@ -196,7 +192,7 @@ _FuchsiaGymAfterBattleText6::
 	cont "choose?"
 	done
 
-_UnnamedText_7564e::
+_FuchsiaGymText_7564e::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -207,15 +203,12 @@ _UnnamedText_7564e::
 	para "KOGA might appear"
 	line "close, but he's"
 	cont "blocked off!"
-
 	para "You have to find"
 	line "gaps in the walls"
 	cont "to reach him!"
 	done
-
-_UnnamedText_75653::
+_FuchsiaGymText_75653::
 	text "It's amazing how"
 	line "ninja can terrify"
 	cont "even now!"
-	done
-
+	done
\ No newline at end of file
diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/fuchsia_gym_1.asm
new file mode 100644
index 00000000..a877c0a1
--- /dev/null
+++ b/text/maps/fuchsia_gym_1.asm
@@ -0,0 +1,27 @@
+_KogaBeforeBattleText:: ; 9e9b1 (27:69b1)
+	text "KOGA: Fwahahaha!"
+
+	para "A mere child like"
+	line "you dares to"
+	cont "challenge me?"
+
+	para "Very well, I"
+	line "shall show you"
+	cont "true terror as a"
+	cont "ninja master!"
+
+	para "You shall feel"
+	line "the despair of"
+	cont "poison and sleep"
+	cont "techniques!"
+	done
+
+_KogaAfterBattleText:: ; 9ea66 (27:6a66)
+	text "Humph!"
+	line "You have proven"
+	cont "your worth!"
+
+	para "Here! Take the"
+	line "SOULBADGE!"
+	prompt
+
diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm
index 4c392562..db032c78 100644
--- a/text/maps/lorelei.asm
+++ b/text/maps/lorelei.asm
@@ -30,14 +30,12 @@ _LoreleiAfterBattleText::
 	text "You're better"
 	line "than I thought!"
 	cont "Go on ahead!"
-
 	para "You only got a"
 	line "taste of #MON"
 	cont "LEAGUE power!"
 	done
 
-_LoreleiText2::
+_LoreleiDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
-	done
-
+	done
\ No newline at end of file
diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm
index 2708ca73..09878dca 100644
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -35,7 +35,7 @@ _NameRaterText_1dac7::
 	text "OK! This #MON"
 	line "has been renamed"
 	cont "@"
-	TX_RAM wHPBarMaxHP
+	TX_RAM wBuffer
 	text "!"
 
 	para "That's a better"
diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm
index b4b77ed1..31f8deeb 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -400,10 +400,10 @@ _OaksLabText_441cc::
 	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"
diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm
index ed1497f7..1a66e8b1 100644
--- a/text/maps/underground_path_route_7_entrance_unused.asm
+++ b/text/maps/underground_path_route_7_entrance_unused.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5d773::
+_UGPathRoute7EntranceUnusedText_5d773::
 	text "I want to shop at"
 	line "the dept. store"
 	cont "in CELADON but..."
@@ -8,29 +8,25 @@ _UnnamedText_5d773::
 	cont "people there."
 	done
 
-_UnnamedText_5d778::
+_UGPathRoute7EntranceUnusedText_5d778::
 	text "TEAM ROCKET had a"
 	line "secret hideout in"
 	cont "CELADON CITY?"
 	done
 
-_UnnamedText_5d77d::
+_UGPathRoute7EntranceUnusedText_5d77d::
 	text "You're here to"
 	line "shop in CELADON?"
-
 	para "Just step outside"
 	line "and head west!"
 	done
-
-_UnnamedText_5d782::
+_UGPathRoute7EntranceUnusedText_5d782::
 	text "The UNDERGROUND"
 	line "PATH goes beneath"
 	cont "SAFFRON and leads"
 	cont "to LAVENDER."
-
 	para "If you're heading"
 	line "to CERULEAN, go"
 	cont "to the building"
 	cont "across the road."
-	done
-
+	done
\ No newline at end of file