Merge pull request #320 from ProjectRevoTPP/master

finish decompiling player_pc.c

2 files changed, 28 insertions, 49 deletions

diff --git a/data/player_pc.s b/data/player_pc.s
index 200ae19c2..10f802bbb 100644
--- a/data/player_pc.s
+++ b/data/player_pc.s
@@ -4,27 +4,27 @@
 	.section .rodata
 
 	.align 2
-gUnknown_08406288:: @ 8406288
+gPCText_OptionDescList:: @ 8406288
 	.4byte PCText_TakeOutItems
 	.4byte PCText_StoreItems
 	.4byte PCText_ThrowAwayItems
 	.4byte gMenuText_GoBackToPrev
 
 	.align 2
-gUnknown_08406298:: @ 8406298
+gPCText_PlayerPCOptionsText:: @ 8406298
 	.4byte SecretBaseText_ItemStorage, PlayerPC_ItemStorage
 	.4byte gPCText_Mailbox, PlayerPC_Mailbox
 	.4byte SecretBaseText_Decoration, PlayerPC_Decoration
 	.4byte SecretBaseText_TurnOff, PlayerPC_TurnOff
 
-gUnknown_084062B8:: @ 84062B8
+gBedroomPC_OptionOrder:: @ 84062B8
 	.byte 0, 1, 2, 3
 
-gUnknown_084062BC:: @ 84062BC
+gPlayerPC_OptionOrder:: @ 84062BC
 	.byte 0, 1, 3
 
 	.align 2
-gUnknown_084062C0:: @ 84062C0
+gPCText_ItemPCOptionsText:: @ 84062C0
 	.4byte PCText_WithdrawItem, ItemStorage_Withdraw
 	.4byte PCText_DepositItem, ItemStorage_Deposit
 	.4byte PCText_TossItem, ItemStorage_Toss
@@ -32,8 +32,8 @@ gUnknown_084062C0:: @ 84062C0
 
 	.align 2
 gUnknown_084062E0:: @ 84062E0
-	.4byte sub_813A83C
-	.4byte sub_813A878
+	.4byte ItemStorage_ResumeInputFromYesToss
+	.4byte ItemStorage_ResumeInputFromNoToss
 
 	.align 2
 gUnknown_084062E8:: @ 84062E8
diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc
index d816799b6..bcf57eb5b 100644
--- a/data/text/pokedex_rating.inc
+++ b/data/text/pokedex_rating.inc
@@ -12,111 +12,90 @@ Route101_Text_1C44DC:: @ 81C44DC
 	.string "So, you’ve seen {STR_VAR_1} POKéMON,\n"
 	.string "and you’ve caught {STR_VAR_2} POKéMON...$"
 
-gUnknown_081C4520:: @ 81C4520
-UnknownString_81C4520: @ 81C4520
+gBirchDexRatingText_LessThan10:: @ 81C4520
 	.string "You should go into grassy areas more\n"
 	.string "and look for POKéMON more carefully.$"
 
-gUnknown_081C456A:: @ 81C456A
-UnknownString_81C456A: @ 81C456A
+gBirchDexRatingText_LessThan20:: @ 81C456A
 	.string "I guess you’re getting the hang of it.\n"
 	.string "But, it gets harder from here.$"
 
-gUnknown_081C45B0:: @ 81C45B0
-UnknownString_81C45B0: @ 81C45B0
+gBirchDexRatingText_LessThan30:: @ 81C45B0
 	.string "Some POKéMON only appear in certain\n"
 	.string "areas. You’ll need to be persistent.$"
 
-gUnknown_081C45F9:: @ 81C45F9
-UnknownString_81C45F9: @ 81C45F9
+gBirchDexRatingText_LessThan40:: @ 81C45F9
 	.string "Well, it could use more quantity, but\n"
 	.string "this is looking more like a POKéDEX now.$"
 
-gUnknown_081C4648:: @ 81C4648
-UnknownString_81C4648: @ 81C4648
+gBirchDexRatingText_LessThan50:: @ 81C4648
 	.string "This is coming along pretty good.\n"
 	.string "Keep up the effort.$"
 
-gUnknown_081C467E:: @ 81C467E
-UnknownString_81C467E: @ 81C467E
+gBirchDexRatingText_LessThan60:: @ 81C467E
 	.string "Are you using any RODS?\n"
 	.string "There are many POKéMON in the sea.$"
 
