Merge branch 'master' of https://github.com/pret/pokeemerald into intro

18 files changed, 77 insertions, 271 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/event_scripts.s b/data/event_scripts.s
index b2b895903..6668f0d1f 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -8,7 +8,6 @@
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
-	
 
 	.section script_data, "aw", %progbits
 
@@ -1287,12 +1286,12 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
 	setvar VAR_0x40D3, 1
 	return
 
-EverGrandeCity_HallOfFame_EventScript_271857:: @ 8271857
+EventScript_WhiteOut:: @ 8271857
 	call EverGrandeCity_HallOfFame_EventScript_2718CC
-	goto EverGrandeCity_HallOfFame_EventScript_271862
+	goto EventScript_271862
 	end
 
-EverGrandeCity_HallOfFame_EventScript_271862:: @ 8271862
+EventScript_271862:: @ 8271862
 	compare VAR_0x4096, 1
 	goto_eq EverGrandeCity_HallOfFame_EventScript_271884
 	compare VAR_0x4096, 2
diff --git a/data/field_screen.s b/data/field_screen.s
index f95e7e0ec..968e2e7f3 100644
--- a/data/field_screen.s
+++ b/data/field_screen.s
@@ -483,7 +483,7 @@ gUnknown_0854FE64:: @ 854FE64
 	.2byte 0x00c8, 0x0048, 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0000, 0x0000
 
 	.align 2
-gUnknown_0854FE78:: @ 854FE78
+gMaxFlashLevel:: @ 854FE78
 	.4byte 0x00000008
 
 	.align 2
diff --git a/data/item_use.s b/data/item_use.s
index d9bcc44f6..6c9affbc8 100644
--- a/data/item_use.s
+++ b/data/item_use.s
@@ -8,7 +8,7 @@
     .align 2
 gUnknown_085920D8:: @ 85920D8
 	.4byte sub_81B617C
-	.4byte c2_exit_to_overworld_2_switch
+	.4byte CB2_ReturnToField
 	.4byte NULL
 
     .align 2
