Merge pull request #9 from PikalaxALT/master

Disassemble banks 3A, 3F, and all outdoor maps

7 files changed, 81 insertions, 82 deletions

diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm
index 252dffdc..723021a1 100644
--- a/text/maps/bike_shop.asm
+++ b/text/maps/bike_shop.asm
@@ -25,7 +25,7 @@ _BikeShopText_1d81f::
 	prompt
 
 _BikeShopText_1d824::
-	text $52, " exchanged"
+	text "<PLAYER> exchanged"
 	line "the BIKE VOUCHER"
 	cont "for a BICYCLE.@@"
 
diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm
index f5f7f042..71aeee3c 100644
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -81,7 +81,7 @@ _Museum1FText_5c28e::
 	prompt
 
 _ReceivedOldAmberText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "OLD AMBER!@@"
 
 _Museum1FText_5c299::
diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm
index 5b12e1b8..097fa931 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -1,6 +1,6 @@
 _OaksLabGaryText1::
-	text $53,": Yo"
-	line $52,"! Gramps"
+	text "<RIVAL>: Yo"
+	line "<PLAYER>! Gramps"
 	cont "isn't around!"
 
 	para "I ran here 'cos"
@@ -9,13 +9,13 @@ _OaksLabGaryText1::
 	done
 
 _OaksLabText40::
-	text $53,": Humph!"
+	text "<RIVAL>: Humph!"
 	line "I'll get a better"
 	cont "#MON than you!"
 	done
 
 _OaksLabText41::
-	text $53,": Heh, my"
+	text "<RIVAL>: Heh, my"
 	line "#MON looks a"
 	cont "lot stronger."
 	done
@@ -48,7 +48,7 @@ _OaksLabText_1d2fa::
 	done
 
 _OaksLabDeliverParcelText1::
-	text "OAK: Oh, ", $52, "!"
+	text "OAK: Oh, <PLAYER>!"
 
 	para "How is my old"
 	line "#MON?"
@@ -63,15 +63,15 @@ _OaksLabDeliverParcelText1::
 	para "What? You have"
 	line "something for me?"
 
-	para $52, " delivered"
+	para "<PLAYER> delivered"
 	line "OAK's PARCEL.@@"
 
 _OaksLabDeliverParcelText2::
-	db $0
+	text ""
 	para "Ah! This is the"
 	line "custom # BALL"
 	cont "I ordered!"
-	cont "Thanks, ",$52,"!"
+	cont "Thanks, <PLAYER>!"
 
 	para "By the way, I must"
 	line "ask you to do"
@@ -81,7 +81,7 @@ _OaksLabDeliverParcelText2::
 _OaksLabAroundWorldText::
 	text "#MON around the"
 	line "world wait for"
-	cont "you, ", $52, "!"
+	cont "you, <PLAYER>!"
 	done
 
 _OaksLabGivePokeballsText1::
@@ -95,11 +95,11 @@ _OaksLabGivePokeballsText1::
 	cont "to capture wild"
 	cont "#MON."
 
-	para $52, " got 5"
+	para "<PLAYER> got 5"
 	line "# BALLs!@@"
 
 _OaksLabGivePokeballsText2::
-	db $0
+	text ""
 	para "When a wild"
 	line "#MON appears,"
 	cont "it's fair game."
@@ -155,13 +155,13 @@ _OaksLabText_1d340::
 	done
 
 _OaksLabRivalWaitingText::
-	text $53, ": Gramps!"
+	text "<RIVAL>: Gramps!"
 	line "I'm fed up with"
 	cont "waiting!"
 	done
 
 _OaksLabChooseMonText::
-	text "OAK: Hmm? ",$53,"?"
+	text "OAK: Hmm? <RIVAL>?"
 	line "Why are you here"
 	cont "already?"
 
@@ -171,7 +171,7 @@ _OaksLabChooseMonText::
 	para "Ah, whatever!"
 	line "Just wait there."
 
-	para "Look, ",$52,"! Do"
+	para "Look, <PLAYER>! Do"
 	line "you see that ball"
 	cont "on the table?"
 
@@ -184,34 +184,34 @@ _OaksLabChooseMonText::
 	done
 
 _OaksLabRivalInterjectionText::
-	text $53, ": Hey!"
+	text "<RIVAL>: Hey!"
 	line "Gramps! What"
 	cont "about me?"
 	done
 
 _OaksLabBePatientText::
 	text "OAK: Be patient,"