-gUnknown_081C46B9:: @ 81C46B9
-UnknownString_81C46B9: @ 81C46B9
+gBirchDexRatingText_LessThan70:: @ 81C46B9
 	.string "Instead of just catching POKéMON,\n"
 	.string "how about making them evolve, too?$"
 
-gUnknown_081C46FE:: @ 81C46FE
-UnknownString_81C46FE: @ 81C46FE
+gBirchDexRatingText_LessThan80:: @ 81C46FE
 	.string "This is going to be a fantastic POKéDEX.\n"
 	.string "That’s the feeling I’m getting.$"
 
-gUnknown_081C4747:: @ 81C4747
-UnknownString_81C4747: @ 81C4747
+gBirchDexRatingText_LessThan90:: @ 81C4747
 	.string "You’ve collected this many...\n"
 	.string "Your talent is remarkable!$"
 
-gUnknown_081C4780:: @ 81C4780
-UnknownString_81C4780: @ 81C4780
+gBirchDexRatingText_LessThan100:: @ 81C4780
 	.string "Have you visited the SAFARI ZONE?\p"
 	.string "I hear there are some POKéMON that\n"
 	.string "can only be caught there.$"
 
-gUnknown_081C47DF:: @ 81C47DF
-UnknownString_81C47DF: @ 81C47DF
+gBirchDexRatingText_LessThan110:: @ 81C47DF
 	.string "You’ve finally reached the 100-kind\n"
 	.string "mark. This is an impressive POKéDEX!$"
 
-gUnknown_081C4828:: @ 81C4828
-UnknownString_81C4828: @ 81C4828
+gBirchDexRatingText_LessThan120:: @ 81C4828
 	.string "There might be POKéMON that can be\n"
 	.string "found using ROCK SMASH.$"
 
-gUnknown_081C4863:: @ 81C4863
-UnknownString_81C4863: @ 81C4863
+gBirchDexRatingText_LessThan130:: @ 81C4863
 	.string "You should get some more POKéMON by\n"
 	.string "trading with others.$"
 
-gUnknown_081C489C:: @ 81C489C
-UnknownString_81C489C: @ 81C489C
+gBirchDexRatingText_LessThan140:: @ 81C489C
 	.string "I’ve heard of POKéMON that evolve when\n"
 	.string "they come to fully love their TRAINERS.$"
 
-gUnknown_081C48EB:: @ 81C48EB
-UnknownString_81C48EB: @ 81C48EB
+gBirchDexRatingText_LessThan150:: @ 81C48EB
 	.string "I had no idea that there were so many\n"
 	.string "POKéMON species in the HOENN region.$"
 
-gUnknown_081C4936:: @ 81C4936
-UnknownString_81C4936: @ 81C4936
+gBirchDexRatingText_LessThan160:: @ 81C4936
 	.string "On occasion, some POKéMON appear in\n"
 	.string "large numbers like wild outbreaks.\l"
 	.string "Don’t miss opportunities like those.$"
 
-gUnknown_081C49A2:: @ 81C49A2
-UnknownString_81C49A2: @ 81C49A2
+gBirchDexRatingText_LessThan170:: @ 81C49A2
 	.string "One can get a very good idea about the\n"
 	.string "POKéMON of the HOENN region by looking\l"
 	.string "through your POKéDEX.$"
 
-gUnknown_081C4A06:: @ 81C4A06
-UnknownString_81C4A06: @ 81C4A06
+gBirchDexRatingText_LessThan180:: @ 81C4A06
 	.string "I’d say you already qualify as a POKéMON\n"
 	.string "PROFESSOR, and a good one, too!$"
 
-gUnknown_081C4A4F:: @ 81C4A4F
-UnknownString_81C4A4F: @ 81C4A4F
+gBirchDexRatingText_LessThan190:: @ 81C4A4F
 	.string "With a POKéDEX this complete, you’re\n"
 	.string "a real professional at this!$"
 
-gUnknown_081C4A91:: @ 81C4A91
-UnknownString_81C4A91: @ 81C4A91
+gBirchDexRatingText_LessThan200:: @ 81C4A91
 	.string "You’re very close to completing this\n"
 	.string "POKéDEX. I can feel it in my bones!$"
 
-gUnknown_081C4ADA:: @ 81C4ADA
-UnknownString_81C4ADA: @ 81C4ADA
+gBirchDexRatingText_DexCompleted:: @ 81C4ADA
 	.string "Congratulations!\n"
 	.string "Your POKéDEX is complete!$"