Merge pull request #47 from PikalaxALT/roamer

Roamer

10 files changed, 87 insertions, 90 deletions

diff --git a/data/data_835B488.s b/data/data_835B488.s
index c5b533348..2a0bfcf87 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -740,19 +740,19 @@ sFanfares:: @ 83AC990
 gUnknown_83AC9D0:: @ 83AC9D0
 	.incbin "baserom.gba", 0x3AC9D0, 0x8
 
-gUnknown_83AC9D8::
+gOamData_83AC9D8::
 	.incbin "baserom.gba", 0x3AC9D8, 0x10
 
-gUnknown_83AC9E8::
+gOamData_83AC9E8::
 	.incbin "baserom.gba", 0x3AC9E8, 0x10
 
-gUnknown_83AC9F8::
+gOamData_83AC9F8::
 	.incbin "baserom.gba", 0x3AC9F8, 0x8
 
 gUnknown_83ACA00::
 	.incbin "baserom.gba", 0x3ACA00, 0xF8
 
-gUnknown_83ACAF8::
+gOamData_83ACAF8::
 	.incbin "baserom.gba", 0x3ACAF8, 0x110
 
 gUnknown_83ACC08:: @ 83ACC08
diff --git a/data/data_83F5738.s b/data/data_83F5738.s
index e6f026d0e..c14edc5c8 100644
--- a/data/data_83F5738.s
+++ b/data/data_83F5738.s
@@ -55,7 +55,7 @@ gUnknown_83F5BCC:: @ 83F5BCC
 gUnknown_83F5D1C:: @ 83F5D1C
 	.incbin "baserom.gba", 0x3F5D1C, 0x10
 
-gUnknown_83F5D2C:: @ 83F5D2C
+sStarterMon:: @ 83F5D2C
 	.incbin "baserom.gba", 0x3F5D2C, 0x6
 
 gUnknown_83F5D32:: @ 83F5D32
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index 96485c89e..682877f7e 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -586,7 +586,7 @@ gUnknown_8415C64:: @ 8415C64
 gUnknown_8415CE8:: @ 8415CE8
 	.incbin "baserom.gba", 0x415CE8, 0x44
 
-gUnknown_8415D2C:: @ 8415D2C
+gText_Controls:: @ 8415D2C
 	.string "CONTROLS$"
 
 	.align 2
@@ -594,28 +594,30 @@ gUnknown_8415D38:: @ 8415D2C
 	.string "{KEYGFX_DPAD_UP_DOWN}えらぶ {KEYGFX_A_BUTTON}けってい$"
 
 	.align 2
-gUnknown_8415D48:: @ 8415D48
+gText_ABUTTONNext:: @ 8415D48
 	.string "{KEYGFX_A_BUTTON}NEXT$"
 
 	.align 2
-gUnknown_8415D50:: @ 8415D50
+gText_ABUTTONNext_BBUTTONBack:: @ 8415D50
 	.string "{KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}BACK$"
 
 	.align 2
-gUnknown_8415D60:: @ 8415D60
-	.incbin "baserom.gba", 0x415D60, 0x18
+gText_UPDOWNPick_ABUTTONNext_BBUTTONBack:: @ 8415D60
+	.string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}CANCEL$"
 
-gUnknown_8415D78:: @ 8415D78
-	.incbin "baserom.gba", 0x415D78, 0x14
+	.align 2
+gText_UPDOWNPick_ABUTTONBBUTTONCancel:: @ 8415D78
+	.string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}{KEYGFX_B_BUTTON}CANCEL$"
 
-gUnknown_8415D8C:: @ 8415D8C
-	.incbin "baserom.gba", 0x415D8C, 0x7
+	.align 2
+gText_ABUTTONExit:: @ 8415D8C
+	.string "{KEYGFX_A_BUTTON}EXIT$"
 
-gUnknown_8415D93:: @ 8415D93
-	.incbin "baserom.gba", 0x415D93, 0x4
+gText_Boy:: @ 8415D93
+	.string "BOY$"
 
-gUnknown_8415D97:: @ 8415D97
-	.incbin "baserom.gba", 0x415D97, 0x5
+gText_Girl:: @ 8415D97
+	.string "GIRL$"
 
 gUnknown_8415D9C:: @ 8415D9C
 	.incbin "baserom.gba", 0x415D9C, 0x1C
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 7d4a7b996..95fcf7a92 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -428,167 +428,167 @@ gUnknown_81C5647:: @ 81C5647
 gUnknown_81C566A:: @ 81C566A
 	.incbin "baserom.gba", 0x1C566A, 0xE5
 
