3 files changed, 55 insertions, 60 deletions
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 71d4b725c..bd98a3676 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -3,7 +3,7 @@ EventScript_CutTree:: @ 82906BB
 	lockall
 	goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
 	checkpartymove MOVE_CUT
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CheckTreeCantCut
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
@@ -62,7 +62,7 @@ EventScript_RockSmash:: @ 82907A6
 	lockall
 	goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
 	checkpartymove MOVE_ROCK_SMASH
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantSmashRock
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
@@ -129,7 +129,7 @@ EventScript_StrengthBoulder:: @ 82908BA
 	goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
 	goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
 	checkpartymove MOVE_STRENGTH
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantStrength
 	setfieldeffectargument 0, VAR_RESULT
 	msgbox Text_WantToStrength, MSGBOX_YESNO
@@ -190,7 +190,7 @@ Text_StrengthActivated: @ 8290A16
 EventScript_UseWaterfall:: @ 8290A49
 	lockall
 	checkpartymove MOVE_WATERFALL
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantWaterfall
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
@@ -225,7 +225,7 @@ Text_MonUsedWaterfall: @ 8290AFC
 EventScript_UseDive:: @ 8290B0F
 	lockall
 	checkpartymove MOVE_DIVE
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantDive
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
@@ -250,7 +250,7 @@ EventScript_EndDive:: @ 8290B58
 EventScript_UseDiveUnderwater:: @ 8290B5A
 	lockall
 	checkpartymove MOVE_DIVE
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantSurface
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index d5e51e412..b3602ee6f 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -4,63 +4,63 @@ EventScript_PC:: @ 8271D92
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
 	msgbox Text_BootUpPC, MSGBOX_DEFAULT
-	goto EventScript_271DAC
+	goto EventScript_PCMainMenu
 	end
 
-EventScript_271DAC:: @ 8271DAC
+EventScript_PCMainMenu:: @ 8271DAC
 	message gText_WhichPCShouldBeAccessed
 	waitmessage
 	special ScriptMenu_CreatePCMultichoice
 	waitstate
-	goto EventScript_271DBC
+	goto EventScript_AccessPC
 	end
 
-EventScript_271DBC:: @ 8271DBC
+EventScript_AccessPC:: @ 8271DBC
 	switch VAR_RESULT
-	case 0, EventScript_271E0E
-	case 1, EventScript_271DF9
-	case 2, EventScript_271E54
-	case 3, EventScript_271E47
-	case MULTI_B_PRESSED, EventScript_271E47
+	case 0, EventScript_AccessPokemonStorage
+	case 1, EventScript_AccessPlayersPC
+	case 2, EventScript_AccessHallOfFame
+	case 3, EventScript_TurnOffPC
+	case MULTI_B_PRESSED, EventScript_TurnOffPC
 	end
 
-EventScript_271DF9:: @ 8271DF9
+EventScript_AccessPlayersPC:: @ 8271DF9
 	playse SE_PC_LOGIN
 	msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
 	special PlayerPC
 	waitstate
-	goto EventScript_271DAC
+	goto EventScript_PCMainMenu
 	end
 
-EventScript_271E0E:: @ 8271E0E
+EventScript_AccessPokemonStorage:: @ 8271E0E
 	playse SE_PC_LOGIN
-	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35
-	call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E
+	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
+	call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
 	msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
 	special ShowPokemonStorageSystemPC
 	waitstate
-	goto EventScript_271DAC
+	goto EventScript_PCMainMenu
 	end
 
-EventScript_271E35:: @ 8271E35
+EventScript_AccessSomeonesPC:: @ 8271E35
 	msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
 	return
 
-EventScript_271E3E:: @ 8271E3E
+EventScript_AccessLanettesPC:: @ 8271E3E
 	msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
 	return
 
-EventScript_271E47:: @ 8271E47
+EventScript_TurnOffPC:: @ 8271E47
 	setvar VAR_0x8004, 0
 	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
 
-EventScript_271E54:: @ 8271E54
-	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47
+EventScript_AccessHallOfFame:: @ 8271E54
+	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
 	playse SE_PC_LOGIN
 	special AccessHallOfFamePC
 	waitstate
-	goto EventScript_271DBC
+	goto EventScript_AccessPC
 	end
diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc
index 249f45376..50284d590 100644
--- a/data/scripts/prof_birch.inc
+++ b/data/scripts/prof_birch.inc
@@ -1,94 +1,89 @@
-LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD
-Route101_EventScript_2720AD:: @ 82720AD
-Route103_EventScript_2720AD:: @ 82720AD
+ProfBirch_EventScript_UpdateLocation:: @ 82720AD
 	compare VAR_PETALBURG_GYM_STATE, 0
 	goto_if_eq Common_EventScript_NopReturn
