From 852effa474c159398014da736ade6f0fea454de7 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sat, 23 Jul 2022 12:43:43 +0200
Subject: Rename objects

---
 .../script_CutsceneMiscObjectMysteriousCloud.inc   | 10 +++++++++
 ..._CutsceneOrchestratorGreatWhirlwindRevealed.inc | 24 ++++++++++++++++++++++
 data/scripts/cloudTops/script_EzloTalkPoW.inc      |  4 ++--
 data/scripts/cloudTops/script_GregalSick.inc       | 10 ++++-----
 data/scripts/cloudTops/script_Npc4EFirstCloud.inc  |  4 ++--
 .../cloudTops/script_Npc4EKinstoneFused.inc        |  2 +-
 .../script_Object69GreatWhirlwindRevealed.inc      | 24 ----------------------
 .../cloudTops/script_Object6AMysteriousCloud.inc   | 10 ---------
 .../scripts/cloudTops/script_WindTribespeople6.inc |  6 +++---
 9 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 data/scripts/cloudTops/script_CutsceneMiscObjectMysteriousCloud.inc
 create mode 100644 data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc
 delete mode 100644 data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc
 delete mode 100644 data/scripts/cloudTops/script_Object6AMysteriousCloud.inc

(limited to 'data/scripts/cloudTops')

diff --git a/data/scripts/cloudTops/script_CutsceneMiscObjectMysteriousCloud.inc b/data/scripts/cloudTops/script_CutsceneMiscObjectMysteriousCloud.inc
new file mode 100644
index 00000000..8d3bd190
--- /dev/null
+++ b/data/scripts/cloudTops/script_CutsceneMiscObjectMysteriousCloud.inc
@@ -0,0 +1,10 @@
+@ Cloud Tops CUTSCENE_MISC_OBJECT Mysterious Cloud
+SCRIPT_START script_CutsceneMiscObjectMysteriousCloud
+	BeginBlock
+	DoPostScriptAction 0x0007
+	DoPostScriptAction 0x0011
+	Call SetCollisionLayer1
+	Call sub_0807F738
+	EndBlock
+SCRIPT_END
+	.2byte 0x0000
diff --git a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc
new file mode 100644
index 00000000..f2ee4050
--- /dev/null
+++ b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc
@@ -0,0 +1,24 @@
+@ Cloud Tops CUTSCENE_ORCHESTRATOR great whirlwind revealed
+SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed
+	BeginBlock
+	Call SetPriorityHighest
+	SetEntitySpeed 0x0700
+	_0807F0B4 0x0007
+	CameraTargetEntity
+	Call sub_0807FBC4
+	EndBlock
+	SetSyncFlag 0x00000008
+	WaitForSyncFlagAndClear 0x00000010
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000004
+	SetSyncFlag 0x0000000a
+	WaitForSyncFlagAndClear 0x00000004
+	_0807EEB4
+	_0807F0B4 0x0004
+	CameraTargetPlayer
+	Call sub_0807FBCC
+	EnablePlayerControl
+	Call EnablePauseMenu
+	DoPostScriptAction 0x0006
+SCRIPT_END
+	.2byte 0x0000
diff --git a/data/scripts/cloudTops/script_EzloTalkPoW.inc b/data/scripts/cloudTops/script_EzloTalkPoW.inc
index bfbb2d42..a0f641f9 100644
--- a/data/scripts/cloudTops/script_EzloTalkPoW.inc
+++ b/data/scripts/cloudTops/script_EzloTalkPoW.inc
@@ -1,11 +1,11 @@
 @ Ezlo talk after getting wind element
 SCRIPT_START script_EzloTalkPoW
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x05
 	WaitUntilTextboxCloses
 	SetLocalFlagByBank FLAG_BANK_1, 0x0005
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc
index 460e3969..1466280d 100644
--- a/data/scripts/cloudTops/script_GregalSick.inc
+++ b/data/scripts/cloudTops/script_GregalSick.inc
@@ -13,9 +13,9 @@ script_08014B48:
 	JumpIf script_08014B70
 	CheckEntityInteractType
 	JumpIfNot script_08014B48