-	line $53,", I'll give"
+	line "<RIVAL>, I'll give"
 	cont "you one later."
 	done
 
 _OaksLabRivalTakesText1::
-	text $53,": No way!"
-	line $52,", I want"
+	text "<RIVAL>: No way!"
+	line "<PLAYER>, I want"
 	cont "this #MON!"
 	prompt
 
 _OaksLabRivalTakesText2::
-	text $53," snatched"
+	text "<RIVAL> snatched"
 	line "the #MON!@@"
 
 _OaksLabRivalTakesText3::
-	text "OAK: ",$53,"! What"
+	text "OAK: <RIVAL>! What"
 	line "are you doing?"
 	prompt
 
 _OaksLabRivalTakesText4::
-	text $53,": Gramps, I"
+	text "<RIVAL>: Gramps, I"
 	line "want this one!"
 	prompt
 
@@ -225,12 +225,12 @@ _OaksLabRivalTakesText5::
 	line "give you one"
 	cont "anyway..."
 
-	para $52,", come over"
+	para "<PLAYER>, come over"
 	line "here."
 	done
 
 _OaksLabOakGivesText::
-	text "OAK: ",$52,", this"
+	text "OAK: <PLAYER>, this"
 	line "is the #MON I"
 	cont "caught earlier."
 
@@ -241,9 +241,9 @@ _OaksLabOakGivesText::
 	prompt
 
 _OaksLabReceivedText::
-	text $52," received"
+	text "<PLAYER> received"
 	line "a @"
-	TX_RAM $CD6D
+	TX_RAM wcd6d
 	text "!@@"
 
 _OaksLabLeavingText::
@@ -252,8 +252,8 @@ _OaksLabLeavingText::
 	done
 
 _OaksLabRivalChallengeText::
-	text $53, ": Wait"
-	line $52, "!"
+	text "<RIVAL>: Wait"
+	line "<PLAYER>!"
 	cont "Let's check out"
 	cont "our #MON!"
 
@@ -269,17 +269,17 @@ _OaksLabText_1d3be::
 	prompt
 
 _OaksLabText_1d3c3::
-	text $53, ": Yeah! Am"
+	text "<RIVAL>: Yeah! Am"
 	line "I great or what?"
 	prompt
 
 _OaksLabRivalToughenUpText::
-	text $53, ": Okay!"
+	text "<RIVAL>: Okay!"
 	line "I'll make my"
 	cont "#MON fight to"
 	cont "toughen it up!"
 
-	para $52, "! Gramps!"
+	para "<PLAYER>! Gramps!"
 	line "Smell you later!"
 	done
 
@@ -308,18 +308,18 @@ _OaksLabPikachuDislikesPokeballsText2::
 	done
 
 _OaksLabText21::
-	text $53, ": Gramps!"
+	text "<RIVAL>: Gramps!"
 	done
 
 _OaksLabText22::
-	text $53,": Gramps,"
+	text "<RIVAL>: Gramps,"
 	line "my #MON has"
 	cont "grown stronger!"
 	cont "Check it out!"
 	done
 
 _OaksLabText23::
-	text "OAK: Ah, ",$53,","
+	text "OAK: Ah, <RIVAL>,"
 	line "good timing!"
 
 	para "I needed to ask"
@@ -342,11 +342,11 @@ _OaksLabText24::
 	done
 
 _OaksLabText25::
-	text "OAK: ", $52, " and"
-	line $53, "! Take"
+	text "OAK: <PLAYER> and"
+	line "<RIVAL>! Take"
 	cont "these with you!"
 
-	para $52, " got"
+	para "<PLAYER> got"
 	line "#DEX from OAK!@@"
 
 _OaksLabText26::
@@ -373,11 +373,11 @@ _OaksLabText26::
 	done
 
 _OaksLabText27::
-	text $53, ": Alright"
+	text "<RIVAL>: Alright"
 	line "Gramps! Leave it"
 	cont "all to me!"
 
-	para $52, ", I hate to"
+	para "<PLAYER>, I hate to"
 	line "say it, but I"
 	cont "don't need you!"
 
@@ -387,10 +387,10 @@ _OaksLabText27::
 
 	para "I'll tell her not"
 	line "to lend you one,"
-	cont $52, "! Hahaha!"
+	cont "<PLAYER>! Hahaha!"
 	done
 
 _OaksLabText_1d405::
 	text "I study #MON as"
 	line "PROF.OAK's AIDE."
