This commit is contained in:
theo3
2022-03-17 19:13:56 -07:00
parent 3357984494
commit ef470547e0
279 changed files with 848 additions and 813 deletions
@@ -33,7 +33,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub
SetEntitySpeed 0x0200
WalkSouth 0x0008
SetAnimation 0x0040
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0006
DoPostScriptAction 0x0000
SetSyncFlag 0x00000002
@@ -30,7 +30,7 @@ SCRIPT_START script_Npc4EMonsters
Call NPC4E_SaveEquippedItems
Call SetPlayerActionNormal
CallWithArg EquipItem, 0x0000000d
CallWithArg sub_0807F29C, gUnk_080049F6
CallWithArg SetInputMacro, gUnk_080049F6
_0807F0B4 0x0001
SetEntityPositionRelative 0x01f8, 0x0068
SetSyncFlag 0x00000004
@@ -41,7 +41,7 @@ SCRIPT_START script_Npc4EMonsters
PlaySound SFX_1C3
SetSyncFlag 0x20000000
Wait 0x0078
CallWithArg sub_0807F29C, 0x00000000
CallWithArg SetInputMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
SetSyncFlag 0x40000000
SetSyncFlag 0x00000010
@@ -10,11 +10,11 @@ SCRIPT_START script_Npc4EVaatiAttacking
Call NPC4E_SaveEquippedItems
Call SetPlayerActionNormal
CallWithArg EquipItem, 0x0000000d
CallWithArg sub_0807F29C, gUnk_080049F6
CallWithArg SetInputMacro, gUnk_080049F6
Wait 0x001e
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000200
CallWithArg sub_0807F29C, 0x00000000
CallWithArg SetInputMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
Wait 0x003c
SetSyncFlag 0x08000000
@@ -11,7 +11,7 @@ SCRIPT_START script_PlayerFainting
Call sub_0807F1E8
DoPostScriptAction 0x0011
EndBlock
Call WaitForFrameHiBit
Call WaitForAnimDone
WaitForSyncFlag 0x80000000
Call SetPlayerActionNormal
SCRIPT_END
@@ -13,21 +13,21 @@ SCRIPT_START script_VaatiIntroCeremony
WaitForSyncFlagAndClear 0x00000100
SetAnimationState 0x0004
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0004
DoPostScriptAction 0x0000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00000100
SetAnimationState 0x0000
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00000100
SetAnimationState 0x0000
DoPostScriptAction 0x001a
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00000100
@@ -71,7 +71,7 @@ SCRIPT_START script_VaatiIntroCeremony
Wait 0x005a
SetAnimationState 0x0004
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0004
DoPostScriptAction 0x0000
Wait 0x001e
@@ -48,7 +48,7 @@ script_08011206:
Call sub_08066E20
Wait 0x0014
DoPostScriptAction 0x0010
Call WaitForFrameHiBit
Call WaitForAnimDone
PlaySound SFX_1CA
SetSyncFlag 0x00000020
WaitForSyncFlagAndClear 0x00000010
@@ -164,14 +164,14 @@ SCRIPT_START script_Npc4EIntroTown
CallWithArg EquipItem, 0x0000000d
SetIntVariable 0x000000ff
Call sub_0807F5B0
CallWithArg sub_0807F29C, gUnk_080049D6
CallWithArg SetInputMacro, gUnk_080049D6
Wait 0x00b7
SetIntVariable 0x00000000
Call sub_0807F5B0
MessageFromTargetPos 0x102c, 0x0000
WaitUntilTextboxCloses
@ Give control back to the player
CallWithArg sub_0807F29C, 0x00000000
CallWithArg SetInputMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
_0807F0B4 0x0004
CameraTargetPlayer
@@ -34,7 +34,7 @@ SCRIPT_START script_MinishEzlo
SetSyncFlag 0x00010000
WaitForSyncFlagAndClear 0x00008000
SetAnimation 0x000d
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00010000
Wait 0x003c
DoPostScriptAction 0x0005
@@ -17,7 +17,7 @@ SCRIPT_START script_Object6AMinishCap
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x0001
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
@@ -23,7 +23,7 @@ SCRIPT_START script_Vaati
SetSyncFlag 0x00001000
WaitForSyncFlagAndClear 0x00000800
DoPostScriptAction 0x0018
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0004
DoPostScriptAction 0x0000
SetSyncFlag 0x00001000
@@ -16,7 +16,7 @@ SCRIPT_START script_VaatiAppearsAgain
Wait 0x0014
SetAnimationState 0x0000
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000002
@@ -25,17 +25,17 @@ SCRIPT_START script_MinishEzloGoodbye
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000c
Call WaitForFrameHiBit
Call WaitForAnimDone
Call sub_08094B94
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000f
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000002
CallWithArg sub_080960C4, script_Object6AEzloFinalMagic
SetAnimation 0x0012
Call WaitForFrameHiBit
Call WaitForAnimDone
Wait 0x001e
SetSyncFlag 0x00000020
StopBgm
@@ -10,20 +10,20 @@ SCRIPT_START script_MinishEzloOutro
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000e
DoPostScriptAction 0x0007
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0004
SetSyncFlag 0x00000040
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000040
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000f
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000040
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000040
WaitForSyncFlagAndClear 0x00000002
CallWithArg sub_080960C4, script_EzloZeldaMagic
@@ -1,9 +1,9 @@
@ Sanctuary Player faint from Vaati attack
SCRIPT_START script_PlayerFaintAgain
Call sub_0807F1C4
Call WaitForFrameHiBit
Call WaitForAnimDone
Call sub_0807F1E8
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000002
WaitForSyncFlagAndClear 0x00000004
PlaySound SFX_PLY_JUMP
@@ -14,7 +14,7 @@ SCRIPT_START script_VaatiTakeover
Wait 0x0014
SetAnimationState 0x0000
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
SetSyncFlag 0x00000020
WaitForSyncFlagAndClear 0x00000010
+1 -1
View File
@@ -25,7 +25,7 @@ SCRIPT_START script_Vaati1Intro
PlayBgm BGM_VAATI_REBORN
DoPostScriptAction 0x0019
PlaySound SFX_198
Call WaitForFrameHiBit
Call WaitForAnimDone
SetRoomFlag 0x0000
DoPostScriptAction 0x0008
Wait 0x0080
+1 -1
View File
@@ -11,7 +11,7 @@ SCRIPT_START script_VaatiWithZelda
Wait 0x003c
SetAnimationState 0x0004
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
Wait 0x003c
SetSyncFlag 0x00000002
@@ -18,7 +18,7 @@ script_0800DCD0:
StopBgm
Call sub_08066E50
PlaySound SFX_1C9
Call WaitForFrameHiBit
Call WaitForAnimDone
PlaySound SFX_1CA
Wait 0x003c
DoPostScriptAction 0x0004
+1 -1
View File
@@ -10,7 +10,7 @@ script_0800E974:
JumpIfNot script_0800E974
SetPlayerIdle
SetAnimation 0x0008
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x0009
Call sub_0806B260
JumpIfNot script_0800E9E4
@@ -10,7 +10,7 @@ script_08012440:
JumpIfNot script_08012440
SetPlayerIdle
SetAnimation 0x0008
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x0009
Call sub_0806B2B4
WaitUntilTextboxCloses
@@ -10,7 +10,7 @@ script_08008BA2:
TriggerInteract
SetPlayerIdle
SetAnimation 0x0004
Call WaitForFrameHiBit
Call WaitForAnimDone
MessageFromTarget 0x4912
WaitUntilTextboxCloses
SetAnimation 0x0008
@@ -16,13 +16,13 @@ script_08008BD2:
SetGlobalFlag 0x0061
.endif
SetAnimation 0x0004
Call WaitForFrameHiBit
Call WaitForAnimDone
WaitUntilTextboxCloses
Call sub_0806BA34
JumpIfNot script_08008C54
WaitUntilTextboxCloses
CallWithArg sub_0806BB1C, 0x00000000
Call WaitForFrameHiBit
Call WaitForAnimDone
CallWithArg sub_0806BB1C, 0x00000001
Call sub_0806BB7C
JumpIfNot script_08008C5C
@@ -34,11 +34,11 @@ script_08008BD2:
Wait 0x000f
PlaySound SFX_SECRET
SetAnimation 0x0004
Call WaitForFrameHiBit
Call WaitForAnimDone
MessageNoOverlap 0x4913
WaitUntilTextboxCloses
SetAnimation 0x0008
Call WaitForFrameHiBit
Call WaitForAnimDone
Jump script_08008C5C
script_08008C54:
SetAnimation 0x0008
@@ -10,7 +10,7 @@ script_08008B6E:
TriggerInteract
SetPlayerIdle
SetAnimation 0x0004
Call WaitForFrameHiBit
Call WaitForAnimDone
Call sub_0806BBB0
WaitUntilTextboxCloses
SetAnimation 0x0008
+2 -2
View File
@@ -12,12 +12,12 @@ script_0800EA6A:
SetPlayerIdle
FacePlayer
CallWithArg sub_0807F3D8, 0x00000004
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x0009
Call sub_0806CE80
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimation 0x000a
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x0008
Jump script_0800EA6A
+1 -1
View File
@@ -11,7 +11,7 @@ script_080106BE:
JumpIfNot script_080106BE
SetPlayerIdle
FacePlayer
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
HasRoomItemForSale
JumpIf script_080106E0
+1 -1
View File
@@ -11,7 +11,7 @@ script_080107AA:
CheckEntityInteractType
JumpIfNot script_080107AA
SetPlayerIdle
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0001
Call sub_08062CBC
WaitUntilTextboxCloses
+1 -1
View File
@@ -36,7 +36,7 @@ script_08016262:
Call sub_08068E00
WaitUntilTextboxCloses
DoPostScriptAction 0x0001
Call WaitForFrameHiBit
Call WaitForAnimDone
Call sub_08068E90
Call sub_08068C8C
JumpIf script_0801631C
+2 -2
View File
@@ -11,7 +11,7 @@ script_0800B0E8:
script_0800B0F6:
SetPlayerIdle
Call sub_0807DF28
Call WaitForFrameHiBit
Call WaitForAnimDone
FacePlayer
CallWithArg sub_0806BC94, 0x00000004
Call sub_0806BCE8
@@ -24,7 +24,7 @@ script_0800B0F6:
script_0800B134:
SetPlayerIdle
Call sub_0807DF28
Call WaitForFrameHiBit
Call WaitForAnimDone
FacePlayer
CallWithArg sub_0806BC94, 0x00000004
Call sub_0807F650
@@ -85,9 +85,9 @@ script_080138D0:
.endif
Call NPC4E_SaveEquippedItems
CallWithArg EquipItem, 0x00010001
CallWithArg sub_0807F29C, gUnk_080049FE
CallWithArg SetInputMacro, gUnk_080049FE
Wait 0x00c8
CallWithArg sub_0807F29C, 0x00000000
CallWithArg SetInputMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
script_08013A8E:
.ifndef EU
@@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASword2
EndBlock
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x000c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
DoPostScriptAction 0x0006
@@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASword3
EndBlock
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x000d
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
DoPostScriptAction 0x0006
@@ -9,6 +9,6 @@ SCRIPT_START script_Object6ASwordCharge10
EndBlock
WaitForSyncFlag 0x00000020
Wait 0x0078
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
@@ -6,11 +6,11 @@ SCRIPT_START script_Object6ASwordCharge5
EndBlock
WaitForSyncFlagAndClear 0x00000200
SetAnimation 0x0008
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x000c
SetSyncFlag 0x00002000
WaitForSyncFlag 0x00000020
SetAnimation 0x0010
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
@@ -6,11 +6,11 @@ SCRIPT_START script_Object6ASwordCharge6
EndBlock
WaitForSyncFlagAndClear 0x00000400
SetAnimation 0x0009
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x000d
SetSyncFlag 0x00004000
WaitForSyncFlag 0x00000020
SetAnimation 0x0011
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
@@ -7,12 +7,12 @@ SCRIPT_START script_Object6ASwordCharge8
EndBlock
WaitForSyncFlagAndClear 0x00001000
SetAnimation 0x000b
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x000f
SetSyncFlag 0x00010000
WaitForSyncFlag 0x00000020
SetAnimation 0x0013
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
@@ -8,7 +8,7 @@ SCRIPT_START script_Object6ASwordCharge9
EndBlock
WaitForSyncFlag 0x00000020
Wait 0x0078
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
@@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASwordInPedestal
EndBlock
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x000b
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
DoPostScriptAction 0x0006
@@ -7,12 +7,12 @@ SCRIPT_START script_Objet6ASwordCharge7
EndBlock
WaitForSyncFlagAndClear 0x00000800
SetAnimation 0x000a
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x000e
SetSyncFlag 0x00008000
WaitForSyncFlag 0x00000020
SetAnimation 0x0012
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000