Merge branch 'master' into event-flags

data/scripts/cable_club.inc

@@ -474,7 +474,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
 	release
 	compare VAR_0x8004, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036
-	special sub_809D2BC
+	special SetCableClubWarp
 	warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
 	special sub_80AF948
 	waitstate
@@ -486,7 +486,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036
-	special sub_809D2BC
+	special SetCableClubWarp
 	warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
 	special sub_80AF948
 	waitstate
@@ -576,7 +576,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
 	closedoor 9, 1
 	waitdooranim
 	release
-	special sub_809D2BC
+	special SetCableClubWarp
 	setwarp MAP_TRADE_CENTER, 255, 5, 8
 	special sub_80AF948
 	waitstate
@@ -651,7 +651,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
 	closedoor 9, 1
 	waitdooranim
 	release
-	special sub_809D2BC
+	special SetCableClubWarp
 	setwarp MAP_RECORD_CORNER, 255, 8, 9
 	special sub_80AF948
 	waitstate
@@ -702,7 +702,7 @@ MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306
-	special sub_809D2BC
+	special SetCableClubWarp
 	special sub_80AF948
 	waitstate
 	end
@@ -784,7 +784,7 @@ MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360
 	walk_up
 	step_end
 
-gUnknown_08277365:: @ 8277365
+EventScript_CableBoxResults:: @ 8277365
 	lockall
 	setvar VAR_0x8004, 0
 	special ShowLinkBattleRecords
@@ -1050,7 +1050,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
 	closedoor 5, 1
 	waitdooranim
 	special sub_8018090
-	special sub_809D2BC
+	special SetCableClubWarp
 	warpteleport2 MAP_UNION_ROOM, 255, 7, 11
 	waitstate
 	special UnionRoomSpecial
@@ -1392,7 +1392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A
 	waitstate
 	end
 
-OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A
+EventScript_WirelessBoxResults:: @ 8277B8A
 	lockall
 	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F

data/scripts/day_care.inc

@@ -289,7 +289,7 @@ Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_291FC0:: @ 8291FC0
+EventScript_EggHatch:: @ 8291FC0
 	lockall
 	msgbox Text_292668, 4
 	special EggHatch

data/scripts/field_move_scripts.inc

@@ -223,7 +223,7 @@ FieryPath_Text_290A16: @ 8290A16
 	.string "STRENGTH made it possible to move\n"
 	.string "boulders around.$"
 
-EventScript_290A49:: @ 8290A49
+EventScript_UseWaterfall:: @ 8290A49
 	lockall
 	checkpartymove MOVE_WATERFALL
 	compare VAR_RESULT, 6
@@ -237,7 +237,7 @@ EventScript_290A49:: @ 8290A49
 	dofieldeffect 43
 	goto EventScript_290A8C
 
-EventScript_290A83:: @ 8290A83
+EventScript_CannotUseWaterfall:: @ 8290A83
 	lockall
 
 EventScript_290A84:: @ 8290A84
@@ -258,7 +258,7 @@ Text_290AC3: @ 8290AC3
 Text_290AFC: @ 8290AFC
 	.string "{STR_VAR_1} used WATERFALL.$"
 
-EventScript_290B0F:: @ 8290B0F
+EventScript_UseDive:: @ 8290B0F
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, 6
@@ -283,7 +283,7 @@ EventScript_290B58:: @ 8290B58
 	releaseall
 	end
 
-EventScript_290B5A:: @ 8290B5A
+EventScript_UseDiveUnderwater:: @ 8290B5A
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, 6

data/scripts/secret_power_tm.inc

@@ -104,10 +104,10 @@ Route111_Movement_276696: @ 8276696
 	walk_down
 	step_end
 
-EventScript_2766A2:: @ 82766A2
+EventScript_SecretPower1:: @ 82766A2
 	special sub_80EB290
 	end
 
-EventScript_2766A6:: @ 82766A6
+EventScript_SecretPower2:: @ 82766A6
 	special sub_80EB2C8
 	end

data/scripts/tv.inc

@@ -1,4 +1,4 @@
-EventScript_27EE0B:: @ 827EE0B
+EventScript_TV:: @ 827EE0B
 	lockall
 	incrementgamestat 44
 	special ResetTVShowState