diff --git a/data/main_menu.s b/data/main_menu.s
deleted file mode 100644
index 019fdfab8..000000000
--- a/data/main_menu.s
+++ /dev/null
@@ -1,141 +0,0 @@
-@ the second big chunk of data
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_082FECFC:: @ 82FECFC
-	.incbin "graphics/birch_speech/bg0.gbapal"
-	.incbin "graphics/birch_speech/bg1.gbapal"
-
-	.align 2
-gBirchIntroShadowGfx:: @ 82FED3C
-	.incbin "graphics/birch_speech/shadow.4bpp.lz"
-
-	.align 2
-gUnknown_082FEEF0:: @ 82FEEF0
-	.incbin "graphics/birch_speech/map.bin.lz"
-
-	.align 2
-gUnknown_082FF018:: @ 82FF018
-	.incbin "graphics/birch_speech/bg2.gbapal"
-
-	.align 2
-gUnknown_082FF028:: @ 82FF028
-	.space 16
-
-	.align 2
-gUnknown_082FF038:: @ 82FF038
-	window_template 0x00, 0x02, 0x01, 0x1a, 0x02, 0x0f, 0x0001
-	window_template 0x00, 0x02, 0x05, 0x1a, 0x02, 0x0f, 0x0035
-
-	.align 2
-gUnknown_082FF048:: @ 82FF048
-	window_template 0x00, 0x02, 0x01, 0x1a, 0x06, 0x0f, 0x0001
-	window_template 0x00, 0x02, 0x09, 0x1a, 0x02, 0x0f, 0x009d
-	window_template 0x00, 0x02, 0x0d, 0x1a, 0x02, 0x0f, 0x00d1
-	window_template 0x00, 0x02, 0x11, 0x1a, 0x02, 0x0f, 0x0105
-	window_template 0x00, 0x02, 0x15, 0x1a, 0x02, 0x0f, 0x0139
-
-	.align 2
-gUnknown_082FF070:: @ 82FF070
-	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x016d
-	null_window_template
-
-	.align 2
-gUnknown_082FF080:: @ 82FF080
-	window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0001
-
-	.align 2
-gUnknown_082FF088:: @ 82FF088
-	window_template 0x00, 0x03, 0x05, 0x06, 0x04, 0x0f, 0x006d
-	window_template 0x00, 0x03, 0x02, 0x09, 0x0a, 0x0f, 0x0085
-	null_window_template
-
-	.align 2
-gMainMenuBgPal:: @ 82FF0A0
-	.incbin "graphics/misc/main_menu_bg.gbapal"
-
-	.align 2
-gMainMenuTextPal:: @ 82FF0C0
-	.incbin "graphics/misc/main_menu_text.gbapal"
-
-	.align 2
-gUnknown_082FF0E0:: @ 82FF0E0
-	.byte 0x0a, 0x0b, 0x0c
-
-gUnknown_082FF0E3:: @ 82FF0E3
-	.byte 0x0a, 0x01, 0x0c
-
-	.align 2
-gUnknown_082FF0E8:: @ 82FF0E8
-	.4byte 0x000001e8, 0x00003071
-
-	.align 2
-gUnknown_082FF0F0:: @ 82FF0F0
-	.4byte 0x000001ec
-
-	.align 2
-gUnknown_082FF0F4:: @ 82FF0F4
-	.byte 0x02, 0x78, 0x08, 0x03, 0x78, 0x98, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_082FF104:: @ 82FF104
-	.2byte 0xfffe, 0xfffe, 0x3000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gUnknown_082FF114:: @ 82FF114
-	.4byte gUnknown_082FF104
-
-	.align 2
-gUnknown_082FF118:: @ 82FF118
-	.4byte gText_BirchBoy, 0x00000000
-	.4byte gText_BirchGirl, 0x00000000
-
-	.align 2
-gMalePresetNames:: @ 82FF128
-	.4byte gText_DefaultNameStu
-	.4byte gText_DefaultNameMilton
-	.4byte gText_DefaultNameTom
-	.4byte gText_DefaultNameKenny
-	.4byte gText_DefaultNameReid
-	.4byte gText_DefaultNameJude
-	.4byte gText_DefaultNameJaxson
-	.4byte gText_DefaultNameEaston
-	.4byte gText_DefaultNameWalker
-	.4byte gText_DefaultNameTeru
-	.4byte gText_DefaultNameJohnny
-	.4byte gText_DefaultNameBrett
-	.4byte gText_DefaultNameSeth
-	.4byte gText_DefaultNameTerry
-	.4byte gText_DefaultNameCasey
-	.4byte gText_DefaultNameDarren
-	.4byte gText_DefaultNameLandon
-	.4byte gText_DefaultNameCollin
-	.4byte gText_DefaultNameStanley
-	.4byte gText_DefaultNameQuincy
-
-	.align 2
-gFemalePresetNames:: @ 82FF178
-	.4byte gText_DefaultNameKimmy
-	.4byte gText_DefaultNameTiara
-	.4byte gText_DefaultNameBella
-	.4byte gText_DefaultNameJayla
-	.4byte gText_DefaultNameAllie
-	.4byte gText_DefaultNameLianna
-	.4byte gText_DefaultNameSara
-	.4byte gText_DefaultNameMonica
-	.4byte gText_DefaultNameCamila
-	.4byte gText_DefaultNameAubree
-	.4byte gText_DefaultNameRuthie
-	.4byte gText_DefaultNameHazel
-	.4byte gText_DefaultNameNadine
-	.4byte gText_DefaultNameTanja
-	.4byte gText_DefaultNameYasmin
-	.4byte gText_DefaultNameNicola
-	.4byte gText_DefaultNameLillie
-	.4byte gText_DefaultNameTerra
-	.4byte gText_DefaultNameLucy
-	.4byte gText_DefaultNameHalie
diff --git a/data/overworld.s b/data/overworld.s
deleted file mode 100644
index 186af6f44..000000000
--- a/data/overworld.s
+++ /dev/null
@@ -1,52 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-gUnknown_08339D3C:: @ 8339D3C
-	.4byte 0xFFFFFF, 0xFFFFFFFF, 0x4B0, 0xE10, 0x4B0, 0x960, 0x32, 0x50, 0xFFFFFFD4, 0x2C
-
-gUnknown_08339D64:: @ 8339D64
-	.4byte 0, 0
-	.4byte 0, 1
-	.4byte 0, -1
-	.4byte -1, 0
-	.4byte 1, 0
-	.4byte -1, 1
-	.4byte 1, 1
-	.4byte -1, -1
-	.4byte 1, -1
-
-gUnknown_08339DAC:: @ 8339DAC
-	.4byte 0x1F8
-	.4byte 0x11D1
-	.4byte 0x21C2
-	.4byte 0x31E3
-
-gUnknown_08339DBC:: @ 8339DBC
-	.4byte REG_WIN0H
-	.4byte 0xa2600001
-	.byte 1, 0
-
-	.align 2
-gUnknown_08339DC8:: @ 8339DC8
-	.4byte sub_80879D8
-	.4byte sub_80879F8
-	.4byte sub_80879FC
-
-gUnknown_08339DD4:: @ 8339DD4
-	.4byte sub_8087A1C
-	.4byte sub_8087A20
-	.4byte sub_8087A20
-	.4byte sub_8087A20
-	.4byte sub_8087A20
-	.4byte sub_8087A1C
-	.4byte sub_8087A1C
-	.4byte sub_8087A88
-	.4byte sub_8087A88
-	.4byte sub_8087A88
-	.4byte sub_8087A88
-
-gUnknown_08339E00:: @ 8339E00
-	.4byte sub_8087AA0
-	.4byte sub_8087AA8
diff --git a/data/party_menu.s b/data/party_menu.s
index 1319ce5d8..b60a1f927 100644
--- a/data/party_menu.s
+++ b/data/party_menu.s
@@ -434,7 +434,7 @@ gUnknown_08615D9C:: @ 8615D9C
 	.4byte sub_80D3718, 0x00000007
 	.4byte SetUpFieldMove_Flash, 0x0000000d
 	.4byte sub_8135654, 0x0000000d