-gUnknown_81C574F:: @ 81C574F
+gOtherText_NewName:: @ 81C574F
 	.string "NEW NAME$"
 
-gUnknown_81C5758:: @ 81C5758
+gNameChoice_Green:: @ 81C5758
 	.string "GREEN$"
 
-gUnknown_81C575E:: @ 81C575E
+gNameChoice_Red:: @ 81C575E
 	.string "RED$"
 
-gUnknown_81C5762:: @ 81C5762
+gNameChoice_Leaf:: @ 81C5762
 	.string "LEAF$"
 
-gUnknown_81C5767:: @ 81C5767
+gNameChoice_Fire:: @ 81C5767
 	.string "FIRE$"
 
-gUnknown_81C576C:: @ 81C576C
+gNameChoice_Gary:: @ 81C576C
 	.string "GARY$"
 
-gUnknown_81C5771:: @ 81C5771
+gNameChoice_Kaz:: @ 81C5771
 	.string "KAZ$"
 
-gUnknown_81C5775:: @ 81C5775
+gNameChoice_Toru:: @ 81C5775
 	.string "TORU$"
 
-gUnknown_81C577A:: @ 81C577A
+gNameChoice_Ash:: @ 81C577A
 	.string "ASH$"
 
-gUnknown_81C577E:: @ 81C577E
+gNameChoice_Kene:: @ 81C577E
 	.string "KENE$"
 
-gUnknown_81C5783:: @ 81C5783
+gNameChoice_Geki:: @ 81C5783
 	.string "GEKI$"
 
-gUnknown_81C5788:: @ 81C5788
+gNameChoice_Jak:: @ 81C5788
 	.string "JAK$"
 
-gUnknown_81C578C:: @ 81C578C
+gNameChoice_Janne:: @ 81C578C
 	.string "JANNE$"
 
-gUnknown_81C5792:: @ 81C5792
+gNameChoice_Jonn:: @ 81C5792
 	.string "JONN$"
 
-gUnknown_81C5797:: @ 81C5797
+gNameChoice_Kamon:: @ 81C5797
 	.string "KAMON$"
 
-gUnknown_81C579D:: @ 81C579D
+gNameChoice_Karl:: @ 81C579D
 	.string "KARL$"
 
-gUnknown_81C57A2:: @ 81C57A2
+gNameChoice_Taylor:: @ 81C57A2
 	.string "TAYLOR$"
 
-gUnknown_81C57A9:: @ 81C57A9
+gNameChoice_Oscar:: @ 81C57A9
 	.string "OSCAR$"
 
-gUnknown_81C57AF:: @ 81C57AF
+gNameChoice_Hiro:: @ 81C57AF
 	.string "HIRO$"
 
-gUnknown_81C57B4:: @ 81C57B4
+gNameChoice_Max:: @ 81C57B4
 	.string "MAX$"
 
-gUnknown_81C57B8:: @ 81C57B8
+gNameChoice_Jon:: @ 81C57B8
 	.string "JON$"
 
-gUnknown_81C57BC:: @ 81C57BC
+gNameChoice_Ralph:: @ 81C57BC
 	.string "RALPH$"
 
-gUnknown_81C57C2:: @ 81C57C2
+gNameChoice_Kay:: @ 81C57C2
 	.string "KAY$"
 
-gUnknown_81C57C6:: @ 81C57C6
+gNameChoice_Tosh:: @ 81C57C6
 	.string "TOSH$"
 
-gUnknown_81C57CB:: @ 81C57CB
+gNameChoice_Roak:: @ 81C57CB
 	.string "ROAK$"
 
-gUnknown_81C57D0:: @ 81C57D0
+gNameChoice_Omi:: @ 81C57D0
 	.string "OMI$"
 
-gUnknown_81C57D4:: @ 81C57D4
+gNameChoice_Jodi:: @ 81C57D4
 	.string "JODI$"
 
-gUnknown_81C57D9:: @ 81C57D9
+gNameChoice_Amanda:: @ 81C57D9
 	.string "AMANDA$"
 
-gUnknown_81C57E0:: @ 81C57E0
+gNameChoice_Hillary:: @ 81C57E0
 	.string "HILLARY$"
 
-gUnknown_81C57E8:: @ 81C57E8
+gNameChoice_Makey:: @ 81C57E8
 	.string "MAKEY$"
 
-gUnknown_81C57EE:: @ 81C57EE
+gNameChoice_Michi:: @ 81C57EE
 	.string "MICHI$"
 
-gUnknown_81C57F4:: @ 81C57F4
+gNameChoice_Paula:: @ 81C57F4
 	.string "PAULA$"
 
