Merge pull request #421 from octorock/playerUtils

Merge playerUtils

14 files changed, 26 insertions, 26 deletions

diff --git a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
index 009478ee..09f52543 100644
--- a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
+++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
@@ -1,6 +1,6 @@
 @ Intro Assembly Player gets Sword
 SCRIPT_START script_PlayerGetSword
-	_0807F078 0x0001, 0x0001
+	SetInventoryValue 0x0001, 0x0001
 	CallWithArg PutItemAnySlot, 0x00000001
 	PlaySound SFX_109
 	CallWithArg SetPlayerAnimation2, 0x0000045f
diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
index a25fa93f..46e39e17 100644
--- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
@@ -27,7 +27,7 @@ SCRIPT_START script_Npc4EMonsters
 	WaitForFadeFinish
 	CallWithArg DeleteManager36, 0x00000002
 	_0807F0C8 0x0000, 0x0000
-	Call sub_0806DC3C
+	Call NPC4E_SaveEquippedItems
 	Call SetPlayerActionNormal
 	CallWithArg EquipItem, 0x0000000d
 	CallWithArg sub_0807F29C, gUnk_080049F6
@@ -42,7 +42,7 @@ SCRIPT_START script_Npc4EMonsters
 	SetSyncFlag 0x20000000
 	Wait 0x0078
 	CallWithArg sub_0807F29C, 0x00000000
-	Call sub_0806DC58
+	Call NPC4E_RestoreEquippedItems
 	SetSyncFlag 0x40000000
 	SetSyncFlag 0x00000010
 	SetSyncFlag 0x00000100
diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
index c969f3bb..02d18eba 100644
--- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
+++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_Npc4EVaatiAttacking
 	WaitForSyncFlagAndClear 0x00000400
 	MessageFromTargetPos 0x1047, 0x0000
 	WaitUntilTextboxCloses
-	Call sub_0806DC3C
+	Call NPC4E_SaveEquippedItems
 	Call SetPlayerActionNormal
 	CallWithArg EquipItem, 0x0000000d
 	CallWithArg sub_0807F29C, gUnk_080049F6
@@ -15,7 +15,7 @@ SCRIPT_START script_Npc4EVaatiAttacking
 	SetSyncFlag 0x00000100
 	WaitForSyncFlagAndClear 0x00000200
 	CallWithArg sub_0807F29C, 0x00000000
-	Call sub_0806DC58
+	Call NPC4E_RestoreEquippedItems
 	Wait 0x003c
 	SetSyncFlag 0x08000000
 	PlaySound SFX_125
diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
index 9e1c5a94..44fa21f2 100644
--- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
+++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EIntroCastle
 	Call sub_0807DF28
 	StartPlayerScript script_PlayerIntroCastle
 	WaitForSyncFlagAndClear 0x00000400
-	_0807F078 0x0034, 0x0002
+	SetInventoryValue 0x0034, 0x0002
 	MessageFromTargetPos 0x1036, 0x000c
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00000010
diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
index 0f8cf461..10f3eef7 100644
--- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
+++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
@@ -159,7 +159,7 @@ SCRIPT_START script_Npc4EIntroTown
 	@ Give the shield to the player
 	GivePlayerItem 0x000d
 	WaitPlayerGetItem
-	Call sub_0806DC3C
+	Call NPC4E_SaveEquippedItems
 	Call SetPlayerActionNormal
 	CallWithArg EquipItem, 0x0000000d
 	SetIntVariable 0x000000ff
@@ -172,7 +172,7 @@ SCRIPT_START script_Npc4EIntroTown
 	WaitUntilTextboxCloses
 	@ Give control back to the player
 	CallWithArg sub_0807F29C, 0x00000000
-	Call sub_0806DC58
+	Call NPC4E_RestoreEquippedItems
 	_0807F0B4 0x0004
 	CameraTargetPlayer
 	Wait 0x000a
diff --git a/data/scripts/graveyard/script_DampeInside.inc b/data/scripts/graveyard/script_DampeInside.inc
index c722ae55..42ebf439 100644
--- a/data/scripts/graveyard/script_DampeInside.inc
+++ b/data/scripts/graveyard/script_DampeInside.inc
@@ -13,7 +13,7 @@ SCRIPT_START script_DampeInside
 	MessageFromTarget 0x053c
 	WaitPlayerGetItem 
 	WaitUntilTextboxCloses
-	_0807F078 0x003c, 0x0001
+	SetInventoryValue 0x003c, 0x0001
 script_08009622:
 	EnablePlayerControl
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc
index 653e1ee5..21ea8e95 100644
--- a/data/scripts/graveyard/script_DampeOuside.inc
+++ b/data/scripts/graveyard/script_DampeOuside.inc
@@ -28,7 +28,7 @@ script_08009660:
 	JumpIfNot script_0800968E
 	PlaySound SFX_111
 	PlaySound SFX_SECRET