-	goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
+	goto_if_set FLAG_SYS_GAME_CLEAR, ProfBirch_EventScript_MoveToLab
 	compare VAR_BIRCH_STATE, 0
-	call_if_eq Route101_EventScript_27211A
+	call_if_eq ProfBirch_EventScript_MoveToLab
 	compare VAR_BIRCH_STATE, 1
-	call_if_eq Route101_EventScript_27211A
+	call_if_eq ProfBirch_EventScript_MoveToLab
 	compare VAR_BIRCH_STATE, 2
-	call_if_eq Route101_EventScript_272127
+	call_if_eq ProfBirch_EventScript_MoveToRoute101
 	compare VAR_BIRCH_STATE, 3
-	call_if_eq Route101_EventScript_272127
+	call_if_eq ProfBirch_EventScript_MoveToRoute101
 	compare VAR_BIRCH_STATE, 4
-	call_if_eq Route101_EventScript_272134
+	call_if_eq ProfBirch_EventScript_MoveToRoute103
 	compare VAR_BIRCH_STATE, 5
-	call_if_eq Route101_EventScript_272134
+	call_if_eq ProfBirch_EventScript_MoveToRoute103
 	compare VAR_BIRCH_STATE, 6
-	call_if_eq Route101_EventScript_27211A
+	call_if_eq ProfBirch_EventScript_MoveToLab
 	compare VAR_BIRCH_STATE, 7
-	call_if_eq Route101_EventScript_27211A
+	call_if_eq ProfBirch_EventScript_MoveToLab
 	return
 
-Route101_EventScript_27211A:: @ 827211A
+ProfBirch_EventScript_MoveToLab:: @ 827211A
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	setflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
-Route101_EventScript_272127:: @ 8272127
+ProfBirch_EventScript_MoveToRoute101:: @ 8272127
 	clearflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
-Route101_EventScript_272134:: @ 8272134
+ProfBirch_EventScript_MoveToRoute103:: @ 8272134
 	clearflag FLAG_HIDE_ROUTE_103_BIRCH
 	setflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141
-Route101_EventScript_272141:: @ 8272141
-Route103_EventScript_272141:: @ 8272141
+ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
 	lock
 	faceplayer
-	goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155
-	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2
+	goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex
+	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
 
-Route101_EventScript_272155:: @ 8272155
+ProfBirch_EventScript_AskRatePokedex:: @ 8272155
 	msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq Route101_EventScript_27216F
-	call Route101_EventScript_272184
+	goto_if_eq ProfBirch_EventScript_DeclineRating
+	call ProfBirch_EventScript_RatePokedex
 	release
 	end
 
-Route101_EventScript_27216F:: @ 827216F
+ProfBirch_EventScript_DeclineRating:: @ 827216F
 	msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT
 	release
 	end
 
-Route101_EventScript_272179:: @ 8272179
+ProfBirch_EventScript_ShowRatingMessage:: @ 8272179
 	copyvar VAR_0x8004, VAR_0x8009
 	special ShowPokedexRatingMessage
 	waitmessage
 	waitbuttonpress
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184
-Route101_EventScript_272184:: @ 8272184
+ProfBirch_EventScript_RatePokedex:: @ 8272184
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, ScriptGetPokedexInfo
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
 	copyvar VAR_0x800A, VAR_RESULT
-	buffernumberstring 0, VAR_0x8008
-	buffernumberstring 1, VAR_0x8009
+	buffernumberstring 0, VAR_0x8008  @ Num Hoenn seen
+	buffernumberstring 1, VAR_0x8009  @ Num Hoenn caught
 	msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT
-	call Route101_EventScript_272179
+	call ProfBirch_EventScript_ShowRatingMessage
 	compare VAR_0x800A, 0
-	goto_if_eq Common_EventScript_NopReturn
+	goto_if_eq Common_EventScript_NopReturn  @ National dex not enabled
 	setvar VAR_0x8004, 1
 	specialvar VAR_RESULT, ScriptGetPokedexInfo
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
-	buffernumberstring 0, VAR_0x8008
-	buffernumberstring 1, VAR_0x8009
+	buffernumberstring 0, VAR_0x8008  @ Num National seen
+	buffernumberstring 1, VAR_0x8009  @ Num National caught
 	msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
 	return