-	done
\ No newline at end of file
+	done
diff --git a/text/maps/route_24.asm b/text/maps/route_24.asm
index 7a073916..475a2602 100644
--- a/text/maps/route_24.asm
+++ b/text/maps/route_24.asm
@@ -4,13 +4,13 @@ _Route24Text_51510::
 	cont "contest trainers!@@"
 
 _Route24Text_51515::
-	db $0
+	text ""
 	para "You just earned a"
 	line "fabulous prize!"
 	prompt
 
 _Route24Text_5151a::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
@@ -154,3 +154,30 @@ _Route24AfterBattleText6::
 	line "have no regrets!"
 	done
 
+_Route24DamianText1::
+	text "I'm not good at"
+	line "raising #MON."
+
+	para "I should release"
+	line "my CHARMANDER"
+	cont "because I haven't"
+	cont "raised it well..."
+
+	para "If you promise me"
+	line "you'll care for"
+	cont "it, it's yours."
+	done
+
+_Route24DamianText2::
+	text "Take good care of"
+	line "my CHARMANDER!@@"
+
+_Route24DamianText3::
+	text "Oh... I'd better"
+	line "release it then."
+	done
+
+_Route24DamianText4::
+	text "How's CHARMANDER"
+	line "doing?"
+	done
diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm
index 0d0d8b5b..f9f0c8ff 100644
--- a/text/maps/route_25.asm
+++ b/text/maps/route_25.asm
@@ -1,31 +1,3 @@
-_Route25DamianText1::
-	text "I'm not good at"
-	line "raising #MON."
-
-	para "I should release"
-	line "my CHARMANDER"
-	cont "because I haven't"
-	cont "raised it well..."
-
-	para "If you promise me"
-	line "you'll care for"
-	cont "it, it's yours."
-	done
-
-_Route25DamianText2::
-	text "Take good care of"
-	line "my CHARMANDER!@@"
-
-_Route25DamianText3::
-	text "Oh... I'd better"
-	line "release it then."
-	done
-
-_Route25DamianText4::
-	text "How's CHARMANDER"
-	line "doing?"
-	done
-
 _Route25BattleText1::
 	text "Local trainers"
 	line "come here to"
diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm
index 603b218a..f5e0adba 100644
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/vermilion_city.asm
@@ -35,7 +35,7 @@ _SSAnneWelcomeText9::
 	prompt
 
 _SSAnneFlashedTicketText::
-	text $52, " flashed"
+	text "<PLAYER> flashed"
 	line "the S.S.TICKET!"
 
 	para "Great! Welcome to"
@@ -43,7 +43,7 @@ _SSAnneFlashedTicketText::
 	done
 
 _SSAnneNoTicketText::
-	text $52, " doesn't"
+	text "<PLAYER> doesn't"
 	line "have the needed"
 	cont "S.S.TICKET."
 
@@ -70,8 +70,8 @@ _VermilionCityText5::
 	text "MACHOP: Guoh!"
 	line "Gogogoh!@@"
 
-_VermilionCityText14::
-	db $0
+_VermilionCityText15::
+	text ""
 	para "A MACHOP is"
 	line "stomping the land"
 	cont "flat."
@@ -127,13 +127,13 @@ _OfficerJennyText5::
 	line "doing?"
 	done
 
-_VermilionCityText7::
+_VermilionCityText8::
 	text "VERMILION CITY"
 	line "The Port of"
 	cont "Exquisite Sunsets"
 	done
 
-_VermilionCityText8::
+_VermilionCityText9::
 	text "NOTICE!"
 
 	para "ROUTE 12 may be"
@@ -147,13 +147,13 @@ _VermilionCityText8::
 	para "VERMILION POLICE"
 	done
 
-_VermilionCityText11::
+_VermilionCityText12::
 	text "#MON FAN CLUB"
 	line "All #MON fans"
 	cont "welcome!"
 	done
 
-_VermilionCityText12::
+_VermilionCityText13::
 	text "VERMILION CITY"
 	line "#MON GYM"
 	cont "LEADER: LT.SURGE"
@@ -162,7 +162,7 @@ _VermilionCityText12::
 	line "American!"
 	done
 
-_VermilionCityText13::
+_VermilionCityText14::
 	text "VERMILION HARBOR"
 	done
 
diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm
index 4459acb8..a9a2184e 100644
--- a/text/maps/viridian_city.asm
+++ b/text/maps/viridian_city.asm
@@ -1,4 +1,4 @@
-_ViridianCityText_19219::
+_ViridianCityText_19219:: ; 2d:4478
 	text "First, you need"
 	line "to weaken the"
 	cont "target #MON."