-	.4byte hm_prepare_rocksmash, 0x0000000d
+	.4byte SetUpFieldMove_Strength, 0x0000000d
 	.4byte sub_81B5820, 0x00000008
 	.4byte sub_81B5884, 0x0000000d
 	.4byte sub_81B5974, 0x0000000d
@@ -442,8 +442,8 @@ gUnknown_08615D9C:: @ 8615D9C
 	.4byte SetUpFieldMove_Teleport, 0x0000000d
 	.4byte sub_813572C, 0x0000000d
 	.4byte sub_80FA004, 0x0000000d
-	.4byte hm_prepare_dive_probably, 0x00000010
-	.4byte hm_prepare_dive_probably, 0x00000010
+	.4byte SetUpFieldMove_SoftBoiled, 0x00000010
+	.4byte SetUpFieldMove_SoftBoiled, 0x00000010
 	.4byte SetUpFieldMove_SweetScent, 0x0000000d
 
 	.align 2
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index b8aef7c3d..e5b330bf3 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -916,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471
 	releaseall
 	end
 
-gUnknown_0827747E:: @ 827747E
+EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E
 	msgbox Text_278452, 4
 	fadescreen 1
 	special sp02A_crash_sound
 	waitstate
 	end
 
-gUnknown_0827748D:: @ 827748D
+EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D
 	msgbox Text_27847B, 4
 	fadescreen 1
 	special sp02A_crash_sound
 	waitstate
 	end
 
-gUnknown_0827749C:: @ 827749C
+EventScript_TradeRoom_TooBusyToNotice:: @ 827749C
 	msgbox Text_27842E, 4
 	closemessage
 	end
@@ -983,7 +983,7 @@ gUnknown_08277509:: @ 8277509
 	special sub_80B371C
 	end
 
-gUnknown_08277513:: @ 8277513
+EventScript_277513:: @ 8277513
 	special sub_80B36EC
 	special sub_80AF9F8
 	waitstate
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
index cff676124..c2b70944b 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
@@ -28,7 +28,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F
-	special AddMapNamePopUpWindowTask
+	special ShowMapNamePopup
 	setvar VAR_0x400F, 0
 	end
 
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
index 6c44e0044..3ba3a5a6a 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
@@ -64,7 +64,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180
 	end
 
 BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
-	special AddMapNamePopUpWindowTask
+	special ShowMapNamePopup
 	setvar VAR_0x400F, 0
 	end
 
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index fc069a8ee..01ce60717 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -12,7 +12,7 @@ FortreeCity_Gym_MapScript2_2165BA: @ 82165BA
 	.2byte 0
 
 FortreeCity_Gym_EventScript_2165C4:: @ 82165C4
-	special sub_80FBED0
+	special RotatingGate_InitPuzzleAndGraphics
 	end
 
 FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
index a043b2ec4..6b13cf8cb 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
@@ -12,7 +12,7 @@ Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6
 	.2byte 0
 
 Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0
-	special sub_80FBED0
+	special RotatingGate_InitPuzzleAndGraphics
 	end
 
 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 72707186b..2f99f7c4e 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -18,7 +18,7 @@ Route119_EventScript_1F4439:: @ 81F4439
 Route119_MapScript1_1F444D: @ 81F444D
 	call Route119_EventScript_271ED7
 	call Route119_EventScript_271EFB
-	compare VAR_0x40B3, 1
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
 	call_if 1, Route119_EventScript_1F4466
 	special SetRoute119Weather
 	end
@@ -26,7 +26,7 @@ Route119_MapScript1_1F444D: @ 81F444D
 Route119_EventScript_1F4466:: @ 81F4466
 	setflag FLAG_0x37D
 	clearflag FLAG_0x37C
