Rename objects

This commit is contained in:
octorock
2022-07-23 12:43:43 +02:00
parent ccba86d292
commit 852effa474
671 changed files with 5779 additions and 5277 deletions
+2 -2
View File
@@ -15,12 +15,12 @@ script_08013FA4:
EndBlock
Call WaitForPlayerNormalOrTalkEzlo
DisablePlayerControl
Call sub_0807DF38
Call DisablePauseMenu
Wait 0x0078
EzloMessage TEXT_PANEL_TUTORIAL, 0x05
WaitUntilTextboxCloses
SetLocalFlag 0x007d
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
script_08013FE0:
DoPostScriptAction 0x0006
@@ -1,5 +1,5 @@
@ Sanctuary second time OBJECT_6A Earth Element
SCRIPT_START script_Object6AEarthElement
@ Sanctuary second time CUTSCENE_MISC_OBJECT Earth Element
SCRIPT_START script_CutsceneMiscObjectEarthElement
BeginBlock
DoPostScriptAction 0x0007
Call SetCollisionLayer2
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A floating Earth Element
SCRIPT_START script_Object6AEarthElementFloating
@ Sanctuary CUTSCENE_MISC_OBJECT floating Earth Element
SCRIPT_START script_CutsceneMiscObjectEarthElementFloating
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0000
@@ -1,5 +1,5 @@
@ Sanctuary second time OBJECT_6A Fire Element
SCRIPT_START script_Object6AFireElement
@ Sanctuary second time CUTSCENE_MISC_OBJECT Fire Element
SCRIPT_START script_CutsceneMiscObjectFireElement
BeginBlock
DoPostScriptAction 0x0007
Call SetCollisionLayer2
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A floating Fire Element
SCRIPT_START script_Object6AFireElementFloating
@ Sanctuary CUTSCENE_MISC_OBJECT floating Fire Element
SCRIPT_START script_CutsceneMiscObjectFireElementFloating
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0002
@@ -1,5 +1,5 @@
@ Sanctuary second time OBJECT_6A sword?
SCRIPT_START script_Object6ASword2
@ Sanctuary second time CUTSCENE_MISC_OBJECT sword?
SCRIPT_START script_CutsceneMiscObjectSword2
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0009
@@ -1,5 +1,5 @@
@ Sanctuary third time OBJECT_6A ?
SCRIPT_START script_Object6ASword3
@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
SCRIPT_START script_CutsceneMiscObjectSword3
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x000a
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Sword charging?
SCRIPT_START script_Object6ASwordChange1
@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging?
SCRIPT_START script_CutsceneMiscObjectSwordChange1
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0000
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Sword charging 5?
SCRIPT_START script_Object6ASwordCharge10
@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 5?
SCRIPT_START script_CutsceneMiscObjectSwordCharge10
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0015
@@ -1,10 +1,10 @@
@ Sanctuary third time OBJECT_6A ?
SCRIPT_START script_Object6ASwordCharge11
@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
SCRIPT_START script_CutsceneMiscObjectSwordCharge11
CheckSyncFlagAndClear 0x00020000
JumpIf script_08014264
Wait 0x0008
CallWithArg sub_08095EAC, 0x00000000
Jump script_Object6ASwordCharge11
Jump script_CutsceneMiscObjectSwordCharge11
script_08014264:
CallWithArg sub_08095EAC, 0x00000001
Jump script_08014264
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Sword charging 2?
SCRIPT_START script_Object6ASwordCharge2
@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 2?
SCRIPT_START script_CutsceneMiscObjectSwordCharge2
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0001
@@ -1,5 +1,5 @@
@ Sanctuary second time OBJECT_6A sword charging?
SCRIPT_START script_Object6ASwordCharge3
@ Sanctuary second time CUTSCENE_MISC_OBJECT sword charging?
SCRIPT_START script_CutsceneMiscObjectSwordCharge3
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0002
@@ -1,5 +1,5 @@
@ Sanctuary third time OBJECT_6A ?
SCRIPT_START script_Object6ASwordCharge4
@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
SCRIPT_START script_CutsceneMiscObjectSwordCharge4
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0003
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Sword charging 3?
SCRIPT_START script_Object6ASwordCharge5
@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 3?
SCRIPT_START script_CutsceneMiscObjectSwordCharge5
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0004
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Sword charging 3?
SCRIPT_START script_Object6ASwordCharge6
@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 3?
SCRIPT_START script_CutsceneMiscObjectSwordCharge6
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0005
@@ -1,5 +1,5 @@
@ Sanctuary second time OBJECT_6A sword charging?
SCRIPT_START script_Objet6ASwordCharge7
@ Sanctuary second time CUTSCENE_MISC_OBJECT sword charging?
SCRIPT_START script_CutsceneMiscObjectSwordCharge7
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0006
@@ -1,5 +1,5 @@
@ Sanctuary third time OBJECT_6A ?
SCRIPT_START script_Object6ASwordCharge8
@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
SCRIPT_START script_CutsceneMiscObjectSwordCharge8
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0007
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Sword charging 4?
SCRIPT_START script_Object6ASwordCharge9
@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 4?
SCRIPT_START script_CutsceneMiscObjectSwordCharge9
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0014
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Sword in pedestal
SCRIPT_START script_Object6ASwordInPedestal
@ Sanctuary CUTSCENE_MISC_OBJECT Sword in pedestal
SCRIPT_START script_CutsceneMiscObjectSwordInPedestal
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0008
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A text board
SCRIPT_START script_Object6ATextBoard
@ Sanctuary CUTSCENE_MISC_OBJECT text board
SCRIPT_START script_CutsceneMiscObjectTextBoard
BeginBlock
CheckLocalFlag 0x007a
JumpIf script_08013C2A
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Water Element
SCRIPT_START script_Object6AWaterElement
@ Sanctuary CUTSCENE_MISC_OBJECT Water Element
SCRIPT_START script_CutsceneMiscObjectWaterElement
BeginBlock
DoPostScriptAction 0x0007
Call SetCollisionLayer2
@@ -1,5 +1,5 @@
@ Sanctuary second time floating water element
SCRIPT_START script_Object6AWaterElementFloating
SCRIPT_START script_CutsceneMiscObjectWaterElementFloating
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0004
@@ -1,5 +1,5 @@
@ Sanctuary OBJECT_6A Wind Element
SCRIPT_START script_Object6AWindElement
@ Sanctuary CUTSCENE_MISC_OBJECT Wind Element
SCRIPT_START script_CutsceneMiscObjectWindElement
BeginBlock
DoPostScriptAction 0x0007
Call SetCollisionLayer2
@@ -1,5 +1,5 @@
@ Sanctuary third time OBJECT_6A ?
SCRIPT_START script_Object6AWindElementFloating
@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
SCRIPT_START script_CutsceneMiscObjectWindElementFloating
BeginBlock
DoPostScriptAction 0x0007
SetAnimation 0x0006
@@ -18,13 +18,13 @@ script_08013FF0:
Call WaitForPlayerNormal
BeginBlock
SetPlayerIdle
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
EndBlock
EzloMessage TEXT_PANEL_TUTORIAL, 0x08
WaitUntilTextboxCloses
StartPlayerScript script_PlayerSanctuary
WaitForSyncFlagAndClear 0x00000001
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
Jump script_08013FF0
script_0801404C:
@@ -29,7 +29,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble
CameraTargetPlayer
SetLocalFlag 0x007c
Call sub_08053250
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
@@ -13,9 +13,9 @@ script_0801427C:
script_08014298:
CheckEntityInteractType
JumpIfNot script_08014298
SetPlayerIdle
SetPlayerIdle
MessageFromTargetPos 0x0647, 0x000c
WaitUntilTextboxCloses
EnablePlayerControl
EnablePlayerControl
Jump script_08014298
.2byte 0x0000
+10 -10
View File
@@ -11,36 +11,36 @@ script_080134F8:
CheckEntityInteractType
JumpIfNot script_080134F8
SetPlayerIdle
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
StartPlayerScript script_PlayerAtPedestal
WaitForSyncFlagAndClear 0x00000001
CallWithArg sub_08095A1C, script_Object6ASwordInPedestal
CallWithArg sub_08095A1C, script_CutsceneMiscObjectSwordInPedestal
PlaySound SFX_ELEMENT_PLACE
Wait 0x005a
BeginBlock
PlaySound SFX_ELEMENT_FLOAT
CallWithArg sub_08095D54, script_Object6AEarthElementFloating
CallWithArg sub_08095D54, script_Object6AFireElementFloating
CallWithArg sub_08095D54, script_CutsceneMiscObjectEarthElementFloating
CallWithArg sub_08095D54, script_CutsceneMiscObjectFireElementFloating
EndBlock
WaitForSyncFlagAndClear 0x18000000
BeginBlock
PlaySound SFX_ELEMENT_CHARGE
CallWithArg sub_08095D8C, script_Object6ASwordChange1
CallWithArg sub_08095D8C, script_Object6ASwordCharge2
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2
EndBlock
Wait 0x001e
BeginBlock
PlaySound SFX_1D0
CallWithArg sub_08095D8C, script_Object6ASwordCharge5
CallWithArg sub_08095D8C, script_Object6ASwordCharge6
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6
EndBlock
Wait 0x003c
CallWithArg CreateRepeatedSoundManager, 0x00000000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00002000
PlaySound SFX_1D2
CallWithArg sub_08095D8C, script_Object6ASwordCharge9
CallWithArg sub_08095D8C, script_Object6ASwordCharge10
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10
SetSyncFlag 0x00000400
WaitForSyncFlagAndClear 0x00004000
Wait 0x0078
@@ -14,12 +14,12 @@ script_08013B1E:
EndBlock
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
EzloMessage TEXT_PANEL_TUTORIAL, 0x07
WaitUntilTextboxCloses
StartPlayerScript script_PlayerSanctuary
WaitForSyncFlagAndClear 0x00000001
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
Jump script_08013B1E
.2byte 0x0000
@@ -6,7 +6,7 @@ script_08013CA6:
JumpIfNot script_08013CA6
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
Call CreatePlayerExclamationMark
Wait 0x003c
_0807F0B4 0x0001
@@ -20,7 +20,7 @@ script_08013CA6:
EzloMessage TEXT_PANEL_TUTORIAL, 0x04
WaitUntilTextboxCloses
SetLocalFlag 0x0079
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
@@ -11,37 +11,37 @@ script_0801373C:
CheckEntityInteractType
JumpIfNot script_0801373C
SetPlayerIdle
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
StartPlayerScript script_PlayerAtPedestal
WaitForSyncFlagAndClear 0x00000001
CallWithArg sub_08095A1C, script_Object6ASword2
CallWithArg sub_08095A1C, script_CutsceneMiscObjectSword2
PlaySound SFX_ELEMENT_PLACE
Wait 0x005a
BeginBlock
PlaySound SFX_ELEMENT_FLOAT
CallWithArg sub_08095D54, script_Object6AWaterElementFloating
CallWithArg sub_08095D54, script_CutsceneMiscObjectWaterElementFloating
EndBlock
WaitForSyncFlagAndClear 0x20000000
BeginBlock
PlaySound SFX_ELEMENT_CHARGE
CallWithArg sub_08095D8C, script_Object6ASwordChange1
CallWithArg sub_08095D8C, script_Object6ASwordCharge2
CallWithArg sub_08095D8C, script_Object6ASwordCharge3
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge3
EndBlock
Wait 0x001e
BeginBlock
PlaySound SFX_1D0
CallWithArg sub_08095D8C, script_Object6ASwordCharge5
CallWithArg sub_08095D8C, script_Object6ASwordCharge6
CallWithArg sub_08095D8C, script_Objet6ASwordCharge7
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge7
EndBlock
Wait 0x003c
CallWithArg CreateRepeatedSoundManager, 0x00000000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00002000
PlaySound SFX_1D2
CallWithArg sub_08095D8C, script_Object6ASwordCharge9
CallWithArg sub_08095D8C, script_Object6ASwordCharge10
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10
SetSyncFlag 0x00000400
WaitForSyncFlagAndClear 0x00004000
SetSyncFlag 0x00000800
@@ -75,7 +75,7 @@ script_0801373C:
SetSyncFlag 0x00040000
SetLocalFlag 0x007b
Call sub_08053250
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
@@ -18,7 +18,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard
CameraTargetPlayer
SetLocalFlag 0x007a
Call sub_08053250
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
@@ -11,39 +11,39 @@ script_080138D0:
CheckEntityInteractType
JumpIfNot script_080138D0
SetPlayerIdle
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
StartPlayerScript script_PlayerAtPedestal
WaitForSyncFlagAndClear 0x00000001
CallWithArg sub_08095A1C, script_Object6ASword3
CallWithArg sub_08095A1C, script_CutsceneMiscObjectSword3
PlaySound SFX_ELEMENT_PLACE
Wait 0x005a
BeginBlock
PlaySound SFX_ELEMENT_FLOAT
CallWithArg sub_08095D54, script_Object6AWindElementFloating
CallWithArg sub_08095D54, script_CutsceneMiscObjectWindElementFloating
EndBlock
WaitForSyncFlagAndClear 0x40000000
BeginBlock
PlaySound SFX_ELEMENT_CHARGE
CallWithArg sub_08095D8C, script_Object6ASwordChange1
CallWithArg sub_08095D8C, script_Object6ASwordCharge2
CallWithArg sub_08095D8C, script_Object6ASwordCharge3
CallWithArg sub_08095D8C, script_Object6ASwordCharge4
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge3
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge4
EndBlock
Wait 0x001e
BeginBlock
PlaySound SFX_1D0
CallWithArg sub_08095D8C, script_Object6ASwordCharge5
CallWithArg sub_08095D8C, script_Object6ASwordCharge6
CallWithArg sub_08095D8C, script_Objet6ASwordCharge7
CallWithArg sub_08095D8C, script_Object6ASwordCharge8
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge7
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge8
EndBlock
Wait 0x003c
CallWithArg CreateRepeatedSoundManager, 0x00000000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00002000
PlaySound SFX_1D2
CallWithArg sub_08095D8C, script_Object6ASwordCharge9
CallWithArg sub_08095D8C, script_Object6ASwordCharge10
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9
CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10
SetSyncFlag 0x00000400
WaitForSyncFlagAndClear 0x00004000
SetSyncFlag 0x00000800
@@ -85,9 +85,9 @@ script_080138D0:
.endif
Call NPC4E_SaveEquippedItems
CallWithArg EquipItem, 0x00010001
CallWithArg SetInputMacro, gUnk_080049FE
CallWithArg SetPlayerMacro, gUnk_080049FE
Wait 0x00c8
CallWithArg SetInputMacro, 0x00000000
CallWithArg SetPlayerMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
script_08013A8E:
.ifndef EU
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGetElement
BeginBlock
SetEntitySpeed 0x0140
SetPlayerIdle
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
EndBlock
Wait 0x0078
PlayBgm BGM_ELEMENT_THEME
@@ -1,6 +1,6 @@
@ Player at Sanctuary draw final sword
SCRIPT_START script_PlayerPickUpFinalSword
CallWithArg sub_08095E7C, script_Object6ASwordCharge11
CallWithArg sub_08095E7C, script_CutsceneMiscObjectSwordCharge11
PlaySound SFX_1D3
CallWithArg SetPlayerAnimation2, 0x000008e3
Call sub_08096028