mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-11 21:19:02 -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/unused/script_0800B828.inc
+2 -2
View File
@@ -8,7 +8,7 @@ SCRIPT_START script_0800B828
script_0800B836:
TriggerInteract
SetPlayerIdle
MessageFromTarget 0x0a01
MessageFromTarget TEXT_EMPTY, 0x01
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
@@ -45,7 +45,7 @@ script_0800B89E:
JumpIfNot script_0800B89E
SetPlayerIdle
FacePlayer
MessageFromTarget 0x0a01
MessageFromTarget TEXT_EMPTY, 0x01
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
data/scripts/unused/script_08012C68.inc
+2 -2
View File
@@ -11,9 +11,9 @@ script_08012C7E:
JumpIfNot script_08012C7E
SetPlayerIdle
_0807E8E4_0
MessageFromTarget 0x111d
MessageFromTarget TEXT_FINDING_EZLO, 0x1d
WaitUntilTextboxCloses
SetGlobalFlag 0x0022
SetGlobalFlag ENTRANCE_OK
EnablePlayerControl
Jump script_08012C7E
data/scripts/unused/script_08016384.inc
+8 -20
View File
@@ -14,24 +14,12 @@ SCRIPT_START script_08016384
CallWithArg script_08016384, 0x12345678
LoadRoomEntityList script_08016384
CheckSyncFlagAndClear 0x00000001
CheckInventory1 0x0001
CheckInventory2 0x0001
CheckInventory1 ITEM_SMITH_SWORD
CheckInventory2 ITEM_SMITH_SWORD
HasRoomItemForSale
CheckLocalFlag 0x0067
.ifdef JP
CheckLocalFlagByBank 0x0100, 0x0069
.else
.ifdef EU
CheckLocalFlagByBank 0x0100, 0x0069
.else
.ifdef DEMO_JP
CheckLocalFlagByBank 0x0100, 0x0069 @ TODO deduplicate
.else
CheckLocalFlagByBank 0x0100, 0x006b
.endif
.endif
.endif
CheckGlobalFlag 0x0013
CheckLocalFlagByBank FLAG_BANK_1, SOUGEN_01_00
CheckGlobalFlag START
CheckRoomFlag 0x0000
CheckPlayerInRegion 0x0000, 0x0000, 0x0000
CheckPlayerInRegion2 0x0000
@@ -39,7 +27,7 @@ SCRIPT_START script_08016384
FacePlayerAndCheckDist
HasRupees 0x00c8
CheckTextboxResult
CheckKinstoneFused 0x0001
CheckKinstoneFused KINSTONE_1
BuyItem 0x006c, 0x0000
CheckBottleContaining 0x0020
VariableBitSet 0x00000000
@@ -53,10 +41,10 @@ SCRIPT_START script_08016384
SetSyncFlag 0x00000001
ClearSyncFlag 0x00000002
SetLocalFlag 0x0067
SetLocalFlagByBank 0x0100, 0x0001
SetLocalFlagByBank FLAG_BANK_1, 0x0001
ClearLocalFlag 0x0067
SetGlobalFlag 0x0013
ClearGlobalFlag 0x0013
SetGlobalFlag START
ClearGlobalFlag START
SetRoomFlag 0x0000
ClearRoomFlag 0x0000
Wait 0x001e
data/scripts/unused/script_08016482.inc
+4 -4
View File
@@ -30,12 +30,12 @@ SCRIPT_START script_08016482
_0807E9E4 0x0000
_0807EA88 0x0001
WaitUntilTextboxCloses
MessageFromTarget 0x0601
MessageFromTarget TEXT_LOCATIONS, 0x01
MessageNoOverlap 0x0601
MessageFromTargetPos_1 0x0601
MessageFromTargetTable 0x0601, 0x0602, 0x0603
MessageFromTargetPos_1 TEXT_LOCATIONS, 0x01
MessageFromTargetTable TEXT_LOCATIONS << 8 | 0x01, TEXT_LOCATIONS << 8 | 0x02, TEXT_LOCATIONS << 8 | 0x03
MessageNoOverlapVar
EzloMessage 0x0602
EzloMessage TEXT_LOCATIONS, 0x02
_0807EB38
SetAnimationState 0x0000
_0807EB4C 0x0000, 0x0000