Sync elite_four.inc, check_furniture.inc

12 files changed, 27 insertions, 27 deletions

diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index 45e9f9782..fcf09914b 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -18,7 +18,7 @@ EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
 
 EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
 	lockall
-	call EverGrandeCity_DrakesRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 4
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
 	end
 
 EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758
-	call EverGrandeCity_DrakesRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
-	call EverGrandeCity_DrakesRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
@@ -56,7 +56,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
 	setvar VAR_0x8004, 0
 	special sub_810FF60
 	setflag FLAG_DEFEATED_ELITE_4_DRAKE
-	call EverGrandeCity_DrakesRoom_EventScript_1A0693
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
index 1218cf1d0..d4b5c8582 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -18,7 +18,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692
 
 EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
 	lockall
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 3
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
-	call EverGrandeCity_GlaciasRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
@@ -54,7 +54,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
 	setflag FLAG_DEFEATED_ELITE_4_GLACIA
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
index ea84a7d81..c5394ecb0 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -18,7 +18,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8
 
 EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
 	lockall
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 2
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
-	call EverGrandeCity_PhoebesRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
@@ -54,7 +54,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
 
 EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
 	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index 527aefdda..7bd896364 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -11,11 +11,11 @@ EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564
-	call EverGrandeCity_SidneysRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A
-	call EverGrandeCity_SidneysRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570
@@ -33,7 +33,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F
 
 EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
 	lockall
-	call EverGrandeCity_SidneysRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 1
 	releaseall
 	end
@@ -55,7 +55,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
 
 EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
 	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
-	call EverGrandeCity_SidneysRoom_EventScript_1A0693
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_SidneysRoom_Text_19086D, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc
index f8b990423..9690ccb29 100644
--- a/data/maps/FallarborTown_House1/scripts.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
@@ -25,8 +25,8 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
 	giveitem ITEM_TM27_RETURN
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setvar VAR_0x8004, 280
-	call FallarborTown_House1_EventScript_1A067F
+	setvar VAR_0x8004, ITEM_METEORITE
+	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_RECEIVED_TM27
 	msgbox FallarborTown_House1_Text_177910, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index e8b8c6133..861b0eccb 100644
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -6,7 +6,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
 	faceplayer
 	msgbox GraniteCave_StevensRoom_Text_194AE5, MSGBOX_DEFAULT
 	setvar VAR_0x8004, ITEM_LETTER
-	call GraniteCave_StevensRoom_EventScript_1A067F
+	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_194BDD, MSGBOX_DEFAULT
 	giveitem ITEM_TM47_STEEL_WING
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 945f5d35a..15267ec8a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -38,7 +38,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA
 	setvar VAR_0x8004, 0
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678
+	call Common_EventScript_NameReceivedPartyMon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
 	end
 
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 26ab6aed3..07fe1b296 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -86,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	bufferspeciesname 1, SPECIES_BELDUM
 	msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
 	setflag FLAG_RECEIVED_BELDUM
 	releaseall
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index a55ae8800..fc0776fb5 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -194,7 +194,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A
 
 MtPyre_Summit_EventScript_15D669:: @ 815D669
 	setvar VAR_0x8004, ITEM_RED_OR_BLUE_ORB
-	call MtPyre_Summit_EventScript_1A067F
+	call Common_EventScript_PlayerHandedOverTheItem
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 33a25c7ca..ae04f9779 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -145,7 +145,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
 	givemon SPECIES_LILEEP, 20, ITEM_NONE
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	release
 	end
 
@@ -165,7 +165,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
 	givemon SPECIES_ANORITH, 20, ITEM_NONE
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	release
 	end
 
diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc
index f047c80a5..b5139c129 100644
--- a/data/maps/SlateportCity_House1/scripts.inc
+++ b/data/maps/SlateportCity_House1/scripts.inc
@@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_155726:: @ 8155726
 
 SlateportCity_House1_EventScript_155730:: @ 8155730
 	msgbox SlateportCity_House1_Text_17D580, MSGBOX_DEFAULT
-	call SlateportCity_House1_EventScript_1A0678
+	call Common_EventScript_NameReceivedPartyMon
 	specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	compare VAR_RESULT, 1
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 47d49639e..0450d51f1 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -78,8 +78,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 269
-	call SlateportCity_OceanicMuseum_2F_EventScript_1A067F
+	setvar VAR_0x8004, ITEM_DEVON_GOODS
+	call Common_EventScript_PlayerHandedOverTheItem
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98