diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-06-17 11:08:13 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-06-17 11:08:13 +0200 |
| commit | f9da6344273ac86d6fd9219fac2710c968eeab37 (patch) | |
| tree | bd83d094d1d1fbc7f16b7f2c025cb77ca796bac2 /data/scripts | |
| parent | c317fe3f18325fec54c0d76df450f132945449f7 (diff) | |
Extract player macros
Diffstat (limited to 'data/scripts')
4 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index eb566324..e378d0f2 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -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 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index d9a9df96..0ce97624 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -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 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 14a92e0c..0b1e0424 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -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 diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index ffb033f9..3e99529d 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -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 |