merge overworld with master

3 files changed, 42 insertions, 169 deletions

diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s
index 34e8df6d2..e2eb99505 100644
--- a/data/battle_frontier_1.s
+++ b/data/battle_frontier_1.s
@@ -1872,24 +1872,24 @@ gUnknown_0860F010:: @ 860F010
 	.2byte FLAG_BADGE08_GET
 
 gUnknown_0860F020:: @ 860F020
-	.4byte gUnknown_082A5D6C
-	.4byte gUnknown_082A5DAB
-	.4byte gUnknown_082A5DF1
-	.4byte gUnknown_082A5E34
-	.4byte gUnknown_082A5E83
-	.4byte gUnknown_082A5EB9
-	.4byte gUnknown_082A5EF4
-	.4byte gUnknown_082A5F39
-	.4byte gUnknown_082A5F82
-	.4byte gUnknown_082A5FB9
-	.4byte gUnknown_082A6018
-	.4byte gUnknown_082A6061
-	.4byte gUnknown_082A609C
-	.4byte gUnknown_082A60D5
-	.4byte gUnknown_082A6124
-	.4byte gUnknown_082A616F
-	.4byte gUnknown_082A61D6
-	.4byte gUnknown_082A623A
-	.4byte gUnknown_082A6287
-	.4byte gUnknown_082A62C9
-	.4byte gUnknown_082A6312
+	.4byte gBirchDexRatingText_LessThan10
+	.4byte gBirchDexRatingText_LessThan20
+	.4byte gBirchDexRatingText_LessThan30
+	.4byte gBirchDexRatingText_LessThan40
+	.4byte gBirchDexRatingText_LessThan50
+	.4byte gBirchDexRatingText_LessThan60
+	.4byte gBirchDexRatingText_LessThan70
+	.4byte gBirchDexRatingText_LessThan80
+	.4byte gBirchDexRatingText_LessThan90
+	.4byte gBirchDexRatingText_LessThan100
+	.4byte gBirchDexRatingText_LessThan110
+	.4byte gBirchDexRatingText_LessThan120
+	.4byte gBirchDexRatingText_LessThan130
+	.4byte gBirchDexRatingText_LessThan140
+	.4byte gBirchDexRatingText_LessThan150
+	.4byte gBirchDexRatingText_LessThan160
+	.4byte gBirchDexRatingText_LessThan170
+	.4byte gBirchDexRatingText_LessThan180
+	.4byte gBirchDexRatingText_LessThan190
+	.4byte gBirchDexRatingText_LessThan200
+	.4byte gBirchDexRatingText_DexCompleted
diff --git a/data/item_menu.s b/data/item_menu.s
deleted file mode 100644
index 1b11c5e59..000000000
--- a/data/item_menu.s
+++ /dev/null
@@ -1,127 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_08613F90:: @ 8613F90
-	.4byte 0x11F0, 0x1E1, 0x21DE
-
-@ possibly a struct
-gUnknown_08613F9C:: @ 8613F9C
-	.4byte 0
-	.4byte bag_menu_change_item_callback
-	.4byte sub_81AB520
-	.4byte 0
-	.4byte 0x80000
-	.4byte 0x7003011
-
-gUnknown_08613FB4:: @ 8613FB4
-    .4byte gMenuText_Use, ItemMenu_UseOutOfBattle
-    .4byte gMenuText_Toss, ItemMenu_Toss
-    .4byte gMenuText_Register, ItemMenu_Register
-    .4byte gMenuText_Give, ItemMenu_Give
-    .4byte gText_Cancel2, ItemMenu_Cancel
-    .4byte gMenuText_Use, ItemMenu_UseInBattle
-    .4byte gMenuText_Check, ItemMenu_UseOutOfBattle
-    .4byte gMenuText_Walk, ItemMenu_UseOutOfBattle
-    .4byte gMenuText_Deselect, ItemMenu_Register
-    .4byte gMenuText_CheckTag, ItemMenu_CheckTag
-    .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm
-    .4byte gMenuText_Show, unknown_ItemMenu_Show
-    .4byte gMenuText_Give2, unknown_ItemMenu_Give2
-    .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm2
-    .4byte gText_EmptyString2, NULL
-
-gUnknown_0861402C:: @ 861402C
-	.byte 0, 3, 1, 4
-
-gUnknown_08614030:: @ 8614030
-	.byte 0, 2, 14, 4
-
-gUnknown_08614034:: @ 8614034
-	.byte 3, 14, 1, 4
-
-gUnknown_08614038:: @ 8614038
-	.byte 0, 3, 14, 4
-
-gUnknown_0861403C:: @ 861403C
-	.byte 9, 14, 0, 3, 1, 4
-
-gUnknown_08614042:: @ 8614042
-	.byte 5, 4
-
-gUnknown_08614044:: @ 8614044
-	.byte 3, 4
-
-gUnknown_08614046:: @ 8614046
-	.byte 4
-
-gUnknown_08614047:: @ 8614047
-	.byte 10, 9, 14, 4
-
-gUnknown_0861404B:: @ 861404B
-	.byte 11, 4
-
-gUnknown_0861404D:: @ 861404D
-	.byte 12, 4
-
-gUnknown_0861404F:: @ 861404F
-	.byte 13, 4
-
-    .align 2
-gUnknown_08614054:: @ 8614054
-	.4byte unknown_item_menu_type
-	.4byte unknown_item_menu_type
-	.4byte item_menu_type_2
-	.4byte display_sell_item_ask_str
-	.4byte unknown_ItemMenu_Confirm
-	.4byte unknown_item_menu_type
-	.4byte display_deposit_item_ask_str
-	.4byte unknown_item_menu_type
-	.4byte unknown_item_menu_type
-	.4byte unknown_item_menu_type
-	.4byte NULL
-	.4byte item_menu_type_b
-
-    .align 2
-gUnknown_08614084:: @ 8614084
-	.4byte BagMenuActuallyToss
-	.4byte BagMenuCancelToss
-
-gUnknown_0861408C:: @ 861408C
-	.4byte sub_81AD84C
-	.4byte sub_81AD6FC
-
-@ probably a struct
-gUnknown_08614094:: @ 8614094
-	.4byte 0x1101C00
-	.4byte 0xFFFF1064
-	.4byte 0x6FFFFF
-	.4byte 0x6F
-
-gUnknown_086140A4:: @ 86140A4
-	.incbin "graphics/interface/select_button.4bpp"
-
-gUnknown_08614164:: @ 8614164
-	.byte 0, 1, 3, 0, 1, 4, 0, 3, 6, 2, 1, 3, 0, 14, 10, 0
-
-gUnknown_08614174:: @ 8614174
-	window_template 0, 14, 2, 15, 16, 1, 0x27
-	window_template 0, 0, 13, 14, 6, 1, 0x117
-	window_template 0, 4, 1, 8, 2, 1, 0x1A1
-	window_template 0, 1, 13, 5, 6, 12, 0x16B
-	window_template 0, 7, 13, 4, 6, 12, 0x189
-	window_template 1, 2, 15, 27, 4, 15, 0x1B1
-	null_window_template
-
-gUnknown_086141AC:: @ 86141AC
-	window_template 1, 22, 17, 7, 2, 15, 0x21D
-	window_template 1, 22, 15, 7, 4, 15, 0x21D
-	window_template 1, 15, 15, 14, 4, 15, 0x21D
-	window_template 1, 15, 13, 14, 6, 15, 0x21D
-	window_template 1, 2, 15, 27, 4, 15, 0x1B1
-	window_template 1, 24, 15, 5, 4, 15, 0x21D
-	window_template 1, 21, 9, 5, 4, 15, 0x21D
-	window_template 1, 24, 17, 5, 2, 15, 0x21D
-	window_template 1, 18, 11, 10, 2, 15, 0x245
-	window_template 1, 1, 1, 10, 2, 15, 0x231
diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc
index 735488b37..666c90867 100644
--- a/data/text/pokedex_rating.inc
+++ b/data/text/pokedex_rating.inc
@@ -12,99 +12,99 @@ gUnknown_082A5D2C:: @ 82A5D2C
 	.string "So, you’ve seen {STR_VAR_1} POKéMON,\n"
 	.string "and you’ve caught {STR_VAR_2} POKéMON…$"
 
