Extract player macros

This commit is contained in:
octorock
2023-06-17 11:08:13 +02:00
parent c317fe3f18
commit f9da634427
12 changed files with 98 additions and 130 deletions
@@ -30,7 +30,7 @@ SCRIPT_START script_Npc4EMonsters
Call NPC4E_SaveEquippedItems
Call SetPlayerActionNormal
CallWithArg EquipItem, ITEM_SHIELD
CallWithArg SetPlayerMacro, gUnk_080049F6
CallWithArg SetPlayerMacro, gPlayerMacroProtectWithShield
SetScrollSpeed 1
SetEntityPositionRelative 0x01f8, 0x0068
SetSyncFlag 0x00000004
@@ -41,7 +41,7 @@ SCRIPT_START script_Npc4EMonsters
PlaySound SFX_1C3
SetSyncFlag 0x20000000
Wait 0x0078
CallWithArg SetPlayerMacro, 0x00000000
CallWithArg SetPlayerMacro, 0
Call NPC4E_RestoreEquippedItems
SetSyncFlag 0x40000000
SetSyncFlag 0x00000010
@@ -10,11 +10,11 @@ SCRIPT_START script_Npc4EVaatiAttacking
Call NPC4E_SaveEquippedItems
Call SetPlayerActionNormal
CallWithArg EquipItem, ITEM_SHIELD
CallWithArg SetPlayerMacro, gUnk_080049F6
CallWithArg SetPlayerMacro, gPlayerMacroProtectWithShield
Wait 0x001e
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000200
CallWithArg SetPlayerMacro, 0x00000000
CallWithArg SetPlayerMacro, 0
Call NPC4E_RestoreEquippedItems
Wait 0x003c
SetSyncFlag 0x08000000
@@ -152,14 +152,14 @@ SCRIPT_START script_Npc4EIntroTown
CallWithArg EquipItem, ITEM_SHIELD
SetIntVariable 0x000000ff
Call sub_0807F5B0
CallWithArg SetPlayerMacro, gUnk_080049D6
CallWithArg SetPlayerMacro, gPlayerMacroTryOutShield
Wait 0x00b7
SetIntVariable 0x00000000
Call sub_0807F5B0
MessageFromTargetPos TEXT_PROLOGUE, 0x2c, 0x0000
WaitUntilTextboxCloses
@ Give control back to the player
CallWithArg SetPlayerMacro, 0x00000000
CallWithArg SetPlayerMacro, 0
Call NPC4E_RestoreEquippedItems
SetScrollSpeed 4
CameraTargetPlayer
@@ -85,9 +85,9 @@ script_080138D0:
.endif
Call NPC4E_SaveEquippedItems
CallWithArg EquipItem, 0x00010001
CallWithArg SetPlayerMacro, gUnk_080049FE
CallWithArg SetPlayerMacro, gPlayerMacroSanctuary
Wait 0x00c8
CallWithArg SetPlayerMacro, 0x00000000
CallWithArg SetPlayerMacro, 0
Call NPC4E_RestoreEquippedItems
script_08013A8E:
.ifndef EU