-gUnknown_81C57FA:: @ 81C57FA
+gNameChoice_June:: @ 81C57FA
 	.string "JUNE$"
 
-gUnknown_81C57FF:: @ 81C57FF
+gNameChoice_Cassie:: @ 81C57FF
 	.string "CASSIE$"
 
-gUnknown_81C5806:: @ 81C5806
+gNameChoice_Rey:: @ 81C5806
 	.string "REY$"
 
-gUnknown_81C580A:: @ 81C580A
+gNameChoice_Seda:: @ 81C580A
 	.string "SEDA$"
 
-gUnknown_81C580F:: @ 81C580F
+gNameChoice_Kiko:: @ 81C580F
 	.string "KIKO$"
 
-gUnknown_81C5814:: @ 81C5814
+gNameChoice_Mina:: @ 81C5814
 	.string "MINA$"
 
-gUnknown_81C5819:: @ 81C5819
+gNameChoice_Norie:: @ 81C5819
 	.string "NORIE$"
 
-gUnknown_81C581F:: @ 81C581F
+gNameChoice_Sai:: @ 81C581F
 	.string "SAI$"
 
-gUnknown_81C5823:: @ 81C5823
+gNameChoice_Momo:: @ 81C5823
 	.string "MOMO$"
 
-gUnknown_81C5828:: @ 81C5828
+gNameChoice_Suzi:: @ 81C5828
 	.string "SUZI$"
 
-gUnknown_81C582D:: @ 81C582D
+gNewGame_HelpDocs1:: @ 81C582D
 	.string "The various buttons will be explained in\n"
 	.string "the order of their importance.$"
 
-gUnknown_81C5875:: @ 81C5875
+gNewGame_HelpDocs2:: @ 81C5875
 	.string "Moves the main character.\n"
 	.string "Also used to choose various data\n"
 	.string "headings.$"
 
-gUnknown_81C58BA:: @ 81C58BA
+gNewGame_HelpDocs3:: @ 81C58BA
 	.string "Used to confirm a choice, check\n"
 	.string "things, chat, and scroll text.$"
 
-gUnknown_81C58F9:: @ 81C58F9
+gNewGame_HelpDocs4:: @ 81C58F9
 	.string "Used to exit, cancel a choice,\n"
 	.string "and cancel a mode.$"
 
-gUnknown_81C592B:: @ 81C592B
+gNewGame_HelpDocs5:: @ 81C592B
 	.string "Press this button to open the\n"
 	.string "MENU.$"
 
-gUnknown_81C594F:: @ 81C594F
+gNewGame_HelpDocs6:: @ 81C594F
 	.string "Used to shift items and to use\n"
 	.string "a registered item.$"
 
-gUnknown_81C5981:: @ 81C5981
+gNewGame_HelpDocs7:: @ 81C5981
 	.string "If you need help playing the\n"
 	.string "game, or on how to do things,\n"
 	.string "press the L or R Button.$"
 
-gUnknown_81C59D5:: @ 81C59D5
+gOakText_AskPlayerGender:: @ 81C59D5
 	.string "Now tell me. Are you a boy?\n"
 	.string "Or are you a girl?$"
 
-gUnknown_81C5A04::
+gNewGameAdventureIntro1::
 	.string "In the world which you are about to\n"
 	.string "enter, you will embark on a grand\n"
 	.string "adventure with you as the hero.\n"
@@ -598,7 +598,7 @@ gUnknown_81C5A04::
 	.string "or caves. Gather information and\n"
 	.string "hints from every source.$"
 
-gUnknown_81C5AEB::
+gNewGameAdventureIntro2::
 	.string "New paths will open to you by helping\n"
 	.string "people in need, overcoming challenges,\n"
 	.string "and solving mysteries.\n"
@@ -607,7 +607,7 @@ gUnknown_81C5AEB::
 	.string "others and attacked by wild creatures.\n"
 	.string "Be brave and keep pushing on.$"
 
-gUnknown_81C5BB9::
+gNewGameAdventureIntro3::
 	.string "Through your adventure, we hope\n"
 	.string "that you will interact with all sorts\n"
 	.string "of people and achieve personal growth.\n"
@@ -616,49 +616,49 @@ gUnknown_81C5BB9::
 	.string "Press the A Button, and let your\n"
 	.string "adventure begin!$"
 
-gUnknown_81C5C78:: @ 81C5C78
+gOakText_WelcomeToTheWorld:: @ 81C5C78
 	.string "Hello, there!\n"
 	.string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n"
 	.string "as the POKéMON PROFESSOR.\p$"
 
-gUnknown_81C5D06:: @ 81C5D06
+gOakText_WorldInhabited1:: @ 81C5D06
 	.string "This world…$"
 