-gUnknown_082A5D6C:: @ 82A5D6C
+gBirchDexRatingText_LessThan10:: @ 82A5D6C
 	.string "Go into grassy areas more and look\n"
 	.string "for POKéMON more carefully.$"
 
-gUnknown_082A5DAB:: @ 82A5DAB
+gBirchDexRatingText_LessThan20:: @ 82A5DAB
 	.string "I guess you’re getting the hang\n"
 	.string "of it. But, it gets harder from here.$"
 
-gUnknown_082A5DF1:: @ 82A5DF1
+gBirchDexRatingText_LessThan30:: @ 82A5DF1
 	.string "Some POKéMON only appear in\n"
 	.string "certain areas.\l"
 	.string "You must be persistent.$"
 
-gUnknown_082A5E34:: @ 82A5E34
+gBirchDexRatingText_LessThan40:: @ 82A5E34
 	.string "Well, it could use more quantity,\n"
 	.string "but this is looking more like\l"
 	.string "a POKéDEX now.$"
 
-gUnknown_082A5E83:: @ 82A5E83
+gBirchDexRatingText_LessThan50:: @ 82A5E83
 	.string "This is coming along pretty good.\n"
 	.string "Keep up the effort.$"
 
-gUnknown_082A5EB9:: @ 82A5EB9
+gBirchDexRatingText_LessThan60:: @ 82A5EB9
 	.string "Are you using any RODS?\n"
 	.string "There are many POKéMON in the sea.$"
 
