6 files changed, 11 insertions, 12 deletions
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 99a1a6eb3..8e4e93770 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -108,7 +108,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
-	call EverGrandeCity_ChampionsRoom_EventScript_272184
+	call ProfBirch_EventScript_RatePokedex
 	msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index b0275642c..b2307a344 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -6,7 +6,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
 
 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
 	call Common_EventScript_SetupRivalGfxId
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
+	call ProfBirch_EventScript_UpdateLocation
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
@@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
 	goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
-	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
+	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
 	end
 
@@ -497,19 +497,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
-	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_BIRCH_LAB_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2
-Route101_EventScript_1FA2D2:: @ 81FA2D2
+EventScript_RegisterProfBirch:: @ 81FA2D2
 	msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT
 	closemessage
 	delay 30
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index 44d8b2137..7e8cfb959 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route101_EventScript_272141",
+      "script": "ProfBirch_EventScript_RatePokedexOrRegister",
       "flag": "FLAG_HIDE_ROUTE_101_BIRCH"
     },
     {
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 73bfe570c..aab1d44b3 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -4,7 +4,7 @@ Route101_MapScripts:: @ 81EBCBA
 	.byte 0
 
 Route101_OnTransition: @ 81EBCC5
-	call Route101_EventScript_2720AD
+	call ProfBirch_EventScript_UpdateLocation
 	end
 
 Route101_MapScript2_1EBCCB: @ 81EBCCB
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index bf207ec2f..8f5b9f2b3 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -165,7 +165,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_272141",
+      "script": "ProfBirch_EventScript_RatePokedexOrRegister",
       "flag": "FLAG_HIDE_ROUTE_103_BIRCH"
     },
     {
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 84e7ad98b..cdb76d763 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -5,7 +5,7 @@ Route103_MapScripts:: @ 81EC38E
 
 Route103_OnTransition: @ 81EC399
 	call Common_EventScript_SetupRivalGfxId
-	call Route103_EventScript_2720AD
+	call ProfBirch_EventScript_UpdateLocation
 	end
 
 Route103_MapScript1_1EC3A4: @ 81EC3A4