Merge branch 'master' into tilemap-docs

This commit is contained in:
octorock
2023-12-28 14:59:23 +01:00
495 changed files with 14619 additions and 16191 deletions
@@ -3,7 +3,7 @@ SCRIPT_START script_CutsceneMiscObjectBrokenSword
BeginBlock
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIf script_0800D24C
CheckLocalFlag 0x007e
CheckLocalFlag OYAKATA_DEMO
JumpIf script_0800D242
DoPostScriptAction 0x0008
EndBlock
@@ -24,7 +24,7 @@ script_0800B734:
Jump script_0800B6A6
script_0800B794:
WaitUntilTextboxCloses
SetLocalFlag 0x00a0
SetLocalFlag IZUMI_02_FAIRY
GivePlayerItem ITEM_BOMBBAG
Jump script_0800B698
script_0800B7A2:
+4 -4
View File
@@ -8,7 +8,7 @@ SCRIPT_START script_Melari
EndBlock
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIf script_0800CFD2
CheckLocalFlag 0x007e
CheckLocalFlag OYAKATA_DEMO
JumpIfNot script_0800CFD2
SetAnimation 0x0008
script_0800CFD2:
@@ -19,7 +19,7 @@ script_0800CFD2:
SetSyncFlag 0x00000020
Jump script_0800CFFA
script_0800CFEC:
CheckLocalFlag 0x007e
CheckLocalFlag OYAKATA_DEMO
JumpIfNot script_0800CFFA
SetSyncFlag 0x00000010
script_0800CFFA:
@@ -60,7 +60,7 @@ script_0800D032:
MessageFromTargetPos TEXT_MINISH2, 0x5d, 0x0002
Jump script_0800D17C
script_0800D098:
CheckLocalFlag 0x007e
CheckLocalFlag OYAKATA_DEMO
JumpIfNot script_0800D0A8
MessageFromTarget TEXT_MINISH2, 0x3e
Jump script_0800D17C
@@ -88,7 +88,7 @@ script_0800D108:
JumpIf script_0800D108
PlaySound SFX_F8
SetSyncFlag 0x00000010
SetLocalFlag 0x007e
SetLocalFlag OYAKATA_DEMO
MessageFromTargetPos TEXT_MINISH2, 0x3e, 0x0002
WaitUntilTextboxCloses
Wait 0x000f
@@ -7,7 +7,7 @@ SCRIPT_START script_MountainMinish3
script_0800D282:
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIf script_0800D292
CheckLocalFlag 0x007e
CheckLocalFlag OYAKATA_DEMO
JumpIf script_0800D2EA
script_0800D292:
BeginBlock
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGetWhiteSword
SetInventoryValue ITEM_GREEN_SWORD, 0x0001
CallWithArg PutItemAnySlot, ITEM_GREEN_SWORD
PlaySound SFX_ITEM_GET
CallWithArg SetPlayerAnimation2, 0x000001e2
CallWithArg SetPlayerAnimation2, ANIM_GET_WHITE_SWORD
Call WaitForPlayerAnim
MessageNoOverlap TEXT_ITEM_GET, 0x02
WaitUntilTextboxCloses