mirror of
https://github.com/zeldaret/tmc
synced 2026-05-30 17:06:15 -04:00
Merge branch 'master' into tilemap-docs
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -17,9 +17,9 @@ script_08014C4C:
|
||||
script_08014C56:
|
||||
Call sub_0806CCB4
|
||||
JumpIfNot script_08014C56
|
||||
CheckLocalFlag 0x0066
|
||||
CheckLocalFlag SORA_ELDER_TALK2ND
|
||||
JumpIf script_08014C7C
|
||||
SetLocalFlag 0x0066
|
||||
SetLocalFlag SORA_ELDER_TALK2ND
|
||||
MessageNoOverlap TEXT_WIND_TRIBE, 0x0d
|
||||
WaitUntilTextboxCloses
|
||||
GivePlayerItem ITEM_LIGHT_ARROW
|
||||
|
||||
@@ -4,7 +4,7 @@ SCRIPT_START script_GregalSick
|
||||
DoPostScriptAction 0x000a
|
||||
SetAnimation 0x0000
|
||||
EndBlock
|
||||
CheckLocalFlag 0x0063
|
||||
CheckLocalFlag SORA_ELDER_RECOVER
|
||||
JumpIf script_08014BE8
|
||||
script_08014B48:
|
||||
EndBlock
|
||||
@@ -54,9 +54,9 @@ script_08014BF2:
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_08014BF2
|
||||
SetPlayerIdle
|
||||
CheckLocalFlag 0x0065
|
||||
CheckLocalFlag SORA_ELDER_TALK1ST
|
||||
JumpIf script_08014C1C
|
||||
SetLocalFlag 0x0065
|
||||
SetLocalFlag SORA_ELDER_TALK1ST
|
||||
MessageNoOverlap TEXT_WIND_TRIBE, 0x07
|
||||
WaitUntilTextboxCloses
|
||||
SetIntVariable 100
|
||||
|
||||
@@ -12,7 +12,7 @@ SCRIPT_START script_Npc4EFirstCloud
|
||||
EndBlock
|
||||
script_0800D636:
|
||||
_0807EA4C
|
||||
_0807E9F0
|
||||
UpdateFusion
|
||||
Call NPC4E_IsKinstoneFused
|
||||
JumpIf script_0800D650
|
||||
Call EnablePauseMenu
|
||||
|
||||
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGetSword
|
||||
SetInventoryValue ITEM_SMITH_SWORD, 0x0001
|
||||
CallWithArg PutItemAnySlot, ITEM_SMITH_SWORD
|
||||
PlaySound SFX_ITEM_GET
|
||||
CallWithArg SetPlayerAnimation2, 0x0000045f
|
||||
CallWithArg SetPlayerAnimation2, ANIM_GET_ITEM_SWORD
|
||||
Call WaitForPlayerAnim
|
||||
MessageFromTargetPos TEXT_ITEM_GET, 0x01, 0x000e
|
||||
WaitUntilTextboxCloses
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
SCRIPT_START script_PlayerGetGreenCap
|
||||
BeginBlock
|
||||
Call sub_08094BE0
|
||||
CallWithArg SetPlayerAnimation2, 0x0000045b
|
||||
CallWithArg SetPlayerAnimation2, ANIM_GET_ITEM_BIG_NOCAP
|
||||
PlaySound SFX_ITEM_GET
|
||||
EndBlock
|
||||
Call WaitForPlayerAnim
|
||||
@@ -10,7 +10,7 @@ SCRIPT_START script_PlayerGetGreenCap
|
||||
SetSyncFlag 0x00000008
|
||||
BeginBlock
|
||||
CallWithArg ResetPlayerFlag, PL_NO_CAP
|
||||
CallWithArg SetPlayerAnimation2, 0x000008e4
|
||||
CallWithArg SetPlayerAnimation2, ANIM_GET_NEWCAP
|
||||
EndBlock
|
||||
Call WaitForPlayerAnim
|
||||
SetAnimationState 0x0004
|
||||
|
||||
@@ -7,11 +7,11 @@ SCRIPT_START script_PlayerAtTakeover
|
||||
MoveTo 0x0168, 0x0058
|
||||
SetAnimationState 0x0004
|
||||
DoPostScriptAction 0x0000
|
||||
CallWithArg SetPlayerAnimation2, 0x000003c5
|
||||
CallWithArg SetPlayerAnimation2, ANIM_EZLO_SEARCH
|
||||
Call WaitForPlayerAnim
|
||||
MessageFromTargetPos TEXT_VAATI, 0x18, 0x000c
|
||||
WaitUntilTextboxCloses
|
||||
CallWithArg SetPlayerAnimation2, 0x000003c9
|
||||
CallWithArg SetPlayerAnimation2, ANIM_EZLO_LEAVE_LEFT
|
||||
Call WaitForPlayerAnim
|
||||
SetAnimationState 0x0004
|
||||
DoPostScriptAction 0x0000
|
||||
|
||||
@@ -3,9 +3,9 @@ SCRIPT_START script_KingDaltusStone
|
||||
BeginBlock
|
||||
SetAnimationState 0x0004
|
||||
DoPostScriptAction 0x000a
|
||||
CheckLocalFlag 0x0071
|
||||
CheckLocalFlag LV6_1d_KEYGET
|
||||
JumpIf script_0800E3E8
|
||||
CheckLocalFlag 0x0096
|
||||
CheckLocalFlag LV6_39_KING
|
||||
JumpIf script_0800E3BE
|
||||
SetAnimation 0x000c
|
||||
CallWithArg sub_0807F8E8, 0x00000000
|
||||
@@ -28,7 +28,7 @@ script_0800E37A:
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0000
|
||||
FacePlayer
|
||||
SetLocalFlag 0x0096
|
||||
SetLocalFlag LV6_39_KING
|
||||
script_0800E3BE:
|
||||
DoPostScriptAction 0x0000
|
||||
_0807E9D4
|
||||
@@ -44,7 +44,7 @@ script_0800E3C8:
|
||||
Wait 0x000f
|
||||
GivePlayerItem ITEM_SMALL_KEY
|
||||
WaitPlayerGetItem
|
||||
SetLocalFlag 0x0071
|
||||
SetLocalFlag LV6_1d_KEYGET
|
||||
EnablePlayerControl
|
||||
script_0800E3E8:
|
||||
_0807E9D4
|
||||
|
||||
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerStonesFall
|
||||
EndBlock
|
||||
SetAnimationState 0x0004
|
||||
DoPostScriptAction 0x0000
|
||||
CallWithArg SetPlayerAnimation2, 0x000003c5
|
||||
CallWithArg SetPlayerAnimation2, ANIM_EZLO_SEARCH
|
||||
Call WaitForPlayerAnim
|
||||
SetSyncFlag 0x00000004
|
||||
Call SetPlayerActionNormal
|
||||
|
||||
@@ -31,7 +31,7 @@ script_0800B684:
|
||||
Jump script_0800B6A6
|
||||
script_0800B68E:
|
||||
WaitUntilTextboxCloses
|
||||
SetLocalFlag 0x009e
|
||||
SetLocalFlag IZUMI_00_FAIRY
|
||||
GivePlayerItem ITEM_LARGE_QUIVER
|
||||
script_0800B698:
|
||||
WaitPlayerGetItem
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@ Hyrule Town Carlov
|
||||
@ Hyrule Town ~~Carlov~~ Burlov
|
||||
SCRIPT_START script_Carlov
|
||||
BeginBlock
|
||||
_0807E9D4
|
||||
|
||||
@@ -47,7 +47,7 @@ script_080146E2:
|
||||
JumpIf script_0801472E
|
||||
CheckLocalFlag 0x005f
|
||||
JumpIf script_08014720
|
||||
Call sub_08088574
|
||||
Call FigurineDevice_TryAgainMessage
|
||||
SetRoomFlag 0x000a
|
||||
Jump script_0801473C
|
||||
script_0801472E_2:
|
||||
@@ -104,7 +104,7 @@ script_080146C6:
|
||||
JumpIf script_0801472E
|
||||
CheckLocalFlag 0x005f
|
||||
JumpIf script_08014720
|
||||
Call sub_08088574
|
||||
Call FigurineDevice_TryAgainMessage
|
||||
SetRoomFlag 0x0009
|
||||
Jump script_0801473C
|
||||
.endif
|
||||
@@ -135,7 +135,7 @@ script_08014720:
|
||||
.else
|
||||
SetRoomFlag 0x0009
|
||||
.endif
|
||||
Call sub_08088504
|
||||
Call FigurineDevice_NothingNewToDrawMessage
|
||||
Jump script_0801473C
|
||||
script_0801472E:
|
||||
.ifdef EU
|
||||
@@ -144,7 +144,7 @@ script_0801472E:
|
||||
SetRoomFlag 0x0009
|
||||
.endif
|
||||
ClearRoomFlag 0x0006
|
||||
Call sub_08088544
|
||||
Call FigurineDevice_NewFigurinesMessage
|
||||
script_0801473C:
|
||||
CheckTextboxResult
|
||||
JumpIfNot script_08014770
|
||||
@@ -179,9 +179,9 @@ script_0801477A:
|
||||
CheckRoomFlag 0x0007
|
||||
JumpIf script_080147A4
|
||||
script_0801478A:
|
||||
Call sub_08088478
|
||||
Call FigurineDevice_NoFigurinesLeftMessage
|
||||
WaitUntilTextboxCloses
|
||||
Call sub_080885B0
|
||||
Call FigurineDevice_LostOrFinishedMessage
|
||||
WaitPlayerGetItem
|
||||
SetSyncFlag 0x00000008
|
||||
Jump script_080147CE
|
||||
|
||||
@@ -28,12 +28,12 @@ script_0800E974:
|
||||
SetAnimation 0x0000
|
||||
StartPlayerScript script_PlayerActivatedTrapCard
|
||||
WaitForSyncFlagAndClear 0x00000001
|
||||
SetLocalFlag 0x0074
|
||||
SetLocalFlag MIZUKAKI_STAIR
|
||||
PlaySound SFX_SECRET
|
||||
Wait 0x00f0
|
||||
MessageFromTarget TEXT_TOWN_MINISH1, 0x26
|
||||
WaitUntilTextboxCloses
|
||||
SetLocalFlag 0x0075
|
||||
SetLocalFlag MIZUKAKI_STAIR_WARP_OK
|
||||
script_0800E9E4:
|
||||
WaitUntilTextboxCloses
|
||||
Wait 0x000f
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@ Library if you talk to him later?
|
||||
@ Librari at the lake
|
||||
SCRIPT_START script_LibrariLater
|
||||
BeginBlock
|
||||
DoPostScriptAction 0x000a
|
||||
@@ -14,9 +14,9 @@ script_08012440:
|
||||
SetAnimation 0x0009
|
||||
Call sub_0806B2B4
|
||||
WaitUntilTextboxCloses
|
||||
CheckLocalFlag 0x00b3
|
||||
CheckLocalFlag KHOUSE23_TALK1ST
|
||||
JumpIf script_08012474
|
||||
SetLocalFlag 0x00b3
|
||||
SetLocalFlag KHOUSE23_TALK1ST
|
||||
GivePlayerItem ITEM_HEART_CONTAINER
|
||||
WaitPlayerGetItem
|
||||
.ifdef USA
|
||||
|
||||
@@ -6,7 +6,7 @@ SCRIPT_START script_Rem
|
||||
SetAnimation 0x0002
|
||||
CheckInventory1 ITEM_PEGASUS_BOOTS
|
||||
JumpIf script_080130B6
|
||||
CheckLocalFlag 0x0060
|
||||
CheckLocalFlag SHOP02_KUTSU_00
|
||||
JumpIf script_08012FD2
|
||||
CheckGlobalFlag DASHBOOTS
|
||||
JumpIf script_RemFallingAsleep
|
||||
|
||||
@@ -84,7 +84,7 @@ script_0801309E:
|
||||
SetAction 0x0001
|
||||
Jump script_0801308A
|
||||
script_080130B6:
|
||||
CheckLocalFlag 0x0062
|
||||
CheckLocalFlag NPC37_REM_SLEEP
|
||||
JumpIfNot script_080130C4
|
||||
Call sub_0806A9B0
|
||||
script_080130C4:
|
||||
|
||||
@@ -23,7 +23,7 @@ script_0800B9F4:
|
||||
FacePlayer
|
||||
DoPostScriptAction 0x0000
|
||||
Call sub_0807F650
|
||||
_0807E9F0
|
||||
UpdateFusion
|
||||
SetPlayerIdle
|
||||
Call sub_0806948C
|
||||
JumpIf script_0800BA24
|
||||
|
||||
@@ -55,7 +55,7 @@ script_08009FB6:
|
||||
Jump script_08009F86
|
||||
script_08009FD2:
|
||||
EndBlock
|
||||
CheckLocalFlag 0x00b0
|
||||
CheckLocalFlag KHOUSE26_REMOCON
|
||||
JumpIf script_0800A024
|
||||
script_08009FDC:
|
||||
EndBlock
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -28,7 +28,7 @@ script_0800B134:
|
||||
FacePlayer
|
||||
CallWithArg sub_0806BC94, 0x00000004
|
||||
Call sub_0807F650
|
||||
_0807E9F0
|
||||
UpdateFusion
|
||||
.ifndef EU
|
||||
@! @bug: In EU, Eenie is marked as done fusing if kinstone menu is closed without fusing
|
||||
JumpIfNot script_0800B160
|
||||
|
||||
@@ -10,7 +10,7 @@ SCRIPT_START script_MysteriousWall
|
||||
EndBlock
|
||||
script_0800B98A:
|
||||
_0807EA4C
|
||||
_0807E9F0
|
||||
UpdateFusion
|
||||
JumpIf script_0800B99E
|
||||
Call EnablePauseMenu
|
||||
EnablePlayerControl
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
SCRIPT_START script_PlayerPickUpFinalSword
|
||||
CallWithArg sub_08095E7C, script_CutsceneMiscObjectSwordCharge11
|
||||
PlaySound SFX_1D3
|
||||
CallWithArg SetPlayerAnimation2, 0x000008e3
|
||||
CallWithArg SetPlayerAnimation2, ANIM_GET_LAST_SWORD
|
||||
Call sub_08096028
|
||||
Wait 0x0078
|
||||
SetSyncFlag 0x00020000
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@ Player at Sanctuary pick up sword
|
||||
SCRIPT_START script_PlayerPickUpSword
|
||||
PlaySound SFX_1D3
|
||||
CallWithArg SetPlayerAnimation2, 0x000008bf
|
||||
CallWithArg SetPlayerAnimation2, ANIM_GET_NEW_SWORD
|
||||
Call sub_08096028
|
||||
Wait 0x003c
|
||||
SetSyncFlag 0x00020000
|
||||
|
||||
@@ -14,7 +14,7 @@ SCRIPT_START script_08016482
|
||||
DisablePlayerControl
|
||||
SetPlayerAction 0x00005408
|
||||
StartPlayerScript script_08016384
|
||||
SetPlayerAnimation 0x03a0
|
||||
SetPlayerAnimation ANIM_FALL_ON_BACK
|
||||
_0807E8E4_0
|
||||
_0807E8E4_1
|
||||
_0807E8E4_2
|
||||
|
||||
@@ -10,7 +10,7 @@ SCRIPT_START script_NPC4ESourceOfTheFlow
|
||||
EndBlock
|
||||
script_08015FE4:
|
||||
_0807EA4C
|
||||
_0807E9F0
|
||||
UpdateFusion
|
||||
SetPlayerIdle
|
||||
CheckKinstoneFused KINSTONE_SOURCE_FLOW
|
||||
JumpIf script_08015FFE
|
||||
|
||||
@@ -12,9 +12,9 @@ script_08012338:
|
||||
SetPlayerIdle
|
||||
MessageFromTarget TEXT_PERCY, 0x04
|
||||
WaitUntilTextboxCloses
|
||||
CheckLocalFlag 0x0042
|
||||
CheckLocalFlag MHOUSE08_03
|
||||
JumpIf script_0801235A
|
||||
SetLocalFlag 0x0042
|
||||
SetLocalFlag MHOUSE08_03
|
||||
GivePlayerItem ITEM_RUPEE50
|
||||
WaitPlayerGetItem
|
||||
script_0801235A:
|
||||
|
||||
Reference in New Issue
Block a user