-gUnknown_082A5EF4:: @ 82A5EF4
+gBirchDexRatingText_LessThan70:: @ 82A5EF4
 	.string "Instead of just catching POKéMON,\n"
 	.string "how about making them evolve, too?$"
 
-gUnknown_082A5F39:: @ 82A5F39
+gBirchDexRatingText_LessThan80:: @ 82A5F39
 	.string "This is going to be a fantastic\n"
 	.string "POKéDEX.\l"
 	.string "That’s the feeling I’m getting.$"
 
-gUnknown_082A5F82:: @ 82A5F82
+gBirchDexRatingText_LessThan90:: @ 82A5F82
 	.string "You’ve collected this many…\n"
 	.string "Your talent is remarkable!$"
 
-gUnknown_082A5FB9:: @ 82A5FB9
+gBirchDexRatingText_LessThan100:: @ 82A5FB9
 	.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_082A6018:: @ 82A6018
+gBirchDexRatingText_LessThan110:: @ 82A6018
 	.string "You’ve finally reached\n"
 	.string "the 100-kind mark.\p"
 	.string "This is an impressive POKéDEX!$"
 
-gUnknown_082A6061:: @ 82A6061
+gBirchDexRatingText_LessThan120:: @ 82A6061
 	.string "There might be POKéMON that can be\n"
 	.string "found using ROCK SMASH.$"
 
-gUnknown_082A609C:: @ 82A609C
+gBirchDexRatingText_LessThan130:: @ 82A609C
 	.string "You should get some more POKéMON\n"
 	.string "by trading with others.$"
 
-gUnknown_082A60D5:: @ 82A60D5
+gBirchDexRatingText_LessThan140:: @ 82A60D5
 	.string "I’ve heard of POKéMON that evolve\n"
 	.string "when they come to fully love their\l"
 	.string "TRAINERS.$"
 
-gUnknown_082A6124:: @ 82A6124
+gBirchDexRatingText_LessThan150:: @ 82A6124
 	.string "I had no idea that there were so\n"
 	.string "many POKéMON species in the HOENN\l"
 	.string "region.$"
 
-gUnknown_082A616F:: @ 82A616F
+gBirchDexRatingText_LessThan160:: @ 82A616F
 	.string "On occasion, some POKéMON appear\n"
 	.string "in large numbers like outbreaks.\p"
 	.string "Don’t miss opportunities like\n"
 	.string "those.$"
 
-gUnknown_082A61D6:: @ 82A61D6
+gBirchDexRatingText_LessThan170:: @ 82A61D6
 	.string "One can get a very good idea about\n"
 	.string "the POKéMON of the HOENN region\l"
 	.string "by looking through your POKéDEX.$"
 
-gUnknown_082A623A:: @ 82A623A
+gBirchDexRatingText_LessThan180:: @ 82A623A
 	.string "I would say you already qualify as\n"
 	.string "a POKéMON PROFESSOR, and a good\l"
 	.string "one, too!$"
 
-gUnknown_082A6287:: @ 82A6287
+gBirchDexRatingText_LessThan190:: @ 82A6287
 	.string "With a POKéDEX this complete,\n"
 	.string "you’re a real professional at this!$"
 
-gUnknown_082A62C9:: @ 82A62C9
+gBirchDexRatingText_LessThan200:: @ 82A62C9
 	.string "You’re very close to completing\n"
 	.string "this POKéDEX.\l"
 	.string "I can feel it in my bones!$"
 
-gUnknown_082A6312:: @ 82A6312
+gBirchDexRatingText_DexCompleted:: @ 82A6312
 	.string "Congratulations!\n"
 	.string "Your POKéDEX is complete!$"