Add JP variant

This commit is contained in:
octorock
2021-06-17 20:35:06 +02:00
parent b0510402ab
commit 57ab4df1a0
90 changed files with 3002 additions and 22 deletions
+13
View File
@@ -1,5 +1,9 @@
SCRIPT_START script_0800939A
.ifdef JP
CheckLocalFlag 0x00ac
.else
CheckLocalFlag 0x00ae
.endif
JumpIf script_0800943E
CheckInventory1 0x000d
JumpIf script_080093BC
@@ -18,7 +22,11 @@ script_080093BC:
Jump script_08009376
script_080093DA:
SetIntVariable 0x00001d05
.ifdef JP
CheckLocalFlag 0x00ab
.else
CheckLocalFlag 0x00ad
.endif
JumpIf script_080093EE
SetIntVariable 0x00001d04
script_080093EE:
@@ -35,8 +43,13 @@ script_080093EE:
Wait 0x00b4
Call sub_0806D70C
Wait 0x0078
.ifdef JP
SetLocalFlag 0x00ac
SetLocalFlag 0x00ab
.else
SetLocalFlag 0x00ae
SetLocalFlag 0x00ad
.endif
Call sub_0806D5D4
_0807EB8C
TextboxNoOverlap 0x1d09
+4
View File
@@ -5,7 +5,11 @@ SCRIPT_START script_08009464
Wait 0x003c
Call sub_0806D70C
Wait 0x003c
.ifdef JP
ClearLocalFlag 0x00ac
.else
ClearLocalFlag 0x00ae
.endif
Call sub_0806D620
Wait 0x003c
WaitPlayerAction8
+9 -1
View File
@@ -7,9 +7,17 @@ script_080098D8:
script_080098E0:
CheckInventory1 0x003c
JumpIfNot script_080098E0
CheckLocalFlag 0x005d
.ifdef JP
CheckLocalFlag 0x5b
.else
CheckLocalFlag 0x5d
.endif
JumpIf script_08009910
.ifdef JP
SetLocalFlag 0x005b
.else
SetLocalFlag 0x005d
.endif
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
+4
View File
@@ -2,7 +2,11 @@ SCRIPT_START script_08009E88
BeginBlock
Call sub_0807DF28
_0807E864
.ifdef JP
SetLocalFlag 0x009e
.else
SetLocalFlag 0x009f
.endif
EndBlock
Wait 0x003c
_0807E778 0x0004
+8
View File
@@ -1,7 +1,11 @@
SCRIPT_START script_0800B200
BeginBlock
_0807E5F8 0x00000000
.ifdef JP
CheckLocalFlag 0x001e
.else
CheckLocalFlag 0x001d
.endif
JumpIf script_0800B252
SetEntitySpeed 0x00c0
EndBlock
@@ -18,7 +22,11 @@ script_0800B216:
CameraTargetPlayer
Wait 0x0008
_0807E878
.ifdef JP
CheckLocalFlag 0x001e
.else
CheckLocalFlag 0x001d
.endif
JumpIfNot script_0800B216
script_0800B252:
SCRIPT_END
+8
View File
@@ -1,6 +1,10 @@
SCRIPT_START script_0800B308
BeginBlock
.ifdef JP
CheckLocalFlag 0x001e
.else
CheckLocalFlag 0x001d
.endif
JumpIf script_0800B39C
DoPostScriptAction 0x0001
SetEntitySpeed 0x0040
@@ -36,7 +40,11 @@ script_0800B350:
CheckKinstoneFused 0x0008
JumpIfNot script_0800B350
EndBlock
.ifdef JP
SetLocalFlag 0x001e
.else
SetLocalFlag 0x001d
.endif
PlaySound SFX_SECRET
script_0800B39C:
DoPostScriptAction 0x0006
+8
View File
@@ -1,11 +1,19 @@
SCRIPT_START script_0800D6D0
BeginBlock
.ifdef JP
CheckLocalFlag 0x00f0
.else
CheckLocalFlag 0x00f3
.endif
JumpIf script_0800D6E8
DoPostScriptAction 0x0008
EndBlock
script_0800D6E0:
.ifdef JP
CheckLocalFlag 0x00f0
.else
CheckLocalFlag 0x00f3
.endif
JumpIfNot script_0800D6E0
script_0800D6E8:
DoPostScriptAction 0x0007
+8
View File
@@ -1,11 +1,19 @@
SCRIPT_START script_0800D6F0
BeginBlock
.ifdef JP
CheckLocalFlag 0x00f2
.else
CheckLocalFlag 0x00f5
.endif
JumpIf script_0800D6E8
DoPostScriptAction 0x0008
EndBlock
script_0800D700:
.ifdef JP
CheckLocalFlag 0x00f2
.else
CheckLocalFlag 0x00f5
.endif
JumpIfNot script_0800D700
DoPostScriptAction 0x0007
SCRIPT_END
+11 -1
View File
@@ -301,10 +301,17 @@ SCRIPT_START script_0800E4A4
CheckLocalFlag 0x007c
JumpIf script_0800E4FA
script_0800E4B6:
.ifdef JP
CheckPlayerInRegion 0x0088, 0x0100, 0x0820
.else
CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
.endif
JumpIfNot script_0800E4B6
BeginBlock
_0807E864
_0807E864
.ifdef JP
Call sub_0805E544
.endif
EndBlock
Call sub_0807F3F8
Wait 0x003c
@@ -320,6 +327,9 @@ script_0800E4B6:
BeginBlock
PlayBgm BGM_FIGHT_THEME2
SetLocalFlag 0x007c
.ifdef JP
Call UnfreezeTime
.endif
script_0800E4FA:
_0807E878
DoPostScriptAction 0x0006
+10
View File
@@ -105,6 +105,8 @@ script_0800F662:
DoPostScriptAction 0x0000
Jump script_0800F662
.2byte 0x0000
SCRIPT_START script_0800F688
BeginBlock
_0807EB44 0x0004
@@ -119,7 +121,11 @@ script_0800F6A0:
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000004
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800F6C4
TextboxNoOverlap 0x2512
Jump script_0800F6C8
@@ -140,7 +146,11 @@ SCRIPT_START script_0800F6E0
Call sub_08062788
EndBlock
script_0800F6F4:
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800F718
CheckEntityInteractType
JumpIfNot script_0800F6F4
+14
View File
@@ -3,12 +3,22 @@ SCRIPT_START script_0800F724
DoPostScriptAction 0x0008
EndBlock
script_0800F72C:
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIfNot script_0800F72C
DoPostScriptAction 0x0007
Jump script_0800F584
SCRIPT_START script_0800F73C
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800FA4C
_0807E864
Call sub_0807DF28
@@ -168,7 +178,11 @@ SCRIPT_START script_0800F73C
Wait 0x000a
_0807E5F8 0x00000002
Call sub_08063C44
.ifdef JP
SetLocalFlag 0x00ca
.else
SetLocalFlag 0x00cd
.endif
Call sub_0807DF50
_0807E878
script_0800FA4C:
+8
View File
@@ -1,11 +1,19 @@
SCRIPT_START script_0800FD0C
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800FD50
WaitForSomething2 0x00000010
script_0800FD1A:
CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
JumpIfNot script_0800FD1A
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800FD5C
_0807E864
Call sub_0807F9A4
+24
View File
@@ -4,17 +4,29 @@ SCRIPT_START script_0800FF74
_0807E9D4
CallWithArg sub_0807F3D8, 0x00000008
Call sub_080644A4
.ifdef JP
ClearLocalFlag 0x00c4
.else
ClearLocalFlag 0x00c7
.endif
EndBlock
script_0800FF92:
EndBlock
BeginBlock
DoPostScriptAction 0x000a
.ifdef JP
CheckLocalFlag 0x00cb
.else
CheckLocalFlag 0x00ce
.endif
JumpIf script_0800FFCC
DoPostScriptAction 0x000b
Call sub_08064198
.ifdef JP
CheckLocalFlag 0x00c4
.else
CheckLocalFlag 0x00c7
.endif
JumpIfNot script_0800FFCC
Call sub_08064488
CheckPlayerInRegion2 0x4040
@@ -25,7 +37,11 @@ script_0800FFCC:
CheckEntityInteractType
JumpIfNot script_0800FF92
EndBlock
.ifdef JP
SetLocalFlag 0x00c4
.else
SetLocalFlag 0x00c7
.endif
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000008
@@ -35,7 +51,11 @@ script_0800FFCC:
_0807EA94
Jump script_08010060
script_0800FFF8:
.ifdef JP
CheckLocalFlag 0x00cb
.else
CheckLocalFlag 0x00ce
.endif
JumpIfNot script_0801000A
TextboxNoOverlap 0x340b
_0807EA94
@@ -60,7 +80,11 @@ script_08010014:
_0807EDD4 0x0018, 0x0108
_0807EB44 0x0002
CallWithArg sub_0807F3D8, 0x00000008
.ifdef JP
SetLocalFlag 0x00cb
.else
SetLocalFlag 0x00ce
.endif
script_08010060:
Call sub_080644A4
CallWithArg sub_0807F5B0, 0x0000000a
+2
View File
@@ -501,7 +501,9 @@ script_08010860:
TextboxNoOverlap 0x2c21
Jump script_080108B2
script_080108AA:
.ifndef JP
SetLocalFlag 0x00fa
.endif
TextboxNoOverlap 0x2c20
script_080108B2:
_0807EA94
+6
View File
@@ -14,10 +14,16 @@ script_08010994:
Call sub_0807DF50
_0807E878
Jump script_08010964
SCRIPT_START script_080109A0
BeginBlock
EndBlock
.ifdef JP
CheckLocalFlag 0x00ce
.else
CheckLocalFlag 0x00d1
.endif
JumpIf script_080109EA
CheckPlayerInRegion2 0x0808
JumpIfNot script_080109A0
+7
View File
@@ -2,6 +2,10 @@ SCRIPT_START script_08011128
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
.ifdef JP
_0807E9D4
DoPostScriptAction 0x000a
.endif
EndBlock
script_08011134:
CheckPlayerInRegion 0x01f8, 0x0048, 0x1040
@@ -35,3 +39,6 @@ script_08011134:
_0807E5F8 0x00000008
DoPostScriptAction 0x0006
SCRIPT_END
.ifdef JP
.2byte 0x0000
.endif
+5
View File
@@ -127,6 +127,7 @@ script_08011AC4:
_0807EA94
_0807E878
Jump script_08011AC4
SCRIPT_START script_08011AE4
CheckRoomFlag 0x000f
JumpIfNot script_08011AE4
@@ -136,7 +137,11 @@ SCRIPT_START script_08011AE4
script_08011AFA:
TextboxNoOverlapFollowPos 0x1321, 0x0007
_0807EA94
.ifdef JP
SetLocalFlag 0x0011
.else
SetLocalFlag 0x0010
.endif
CallWithArg sub_0806DA1C, 0x00000003
_0807E878
Call sub_0807DF50
+18 -2
View File
@@ -360,8 +360,10 @@ script_08012070:
TextboxNoOverlap 0x3125
_0807EA94
_0807F034 0x0031
WaitPlayerAction8
WaitPlayerAction8
.ifndef JP
Call sub_0807FC24
.endif
Jump script_0801209E
script_0801209A:
TextboxNoOverlap 0x3127
@@ -371,7 +373,11 @@ script_0801209E:
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_0801203A
.ifndef JP
.2byte 0x0000
.endif
SCRIPT_START script_080120B0
BeginBlock
Call sub_08064928
@@ -407,8 +413,10 @@ script_080120FC:
TextboxNoOverlap 0x3119
_0807EA94
_0807F034 0x002f
WaitPlayerAction8
WaitPlayerAction8
.ifndef JP
Call sub_0807FC24
.endif
Jump script_0801212A
script_08012126:
TextboxNoOverlap 0x311b
@@ -418,7 +426,10 @@ script_0801212A:
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_080120C6
.ifndef JP
.2byte 0x0000
.endif
SCRIPT_START script_0801213C
BeginBlock
Call sub_08064A28
@@ -455,7 +466,9 @@ script_08012188:
_0807EA94
_0807F034 0x0030
WaitPlayerAction8
.ifndef JP
Call sub_0807FC24
.endif
Jump script_080121B6
script_080121B2:
TextboxNoOverlap 0x3121
@@ -465,7 +478,10 @@ script_080121B6:
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_08012152
.ifndef JP
.2byte 0x0000
.endif
SCRIPT_START script_080121C8
BeginBlock
Call sub_08064828
+2
View File
@@ -18,7 +18,9 @@ script_08012440:
SetLocalFlag 0x00b3
_0807F034 0x0062
WaitPlayerAction8
.ifndef JP
SetLocalFlag 0x00d0
.endif
script_08012474:
_0807E878
_0807E930 0x0000
+5
View File
@@ -15,6 +15,7 @@ script_08012C7E:
SetGlobalFlag 0x0022
_0807E878
Jump script_08012C7E
SCRIPT_START script_08012C98
CheckGlobalFlag 0x0014
JumpIfNot script_08012C98
@@ -30,7 +31,11 @@ script_08012CA0:
Call sub_0807DF28
_0807EB28 0x2202
_0807EA94
.ifdef JP
SetLocalFlag 0x003a
.else
SetLocalFlag 0x003b
.endif
Call sub_0807DF50
_0807E878
script_08012CD2:
+4
View File
@@ -12,7 +12,11 @@ SCRIPT_START script_08012CD8
EndBlock
_0807EB28 0x2203
_0807EA94
.ifdef JP
SetLocalFlag 0x003d
.else
SetLocalFlag 0x003e
.endif
Call sub_0807DF50
_0807E878
DoPostScriptAction 0x0006
+4
View File
@@ -8,7 +8,11 @@ SCRIPT_START script_08012D70
WaitForSomething2 0x00000001
_0807EB28 0x132d
_0807EA94
.ifdef JP
SetLocalFlag 0x0015
.else
SetLocalFlag 0x0014
.endif
Call sub_0807DF50
_0807E878
DoPostScriptAction 0x0006
+7
View File
@@ -35,7 +35,9 @@ script_080144B8:
Jump script_080144C8
script_080144C0:
SetLocalFlag 0x0093
.ifndef JP
SetLocalFlag 0x00d3
.endif
script_080144C8:
ModRupees 0xfff6
TextboxNoOverlapFollow 0x420c
@@ -54,6 +56,11 @@ script_080144FC:
_0807E878
CheckRoomFlag 0x0000
JumpIfNot script_08014462
.ifndef JP
_0807E9DC
.endif
SCRIPT_END
.ifndef JP
.2byte 0x0000
.endif
+7
View File
@@ -17,6 +17,7 @@ script_08014608:
Call sub_0807DF50
_0807E878
Jump script_080145F8
SCRIPT_START script_08014628
BeginBlock
_0807E9D4
@@ -40,7 +41,11 @@ script_0801463A:
TextboxNoOverlapFollowPos 0x432b, 0x000c
Jump script_080147CE
script_08014672:
.ifdef JP
CheckPlayerInRegion 0x0078, 0x0078, 0x0810
.else
Call sub_08088658
.endif
JumpIfNot script_0801463A
_0807E864
_0807EB28 0x431f
@@ -144,4 +149,6 @@ script_080147CE:
Wait 0x0004
_0807E878
Jump script_0801463A
.ifndef JP
.2byte 0x0000
.endif
+4
View File
@@ -53,7 +53,11 @@ script_08014D96:
TextboxNoOverlap 0x1014
_0807EA94
_0807EC64 0x0018
.ifdef JP
SetLocalFlag 0x006b
.else
SetLocalFlag 0x006d
.endif
Call sub_0807DF50
_0807E878
DoPostScriptAction 0x0006
+4
View File
@@ -239,7 +239,11 @@ script_08015104:
PlaySound SFX_SECRET
_0807F0B4 0x0004
CameraTargetPlayer
.ifdef JP
SetLocalFlag 0x008a
.else
SetLocalFlag 0x008c
.endif
_0807EB28 0x130c
_0807EA94
CameraTargetPlayer
+4
View File
@@ -63,7 +63,11 @@ script_08015888:
_0807EA94
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
.ifdef JP
SetLocalFlag 0x0089
.else
SetLocalFlag 0x008b
.endif
Call sub_08066FB8
Call sub_0807DF50
_0807E878
+4
View File
@@ -1,7 +1,11 @@
SCRIPT_START script_08015B34
EndBlock
BeginBlock
.ifdef JP
CheckLocalFlag 0x0089
.else
CheckLocalFlag 0x008b
.endif
JumpIf script_08015B7E
CallWithArg sub_0807F6B4, 0x00000318
JumpIfNot script_08015B34
+4
View File
@@ -1,6 +1,10 @@
SCRIPT_START script_08015BA8
BeginBlock
.ifdef JP
SetLocalFlag 0x008c
.else
SetLocalFlag 0x008e
.endif
_0807E864
MoveEntityToPlayer
CameraTargetEntity
+4
View File
@@ -31,7 +31,11 @@ script_08015BF0:
PlayBGM
_0807EB28 0x131f
_0807EA94
.ifdef JP
SetLocalFlag 0x009b
.else
SetLocalFlag 0x009c
.endif
Call sub_0807FBCC
Call sub_0807DF50
_0807E878
+4
View File
@@ -17,7 +17,11 @@ SCRIPT_START script_08016384
CheckInventory2 0x0001
HasRoomItemForSale
CheckLocalFlag 0x0067
.ifdef JP
CheckLocalFlagByOffset 0x0100, 0x0069
.else
CheckLocalFlagByOffset 0x0100, 0x006b
.endif
CheckGlobalFlag 0x0013
CheckRoomFlag 0x0000
CheckPlayerInRegion 0x0000, 0x0000, 0x0000