Rename objects

6 files changed, 19 insertions, 19 deletions

diff --git a/data/scripts/npc/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc
index 18d2a03d..18ba3fce 100644
--- a/data/scripts/npc/script_08012C48.inc
+++ b/data/scripts/npc/script_08012C48.inc
@@ -1,4 +1,4 @@
-@ OBJECT_6A in sub_08095954 ?
+@ CUTSCENE_MISC_OBJECT in sub_08095954 ?
 SCRIPT_START script_08012C48
 	BeginBlock
 	DoPostScriptAction 0x0007
diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc
index 8dbcf6d5..1a0c3f0b 100644
--- a/data/scripts/npc/script_BladeBrothers.inc
+++ b/data/scripts/npc/script_BladeBrothers.inc
@@ -12,7 +12,7 @@ script_08016204:
 	CheckEntityInteractType
 	JumpIfNot script_08016204
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	FacePlayer
 	Call sub_08068CA0
 	JumpIf script_0801633E
@@ -44,14 +44,14 @@ script_08016262:
 	Call sub_08068F14
 	Call sub_08068BB4
 	CallWithArg EquipItem, 0x00010001
-	Call sub_08068B84
-	Call sub_0807F2A8
+	Call BladeBrothers_StartPlayerDemonstration
+	Call WaitForPlayerMacro
 	Call sub_08068BD0
 	Wait 0x001e
 	Call sub_08068E18
 	WaitUntilTextboxCloses
 	Call sub_08068EB4
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 script_080162CC:
 	EndBlock
@@ -72,7 +72,7 @@ script_080162F6:
 	EndBlock
 	DisablePlayerControl
 	Call WaitForPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	SetPlayerIdle
 	StopBgm
 	PlaySound SFX_TASK_COMPLETE
@@ -82,7 +82,7 @@ script_080162F6:
 script_0801631C:
 	Call sub_08068E30
 	WaitUntilTextboxCloses
-	Call sub_08068C6C
+	Call BladeBrothers_GetScroll
 	WaitPlayerGetItem
 	WaitUntilTextboxCloses
 	Jump script_08016346
@@ -94,7 +94,7 @@ script_0801633E:
 	Call sub_08068E48
 	WaitUntilTextboxCloses
 script_08016346:
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc
index 2aa74c78..9d281c12 100644
--- a/data/scripts/npc/script_Farmer.inc
+++ b/data/scripts/npc/script_Farmer.inc
@@ -6,24 +6,24 @@ SCRIPT_START script_Farmer
 	CallWithArg sub_0806BC94, 0x00000000
 	EndBlock
 script_0800B0E8:
-	Call sub_0807F434
+	Call CheckInteractType
 	JumpTable script_0800B0E8, script_0800B0F6, script_0800B134
 script_0800B0F6:
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	Call WaitForAnimDone
 	FacePlayer
 	CallWithArg sub_0806BC94, 0x00000004
 	Call sub_0806BCE8
 	WaitUntilTextboxCloses
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	Call sub_0806BCB8
 	CallWithArg sub_0806BC94, 0x00000000
 	Jump script_0800B0E8
 script_0800B134:
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	Call WaitForAnimDone
 	FacePlayer
 	CallWithArg sub_0806BC94, 0x00000004
@@ -34,7 +34,7 @@ script_0800B134:
 .endif
 	Call sub_0806BCC0
 script_0800B160:
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	Call sub_0806BCB8
 	CallWithArg sub_0806BC94, 0x00000000
diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc
index 00460f2c..28f13d5e 100644
--- a/data/scripts/npc/script_ForestMinish13.inc
+++ b/data/scripts/npc/script_ForestMinish13.inc
@@ -4,8 +4,8 @@ SCRIPT_START script_ForestMinish13
 	_0807E9D4
 	EndBlock
 script_08016612:
-	TriggerInteract 
-	SetPlayerIdle 
+	TriggerInteract
+	SetPlayerIdle
 	MessageFromTarget TEXT_LOCATIONS, 0x02
 	WaitUntilTextboxCloses
 	Wait 0x000f
diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc
index d7a22778..aa780c91 100644
--- a/data/scripts/npc/script_MysteriousWall.inc
+++ b/data/scripts/npc/script_MysteriousWall.inc
@@ -12,12 +12,12 @@ script_0800B98A:
 	_0807EA4C
 	_0807E9F0
 	JumpIf script_0800B99E
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	Jump script_0800B98A
 script_0800B99E:
 	Call sub_0806F188
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 script_0800B9AC:
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc
index 09d94fef..130ad98a 100644
--- a/data/scripts/npc/script_Windcrest.inc
+++ b/data/scripts/npc/script_Windcrest.inc
@@ -10,7 +10,7 @@ script_0800B024:
 	CheckEntityInteractType
 	JumpIfNot script_0800B024
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	CheckGlobalFlag WARP_1ST
 	JumpIf script_0800B082
 	CheckGlobalFlag WARP_MONUMENT
@@ -42,7 +42,7 @@ script_0800B082:
 	EzloMessage TEXT_EZLO, 0x5e
 	WaitUntilTextboxCloses
 script_0800B09C:
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END