mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-10 04:11:53 -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/hyruleTown/script_Anju.inc
+2 -2
View File
@@ -12,7 +12,7 @@ script_0801015A:
FacePlayer
CheckRoomFlag 0x0001
JumpIf script_0801019E
MessageFromTargetPos 0x3001, 0x0000
MessageFromTargetPos TEXT_ANJU, 0x01, 0x0000
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_080101A6
@@ -38,7 +38,7 @@ script_080101AC:
Call sub_080A1270
SetPlayerIdle
Call sub_0807DF28
MessageFromTargetPos 0x3004, 0x0007
MessageFromTargetPos TEXT_ANJU, 0x04, 0x0007
WaitUntilTextboxCloses
StopBgm
SetFadeTime 0x0004
data/scripts/hyruleTown/script_AnjuInside.inc
+1 -1
View File
@@ -11,7 +11,7 @@ script_08010132:
JumpIfNot script_08010132
SetPlayerIdle
FacePlayer
MessageFromTarget 0x4f22
MessageFromTarget TEXT_CAFE, 0x22
WaitUntilTextboxCloses
EnablePlayerControl
Jump script_08010132
data/scripts/hyruleTown/script_Beedle.inc
+13 -13
View File
@@ -16,24 +16,24 @@ script_08010502:
CheckRoomFlag 0x000e
JumpIf script_0801052E
SetRoomFlag 0x000e
MessageNoOverlap 0x2b10
MessageNoOverlap TEXT_PICOLYTE, 0x10
WaitUntilTextboxCloses
script_0801052E:
Call sub_080634E4
JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570
script_08010544:
MessageNoOverlap 0x2b0d
MessageNoOverlap TEXT_PICOLYTE, 0x0d
Jump script_080105E0
script_0801054C:
CheckGlobalFlag 0x003d
CheckGlobalFlag DRUG_3
JumpIfNot script_080105DC
Jump script_08010570
script_08010558:
CheckGlobalFlag 0x003c
CheckGlobalFlag DRUG_2
JumpIfNot script_080105DC
Jump script_08010570
script_08010564:
CheckGlobalFlag 0x003b
CheckGlobalFlag DRUG_1
JumpIfNot script_080105DC
Jump script_08010570
script_08010570:
@@ -44,28 +44,28 @@ script_08010570:
JumpIfNot script_080105E0
CallWithArg sub_0807F7C4, 0x00000000
JumpIfNot script_080105C4
CheckBottleContaining 0x0020
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_080105CC
Call sub_08063504
JumpIf script_080105D4
MessageNoOverlap 0x2b07
MessageNoOverlap TEXT_PICOLYTE, 0x07
WaitUntilTextboxCloses
CallWithArg sub_0807F800, 0x00000000
WaitPlayerGetItem
WaitUntilTextboxCloses
MessageNoOverlap 0x2b0c
MessageNoOverlap TEXT_PICOLYTE, 0x0c
Jump script_080105E0
script_080105C4:
MessageNoOverlap 0x2b09
MessageNoOverlap TEXT_PICOLYTE, 0x09
Jump script_080105E0
script_080105CC:
MessageNoOverlap 0x2b0a
MessageNoOverlap TEXT_PICOLYTE, 0x0a
Jump script_080105E0
script_080105D4:
MessageNoOverlap 0x2b0b
MessageNoOverlap TEXT_PICOLYTE, 0x0b
Jump script_080105E0
script_080105DC:
MessageNoOverlap 0x2b0e
MessageNoOverlap TEXT_PICOLYTE, 0x0e
script_080105E0:
WaitUntilTextboxCloses
Call sub_0807DF50
@@ -83,7 +83,7 @@ script_08010602:
JumpIfNot script_08010602
SetPlayerIdle
FacePlayer
MessageFromTarget 0x0a01
MessageFromTarget TEXT_EMPTY, 0x01
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimationState 0x0004
data/scripts/hyruleTown/script_Carlov.inc
+5 -5
View File
@@ -13,8 +13,8 @@ script_08014462:
SetAnimation 0x0008
Wait 0x0020
SetAnimation 0x0002
MessageFromTarget 0x4202
MessageFromTarget 0x4203
MessageFromTarget TEXT_BURLOV, 0x02
MessageFromTarget TEXT_BURLOV, 0x03
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_080144F0
@@ -23,12 +23,12 @@ script_08014462:
DoPostScriptAction 0x0000
HasRupees 0x000a
JumpIf script_080144A2
MessageFromTarget 0x4204
MessageFromTarget TEXT_BURLOV, 0x04
Jump script_080144FC
script_080144A2:
Call sub_0806E250
JumpIfNot script_080144B8
MessageFromTarget 0x420b
MessageFromTarget TEXT_BURLOV, 0x0b
_0807EB38
JumpTable script_080144B8, script_080144C0
script_080144B8:
@@ -45,7 +45,7 @@ script_080144C0:
.endif
script_080144C8:
ModRupees 0xfff6
MessageFromTarget 0x420c
MessageFromTarget TEXT_BURLOV, 0x0c
PlaySound SFX_BUTTON_PRESS
Wait 0x0018
SetRoomFlag 0x0000
data/scripts/hyruleTown/script_Carlov2.inc
+12 -12
View File
@@ -21,7 +21,7 @@ script_0801463A:
CheckRoomFlag 0x0009
JumpIfNot script_0801463A
SetPlayerIdle
EzloMessage 0x431f
EzloMessage TEXT_CARLOV, 0x1f
WaitUntilTextboxCloses
script_0801469A:
StartPlayerScript script_PlayerAtCarlov
@@ -35,7 +35,7 @@ script_080146E2:
SetAnimation 0x0008
Wait 0x0020
SetAnimation 0x0002
CheckGlobalFlag 0x0059
CheckGlobalFlag FIGURE_ALLCOMP
JumpIf script_0801472E_2
CheckRoomFlag 0x0009
JumpIf script_080146F4
@@ -51,7 +51,7 @@ script_080146E2:
SetRoomFlag 0x000a
Jump script_0801473C
script_0801472E_2:
MessageFromTargetPos 0x432f, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x2f, 0x000c
Jump script_080147CE
.else
CheckRoomFlag 0x0004
@@ -62,7 +62,7 @@ script_0801472E_2:
JumpIf script_080146A0
SetPlayerIdle
FaceAwayFromPlayer
MessageFromTargetPos 0x432b, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x2b, 0x000c
Jump script_080147CE
script_08014672:
.ifdef DEMO_JP
@@ -76,7 +76,7 @@ script_08014672:
.endif
JumpIfNot script_0801463A
SetPlayerIdle
EzloMessage 0x431f
EzloMessage TEXT_CARLOV, 0x1f
WaitUntilTextboxCloses
StartPlayerScript script_PlayerAtCarlov
Wait 0x0010
@@ -91,9 +91,9 @@ script_080146A0:
FaceAwayFromPlayer
Wait 0x0010
SetAnimation 0x0002
CheckGlobalFlag 0x0059
CheckGlobalFlag FIGURE_ALLCOMP
JumpIfNot script_080146C6
MessageFromTargetPos 0x432f, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x2f, 0x000c
Jump script_080147CE
script_080146C6:
CheckRoomFlag 0x0004
@@ -110,7 +110,7 @@ script_080146C6:
.endif
script_080146F4:
MessageFromTargetPos 0x431e, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x1e, 0x000c
Jump script_080147CE
script_080146FE:
.ifdef EU
@@ -123,11 +123,11 @@ script_080146FE:
script_0801474A:
SetRoomFlag 0x000a
.endif
MessageFromTargetPos 0x4305, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x05, 0x000c
WaitUntilTextboxCloses
HasShells 0x0001
JumpIfNot script_080147C4
MessageFromTargetPos 0x4306, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x06, 0x000c
Jump script_0801473C
script_08014720:
.ifdef EU
@@ -163,7 +163,7 @@ script_08014754:
.else
SetRoomFlag 0x0004
.endif
MessageFromTargetPos 0x431e, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x1e, 0x000c
Jump script_080147CE
script_08014770:
.ifdef EU
@@ -201,7 +201,7 @@ script_080147C4:
.else
SetRoomFlag 0x0009
.endif
MessageFromTargetPos 0x4307, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x07, 0x000c
script_080147CE:
WaitUntilTextboxCloses
.ifdef EU
data/scripts/hyruleTown/script_Din2.inc
+7 -7
View File
@@ -9,9 +9,9 @@ SCRIPT_START script_Din2
script_08011E96:
EndBlock
BeginBlock
CheckGlobalFlag 0x002f
CheckGlobalFlag NEW_HOUSE_NAYRU
JumpIf script_08011C9A
CheckGlobalFlag 0x0030
CheckGlobalFlag NEW_HOUSE_FARORE
JumpIf script_08011C9A
CheckEntityInteractType
JumpIfNot script_08011E96
@@ -19,13 +19,13 @@ script_08011E96:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
CheckGlobalFlag 0x0048
CheckGlobalFlag GOMAN_NEW_HOUSE
JumpIf script_08011ECC
MessageNoOverlap 0x4524
MessageNoOverlap TEXT_HAPPY_HEARTH, 0x24
WaitUntilTextboxCloses
Jump script_08011ED8
script_08011ECC:
MessageNoOverlap 0x3111
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x11
WaitUntilTextboxCloses
CheckTextboxResult
JumpIf script_08011EF4
@@ -41,9 +41,9 @@ script_08011EE6:
FacePlayer
DoPostScriptAction 0x0000
script_08011EF4:
MessageNoOverlap 0x3114
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x14
WaitUntilTextboxCloses
SetGlobalFlag 0x002e
SetGlobalFlag NEW_HOUSE_DIN
EnablePlayerControl
SetAnimationState 0x0004
DoPostScriptAction 0x0001
data/scripts/hyruleTown/script_DinAlone.inc
+1 -1
View File
@@ -12,7 +12,7 @@ script_080121DE:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
MessageNoOverlap 0x4527
MessageNoOverlap TEXT_HAPPY_HEARTH, 0x27
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimationState 0x0004
data/scripts/hyruleTown/script_DinMovedIn.inc
+5 -5
View File
@@ -14,24 +14,24 @@ script_0801203A:
DoPostScriptAction 0x0000
CheckLocalFlag 0x0094
JumpIf script_0801205E
MessageNoOverlap 0x3122
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x22
WaitUntilTextboxCloses
SetLocalFlag 0x0094
Jump script_0801209E
script_0801205E:
CheckBottleContaining 0x0031
JumpIfNot script_08012070
MessageNoOverlap 0x3123
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x23
WaitUntilTextboxCloses
Jump script_0801209E
script_08012070:
MessageNoOverlap 0x3124
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x24
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_0801209E
CheckBottleContaining 0x0020
JumpIfNot script_0801209A
MessageNoOverlap 0x3125
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x25
WaitUntilTextboxCloses
GivePlayerItem 0x0031
WaitPlayerGetItem
@@ -48,7 +48,7 @@ script_08012070:
.endif
Jump script_0801209E
script_0801209A:
MessageNoOverlap 0x3127
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x27
script_0801209E:
WaitUntilTextboxCloses
EnablePlayerControl
data/scripts/hyruleTown/script_DrLeftDoor.inc
+4 -4
View File
@@ -2,7 +2,7 @@
SCRIPT_START script_DrLeftDoor
BeginBlock
DoPostScriptAction 0x0007
CheckGlobalFlag 0x001f
CheckGlobalFlag LEFT_DOOR_OPEN
JumpIf script_0800EF92
EndBlock
script_0800EF50:
@@ -11,7 +11,7 @@ script_0800EF50:
SetPlayerIdle
CheckLocalFlagByBank 0x0200, 0x006d
JumpIf script_0800EF82
MessageFromTarget 0x4d01
MessageFromTarget TEXT_DR_LEFT, 0x01
WaitUntilTextboxCloses
StartPlayerScript script_PlayerAtDrLeftDoor
WaitForSyncFlagAndClear 0x00000001
@@ -19,8 +19,8 @@ script_0800EF50:
EnablePlayerControl
Jump script_0800EF50
script_0800EF82:
SetGlobalFlag 0x001f
MessageFromTarget 0x4d02
SetGlobalFlag LEFT_DOOR_OPEN
MessageFromTarget TEXT_DR_LEFT, 0x02
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
data/scripts/hyruleTown/script_Emma.inc
+3 -3
View File
@@ -11,7 +11,7 @@ script_0800E832:
SetPlayerIdle
SetAnimationState 0x0004
BeginBlock
MessageFromTarget 0x4501
MessageFromTarget TEXT_HAPPY_HEARTH, 0x01
CallWithArg sub_0807F854, 0x00010032
CallWithArg sub_0807F854, 0x000200c8
CallWithArg sub_0807F854, 0x00030190
@@ -21,7 +21,7 @@ script_0800E832:
JumpTable script_0800E910, script_RentSmallRoom, script_RentRegularRoom, script_0800E872
script_0800E872: @ Rent large room
BeginBlock
MessageFromTarget 0x4505
MessageFromTarget TEXT_HAPPY_HEARTH, 0x05
CallWithArg sub_0807F854, 0x00010190
EndBlock
WaitUntilTextboxCloses
@@ -29,7 +29,7 @@ script_0800E872: @ Rent large room
JumpIfNot script_EmmaNotEnoughRupees
ModRupees 0xfe70
SetLocalFlag 0x0091
MessageFromTarget 0x4508
MessageFromTarget TEXT_HAPPY_HEARTH, 0x08
WaitUntilTextboxCloses
Call sub_0806C578
SCRIPT_END
data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc
+2 -2
View File
@@ -1,9 +1,9 @@
@ Hyrule Town Inn Emma not enough rupees
SCRIPT_START script_EmmaNotEnoughRupees
MessageFromTarget 0x4507
MessageFromTarget TEXT_HAPPY_HEARTH, 0x07
Jump script_0800E914
script_0800E910: @ Rent no room
MessageFromTarget 0x4509
MessageFromTarget TEXT_HAPPY_HEARTH, 0x09
script_0800E914:
WaitUntilTextboxCloses
EnablePlayerControl
data/scripts/hyruleTown/script_Farore.inc
+7 -7
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_Farore
SetAnimationState 0x0004
DoPostScriptAction 0x0001
DoPostScriptAction 0x000a
CheckGlobalFlag 0x0047
CheckGlobalFlag GOMAN_RENTED_HOUSE
JumpIf script_08011E1A
EndBlock
script_08011DF2:
@@ -17,7 +17,7 @@ script_08011DF2:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
MessageNoOverlap 0x4514
MessageNoOverlap TEXT_HAPPY_HEARTH, 0x14
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimationState 0x0004
@@ -26,9 +26,9 @@ script_08011DF2:
script_08011E1A:
EndBlock
BeginBlock
CheckGlobalFlag 0x002b
CheckGlobalFlag RENTED_HOUSE_DIN
JumpIf script_08011DF2
CheckGlobalFlag 0x002c
CheckGlobalFlag RENTED_HOUSE_NAYRU
JumpIf script_08011DF2
CheckEntityInteractType
JumpIfNot script_08011E1A
@@ -36,7 +36,7 @@ script_08011E1A:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
MessageNoOverlap 0x3104
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x04
WaitUntilTextboxCloses
CheckTextboxResult
JumpIf script_08011E66
@@ -51,9 +51,9 @@ script_08011E58:
FacePlayer
DoPostScriptAction 0x0000
script_08011E66:
MessageNoOverlap 0x3107
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x07
WaitUntilTextboxCloses
SetGlobalFlag 0x002d
SetGlobalFlag RENTED_HOUSE_FARORE
EnablePlayerControl
SetAnimationState 0x0004
DoPostScriptAction 0x0001
data/scripts/hyruleTown/script_Farore2.inc
+7 -7
View File
@@ -9,9 +9,9 @@ SCRIPT_START script_Farore2
script_08011FAE:
EndBlock
BeginBlock
CheckGlobalFlag 0x002e
CheckGlobalFlag NEW_HOUSE_DIN
JumpIf script_08011DF2
CheckGlobalFlag 0x002f
CheckGlobalFlag NEW_HOUSE_NAYRU
JumpIf script_08011DF2
CheckEntityInteractType
JumpIfNot script_08011FAE
@@ -19,13 +19,13 @@ script_08011FAE:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
CheckGlobalFlag 0x0048
CheckGlobalFlag GOMAN_NEW_HOUSE
JumpIf script_08011FE4
MessageNoOverlap 0x4523
MessageNoOverlap TEXT_HAPPY_HEARTH, 0x23
WaitUntilTextboxCloses
Jump script_08011FF0
script_08011FE4:
MessageNoOverlap 0x3110
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x10
WaitUntilTextboxCloses
CheckTextboxResult
JumpIf script_0801200C
@@ -41,9 +41,9 @@ script_08011FFE:
FacePlayer
DoPostScriptAction 0x0000
script_0801200C:
MessageNoOverlap 0x3113
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x13
WaitUntilTextboxCloses
SetGlobalFlag 0x0030
SetGlobalFlag NEW_HOUSE_FARORE
EnablePlayerControl
SetAnimationState 0x0004
DoPostScriptAction 0x0001
data/scripts/hyruleTown/script_FaroreAlone.inc
+1 -1
View File
@@ -12,7 +12,7 @@ script_0801224E:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
MessageNoOverlap 0x4526
MessageNoOverlap TEXT_HAPPY_HEARTH, 0x26
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimationState 0x0004
data/scripts/hyruleTown/script_FaroreMovedIn.inc
+5 -5
View File
@@ -14,24 +14,24 @@ script_08012152:
DoPostScriptAction 0x0000
CheckLocalFlag 0x0096
JumpIf script_08012176
MessageNoOverlap 0x311c
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1c
WaitUntilTextboxCloses
SetLocalFlag 0x0096
Jump script_080121B6
script_08012176:
CheckBottleContaining 0x0030
JumpIfNot script_08012188
MessageNoOverlap 0x311d
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1d
WaitUntilTextboxCloses
Jump script_080121B6
script_08012188:
MessageNoOverlap 0x311e
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1e
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_080121B6
CheckBottleContaining 0x0020
JumpIfNot script_080121B2
MessageNoOverlap 0x311f
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1f
WaitUntilTextboxCloses
GivePlayerItem 0x0030
WaitPlayerGetItem
@@ -48,7 +48,7 @@ script_08012188:
.endif
Jump script_080121B6
script_080121B2:
MessageNoOverlap 0x3121
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x21
script_080121B6:
WaitUntilTextboxCloses
EnablePlayerControl
data/scripts/hyruleTown/script_FirstHouseDoor.inc
+2 -2
View File
@@ -2,7 +2,7 @@
SCRIPT_START script_FirstHouseDoor
BeginBlock
DoPostScriptAction 0x0007
CheckKinstoneFused 0x001b
CheckKinstoneFused KINSTONE_1B
JumpIf script_0800EF92
EndBlock
script_0801091C:
@@ -13,7 +13,7 @@ script_0801091C:
Call sub_0807DF28
CheckRoomFlag 0x0001
JumpIf script_08010942
EzloMessage 0x0b62
EzloMessage TEXT_EZLO, 0x62
WaitUntilTextboxCloses
script_08010942:
StartPlayerScript script_PlayerAtInnDoor
data/scripts/hyruleTown/script_GoronMerchant.inc
+12 -12
View File
@@ -28,21 +28,21 @@ script_08010804:
SetPlayerIdle
Call sub_0807DF28
FacePlayer
CheckGlobalFlag 0x0042
CheckGlobalFlag GORON_KAKERA_L
JumpIfNot script_08010858
CheckGlobalFlag 0x0043
CheckGlobalFlag GORON_KAKERA_M
JumpIfNot script_08010858
CheckGlobalFlag 0x0044
CheckGlobalFlag GORON_KAKERA_R
JumpIfNot script_08010858
CheckGlobalFlag 0x0041
CheckGlobalFlag GORON_KAKERA_LV5
JumpIfNot script_08010850
MessageNoOverlap 0x3f39
MessageNoOverlap TEXT_TINGLE, 0x39
Jump script_080108BA
script_08010850:
MessageNoOverlap 0x2c1b
MessageNoOverlap TEXT_STOCKWELL, 0x1b
Jump script_080108BA
script_08010858:
MessageNoOverlap 0x2c1a
MessageNoOverlap TEXT_STOCKWELL, 0x1a
Jump script_080108BA
script_08010860:
EndBlock
@@ -58,13 +58,13 @@ script_08010860:
WaitPlayerGetItem
WaitUntilTextboxCloses
FaceAwayFromPlayer
CheckGlobalFlag 0x0042
CheckGlobalFlag GORON_KAKERA_L
JumpIfNot script_080108AA
CheckGlobalFlag 0x0043
CheckGlobalFlag GORON_KAKERA_M
JumpIfNot script_080108AA
CheckGlobalFlag 0x0044
CheckGlobalFlag GORON_KAKERA_R
JumpIfNot script_080108AA
MessageNoOverlap 0x2c21
MessageNoOverlap TEXT_STOCKWELL, 0x21
Jump script_080108B2
script_080108AA:
.ifdef USA
@@ -74,7 +74,7 @@ script_080108AA:
SetLocalFlag 0x00fa
.endif
.endif
MessageNoOverlap 0x2c20
MessageNoOverlap TEXT_STOCKWELL, 0x20
script_080108B2:
WaitUntilTextboxCloses
Call sub_0807F83C
data/scripts/hyruleTown/script_GuardEast.inc
+1 -1
View File
@@ -1,7 +1,7 @@
@ Hyrule Town Guard east
SCRIPT_START script_GuardEast
BeginBlock
CheckInventory1 0x0012
CheckInventory1 ITEM_PACCI_CANE
JumpIf script_0800FF6A
SetAnimationState 0x0006
_0807E9D4
data/scripts/hyruleTown/script_GuardNorth.inc
+1 -1
View File
@@ -1,7 +1,7 @@
@ Hyrule Town Guard north
SCRIPT_START script_GuardNorth
BeginBlock
CheckInventory1 0x0012
CheckInventory1 ITEM_PACCI_CANE
JumpIf script_0800FF0E
SetAnimationState 0x0006
_0807E9D4
data/scripts/hyruleTown/script_GuardWest.inc
+12 -80
View File
@@ -5,51 +5,19 @@ SCRIPT_START script_GuardWest
_0807E9D4
CallWithArg sub_0807F3D8, 0x00000008
Call sub_080644A4
.ifdef JP
ClearLocalFlag 0x00c4
.else
.ifdef DEMO_JP
ClearLocalFlag 0x00c4 @ TODO deduplicate
.else
.ifndef EU
ClearLocalFlag 0x00c7
.endif
.endif
ClearLocalFlag MACHI_02_HEISHI_TALK
.endif
EndBlock
script_0800FF92:
EndBlock
BeginBlock
DoPostScriptAction 0x000a
.ifdef JP
CheckLocalFlag 0x00cb
.else
.ifdef EU
CheckLocalFlag 0x00cb
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00cb @ TODO deduplicate
.else
CheckLocalFlag 0x00ce
.endif
.endif
.endif
CheckLocalFlag MACHI_02_HEISHI
JumpIf script_0800FFCC
DoPostScriptAction 0x000b
Call sub_08064198
.ifdef JP
CheckLocalFlag 0x00c4
.else
.ifdef EU
CheckLocalFlag 0x00c4
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00c4 @ TODO deduplicate
.else
CheckLocalFlag 0x00c7
.endif
.endif
.endif
CheckLocalFlag MACHI_02_HEISHI_TALK
JumpIfNot script_0800FFCC
Call sub_08064488
CheckPlayerInRegion2 0x4040
@@ -60,47 +28,23 @@ script_0800FFCC:
CheckEntityInteractType
JumpIfNot script_0800FF92
EndBlock
.ifdef JP
SetLocalFlag 0x00c4
.else
.ifdef EU
SetLocalFlag 0x00c4
.else
.ifdef DEMO_JP
SetLocalFlag 0x00c4 @ TODO deduplicate
.else
SetLocalFlag 0x00c7
.endif
.endif
.endif
SetLocalFlag MACHI_02_HEISHI_TALK
SetPlayerIdle
FacePlayer
CallWithArg sub_0807F3D8, 0x00000008
CheckInventory1 0x0048
CheckInventory1 ITEM_SKILL_SPIN_ATTACK
JumpIf script_0800FFF8
MessageNoOverlap 0x3401
MessageNoOverlap TEXT_TOWN, 0x01
WaitUntilTextboxCloses
Jump script_08010060
script_0800FFF8:
.ifdef JP
CheckLocalFlag 0x00cb
.else
.ifdef EU
CheckLocalFlag 0x00cb
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00cb @ TODO deduplicate
.else
CheckLocalFlag 0x00ce
.endif
.endif
.endif
CheckLocalFlag MACHI_02_HEISHI
JumpIfNot script_0801000A
MessageNoOverlap 0x340b
MessageNoOverlap TEXT_TOWN, 0x0b
WaitUntilTextboxCloses
Jump script_08010060
script_0801000A:
MessageNoOverlap 0x3402
MessageNoOverlap TEXT_TOWN, 0x02
WaitUntilTextboxCloses
Jump script_08010060
script_08010014:
@@ -111,7 +55,7 @@ script_08010014:
FacePlayer
CallWithArg sub_0807F3D8, 0x00000008
PlaySound SFX_TASK_COMPLETE
MessageNoOverlap 0x340a
MessageNoOverlap TEXT_TOWN, 0x0a
WaitUntilTextboxCloses
SetAnimationState 0x0004
CallWithArg sub_0807F3D8, 0x0000000c
@@ -119,19 +63,7 @@ script_08010014:
_0807EDD4 0x0018, 0x0108
SetAnimationState 0x0002
CallWithArg sub_0807F3D8, 0x00000008
.ifdef JP
SetLocalFlag 0x00cb
.else
.ifdef EU
SetLocalFlag 0x00cb
.else
.ifdef DEMO_JP
SetLocalFlag 0x00cb @ TODO deduplicate
.else
SetLocalFlag 0x00ce
.endif
.endif
.endif
SetLocalFlag MACHI_02_HEISHI
script_08010060:
Call sub_080644A4
CallWithArg sub_0807F5B0, 0x0000000a
@@ -150,7 +82,7 @@ script_08010090:
SetPlayerIdle
FacePlayer
CallWithArg sub_080672B0, 0x00000004
MessageFromTarget 0x0a01
MessageFromTarget TEXT_EMPTY, 0x01
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
data/scripts/hyruleTown/script_InnDoor.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SCRIPT_START script_InnDoor
WaitForSyncFlagAndClear 0x00000001
CheckRoomFlag 0x0001
JumpIf script_08010900
EzloMessage 0x0b63
EzloMessage TEXT_EZLO, 0x63
WaitUntilTextboxCloses
script_08010900:
Call sub_0807DF50
data/scripts/hyruleTown/script_Librari.inc
+3 -3
View File
@@ -19,11 +19,11 @@ script_0800E974:
StartPlayerScript script_PlayerStepOnTrap
WaitForSyncFlagAndClear 0x00000001
DoPostScriptAction 0x000a
MessageFromTarget 0x4a24
MessageFromTarget TEXT_TOWN_MINISH1, 0x24
WaitUntilTextboxCloses
SetAnimation 0x000a
Wait 0x0014
MessageFromTarget 0x4a25
MessageFromTarget TEXT_TOWN_MINISH1, 0x25
WaitUntilTextboxCloses
SetAnimation 0x0000
StartPlayerScript script_PlayerActivatedTrapCard
@@ -31,7 +31,7 @@ script_0800E974:
SetLocalFlag 0x0074
PlaySound SFX_SECRET
Wait 0x00f0
MessageFromTarget 0x4a26
MessageFromTarget TEXT_TOWN_MINISH1, 0x26
WaitUntilTextboxCloses
SetLocalFlag 0x0075
script_0800E9E4:
data/scripts/hyruleTown/script_LibrarianLeft.inc
+1 -1
View File
@@ -11,7 +11,7 @@ script_08008BA2:
SetPlayerIdle
SetAnimation 0x0004
Call WaitForAnimDone
MessageFromTarget 0x4912
MessageFromTarget TEXT_LIBRARY, 0x12
WaitUntilTextboxCloses
SetAnimation 0x0008
EnablePlayerControl
data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc
+4 -4
View File
@@ -6,14 +6,14 @@ SCRIPT_START script_LibrarianLeftWithQuest
DoPostScriptAction 0x000a
SetAnimation 0x0000
.ifdef EU
SetGlobalFlag 0x0061
SetGlobalFlag MIZUKAKI_NECHAN
.endif
EndBlock
script_08008BD2:
TriggerInteract
SetPlayerIdle
.ifndef EU
SetGlobalFlag 0x0061
SetGlobalFlag MIZUKAKI_NECHAN
.endif
SetAnimation 0x0004
Call WaitForAnimDone
@@ -26,7 +26,7 @@ script_08008BD2:
CallWithArg sub_0806BB1C, 0x00000001
Call sub_0806BB7C
JumpIfNot script_08008C5C
MessageNoOverlap 0x490c
MessageNoOverlap TEXT_LIBRARY, 0x0c
WaitUntilTextboxCloses
LoadRoomEntityList gUnk_080D6784
WaitForSyncFlag 0x00000001
@@ -35,7 +35,7 @@ script_08008BD2:
PlaySound SFX_SECRET
SetAnimation 0x0004
Call WaitForAnimDone
MessageNoOverlap 0x4913
MessageNoOverlap TEXT_LIBRARY, 0x13
WaitUntilTextboxCloses
SetAnimation 0x0008
Call WaitForAnimDone
data/scripts/hyruleTown/script_MalonHyruleTown.inc
+4 -4
View File
@@ -15,7 +15,7 @@ script_08014F4A:
FacePlayer
DoPostScriptAction 0x0000
BeginBlock
MessageNoOverlap 0x3b0b
MessageNoOverlap TEXT_MILK, 0x0b
CallWithArg sub_0807F854, 0x00010064
EndBlock
WaitUntilTextboxCloses
@@ -28,13 +28,13 @@ script_08014F4A:
ModRupees 0xff9c
GivePlayerItem 0x0022
WaitPlayerGetItem
MessageNoOverlap 0x3b11
MessageNoOverlap TEXT_MILK, 0x11
Jump script_08014FA6
script_08014F9A:
MessageNoOverlap 0x3b0e
MessageNoOverlap TEXT_MILK, 0x0e
Jump script_08014FA6
script_08014FA2:
MessageNoOverlap 0x3b0f
MessageNoOverlap TEXT_MILK, 0x0f
script_08014FA6:
WaitUntilTextboxCloses
Call sub_0807DF50
data/scripts/hyruleTown/script_Marcy.inc
+2 -2
View File
@@ -20,12 +20,12 @@ script_08010746:
JumpIfNot script_08010786
HasRupees 0x00c8
JumpIf script_08010778
MessageNoOverlap 0x4008
MessageNoOverlap TEXT_POST, 0x08
Jump script_08010786
script_08010778:
ModRupees 0xff38
Call sub_08062E14
MessageNoOverlap 0x4007
MessageNoOverlap TEXT_POST, 0x07
script_08010786:
EndBlock
WaitUntilTextboxCloses
data/scripts/hyruleTown/script_Nayru.inc
+7 -7
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_Nayru
SetAnimationState 0x0004
DoPostScriptAction 0x0001
DoPostScriptAction 0x000a
CheckGlobalFlag 0x0047
CheckGlobalFlag GOMAN_RENTED_HOUSE
JumpIf script_08011D6E
EndBlock
script_08011D46:
@@ -17,7 +17,7 @@ script_08011D46:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
MessageNoOverlap 0x4513
MessageNoOverlap TEXT_HAPPY_HEARTH, 0x13
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimationState 0x0004
@@ -26,9 +26,9 @@ script_08011D46:
script_08011D6E:
EndBlock
BeginBlock
CheckGlobalFlag 0x002b
CheckGlobalFlag RENTED_HOUSE_DIN
JumpIf script_08011D46
CheckGlobalFlag 0x002d
CheckGlobalFlag RENTED_HOUSE_FARORE
JumpIf script_08011D46
CheckEntityInteractType
JumpIfNot script_08011D6E
@@ -36,7 +36,7 @@ script_08011D6E:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
MessageNoOverlap 0x3103
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x03
WaitUntilTextboxCloses
CheckTextboxResult
JumpIf script_08011DBA
@@ -51,9 +51,9 @@ script_08011DAC:
FacePlayer
DoPostScriptAction 0x0000
script_08011DBA:
MessageNoOverlap 0x3106
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x06
WaitUntilTextboxCloses
SetGlobalFlag 0x002c
SetGlobalFlag RENTED_HOUSE_NAYRU
EnablePlayerControl
SetAnimationState 0x0004
DoPostScriptAction 0x0001
data/scripts/hyruleTown/script_Nayru2.inc
+7 -7
View File
@@ -9,9 +9,9 @@ SCRIPT_START script_Nayru2
script_08011F22:
EndBlock
BeginBlock
CheckGlobalFlag 0x002e
CheckGlobalFlag NEW_HOUSE_DIN
JumpIf script_08011D46
CheckGlobalFlag 0x0030
CheckGlobalFlag NEW_HOUSE_FARORE
JumpIf script_08011D46
CheckEntityInteractType
JumpIfNot script_08011F22
@@ -19,13 +19,13 @@ script_08011F22:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
CheckGlobalFlag 0x0048
CheckGlobalFlag GOMAN_NEW_HOUSE
JumpIf script_08011F58
MessageNoOverlap 0x4522
MessageNoOverlap TEXT_HAPPY_HEARTH, 0x22
WaitUntilTextboxCloses
Jump script_08011F64
script_08011F58:
MessageNoOverlap 0x310f
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x0f
WaitUntilTextboxCloses
CheckTextboxResult
JumpIf script_08011F80
@@ -41,9 +41,9 @@ script_08011F72:
FacePlayer
DoPostScriptAction 0x0000
script_08011F80:
MessageNoOverlap 0x3112
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x12
WaitUntilTextboxCloses
SetGlobalFlag 0x002f
SetGlobalFlag NEW_HOUSE_NAYRU
EnablePlayerControl
SetAnimationState 0x0004
DoPostScriptAction 0x0001
data/scripts/hyruleTown/script_NayruAlone.inc
+1 -1
View File
@@ -12,7 +12,7 @@ script_08012216:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
MessageNoOverlap 0x4525
MessageNoOverlap TEXT_HAPPY_HEARTH, 0x25
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimationState 0x0004
data/scripts/hyruleTown/script_NayruMovedIn.inc
+5 -5
View File
@@ -14,24 +14,24 @@ script_080120C6:
DoPostScriptAction 0x0000
CheckLocalFlag 0x0095
JumpIf script_080120EA
MessageNoOverlap 0x3116
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x16
WaitUntilTextboxCloses
SetLocalFlag 0x0095
Jump script_0801212A
script_080120EA:
CheckBottleContaining 0x002f
JumpIfNot script_080120FC
MessageNoOverlap 0x3117
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x17
WaitUntilTextboxCloses
Jump script_0801212A
script_080120FC:
MessageNoOverlap 0x3118
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x18
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_0801212A
CheckBottleContaining 0x0020
JumpIfNot script_08012126
MessageNoOverlap 0x3119
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x19
WaitUntilTextboxCloses
GivePlayerItem 0x002f
WaitPlayerGetItem
@@ -48,7 +48,7 @@ script_080120FC:
.endif
Jump script_0801212A
script_08012126:
MessageNoOverlap 0x311b
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1b
script_0801212A:
WaitUntilTextboxCloses
EnablePlayerControl
data/scripts/hyruleTown/script_Object6ACarlov.inc
+1 -1
View File
@@ -18,7 +18,7 @@ script_080145C2:
Wait 0x000c
FaceAwayFromPlayer
.endif
MessageFromTargetPos 0x432e, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x2e, 0x000c
WaitUntilTextboxCloses
.ifdef EU
Wait 0x0018
data/scripts/hyruleTown/script_Object6ACarlov2.inc
+1 -1
View File
@@ -17,7 +17,7 @@ script_080145F8:
Wait 0x0018
_0807E8E4_3
SetAnimationState 0x0002
MessageFromTargetPos 0x432b, 0x000c
MessageFromTargetPos TEXT_CARLOV, 0x2b, 0x000c
WaitUntilTextboxCloses
Wait 0x0018
EnablePlayerControl
data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc
+1 -1
View File
@@ -8,7 +8,7 @@ script_0801454C:
CheckRoomFlag 0x0000
JumpIfNot script_0801454C
SetPlayerIdle
EzloMessage 0x4217
EzloMessage TEXT_BURLOV, 0x17
WaitUntilTextboxCloses
StartPlayerScript script_PlayerWhenLeavingCarlovAlreadyPaid
Wait 0x0010
data/scripts/hyruleTown/script_Phonograph.inc
+1 -1
View File
@@ -8,7 +8,7 @@ script_0800BA46:
JumpIfNot script_0800BA46
SetPlayerIdle
Call sub_0807DF28
MessageFromTarget 0x3301
MessageFromTarget TEXT_PHONOGRAPH, 0x01
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_0800BA6C
data/scripts/hyruleTown/script_PhonographDoor.inc
+2 -14
View File
@@ -2,19 +2,7 @@
SCRIPT_START script_PhonographDoor
BeginBlock
EndBlock
.ifdef JP
CheckLocalFlag 0x00ce
.else
.ifdef EU
CheckLocalFlag 0x00ce
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00ce @ TODO deduplicate
.else
CheckLocalFlag 0x00d1
.endif
.endif
.endif
CheckLocalFlag SHOP05_OPEN
JumpIf script_080109EA
CheckPlayerInRegion2 0x0808
JumpIfNot script_PhonographDoor
@@ -26,7 +14,7 @@ SCRIPT_START script_PhonographDoor
WaitForSyncFlagAndClear 0x00000001
CheckRoomFlag 0x0001
JumpIf script_080109DE
EzloMessage 0x0b64
EzloMessage TEXT_EZLO, 0x64
WaitUntilTextboxCloses
script_080109DE:
Call sub_0807DF50
data/scripts/hyruleTown/script_Pita.inc
+3 -3
View File
@@ -15,7 +15,7 @@ script_080106BE:
DoPostScriptAction 0x0000
HasRoomItemForSale
JumpIf script_080106E0
MessageNoOverlap 0x3c07
MessageNoOverlap TEXT_BAKERY, 0x07
Jump script_08010726
script_080106E0:
Call RemoveAllBakedGoods
@@ -26,14 +26,14 @@ script_080106E0:
WaitUntilTextboxCloses
BuyItem 0x0000, 0x0000
JumpIf script_0801070C
MessageNoOverlap 0x3c04
MessageNoOverlap TEXT_BAKERY, 0x04
Jump script_08010726
script_0801070C:
WaitPlayerGetItem
ModHealth 0x0008
Call sub_08062EDC
JumpIf script_08010724
MessageNoOverlap 0x3c06
MessageNoOverlap TEXT_BAKERY, 0x06
Jump script_08010726
script_08010724:
WaitPlayerGetItem
data/scripts/hyruleTown/script_Postman.inc
+1 -1
View File
@@ -1,7 +1,7 @@
@ Hyrule Town Postman
SCRIPT_START script_Postman
BeginBlock
CheckInventory1 0x0067
CheckInventory1 ITEM_KINSTONE_BAG
JumpIfNot script_08010B62
SetAnimationState 0x0004
DoPostScriptAction 0x0000
data/scripts/hyruleTown/script_Rem.inc
+4 -4
View File
@@ -4,11 +4,11 @@ SCRIPT_START script_Rem
CallWithArg sub_0806A93C, 0x12345678
SetAnimationState 0x0004
SetAnimation 0x0002
CheckInventory1 0x0015
CheckInventory1 ITEM_PEGASUS_BOOTS
JumpIf script_080130B6
CheckLocalFlag 0x0060
JumpIf script_08012FD2
CheckGlobalFlag 0x001e
CheckGlobalFlag DASHBOOTS
JumpIf script_RemFallingAsleep
EndBlock
CheckLocalFlag 0x0062
@@ -21,7 +21,7 @@ script_08012F50:
Call sub_0806A96C
JumpIfNot script_08012F50
SetPlayerIdle
MessageNoOverlap 0x4401
MessageNoOverlap TEXT_REM, 0x01
WaitUntilTextboxCloses
SetLocalFlag 0x0061
EnablePlayerControl
@@ -29,7 +29,7 @@ script_08012F50:
script_08012F6C:
Call sub_0806A96C
JumpIfNot script_08012F6C
MessageNoOverlap 0x4402
MessageNoOverlap TEXT_REM, 0x02
WaitUntilTextboxCloses
SetAction 0x0001
Jump script_08012F6C
data/scripts/hyruleTown/script_RemFallingAsleep.inc
+8 -8
View File
@@ -25,11 +25,11 @@ script_08012FD2:
CallWithArg sub_0807F93C, 0x0000f2f4
Call sub_0806AA10
EndBlock
CheckInventory1 0x0038
CheckInventory1 ITEM_QST_MUSHROOM
JumpIf script_08013006
script_08012FFA:
TriggerInteract
MessageNoOverlap 0x4403
MessageNoOverlap TEXT_REM, 0x03
WaitUntilTextboxCloses
Jump script_08012FFA
script_08013006:
@@ -48,24 +48,24 @@ script_08013006:
Wait 0x003c
DoPostScriptAction 0x0004
Wait 0x003c
MessageNoOverlap 0x4404
MessageNoOverlap TEXT_REM, 0x04
WaitUntilTextboxCloses
Wait 0x001e
DoPostScriptAction 0x0004
Wait 0x003c
MessageNoOverlap 0x440e
MessageNoOverlap TEXT_REM, 0x0e
WaitUntilTextboxCloses
Wait 0x001e
Call sub_0806A9E8
SetAnimation 0x000f
Wait 0x00f0
MessageNoOverlap 0x4405
MessageNoOverlap TEXT_REM, 0x05
WaitUntilTextboxCloses
SetSyncFlag 0x00000200
GivePlayerItem 0x0015
WaitPlayerGetItem
FaceAwayFromPlayer
MessageNoOverlap 0x4406
MessageNoOverlap TEXT_REM, 0x06
WaitUntilTextboxCloses
SetAction 0x0001
Call sub_0807DF50
@@ -73,13 +73,13 @@ script_08013006:
script_0801308A:
Call sub_0806A96C
JumpIfNot script_0801308A
MessageNoOverlap 0x4407
MessageNoOverlap TEXT_REM, 0x07
WaitUntilTextboxCloses
SetAction 0x0001
script_0801309E:
Call sub_0806A96C
JumpIfNot script_0801309E
MessageNoOverlap 0x440d
MessageNoOverlap TEXT_REM, 0x0d
WaitUntilTextboxCloses
SetAction 0x0001
Jump script_0801308A
data/scripts/hyruleTown/script_RentRegularRoom.inc
+2 -2
View File
@@ -1,7 +1,7 @@
@ Hyrule Town Inn Emma after renting regular room
SCRIPT_START script_RentRegularRoom
BeginBlock
MessageFromTarget 0x4504
MessageFromTarget TEXT_HAPPY_HEARTH, 0x04
CallWithArg sub_0807F854, 0x000100c8
EndBlock
WaitUntilTextboxCloses
@@ -9,7 +9,7 @@ SCRIPT_START script_RentRegularRoom
JumpIfNot script_EmmaNotEnoughRupees
ModRupees 0xff38
SetLocalFlag 0x0091
MessageFromTarget 0x4508
MessageFromTarget TEXT_HAPPY_HEARTH, 0x08
WaitUntilTextboxCloses
Call sub_0806C588
SCRIPT_END
data/scripts/hyruleTown/script_RentSmallRoom.inc
+2 -2
View File
@@ -1,7 +1,7 @@
@ Hyrule Town Inn Emma after renting small room
SCRIPT_START script_RentSmallRoom
BeginBlock
MessageFromTarget 0x4503
MessageFromTarget TEXT_HAPPY_HEARTH, 0x03
CallWithArg sub_0807F854, 0x00010032
EndBlock
WaitUntilTextboxCloses
@@ -9,7 +9,7 @@ SCRIPT_START script_RentSmallRoom
JumpIfNot script_EmmaNotEnoughRupees
ModRupees 0xffce
SetLocalFlag 0x0091
MessageFromTarget 0x4508
MessageFromTarget TEXT_HAPPY_HEARTH, 0x08
WaitUntilTextboxCloses
Call sub_0806C598
SCRIPT_END
data/scripts/hyruleTown/script_Simon.inc
+6 -6
View File
@@ -6,17 +6,17 @@ SCRIPT_START script_Simon
SetAnimationState 0x0004
DoPostScriptAction 0x0000
EndBlock
CheckGlobalFlag 0x0050
CheckGlobalFlag MAROYA_WAKEUP
JumpIfNot script_08011B84
WaitForSyncFlagAndClear 0x00000004
SetAnimationState 0x0006
DoPostScriptAction 0x0004
Wait 0x003c
FaceAwayFromPlayer
MessageNoOverlap 0x3d07
MessageNoOverlap TEXT_SIMON, 0x07
WaitUntilTextboxCloses
SetAnimationState 0x0004
ClearGlobalFlag 0x0050
ClearGlobalFlag MAROYA_WAKEUP
Call sub_0807DF50
EnablePlayerControl
script_08011B84:
@@ -24,7 +24,7 @@ script_08011B84:
JumpIfNot script_08011B84
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x3d01
MessageNoOverlap TEXT_SIMON, 0x01
WaitUntilTextboxCloses
CheckTextboxResult
JumpIf script_08011BA4
@@ -37,12 +37,12 @@ script_08011BA4:
JumpIf script_08011BBC
DoPostScriptAction 0x0004
Wait 0x003c
MessageNoOverlap 0x3d05
MessageNoOverlap TEXT_SIMON, 0x05
Jump script_08011B9A
script_08011BBC:
ModRupees 0xfff6
Wait 0x001e
MessageNoOverlap 0x3d06
MessageNoOverlap TEXT_SIMON, 0x06
WaitUntilTextboxCloses
CallWithArg sub_0806C2A0, 0x00000000
WaitForFadeFinish
data/scripts/hyruleTown/script_SimonsDoor.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SCRIPT_START script_SimonsDoor
WaitForSyncFlagAndClear 0x00000001
CheckRoomFlag 0x0001
JumpIf script_08010994
EzloMessage 0x0b63
EzloMessage TEXT_EZLO, 0x63
WaitUntilTextboxCloses
script_08010994:
Call sub_0807DF50
data/scripts/hyruleTown/script_Stockwell.inc
+2 -2
View File
@@ -30,7 +30,7 @@ script_080142C4:
Wait 0x000a
SetAnimation 0x0002
Wait 0x001e
MessageNoOverlap 0x2c12
MessageNoOverlap TEXT_STOCKWELL, 0x12
WaitUntilTextboxCloses
Wait 0x0014
SetAnimation 0x0004
@@ -54,7 +54,7 @@ script_08014330:
Wait 0x001e
SetAnimation 0x0001
Wait 0x001e
MessageNoOverlap 0x2c13
MessageNoOverlap TEXT_STOCKWELL, 0x13
WaitUntilTextboxCloses
Wait 0x0014
SetAnimation 0x0004
data/scripts/hyruleTown/script_StockwellDogFood.inc
+4 -4
View File
@@ -7,7 +7,7 @@ SCRIPT_START script_StockwellDogFood
SetAnimation 0x0001
Call sub_080654EC
Wait 0x003c
MessageNoOverlap 0x2c16
MessageNoOverlap TEXT_STOCKWELL, 0x16
WaitUntilTextboxCloses
CheckTextboxResult
JumpIf script_080143FA
@@ -17,21 +17,21 @@ SCRIPT_START script_StockwellDogFood
script_080143FA:
Call sub_080654EC
Wait 0x001e
MessageNoOverlap 0x2c18
MessageNoOverlap TEXT_STOCKWELL, 0x18
WaitUntilTextboxCloses
Wait 0x000a
SetIntVariable 0x00000000
Call sub_08065528
GivePlayerItem 0x0036
WaitPlayerGetItem
MessageNoOverlap 0x2c19
MessageNoOverlap TEXT_STOCKWELL, 0x19
WaitUntilTextboxCloses
SetIntVariable 0x00000303
Call LoadMenu
.ifndef EU
Wait 0x001e
FaceAwayFromPlayer
MessageNoOverlap 0x2c22
MessageNoOverlap TEXT_STOCKWELL, 0x22
WaitUntilTextboxCloses
.endif
script_0801443E:
data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SCRIPT_START script_SturgeonAllBooksCollected
PlaySound SFX_STAIRS
EndBlock
WaitForSyncFlag 0x00000002
MessageNoOverlap 0x490d
MessageNoOverlap TEXT_LIBRARY, 0x0d
WaitUntilTextboxCloses
DoPostScriptAction 0x0007
Call sub_08064D08
data/scripts/hyruleTown/script_TownMinish3.inc
+3 -3
View File
@@ -4,9 +4,9 @@ SCRIPT_START script_TownMinish3
_0807E9D4
DoPostScriptAction 0x000a
SetEntitySpeed 0x0200
CheckGlobalFlag 0x0029
CheckGlobalFlag MIZUKAKI_START
JumpIfNot script_0800E77C
CheckGlobalFlag 0x002a
CheckGlobalFlag MIZUKAKI_HARIFALL
JumpIfNot script_0800E786
script_0800E77C:
SetEntityPositionRelative 0x0188, 0x0098
@@ -15,7 +15,7 @@ script_0800E786:
EndBlock
script_0800E788:
BeginBlock
CheckGlobalFlag 0x002a
CheckGlobalFlag MIZUKAKI_HARIFALL
JumpIf script_0800E7BA
CheckEntityInteractType
JumpIf script_0800E7A4
data/scripts/hyruleTown/script_TownMinish4.inc
+4 -4
View File
@@ -20,13 +20,13 @@ script_0800EDB6:
JumpIf script_0800EE3E
Wait 0x000a
SetSyncFlag 0x00000001
MessageFromTarget 0x4c07
MessageFromTarget TEXT_HAGEN, 0x07
WaitUntilTextboxCloses
SetSyncFlag 0x00000010
MessageFromTarget 0x4c08
MessageFromTarget TEXT_HAGEN, 0x08
WaitUntilTextboxCloses
SetSyncFlag 0x00000020
MessageFromTarget 0x4c09
MessageFromTarget TEXT_HAGEN, 0x09
WaitUntilTextboxCloses
SetIntVariable 0x00000503
Call LoadMenu
@@ -45,7 +45,7 @@ script_0800EE12:
WaitForSyncFlagAndClear 0x00000008
Jump script_0800ED98
script_0800EE3E:
MessageFromTarget 0x4c16
MessageFromTarget TEXT_HAGEN, 0x16
WaitUntilTextboxCloses
Call sub_0807DF50
EnablePlayerControl
data/scripts/hyruleTown/script_TownMinish5.inc
+7 -7
View File
@@ -20,13 +20,13 @@ script_0800EE76:
JumpIf script_0800EEFE
Wait 0x000a
SetSyncFlag 0x00000001
MessageFromTarget 0x4c07
MessageFromTarget TEXT_HAGEN, 0x07
WaitUntilTextboxCloses
SetSyncFlag 0x00000002
MessageFromTarget 0x4c08
MessageFromTarget TEXT_HAGEN, 0x08
WaitUntilTextboxCloses
SetSyncFlag 0x00000004
MessageFromTarget 0x4c09
MessageFromTarget TEXT_HAGEN, 0x09
WaitUntilTextboxCloses
SetIntVariable 0x00000503
Call LoadMenu
@@ -45,19 +45,19 @@ script_0800EED2:
WaitForSyncFlagAndClear 0x00000040
Jump script_0800EE58
script_0800EEFE:
MessageFromTarget 0x4c15
MessageFromTarget TEXT_HAGEN, 0x15
WaitUntilTextboxCloses
Call sub_0807DF50
EnablePlayerControl
Jump script_0800EE58
MessageFromTarget 0x4c07
MessageFromTarget TEXT_HAGEN, 0x07
WaitUntilTextboxCloses
SetSyncFlag 0x00000012
Wait 0x000a
MessageFromTarget 0x4c08
MessageFromTarget TEXT_HAGEN, 0x08
WaitUntilTextboxCloses
SetSyncFlag 0x00000024
MessageFromTarget 0x4c09
MessageFromTarget TEXT_HAGEN, 0x09
WaitUntilTextboxCloses
SetSyncFlag 0x00000048
Call SetPlayerActionNormal
data/scripts/hyruleTown/script_Wheaton.inc
+1 -1
View File
@@ -13,7 +13,7 @@ script_08010686:
FacePlayer
HasRoomItemForSale
Call GetConditionSet
MessageFromTargetTable 0x3c08, 0x3c09
MessageFromTargetTable TEXT_BAKERY << 8 | 0x08, TEXT_BAKERY << 8 | 0x09
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimationState 0x0004