From a82ad2951a2d78533fb18bf08203cb4b3256a2f1 Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Sat, 29 Apr 2023 01:25:31 +0200
Subject: Name some things with NPC4E

---
 data/scripts/cloudTops/script_Npc4EFirstCloud.inc | 8 ++++----
 data/scripts/npc/script_MysteriousWall.inc        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'data/scripts')

diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
index b5245520..11010e65 100644
--- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EFirstCloud
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x000b
 	DoPostScriptAction 0x0008
-	Call sub_0806DAAC
+	Call NPC4E_IsKinstoneFused
 	JumpIf script_0800D6AE
 	Call NPC4E_MakeFuserInteractable
 	CallWithArg sub_0806DA04, 0x00000002
@@ -13,7 +13,7 @@ SCRIPT_START script_Npc4EFirstCloud
 script_0800D636:
 	_0807EA4C
 	_0807E9F0
-	Call sub_0806DAAC
+	Call NPC4E_IsKinstoneFused
 	JumpIf script_0800D650
 	Call EnablePauseMenu
 	EnablePlayerControl
@@ -28,9 +28,9 @@ script_0800D650:
 	CameraTargetEntity
 	_0807EDD4 0x01e8, 0x01b8
 	Wait 0x003c
-	Call sub_0806DAE8
+	Call NPC4E_SetPinwheelFlag
 	Wait 0x0078
-	Call sub_0806DB44
+	Call NPC4E_IsEveryPinwheelActivated
 	JumpIfNot script_Npc4EKinstoneFused
 	LoadRoomEntityList gUnk_080DD730
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc
index 0c03e624..4775eb3c 100644
--- a/data/scripts/npc/script_MysteriousWall.inc
+++ b/data/scripts/npc/script_MysteriousWall.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_MysteriousWall
 	BeginBlock
 	DoPostScriptAction 0x000b
 	DoPostScriptAction 0x0008
-	Call sub_0806DAAC
+	Call NPC4E_IsKinstoneFused
 	JumpIf script_0800B9AC
 	Call NPC4E_MakeFuserInteractable
 	CallWithArg sub_0806DA04, 0x00000005
-- 
cgit v1.2.3