-	EndBlock 
-	SetPlayerIdle 
-	FacePlayer 
+	EndBlock
+	SetPlayerIdle
+	FacePlayer
 	MessageNoOverlap TEXT_WIND_TRIBE, 0x01
 	WaitUntilTextboxCloses
 	Wait 0x000f
@@ -24,7 +24,7 @@ script_08014B48:
 script_08014B70:
 	EndBlock
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	SetSyncFlag 0x00000001
 	DoPostScriptAction 0x0004
 	WaitForSyncFlagAndClear 0x00000002
@@ -45,7 +45,7 @@ script_08014B70:
 	PlaySound SFX_SECRET
 	SetSyncFlag 0x00000001
 	WaitForSyncFlagAndClear 0x00000002
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 script_08014BE8:
 	SetAnimation 0x0010
diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
index bec3df8e..7ee1968c 100644
--- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
@@ -15,12 +15,12 @@ script_0800D636:
 	_0807E9F0
 	Call sub_0806DAAC
 	JumpIf script_0800D650
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	Jump script_0800D636
 script_0800D650:
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	Call sub_0807FBC4
 	Call sub_0807FBA0
 	SetEntitySpeed 0x0700
diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc
index 8f86a3a7..9a46581f 100644
--- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc
+++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EKinstoneFused
 	CameraTargetPlayer
 	Call sub_0807FBCC
 	EnablePlayerControl
-	Call sub_0807DF50
+	Call EnablePauseMenu
 script_0800D6AE:
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc
deleted file mode 100644
index 8053cca1..00000000
--- a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-@ Cloud Tops OBJECT_69 great whirlwind revealed
-SCRIPT_START script_Object69GreatWhirlwindRevealed
-	BeginBlock
-	Call SetPriorityHighest
-	SetEntitySpeed 0x0700
-	_0807F0B4 0x0007
-	CameraTargetEntity
-	Call sub_0807FBC4
-	EndBlock
-	SetSyncFlag 0x00000008
-	WaitForSyncFlagAndClear 0x00000010
-	SetSyncFlag 0x00000002
-	WaitForSyncFlagAndClear 0x00000004
-	SetSyncFlag 0x0000000a
-	WaitForSyncFlagAndClear 0x00000004
-	_0807EEB4
-	_0807F0B4 0x0004
-	CameraTargetPlayer
-	Call sub_0807FBCC
-	EnablePlayerControl
-	Call sub_0807DF50
-	DoPostScriptAction 0x0006
-SCRIPT_END
-	.2byte 0x0000
diff --git a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc
deleted file mode 100644
index 686d63dd..00000000
--- a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-@ Cloud Tops OBJECT_6A Mysterious Cloud
-SCRIPT_START script_Object6AMysteriousCloud
-	BeginBlock
-	DoPostScriptAction 0x0007
-	DoPostScriptAction 0x0011
-	Call SetCollisionLayer1
-	Call sub_0807F738
-	EndBlock
-SCRIPT_END
-	.2byte 0x0000
diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc
index 7e59ddc0..056361ae 100644
--- a/data/scripts/cloudTops/script_WindTribespeople6.inc
+++ b/data/scripts/cloudTops/script_WindTribespeople6.inc
@@ -14,10 +14,10 @@ SCRIPT_START script_WindTribespeople6
 script_08014AAC:
 	FacePlayerAndCheckDist
 	JumpIfNot script_08014AAC
-	SetPlayerIdle 
-	FacePlayer 
+	SetPlayerIdle
+	FacePlayer
 	MessageNoOverlap TEXT_WIND_TRIBE, 0x0a
 	WaitUntilTextboxCloses
-	EnablePlayerControl 
+	EnablePlayerControl
 	Jump script_08014AAC
 	.2byte 0x0000
-- 
cgit v1.2.3