figurine cleanup

This commit is contained in:
theo3
2022-03-28 17:26:07 -07:00
parent 52439a0fc8
commit 6cf555f074
23 changed files with 81 additions and 92 deletions
@@ -2,9 +2,9 @@
SCRIPT_START script_PlayerGetSword
SetInventoryValue 0x0001, 0x0001
CallWithArg PutItemAnySlot, 0x00000001
PlaySound SFX_109
PlaySound SFX_ITEM_GET
CallWithArg SetPlayerAnimation2, 0x0000045f
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
MessageFromTargetPos 0x0501, 0x000e
WaitUntilTextboxCloses
SetSyncFlag 0x00000020
@@ -3,16 +3,16 @@ SCRIPT_START script_PlayerGetGreenCap
BeginBlock
Call sub_08094BE0
CallWithArg SetPlayerAnimation2, 0x0000045b
PlaySound SFX_109
PlaySound SFX_ITEM_GET
EndBlock
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
Wait 0x005a
SetSyncFlag 0x00000008
BeginBlock
CallWithArg ResetPlayerFlag, 0x00000008
CallWithArg SetPlayerAnimation2, 0x000008e4
EndBlock
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
SetAnimationState 0x0004
DoPostScriptAction 0x0000
Wait 0x003c
@@ -8,11 +8,11 @@ SCRIPT_START script_PlayerAtTakeover
SetAnimationState 0x0004
DoPostScriptAction 0x0000
CallWithArg SetPlayerAnimation2, 0x000003c5
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
MessageFromTargetPos 0x1318, 0x000c
WaitUntilTextboxCloses
CallWithArg SetPlayerAnimation2, 0x000003c9
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
SetAnimationState 0x0004
DoPostScriptAction 0x0000
SetSyncFlag 0x00000100
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_PlayerStonesFall
SetAnimationState 0x0004
DoPostScriptAction 0x0000
CallWithArg SetPlayerAnimation2, 0x000003c5
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
SetSyncFlag 0x00000004
Call SetPlayerActionNormal
SCRIPT_END
@@ -8,7 +8,7 @@ SCRIPT_START script_DampeInside
Call sub_0806BE84
WaitUntilTextboxCloses
JumpIfNot script_08009622
PlaySound SFX_109
PlaySound SFX_ITEM_GET
_0807F088 0x003c
MessageFromTarget 0x053c
WaitPlayerGetItem
@@ -2,9 +2,9 @@
SCRIPT_START script_PlayerGetWhiteSword
SetInventoryValue 0x0002, 0x0001
CallWithArg PutItemAnySlot, 0x00000002
PlaySound SFX_109
PlaySound SFX_ITEM_GET
CallWithArg SetPlayerAnimation2, 0x000001e2
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
MessageNoOverlap 0x0502
WaitUntilTextboxCloses
SetSyncFlag 0x00000008
@@ -55,7 +55,7 @@ script_080134F8:
SetInventoryValue 0x0003, 0x0001
Call NPC4E_SaveEquippedItems
Call NPC4E_RestoreEquippedItems
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
Wait 0x003c
SetFadeTime 0x0004
SetFade7
@@ -66,7 +66,7 @@ script_080134F8:
SetFadeTime 0x0002
SetFade6
WaitForFadeFinish
PlaySound SFX_109
PlaySound SFX_ITEM_GET
MessageFromTargetPos 0x0503, 0x000c
WaitUntilTextboxCloses
SetSyncFlag 0x00040000
@@ -58,7 +58,7 @@ script_0801373C:
SetInventoryValue 0x0004, 0x0001
Call NPC4E_SaveEquippedItems
Call NPC4E_RestoreEquippedItems
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
Wait 0x003c
SetFadeTime 0x0004
SetFade7
@@ -69,7 +69,7 @@ script_0801373C:
SetFadeTime 0x0002
SetFade6
WaitForFadeFinish
PlaySound SFX_109
PlaySound SFX_ITEM_GET
MessageFromTargetPos 0x0504, 0x000c
WaitUntilTextboxCloses
SetSyncFlag 0x00040000
@@ -63,7 +63,7 @@ script_080138D0:
Call UpdatePlayerSkills
Call NPC4E_SaveEquippedItems
Call NPC4E_RestoreEquippedItems
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
Wait 0x003c
SetFadeTime 0x0004
SetFade7
@@ -74,7 +74,7 @@ script_080138D0:
SetFadeTime 0x0002
SetFade6
WaitForFadeFinish
PlaySound SFX_109
PlaySound SFX_ITEM_GET
MessageFromTargetPos 0x0505, 0x000c
WaitUntilTextboxCloses
SetSyncFlag 0x00040000
@@ -6,7 +6,7 @@ SCRIPT_START script_PlayerPickUpFinalSword
Call sub_08096028
Wait 0x0078
SetSyncFlag 0x00020000
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
Wait 0x0078
WaitForSyncFlagAndClear 0x00040000
Call SetPlayerActionNormal
@@ -5,7 +5,7 @@ SCRIPT_START script_PlayerPickUpSword
Call sub_08096028
Wait 0x003c
SetSyncFlag 0x00020000
Call WaitForPlayerFrameHiBit
Call WaitForPlayerAnim
Wait 0x0078
WaitForSyncFlagAndClear 0x00040000
Call SetPlayerActionNormal