-	_0807F078 0x003c, 0x0002
+	SetInventoryValue 0x003c, 0x0002
 	Call sub_0806BEFC
 script_0800968E:
 	EnablePlayerControl
diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc
index 47cf61f9..420f5f94 100644
--- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc
+++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc
@@ -17,7 +17,7 @@ SCRIPT_START script_Object69CrowStealingKey
 	WaitForSyncFlagAndClear 0x00000010
 	SetSyncFlag 0x00000020
 	WaitForSyncFlagAndClear 0x00000040
-	_0807F078 0x003c, 0x0000
+	SetInventoryValue 0x003c, 0x0000
 	SetGlobalFlag 0x0020
 	_0807E8E4_3
 	Wait 0x001e
diff --git a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
index 6c1f1237..1ebd20e1 100644
--- a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
+++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
@@ -1,6 +1,6 @@
 @ Mines Player get white sword
 SCRIPT_START script_PlayerGetWhiteSword
-	_0807F078 0x0002, 0x0001
+	SetInventoryValue 0x0002, 0x0001
 	CallWithArg PutItemAnySlot, 0x00000002
 	PlaySound SFX_109
 	CallWithArg SetPlayerAnimation2, 0x000001e2
diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc
index 6abf95dc..6900e574 100644
--- a/data/scripts/sanctuary/script_Npc4EPedestal.inc
+++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc
@@ -52,9 +52,9 @@ script_080134F8:
 	Wait 0x003c
 	StartPlayerScript script_PlayerPickUpSword
 	SetSyncFlag 0x00000080
-	_0807F078 0x0003, 0x0001
-	Call sub_0806DC3C
-	Call sub_0806DC58
+	SetInventoryValue 0x0003, 0x0001
+	Call NPC4E_SaveEquippedItems
+	Call NPC4E_RestoreEquippedItems
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
index e36bf5f1..4b069913 100644
--- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
@@ -55,9 +55,9 @@ script_0801373C:
 	Wait 0x003c
 	StartPlayerScript script_PlayerPickUpSword
 	SetSyncFlag 0x00000080
-	_0807F078 0x0004, 0x0001
-	Call sub_0806DC3C
-	Call sub_0806DC58
+	SetInventoryValue 0x0004, 0x0001
+	Call NPC4E_SaveEquippedItems
+	Call NPC4E_RestoreEquippedItems
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
index ae46129d..3e97485d 100644
--- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
@@ -59,10 +59,10 @@ script_080138D0:
 	Wait 0x003c
 	StartPlayerScript script_PlayerPickUpFinalSword
 	SetSyncFlag 0x00000080
-	_0807F078 0x0006, 0x0001
+	SetInventoryValue 0x0006, 0x0001
 	Call UpdatePlayerSkills
-	Call sub_0806DC3C
-	Call sub_0806DC58
+	Call NPC4E_SaveEquippedItems
+	Call NPC4E_RestoreEquippedItems
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
@@ -83,12 +83,12 @@ script_080138D0:
 	SetEntityPositionRelative 0x00e8, 0x00d8
 	CameraTargetEntity
 .endif
-	Call sub_0806DC3C
+	Call NPC4E_SaveEquippedItems
 	CallWithArg EquipItem, 0x00010001
 	CallWithArg sub_0807F29C, gUnk_080049FE
 	Wait 0x00c8
 	CallWithArg sub_0807F29C, 0x00000000
-	Call sub_0806DC58
+	Call NPC4E_RestoreEquippedItems
 script_08013A8E:
 .ifndef EU
 	CheckRoomFlag 0x0004
diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc
index 2e4770e6..9ceb5e3a 100644
--- a/data/scripts/unused/script_08016482.inc
+++ b/data/scripts/unused/script_08016482.inc
@@ -71,7 +71,7 @@ SCRIPT_START script_08016482
 	GiveKinstone 0x0001
 	GivePlayerItem 0x0001
 	GetInventoryValue 0x0001
-	_0807F078 0x0001, 0x0002
+	SetInventoryValue 0x0001, 0x0002
 	_0807F088 0x0001
 	CameraTargetEntity
 	CameraTargetPlayer
diff --git a/data/scripts/veilFalls/script_BigGoronMirrorShield.inc b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc
index c0d457c7..77923ffd 100644
--- a/data/scripts/veilFalls/script_BigGoronMirrorShield.inc
+++ b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc
@@ -21,8 +21,8 @@ SCRIPT_START script_BigGoronMirrorShield
 .endif
 	Call sub_0806D620
 	Wait 0x003c
-	WaitPlayerGetItem 
-	FaceAwayFromPlayer 
+	WaitPlayerGetItem
+	FaceAwayFromPlayer
 	MessageNoOverlap 0x1d0c
 	WaitUntilTextboxCloses
 	Wait 0x000a