mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-04 01:03:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Extract player macros

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
data/data_080046A4.s
-41
View File
@@ -1,41 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ .align 2
@ TODO PlayerMacros
gUnk_080049D6:: @ 080049D6
.incbin "code_080043E8/gUnk_080049D6.bin"
gUnk_080049F6:: @ 080049F6
.incbin "code_080043E8/gUnk_080049F6.bin"
gUnk_080049FE:: @ gUnk_080049FE
.incbin "code_080043E8/gUnk_080049FE.bin"
gUnk_08004A0C:: @ 08004A0C
.incbin "code_080043E8/gUnk_08004A0C.bin"
gUnk_08004A16:: @ 08004A16
.incbin "code_080043E8/gUnk_08004A16.bin"
gUnk_08004A24:: @ 08004A24
.incbin "code_080043E8/gUnk_08004A24.bin"
gUnk_08004A32:: @ 08004A32
.incbin "code_080043E8/gUnk_08004A32.bin"
gUnk_08004A48:: @ 08004A48
.incbin "code_080043E8/gUnk_08004A48.bin"
gUnk_08004A72:: @ 08004A72
.incbin "code_080043E8/gUnk_08004A72.bin"
gUnk_08004A8C:: @ 08004A8C
.incbin "code_080043E8/gUnk_08004A8C.bin"
gUnk_08004AA6:: @ 08004AA6
.incbin "code_080043E8/gUnk_08004AA6.bin"
data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
+2 -2
View File
@@ -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
data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+2 -2
View File
@@ -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