-	setvar VAR_0x40B3, 2
+	setvar VAR_WEATHER_INSTITUTE_STATE, 2
 	return
 
 Route119_EventScript_1F4472:: @ 81F4472
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
index 399692db3..b008f52c0 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
@@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86
 	.byte 0
 
 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C
-	compare VAR_0x40B3, 0
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98
 	end
 
@@ -16,7 +16,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
-	compare VAR_0x40B3, 0
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE
 	msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4
 	release
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index 38f79763d..c8f24f33d 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
@@ -3,9 +3,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E
 	.byte 0
 
 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24
-	compare VAR_0x40B3, 0
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44
-	compare VAR_0x40B3, 1
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
 	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50
 	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C
@@ -62,7 +62,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
 	waitmovement 0
 	msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4
 	closemessage
-	setvar VAR_0x40B3, 1
+	setvar VAR_WEATHER_INSTITUTE_STATE, 1
 	clearflag FLAG_0x37D
 	fadedefaultbgm
 	fadescreen 1
diff --git a/data/specials.inc b/data/specials.inc
index a4bd17699..62dd9717e 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -213,7 +213,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80F972C
 	def_special sp0C8_whiteout_maybe
 	def_special sub_80FBE90
-	def_special sub_80FBED0
+	def_special RotatingGate_InitPuzzleAndGraphics
 	def_special SetSSTidalFlag
 	def_special ResetSSTidalFlag
 	def_special EnterSafariMode
@@ -417,8 +417,8 @@ gSpecials:: @ 81DBA64
 	def_special sub_813B880
 	def_special sub_81A085C
 	def_special ShouldTryGetTrainerScript
-	def_special AddMapNamePopUpWindowTask
-	def_special AddMapNamePopUpWindowTask
+	def_special ShowMapNamePopup
+	def_special ShowMapNamePopup
 	def_special sub_81BE994
 	def_special sub_81BE79C
 	def_special sub_81BE7F4
diff --git a/data/text/birch_speech.inc b/data/text/birch_speech.inc
index 9e7eea3bc..1dfc0242b 100644
--- a/data/text/birch_speech.inc
+++ b/data/text/birch_speech.inc
@@ -1,4 +1,4 @@
-gUnknown_082C897B:: @ 82C897B
+gText_Birch_Welcome:: @ 82C897B
 	.string "Hi! Sorry to keep you waiting!\p"
 	.string "Welcome to the world of POKéMON!\p"
 	.string "My name is BIRCH.\p"
@@ -6,12 +6,12 @@ gUnknown_082C897B:: @ 82C897B
 	.string "PROFESSOR.\p"
 	.string "$"
 
-gUnknown_082C89FB:: @ 82C89FB
+gText_Birch_Pokemon:: @ 82C89FB
 	.string "This is what we call a “POKéMON.”\p"
 	.string "\n"
 	.string "$"
 
-gUnknown_082C8A1F:: @ 82C8A1F
+gText_Birch_MainSpeech:: @ 82C8A1F
 	.string "This world is widely inhabited by\n"
 	.string "creatures known as POKéMON.\p"
 	.string "We humans live alongside POKéMON,\n"
@@ -28,28 +28,28 @@ gUnknown_082C8A1F:: @ 82C8A1F
 	.string "That’s what I do.\p"
 	.string "$"
 
-gUnknown_082C8BD0:: @ 82C8BD0
+gText_Birch_AndYouAre:: @ 82C8BD0
 	.string "And you are?$"
 
-gUnknown_082C8BDD:: @ 82C8BDD
+gText_Birch_BoyOrGirl:: @ 82C8BDD
 	.string "Are you a boy?\n"
 	.string "Or are you a girl?$"
 
-gUnknown_082C8BFF:: @ 82C8BFF
+gText_Birch_WhatsYourName:: @ 82C8BFF
 	.string "All right.\n"
 	.string "What’s your name?$"
 
-gUnknown_082C8C1C:: @ 82C8C1C
+gText_Birch_SoItsPlayer:: @ 82C8C1C
 	.string "So it’s {PLAYER}{KUN}?$"
 
-gUnknown_082C8C2A:: @ 82C8C2A
+gText_Birch_YourePlayer:: @ 82C8C2A
 	.string "Ah, okay!\p"
 	.string "You’re {PLAYER}{KUN} who’s moving to my\n"
 	.string "hometown of LITTLEROOT.\l"
 	.string "I get it now!\p"
 	.string "$"
 
-gUnknown_082C8C7A:: @ 82C8C7A
+gText_Birch_AreYouReady:: @ 82C8C7A
 	.string "All right, are you ready?\p"
 	.string "Your very own adventure is about\n"
 	.string "to unfold.\p"
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!$"