Merge branch 'master' into enemies

17 files changed, 24 insertions, 24 deletions

diff --git a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc
index 874dff2a..1439e7fe 100644
--- a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc
+++ b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_CastorWildsStatueLeft
 	EndBlock
 script_0800B268:
 	_0807EA4C
-	_0807E9F0
+	UpdateFusion
 	SetPlayerIdle
 	CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT
 	JumpIf script_0800B2E2
diff --git a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc
index 7abd69e1..4541edf9 100644
--- a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc
+++ b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_CastorWildsStatueMiddle
 	EndBlock
 script_0800B298:
 	_0807EA4C
-	_0807E9F0
+	UpdateFusion
 	SetPlayerIdle
 	CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE
 	JumpIf script_0800B2E2
diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc
index c4549d85..8beacfa7 100644
--- a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc
+++ b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_CastorWildsStatueRight
 	EndBlock
 script_0800B2C8:
 	_0807EA4C
-	_0807E9F0
+	UpdateFusion
 	SetPlayerIdle
 	CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT
 	JumpIf script_0800B2E2
diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
index 76d025fa..3ed822d7 100644
--- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_Npc4EFirstCloud
 	EndBlock
 script_0800D636:
 	_0807EA4C
-	_0807E9F0
+	UpdateFusion
 	Call NPC4E_IsKinstoneFused
 	JumpIf script_0800D650
 	Call EnablePauseMenu
diff --git a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
index ebabde5d..812f5e39 100644
--- a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
+++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGetSword
 	SetInventoryValue ITEM_SMITH_SWORD, 0x0001
 	CallWithArg PutItemAnySlot, ITEM_SMITH_SWORD
 	PlaySound SFX_ITEM_GET
-	CallWithArg SetPlayerAnimation2, 0x0000045f
+	CallWithArg SetPlayerAnimation2, ANIM_GET_ITEM_SWORD
 	Call WaitForPlayerAnim
 	MessageFromTargetPos TEXT_ITEM_GET, 0x01, 0x000e
 	WaitUntilTextboxCloses
diff --git a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc
index 85ba5972..a1249100 100644
--- a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc
+++ b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_PlayerGetGreenCap
 	BeginBlock
 	Call sub_08094BE0
-	CallWithArg SetPlayerAnimation2, 0x0000045b
+	CallWithArg SetPlayerAnimation2, ANIM_GET_ITEM_BIG_NOCAP
 	PlaySound SFX_ITEM_GET
 	EndBlock
 	Call WaitForPlayerAnim
@@ -10,7 +10,7 @@ SCRIPT_START script_PlayerGetGreenCap
 	SetSyncFlag 0x00000008
 	BeginBlock
 	CallWithArg ResetPlayerFlag, PL_NO_CAP
-	CallWithArg SetPlayerAnimation2, 0x000008e4
+	CallWithArg SetPlayerAnimation2, ANIM_GET_NEWCAP
 	EndBlock
 	Call WaitForPlayerAnim
 	SetAnimationState 0x0004
diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc
index aea96906..423e3ed9 100644
--- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc
+++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc
@@ -7,11 +7,11 @@ SCRIPT_START script_PlayerAtTakeover
 	_0807EDD4 0x0168, 0x0058
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
-	CallWithArg SetPlayerAnimation2, 0x000003c5
+	CallWithArg SetPlayerAnimation2, ANIM_EZLO_SEARCH
 	Call WaitForPlayerAnim
 	MessageFromTargetPos TEXT_VAATI, 0x18, 0x000c
 	WaitUntilTextboxCloses
-	CallWithArg SetPlayerAnimation2, 0x000003c9
+	CallWithArg SetPlayerAnimation2, ANIM_EZLO_LEAVE_LEFT
 	Call WaitForPlayerAnim
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc
index b2a41dd6..adafc6cd 100644
--- a/data/scripts/dhc/script_PlayerStonesFall.inc
+++ b/data/scripts/dhc/script_PlayerStonesFall.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerStonesFall
 	EndBlock
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
-	CallWithArg SetPlayerAnimation2, 0x000003c5
+	CallWithArg SetPlayerAnimation2, ANIM_EZLO_SEARCH
 	Call WaitForPlayerAnim
 	SetSyncFlag 0x00000004
 	Call SetPlayerActionNormal
diff --git a/data/scripts/hyruleTown/script_Carlov2.inc b/data/scripts/hyruleTown/script_Carlov2.inc
index de16ca9f..d1b49cc9 100644
--- a/data/scripts/hyruleTown/script_Carlov2.inc
+++ b/data/scripts/hyruleTown/script_Carlov2.inc
@@ -47,7 +47,7 @@ script_080146E2:
 	JumpIf script_0801472E
 	CheckLocalFlag 0x005f
 	JumpIf script_08014720
-	Call sub_08088574
+	Call FigurineDevice_TryAgainMessage
 	SetRoomFlag 0x000a
 	Jump script_0801473C
 script_0801472E_2:
@@ -104,7 +104,7 @@ script_080146C6:
 	JumpIf script_0801472E
 	CheckLocalFlag 0x005f
 	JumpIf script_08014720
-	Call sub_08088574
+	Call FigurineDevice_TryAgainMessage
 	SetRoomFlag 0x0009
 	Jump script_0801473C
 .endif
@@ -135,7 +135,7 @@ script_08014720:
 .else
 	SetRoomFlag 0x0009
 .endif
