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

10 files changed, 45 insertions, 45 deletions

diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index a644008d0..bbb7662ba 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
 	end
 
 Script_Apprentice_SetLeavingFlags:
-	setflag FLAG_0x2BD
+	setflag FLAG_HIDE_APPRENTICE
 	setflag FLAG_0x934
 	return
 
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 08f5accca..3408eb2a8 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -29,11 +29,11 @@ OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276AFB:: @ 8276AFB
-	clearflag FLAG_0x2BE
+	clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_276AFF:: @ 8276AFF
-	setflag FLAG_0x2BE
+	setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 	return
 
 BattleFrontier_PokemonCenter_2F_EventScript_276B03:: @ 8276B03
@@ -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
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index d89c78f18..afd2ca851 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1086,7 +1086,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36
 	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27ABD8
 	call LinkContestRoom1_EventScript_27AB9E
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	goto_eq LinkContestRoom1_EventScript_27AB82
 	lockall
 	msgbox LinkContestRoom1_Text_27BBA8, 4
@@ -1127,7 +1127,7 @@ LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF
 LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE
 	compare VAR_CONTEST_RANK, 3
 	goto_eq LinkContestRoom1_EventScript_27ABCD
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	return
 
 LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index d9b8a89ac..7b306a261 100644
--- a/data/scripts/day_care.inc
+++ b/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
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index d0936b9c1..aba6bec97 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/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
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 5a03a0e98..0ca624572 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -72,67 +72,67 @@ Route111_EventScript_28CD8B:: @ 828CD8B
 	return
 
 Route111_EventScript_28CD96:: @ 828CD96
-	setflag FLAG_0x31C
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CD9A:: @ 828CD9A
-	clearflag FLAG_0x31C
+	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CD9E:: @ 828CD9E
-	setflag FLAG_0x31D
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CDA2:: @ 828CDA2
-	clearflag FLAG_0x31D
+	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CDA6:: @ 828CDA6
-	setflag FLAG_0x31E
+	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CDAA:: @ 828CDAA
-	clearflag FLAG_0x31E
+	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CDAE:: @ 828CDAE
-	setflag FLAG_0x31F
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
 Route111_EventScript_28CDB2:: @ 828CDB2
-	clearflag FLAG_0x31F
+	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
 Route111_EventScript_28CDB6:: @ 828CDB6
-	setflag FLAG_0x385
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDBA:: @ 828CDBA
-	clearflag FLAG_0x385
+	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDBE:: @ 828CDBE
-	setflag FLAG_0x386
+	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDC2:: @ 828CDC2
-	clearflag FLAG_0x386
+	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDC6:: @ 828CDC6
-	setflag FLAG_0x387
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDCA:: @ 828CDCA
-	clearflag FLAG_0x387
+	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDCE:: @ 828CDCE
-	setflag FLAG_0x388
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
 Route111_EventScript_28CDD2:: @ 828CDD2
-	clearflag FLAG_0x388
+	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
 Route111_EventScript_28CDD6:: @ 828CDD6
@@ -220,7 +220,7 @@ Route111_EventScript_28CF56:: @ 828CF56
 	call_if 1, Route111_EventScript_28CF9F
 	compare VAR_FACING, 4
 	call_if 1, Route111_EventScript_28CFB1
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq Route111_EventScript_28D0EE
 	msgbox Route111_Text_28B042, 5
 	goto Route111_EventScript_28D0A7
@@ -254,7 +254,7 @@ Route120_EventScript_28CFC3:: @ 828CFC3
 	call_if 1, Route111_EventScript_28CF9F
 	compare VAR_FACING, 4
 	call_if 1, Route111_EventScript_28CFB1
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq Route111_EventScript_28D0EE
 	specialvar VAR_RESULT, GabbyAndTyGetLastQuote
 	compare VAR_RESULT, 0
@@ -323,13 +323,13 @@ Route111_EventScript_28D0A7:: @ 828D0A7
 	goto_eq Route111_EventScript_28D0E1
 	msgbox Route111_Text_28B4AB, 4
 	special GabbyAndTyAfterInterview
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	release
 	end
 
 Route111_EventScript_28D0E1:: @ 828D0E1
 	msgbox Route111_Text_28B577, 4
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	release
 	end
 
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 734831f7f..9ae77ccf8 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -66,8 +66,8 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
 	delay 30
 	setvar VAR_0x4092, 6
 	setflag FLAG_0x051
-	setflag FLAG_0x2F2
-	setflag FLAG_0x2F3
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
 	checkplayergender
 	compare VAR_RESULT, 0
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 3187c95f4..e77db6b00 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4
 
 EventScript_Pblock1_Ask:: @ 8293C3E
 	lockall
-	checkflag FLAG_0x340
+	checkflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
 	goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB
 	setvar VAR_0x8009, 1
 	applymovement 16, LilycoveCity_ContestLobby_Movement_294053
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 76a4ee8f1..27fe53a4c 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -50,7 +50,7 @@ Route111_EventScript_27661E:: @ 827661E
 	msgbox Route111_Text_27636E, 4
 	closemessage
 	setflag FLAG_0x060
-	clearflag FLAG_0x3B4
+	clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
 	compare VAR_FACING, 3
 	call_if 1, Route111_EventScript_27666A
 	compare VAR_FACING, 4
@@ -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
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 8d1ac83eb..2292e9984 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -1,4 +1,4 @@
-EventScript_27EE0B:: @ 827EE0B
+EventScript_TV:: @ 827EE0B
 	lockall
 	incrementgamestat 44
 	special ResetTVShowState