mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-06 19:10:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use enums across more scripts and files

Browse Source
This commit is contained in:
Tal Hayon
2022-05-14 20:51:30 +03:00
parent 422fb8ed14
commit 968e200c78
259 changed files with 876 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/castorWilds/script_CastorWildsStatueLeft.inc
+3 -3
View File
@@ -1,16 +1,16 @@
@ Castor Wilds Statue left
SCRIPT_START script_CastorWildsStatueLeft
BeginBlock
CheckKinstoneFused 0x0006
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT
JumpIf script_0800B302
_0807EA88 0x0006
_0807EA88 KINSTONE_CASTOR_WILDS_STATUE_LEFT
SetAnimationState 0x0002
EndBlock
script_0800B268:
_0807EA4C
_0807E9F0
SetPlayerIdle
CheckKinstoneFused 0x0006
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT
JumpIf script_0800B2E2
Call sub_0807DF50
EnablePlayerControl
data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc
+3 -3
View File
@@ -1,16 +1,16 @@
@ Castor Wilds Statue middle
SCRIPT_START script_CastorWildsStatueMiddle
BeginBlock
CheckKinstoneFused 0x0007
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE
JumpIf script_0800B302
_0807EA88 0x0007
_0807EA88 KINSTONE_CASTOR_WILDS_STATUE_MIDDLE
SetAnimationState 0x0002
EndBlock
script_0800B298:
_0807EA4C
_0807E9F0
SetPlayerIdle
CheckKinstoneFused 0x0007
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE
JumpIf script_0800B2E2
Call sub_0807DF50
EnablePlayerControl
data/scripts/castorWilds/script_CastorWildsStatueRight.inc
+3 -3
View File
@@ -1,16 +1,16 @@
@ Castor Wilds Statue right
SCRIPT_START script_CastorWildsStatueRight
BeginBlock
CheckKinstoneFused 0x0008
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT
JumpIf script_0800B302
_0807EA88 0x0008
_0807EA88 KINSTONE_CASTOR_WILDS_STATUE_RIGHT
SetAnimationState 0x0002
EndBlock
script_0800B2C8:
_0807EA4C
_0807E9F0
SetPlayerIdle
CheckKinstoneFused 0x0008
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT
JumpIf script_0800B2E2
Call sub_0807DF50
EnablePlayerControl
data/scripts/castorWilds/script_CastorWildsStatueRock.inc
+8 -32
View File
@@ -1,32 +1,20 @@
@ Castor Wilds Statue rock
SCRIPT_START script_CastorWildsStatueRock
BeginBlock
.ifdef JP
CheckLocalFlag 0x001e
.else
.ifdef EU
CheckLocalFlag 0x001e
.else
.ifdef DEMO_JP
CheckLocalFlag 0x001e @ TODO deduplicate
.else
CheckLocalFlag 0x001d
.endif
.endif
.endif
CheckLocalFlag HIKYOU_00_SEKIZOU
JumpIf script_0800B39C
DoPostScriptAction 0x0001
SetEntitySpeed 0x0040
SetEntityDirection 0x0010
CheckKinstoneFused 0x0006
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT
JumpIfNot script_0800B32C
Call sub_080676D8
script_0800B32C:
CheckKinstoneFused 0x0007
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE
JumpIfNot script_0800B33A
Call sub_080676D8
script_0800B33A:
CheckKinstoneFused 0x0008
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT
JumpIfNot script_0800B348
Call sub_080676D8
script_0800B348:
@@ -42,26 +30,14 @@ script_0800B350:
Wait 0x0014
BeginBlock
SetSyncFlag 0x00000001
CheckKinstoneFused 0x0006
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT
JumpIfNot script_0800B350
CheckKinstoneFused 0x0007
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE
JumpIfNot script_0800B350
CheckKinstoneFused 0x0008
CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT
JumpIfNot script_0800B350
EndBlock
.ifdef JP
SetLocalFlag 0x001e
.else
.ifdef EU
SetLocalFlag 0x001e
.else
.ifdef DEMO_JP
SetLocalFlag 0x001e @ TODO deduplicate
.else
SetLocalFlag 0x001d
.endif
.endif
.endif
SetLocalFlag HIKYOU_00_SEKIZOU
PlaySound SFX_SECRET
script_0800B39C:
DoPostScriptAction 0x0006
data/scripts/castorWilds/script_GreatFairyRupees.inc
+3 -3
View File
@@ -17,12 +17,12 @@ script_0800B6D4:
WaitForSyncFlagAndClear 0x00000004
CheckLocalFlag 0x009f
JumpIf script_0800B7A2
MessageNoOverlap 0x057b
MessageNoOverlap TEXT_ITEM_GET, 0x7b
WaitUntilTextboxCloses
CallWithArg CheckMessageEqual, 0x0000057d
CallWithArg CheckMessageEqual, TEXT_ITEM_GET << 8 | 0x7d
JumpIf script_0800B6A6
WaitUntilTextboxCloses
SetLocalFlag 0x009f
GivePlayerItem 0x0064
GivePlayerItem ITEM_WALLET
Jump script_0800B698
.2byte 0x0000
data/scripts/castorWilds/script_MalonAtRanch.inc
+1 -1
View File
@@ -10,7 +10,7 @@ script_0800B5FA:
JumpIfNot script_0800B5FA
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x2009
MessageNoOverlap TEXT_LON_LON, 0x09
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimationState 0x0004
data/scripts/castorWilds/script_Object69.inc
+2 -26
View File
@@ -2,19 +2,7 @@
SCRIPT_START script_Object69
BeginBlock
SetSyncFlag 0x00000000
.ifdef JP
CheckLocalFlag 0x001e
.else
.ifdef EU
CheckLocalFlag 0x001e
.else
.ifdef DEMO_JP
CheckLocalFlag 0x001e @ TODO deduplicate
.else
CheckLocalFlag 0x001d
.endif
.endif
.endif
CheckLocalFlag HIKYOU_00_SEKIZOU
JumpIf script_0800B252
SetEntitySpeed 0x00c0
EndBlock
@@ -31,19 +19,7 @@ script_0800B216:
CameraTargetPlayer
Wait 0x0008
EnablePlayerControl
.ifdef JP
CheckLocalFlag 0x001e
.else
.ifdef EU
CheckLocalFlag 0x001e
.else
.ifdef DEMO_JP
CheckLocalFlag 0x001e @ TODO deduplicate
.else
CheckLocalFlag 0x001d
.endif
.endif
.endif
CheckLocalFlag HIKYOU_00_SEKIZOU
JumpIfNot script_0800B216
script_0800B252:
SCRIPT_END
data/scripts/castorWilds/script_Object69DarknutFight.inc
+1 -1
View File
@@ -13,7 +13,7 @@ SCRIPT_START script_Object69DarknutFight
SetRoomFlag 0x0000
Wait 0x0010
PlayBgm BGM_FIGHT_THEME
EzloMessage 0x2701
EzloMessage TEXT_TREASURE_GUARDIAN, 0x01
EnablePlayerControl
Call sub_0807DF50
SCRIPT_END