-	Call sub_08088504
+	Call FigurineDevice_NothingNewToDrawMessage
 	Jump script_0801473C
 script_0801472E:
 .ifdef EU
@@ -144,7 +144,7 @@ script_0801472E:
 	SetRoomFlag 0x0009
 .endif
 	ClearRoomFlag 0x0006
-	Call sub_08088544
+	Call FigurineDevice_NewFigurinesMessage
 script_0801473C:
 	CheckTextboxResult
 	JumpIfNot script_08014770
@@ -179,9 +179,9 @@ script_0801477A:
 	CheckRoomFlag 0x0007
 	JumpIf script_080147A4
 script_0801478A:
-	Call sub_08088478
+	Call FigurineDevice_NoFigurinesLeftMessage
 	WaitUntilTextboxCloses
-	Call sub_080885B0
+	Call FigurineDevice_LostOrFinishedMessage
 	WaitPlayerGetItem
 	SetSyncFlag 0x00000008
 	Jump script_080147CE
diff --git a/data/scripts/lonLonRanch/script_GoronPunching.inc b/data/scripts/lonLonRanch/script_GoronPunching.inc
index 992ee9eb..d38d47cd 100644
--- a/data/scripts/lonLonRanch/script_GoronPunching.inc
+++ b/data/scripts/lonLonRanch/script_GoronPunching.inc
@@ -23,7 +23,7 @@ script_0800B9F4:
 	FacePlayer
 	DoPostScriptAction 0x0000
 	Call sub_0807F650
-	_0807E9F0
+	UpdateFusion
 	SetPlayerIdle
 	Call sub_0806948C
 	JumpIf script_0800BA24
diff --git a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
index 2989fde6..3054711b 100644
--- a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
+++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGetWhiteSword
 	SetInventoryValue ITEM_GREEN_SWORD, 0x0001
 	CallWithArg PutItemAnySlot, ITEM_GREEN_SWORD
 	PlaySound SFX_ITEM_GET
-	CallWithArg SetPlayerAnimation2, 0x000001e2
+	CallWithArg SetPlayerAnimation2, ANIM_GET_WHITE_SWORD
 	Call WaitForPlayerAnim
 	MessageNoOverlap TEXT_ITEM_GET, 0x02
 	WaitUntilTextboxCloses
diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc
index 11f0566f..d59dad99 100644
--- a/data/scripts/npc/script_Farmer.inc
+++ b/data/scripts/npc/script_Farmer.inc
@@ -28,7 +28,7 @@ script_0800B134:
 	FacePlayer
 	CallWithArg sub_0806BC94, 0x00000004
 	Call sub_0807F650
-	_0807E9F0
+	UpdateFusion
 .ifndef EU
 	@! @bug: In EU, Eenie is marked as done fusing if kinstone menu is closed without fusing
 	JumpIfNot script_0800B160
diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc
index 28ab2c5e..8d10f21d 100644
--- a/data/scripts/npc/script_MysteriousWall.inc
+++ b/data/scripts/npc/script_MysteriousWall.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_MysteriousWall
 	EndBlock
 script_0800B98A:
 	_0807EA4C
-	_0807E9F0
+	UpdateFusion
 	JumpIf script_0800B99E
 	Call EnablePauseMenu
 	EnablePlayerControl
diff --git a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc
index 7ef157da..43f188e8 100644
--- a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc
+++ b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_PlayerPickUpFinalSword
 	CallWithArg sub_08095E7C, script_CutsceneMiscObjectSwordCharge11
 	PlaySound SFX_1D3
-	CallWithArg SetPlayerAnimation2, 0x000008e3
+	CallWithArg SetPlayerAnimation2, ANIM_GET_LAST_SWORD
 	Call sub_08096028
 	Wait 0x0078
 	SetSyncFlag 0x00020000
diff --git a/data/scripts/sanctuary/script_PlayerPickUpSword.inc b/data/scripts/sanctuary/script_PlayerPickUpSword.inc
index c873fa4e..fff8a063 100644
--- a/data/scripts/sanctuary/script_PlayerPickUpSword.inc
+++ b/data/scripts/sanctuary/script_PlayerPickUpSword.inc
@@ -1,7 +1,7 @@
 @ Player at Sanctuary pick up sword
 SCRIPT_START script_PlayerPickUpSword
 	PlaySound SFX_1D3
-	CallWithArg SetPlayerAnimation2, 0x000008bf
+	CallWithArg SetPlayerAnimation2, ANIM_GET_NEW_SWORD
 	Call sub_08096028
 	Wait 0x003c
 	SetSyncFlag 0x00020000
diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc
index 70f9b944..7ffcc08a 100644
--- a/data/scripts/unused/script_08016482.inc
+++ b/data/scripts/unused/script_08016482.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_08016482
 	DisablePlayerControl
 	SetPlayerAction 0x00005408
 	StartPlayerScript script_08016384
-	SetPlayerAnimation 0x03a0
+	SetPlayerAnimation ANIM_FALL_ON_BACK
 	_0807E8E4_0
 	_0807E8E4_1
 	_0807E8E4_2
diff --git a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
index 0c4a11a3..b176121d 100644
--- a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
+++ b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_NPC4ESourceOfTheFlow
 	EndBlock
 script_08015FE4:
 	_0807EA4C
-	_0807E9F0
+	UpdateFusion
 	SetPlayerIdle
 	CheckKinstoneFused KINSTONE_SOURCE_FLOW
 	JumpIf script_08015FFE