-gUnknown_81C5D12:: @ 81C5D12
+gOakText_WorldInhabited2:: @ 81C5D12
 	.string "…is inhabited far and wide by\n"
 	.string "creatures called POKéMON.\p$"
 
-gUnknown_81C5D4B:: @ 81C5D4B
+gOakText_PetsBattlingStudy:: @ 81C5D4B
 	.string "For some people, POKéMON are pets.\n"
 	.string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$"
 
-gUnknown_81C5DBD:: @ 81C5DBD
+gOakText_TellMeALittleAboutYourself:: @ 81C5DBD
 	.string "But first, tell me a little about\n"
 	.string "yourself.\p$"
 
-gUnknown_81C5DEA:: @ 81C5DEA
+gOakText_AskPlayerName:: @ 81C5DEA
 	.string "Let’s begin with your name.\n"
 	.string "What is it?\p$"
 
-gUnknown_81C5E13:: @ 81C5E13
+gOakText_FinalizePlayerName:: @ 81C5E13
 	.string "Right…\n"
 	.string "So your name is {PLAYER}.$"
 
-gUnknown_81C5E2E:: @ 81C5E2E
+gOakText_IntroduceRival:: @ 81C5E2E
 	.string "This is my grandson.\pHe’s been your rival since you both\n"
 	.string "were babies.\p…Erm, what was his name now?$"
 
-gUnknown_81C5E91:: @ 81C5E91
+gOakText_AskRivalName:: @ 81C5E91
 	.string "Your rival’s name, what was it now?$"
 
-gUnknown_81C5EB5:: @ 81C5EB5
+gOakText_ConfirmRivalName:: @ 81C5EB5
 	.string "…Er, was it {RIVAL}?$"
 
-gUnknown_81C5EC5:: @ 81C5EC5
+gOakText_RememberRivalName:: @ 81C5EC5
 	.string "That’s right! I remember now!\n"
 	.string "His name is {RIVAL}!\p$"
 
-gUnknown_81C5EF4:: @ 81C5EF4
+gOakText_LegendAboutToUnfold:: @ 81C5EF4
 	.string "{PLAYER}!\pYour very own POKéMON legend is\n"
 	.string "about to unfold!\pA world of dreams and adventures\n"
 	.string "with POKéMON awaits! Let’s go!$"
diff --git a/data/oak_speech/unk_8462A10.png b/data/oak_speech/unk_8462A10.png
index 324529e90..2c8e425d2 100644
--- a/data/oak_speech/unk_8462A10.png
+++ b/data/oak_speech/unk_8462A10.png
diff --git a/data/oak_speech/unk_8462B74.png b/data/oak_speech/unk_8462B74.png
index 674cef46d..71644c355 100644
--- a/data/oak_speech/unk_8462B74.png
+++ b/data/oak_speech/unk_8462B74.png
diff --git a/data/oak_speech/unk_8462D34.png b/data/oak_speech/unk_8462D34.png
index 56715aadb..e85cbfa9c 100644
--- a/data/oak_speech/unk_8462D34.png
+++ b/data/oak_speech/unk_8462D34.png
diff --git a/data/oak_speech/unk_8462E18.png b/data/oak_speech/unk_8462E18.png
index f6796f724..5e2fd80c0 100644
--- a/data/oak_speech/unk_8462E18.png
+++ b/data/oak_speech/unk_8462E18.png
diff --git a/data/roamer.s b/data/roamer.s
deleted file mode 100644
index a17d9d26b..000000000
--- a/data/roamer.s
+++ /dev/null
@@ -1,5 +0,0 @@
-	.section .rodata
-	.align 2
-
-gUnknown_8466C58:: @ 8466C58
-	.incbin "baserom.gba", 0x466C58, 0xB8
diff --git a/data/specials.inc b/data/specials.inc
index 56b666207..33cc5736b 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -306,7 +306,7 @@ gSpecials:: @ 815FD60
 	def_special ScrSpecial_AreLeadMonEVsMaxedOut
 	def_special sub_8069740
 	def_special sub_8069768
-	def_special sub_8141D9C
+	def_special InitRoamer
 	def_special nullsub_75
 	def_special sub_80CA804
 	def_special nullsub_75
@@ -363,7 +363,7 @@ gSpecials:: @ 815FD60
 	def_special GetDaycarePokemonCount
 	def_special sub_80CB63C
 	def_special sub_80CBD80
-	def_special sub_80CBDB0
+	def_special ScrSpecial_GetStarter
 	def_special sub_80CBDCC
 	def_special sub_810C444
 	def_special sub_80CC7B4