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
@@ -8,7 +8,7 @@ SCRIPT_START script_CastorWildsStatueLeft
EndBlock
script_0800B268:
_0807EA4C
_0807E9F0
UpdateFusion
SetPlayerIdle
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT
JumpIf script_0800B2E2
@@ -8,7 +8,7 @@ SCRIPT_START script_CastorWildsStatueMiddle
EndBlock
script_0800B298:
_0807EA4C
_0807E9F0
UpdateFusion
SetPlayerIdle
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE
JumpIf script_0800B2E2
@@ -8,7 +8,7 @@ SCRIPT_START script_CastorWildsStatueRight
EndBlock
script_0800B2C8:
_0807EA4C
_0807E9F0
UpdateFusion
SetPlayerIdle
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT
JumpIf script_0800B2E2
@@ -15,6 +15,7 @@ script_0800B6D4:
WaitForSyncFlagAndClear 0x00000004
SetRoomFlag 0x0000
WaitForSyncFlagAndClear 0x00000004
//30
CheckLocalFlag 0x009f
JumpIf script_0800B7A2
MessageNoOverlap TEXT_ITEM_GET, 0x7b
@@ -22,7 +23,7 @@ script_0800B6D4:
CallWithArg CheckMessageEqual, TEXT_ITEM_GET << 8 | 0x7d
JumpIf script_0800B6A6
WaitUntilTextboxCloses
SetLocalFlag 0x009f
SetLocalFlag IZUMI_01_FAIRY
GivePlayerItem ITEM_WALLET
Jump script_0800B698
.2byte 0x0000