diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-11-05 01:58:55 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-11-05 01:58:55 -0700 |
| commit | a9bb5184d02c1d46860680278fcfc5d6c94b08ce (patch) | |
| tree | 5ed602505a1f3677098d307f77bccf9c1e07d233 /data/scripts | |
| parent | 9cfbb3a27a4c8be6adad1ab060db777b30d52ec2 (diff) | |
| parent | 90ed4a86cec815af8fb37d998f96a5c22945f9c2 (diff) | |
Merge remote-tracking branch 'upstream/master' into m
Diffstat (limited to 'data/scripts')
364 files changed, 3204 insertions, 3015 deletions
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 5378e632..d2ac2ac4 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -1,60 +1,60 @@ SCRIPT_START script_08008B5C - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 _0807E930 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08008B6E: - _0807E944 - _0807E864 + _0807E944 + _0807E864 _0807E930 0x0004 Call sub_0807F2D4 Call sub_0806BBB0 - _0807EA94 + _0807EA94 _0807E930 0x0008 - _0807E878 + _0807E878 Jump script_08008B6E .2byte 0x0000 SCRIPT_START script_08008B90 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x000a _0807E930 0x0000 - EndBlock + EndBlock script_08008BA2: - _0807E944 - _0807E864 + _0807E944 + _0807E864 _0807E930 0x0004 Call sub_0807F2D4 MessageFromTarget 0x4912 _0807EA94 _0807E930 0x0008 - _0807E878 + _0807E878 Jump script_08008BA2 SCRIPT_START script_08008BC0 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x000a _0807E930 0x0000 .ifdef EU SetGlobalFlag 0x0061 .endif - EndBlock + EndBlock script_08008BD2: - _0807E944 - _0807E864 + _0807E944 + _0807E864 .ifndef EU SetGlobalFlag 0x0061 .endif _0807E930 0x0004 Call sub_0807F2D4 - _0807EA94 + _0807EA94 Call sub_0806BA34 JumpIfNot script_08008C54 - _0807EA94 + _0807EA94 CallWithArg sub_0806BB1C, 0x00000000 Call sub_0807F2D4 CallWithArg sub_0806BB1C, 0x00000001 @@ -78,18 +78,18 @@ script_08008C54: _0807E930 0x0008 Wait 0x000f script_08008C5C: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08008BD2 SCRIPT_START script_08008C64 - BeginBlock + BeginBlock SetEntityPositionRelative 0x0068, 0x0018 DoPostScriptAction 0x000f _0807EB44 0x0004 _0807E930 0x0004 SetEntitySpeed 0x0300 PlaySound SFX_STAIRS - EndBlock + EndBlock WaitForSomething 0x00000002 MessageNoOverlap 0x490d _0807EA94 diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc index 1b90b9f7..76375a89 100644 --- a/data/scripts/script_08008D50.inc +++ b/data/scripts/script_08008D50.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08008D50 - BeginBlock + BeginBlock SetEntityPositionRelative 0x0068, 0x0068 _0807F0B4 0x0004 - CameraTargetEntity - EndBlock + CameraTargetEntity + EndBlock Wait 0x001e _0807E5F8 0x00000002 WaitForSomething 0x00000001 Wait 0x000f _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Wait 0x001e _0807E5F8 0x00000004 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index d853908a..bec68bb0 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -1,52 +1,52 @@ SCRIPT_START script_08008D8C - BeginBlock + BeginBlock Call sub_08061FD8 Call sub_08061E70 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08008DA0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08008DA0 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08008DA0 .2byte 0x0000 SCRIPT_START script_08008DC0 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08008DD8: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08008DD8 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Call sub_080643D8 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 Jump script_08008DD8 SCRIPT_START script_08008E08 - BeginBlock + BeginBlock SetEntityPositionRelative 0x0088, 0x0078 - EndBlock + EndBlock script_08008E12: CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 JumpIfNot script_08008E12 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807F0B4 0x0001 - CameraTargetEntity - WaitForPlayerAction0x17 + CameraTargetEntity + WaitForPlayerAction0x17 Wait 0x003c StartPlayerScript script_08008F74 WaitForSomething2 0x00000020 @@ -81,32 +81,32 @@ script_08008E12: _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F034 0x0035 - WaitPlayerAction8 + WaitPlayerAction8 StartPlayerScript script_08008FC0 WaitForSomething2 0x00000020 - _0807E8E4_0 + _0807E8E4_0 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 _0807E5F8 0x00000010 Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 - _0807E8E4_1 + _0807E8E4_1 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F034 0x0047 - WaitPlayerAction8 + WaitPlayerAction8 SetIntVariable 0x00000003 Call sub_0807F420 - _0807E8E4_0 + _0807E8E4_0 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer SetGlobalFlag 0x0015 Call sub_0806DCC0 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc index 959a01c1..8db32075 100644 --- a/data/scripts/script_08008F74.inc +++ b/data/scripts/script_08008F74.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08008F74 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00b8, 0x0090 _0807EB44 0x0006 diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc index 34d38b3d..0a8bb0c9 100644 --- a/data/scripts/script_08008FFC.inc +++ b/data/scripts/script_08008FFC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08008FFC - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething 0x00000010 PlaySound SFX_11C _0807E930 0x0001 diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index 143e21d7..46262f67 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800903C - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000004 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 @@ -11,20 +11,20 @@ SCRIPT_START script_0800903C WaitForSomething2 0x00000004 _0807EB44 0x0004 _0807E5F8 0x00000008 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a Jump script_0800927E .2byte 0x0000 SCRIPT_START script_08009080 - BeginBlock + BeginBlock Call sub_0807F348 SetEntitySpeed 0x0100 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock WaitForSomething2 0x00000080 _0807EB44 0x0004 _0807ECC4 0x0008 @@ -74,23 +74,23 @@ SCRIPT_START script_08009080 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 script_0800917C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800917C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806673C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800917C SCRIPT_START script_08009198 - BeginBlock + BeginBlock Call sub_0807F348 _0807EB44 0x0006 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000001 - _0807EB74 + _0807EB74 DoPostScriptAction 0x0001 MessageFromTargetPos 0x105b, 0x0000 _0807EA94 @@ -111,86 +111,86 @@ SCRIPT_START script_08009198 WaitForSomething2 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB74 - _0807EB8C + _0807EB74 + _0807EB8C DoPostScriptAction 0x0001 MessageFromTargetPos 0x1055, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - _0807EB74 + _0807EB74 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0078 - _0807EB74 + _0807EB74 DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 MessageFromTargetPos 0x1059, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a Jump script_080092B2 .2byte 0x0000 SCRIPT_START script_08009274 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 script_0800927E: Call sub_080668F0 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800928A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800928A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08066904 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800928A .2byte 0x0000 SCRIPT_START script_080092A8 - BeginBlock + BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 script_080092B2: - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080092BA: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080092BA _0807E864 _0807EB74 MessageNoOverlap 0x105e _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_080092BA SCRIPT_START script_080092D4 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0806672C DoPostScriptAction 0x000a - EndBlock + EndBlock Jump script_0800917C .2byte 0x0000 SCRIPT_START script_080092F0 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_08009300: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009300 _0807E864 _0807EB74 @@ -200,7 +200,7 @@ script_08009300: Jump script_08009300 .2byte 0x0000 SCRIPT_START script_08009318 - BeginBlock - EndBlock + BeginBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009320.inc b/data/scripts/script_08009320.inc index 6b99a817..ccea2c7d 100644 --- a/data/scripts/script_08009320.inc +++ b/data/scripts/script_08009320.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08009320 - BeginBlock + BeginBlock Call sub_0806D650 SetEntitySpeed 0x0010 - EndBlock + EndBlock script_0800932E: _0807EEF4 0xfff8, 0x0000 _0807EEF4 0x0008, 0x0000 diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc index 9f5907f4..d5ecf24e 100644 --- a/data/scripts/script_08009340.inc +++ b/data/scripts/script_08009340.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009340 - BeginBlock - EndBlock + BeginBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc index c040ba8f..8138e6c5 100644 --- a/data/scripts/script_08009348.inc +++ b/data/scripts/script_08009348.inc @@ -1,27 +1,27 @@ SCRIPT_START script_08009348 - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_0800934E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800934E - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_0806D638 _0807F0B4 0x0001 - CameraTargetEntity + CameraTargetEntity CheckGlobalFlag 0x0055 JumpIf script_0800939A MessageNoOverlap 0x1d01 _0807EA94 script_08009376: - _0807EA94 + _0807EA94 Call sub_0806D640 _0807F0B4 0x0001 - CameraTargetPlayer + CameraTargetPlayer Wait 0x002d _0807F0B4 0x0004 - _0807E878 + _0807E878 Call sub_0807DF50 Jump script_0800934E SCRIPT_END diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc index 66e30047..cd222161 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -5,9 +5,13 @@ SCRIPT_START script_0800939A .ifdef EU CheckLocalFlag 0x00ac .else +.ifdef DEMO_JP @ TODO deduplicate + CheckLocalFlag 0x00ac +.else CheckLocalFlag 0x00ae .endif .endif +.endif JumpIf script_0800943E CheckInventory1 0x000d JumpIf script_080093BC @@ -32,9 +36,13 @@ script_080093DA: .ifdef EU CheckLocalFlag 0x00ab .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ab @ TODO deduplicate +.else CheckLocalFlag 0x00ad .endif .endif +.endif JumpIf script_080093EE SetIntVariable 0x00001d04 script_080093EE: @@ -59,10 +67,15 @@ script_080093EE: SetLocalFlag 0x00ac SetLocalFlag 0x00ab .else +.ifdef DEMO_JP + SetLocalFlag 0x00ac @ TODO deduplicate + SetLocalFlag 0x00ab +.else SetLocalFlag 0x00ae SetLocalFlag 0x00ad .endif .endif +.endif Call sub_0806D5D4 _0807EB8C MessageNoOverlap 0x1d09 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 0c2e42ac..f85d454f 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -11,9 +11,13 @@ SCRIPT_START script_08009464 .ifdef EU ClearLocalFlag 0x00ac .else +.ifdef DEMO_JP + ClearLocalFlag 0x00ac @ TODO deduplicate +.else ClearLocalFlag 0x00ae .endif .endif +.endif Call sub_0806D620 Wait 0x003c WaitPlayerAction8 @@ -24,14 +28,14 @@ SCRIPT_START script_08009464 Jump script_08009376 .2byte 0x0000 SCRIPT_START script_080094A4 - BeginBlock + BeginBlock Call sub_0806D7C4 SetEntitySpeed 0x0080 - EndBlock + EndBlock Wait 0x003c SetEntity0x20 0x00018000 script_080094BC: - _0807EE30 + _0807EE30 JumpIfNot script_080094BC Wait 0x003c DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc index 8d269a34..9b4323f2 100644 --- a/data/scripts/script_080094CC.inc +++ b/data/scripts/script_080094CC.inc @@ -1,13 +1,13 @@ SCRIPT_START script_080094CC - BeginBlock + BeginBlock Call sub_0806D804 SetEntitySpeed 0x0180 - EndBlock + EndBlock Wait 0x003c SetEntity0x20 0x00018000 Call sub_0806D858 script_080094EA: - _0807EE30 + _0807EE30 JumpIfNot script_080094EA Wait 0x001e DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc index fb908878..04ad9fd0 100644 --- a/data/scripts/script_080094FC.inc +++ b/data/scripts/script_080094FC.inc @@ -1,73 +1,73 @@ SCRIPT_START script_080094FC - BeginBlock + BeginBlock Call sub_08067100 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08009512: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009512 - _0807E864 + _0807E864 DoPostScriptAction 0x0001 - _0807EB74 + _0807EB74 Call sub_080670B4 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_08009512 .2byte 0x0000 SCRIPT_START script_08009538 - BeginBlock + BeginBlock Call sub_08067100 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_0800954E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800954E - _0807E864 + _0807E864 DoPostScriptAction 0x0001 - _0807EB74 + _0807EB74 Call sub_080670E4 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_0800954E .2byte 0x0000 SCRIPT_START script_08009574 - BeginBlock + BeginBlock Call sub_08067314 DoPostScriptAction 0x000a _0807EB44 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 - EndBlock + EndBlock script_08009592: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009592 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 SetIntVariable 0x00000004 Call sub_080672B0 Call sub_080672C8 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 _0807EB44 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 Jump script_08009592 .2byte 0x0000 SCRIPT_START script_080095CC - BeginBlock + BeginBlock Call sub_0806BE3C DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - EndBlock + EndBlock script_080095DE: Call sub_0806BF44 JumpIf script_080095F2 diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index bf90c424..cda95152 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080095F2 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080095DE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0001 Call sub_0806BE84 - _0807EA94 + _0807EA94 JumpIfNot script_08009622 PlaySound SFX_109 _0807F088 0x003c @@ -14,55 +14,55 @@ SCRIPT_START script_080095F2 _0807EA94 _0807F078 0x003c, 0x0001 script_08009622: - _0807E878 + _0807E878 DoPostScriptAction 0x0000 Jump script_080095DE SCRIPT_START script_0800962C - BeginBlock + BeginBlock DoPostScriptAction 0x000b DoPostScriptAction 0x0008 - EndBlock + EndBlock script_08009638: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x0020 JumpIfNot script_08009638 - EndBlock + EndBlock script_08009646: Call sub_0806BF44 JumpIf script_08009646 - EndBlock + EndBlock Call sub_0806BE3C DoPostScriptAction 0x000a DoPostScriptAction 0x0007 script_08009660: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009660 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0001 Call sub_0806BEC8 - _0807EA94 + _0807EA94 JumpIfNot script_0800968E PlaySound SFX_111 PlaySound SFX_SECRET _0807F078 0x003c, 0x0002 Call sub_0806BEFC script_0800968E: - _0807E878 + _0807E878 DoPostScriptAction 0x0000 Jump script_08009660 SCRIPT_START script_08009698 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Jump script_080096FC CheckGlobalFlag 0x0020 JumpIf script_080096FC - EndBlock + EndBlock script_080096AC: CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 JumpIfNot script_080096AC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08009704 @@ -77,7 +77,7 @@ script_080096EC: CheckGlobalFlag 0x0020 JumpIfNot script_080096EC Call sub_0807DF50 - _0807E878 + _0807E878 script_080096FC: Call sub_0808692C SCRIPT_END diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc index c2cb5886..fe187ffb 100644 --- a/data/scripts/script_08009740.inc +++ b/data/scripts/script_08009740.inc @@ -1,31 +1,31 @@ SCRIPT_START script_08009740 - BeginBlock + BeginBlock Call sub_08065D00 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - EndBlock + EndBlock script_0800975A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800975A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 Call sub_08065F64 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800975A .2byte 0x0000 SCRIPT_START script_08009778 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 PlaySound SFX_1F3 Call sub_0807F40C - _0807E8E4_1 + _0807E8E4_1 Wait 0x000a - _0807E8E4_3 + _0807E8E4_3 Wait 0x0032 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -37,11 +37,11 @@ SCRIPT_START script_08009778 WaitForSomething2 0x00000040 _0807F078 0x003c, 0x0000 SetGlobalFlag 0x0020 - _0807E8E4_3 + _0807E8E4_3 Wait 0x001e _0807EB28 0x2809 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc index 6732d029..dd31d91e 100644 --- a/data/scripts/script_080097F0.inc +++ b/data/scripts/script_080097F0.inc @@ -1,19 +1,19 @@ SCRIPT_START script_080097F0 - BeginBlock + BeginBlock _0807E930 0x0003 DoPostScriptAction 0x0007 SetEntitySpeed 0x0300 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 PlaySound SFX_123 Call sub_0807F1A0 script_08009816: - EndBlock - BeginBlock - _0807EE30 + EndBlock + BeginBlock + _0807EE30 JumpIfNot script_08009816 - EndBlock + EndBlock _0807E5F8 0x00000004 Call sub_0807FBD4 PlaySound SFX_1F3 diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc index 00776ede..dab8ef69 100644 --- a/data/scripts/script_08009838.inc +++ b/data/scripts/script_08009838.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08009838 - BeginBlock + BeginBlock _0807E930 0x0003 DoPostScriptAction 0x0007 SetEntitySpeed 0x0300 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000008 Call sub_0809E0A0 Call sub_0809E0D4 diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc index 1b17c7aa..26d3915e 100644 --- a/data/scripts/script_080098D4.inc +++ b/data/scripts/script_080098D4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080098D4 - BeginBlock - EndBlock + BeginBlock + EndBlock script_080098D8: CheckGlobalFlag 0x0020 JumpIfNot script_080098D8 @@ -13,9 +13,13 @@ script_080098E0: .ifdef EU CheckLocalFlag 0x5b .else +.ifdef DEMO_JP + CheckLocalFlag 0x5b @ TODO deduplicate +.else CheckLocalFlag 0x5d .endif .endif +.endif JumpIf script_08009910 .ifdef JP SetLocalFlag 0x005b @@ -23,16 +27,20 @@ script_080098E0: .ifdef EU SetLocalFlag 0x005b .else +.ifdef DEMO_JP + SetLocalFlag 0x005b @ TODO deduplicate +.else SetLocalFlag 0x005d .endif .endif - _0807E864 +.endif + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807EB28 0x280a - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 script_08009910: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009918.inc b/data/scripts/script_08009918.inc index 79d4cbd7..77f4fe2a 100644 --- a/data/scripts/script_08009918.inc +++ b/data/scripts/script_08009918.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08009918 - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 + _0807E864 _0807E5F8 0x00000000 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x0078 _0807E5F8 0x00000004 WaitForSomething2 0x00000001 SetGlobalFlag 0x001c Call sub_0807DF50 - _0807E878 + _0807E878 Call sub_0807921C SCRIPT_END diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index 807a525b..8fcf8511 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -1,16 +1,16 @@ SCRIPT_START script_08009950 - BeginBlock + BeginBlock Call sub_0807F348 SetEntitySpeed 0x0040 _0807EB44 0x0004 _0807E930 0x000c _0807E908 0x0003 - EndBlock + EndBlock Wait 0x001e - CameraTargetEntity + CameraTargetEntity _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitFor_2 WaitForSomething2 0x00000008 DoPostScriptAction 0x0004 Wait 0x001e @@ -31,7 +31,7 @@ SCRIPT_START script_08009950 DoPostScriptAction 0x0000 Wait 0x001e _0807E778 0x0002 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 Call sub_08053634 SCRIPT_END diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index 42986bcd..9c526d16 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080099DC - BeginBlock + BeginBlock Call sub_0807F348 SetEntitySpeed 0x00c0 _0807EB44 0x0002 DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc index e86e879e..03504b53 100644 --- a/data/scripts/script_08009A34.inc +++ b/data/scripts/script_08009A34.inc @@ -8,13 +8,13 @@ script_08009A38: Jump script_08009A38 SCRIPT_START script_08009A50 SetEntityPositionRelative 0x0240, 0x0178 - CameraTargetEntity + CameraTargetEntity SetEntitySpeed 0x0080 Wait 0x0078 PlayBgm BGM_MINISH_CAP _0807E778 0x0002 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 Wait 0x0078 _0807E5F8 0x00000004 Call sub_08053648 diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc index b6d926af..6b3e05a7 100644 --- a/data/scripts/script_08009A84.inc +++ b/data/scripts/script_08009A84.inc @@ -1,16 +1,16 @@ SCRIPT_START script_08009A84 - BeginBlock + BeginBlock SetEntityPositionRelative 0x01e8, 0x0110 SetEntitySpeed 0x00c0 DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x01e8, 0x0200 _0807EDD4 0x01f8, 0x0218 _0807EDD4 0x0220, 0x0228 _0807EDD4 0x0240, 0x0228 - CameraTargetEntity + CameraTargetEntity _0807EDD4 0x0290, 0x0228 _0807EDD4 0x0290, 0x01f8 SetEntitySpeed 0x0080 diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc index 0e66a292..48ef802b 100644 --- a/data/scripts/script_08009AF8.inc +++ b/data/scripts/script_08009AF8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08009AF8 - BeginBlock - EndBlock + BeginBlock + EndBlock WaitForSomething2 0x00000010 PlaySound SFX_F0 DoPostScriptAction 0x0008 @@ -10,7 +10,7 @@ SCRIPT_START script_08009AF8 Wait 0x005a _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitFor_2 Call sub_0805367C SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index 9016acb9..7217bf9b 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08009B30 - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 + _0807E864 SetLocalFlag 0x0046 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x001e MessageFromTarget 0x1005 _0807EA94 @@ -14,7 +14,7 @@ SCRIPT_START script_08009B30 DoPostScriptAction 0x0014 Wait 0x001e Call sub_08053250 - _0807E878 + _0807E878 Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index 1546b648..8bc7cabe 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08009B78 - BeginBlock + BeginBlock _0807EB44 0x0006 SetEntitySpeed 0x0080 - _0807E9D4 + _0807E9D4 Call sub_0807F348 - EndBlock + EndBlock CheckGlobalFlag 0x0013 JumpIf script_08009C4C - _0807E888 + _0807E888 Wait 0x000a - _0807E864 + _0807E864 StartPlayerScript script_08009CFC Call sub_0807DF28 WaitForSomething2 0x00000008 @@ -24,7 +24,7 @@ SCRIPT_START script_08009B78 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - _0807EB8C + _0807EB8C DoPostScriptAction 0x0001 MessageFromTargetPos 0x100b, 0x0000 _0807EA94 @@ -42,8 +42,8 @@ SCRIPT_START script_08009B78 WaitForSomething2 0x00000008 Call sub_08053250 _0807F034 0x0034 - WaitPlayerAction8 - _0807E8E4_1 + WaitPlayerAction8 + _0807E8E4_1 DoPostScriptAction 0x0001 MessageFromTargetPos 0x100c, 0x0000 _0807EA94 @@ -52,7 +52,7 @@ SCRIPT_START script_08009B78 script_08009C4C: DoPostScriptAction 0x000a script_08009C50: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009C50 _0807E864 _0807EB74 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index aca89d2b..2b81699f 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -1,26 +1,26 @@ SCRIPT_START script_08009C68 - BeginBlock + BeginBlock _0807EB44 0x0002 SetEntitySpeed 0x0100 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0004 - _0807EB74 + _0807EB74 WaitForSomething2 0x00000004 - _0807EB74 + _0807EB74 WaitForSomething2 0x00000004 - _0807EB74 - _0807EB8C + _0807EB74 + _0807EB8C DoPostScriptAction 0x0001 MessageFromTargetPos 0x100a, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - _0807EB8C + _0807EB8C DoPostScriptAction 0x0001 - _0807EB8C + _0807EB8C _0807EB44 0x0002 MessageFromTargetPos 0x100d, 0x0000 _0807EA94 @@ -29,11 +29,11 @@ SCRIPT_START script_08009C68 _0807EDD4 0x0000, 0x0060 Call sub_080536A8 Wait 0x001e - BeginBlock + BeginBlock SetGlobalFlag 0x0013 Call sub_0807DF50 Call sub_080791D0 - _0807E878 - EndBlock + _0807E878 + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc index d51e200f..613aaba8 100644 --- a/data/scripts/script_08009CFC.inc +++ b/data/scripts/script_08009CFC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08009CFC - BeginBlock - _0807E8E4_1 + BeginBlock + _0807E8E4_1 SetEntitySpeed 0x00c0 - EndBlock + EndBlock _0807E5F8 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c @@ -10,7 +10,7 @@ SCRIPT_START script_08009CFC _0807EDD4 0x0060, 0x0068 _0807E5F8 0x00000004 DoPostScriptAction 0x0000 - _0807E8E4_0 + _0807E8E4_0 Wait 0x000f PlaySound SFX_VO_ZELDA1 DoPostScriptAction 0x0000 @@ -18,7 +18,7 @@ SCRIPT_START script_08009CFC _0807E5F8 0x00000008 WaitForSomething2 0x00000002 _0807EDD4 0x0070, 0x005c - _0807E8E4_1 + _0807E8E4_1 DoPostScriptAction 0x0000 Wait 0x000f _0807E5F8 0x00000008 diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc index 4b1a4832..ea71cbc3 100644 --- a/data/scripts/script_08009D6C.inc +++ b/data/scripts/script_08009D6C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08009D6C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0006 - EndBlock + EndBlock _0807EDD4 0x0078, 0x0060 _0807EDD4 0x0078, 0x007c Wait 0x001e @@ -11,8 +11,8 @@ SCRIPT_START script_08009D6C _0807EDD4 0x0078, 0x0098 DoPostScriptAction 0x0008 _0807E778 0x0010 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 Call sub_08053634 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc index 869b107a..f675dccf 100644 --- a/data/scripts/script_08009DB0.inc +++ b/data/scripts/script_08009DB0.inc @@ -1,44 +1,44 @@ SCRIPT_START script_08009DB0 - BeginBlock + BeginBlock Call sub_0807F348 Call sub_08066288 Call sub_08066274 DoPostScriptAction 0x000a _0807E930 0x000c _0807E908 0x0003 - EndBlock + EndBlock script_08009DD2: - _0807E944 + _0807E944 _0807E908 0x0002 Call sub_0806622C - _0807EA94 + _0807EA94 _0807E908 0x0003 _0807E930 0x000c Jump script_08009DD2 SCRIPT_START script_08009DEC - BeginBlock - EndBlock + BeginBlock + EndBlock script_08009DF0: CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 JumpIfNot script_08009DF0 - _0807E864 + _0807E864 Call sub_0807F9A4 Wait 0x0008 _0807EB28 0x3207 - _0807E3E8 + _0807E3E8 JumpIfNot script_08009E4E Call sub_0807DF28 _0807E778 0x0002 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 Call sub_0804E864 Wait 0x001e _0807E5F8 0x00000002 WaitForSomething2 0x00000001 _0807EB28 0x3209 Wait 0x000f - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc index 8174277e..62c60d42 100644 --- a/data/scripts/script_08009E4E.inc +++ b/data/scripts/script_08009E4E.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009E4E - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009E58.inc b/data/scripts/script_08009E58.inc index fb9c9b00..9603cf05 100644 --- a/data/scripts/script_08009E58.inc +++ b/data/scripts/script_08009E58.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009E58 - BeginBlock + BeginBlock Call sub_0807DF28 - EndBlock + EndBlock WaitForSomething2 0x00000002 _0807E778 0x0002 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 DoPostScriptAction 0x0014 Wait 0x001e _0807E5F8 0x00000001 diff --git a/data/scripts/script_08009E80.inc b/data/scripts/script_08009E80.inc index bb82f0fd..97dd114a 100644 --- a/data/scripts/script_08009E80.inc +++ b/data/scripts/script_08009E80.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009E80 - BeginBlock - EndBlock + BeginBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009E88.inc b/data/scripts/script_08009E88.inc index 4368b582..4fc207f9 100644 --- a/data/scripts/script_08009E88.inc +++ b/data/scripts/script_08009E88.inc @@ -1,28 +1,32 @@ SCRIPT_START script_08009E88 - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 + _0807E864 .ifdef JP SetLocalFlag 0x009e .else .ifdef EU SetLocalFlag 0x009e .else +.ifdef DEMO_JP + SetLocalFlag 0x009e @ TODO deduplicate +.else SetLocalFlag 0x009f .endif .endif - EndBlock +.endif + EndBlock Wait 0x003c _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 script_08009EA4: Call sub_0807F0D8 JumpIfNot script_08009EA4 DoPostScriptAction 0x0014 Wait 0x000a Call sub_08053250 - _0807E878 + _0807E878 Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc index 8ef940d1..afac33a8 100644 --- a/data/scripts/script_08009ECC.inc +++ b/data/scripts/script_08009ECC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009ECC - BeginBlock + BeginBlock SetIntVariable 0x00000002 DoPostScriptAction 0x0001 - EndBlock + EndBlock WaitForSomething2 0x00000004 - BeginBlock + BeginBlock SetIntVariable 0x00000003 DoPostScriptAction 0x0001 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc index 632f0d1e..d07f072c 100644 --- a/data/scripts/script_08009EF0.inc +++ b/data/scripts/script_08009EF0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009EF0 - BeginBlock + BeginBlock SetIntVariable 0x00000000 DoPostScriptAction 0x0001 - EndBlock + EndBlock WaitForSomething2 0x00000004 - BeginBlock + BeginBlock SetIntVariable 0x00000001 DoPostScriptAction 0x0001 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 1d076ed6..98e1691e 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009F14 - BeginBlock + BeginBlock _0807EB44 0x0004 Call sub_08060090 DoPostScriptAction 0x000a @@ -7,15 +7,15 @@ SCRIPT_START script_08009F14 JumpIf script_08009FD2 CheckInventory1 0x0007 JumpIf script_08009F84 - EndBlock + EndBlock script_08009F36: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08060158 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009F36 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 DoPostScriptAction 0x000b StartPlayerScript script_0800A088 @@ -25,42 +25,42 @@ script_08009F36: _0807EA94 Wait 0x001e _0807F034 0x0065 - WaitPlayerAction8 + WaitPlayerAction8 DoPostScriptAction 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 script_08009F84: - EndBlock + EndBlock script_08009F86: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08060158 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009F86 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_080602BC - _0807EA94 + _0807EA94 CallWithArg sub_0807F970, 0x00001f03 JumpIf script_08009FB6 - _0807E878 + _0807E878 Jump script_08009F86 script_08009FB6: Wait 0x0008 PlaySound SFX_103 CallWithArg sub_0806030C, 0x00000063 Wait 0x0008 - _0807E878 + _0807E878 Jump script_08009F86 script_08009FD2: - EndBlock + EndBlock CheckLocalFlag 0x00b0 JumpIf script_0800A024 script_08009FDC: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08060158 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009FDC EndBlock _0807E864 @@ -68,47 +68,47 @@ script_08009FDC: _0807EA94 _0807E3E8 JumpIf script_0800A002 - _0807E878 + _0807E878 Jump script_08009FDC script_0800A002: Wait 0x0008 _0807F034 0x0008 Call sub_08060318 - WaitPlayerAction8 + WaitPlayerAction8 Wait 0x0008 _0807EB8C MessageFromTarget 0x1f13 _0807EA94 SetLocalFlag 0x00b0 - _0807E878 + _0807E878 script_0800A024: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08060158 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800A024 - EndBlock - _0807E864 + EndBlock + _0807E864 CheckInventory1 0x0008 JumpIf script_0800A052 MessageNoOverlap 0x1f14 _0807EA94 _0807E3E8 JumpIf script_0800A002 - _0807E878 + _0807E878 Jump script_0800A024 script_0800A052: MessageNoOverlap 0x1f11 _0807EA94 _0807E3E8 JumpIf script_0800A064 - _0807E878 + _0807E878 Jump script_0800A024 script_0800A064: Wait 0x0008 _0807F034 0x0007 Call sub_08060318 - WaitPlayerAction8 + WaitPlayerAction8 Wait 0x0008 _0807EB8C MessageFromTarget 0x1f10 diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc index d24fdd74..4103d535 100644 --- a/data/scripts/script_0800A088.inc +++ b/data/scripts/script_0800A088.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800A088 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807ECC4 0x0010 _0807EDD4 0x0078, 0x0060 _0807EB44 0x0000 diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc index 3645cdfc..25fbd63c 100644 --- a/data/scripts/script_0800A0B4.inc +++ b/data/scripts/script_0800A0B4.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800A0B4 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 - _0807E864 + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock Wait 0x0078 PlayBgm BGM_ELEMENT_THEME Call sub_080A0464 script_0800A0D2: - _0807EE30 + _0807EE30 JumpIfNot script_0800A0D2 - _0807E8E4_0 + _0807E8E4_0 Wait 0x0008 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc index baedeedc..eadf25ba 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/data/scripts/script_0800A0FC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A0FC - EndBlock + EndBlock script_0800A0FE: CheckGlobalFlag 0x0051 JumpIfNot script_0800A0FE - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 StopBgm .ifndef EU @@ -12,14 +12,14 @@ script_0800A0FE: .endif SetEntityPositionRelative 0x00b0, 0x0058 Call sub_0807F844 - _0807E8E4_3 + _0807E8E4_3 CallWithArg sub_0807F75C, 0x00d00060 CallWithArg sub_08094AE8, script_0800A160 PlaySound SFX_APPARATE _0807E778 0x0002 - DoFade6 - EndBlock - WaitFor_2 + DoFade6 + EndBlock + WaitFor_2 WaitForSomething2 0x00000004 CallWithArg sub_0806DA1C, 0x00000006 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc index d6a90fe0..ecc539d6 100644 --- a/data/scripts/script_0800A160.inc +++ b/data/scripts/script_0800A160.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800A160 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b @@ -7,7 +7,7 @@ SCRIPT_START script_0800A160 SetEntityPositionRelative 0x00b0, 0x0080 CallWithArg sub_0807F98C, 0xff800000 CallWithArg sub_080960C4, script_0800A1B4 - EndBlock + EndBlock PlaySound SFX_SPARKLES _0807EF3C 0xff80, 0x0000 PlaySound SFX_143 diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc index 9ea82fa3..51ac4526 100644 --- a/data/scripts/script_0800A1B4.inc +++ b/data/scripts/script_0800A1B4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A1B4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 - EndBlock + EndBlock WaitForSomething 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index ca3bc57f..ee3b8650 100644 --- a/data/scripts/script_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800A1D8 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0080 Call sub_0807F844 - _0807E8E4_3 + _0807E8E4_3 CallWithArg sub_0807F75C, 0x00a80088 - EndBlock + EndBlock Wait 0x003c StartPlayerScript script_0800A310 WaitForSomething2 0x00000001 @@ -18,7 +18,7 @@ SCRIPT_START script_0800A1D8 _0807E5F8 0x00000010 WaitForSomething2 0x00000200 _0807E5F8 0x00000004 - _0807E8E4_0 + _0807E8E4_0 WaitForSomething2 0x00000080 _0807E5F8 0x00000010 WaitForSomething2 0x00000200 @@ -37,7 +37,7 @@ SCRIPT_START script_0800A1D8 _0807E5F8 0x00000008 WaitForSomething2 0x00000100 Wait 0x003c - _0807E8E4_3 + _0807E8E4_3 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 Wait 0x003c diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc index 77e8e6b0..b8d89502 100644 --- a/data/scripts/script_0800A310.inc +++ b/data/scripts/script_0800A310.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800A310 - EndBlock + EndBlock _0807EB44 0x0002 Wait 0x000a _0807EB44 0x0006 @@ -12,13 +12,13 @@ SCRIPT_START script_0800A310 Call sub_080791BC .2byte 0x0000 SCRIPT_START script_0800A340 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock WaitForSomething2 0x00000002 _0807E930 0x000e DoPostScriptAction 0x0007 diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc index 17bc1479..fbb04752 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/data/scripts/script_0800A3D8.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800A3D8 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807EB44 0x0002 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000004 - BeginBlock + BeginBlock DoPostScriptAction 0x0004 Call sub_0807F3F8 - EndBlock + EndBlock Wait 0x003c _0807EC94 0x0010 _0807EB44 0x0002 diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc index be0160a5..55f56c7e 100644 --- a/data/scripts/script_0800A500.inc +++ b/data/scripts/script_0800A500.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A500 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807E930 0x0005 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000008 PlaySound SFX_SPARKLES _0807E610 0x00000800 diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc index 9df69772..6bec907c 100644 --- a/data/scripts/script_0800A590.inc +++ b/data/scripts/script_0800A590.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800A590 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 SetEntity0x20 0x00000000 DoPostScriptAction 0x0008 _0807EB44 0x0000 Call sub_0807F714 - MoveEntityToPlayer + MoveEntityToPlayer CallWithArg sub_0807F98C, 0xfff00000 - EndBlock + EndBlock _0807E930 0x0023 WaitForSomething2 0x00000010 CallWithArg sub_0807F6E8, 0x00000008 diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc index 1f099721..cce609e8 100644 --- a/data/scripts/script_0800A638.inc +++ b/data/scripts/script_0800A638.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A638 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 - EndBlock + EndBlock WaitForSomething 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc index 78eb79bf..759fef06 100644 --- a/data/scripts/script_0800A65C.inc +++ b/data/scripts/script_0800A65C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A65C - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 - EndBlock + EndBlock WaitForSomething 0x00000800 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc index 7112b6da..5ed4c24a 100644 --- a/data/scripts/script_0800A680.inc +++ b/data/scripts/script_0800A680.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A680 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 - EndBlock + EndBlock WaitForSomething 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc index 906bdf0b..89faff49 100644 --- a/data/scripts/script_0800A6A4.inc +++ b/data/scripts/script_0800A6A4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A6A4 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0068 Call sub_0807F844 - EndBlock + EndBlock Wait 0x003c PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000008 diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc index c655fe02..80e01e1d 100644 --- a/data/scripts/script_0800A6D4.inc +++ b/data/scripts/script_0800A6D4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A6D4 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0070 Call sub_0807F844 PlaySound SFX_APPARATE - EndBlock + EndBlock Wait 0x003c CallWithArg sub_0806DA1C, 0x00000009 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc index cf586372..64262eab 100644 --- a/data/scripts/script_0800A704.inc +++ b/data/scripts/script_0800A704.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A704 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x0198, 0x01c8 Call sub_0807F844 - EndBlock + EndBlock Wait 0x003c PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x0000000a diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc index c9767016..3a60f672 100644 --- a/data/scripts/script_0800A734.inc +++ b/data/scripts/script_0800A734.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A734 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x00d8, 0x01c8 Call sub_0807F844 PlaySound SFX_APPARATE - EndBlock + EndBlock Wait 0x003c CallWithArg sub_0806DA1C, 0x0000000b DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc index 098abea1..ce2dd0f7 100644 --- a/data/scripts/script_0800A764.inc +++ b/data/scripts/script_0800A764.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800A764 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x00f8, 0x01b8 Call sub_0807F844 - EndBlock + EndBlock Wait 0x003c PlaySound SFX_EVAPORATE _0807E778 0x0004 - DoFade7 - WaitFor_2 + DoFade7 + WaitFor_2 _0807E5F8 0x00000001 PlaySound SFX_APPARATE _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 Wait 0x001e _0807E5F8 0x00000002 Wait 0x0014 diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc index f6662e0e..719c802a 100644 --- a/data/scripts/script_0800A7E4.inc +++ b/data/scripts/script_0800A7E4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A7E4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0010 - EndBlock + EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000002 @@ -16,11 +16,11 @@ script_0800A80C: Wait 0x001e Jump script_0800A80C SCRIPT_START script_0800A820 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0010 - EndBlock + EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000004 @@ -33,11 +33,11 @@ script_0800A848: Wait 0x0014 Jump script_0800A848 SCRIPT_START script_0800A85C - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0010 - EndBlock + EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000008 @@ -50,11 +50,11 @@ script_0800A884: Wait 0x000a Jump script_0800A884 SCRIPT_START script_0800A898 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0008 - EndBlock + EndBlock WaitForSomething 0x00000001 DoPostScriptAction 0x0000 WaitForSomething2 0x00000010 @@ -67,11 +67,11 @@ script_0800A8C0: Wait 0x0019 Jump script_0800A8C0 SCRIPT_START script_0800A8D4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0008 - EndBlock + EndBlock WaitForSomething 0x00000001 DoPostScriptAction 0x0000 WaitForSomething2 0x00000020 @@ -84,12 +84,12 @@ script_0800A8FC: Wait 0x000f Jump script_0800A8FC SCRIPT_START script_0800A910 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x0378, 0x0178 Call sub_0807F844 - EndBlock + EndBlock Wait 0x003c _0807E5F8 0x00000001 Wait 0x001e diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc index d00269a5..258b3451 100644 --- a/data/scripts/script_0800A964.inc +++ b/data/scripts/script_0800A964.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A964 - BeginBlock + BeginBlock _0807EB44 0x0002 DoPostScriptAction 0x0007 _0807E930 0x0001 - EndBlock + EndBlock WaitForSomething2 0x00000001 Call CreateDust DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc index f0b9135c..0323f7b4 100644 --- a/data/scripts/script_0800A988.inc +++ b/data/scripts/script_0800A988.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A988 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0007 _0807E930 0x0002 - EndBlock + EndBlock WaitForSomething2 0x00000002 Call CreateDust DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc index 9a235bcf..3bafd5c1 100644 --- a/data/scripts/script_0800A9AC.inc +++ b/data/scripts/script_0800A9AC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A9AC - BeginBlock + BeginBlock _0807EB44 0x0000 DoPostScriptAction 0x0007 _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000004 Call CreateDust DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc index 2f385317..7f7495c8 100644 --- a/data/scripts/script_0800A9D0.inc +++ b/data/scripts/script_0800A9D0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A9D0 - BeginBlock + BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0007 _0807E930 0x0003 - EndBlock + EndBlock WaitForSomething2 0x00000008 Call CreateDust DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800A9F4.inc b/data/scripts/script_0800A9F4.inc index e9a1788a..7c33419b 100644 --- a/data/scripts/script_0800A9F4.inc +++ b/data/scripts/script_0800A9F4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A9F4 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x0128, 0x0058 Call sub_0807F844 - EndBlock + EndBlock Wait 0x003c _0807E5F8 0x00000001 Wait 0x000a diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc index e992d04f..a96c6c4f 100644 --- a/data/scripts/script_0800AA48.inc +++ b/data/scripts/script_0800AA48.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800AA48 - BeginBlock + BeginBlock _0807EB44 0x0002 DoPostScriptAction 0x0007 _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000001 Call CreateDust DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc index e9bbd201..448bf96b 100644 --- a/data/scripts/script_0800AA6C.inc +++ b/data/scripts/script_0800AA6C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800AA6C - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0007 _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000002 Call CreateDust DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc index 0a55246e..96901853 100644 --- a/data/scripts/script_0800AA90.inc +++ b/data/scripts/script_0800AA90.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800AA90 - BeginBlock + BeginBlock _0807EB44 0x0000 DoPostScriptAction 0x0007 _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000004 Call CreateDust DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc index bc7bf8ad..8c494dd7 100644 --- a/data/scripts/script_0800AAB4.inc +++ b/data/scripts/script_0800AAB4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800AAB4 - BeginBlock + BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0007 _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000008 Call CreateDust DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc index 277ab505..50cb8c6d 100644 --- a/data/scripts/script_0800AAD8.inc +++ b/data/scripts/script_0800AAD8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800AAD8 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 - EndBlock + EndBlock Wait 0x003c PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x0000000f diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index 7787847e..98fa305e 100644 --- a/data/scripts/script_0800AB08.inc +++ b/data/scripts/script_0800AB08.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800AB08 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 - _0807E8E4_3 + _0807E8E4_3 CallWithArg sub_0807F6E8, 0x00000008 CallWithArg sub_0807F75C, 0x00a80088 PlaySound SFX_APPARATE - EndBlock + EndBlock Wait 0x0078 _0807F0B4 0x0001 SetEntityPositionRelative 0x0088, 0x0078 diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index b7a50cd6..80fa03e7 100644 --- a/data/scripts/script_0800AB6E.inc +++ b/data/scripts/script_0800AB6E.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800AB6E Call sub_0808D2CC _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - _0807E8E4_0 + _0807E8E4_0 _0807E5F8 0x00000040 WaitForSomething2 0x00000080 SetEntityPosition 0x0000, 0xffe0 @@ -53,17 +53,17 @@ SCRIPT_START script_0800AB6E Call sub_0808D280 Wait 0x0078 _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 Call sub_0807FB94 - MoveEntityToPlayer + MoveEntityToPlayer Call sub_0807F844 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer _0807E5F8 0x80000000 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc index 8b08a0c0..a8e89bb6 100644 --- a/data/scripts/script_0800ACBC.inc +++ b/data/scripts/script_0800ACBC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800ACBC - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0088, 0x0080 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc index 2f8a0e05..ad53174a 100644 --- a/data/scripts/script_0800ACE0.inc +++ b/data/scripts/script_0800ACE0.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800ACE0 - BeginBlock + BeginBlock Call sub_08094BE0 CallWithArg sub_0807F238, 0x0000045b PlaySound SFX_109 - EndBlock + EndBlock Call sub_0807F304 Wait 0x005a _0807E5F8 0x00000008 - BeginBlock + BeginBlock CallWithArg sub_0807F6F8, 0x00000008 CallWithArg sub_0807F238, 0x000008e4 - EndBlock + EndBlock Call sub_0807F304 _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc index 1e49d980..0b2c4414 100644 --- a/data/scripts/script_0800AD54.inc +++ b/data/scripts/script_0800AD54.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800AD54 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock _0807EC64 0x0020 _0807EB44 0x0000 DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_START script_0800AD74 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0004 Wait 0x001e diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc index 07fc508d..b206732e 100644 --- a/data/scripts/script_0800AEA4.inc +++ b/data/scripts/script_0800AEA4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AEA4 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807EB44 0x0002 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000040 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc index 15b0a526..6c4e6b61 100644 --- a/data/scripts/script_0800AEDC.inc +++ b/data/scripts/script_0800AEDC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800AEDC - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000008 Call sub_08094B80 _0807EF3C 0x0000, 0x0001 diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc index 53eb509f..6c6c70ed 100644 --- a/data/scripts/script_0800AF18.inc +++ b/data/scripts/script_0800AF18.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800AF18 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 PlaySound SFX_SPARKLES - EndBlock + EndBlock WaitForSomething 0x00000020 PlaySound SFX_143 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800AF44.inc b/data/scripts/script_0800AF44.inc index 9a6fe0ff..aa361372 100644 --- a/data/scripts/script_0800AF44.inc +++ b/data/scripts/script_0800AF44.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AF44 - _0807E864 + _0807E864 Call sub_0807DF28 _0807EB28 0x1c01 - _0807EA94 + _0807EA94 SetLocalFlagByOffset 0x0100, 0x0001 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800AF68.inc b/data/scripts/script_0800AF68.inc index 17d3b4c5..5bcbf9c6 100644 --- a/data/scripts/script_0800AF68.inc +++ b/data/scripts/script_0800AF68.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AF68 - _0807E864 + _0807E864 Call sub_0807DF28 _0807EB28 0x1c02 - _0807EA94 + _0807EA94 SetLocalFlagByOffset 0x0100, 0x0002 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800AF8C.inc b/data/scripts/script_0800AF8C.inc index 2966dc38..811902f2 100644 --- a/data/scripts/script_0800AF8C.inc +++ b/data/scripts/script_0800AF8C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AF8C - _0807E864 + _0807E864 Call sub_0807DF28 _0807EB28 0x1c03 - _0807EA94 + _0807EA94 SetLocalFlagByOffset 0x0100, 0x0003 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc index 21e9510d..f456e1ff 100644 --- a/data/scripts/script_0800AFB0.inc +++ b/data/scripts/script_0800AFB0.inc @@ -1,18 +1,18 @@ SCRIPT_START script_0800AFB0 - _0807E864 + _0807E864 script_0800AFB2: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0807FBB4 ComparePlayerAction 0x0001 JumpIfNot script_0800AFB2 - EndBlock + EndBlock Call sub_0807DF28 _0807EB28 0x1c04 - _0807EA94 + _0807EA94 SetLocalFlagByOffset 0x0100, 0x0004 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800AFE8.inc b/data/scripts/script_0800AFE8.inc index 7cf12c3d..625e93e6 100644 --- a/data/scripts/script_0800AFE8.inc +++ b/data/scripts/script_0800AFE8.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AFE8 - _0807E864 + _0807E864 Call sub_0807DF28 _0807EB28 0x1c05 - _0807EA94 + _0807EA94 SetLocalFlagByOffset 0x0100, 0x0005 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index a3c09920..58c12fe8 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800B00C - BeginBlock + BeginBlock Call sub_0807F934 Call sub_080A2124 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - EndBlock + EndBlock script_0800B024: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B024 - _0807E864 + _0807E864 Call sub_0807DF28 CheckGlobalFlag 0x0052 JumpIf script_0800B082 @@ -20,7 +20,7 @@ script_0800B024: Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5c - _0807EA94 + _0807EA94 SetGlobalFlag 0x0053 Jump script_0800B09C script_0800B064: @@ -30,7 +30,7 @@ script_0800B064: Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5d - _0807EA94 + _0807EA94 Jump script_0800B09C script_0800B082: MessageNoOverlap 0x3f32 @@ -39,10 +39,10 @@ script_0800B082: Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5e - _0807EA94 + _0807EA94 script_0800B09C: Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B0AC.inc b/data/scripts/script_0800B0AC.inc index d89cc551..83897bff 100644 --- a/data/scripts/script_0800B0AC.inc +++ b/data/scripts/script_0800B0AC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800B0AC - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807FA40 Call sub_0807DF28 _0807EB28 0x0b5f - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc index fa5ccadf..597ed7bf 100644 --- a/data/scripts/script_0800B0D0.inc +++ b/data/scripts/script_0800B0D0.inc @@ -1,50 +1,50 @@ SCRIPT_START script_0800B0D0 - BeginBlock + BeginBlock Call sub_0806BCD4 DoPostScriptAction 0x000a CallWithArg sub_0806BC94, 0x00000000 - EndBlock + EndBlock script_0800B0E8: Call sub_0807F434 JumpTable script_0800B0E8, script_0800B0F6, script_0800B134 script_0800B0F6: - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_0807F2D4 - _0807EB74 + _0807EB74 CallWithArg sub_0806BC94, 0x00000004 Call sub_0806BCE8 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 script_0800B134: - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_0807F2D4 - _0807EB74 + _0807EB74 CallWithArg sub_0806BC94, 0x00000004 Call sub_0807F650 - _0807E9F0 + _0807E9F0 .ifndef EU JumpIfNot script_0800B160 .endif Call sub_0806BCC0 script_0800B160: Call sub_0807DF50 - _0807E878 + _0807E878 Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 SCRIPT_START script_0800B17C - BeginBlock + BeginBlock Call sub_0807DF28 SetLocalFlag 0x0039 - _0807E864 - EndBlock - WaitForPlayerAction0x17 + _0807E864 + EndBlock + WaitForPlayerAction0x17 StartPlayerScript script_0800B1C0 Wait 0x0018 _0807E5F8 0x00000002 @@ -53,7 +53,7 @@ SCRIPT_START script_0800B17C Wait 0x0010 PlayBgm BGM_FIGHT_THEME _0807EB28 0x2701 - _0807E878 + _0807E878 Call sub_0807DF50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc index 429afa66..64277512 100644 --- a/data/scripts/script_0800B1C0.inc +++ b/data/scripts/script_0800B1C0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B1C0 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000002 SetEntitySpeed 0x00e0 _0807EDD4 0x0088, 0x0090 diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc index ebd489df..5bc8481a 100644 --- a/data/scripts/script_0800B200.inc +++ b/data/scripts/script_0800B200.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800B200 - BeginBlock + BeginBlock _0807E5F8 0x00000000 .ifdef JP CheckLocalFlag 0x001e @@ -7,34 +7,42 @@ SCRIPT_START script_0800B200 .ifdef EU CheckLocalFlag 0x001e .else +.ifdef DEMO_JP + CheckLocalFlag 0x001e @ TODO deduplicate +.else CheckLocalFlag 0x001d .endif .endif +.endif JumpIf script_0800B252 SetEntitySpeed 0x00c0 - EndBlock + EndBlock script_0800B216: WaitForSomething2 0x00000001 Call sub_0807DF28 - MoveEntityToPlayer - CameraTargetEntity + MoveEntityToPlayer + CameraTargetEntity _0807EDD4 0x0068, 0x0380 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 Call sub_0807DF50 Wait 0x000c - CameraTargetPlayer + CameraTargetPlayer Wait 0x0008 - _0807E878 + _0807E878 .ifdef JP CheckLocalFlag 0x001e .else .ifdef EU CheckLocalFlag 0x001e .else +.ifdef DEMO_JP + CheckLocalFlag 0x001e @ TODO deduplicate +.else CheckLocalFlag 0x001d .endif .endif +.endif JumpIfNot script_0800B216 script_0800B252: SCRIPT_END diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc index cfe10656..3e51c2ce 100644 --- a/data/scripts/script_0800B254.inc +++ b/data/scripts/script_0800B254.inc @@ -1,62 +1,62 @@ SCRIPT_START script_0800B254 - BeginBlock + BeginBlock CheckKinstoneFused 0x0006 JumpIf script_0800B302 _0807EA88 0x0006 _0807EB44 0x0002 - EndBlock + EndBlock script_0800B268: - _0807EA4C - _0807E9F0 - _0807E864 + _0807EA4C + _0807E9F0 + _0807E864 CheckKinstoneFused 0x0006 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B268 .2byte 0x0000 SCRIPT_START script_0800B284 - BeginBlock + BeginBlock CheckKinstoneFused 0x0007 JumpIf script_0800B302 _0807EA88 0x0007 _0807EB44 0x0002 - EndBlock + EndBlock script_0800B298: - _0807EA4C - _0807E9F0 - _0807E864 + _0807EA4C + _0807E9F0 + _0807E864 CheckKinstoneFused 0x0007 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B298 .2byte 0x0000 SCRIPT_START script_0800B2B4 - BeginBlock + BeginBlock CheckKinstoneFused 0x0008 JumpIf script_0800B302 _0807EA88 0x0008 _0807EB44 0x0002 - EndBlock + EndBlock script_0800B2C8: - _0807EA4C - _0807E9F0 - _0807E864 + _0807EA4C + _0807E9F0 + _0807E864 CheckKinstoneFused 0x0008 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B2C8 script_0800B2E2: DoPostScriptAction 0x0013 _0807EB44 0x0004 - _0807E9DC + _0807E9DC Call sub_080676E0 Call sub_08067534 DoPostScriptAction 0x0012 _0807E5F8 0x00000001 script_0800B302: - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc index a283ba91..51dd64ea 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -1,14 +1,18 @@ SCRIPT_START script_0800B308 - BeginBlock + BeginBlock .ifdef JP CheckLocalFlag 0x001e .else .ifdef EU CheckLocalFlag 0x001e .else +.ifdef DEMO_JP + CheckLocalFlag 0x001e @ TODO deduplicate +.else CheckLocalFlag 0x001d .endif .endif +.endif JumpIf script_0800B39C DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 @@ -25,17 +29,17 @@ script_0800B33A: JumpIfNot script_0800B348 Call sub_080676D8 script_0800B348: - EndBlock + EndBlock Call sub_0806757C script_0800B350: - EndBlock + EndBlock WaitForSomething2 0x00000002 PlaySound SFX_ITEM_BOMB_EXPLODE Call sub_080676D8 Call sub_0806757C Call sub_080675D4 Wait 0x0014 - BeginBlock + BeginBlock _0807E5F8 0x00000001 CheckKinstoneFused 0x0006 JumpIfNot script_0800B350 @@ -43,16 +47,20 @@ script_0800B350: JumpIfNot script_0800B350 CheckKinstoneFused 0x0008 JumpIfNot script_0800B350 - EndBlock + EndBlock .ifdef JP SetLocalFlag 0x001e .else .ifdef EU SetLocalFlag 0x001e .else +.ifdef DEMO_JP + SetLocalFlag 0x001e @ TODO deduplicate +.else SetLocalFlag 0x001d .endif .endif +.endif PlaySound SFX_SECRET script_0800B39C: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc index 29a0db43..4347fbfc 100644 --- a/data/scripts/script_0800B3A4.inc +++ b/data/scripts/script_0800B3A4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800B3A4 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_0807F158 SetEntitySpeed 0x0120 _0807EB44 0x0004 _0807E908 0x0002 SetIntVariable 0x0000200a - EndBlock + EndBlock script_0800B3C4: _0807EDD4 0x0158, 0x0290 Call sub_08065780 diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index 75c62c36..e17cead1 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -1,19 +1,19 @@ SCRIPT_START script_0800B41C - BeginBlock + BeginBlock SetEntitySpeed 0x00c0 _0807E908 0x0001 DoPostScriptAction 0x000b - _0807E864 + _0807E864 Call sub_0807FBC4 - EndBlock + EndBlock Wait 0x000a DoPostScriptAction 0x0004 _0807E5F8 0x00000008 StartPlayerScript script_0800B54C _0807EDD4 0x0140, 0x0298 - _0807EB74 + _0807EB74 WaitForSomething2 0x00000004 - _0807EB74 + _0807EB74 Wait 0x003c PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index 2764728a..29239a02 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800B4AC - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0001 SetEntitySpeed 0x00c0 - _0807E9D4 + _0807E9D4 script_0800B4BC: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800B4D4 TestBit 0x00000008 JumpIf script_0800B4F0 Jump script_0800B4BC script_0800B4D4: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageFromTarget 0x200b EndBlock @@ -23,7 +23,7 @@ script_0800B4D4: DoPostScriptAction 0x0001 Jump script_0800B4BC script_0800B4F0: - EndBlock + EndBlock _0807E610 0x00000008 _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 @@ -40,7 +40,7 @@ script_0800B4F0: _0807E5F8 0x00000010 SetGlobalFlag 0x001d Call sub_0807921C - _0807E878 + _0807E878 Call sub_0807FBCC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc index cb550b60..2b50271b 100644 --- a/data/scripts/script_0800B54C.inc +++ b/data/scripts/script_0800B54C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B54C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0128, 0x0298 Wait 0x000a _0807EB44 0x0002 diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc index f5acdf53..1170c517 100644 --- a/data/scripts/script_0800B574.inc +++ b/data/scripts/script_0800B574.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800B574 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 CheckGlobalFlag 0x001d JumpIf script_0800B5BC - EndBlock + EndBlock WaitForSomething2 0x00000010 DoPostScriptAction 0x0008 PlaySound SFX_111 diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc index 7365b9aa..30532b5e 100644 --- a/data/scripts/script_0800B5C4.inc +++ b/data/scripts/script_0800B5C4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800B5C4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0004 - EndBlock + EndBlock Wait 0x001e PlaySound SFX_VO_DOG _0807EDD4 0x008a, 0x005a diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index 2aa13337..6c55593b 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800B5EC - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0001 - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800B5FA: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B5FA _0807E864 _0807EB74 @@ -15,13 +15,13 @@ script_0800B5FA: _0807EB44 0x0004 Jump script_0800B5FA SCRIPT_START script_0800B614 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800B618: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B618 Call sub_08079184 - _0807E864 + _0807E864 Call sub_0807F9A4 StartPlayerScript script_0800B7C4 WaitForSomething2 0x00000004 @@ -45,24 +45,24 @@ script_0800B684: _0807EA94 Jump script_0800B6A6 script_0800B68E: - _0807EA94 + _0807EA94 SetLocalFlag 0x009e _0807F034 0x0066 script_0800B698: - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C Wait 0x001e MessageNoOverlap 0x057f _0807EA94 script_0800B6A6: _0807E778 0x0004 - DoFade7 - WaitFor_2 + DoFade7 + WaitFor_2 Call sub_080873FC - DoFade6 - WaitFor_2 - CameraTargetPlayer + DoFade6 + WaitFor_2 + CameraTargetPlayer Wait 0x001e Call sub_0807DF50 - _0807E878 + _0807E878 SCRIPT_END diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index 1a0d4833..c2e0c56c 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800B6C8 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800B6CC: HasRupees 0x0001 JumpIfNot script_0800B6CC @@ -8,7 +8,7 @@ script_0800B6D4: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B6D4 Call sub_08079184 - _0807E864 + _0807E864 Call sub_0807F9A4 StartPlayerScript script_0800B7C4 WaitForSomething2 0x00000004 @@ -20,19 +20,19 @@ script_0800B6D4: _0807EA94 CallWithArg sub_0807F970, 0x0000057d JumpIf script_0800B6A6 - _0807EA94 + _0807EA94 SetLocalFlag 0x009f _0807F034 0x0064 Jump script_0800B698 .2byte 0x0000 SCRIPT_START script_0800B730 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800B734: Call sub_0808747C JumpIfNot script_0800B734 Call sub_08079184 - _0807E864 + _0807E864 Wait 0x000a Call sub_0807F9A4 StartPlayerScript script_0800B7C4 @@ -49,7 +49,7 @@ script_0800B734: Wait 0x00b4 Jump script_0800B6A6 script_0800B794: - _0807EA94 + _0807EA94 SetLocalFlag 0x00a0 _0807F034 0x0065 Jump script_0800B698 @@ -57,8 +57,8 @@ script_0800B7A2: MessageNoOverlap 0x0590 _0807EA94 _0807E778 0x0010 - DoFade7 - WaitFor_2 + DoFade7 + WaitFor_2 ModHealth 0x00a0 DoFade6 WaitFor_2 diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc index b9f32d34..32b4d19b 100644 --- a/data/scripts/script_0800B7C4.inc +++ b/data/scripts/script_0800B7C4.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800B7C4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock CallWithArg sub_0807F6B4, 0x00000090 JumpIfNot script_0800B7FC CallWithArg sub_0807F464, 0x00000078 CallWithArg sub_0807F4F8, 0x00000090 script_0800B7EE: - _0807E8E4_0 + _0807E8E4_0 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 SCRIPT_END diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc index e2a45b4a..75771a0a 100644 --- a/data/scripts/script_0800B7FC.inc +++ b/data/scripts/script_0800B7FC.inc @@ -2,10 +2,10 @@ SCRIPT_START script_0800B7FC CallWithArg sub_0807F4F8, 0x00000090 CallWithArg sub_0807F464, 0x00000078 Jump script_0800B7EE - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index 602e4281..5c17fb53 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -1,105 +1,105 @@ SCRIPT_START script_0800B828 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800B836: _0807E944 _0807E864 MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800B836 .2byte 0x0000 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800B85E: Wait 0x003c Call sub_080646A4 Jump script_0800B85E - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 _0807E930 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800B87E: Wait 0x003c Call sub_0806407C Jump script_0800B87E - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800B89E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B89E _0807E864 _0807EB74 MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800B89E SCRIPT_START script_0800B8B8 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a CallWithArg sub_08064644, sub_0806464C - EndBlock + EndBlock script_0800B8D4: Wait 0x003c Call sub_080646A4 Jump script_0800B8D4 .2byte 0x0000 SCRIPT_START script_0800B8E4 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 - EndBlock + EndBlock script_0800B8FC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B8FC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800B8FC .2byte 0x0000 SCRIPT_START script_0800B91C - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock CheckLocalFlag 0x005f JumpIf script_0800B94E script_0800B934: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B934 _0807E864 _0807EB74 MessageFromTarget 0x3f19 _0807EA94 SetLocalFlag 0x005f - _0807E878 + _0807E878 Jump script_0800B934 script_0800B94E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B94E _0807E864 _0807EB74 @@ -108,25 +108,25 @@ script_0800B94E: _0807E878 Jump script_0800B94E SCRIPT_START script_0800B964 - BeginBlock + BeginBlock DoPostScriptAction 0x000b DoPostScriptAction 0x0008 Call sub_0806DAAC JumpIf script_0800B9AC Call sub_0806DAD0 CallWithArg sub_0806DA04, 0x00000005 - EndBlock + EndBlock script_0800B98A: - _0807EA4C - _0807E9F0 + _0807EA4C + _0807E9F0 JumpIf script_0800B99E Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B98A script_0800B99E: Call sub_0806F188 Call sub_0807DF50 - _0807E878 + _0807E878 script_0800B9AC: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index d2a821c7..9448c48a 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -1,52 +1,52 @@ SCRIPT_START script_0800B9B4 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 Call sub_080694EC DoPostScriptAction 0x000a Call sub_080694B0 - EndBlock + EndBlock script_0800B9CA: Call sub_0807F434 JumpTable script_0800B9CA, script_0800B9D8, script_0800B9F4 script_0800B9D8: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 Call sub_080694D8 - _0807EA94 + _0807EA94 Call sub_080694EC - _0807E878 + _0807E878 Jump script_0800B9CA script_0800B9F4: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 Call sub_0807F650 - _0807E9F0 - _0807E864 + _0807E9F0 + _0807E864 Call sub_0806948C JumpIf script_0800BA24 - _0807EA94 + _0807EA94 Call sub_080694EC Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B9CA script_0800BA24: - _0807EA94 - _0807E9DC - _0807E9D4 + _0807EA94 + _0807E9DC + _0807E9D4 Call sub_080694EC Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B9CA SCRIPT_START script_0800BA3C - BeginBlock + BeginBlock Call sub_0807F934 - EndBlock + EndBlock script_0800BA46: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800BA46 - _0807E864 + _0807E864 Call sub_0807DF28 MessageFromTarget 0x3301 _0807EA94 @@ -57,15 +57,15 @@ script_0800BA46: PlayBGM script_0800BA6C: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800BA46 SCRIPT_START script_0800BA78 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0040 Call sub_0807F348 - EndBlock + EndBlock script_0800BA8E: CheckRoomFlag 0x00ff JumpIfNot script_0800BA8E diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index d6afe042..3eb79b27 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BACC - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F348 - EndBlock + EndBlock script_0800BADE: CheckRoomFlag 0x00ff JumpIfNot script_0800BADE diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index cb33b0e3..a35881e1 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800BB00 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800BB04: CheckRoomFlag 0x00ff JumpIfNot script_0800BB04 diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index a5784cc2..1e96d74a 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BB30 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F348 - EndBlock + EndBlock script_0800BB42: CheckRoomFlag 0x00ff JumpIfNot script_0800BB42 diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index 396ac1ea..ba26abd0 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800BB64 - BeginBlock + BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 SetEntitySpeed 0x0040 Call sub_0807F348 - EndBlock + EndBlock script_0800BB7A: CheckRoomFlag 0x00ff JumpIfNot script_0800BB7A diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index 4c67b04a..27d24a2e 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800BBA4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F348 - EndBlock + EndBlock script_0800BBBA: CheckRoomFlag 0x00ff JumpIfNot script_0800BBBA diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index 255f1665..12c615e9 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800BBDC - BeginBlock + BeginBlock _0807E930 0x0000 - EndBlock + EndBlock script_0800BBE4: CheckRoomFlag 0x00ff JumpIfNot script_0800BBE4 diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index 74b7fc3d..8da602bf 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BC08 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_0800BC18: CheckRoomFlag 0x00ff JumpIfNot script_0800BC18 @@ -14,7 +14,7 @@ script_0800BC18: BeginBlock _0807EB44 0x0000 _0807E930 0x0004 - EndBlock + EndBlock Wait 0x003c Call sub_08065CCC Wait 0x0078 diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index d087ca52..b5c20051 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BC50 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_08054EB8 - EndBlock + EndBlock script_0800BC62: CheckRoomFlag 0x00ff JumpIfNot script_0800BC62 diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index 56486bf0..f27d63b6 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800BCE8 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 Wait 0x003c diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index 4fffe979..023678b8 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800BD78 - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index 89654d0c..7bc53d08 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800BE1C - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 @@ -16,17 +16,17 @@ SCRIPT_START script_0800BE1C Jump script_0800BE88 .2byte 0x0000 SCRIPT_START script_0800BE54 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 Wait 0x003c - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index 5d17a790..98969897 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800BECC - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index 05d3a9f9..fdf7faef 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800BF38 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 @@ -16,17 +16,17 @@ SCRIPT_START script_0800BF38 Jump script_0800BFA4 .2byte 0x0000 SCRIPT_START script_0800BF70 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 Wait 0x003c - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index dc84fff8..1a581e15 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800C004 - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 64e29d11..69b49329 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800C0B0 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 @@ -16,17 +16,17 @@ SCRIPT_START script_0800C0B0 Jump script_0800C11C .2byte 0x0000 SCRIPT_START script_0800C0E8 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 Wait 0x003c - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 90d19ec2..de972fbe 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800C160 - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index 583bcfff..d8987f9a 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800C1D8 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 @@ -16,17 +16,17 @@ SCRIPT_START script_0800C1D8 Jump script_0800C244 .2byte 0x0000 SCRIPT_START script_0800C210 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 Wait 0x003c - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index d07d743d..01484265 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800C2A4 - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 diff --git a/data/scripts/script_0800C350.inc b/data/scripts/script_0800C350.inc index fd0d06d5..06f641d6 100644 --- a/data/scripts/script_0800C350.inc +++ b/data/scripts/script_0800C350.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C350 - BeginBlock + BeginBlock CallWithArg sub_0806D658, 0x00000003 SetEntitySpeed 0x0200 - EndBlock + EndBlock script_0800C362: CheckRoomFlag 0x00ff JumpIfNot script_0800C362 diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc index e50a0f31..3e0cd6d7 100644 --- a/data/scripts/script_0800C3CC.inc +++ b/data/scripts/script_0800C3CC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C3CC - BeginBlock + BeginBlock Call sub_0806D660 SetEntitySpeed 0x0080 - EndBlock + EndBlock WaitForSomething2 0x00000002 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc index 2d796192..a0cd7597 100644 --- a/data/scripts/script_0800C410.inc +++ b/data/scripts/script_0800C410.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C410 - BeginBlock + BeginBlock Call sub_0806D660 SetEntitySpeed 0x0080 - EndBlock + EndBlock WaitForSomething2 0x00000004 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc index a3882952..c98b696d 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800C45C - BeginBlock + BeginBlock SetEntitySpeed 0x0180 _0807E930 0x0004 Call sub_080A0B28 - EndBlock + EndBlock Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 script_0800C47A: - _0807EE30 + _0807EE30 JumpIfNot script_0800C47A Wait 0x003c SetRoomFlag 0x00ff diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc index ec34449e..6e278038 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C494 - BeginBlock + BeginBlock SetEntitySpeed 0x0120 _0807E930 0x0004 - EndBlock + EndBlock Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc index 6a096484..bdd65634 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C4D0 - BeginBlock + BeginBlock SetEntitySpeed 0x0180 _0807E930 0x0004 - EndBlock + EndBlock Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc index 031cc83f..fbb7b440 100644 --- a/data/scripts/script_0800C50C.inc +++ b/data/scripts/script_0800C50C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800C50C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807E930 0x0004 DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000001 Wait 0x000a DoPostScriptAction 0x0007 diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 60f96806..880ad576 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -1,37 +1,37 @@ SCRIPT_START script_0800C550 - BeginBlock + BeginBlock Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800C55E: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800C572 Call sub_08060158 - EndBlock + EndBlock Jump script_0800C55E script_0800C572: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08060208 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800C55E SCRIPT_START script_0800C584 - BeginBlock + BeginBlock Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800C592: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800C5A6 Call sub_08060158 - EndBlock + EndBlock Jump script_0800C592 script_0800C5A6: - EndBlock - _0807E864 + EndBlock + _0807E864 CheckInventory1 0x0067 JumpIfNot script_0800C5BC Call sub_08060208 @@ -39,51 +39,51 @@ script_0800C5A6: script_0800C5BC: MessageNoOverlap 0x4710 script_0800C5C0: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800C592 SCRIPT_START script_0800C5C8 - BeginBlock + BeginBlock Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800C5D6: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800C5EA Call sub_08060158 - EndBlock + EndBlock Jump script_0800C5D6 script_0800C5EA: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08060270 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800C5D6 SCRIPT_START script_0800C5FC - BeginBlock + BeginBlock script_0800C5FE: Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800C60A: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800C61E Call sub_08060158 - EndBlock + EndBlock Jump script_0800C60A script_0800C61E: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806021C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800C60A SCRIPT_START script_0800C634 - BeginBlock + BeginBlock DoPostScriptAction 0x000a SetEntitySpeed 0x0080 _0807EB44 0x0004 @@ -91,10 +91,10 @@ SCRIPT_START script_0800C634 JumpIfNot script_0800C650 SetEntityPosition 0x0010, 0x0000 script_0800C650: - EndBlock + EndBlock script_0800C652: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x0082 JumpIf script_0800C684 @@ -117,7 +117,7 @@ script_0800C684: Wait 0x000a SetLocalFlag 0x0080 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 script_0800C6B6: CheckLocalFlag 0x0081 @@ -128,7 +128,7 @@ script_0800C6B6: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 script_0800C6DC: CheckLocalFlag 0x0082 @@ -152,7 +152,7 @@ script_0800C712: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 script_0800C730: CheckLocalFlag 0x0083 @@ -163,7 +163,7 @@ script_0800C730: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 @@ -172,16 +172,16 @@ script_0800C756: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 SCRIPT_START script_0800C774 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 - EndBlock + EndBlock script_0800C780: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Call sub_0807DF28 StartPlayerScript script_0800C8F0 WaitForSomething2 0x00000001 @@ -194,7 +194,7 @@ script_0800C780: _0807EA94 DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C780 script_0800C7C0: _0807E930 0x0008 @@ -215,7 +215,7 @@ script_0800C7C0: DoPostScriptAction 0x0000 SetLocalFlag 0x0081 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C780 script_0800C80A: MessageFromTarget 0x1133 @@ -223,7 +223,7 @@ script_0800C80A: Wait 0x000a _0807E930 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C780 script_0800C824: _0807E930 0x0008 @@ -244,17 +244,17 @@ script_0800C824: MessageFromTarget 0x1136 _0807EA94 _0807EB28 0x1137 - _0807EA94 + _0807EA94 Wait 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 script_0800C87C: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 SetIntVariable 0x00000008 Call sub_0807F3D8 MessageFromTarget 0x1136 @@ -262,7 +262,7 @@ script_0800C87C: Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C87C script_0800C8AE: MessageFromTarget 0x1136 @@ -270,5 +270,5 @@ script_0800C8AE: Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C780 diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc index b5a97320..ed1e9998 100644 --- a/data/scripts/script_0800C8C8.inc +++ b/data/scripts/script_0800C8C8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C8C8 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x00e8, 0x0068 _0807EB44 0x0000 Wait 0x000f diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc index 4cfdb12b..c39b1353 100644 --- a/data/scripts/script_0800C8F0.inc +++ b/data/scripts/script_0800C8F0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C8F0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807ECC4 0x0010 _0807EDD4 0x0078, 0x0058 _0807EB44 0x0000 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index a4893feb..65d16b14 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -1,47 +1,47 @@ SCRIPT_START script_0800C91C - BeginBlock + BeginBlock _0807EB44 0x0004 SetEntitySpeed 0x0300 - EndBlock + EndBlock script_0800C928: CheckPlayerInRegion 0x0208, 0x0360, 0x2040 JumpIfNot script_0800C928 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_0800CA8C WaitForSomething2 0x00000002 Wait 0x003c _0807EB28 0x1125 - _0807EA94 + _0807EA94 _0807E5F8 0x00000800 - _0807E8E4_3 + _0807E8E4_3 Wait 0x003c _0807E5F8 0x00000200 - _0807E8E4_0 + _0807E8E4_0 Wait 0x001e _0807E5F8 0x00002000 - _0807E8E4_1 + _0807E8E4_1 Wait 0x0014 _0807E5F8 0x00020000 - _0807E8E4_1 + _0807E8E4_1 Wait 0x000a _0807E5F8 0x00008000 - _0807E8E4_3 + _0807E8E4_3 Wait 0x001e WaitForSomething2 0x00000400 WaitForSomething2 0x00001000 WaitForSomething2 0x00004000 WaitForSomething2 0x00010000 WaitForSomething2 0x00040000 - _0807E8E4_0 + _0807E8E4_0 Wait 0x003c _0807E5F8 0x00000200 WaitForSomething2 0x00000400 _0807E8E4_0 MessageFromTarget 0x1126 Call sub_0807F40C - _0807EA94 + _0807EA94 _0807E5F8 0x00000200 _0807E5F8 0x00000800 _0807E5F8 0x00002000 @@ -72,11 +72,11 @@ script_0800C928: WaitForSomething2 0x00004000 WaitForSomething2 0x00010000 WaitForSomething2 0x00040000 - _0807E8E4_0 + _0807E8E4_0 _0807EB28 0x1129 - _0807EA94 + _0807EA94 SetLocalFlag 0x008d Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc index bccf4699..b77826a4 100644 --- a/data/scripts/script_0800CA8C.inc +++ b/data/scripts/script_0800CA8C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800CA8C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0208, 0x0358 SetEntitySpeed 0x0080 diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc index 8c741a64..33cb62c3 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CABC - BeginBlock + BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00000200 DoPostScriptAction 0x0007 _0807EDD4 0x0208, 0x0308 diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc index b94d1c74..33d6ea64 100644 --- a/data/scripts/script_0800CB54.inc +++ b/data/scripts/script_0800CB54.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CB54 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00000800 DoPostScriptAction 0x0007 _0807EB44 0x0002 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc index 9293653e..20423e5c 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CBD4 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00002000 DoPostScriptAction 0x0007 _0807EDD4 0x0258, 0x0330 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc index facb5c9a..ea083bc7 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CC6C - BeginBlock + BeginBlock DoPostScriptAction 0x0008 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00008000 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0320 diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc index 78b981d4..9519af22 100644 --- a/data/scripts/script_0800CD04.inc +++ b/data/scripts/script_0800CD04.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CD04 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00020000 DoPostScriptAction 0x0007 _0807EDD4 0x0268, 0x0338 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index 2cdbd343..c2a19374 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800CD7C - BeginBlock + BeginBlock CheckInventory1 0x005b JumpIfNot script_0800C5FE Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800CD92: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800CDA6 Call sub_08060158 Jump script_0800CD92 script_0800CDA6: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x009d JumpIf script_0800CDC4 @@ -43,7 +43,7 @@ script_0800CDEC: JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0023 - WaitPlayerAction8 + WaitPlayerAction8 Jump script_0800CE32 script_0800CE14: _0807E48C 0x0022 @@ -54,9 +54,9 @@ script_0800CE14: JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0022 - WaitPlayerAction8 + WaitPlayerAction8 script_0800CE32: - _0807EB8C + _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x213f @@ -83,8 +83,8 @@ script_0800CE6E: JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0027 - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x2143 @@ -111,80 +111,80 @@ script_0800CECE: JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0024 - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x2147 script_0800CF02: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 script_0800CF0C: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800CF20 Call sub_08060158 Jump script_0800CF0C script_0800CF20: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 script_0800CF2A: MessageNoOverlap 0x2140 _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800CF0C script_0800CF3C: MessageNoOverlap 0x214a script_0800CF40: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800CD92 .2byte 0x0000 SCRIPT_START script_0800CF50 - BeginBlock + BeginBlock Call sub_08068104 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800CF5E: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800CF72 Call sub_0806811C - EndBlock + EndBlock Jump script_0800CF5E script_0800CF72: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800CF5E SCRIPT_START script_0800CF88 - BeginBlock + BeginBlock Call sub_08068104 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800CF96: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800CF96 SCRIPT_START script_0800CFAC - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock CheckInventory1 0x0041 JumpIf script_0800CFD2 CheckLocalFlag 0x007e @@ -202,17 +202,17 @@ script_0800CFEC: JumpIfNot script_0800CFFA _0807E5F8 0x00000010 script_0800CFFA: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08068910 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800CFFA - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 CheckInventory1 0x0002 JumpIfNot script_0800D032 - _0807EB74 + _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 MessageNoOverlap 0x1219 @@ -222,7 +222,7 @@ script_0800D032: JumpIfNot script_0800D098 StartPlayerScript script_0800D190 WaitForSomething2 0x00000008 - _0807EB74 + _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTargetPos 0x125c, 0x0002 @@ -250,7 +250,7 @@ script_0800D0A8: WaitForSomething2 0x00000004 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 - _0807EB74 + _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTargetPos 0x123d, 0x0002 @@ -288,9 +288,9 @@ script_0800D108: Call sub_08095164 _0807EB28 0x1240 script_0800D17C: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Call sub_0807DF50 Jump script_0800CFFA .2byte 0x0000 diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc index e280400d..1cec26bd 100644 --- a/data/scripts/script_0800D190.inc +++ b/data/scripts/script_0800D190.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D190 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0170, 0x0140 _0807EB44 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc index 4a7bb3c8..cf4aa40f 100644 --- a/data/scripts/script_0800D1B4.inc +++ b/data/scripts/script_0800D1B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D1B4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0170, 0x0120 _0807EDD4 0x01a8, 0x0120 _0807EB44 0x0004 diff --git a/data/scripts/script_0800D218.inc b/data/scripts/script_0800D218.inc index 50f35779..741fe977 100644 --- a/data/scripts/script_0800D218.inc +++ b/data/scripts/script_0800D218.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D218 - BeginBlock + BeginBlock CheckInventory1 0x0041 JumpIf script_0800D24C CheckLocalFlag 0x007e JumpIf script_0800D242 DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000010 DoPostScriptAction 0x0007 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc index 27de55ab..f601fb80 100644 --- a/data/scripts/script_0800D254.inc +++ b/data/scripts/script_0800D254.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D254 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000020 DoPostScriptAction 0x0007 WaitForSomething2 0x00000020 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index 7a99b401..774708b7 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -1,32 +1,32 @@ SCRIPT_START script_0800D278 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800D282: CheckInventory1 0x0041 JumpIf script_0800D292 CheckLocalFlag 0x007e JumpIf script_0800D2EA script_0800D292: - BeginBlock + BeginBlock TestBit 0x00000001 JumpIf script_0800D2C6 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_0800D2B0 Call sub_0806811C - EndBlock + EndBlock Jump script_0800D282 script_0800D2B0: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800D282 script_0800D2C6: - EndBlock + EndBlock _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807E5F8 0x00000004 @@ -36,54 +36,54 @@ script_0800D2C6: script_0800D2EA: _0807E930 0x000b script_0800D2EE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800D2EE - _0807E864 + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800D2EE SCRIPT_START script_0800D308 - BeginBlock + BeginBlock Call sub_08068884 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock script_0800D31E: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08068910 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800D31E - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTarget 0x1219 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800D31E SCRIPT_START script_0800D350 - BeginBlock + BeginBlock Call sub_08068104 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800D35E: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800D372 Call sub_0806811C - EndBlock + EndBlock Jump script_0800D35E script_0800D372: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f CheckLocalFlag 0x007f JumpIf script_0800D3E4 @@ -108,6 +108,6 @@ script_0800D3B2: DoPostScriptAction 0x000a SetLocalFlag 0x007f script_0800D3E4: - _0807E878 + _0807E878 Jump script_0800D35E .2byte 0x0000 diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc index ed99e4a7..4a39c3f8 100644 --- a/data/scripts/script_0800D3EC.inc +++ b/data/scripts/script_0800D3EC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D3EC - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000d diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc index fa00f3c6..a779dd97 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D414 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 Call sub_08068104 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800D426: _0807EB44 0x0002 SetIntVariable 0x00000000 @@ -39,13 +39,13 @@ script_0800D426: _0807EDD4 0x0228, 0x01e8 Jump script_0800D426 .2byte 0x0000 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08062A48 _0807EB44 0x0004 DoPostScriptAction 0x0000 script_0800D4E4: - EndBlock + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000009 @@ -77,31 +77,31 @@ script_0800D556: script_0800D560: _0807EE04 0x00b8, 0x00b8 script_0800D566: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_0800D4E4 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_0800D584 - _0807EE30 + _0807EE30 JumpIfNot script_0800D566 Jump script_0800D4E4 script_0800D584: - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800D4E4 SCRIPT_START script_0800D59C - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08062A48 DoPostScriptAction 0x0000 script_0800D5AC: - EndBlock + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000004 @@ -118,16 +118,16 @@ script_0800D5E2: script_0800D5EC: _0807EE04 0x0058, 0x00c8 script_0800D5F2: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_0800D5AC - _0807EE30 + _0807EE30 JumpIfNot script_0800D5F2 Jump script_0800D5AC .2byte 0x0000 SCRIPT_START script_0800D60C - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000b DoPostScriptAction 0x0008 @@ -135,23 +135,23 @@ SCRIPT_START script_0800D60C JumpIf script_0800D6AE Call sub_0806DAD0 CallWithArg sub_0806DA04, 0x00000002 - EndBlock + EndBlock script_0800D636: - _0807EA4C - _0807E9F0 + _0807EA4C + _0807E9F0 Call sub_0806DAAC JumpIf script_0800D650 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800D636 script_0800D650: - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_0807FBC4 Call sub_0807FBA0 SetEntitySpeed 0x0700 _0807F0B4 0x0007 - CameraTargetEntity + CameraTargetEntity _0807EDD4 0x01e8, 0x01b8 Wait 0x003c Call sub_0806DAE8 diff --git a/data/scripts/script_0800D698.inc b/data/scripts/script_0800D698.inc index 297e34b2..a9418e17 100644 --- a/data/scripts/script_0800D698.inc +++ b/data/scripts/script_0800D698.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D698 - _0807EEB4 + _0807EEB4 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807FBCC - _0807E878 + _0807E878 Call sub_0807DF50 script_0800D6AE: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc index 5ecafb12..ea0deeed 100644 --- a/data/scripts/script_0800D6B4.inc +++ b/data/scripts/script_0800D6B4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D6B4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x0011 Call sub_0807F158 Call sub_0807F738 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc index 8150664a..ab61e061 100644 --- a/data/scripts/script_0800D6D0.inc +++ b/data/scripts/script_0800D6D0.inc @@ -1,17 +1,21 @@ SCRIPT_START script_0800D6D0 - BeginBlock + BeginBlock .ifdef JP CheckLocalFlag 0x00f0 .else .ifdef EU CheckLocalFlag 0x00f0 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00f0 @ TODO deduplicate +.else CheckLocalFlag 0x00f3 .endif .endif +.endif JumpIf script_0800D6E8 DoPostScriptAction 0x0008 - EndBlock + EndBlock script_0800D6E0: .ifdef JP CheckLocalFlag 0x00f0 @@ -19,9 +23,13 @@ script_0800D6E0: .ifdef EU CheckLocalFlag 0x00f0 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00f0 @ TODO deduplicate +.else CheckLocalFlag 0x00f3 .endif .endif +.endif JumpIfNot script_0800D6E0 script_0800D6E8: DoPostScriptAction 0x0007 diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc index 63cfa930..4cbdf8b2 100644 --- a/data/scripts/script_0800D6F0.inc +++ b/data/scripts/script_0800D6F0.inc @@ -1,17 +1,21 @@ SCRIPT_START script_0800D6F0 - BeginBlock + BeginBlock .ifdef JP CheckLocalFlag 0x00f2 .else .ifdef EU CheckLocalFlag 0x00f2 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00f2 @ TODO deduplicate +.else CheckLocalFlag 0x00f5 .endif .endif +.endif JumpIf script_0800D6E8 DoPostScriptAction 0x0008 - EndBlock + EndBlock script_0800D700: .ifdef JP CheckLocalFlag 0x00f2 @@ -19,9 +23,13 @@ script_0800D700: .ifdef EU CheckLocalFlag 0x00f2 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00f2 @ TODO deduplicate +.else CheckLocalFlag 0x00f5 .endif .endif +.endif JumpIfNot script_0800D700 DoPostScriptAction 0x0007 SCRIPT_END diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc index b2ce1c33..84de7598 100644 --- a/data/scripts/script_0800D710.inc +++ b/data/scripts/script_0800D710.inc @@ -1,22 +1,22 @@ SCRIPT_START script_0800D710 - BeginBlock + BeginBlock Call sub_0807F360 SetEntitySpeed 0x0700 _0807F0B4 0x0007 - CameraTargetEntity + CameraTargetEntity Call sub_0807FBC4 - EndBlock + EndBlock _0807E5F8 0x00000008 WaitForSomething2 0x00000010 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E5F8 0x0000000a WaitForSomething2 0x00000004 - _0807EEB4 + _0807EEB4 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807FBCC - _0807E878 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc index 53cf6c21..01e60a1f 100644 --- a/data/scripts/script_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D76C - BeginBlock + BeginBlock Call sub_0807F360 DoPostScriptAction 0x000b SetEntitySpeed 0x0200 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000008 DoPostScriptAction 0x0004 Wait 0x003c @@ -24,12 +24,12 @@ SCRIPT_START script_0800D76C WaitForSomething2 0x00000008 Jump script_0800D80C SCRIPT_START script_0800D7DC - BeginBlock + BeginBlock Call sub_0807F360 DoPostScriptAction 0x000b SetEntityPositionRelative 0x0268, 0x01d8 SetEntitySpeed 0x0100 - EndBlock + EndBlock WaitForSomething2 0x00000002 _0807EDD4 0x01f0, 0x01d8 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc index 8b2968e9..cfde64fd 100644 --- a/data/scripts/script_0800D84C.inc +++ b/data/scripts/script_0800D84C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800D84C - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800D850: CheckRoomFlag 0x0000 JumpIfNot script_0800D850 - _0807E864 + _0807E864 Call sub_0807DF28 Wait 0x003c Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index 4c47ac07..56f230fa 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800D874 - BeginBlock + BeginBlock Call sub_0807F934 DoPostScriptAction 0x0008 SetIntVariable 0x00000001 Call sub_0806DA04 - EndBlock + EndBlock script_0800D88E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800D88E - _0807E864 + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x0045 JumpIf script_0800D8B0 @@ -28,27 +28,27 @@ script_0800D8CE: JumpIfNot script_0800D8CE script_0800D8D6: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800D88E .2byte 0x0000 SCRIPT_START script_0800D8E4 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 CheckInventory1 0x0017 JumpIf script_0800D924 - EndBlock + EndBlock script_0800D8F4: CheckInventory1 0x0017 JumpIfNot script_0800D8F4 Call sub_0807DF28 - _0807E864 - WaitPlayerAction8 + _0807E864 + WaitPlayerAction8 _0807EB28 0x1325 - _0807EA94 + _0807EA94 PlaySound SFX_113 SetIntVariable 0x00000000 Call sub_0806DA1C - _0807E878 + _0807E878 Call sub_0807DF50 script_0800D924: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc index 2ad1c0b1..43b2abb5 100644 --- a/data/scripts/script_0800D92C.inc +++ b/data/scripts/script_0800D92C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D92C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00a0, 0x0078 _0807EB44 0x0000 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index f98cd972..662df63e 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800D954 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 Call sub_0807F180 - EndBlock + EndBlock script_0800D962: CheckPlayerInRegion 0x0118, 0x0038, 0x3050 JumpIfNot script_0800D962 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_0800DA00 @@ -27,16 +27,16 @@ script_0800D962: _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807F050 0x006d - WaitPlayerAction8 + WaitPlayerAction8 _0807EB28 0x1703 - _0807EA94 + _0807EA94 Wait 0x003c SetLocalFlag 0x0032 PlaySound SFX_113 SetIntVariable 0x00000001 Call sub_0806DA1C Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc index 9f15202c..3c9463ec 100644 --- a/data/scripts/script_0800DA00.inc +++ b/data/scripts/script_0800DA00.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DA00 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0118, 0x0060 _0807EB44 0x0000 diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc index 042eae3c..bfed0909 100644 --- a/data/scripts/script_0800DA28.inc +++ b/data/scripts/script_0800DA28.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DA28 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - EndBlock + EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0007 Wait 0x003c diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index bfb4af16..6069f4b8 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -1,18 +1,18 @@ SCRIPT_START script_0800DA60 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800DA64: CheckPlayerInRegion 0x0078, 0x0148, 0x4040 JumpIfNot script_0800DA64 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - _0807E8E4_0 + _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0080 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -25,22 +25,22 @@ script_0800DA64: _0807E8E4_0 CallWithArg sub_0807F75C, 0x00780138 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807F5C0 SetRoomFlag 0x0000 Call sub_0807F40C Wait 0x001e - _0807E8E4_1 + _0807E8E4_1 Wait 0x000a - _0807E8E4_3 + _0807E8E4_3 Wait 0x000a - _0807E8E4_2 + _0807E8E4_2 Call sub_0807F3F8 Wait 0x003c SetRoomFlag 0x0001 SetLocalFlag 0x0077 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800DB18.inc b/data/scripts/script_0800DB18.inc index 3cf5e35c..6af5c26a 100644 --- a/data/scripts/script_0800DB18.inc +++ b/data/scripts/script_0800DB18.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DB18 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc index 5dd5e987..dc596557 100644 --- a/data/scripts/script_0800DB28.inc +++ b/data/scripts/script_0800DB28.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800DB28 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0000 DoPostScriptAction 0x0014 - EndBlock + EndBlock WaitForSomething2 0x00000001 Wait 0x003c DoPostScriptAction 0x0004 diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index c35c65dc..090c75e6 100644 --- a/data/scripts/script_0800DB78.inc +++ b/data/scripts/script_0800DB78.inc @@ -1,27 +1,27 @@ SCRIPT_START script_0800DB78 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800DB7C: CallWithArg sub_0807F6B4, 0x000000a0 JumpIf script_0800DB7C - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807F0B4 0x0001 SetEntityPositionRelative 0x0078, 0x0078 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 _0807EB28 0x1648 - _0807EA94 + _0807EA94 Call sub_0804D7EC _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 script_0800DBCA: CheckRoomFlag 0x0000 JumpIfNot script_0800DBCA - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0804D810 @@ -37,7 +37,7 @@ script_0800DBCA: MessageFromTargetPos 0x1643, 0x0002 _0807EA94 _0807EB28 0x1645 - _0807EA94 + _0807EA94 Call sub_0807F3F8 _0807E5F8 0x00000001 StopBgm diff --git a/data/scripts/script_0800DC4C.inc b/data/scripts/script_0800DC4C.inc index c08bc36d..c9899815 100644 --- a/data/scripts/script_0800DC4C.inc +++ b/data/scripts/script_0800DC4C.inc @@ -4,18 +4,18 @@ SCRIPT_START script_0800DC4C StartPlayerScript script_0800DE50 WaitForSomething2 0x00000006 _0807EB28 0x1646 - _0807EA94 + _0807EA94 _0807E5F8 0x00000001 StartPlayerScript script_0800DE2C - CameraTargetPlayer + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitFor_2 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 SetLocalFlag 0x0079 CallWithArg sub_0806DA1C, 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index 7ac06b7e..f0d48c29 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DCAC - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 - EndBlock + EndBlock WaitForSomething2 0x00000001 CallWithArg sub_0807F8E8, 0x00000000 _0807E5F8 0x00000002 diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc index c8ca954c..b2c5c367 100644 --- a/data/scripts/script_0800DDD0.inc +++ b/data/scripts/script_0800DDD0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DDD0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc index e8c74e5f..00579691 100644 --- a/data/scripts/script_0800DE00.inc +++ b/data/scripts/script_0800DE00.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DE00 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EB44 0x0000 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc index 125cf382..12867776 100644 --- a/data/scripts/script_0800DE2C.inc +++ b/data/scripts/script_0800DE2C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DE2C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 diff --git a/data/scripts/script_0800DE50.inc b/data/scripts/script_0800DE50.inc index afed1ce2..012e71d1 100644 --- a/data/scripts/script_0800DE50.inc +++ b/data/scripts/script_0800DE50.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800DE50 - EndBlock + EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 diff --git a/data/scripts/script_0800DE78.inc b/data/scripts/script_0800DE78.inc index eda4b452..7c0b11f3 100644 --- a/data/scripts/script_0800DE78.inc +++ b/data/scripts/script_0800DE78.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800DE78 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_0800DEB0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000002 _0807EB28 0x1647 - _0807EA94 + _0807EA94 SetLocalFlag 0x007a Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc index 5ae10991..2c43999a 100644 --- a/data/scripts/script_0800DEB0.inc +++ b/data/scripts/script_0800DEB0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DEB0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc index 8a4dc2fd..3c5f2e5e 100644 --- a/data/scripts/script_0800DED4.inc +++ b/data/scripts/script_0800DED4.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800DED4 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000b Call sub_08066D04 - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08066D14 SetEntityPositionRelative 0x0198, 0x0148 DoPostScriptAction 0x0007 - EndBlock + EndBlock _0807EDD4 0x0198, 0x01a8 _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index 8e114e77..1afd3357 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800DF24 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StopBgm - _0807E8E4_2 + _0807E8E4_2 Wait 0x005a Call sub_0807F3F8 Wait 0x003c - _0807E8E4_0 + _0807E8E4_0 _0807F0B4 0x0001 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 Call sub_08066C94 Wait 0x00e9 @@ -29,10 +29,10 @@ SCRIPT_START script_0800DF24 DoPostScriptAction 0x0008 Wait 0x0080 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807F5C0 SetLocalFlag 0x0078 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc index e3de08af..99f9742c 100644 --- a/data/scripts/script_0800DFB4.inc +++ b/data/scripts/script_0800DFB4.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800DFB4 - EndBlock + EndBlock script_0800DFB6: CheckRoomFlag 0x0001 JumpIfNot script_0800DFB6 StopBgm - _0807E864 + _0807E864 Call sub_0807DF28 PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index 15056000..1b159705 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DFE4 - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 - EndBlock + _0807E864 + EndBlock StopBgm MessageFromTargetPos 0x1632, 0x0002 _0807EA94 @@ -12,11 +12,11 @@ script_0800DFFE: JumpIfNot script_0800DFFE PlayBgm BGM_VAATI_TRANSFIGURED Call sub_0807DF50 - _0807E878 + _0807E878 script_0800E012: CheckRoomFlag 0x0002 JumpIfNot script_0800E012 - _0807E864 + _0807E864 Call sub_0807DF28 SetLocalFlag 0x007b MessageFromTargetPos 0x1639, 0x000c @@ -25,7 +25,7 @@ script_0800E012: PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000005 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc index 7bafd454..b1091a3d 100644 --- a/data/scripts/script_0800E050.inc +++ b/data/scripts/script_0800E050.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800E050 - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 - EndBlock + _0807E864 + EndBlock StopBgm StopBgm Wait 0x0078 _0807EB28 0x1638 - _0807EA94 + _0807EA94 SetRoomFlag 0x0000 Wait 0x001e _0807E5F8 0x00000001 StartPlayerScript script_0800E094 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc index a3891eab..269c0dcd 100644 --- a/data/scripts/script_0800E094.inc +++ b/data/scripts/script_0800E094.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E094 - BeginBlock + BeginBlock SetEntitySpeed 0x00c0 - EndBlock + EndBlock WaitForSomething2 0x00000001 DoPostScriptAction 0x0001 _0807EDD4 0x00a8, 0x002c diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index 9e5a553f..5451a2f8 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800E0BC - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0093 JumpIf script_0800E12E _0807E930 0x0008 CallWithArg sub_0807F8E8, 0x00000000 - EndBlock + EndBlock script_0800E0DE: CheckRoomFlag 0x0000 JumpIfNot script_0800E0DE - _0807E864 + _0807E864 Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 @@ -24,40 +24,40 @@ script_0800E0DE: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + _0807EB8C + _0807EB74 Wait 0x000a MessageNoOverlap 0x2402 _0807EA94 SetLocalFlag 0x0093 script_0800E12E: Call sub_080668F0 - _0807E878 - EndBlock + _0807E878 + EndBlock script_0800E138: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E138 _0807E864 _0807EB74 MessageNoOverlap 0x2402 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E138 .2byte 0x0000 SCRIPT_START script_0800E154 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0094 JumpIf script_0800E1D0 _0807E930 0x0010 CallWithArg sub_0807F8E8, 0x00000001 - EndBlock + EndBlock script_0800E176: CheckRoomFlag 0x0001 JumpIfNot script_0800E176 - _0807E864 + _0807E864 Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 @@ -71,8 +71,8 @@ script_0800E176: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + _0807EB8C + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a MessageNoOverlap 0x2401 @@ -80,42 +80,42 @@ script_0800E176: SetLocalFlag 0x0094 script_0800E1D0: CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 - _0807E878 - EndBlock + _0807E9D4 + _0807E878 + EndBlock script_0800E1E0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E1E0 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2401 _0807EA94 _0807E878 Jump script_0800E1E0 SCRIPT_START script_0800E200 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0073 JumpIfNot script_0800E232 - _0807E9D4 + _0807E9D4 SetEntityPositionRelative 0x0070, 0x0168 _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock Jump script_0800E32E script_0800E232: CheckLocalFlag 0x0095 JumpIf script_0800E29A _0807E930 0x0010 CallWithArg sub_0807F8E8, 0x00000002 - EndBlock + EndBlock script_0800E24A: CheckRoomFlag 0x0002 JumpIfNot script_0800E24A - _0807E864 + _0807E864 Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 @@ -129,20 +129,20 @@ script_0800E24A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + _0807EB8C + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 SetLocalFlag 0x0095 script_0800E29A: DoPostScriptAction 0x0000 CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 - _0807E878 - EndBlock + _0807E9D4 + _0807E878 + EndBlock script_0800E2AE: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800E312 CheckLocalFlag 0x0093 JumpIfNot script_0800E2AE @@ -150,22 +150,22 @@ script_0800E2AE: JumpIfNot script_0800E2AE CheckLocalFlag 0x0095 JumpIfNot script_0800E2AE - _0807E9DC + _0807E9DC SetLocalFlag 0x0073 - EndBlock + EndBlock _0807EB44 0x0000 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0088, 0x0168 _0807EB44 0x0006 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0070, 0x0168 - _0807EB74 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 + _0807E9D4 Jump script_0800E32E script_0800E312: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 EndBlock MessageNoOverlap 0x2404 @@ -173,10 +173,10 @@ script_0800E312: _0807E878 Jump script_0800E2AE script_0800E32E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E32E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2403 _0807EA94 @@ -184,7 +184,7 @@ script_0800E32E: Jump script_0800E32E .2byte 0x0000 SCRIPT_START script_0800E350 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0071 @@ -193,11 +193,11 @@ SCRIPT_START script_0800E350 JumpIf script_0800E3BE _0807E930 0x000c CallWithArg sub_0807F8E8, 0x00000000 - EndBlock + EndBlock script_0800E37A: CheckRoomFlag 0x0000 JumpIfNot script_0800E37A - _0807E864 + _0807E864 Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 @@ -211,15 +211,15 @@ script_0800E37A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB74 + _0807EB74 SetLocalFlag 0x0096 script_0800E3BE: DoPostScriptAction 0x0000 - _0807E9D4 - _0807E878 - EndBlock + _0807E9D4 + _0807E878 + EndBlock script_0800E3C8: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E3C8 _0807E864 _0807EB74 @@ -227,68 +227,68 @@ script_0800E3C8: _0807EA94 Wait 0x000f _0807F034 0x0053 - WaitPlayerAction8 + WaitPlayerAction8 SetLocalFlag 0x0071 - _0807E878 + _0807E878 script_0800E3E8: - _0807E9D4 - _0807E878 - EndBlock + _0807E9D4 + _0807E878 + EndBlock script_0800E3EE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E3EE _0807E864 _0807EB74 MessageNoOverlap 0x240d _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E3EE SCRIPT_START script_0800E408 - BeginBlock + BeginBlock _0807EB44 0x0002 DoPostScriptAction 0x000a Call sub_080668F0 - EndBlock + EndBlock script_0800E41A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E41A _0807E864 _0807EB74 MessageNoOverlap 0x2406 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E41A SCRIPT_START script_0800E434 - BeginBlock + BeginBlock _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800E44C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E44C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2405 _0807EA94 _0807E878 Jump script_0800E44C SCRIPT_START script_0800E46C - BeginBlock + BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800E484: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E484 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2407 _0807EA94 @@ -297,9 +297,9 @@ script_0800E484: SCRIPT_START script_0800E4A4 - BeginBlock + BeginBlock Call sub_0807F354 - EndBlock + EndBlock CheckLocalFlag 0x007c JumpIf script_0800E4FA script_0800E4B6: @@ -313,16 +313,18 @@ script_0800E4B6: .endif .endif JumpIfNot script_0800E4B6 - BeginBlock + BeginBlock _0807E864 .ifdef JP +.ifndef DEMO_JP Call sub_0805E544 +.endif .else .ifdef EU Call sub_0805E544 .endif .endif - EndBlock + EndBlock Call sub_0807F3F8 Wait 0x003c MessageFromTarget 0x160c @@ -333,19 +335,21 @@ script_0800E4B6: Wait 0x001e _0807EB28 0x160e Wait 0x003c - _0807EA94 - BeginBlock + _0807EA94 + BeginBlock PlayBgm BGM_FIGHT_THEME2 SetLocalFlag 0x007c .ifdef JP +.ifndef DEMO_JP Call UnfreezeTime +.endif .else .ifdef EU Call UnfreezeTime .endif .endif script_0800E4FA: - _0807E878 + _0807E878 DoPostScriptAction 0x0006 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc index 3beea212..52e85d09 100644 --- a/data/scripts/script_0800E504.inc +++ b/data/scripts/script_0800E504.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800E504 - BeginBlock - EndBlock + BeginBlock + EndBlock CheckLocalFlag 0x007d JumpIf script_0800E53C script_0800E510: CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 JumpIfNot script_0800E510 - _0807E864 + _0807E864 Wait 0x001e Call sub_0807F3F8 Wait 0x003c @@ -15,6 +15,6 @@ script_0800E510: _0807EB28 0x1617 SetLocalFlag 0x007d script_0800E53C: - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc index d56ce3ff..1b7a7f95 100644 --- a/data/scripts/script_0800E544.inc +++ b/data/scripts/script_0800E544.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800E544 - BeginBlock - EndBlock + BeginBlock + EndBlock CheckLocalFlag 0x007e JumpIf script_0800E582 script_0800E550: CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 JumpIfNot script_0800E550 - _0807E864 + _0807E864 Wait 0x001e Call sub_0807F3F8 Wait 0x003c @@ -16,7 +16,7 @@ script_0800E550: Call sub_08053494 SetLocalFlag 0x007e script_0800E582: - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index 77f8324a..1a6df15e 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800E58C - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0000 DoPostScriptAction 0x0014 - EndBlock + EndBlock Wait 0x003c PlaySound SFX_105 Wait 0x003c diff --git a/data/scripts/script_0800E5C4.inc b/data/scripts/script_0800E5C4.inc index 04160a36..49daf384 100644 --- a/data/scripts/script_0800E5C4.inc +++ b/data/scripts/script_0800E5C4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E5C4 - BeginBlock + BeginBlock CheckLocalFlag 0x0086 JumpIfNot script_0800E5D6 DoPostScriptAction 0x0006 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc index c1219cee..b2e3dd76 100644 --- a/data/scripts/script_0800E5D6.inc +++ b/data/scripts/script_0800E5D6.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E5D6 - EndBlock + EndBlock script_0800E5D8: CheckLocalFlag 0x0086 JumpIfNot script_0800E5D8 - _0807E864 + _0807E864 Wait 0x003c SetIntVariable 0x00000905 Call sub_0807F420 SetRoomFlag 0x0001 Wait 0x001e - _0807E878 + _0807E878 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc index 282b2a6d..f5bf0e9e 100644 --- a/data/scripts/script_0800E600.inc +++ b/data/scripts/script_0800E600.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E600 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0000 - _0807E864 + _0807E864 Call sub_0807F354 - EndBlock - WaitForPlayerAction0x17 - _0807E8E4_0 + EndBlock + WaitForPlayerAction0x17 + _0807E8E4_0 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + _0807E878 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc index 1e325aeb..d19fe97c 100644 --- a/data/scripts/script_0800E62C.inc +++ b/data/scripts/script_0800E62C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E62C - BeginBlock + BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0008 - _0807E864 + _0807E864 Call sub_0807F354 - EndBlock - WaitForPlayerAction0x17 - _0807E8E4_1 + EndBlock + WaitForPlayerAction0x17 + _0807E8E4_1 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + _0807E878 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc index 3368222f..ca0d71bf 100644 --- a/data/scripts/script_0800E658.inc +++ b/data/scripts/script_0800E658.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E658 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0010 - _0807E864 + _0807E864 Call sub_0807F354 - EndBlock - WaitForPlayerAction0x17 - _0807E8E4_2 + EndBlock + WaitForPlayerAction0x17 + _0807E8E4_2 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + _0807E878 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc index 1f12e319..428f2ece 100644 --- a/data/scripts/script_0800E684.inc +++ b/data/scripts/script_0800E684.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E684 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0018 - _0807E864 + _0807E864 Call sub_0807F354 - EndBlock - WaitForPlayerAction0x17 - _0807E8E4_3 + EndBlock + WaitForPlayerAction0x17 + _0807E8E4_3 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + _0807E878 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index 585fef2f..1828fe16 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -1,69 +1,69 @@ SCRIPT_START script_0800E6B0 - BeginBlock + BeginBlock Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800E6BE: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800E6D2 Call sub_08060158 - EndBlock + EndBlock Jump script_0800E6BE script_0800E6D2: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806025C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E6BE SCRIPT_START script_0800E6E8 - BeginBlock + BeginBlock Call sub_0806ADFC DoPostScriptAction 0x000a script_0800E6F4: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800E708 Call sub_0806AEE4 Jump script_0800E6F4 script_0800E708: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806AFE8 JumpIf script_0800E722 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E6F4 script_0800E722: - _0807EA94 + _0807EA94 _0807F034 0x0057 - WaitPlayerAction8 - _0807EA94 - _0807E878 + WaitPlayerAction8 + _0807EA94 + _0807E878 Jump script_0800E6F4 .2byte 0x0000 SCRIPT_START script_0800E734 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800E73E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E73E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0806AF60, 0x00000000 Call sub_0806AFE8 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800E73E SCRIPT_START script_0800E760 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a SetEntitySpeed 0x0200 CheckGlobalFlag 0x0029 @@ -74,23 +74,23 @@ script_0800E77C: SetEntityPositionRelative 0x0188, 0x0098 Jump script_0800E6F4 script_0800E786: - EndBlock + EndBlock script_0800E788: - BeginBlock + BeginBlock CheckGlobalFlag 0x002a JumpIf script_0800E7BA - CheckEntityInteractType + CheckEntityInteractType JumpIf script_0800E7A4 Call sub_0806AEE4 - EndBlock + EndBlock Jump script_0800E788 script_0800E7A4: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806AFE8 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E788 script_0800E7BA: DoPostScriptAction 0x000f @@ -99,58 +99,58 @@ script_0800E7BA: Call sub_0806AF70 _0807EE04 0x0188, 0x0058 script_0800E7D8: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0806AF78 - _0807EE30 + _0807EE30 JumpIfNot script_0800E7D8 - EntityHasHeight + EntityHasHeight JumpIf script_0800E7D8 - EndBlock + EndBlock Jump script_0800E6F4 SCRIPT_START script_0800E7F4 - BeginBlock + BeginBlock Call sub_0806C674 DoPostScriptAction 0x000a _0807EB44 0x0004 - EndBlock + EndBlock script_0800E806: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E806 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C70C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 Jump script_0800E806 .2byte 0x0000 SCRIPT_START script_0800E824 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0000 - EndBlock + EndBlock script_0800E832: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E832 - _0807E864 + _0807E864 _0807EB44 0x0004 BeginBlock MessageFromTarget 0x4501 CallWithArg sub_0807F854, 0x00010032 CallWithArg sub_0807F854, 0x000200c8 CallWithArg sub_0807F854, 0x00030190 - EndBlock - _0807EA94 - _0807EB38 + EndBlock + _0807EA94 + _0807EB38 JumpTable script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872 script_0800E872: BeginBlock MessageFromTarget 0x4505 CallWithArg sub_0807F854, 0x00010190 - EndBlock - _0807EA94 + EndBlock + _0807EA94 HasRupees 0x0190 JumpIfNot script_0800E908 ModRupees 0xfe70 diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index 5a632850..f9465a10 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -2,8 +2,8 @@ SCRIPT_START script_0800E8A4 BeginBlock MessageFromTarget 0x4504 CallWithArg sub_0807F854, 0x000100c8 - EndBlock - _0807EA94 + EndBlock + _0807EA94 HasRupees 0x00c8 JumpIfNot script_0800E908 ModRupees 0xff38 diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index 4dc0a75b..f5a7cd6c 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -2,8 +2,8 @@ SCRIPT_START script_0800E8D6 BeginBlock MessageFromTarget 0x4503 CallWithArg sub_0807F854, 0x00010032 - EndBlock - _0807EA94 + EndBlock + _0807EA94 HasRupees 0x0032 JumpIfNot script_0800E908 ModRupees 0xffce diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index 314462db..24c3c825 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -4,48 +4,48 @@ SCRIPT_START script_0800E908 script_0800E910: MessageFromTarget 0x4509 script_0800E914: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0000 Jump script_0800E832 SCRIPT_START script_0800E920 - BeginBlock + BeginBlock Call sub_0806C4F8 DoPostScriptAction 0x000a _0807EB44 0x0000 - EndBlock + EndBlock script_0800E932: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E932 - _0807E864 + _0807E864 _0807EB44 0x0004 _0807E930 0x0004 script_0800E942: Call sub_0806C4A8 JumpIfNot script_0800E942 Call sub_0806C4DC - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0000 _0807E930 0x0000 Jump script_0800E932 .2byte 0x0000 SCRIPT_START script_0800E964 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock script_0800E974: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E974 - _0807E864 + _0807E864 _0807E930 0x0008 Call sub_0807F2D4 _0807E930 0x0009 Call sub_0806B260 JumpIfNot script_0800E9E4 - _0807EA94 + _0807EA94 DoPostScriptAction 0x000b StartPlayerScript script_0800E9F4 WaitForSomething2 0x00000001 @@ -66,8 +66,8 @@ script_0800E974: _0807EA94 SetLocalFlag 0x0075 script_0800E9E4: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 _0807E930 0x0000 Jump script_0800E974 diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc index 1c1b1d22..c801e9d9 100644 --- a/data/scripts/script_0800E9F4.inc +++ b/data/scripts/script_0800E9F4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800E9F4 - BeginBlock + BeginBlock _0807EB44 0x0004 SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0078, 0x0080 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index fc623ce3..12b58b6c 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -1,185 +1,185 @@ SCRIPT_START script_0800EA54 - BeginBlock + BeginBlock Call sub_0806CE5C DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0008 - EndBlock + EndBlock script_0800EA6A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EA6A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000004 Call sub_0807F2D4 _0807E930 0x0009 Call sub_0806CE80 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807E930 0x000a Call sub_0807F2D4 _0807E930 0x0008 Jump script_0800EA6A SCRIPT_START script_0800EAA4 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 Call sub_0806C09C DoPostScriptAction 0x000a _0807E930 0x0000 _0807EB44 0x0004 - EndBlock + EndBlock script_0800EABC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EABC - BeginBlock - _0807E864 - _0807EB74 + BeginBlock + _0807E864 + _0807EB74 CallWithArg sub_0806C028, 0x00000004 - EndBlock + EndBlock script_0800EAD4: Call sub_0806C00C JumpIfNot script_0800EAD4 _0807E930 0x0008 Call sub_0806C038 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 _0807E930 0x0000 Jump script_0800EABC SCRIPT_START script_0800EAF8 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock script_0800EB0E: - _0807E30C + _0807E30C JumpIfNot script_0800EB0E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800EB0E .2byte 0x0000 SCRIPT_START script_0800EB2C - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 - EndBlock + EndBlock script_0800EB44: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EB44 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800EB44 .2byte 0x0000 SCRIPT_START script_0800EB64 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0006 Call sub_08061FD8 - EndBlock + EndBlock script_0800EB7C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EB7C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0006 Call sub_08061FD8 Jump script_0800EB7C - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0002 Call sub_08061FD8 - EndBlock + EndBlock Jump script_0800EBF4 SCRIPT_START script_0800EBC0 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 - EndBlock + EndBlock Jump script_0800EBF4 SCRIPT_START script_0800EBDC - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0006 Call sub_08061FD8 - EndBlock + EndBlock script_0800EBF4: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EBF4 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800EBF4 .2byte 0x0000 SCRIPT_START script_0800EC14 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0002 Call sub_08061FD8 - EndBlock + EndBlock script_0800EC2C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EC2C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0002 Call sub_08061FD8 Jump script_0800EC2C SCRIPT_START script_0800EC54 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 - EndBlock + EndBlock script_0800EC6C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EC6C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800EC6C .2byte 0x0000 SCRIPT_START script_0800EC8C - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 CallWithArg sub_08061FB8, 0x00000001 SetEntitySpeed 0x0040 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0002 - EndBlock + EndBlock script_0800ECAC: _0807EB44 0x0006 _0807E930 0x0007 @@ -203,63 +203,63 @@ script_0800ECAC: Wait 0x001e Jump script_0800ECAC SCRIPT_START script_0800ED04 - BeginBlock + BeginBlock Call sub_080639D0 DoPostScriptAction 0x000a - EndBlock - BeginBlock + EndBlock + BeginBlock CallWithArg sub_08063850, 0x00000000 - EndBlock + EndBlock script_0800ED20: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800ED20 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_08063850, 0x00000000 Call sub_08063944 - _0807EA94 + _0807EA94 JumpIfNot script_0800ED46 _0807F050 0x0070 - WaitPlayerAction8 + WaitPlayerAction8 script_0800ED46: - _0807E878 + _0807E878 Call sub_08063874 CallWithArg sub_08063850, 0x00000000 Jump script_0800ED20 SCRIPT_START script_0800ED5C - BeginBlock + BeginBlock Call sub_08064CC0 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0002 _0807E930 0x0000 - EndBlock + EndBlock script_0800ED76: - _0807E944 - _0807E864 - _0807EB74 + _0807E944 + _0807E864 + _0807EB74 Call sub_08064CD8 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800ED76 .2byte 0x0000 SCRIPT_START script_0800ED90 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a script_0800ED98: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800EDB6 TestBit 0x00000001 JumpIf script_0800EE12 Call sub_0806AEE4 Jump script_0800ED98 script_0800EDB6: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf script_0800EE3E @@ -277,11 +277,11 @@ script_0800EDB6: Call sub_0807F420 _0807E5F8 0x00000040 Call sub_0807DF50 - _0807E878 + _0807E878 SetLocalFlag 0x00ae Jump script_0800ED98 script_0800EE12: - EndBlock + EndBlock WaitForSomething2 0x00000002 _0807EB44 0x0002 CallWithArg sub_0806AF60, 0x00000008 @@ -293,24 +293,24 @@ script_0800EE3E: MessageFromTarget 0x4c16 _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800ED98 SCRIPT_START script_0800EE50 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a script_0800EE58: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800EE76 TestBit 0x00000001 JumpIf script_0800EED2 Call sub_0806AEE4 Jump script_0800EE58 script_0800EE76: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf script_0800EEFE @@ -328,11 +328,11 @@ script_0800EE76: Call sub_0807F420 _0807E5F8 0x00000008 Call sub_0807DF50 - _0807E878 + _0807E878 SetLocalFlag 0x00ae Jump script_0800EE58 script_0800EED2: - EndBlock + EndBlock WaitForSomething2 0x00000010 _0807EB44 0x0006 CallWithArg sub_0806AF60, 0x00000008 @@ -344,7 +344,7 @@ script_0800EEFE: MessageFromTarget 0x4c15 _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800EE58 MessageFromTarget 0x4c07 _0807EA94 diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index 3e4818ac..037fbfc6 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800EF40 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 CheckGlobalFlag 0x001f JumpIf script_0800EF92 - EndBlock + EndBlock script_0800EF50: Call sub_080869A4 JumpIfNot script_0800EF50 - _0807E864 + _0807E864 CheckLocalFlagByOffset 0x0200, 0x006d JumpIf script_0800EF82 MessageFromTarget 0x4d01 @@ -15,14 +15,14 @@ script_0800EF50: StartPlayerScript script_0800EF9C WaitForSomething2 0x00000001 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800EF50 script_0800EF82: SetGlobalFlag 0x001f MessageFromTarget 0x4d02 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 script_0800EF92: Call sub_0808692C SCRIPT_END diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc index 6e1be5e2..d3e025d2 100644 --- a/data/scripts/script_0800EF9C.inc +++ b/data/scripts/script_0800EF9C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800EF9C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0001 _0807ECC4 0x0008 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index 405abdfe..77fdfb49 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800EFC0 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CheckLocalFlag 0x007b JumpIf script_0800F082 - EndBlock + EndBlock Jump script_0800EFFE script_0800EFDA: _0807EB44 0x0006 @@ -39,19 +39,19 @@ script_0800EFFE: JumpIf script_0800F082 Jump script_0800EFDA script_0800F082: - EndBlock + EndBlock Call sub_0806AEE4 Jump script_0800F082 .2byte 0x0000 SCRIPT_START script_0800F090 - BeginBlock + BeginBlock _0807F0B4 0x0001 - CameraTargetPlayer - EndBlock + CameraTargetPlayer + EndBlock script_0800F09A: CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 JumpIfNot script_0800F09A - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 LoadRoomEntityList gUnk_080EE8AC @@ -66,27 +66,27 @@ script_0800F09A: MessageFromTargetPos 0x1202, 0x000c _0807EA94 _0807F034 0x0067 - WaitPlayerAction8 - _0807E8E4_0 + WaitPlayerAction8 + _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 MessageFromTargetPos 0x1203, 0x000c _0807EA94 _0807E5F8 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 WaitForSomething2 0x00000040 script_0800F11A: CheckKinstoneFused 0x0032 JumpIfNot script_0800F11A - _0807E864 + _0807E864 Call sub_0807DF28 _0807E5F8 0x0000001e Wait 0x003c - _0807E8E4_1 + _0807E8E4_1 WaitForSomething2 0x000003c0 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc index 30be825a..debc95ba 100644 --- a/data/scripts/script_0800F14C.inc +++ b/data/scripts/script_0800F14C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F14C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0000 _0807EB44 0x0006 DoPostScriptAction 0x0004 diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index 0088b802..36ca4f79 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800F184 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0008 DoPostScriptAction 0x000a - EndBlock + EndBlock Call sub_0807F348 _0807EB44 0x0002 WaitForSomething2 0x00000002 @@ -13,7 +13,7 @@ SCRIPT_START script_0800F184 _0807EDD4 0x01f8, 0x0328 _0807EB44 0x0004 _0807E930 0x0008 - _0807E8E4_0 + _0807E8E4_0 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 Call sub_0806E440 @@ -21,14 +21,14 @@ SCRIPT_START script_0800F184 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 script_0800F1E6: - EndBlock - BeginBlock + EndBlock + BeginBlock CallWithArg sub_0807F680, 0x000001c0 JumpIf script_0800F22A - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 - _0807EB74 + _0807EB74 _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c @@ -36,15 +36,15 @@ script_0800F1E6: _0807EA94 StartPlayerScript script_0800F33C WaitForSomething2 0x00000400 - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F22A: CallWithArg sub_0807F680, 0x00000230 JumpIfNot script_0800F26A - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 - _0807EB74 + _0807EB74 _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c @@ -52,15 +52,15 @@ script_0800F22A: _0807EA94 StartPlayerScript script_0800F354 WaitForSomething2 0x00000400 - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F26A: CallWithArg sub_0807F6B4, 0x00000310 JumpIf script_0800F2AA - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 - _0807EB74 + _0807EB74 _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c @@ -68,15 +68,15 @@ script_0800F26A: _0807EA94 StartPlayerScript script_0800F36C WaitForSomething2 0x00000400 - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F2AA: CallWithArg sub_0807F6B4, 0x00000340 JumpIfNot script_0800F2EA - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 - _0807EB74 + _0807EB74 _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c @@ -84,25 +84,25 @@ script_0800F2AA: _0807EA94 StartPlayerScript script_0800F384 WaitForSomething2 0x00000400 - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F2EA: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckKinstoneFused 0x0032 JumpIf script_0800F314 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F2EA - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 _0807E930 0x0008 MessageFromTargetPos 0x1208, 0x000c _0807EA94 _0807E878 Jump script_0800F1E6 script_0800F314: - EndBlock + EndBlock _0807E5F8 0x00000040 WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index cc811603..dda4ca39 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F39C - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b - EndBlock + EndBlock Call sub_0807F348 WaitForSomething2 0x00000004 DoPostScriptAction 0x0007 @@ -18,9 +18,9 @@ SCRIPT_START script_0800F39C DoPostScriptAction 0x000a _0807E5F8 0x00000080 script_0800F3EA: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_0800F402 EndBlock _0807E864 @@ -31,7 +31,7 @@ script_0800F3EA: script_0800F402: TestBit 0x00000004 JumpIfNot script_0800F3EA - EndBlock + EndBlock DoPostScriptAction 0x000b Wait 0x0010 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index 8c38742f..acf631a4 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F430 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b - EndBlock + EndBlock Call sub_0807F348 WaitForSomething2 0x00000008 DoPostScriptAction 0x0007 @@ -17,9 +17,9 @@ SCRIPT_START script_0800F430 DoPostScriptAction 0x000a _0807E5F8 0x00000100 script_0800F478: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_0800F490 EndBlock _0807E864 @@ -30,7 +30,7 @@ script_0800F478: script_0800F490: TestBit 0x00000008 JumpIfNot script_0800F478 - EndBlock + EndBlock DoPostScriptAction 0x000b Wait 0x0018 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index 5e620310..99b156af 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F4C4 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b - EndBlock + EndBlock Call sub_0807F348 WaitForSomething2 0x00000010 DoPostScriptAction 0x0007 @@ -17,9 +17,9 @@ SCRIPT_START script_0800F4C4 DoPostScriptAction 0x000a _0807E5F8 0x00000200 script_0800F50C: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_0800F524 EndBlock _0807E864 @@ -30,7 +30,7 @@ script_0800F50C: script_0800F524: TestBit 0x00000010 JumpIfNot script_0800F50C - EndBlock + EndBlock DoPostScriptAction 0x000b Wait 0x0028 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index eeccd99e..0bd91b70 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -1,125 +1,125 @@ SCRIPT_START script_0800F554 - BeginBlock + BeginBlock Call sub_08061FE4 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800F564: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F564 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FE4 Call sub_08061FF4 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800F564 .2byte 0x0000 SCRIPT_START script_0800F584 - BeginBlock + BeginBlock DoPostScriptAction 0x0001 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800F592: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F592 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0001 Jump script_0800F592 .2byte 0x0000 SCRIPT_START script_0800F5B0 - BeginBlock + BeginBlock _0807EB44 0x0006 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000008 - EndBlock + EndBlock script_0800F5C8: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F5C8 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800F5C8 .2byte 0x0000 SCRIPT_START script_0800F5EC - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_0800F604: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F604 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 MessageNoOverlap 0x2511 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800F604 SCRIPT_START script_0800F628 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a DoPostScriptAction 0x0001 - EndBlock + EndBlock script_0800F636: - _0807E30C + _0807E30C JumpIfNot script_0800F636 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800F636 .2byte 0x0000 SCRIPT_START script_0800F650 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800F662: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F662 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0001 Call sub_0806B4F0 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 DoPostScriptAction 0x0000 Jump script_0800F662 .2byte 0x0000 SCRIPT_START script_0800F688 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_0800F6A0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F6A0 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000004 .ifdef JP CheckLocalFlag 0x00ca @@ -127,28 +127,32 @@ script_0800F6A0: .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800F6C4 MessageNoOverlap 0x2512 Jump script_0800F6C8 script_0800F6C4: MessageNoOverlap 0x251f script_0800F6C8: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_0800F6A0 .2byte 0x0000 SCRIPT_START script_0800F6E0 - BeginBlock + BeginBlock DoPostScriptAction 0x0001 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a Call sub_08062788 - EndBlock + EndBlock script_0800F6F4: .ifdef JP CheckLocalFlag 0x00ca @@ -156,17 +160,21 @@ script_0800F6F4: .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800F718 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F6F4 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0001 Jump script_0800F6F4 script_0800F718: diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index 6b5ddced..8ea80527 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F724 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock script_0800F72C: .ifdef JP CheckLocalFlag 0x00ca @@ -9,9 +9,13 @@ script_0800F72C: .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIfNot script_0800F72C DoPostScriptAction 0x0007 Jump script_0800F584 @@ -24,17 +28,21 @@ SCRIPT_START script_0800F73C .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800FA4C - _0807E864 + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x00c8, 0x0148 Call sub_0807F844 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 StartPlayerScript script_0800FA54 _0807E5F8 0x00000002 _0807F0B4 0x0001 @@ -51,12 +59,12 @@ SCRIPT_START script_0800F73C _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807DF50 - _0807E878 + _0807E878 _0807E5F8 0x00000010 WaitForSomething2 0x00000004 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_0800FA78 WaitForSomething2 0x00000001 @@ -67,9 +75,9 @@ SCRIPT_START script_0800F73C _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 WaitForSomething2 0x00000004 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_0800FA9C WaitForSomething2 0x00000001 @@ -80,9 +88,9 @@ SCRIPT_START script_0800F73C _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 WaitForSomething2 0x00000004 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_0800FAC0 WaitForSomething2 0x00000001 @@ -93,14 +101,14 @@ SCRIPT_START script_0800F73C _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 WaitForSomething2 0x00000004 - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_08063C5C PlaySound SFX_CUCCO_MINIGAME_BELL Wait 0x001e - _0807E8E4_0 + _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c MessageFromTargetPos 0x1021, 0x000e @@ -108,7 +116,7 @@ SCRIPT_START script_0800F73C StartPlayerScript script_0800FAE4 SetEntityPositionRelative 0x00f0, 0x0258 _0807F0B4 0x0001 - CameraTargetEntity + CameraTargetEntity Wait 0x001e Call sub_08063C2C WaitForSomething2 0x00000001 @@ -135,7 +143,7 @@ SCRIPT_START script_0800F73C _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - _0807E8E4_1 + _0807E8E4_1 Call sub_08063C2C MessageFromTargetPos 0x1027, 0x0000 _0807EA94 @@ -161,13 +169,13 @@ SCRIPT_START script_0800F73C Wait 0x001e Call sub_08094E0C Wait 0x001e - _0807E8E4_1 + _0807E8E4_1 Call sub_0807F3F8 Wait 0x003c MessageFromTargetPos 0x102b, 0x0000 _0807EA94 _0807F034 0x000d - WaitPlayerAction8 + WaitPlayerAction8 Call sub_0806DC3C Call sub_080791BC CallWithArg sub_0807F244, 0x0000000d @@ -182,7 +190,7 @@ SCRIPT_START script_0800F73C CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Wait 0x000a _0807E5F8 0x00000002 Call sub_08063C44 @@ -192,11 +200,15 @@ SCRIPT_START script_0800F73C .ifdef EU SetLocalFlag 0x00ca .else +.ifdef DEMO_JP + SetLocalFlag 0x00ca @ TODO deduplicate +.else SetLocalFlag 0x00cd .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 script_0800FA4C: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc index bb03b3ad..f860b75f 100644 --- a/data/scripts/script_0800FA54.inc +++ b/data/scripts/script_0800FA54.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FA54 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock SetEntityPositionRelative 0x00d8, 0x0398 _0807EB44 0x0006 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc index 6da1cdb1..1586c6f1 100644 --- a/data/scripts/script_0800FA78.inc +++ b/data/scripts/script_0800FA78.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FA78 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc index 32d80aea..cf738fff 100644 --- a/data/scripts/script_0800FA9C.inc +++ b/data/scripts/script_0800FA9C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FA9C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc index 9ca12a8a..c9240cf5 100644 --- a/data/scripts/script_0800FAC0.inc +++ b/data/scripts/script_0800FAC0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FAC0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc index 0db32cf2..957eb40f 100644 --- a/data/scripts/script_0800FAE4.inc +++ b/data/scripts/script_0800FAE4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FAE4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock Call sub_0807F584 JumpTable script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC script_0800FAFC: diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc index cfc3e949..687e719e 100644 --- a/data/scripts/script_0800FB44.inc +++ b/data/scripts/script_0800FB44.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800FB44 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 DoPostScriptAction 0x000b SetEntitySpeed 0x0080 Call sub_08066D04 - EndBlock + EndBlock WaitForSomething2 0x00000002 Call sub_08066D14 JumpIf script_0800FB6C - MoveEntityToPlayer + MoveEntityToPlayer script_0800FB6C: DoPostScriptAction 0x0007 SetEntityPositionRelative 0x00b8, 0x0398 @@ -23,9 +23,9 @@ script_0800FB6C: DoPostScriptAction 0x0001 _0807E5F8 0x00000004 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 script_0800FBAE: - _0807E30C + _0807E30C JumpIfNot script_0800FBAE DoPostScriptAction 0x000b _0807E5F8 0x00000004 @@ -44,7 +44,7 @@ script_0800FBAE: _0807E5F8 0x00000004 DoPostScriptAction 0x000a script_0800FC06: - _0807E30C + _0807E30C JumpIfNot script_0800FC06 DoPostScriptAction 0x000b _0807E5F8 0x00000004 @@ -61,7 +61,7 @@ script_0800FC06: _0807E5F8 0x00000004 DoPostScriptAction 0x000a script_0800FC52: - _0807E30C + _0807E30C JumpIfNot script_0800FC52 DoPostScriptAction 0x000b _0807E5F8 0x00000004 @@ -78,7 +78,7 @@ script_0800FC52: _0807E5F8 0x00000004 DoPostScriptAction 0x000a script_0800FC9E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FC9E DoPostScriptAction 0x000b _0807EB44 0x0000 diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc index 96592be7..c424f576 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -5,9 +5,13 @@ SCRIPT_START script_0800FD0C .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800FD50 WaitForSomething2 0x00000010 script_0800FD1A: @@ -19,28 +23,32 @@ script_0800FD1A: .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800FD5C - _0807E864 + _0807E864 Call sub_0807F9A4 MessageFromTargetPos 0x2506, 0x0000 _0807EA94 StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 - _0807E878 + _0807E878 Jump script_0800FD1A script_0800FD50: CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot script_0800FD50 script_0800FD5C: - _0807E864 + _0807E864 Call sub_0807F9A4 MessageFromTargetPos 0x106c, 0x0000 _0807EA94 StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 - _0807E878 + _0807E878 Jump script_0800FD50 .2byte 0x0000 diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc index 024ecd82..806f3a31 100644 --- a/data/scripts/script_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -1,42 +1,42 @@ SCRIPT_START script_0800FDA0 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800FDB2: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FDB2 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08069888 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800FDB2 .2byte 0x0000 SCRIPT_START script_0800FDCC - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 SetEntitySpeed 0x0040 - EndBlock + EndBlock script_0800FDE2: Call sub_08069A60 script_0800FDE8: Call sub_0806991C script_0800FDEE: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08069ACC JumpIf script_0800FE06 - _0807EE30 + _0807EE30 JumpIfNot script_0800FDEE Jump script_0800FDE2 script_0800FE06: - EndBlock + EndBlock _0807EB44 0x0002 DoPostScriptAction 0x0000 Wait 0x001e @@ -53,27 +53,27 @@ script_0800FE06: Jump script_0800FDE8 .2byte 0x0000 SCRIPT_START script_0800FE44 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 SetEntitySpeed 0x0040 - EndBlock + EndBlock script_0800FE5A: Call sub_08069AA8 script_0800FE60: Call sub_080699AC script_0800FE66: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08069ACC JumpIf script_0800FE7E - _0807EE30 + _0807EE30 JumpIfNot script_0800FE66 Jump script_0800FE5A script_0800FE7E: - EndBlock + EndBlock _0807EB44 0x0002 DoPostScriptAction 0x0000 Wait 0x001e @@ -90,28 +90,28 @@ script_0800FE7E: Jump script_0800FE60 .2byte 0x0000 SCRIPT_START script_0800FEBC - BeginBlock + BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF0E _0807EB44 0x0006 - _0807E9D4 + _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 - EndBlock + EndBlock script_0800FED8: - EndBlock - BeginBlock + EndBlock + BeginBlock DoPostScriptAction 0x000b Call sub_080642B8 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FED8 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800FED8 script_0800FF0E: DoPostScriptAction 0x0008 diff --git a/data/scripts/script_0800FF18.inc b/data/scripts/script_0800FF18.inc index 33b87618..981413e6 100644 --- a/data/scripts/script_0800FF18.inc +++ b/data/scripts/script_0800FF18.inc @@ -1,26 +1,26 @@ SCRIPT_START script_0800FF18 - BeginBlock + BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF6A _0807EB44 0x0006 - _0807E9D4 + _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 - EndBlock + EndBlock script_0800FF34: - EndBlock - BeginBlock + EndBlock + BeginBlock DoPostScriptAction 0x000b Call sub_08064198 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FF34 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800FF34 script_0800FF6A: DoPostScriptAction 0x0008 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 6b5780a2..0d3ac1a2 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -1,20 +1,24 @@ SCRIPT_START script_0800FF74 - BeginBlock + BeginBlock _0807EB44 0x0002 - _0807E9D4 + _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 - EndBlock +.endif + EndBlock script_0800FF92: - EndBlock - BeginBlock + EndBlock + BeginBlock DoPostScriptAction 0x000a .ifdef JP CheckLocalFlag 0x00cb @@ -22,9 +26,13 @@ script_0800FF92: .ifdef EU CheckLocalFlag 0x00cb .else +.ifdef DEMO_JP + CheckLocalFlag 0x00cb @ TODO deduplicate +.else CheckLocalFlag 0x00ce .endif .endif +.endif JumpIf script_0800FFCC DoPostScriptAction 0x000b Call sub_08064198 @@ -34,9 +42,13 @@ script_0800FF92: .ifdef EU CheckLocalFlag 0x00c4 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00c4 @ TODO deduplicate +.else CheckLocalFlag 0x00c7 .endif .endif +.endif JumpIfNot script_0800FFCC Call sub_08064488 CheckPlayerInRegion2 0x4040 @@ -44,20 +56,24 @@ script_0800FF92: Call sub_08064470 JumpIf script_08010014 script_0800FFCC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FF92 - EndBlock + EndBlock .ifdef JP SetLocalFlag 0x00c4 .else .ifdef EU SetLocalFlag 0x00c4 .else +.ifdef DEMO_JP + SetLocalFlag 0x00c4 @ TODO deduplicate +.else SetLocalFlag 0x00c7 .endif .endif - _0807E864 - _0807EB74 +.endif + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf script_0800FFF8 @@ -71,9 +87,13 @@ script_0800FFF8: .ifdef EU CheckLocalFlag 0x00cb .else +.ifdef DEMO_JP + CheckLocalFlag 0x00cb @ TODO deduplicate +.else CheckLocalFlag 0x00ce .endif .endif +.endif JumpIfNot script_0801000A MessageNoOverlap 0x340b _0807EA94 @@ -83,11 +103,11 @@ script_0801000A: _0807EA94 Jump script_08010060 script_08010014: - EndBlock - _0807E888 + EndBlock + _0807E888 Call sub_0807F594 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE MessageNoOverlap 0x340a @@ -104,31 +124,35 @@ script_08010014: .ifdef EU SetLocalFlag 0x00cb .else +.ifdef DEMO_JP + SetLocalFlag 0x00cb @ TODO deduplicate +.else SetLocalFlag 0x00ce .endif .endif +.endif script_08010060: Call sub_080644A4 CallWithArg sub_0807F5B0, 0x0000000a - _0807E878 + _0807E878 Jump script_0800FF92 .2byte 0x0000 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 - EndBlock + EndBlock script_08010090: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010090 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_080672B0, 0x00000004 MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010090 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index 5ef23c13..629171b7 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -1,40 +1,40 @@ SCRIPT_START script_080100C8 - BeginBlock + BeginBlock Call sub_08061FE4 Call sub_08061E70 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080100DC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080100DC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FE4 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080100DC .2byte 0x0000 SCRIPT_START script_080100FC - BeginBlock + BeginBlock Call sub_08061FE4 Call sub_08061E70 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08010110: Wait 0x003c Call sub_08061E90 Jump script_08010110 .2byte 0x0000 SCRIPT_START script_08010120 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08010132: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010132 _0807E864 _0807EB74 @@ -43,16 +43,16 @@ script_08010132: _0807E878 Jump script_08010132 SCRIPT_START script_08010148 - BeginBlock + BeginBlock DoPostScriptAction 0x0001 Call sub_0806C354 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801015A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801015A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CheckRoomFlag 0x0001 JumpIf script_0801019E MessageFromTargetPos 0x3001, 0x0000 @@ -60,8 +60,8 @@ script_0801015A: _0807E3E8 JumpIfNot script_080101A6 Call sub_080A1608 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 CallWithArg sub_080A1550, script_080101AC JumpIfNot script_0801015A PlayBgm BGM_CUCCO_MINIGAME @@ -69,51 +69,51 @@ script_0801015A: Jump script_0801015A script_0801019E: Call sub_080A1608 - _0807EA94 + _0807EA94 script_080101A6: - _0807E878 + _0807E878 Jump script_0801015A script_080101AC: - BeginBlock + BeginBlock DoPostScriptAction 0x0008 Call sub_080A1648 - EndBlock + EndBlock Call sub_080A1270 - _0807E864 + _0807E864 Call sub_0807DF28 MessageFromTargetPos 0x3004, 0x0007 _0807EA94 StopBgm _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 CallWithArg sub_0807F75C, 0x03400378 Call sub_080791BC Call sub_0807FB74 - _0807E8E4_1 + _0807E8E4_1 Call sub_0807F168 Call sub_080A1388 Call sub_0806EC38 - BeginBlock - MoveEntityToPlayer + BeginBlock + MoveEntityToPlayer Call sub_0807F844 - CameraTargetPlayer - EndBlock + CameraTargetPlayer + EndBlock _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 PlayBGM Call sub_080A13B4 - _0807EA94 + _0807EA94 JumpIfNot script_08010240 Call sub_080A13E8 - WaitPlayerAction8 + WaitPlayerAction8 Call sub_080A1460 - _0807EA94 + _0807EA94 Call sub_080A14A8 script_08010240: Call sub_0807DF50 - _0807E878 + _0807E878 CallWithArg sub_0807F5B0, 0x00000000 ClearRoomFlag 0x0001 Call sub_080A169C diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index ac3d52b3..9ebf8099 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -1,69 +1,69 @@ SCRIPT_START script_08010264 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0006 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_0801027A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801027A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08065F64 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0801027A - .2byte 0x0000 + .align 2 SCRIPT_START script_08010294 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080102A6: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080102A6 CheckRoomFlag 0x0009 JumpIfNot script_080102CC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Call sub_08062500 Jump script_080102A6 script_080102CC: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080102A6 .2byte 0x0000 SCRIPT_START script_080102E0 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080102F2: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080102F2 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080102F2 .2byte 0x0000 SCRIPT_START script_0801030C - BeginBlock + BeginBlock DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08010314: - EndBlock + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000009 @@ -95,118 +95,118 @@ script_08010386: script_08010390: _0807EE04 0x03c8, 0x00b8 script_08010396: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_08010314 - _0807EE30 + _0807EE30 JumpIfNot script_08010396 Jump script_08010314 .2byte 0x0000 SCRIPT_START script_080103B0 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080103C2: Wait 0x001e Call sub_08062948 Jump script_080103C2 SCRIPT_START script_080103D0 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000004 - EndBlock + EndBlock script_080103E8: Wait 0x003c Call sub_0806407C Jump script_080103E8 .2byte 0x0000 SCRIPT_START script_080103F8 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08010410: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010410 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08064428 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08010410 SCRIPT_START script_08010428 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetIntVariable sub_08064688 Call sub_08064644 - EndBlock + EndBlock script_08010446: Wait 0x003c Call sub_080646A4 Jump script_08010446 SCRIPT_START script_08010454 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 Call sub_080636F4 DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_08010470: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010470 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000004 Call sub_080636D8 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_08010470 SCRIPT_START script_080104A0 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 Call sub_08063CAC DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_080104BC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080104BC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000004 Call sub_08063C90 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_080104BC SCRIPT_START script_080104EC - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_08010502: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010502 - _0807E864 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 CheckRoomFlag 0x000e JumpIf script_0801052E @@ -234,8 +234,8 @@ script_08010564: script_08010570: Call sub_080634EC CallWithArg sub_0807F78C, 0x00000000 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_080105E0 CallWithArg sub_0807F7C4, 0x00000000 JumpIfNot script_080105C4 @@ -262,19 +262,19 @@ script_080105D4: script_080105DC: MessageNoOverlap 0x2b0e script_080105E0: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08010502 .2byte 0x0000 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08010602: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010602 _0807E864 _0807EB74 @@ -284,51 +284,51 @@ script_08010602: _0807EB44 0x0004 Jump script_08010602 SCRIPT_START script_0801061C - BeginBlock + BeginBlock _0807E930 0x0008 script_08010622: Call sub_08062A48 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801062E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801062E - _0807E864 + _0807E864 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0801062E SCRIPT_START script_08010644 - BeginBlock + BeginBlock _0807E930 0x0009 Jump script_08010622 .2byte 0x0000 SCRIPT_START script_08010650 - BeginBlock + BeginBlock _0807E930 0x000b Jump script_08010622 .2byte 0x0000 - BeginBlock + BeginBlock _0807E930 0x000c Jump script_08010622 .2byte 0x0000 - BeginBlock + BeginBlock _0807E930 0x000d Jump script_08010622 .2byte 0x0000 SCRIPT_START script_08010674 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08010686: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010686 - _0807E864 - _0807EB74 - HasRoomItemForSale + _0807E864 + _0807EB74 + HasRoomItemForSale Call sub_0807F77C MessageFromTargetTable 0x3c08, 0x3c09 _0807EA94 @@ -337,67 +337,67 @@ script_08010686: Jump script_08010686 .2byte 0x0000 SCRIPT_START script_080106AC - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_080106BE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080106BE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0807F2D4 DoPostScriptAction 0x0000 - HasRoomItemForSale + HasRoomItemForSale JumpIf script_080106E0 MessageNoOverlap 0x3c07 Jump script_08010726 script_080106E0: Call sub_08062EB8 CallWithArg sub_0807F78C, 0x00000000 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08010726 - _0807EA94 + _0807EA94 BuyItem 0x0000, 0x0000 JumpIf script_0801070C MessageNoOverlap 0x3c04 Jump script_08010726 script_0801070C: - WaitPlayerAction8 + WaitPlayerAction8 ModHealth 0x0008 Call sub_08062EDC JumpIf script_08010724 MessageNoOverlap 0x3c06 Jump script_08010726 script_08010724: - WaitPlayerAction8 + WaitPlayerAction8 script_08010726: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0001 Jump script_080106BE .2byte 0x0000 SCRIPT_START script_08010734 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a _0807E930 0x0000 - EndBlock + EndBlock script_08010746: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010746 - _0807E864 + _0807E864 _0807E930 0x0004 - BeginBlock + BeginBlock Call sub_08062D18 JumpIfNot script_08010786 - EndBlock - _0807EA94 - _0807E3E8 + EndBlock + _0807EA94 + _0807E3E8 JumpIfNot script_08010786 HasRupees 0x00c8 JumpIf script_08010778 @@ -408,60 +408,60 @@ script_08010778: Call sub_08062E14 MessageNoOverlap 0x4007 script_08010786: - EndBlock - _0807EA94 - _0807E878 + EndBlock + _0807EA94 + _0807E878 _0807E930 0x0008 Jump script_08010746 SCRIPT_START script_08010794 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_080107AA: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080107AA - _0807E864 + _0807E864 Call sub_0807F2D4 DoPostScriptAction 0x0001 Call sub_08062CBC - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0000 Jump script_080107AA .2byte 0x0000 SCRIPT_START script_080107D0 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807E9D4 + _0807E9D4 Call sub_0807F348 Call sub_08069684 - EndBlock + EndBlock script_080107F2: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckPlayerInRegion2 0x3030 JumpIfNot script_080107F2 Call sub_080696B0 script_08010804: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckPlayerInRegion2 0x3030 JumpIfNot script_080107F2 - HasRoomItemForSale + HasRoomItemForSale JumpIf script_08010860 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010804 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 CheckGlobalFlag 0x0042 JumpIfNot script_08010858 CheckGlobalFlag 0x0043 @@ -479,19 +479,19 @@ script_08010858: MessageNoOverlap 0x2c1a Jump script_080108BA script_08010860: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF38 - _0807EB74 + _0807EB74 Call sub_08069660 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_080108B2 Call GoronMerchant_TryToBuyKinstone JumpIfNot script_080108B2 - WaitPlayerAction8 - _0807EA94 - _0807EB8C + WaitPlayerAction8 + _0807EA94 + _0807EB8C CheckGlobalFlag 0x0042 JumpIfNot script_080108AA CheckGlobalFlag 0x0043 @@ -504,25 +504,25 @@ script_080108AA: .ifdef USA SetLocalFlag 0x00fa .else -.ifdef DEMO +.ifdef DEMO_USA SetLocalFlag 0x00fa .endif .endif MessageNoOverlap 0x2c20 script_080108B2: - _0807EA94 + _0807EA94 Call sub_0807F83C script_080108BA: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_08010804 SCRIPT_START script_080108D0 CheckPlayerInRegion2 0x0808 JumpIfNot script_080108D0 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_080109F0 @@ -530,32 +530,32 @@ SCRIPT_START script_080108D0 CheckRoomFlag 0x0001 JumpIf script_08010900 _0807EB28 0x0b63 - _0807EA94 + _0807EA94 script_08010900: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_080108D0 SCRIPT_START script_0801090C - BeginBlock + BeginBlock DoPostScriptAction 0x0007 CheckKinstoneFused 0x001b JumpIf script_0800EF92 - EndBlock + EndBlock script_0801091C: Call sub_080869A4 JumpIfNot script_0801091C - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 CheckRoomFlag 0x0001 JumpIf script_08010942 _0807EB28 0x0b62 - _0807EA94 + _0807EA94 script_08010942: StartPlayerScript script_080109F0 WaitForSomething2 0x00000001 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0801091C Call sub_0808692C SCRIPT_END diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc index 908a6a23..666fab8c 100644 --- a/data/scripts/script_08010964.inc +++ b/data/scripts/script_08010964.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08010964 CheckPlayerInRegion2 0x0808 JumpIfNot script_08010964 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08010A38 @@ -9,30 +9,34 @@ SCRIPT_START script_08010964 CheckRoomFlag 0x0001 JumpIf script_08010994 _0807EB28 0x0b63 - _0807EA94 + _0807EA94 script_08010994: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08010964 SCRIPT_START script_080109A0 - BeginBlock - EndBlock + 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 JumpIf script_080109EA CheckPlayerInRegion2 0x0808 JumpIfNot script_080109A0 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08010A38 @@ -40,10 +44,10 @@ SCRIPT_START script_080109A0 CheckRoomFlag 0x0001 JumpIf script_080109DE _0807EB28 0x0b64 - _0807EA94 + _0807EA94 script_080109DE: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_080109A0 script_080109EA: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc index dd5e7093..d8d9abbb 100644 --- a/data/scripts/script_080109F0.inc +++ b/data/scripts/script_080109F0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080109F0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807ECC4 0x0010 _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc index 6d0a7712..8e7c7ca4 100644 --- a/data/scripts/script_08010A14.inc +++ b/data/scripts/script_08010A14.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08010A14 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EC64 0x0010 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc index 36c00b7c..e3dae7ae 100644 --- a/data/scripts/script_08010A38.inc +++ b/data/scripts/script_08010A38.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08010A38 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EC94 0x0010 _0807EB44 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc index 2cdf5764..b08284b9 100644 --- a/data/scripts/script_08010A5C.inc +++ b/data/scripts/script_08010A5C.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08010A5C - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 + _0807E864 ModHealth 0x00a0 - EndBlock + EndBlock Wait 0x003c _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 script_08010A78: Call sub_0807F0D8 JumpIfNot script_08010A78 DoPostScriptAction 0x0014 - _0807E878 + _0807E878 Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc index 96232387..83937eb5 100644 --- a/data/scripts/script_08010A98.inc +++ b/data/scripts/script_08010A98.inc @@ -1,24 +1,24 @@ SCRIPT_START script_08010A98 - BeginBlock + BeginBlock _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 DoPostScriptAction 0x000a Call sub_08067314 - EndBlock + EndBlock script_08010AB4: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010AB4 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_080672B0, 0x00000004 Call sub_08067304 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010AB4 SCRIPT_START script_08010AE4 - BeginBlock + BeginBlock CheckInventory1 0x0067 JumpIfNot script_08010B62 _0807EB44 0x0004 @@ -26,35 +26,35 @@ SCRIPT_START script_08010AE4 SetEntitySpeed 0x0180 CallWithArg sub_0807F348 Call sub_0806075C - EndBlock - _0807EA94 + EndBlock + _0807EA94 Call sub_080606C0 script_08010B10: - EndBlock + EndBlock Call sub_0806076C DoPostScriptAction 0x0007 script_08010B1C: Call sub_08060700 script_08010B22: - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIf script_08010B3A CallWithArg sub_080608E4, 0x00000000 JumpIf script_08010B44 script_08010B3A: - _0807EE30 + _0807EE30 JumpIfNot script_08010B22 Jump script_08010B10 script_08010B44: - EndBlock + EndBlock DoPostScriptAction 0x0000 script_08010B4A: - EndBlock - BeginBlock + EndBlock + BeginBlock CallWithArg sub_080608E4, 0x00000001 JumpIf script_08010B4A - EndBlock + EndBlock Jump script_08010B1C script_08010B62: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc index 44727354..cce9f2f3 100644 --- a/data/scripts/script_08010B68.inc +++ b/data/scripts/script_08010B68.inc @@ -1,26 +1,26 @@ SCRIPT_START script_08010B68 - BeginBlock - _0807E564 + BeginBlock + _0807E564 JumpIfNot script_08010BAC Call sub_0807F924 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08010B88: - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIfNot script_08010BAC - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010B88 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 Call sub_0806E2DC - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08010B88 script_08010BAC: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index f8b16d18..a3e0af1a 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -1,24 +1,24 @@ SCRIPT_START script_08010BB4 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0008 Call sub_0806E440 - EndBlock + EndBlock script_08010BCA: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010BCA - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 Call sub_0806E418 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807E930 0x0008 Jump script_08010BCA .2byte 0x0000 SCRIPT_START script_08010BEC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08011074 @@ -36,8 +36,8 @@ SCRIPT_START script_08010BEC _0807EA94 StopBgm _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 Call sub_08064180 Call sub_08064180 Call sub_08064180 @@ -53,11 +53,11 @@ SCRIPT_START script_08010BEC WaitForSomething2 0x00000400 SetEntityPositionRelative 0x01f8, 0x0050 _0807F0B4 0x0007 - CameraTargetEntity + CameraTargetEntity Wait 0x000a _0807F0B4 0x0001 _0807E778 0x0001 - DoFade4 + DoFade4 _0807E5F8 0x0002a800 WaitForSomething2 0x00055000 SetEntityPositionRelative 0x01f8, 0x0078 @@ -66,13 +66,13 @@ SCRIPT_START script_08010BEC WaitForSomething2 0x01000000 _0807E5F8 0x0002a800 WaitForSomething2 0x00055000 - _0807E8E4_1 + _0807E8E4_1 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 MessageFromTargetPos 0x1039, 0x000c _0807EA94 PlayBgm BGM_CASTLE_TOURNAMENT - _0807E8E4_2 + _0807E8E4_2 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807E5F8 0x00000010 diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index 1483b778..9c65b510 100644 --- a/data/scripts/script_08010E5A.inc +++ b/data/scripts/script_08010E5A.inc @@ -13,8 +13,8 @@ SCRIPT_START script_08010E5A _0807E5F8 0x00800000 WaitForSomething2 0x01000000 _0807E778 0x0004 - DoFade7 - WaitFor_2 + DoFade7 + WaitFor_2 Wait 0x003c PlaySound SFX_SPIRITS_RELEASE PlaySound SFX_1C2 @@ -22,8 +22,8 @@ SCRIPT_START script_08010E5A _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 Call sub_0806DC3C diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc index 43df8c6b..4f3ea168 100644 --- a/data/scripts/script_08011074.inc +++ b/data/scripts/script_08011074.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08011074 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock _0807EDD4 0x01e8, 0x0050 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08011098.inc b/data/scripts/script_08011098.inc index ae79a2e7..5a5b24bb 100644 --- a/data/scripts/script_08011098.inc +++ b/data/scripts/script_08011098.inc @@ -4,6 +4,6 @@ SCRIPT_START script_08011098 DoPostScriptAction 0x0000 _0807E5F8 0x00000400 _0807E610 0x00000002 - EndBlock + EndBlock Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc index 7ca7f0c1..9827dbfb 100644 --- a/data/scripts/script_080110BC.inc +++ b/data/scripts/script_080110BC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080110BC - BeginBlock + BeginBlock SetEntitySpeed 0x0040 - EndBlock + EndBlock SetEntitySpeed 0x0200 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0068 diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc index e65fa936..95ed5ca6 100644 --- a/data/scripts/script_080110E8.inc +++ b/data/scripts/script_080110E8.inc @@ -6,10 +6,10 @@ SCRIPT_START script_080110E8 Call sub_0807F36C SetEntitySpeed 0x0400 _0807ECF4 0x0008 - BeginBlock + BeginBlock Call sub_0807F1E8 DoPostScriptAction 0x0011 - EndBlock + EndBlock Call sub_0807F2D4 WaitForSomething 0x80000000 Call sub_080791BC diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc index 7e9e0db4..a2789561 100644 --- a/data/scripts/script_08011128.inc +++ b/data/scripts/script_08011128.inc @@ -1,17 +1,19 @@ SCRIPT_START script_08011128 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 .ifdef JP - _0807E9D4 +.ifndef DEMO_JP + _0807E9D4 DoPostScriptAction 0x000a +.endif .else .ifdef EU - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a .endif .endif - EndBlock + EndBlock script_08011134: CheckPlayerInRegion 0x01f8, 0x0048, 0x1040 JumpIfNot script_08011134 @@ -45,7 +47,9 @@ script_08011134: DoPostScriptAction 0x0006 SCRIPT_END .ifdef JP +.ifndef DEMO_JP .2byte 0x0000 +.endif .else .ifdef EU .2byte 0x0000 diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc index 4d5a8961..6c63ae50 100644 --- a/data/scripts/script_080111CC.inc +++ b/data/scripts/script_080111CC.inc @@ -1,14 +1,14 @@ SCRIPT_START script_080111CC - BeginBlock + BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 Call sub_08066D04 - EndBlock + EndBlock Call sub_0807F338 WaitForSomething2 0x00000010 Call sub_08066D14 JumpIf script_080111F6 - MoveEntityToPlayer + MoveEntityToPlayer script_080111F6: Call sub_0807F8BC JumpIf script_08011206 @@ -17,7 +17,7 @@ script_08011206: DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0050 - _0807EB74 + _0807EB74 DoPostScriptAction 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc index 6f11ef20..ef5f171c 100644 --- a/data/scripts/script_080112C4.inc +++ b/data/scripts/script_080112C4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080112C4 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 Call sub_08095244 Call sub_0807F338 - EndBlock + EndBlock WaitForSomething 0x0002a800 DoPostScriptAction 0x0007 _0807E930 0x0006 diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc index 782fe44e..bc84211f 100644 --- a/data/scripts/script_080115D0.inc +++ b/data/scripts/script_080115D0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080115D0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0002 _0807E930 0x0001 - EndBlock + EndBlock WaitForSomething2 0x00080000 _0807E930 0x0005 PlaySound SFX_11C diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc index 115fd3d0..f540d792 100644 --- a/data/scripts/script_08011608.inc +++ b/data/scripts/script_08011608.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011608 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0006 _0807E930 0x0003 - EndBlock + EndBlock WaitForSomething2 0x00200000 _0807E930 0x0007 PlaySound SFX_11C diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc index 13deb024..aecf84a6 100644 --- a/data/scripts/script_08011640.inc +++ b/data/scripts/script_08011640.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011640 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 SetEntitySpeed 0x0100 - EndBlock + EndBlock Call sub_0807F338 WaitForSomething2 0x00000040 DoPostScriptAction 0x0007 diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc index 72f45453..57538123 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080116A8 - BeginBlock + BeginBlock _0807EB44 0x0000 SetEntitySpeed 0x0100 - EndBlock + EndBlock Call sub_0807F338 WaitForSomething2 0x00000100 DoPostScriptAction 0x0001 diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc index 8b854d03..f1c733d5 100644 --- a/data/scripts/script_0801183C.inc +++ b/data/scripts/script_0801183C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801183C - BeginBlock + BeginBlock Call sub_08095330 - EndBlock + EndBlock WaitForSomething2 0x00800000 _0807EF3C 0x0000, 0x0020 _0807E5F8 0x01000000 diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc index 4c9f0bc0..f820b99f 100644 --- a/data/scripts/script_08011890.inc +++ b/data/scripts/script_08011890.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011890 - BeginBlock + BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 - EndBlock + EndBlock Wait 0x00f0 Call sub_08094B6C _0807EDD4 0x01f8, 0x0088 diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc index d0633936..f27d95f1 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080118D4 - BeginBlock + BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 - EndBlock + EndBlock WaitForSomething2 0x08000000 Call sub_08094B6C _0807EDD4 0x01d8, 0x0078 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index 1dcbb85e..d88825af 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -1,26 +1,26 @@ SCRIPT_START script_0801194C - BeginBlock + BeginBlock _0807EB44 0x0002 Jump script_0801196A .2byte 0x0000 SCRIPT_START script_08011958 - BeginBlock + BeginBlock _0807EB44 0x0006 Jump script_0801196A .2byte 0x0000 SCRIPT_START script_08011964 - BeginBlock + BeginBlock _0807EB44 0x0004 script_0801196A: - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_0801197C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801197C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 CheckGlobalFlag 0x0015 JumpIf script_080119A0 @@ -29,80 +29,80 @@ script_0801197C: script_080119A0: MessageFromTarget 0x103f script_080119A4: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0801197C SCRIPT_START script_080119B0 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x0000000c - EndBlock + EndBlock script_080119C8: Wait 0x003c Call sub_0806407C Jump script_080119C8 .2byte 0x0000 -SCRIPT_START script_080119D8 - BeginBlock +SCRIPT_START script_080119D8 + BeginBlock _0807EB44 0x0002 Jump script_080119F6 .2byte 0x0000 SCRIPT_START script_080119E4 - BeginBlock + BeginBlock _0807EB44 0x0004 Jump script_080119F6 .2byte 0x0000 SCRIPT_START script_080119F0 - BeginBlock + BeginBlock _0807EB44 0x0006 script_080119F6: - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08011A08: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011A08 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08011A08 .2byte 0x0000 SCRIPT_START script_08011A2C - BeginBlock + BeginBlock _0807EB44 0x0004 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08011A44: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011A44 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 MessageFromTarget 0x1320 _0807EA94 _0807E878 Jump script_08011A44 SCRIPT_START script_08011A64 - BeginBlock + BeginBlock _0807EB44 0x0002 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08011A7C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011A7C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 CallWithArg sub_080644B4, 0x00000006 JumpIf script_08011AFA @@ -111,17 +111,17 @@ script_08011A7C: _0807E878 Jump script_08011A7C .2byte 0x0000 - BeginBlock + BeginBlock _0807EB44 0x0004 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08011AC4: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011AC4 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 MessageFromTarget 0x1322 _0807EA94 @@ -131,7 +131,7 @@ script_08011AC4: SCRIPT_START script_08011AE4 CheckRoomFlag 0x000f JumpIfNot script_08011AE4 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 script_08011AFA: @@ -143,11 +143,15 @@ script_08011AFA: .ifdef EU SetLocalFlag 0x0011 .else +.ifdef DEMO_JP + SetLocalFlag 0x0011 @ TODO deduplicate +.else SetLocalFlag 0x0010 .endif .endif +.endif CallWithArg sub_0806DA1C, 0x00000003 - _0807E878 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index ad3edc18..958cb9f1 100644 --- a/data/scripts/script_08011B20.inc +++ b/data/scripts/script_08011B20.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08011B20 - _0807E864 + _0807E864 Call sub_0807DF28 MessageFromTargetPos 0x1320, 0x000c _0807EA94 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 29d22d33..e17bd540 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011B40 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock CheckGlobalFlag 0x0050 JumpIfNot script_08011B84 WaitForSomething2 0x00000004 @@ -17,9 +17,9 @@ SCRIPT_START script_08011B40 _0807EB44 0x0004 ClearGlobalFlag 0x0050 Call sub_0807DF50 - _0807E878 + _0807E878 script_08011B84: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011B84 _0807E864 _0807EB74 @@ -28,7 +28,7 @@ script_08011B84: _0807E3E8 JumpIf script_08011BA4 script_08011B9A: - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_08011B84 script_08011BA4: @@ -44,40 +44,40 @@ script_08011BBC: MessageNoOverlap 0x3d06 _0807EA94 CallWithArg sub_0806C2A0, 0x00000000 - WaitFor_2 + WaitFor_2 Wait 0x003c Call sub_0806C224 Jump script_08011B9A SCRIPT_START script_08011BE4 - BeginBlock - _0807E888 - EndBlock + BeginBlock + _0807E888 + EndBlock CallWithArg sub_0806C2A0, 0x00000001 - WaitFor_2 + WaitFor_2 Wait 0x003c - _0807E878 + _0807E878 SetRoomFlag 0x0000 PlayBgm BGM_FIGHT_THEME2 script_08011C04: CheckRoomFlag 0x0064 JumpIfNot script_08011C04 StopBgm - _0807E864 + _0807E864 Wait 0x003c - CameraTargetEntity + CameraTargetEntity Wait 0x003c Call Simon_CreateChest Wait 0x003c - CameraTargetPlayer - _0807E878 + CameraTargetPlayer + _0807E878 script_08011C28: CheckLocalFlag 0x0001 JumpIfNot script_08011C28 - _0807E888 - WaitPlayerAction8 + _0807E888 + WaitPlayerAction8 Wait 0x001e CallWithArg sub_0806C2A0, 0x00000000 - WaitFor_2 + WaitFor_2 Wait 0x003c Call sub_0806C280 SCRIPT_END diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc index c74be3e5..154bc0ab 100644 --- a/data/scripts/script_08011C50.inc +++ b/data/scripts/script_08011C50.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011C50 - BeginBlock - _0807E864 - EndBlock + BeginBlock + _0807E864 + EndBlock Wait 0x003c CallWithArg sub_0806C2A0, 0x00000001 - WaitFor_2 + WaitFor_2 Wait 0x003c DoPostScriptAction 0x0014 Wait 0x001e diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index 6062d70a..0cf1a0d0 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08011C7C - BeginBlock + BeginBlock Call sub_08064828 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011CC2 - EndBlock + EndBlock script_08011C9A: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_08011C9A - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x4515 _0807EA94 @@ -23,58 +23,58 @@ script_08011C9A: DoPostScriptAction 0x0001 Jump script_08011C9A script_08011CC2: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002c JumpIf script_08011C9A CheckGlobalFlag 0x002d JumpIf script_08011C9A - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011CC2 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x3105 _0807EA94 _0807E3E8 JumpIf script_08011D0E - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011CC2 script_08011D00: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011D00 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011D0E: MessageNoOverlap 0x3108 _0807EA94 SetGlobalFlag 0x002b - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D00 .2byte 0x0000 SCRIPT_START script_08011D28 - BeginBlock + BeginBlock Call sub_08064928 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011D6E - EndBlock + EndBlock script_08011D46: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_08011D46 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x4513 _0807EA94 @@ -83,58 +83,58 @@ script_08011D46: DoPostScriptAction 0x0001 Jump script_08011D46 script_08011D6E: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002b JumpIf script_08011D46 CheckGlobalFlag 0x002d JumpIf script_08011D46 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011D6E - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x3103 _0807EA94 _0807E3E8 JumpIf script_08011DBA - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D6E script_08011DAC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011DAC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011DBA: MessageNoOverlap 0x3106 _0807EA94 SetGlobalFlag 0x002c - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011DAC .2byte 0x0000 SCRIPT_START script_08011DD4 - BeginBlock + BeginBlock Call sub_08064A28 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011E1A - EndBlock + EndBlock script_08011DF2: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_08011DF2 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x4514 _0807EA94 @@ -143,60 +143,60 @@ script_08011DF2: DoPostScriptAction 0x0001 Jump script_08011DF2 script_08011E1A: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002b JumpIf script_08011DF2 CheckGlobalFlag 0x002c JumpIf script_08011DF2 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011E1A - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x3104 _0807EA94 _0807E3E8 JumpIf script_08011E66 - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011E1A script_08011E58: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011E58 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011E66: MessageNoOverlap 0x3107 _0807EA94 SetGlobalFlag 0x002d - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011E58 .2byte 0x0000 SCRIPT_START script_08011E80 - BeginBlock + BeginBlock Call sub_08064828 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08011E96: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002f JumpIf script_08011C9A CheckGlobalFlag 0x0030 JumpIf script_08011C9A - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011E96 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC @@ -209,43 +209,43 @@ script_08011ECC: _0807E3E8 JumpIf script_08011EF4 script_08011ED8: - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011E96 script_08011EE6: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011EE6 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011EF4: MessageNoOverlap 0x3114 _0807EA94 SetGlobalFlag 0x002e - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011EE6 SCRIPT_START script_08011F0C - BeginBlock + BeginBlock Call sub_08064928 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08011F22: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002e JumpIf script_08011D46 CheckGlobalFlag 0x0030 JumpIf script_08011D46 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011F22 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 @@ -258,43 +258,43 @@ script_08011F58: _0807E3E8 JumpIf script_08011F80 script_08011F64: - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011F22 script_08011F72: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011F72 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011F80: MessageNoOverlap 0x3112 _0807EA94 SetGlobalFlag 0x002f - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011F72 SCRIPT_START script_08011F98 - BeginBlock + BeginBlock Call sub_08064A28 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08011FAE: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002e JumpIf script_08011DF2 CheckGlobalFlag 0x002f JumpIf script_08011DF2 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011FAE - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 @@ -307,38 +307,38 @@ script_08011FE4: _0807E3E8 JumpIf script_0801200C script_08011FF0: - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011FAE script_08011FFE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011FFE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_0801200C: MessageNoOverlap 0x3113 _0807EA94 SetGlobalFlag 0x0030 - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011FFE SCRIPT_START script_08012024 - BeginBlock + BeginBlock Call sub_08064828 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801203A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801203A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E @@ -366,33 +366,37 @@ script_08012070: .ifdef USA Call sub_0807FC24 .else -.ifdef DEMO +.ifdef DEMO_USA Call sub_0807FC24 +.else +.ifdef DEMO_JP + Call sub_0807FC24 +.endif .endif .endif Jump script_0801209E script_0801209A: MessageNoOverlap 0x3127 script_0801209E: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0801203A .align 2, 0 SCRIPT_START script_080120B0 - BeginBlock + BeginBlock Call sub_08064928 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080120C6: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080120C6 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA @@ -419,34 +423,38 @@ script_080120FC: WaitPlayerAction8 .ifdef USA Call sub_0807FC24 -.else -.ifdef DEMO +.else +.ifdef DEMO_USA + Call sub_0807FC24 +.else +.ifdef DEMO_JP Call sub_0807FC24 .endif .endif +.endif Jump script_0801212A script_08012126: MessageNoOverlap 0x311b script_0801212A: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_080120C6 .align 2, 0 SCRIPT_START script_0801213C - BeginBlock + BeginBlock Call sub_08064A28 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08012152: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012152 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 @@ -470,37 +478,41 @@ script_08012188: MessageNoOverlap 0x311f _0807EA94 _0807F034 0x0030 - WaitPlayerAction8 + WaitPlayerAction8 .ifdef USA Call sub_0807FC24 .else -.ifdef DEMO +.ifdef DEMO_USA + Call sub_0807FC24 +.else +.ifdef DEMO_JP Call sub_0807FC24 .endif .endif +.endif Jump script_080121B6 script_080121B2: MessageNoOverlap 0x3121 script_080121B6: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08012152 .align 2, 0 SCRIPT_START script_080121C8 - BeginBlock + BeginBlock Call sub_08064828 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080121DE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080121DE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x4527 _0807EA94 @@ -509,17 +521,17 @@ script_080121DE: DoPostScriptAction 0x0001 Jump script_080121DE SCRIPT_START script_08012200 - BeginBlock + BeginBlock Call sub_08064928 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08012216: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012216 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x4525 _0807EA94 @@ -528,17 +540,17 @@ script_08012216: DoPostScriptAction 0x0001 Jump script_08012216 SCRIPT_START script_08012238 - BeginBlock + BeginBlock Call sub_08064A28 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801224E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801224E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x4526 _0807EA94 @@ -547,25 +559,25 @@ script_0801224E: DoPostScriptAction 0x0001 Jump script_0801224E SCRIPT_START script_08012270 - BeginBlock + BeginBlock _0807EB44 0x0004 Call sub_08061FD8 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08012284: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x001e JumpIfNot script_08012298 CheckInventory1 0x0015 JumpIf script_080122BA script_08012298: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012284 - EndBlock - _0807EB74 - _0807E864 + EndBlock + _0807EB74 + _0807E864 Call sub_08061FD8 MessageFromTarget 0x2302 _0807EA94 @@ -573,27 +585,27 @@ script_08012298: SetGlobalFlag 0x001e Jump script_08012284 script_080122BA: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIfNot script_080122CE CheckRoomFlag 0x0001 JumpIf script_080122EC script_080122CE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080122BA - EndBlock - _0807EB74 - _0807E864 + EndBlock + _0807EB74 + _0807E864 Call sub_08061FD8 MessageFromTarget 0x2303 _0807EA94 _0807E878 Jump script_080122BA script_080122EC: - EndBlock - _0807EB74 - _0807E864 + EndBlock + _0807EB74 + _0807E864 Call sub_08061FD8 DoPostScriptAction 0x000b Call sub_08061FB0 @@ -604,7 +616,7 @@ script_080122EC: PlaySound SFX_SECRET SetLocalFlag 0x0043 Wait 0x001e - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .align 2, 0 diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 014f493f..2f81b0e5 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0801232C - BeginBlock - _0807EB74 - _0807E9D4 + BeginBlock + _0807EB74 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08012338: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012338 _0807EB74 _0807E864 @@ -15,37 +15,37 @@ script_08012338: JumpIf script_0801235A SetLocalFlag 0x0042 _0807F034 0x0057 - WaitPlayerAction8 + WaitPlayerAction8 script_0801235A: - _0807E878 + _0807E878 Jump script_08012338 SCRIPT_START script_08012360 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock script_08012368: CheckLocalFlag 0x0004 JumpIfNot script_08012368 Call sub_0807DF28 - _0807E864 + _0807E864 StopBgm - BeginBlock + BeginBlock _0807E778 0x0004 SetFadeMask 0x00007fff - DoFade5 + DoFade5 _0807E858 0x0080 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 PlayBgm BGM_ELEMENTAL_SANCTUARY _0807EB28 0x1401 - _0807EA94 + _0807EA94 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT SetEntity0x20 0xffff8000 Wait 0x003c - _0807E8E4_0 + _0807E8E4_0 StartPlayerScript script_08012410 WaitForSomething2 0x00000001 MessageNoOverlap 0x1402 @@ -53,20 +53,20 @@ script_08012368: StopBgm SetEntity0x20 0x00010000 Wait 0x003c - BeginBlock + BeginBlock _0807E778 0x0004 SetFadeMask 0xffffffff - DoFade4 + DoFade4 _0807E858 0x0080 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 PlayBGM _0807EB28 0x1403 - _0807EA94 + _0807EA94 SetIntVariable 0x00000203 Call sub_0807F420 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc index 089683a3..82f5c189 100644 --- a/data/scripts/script_08012410.inc +++ b/data/scripts/script_08012410.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012410 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0004 Wait 0x003c _0807E5F8 0x00000001 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 110ca1f7..f6af7e93 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -1,46 +1,46 @@ SCRIPT_START script_08012430 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock script_08012440: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012440 - _0807E864 + _0807E864 _0807E930 0x0008 Call sub_0807F2D4 _0807E930 0x0009 Call sub_0806B2B4 - _0807EA94 + _0807EA94 CheckLocalFlag 0x00b3 JumpIf script_08012474 SetLocalFlag 0x00b3 _0807F034 0x0062 - WaitPlayerAction8 + WaitPlayerAction8 .ifdef USA SetLocalFlag 0x00d0 .else -.ifdef DEMO +.ifdef DEMO_USA SetLocalFlag 0x00d0 .endif .endif script_08012474: - _0807E878 + _0807E878 _0807E930 0x0000 Jump script_08012440 .align 2, 0 SCRIPT_START script_08012480 - BeginBlock + BeginBlock Call sub_08054564 - EndBlock + EndBlock script_0801248A: CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 JumpIfNot script_0801248A StopBgm - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08012AB0 @@ -49,7 +49,7 @@ script_0801248A: CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitFor_2 _0807E858 0x0000 Call sub_080791BC LoadRoomEntityList gUnk_080F4D70 @@ -58,7 +58,7 @@ script_0801248A: Call sub_0807F844 _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitFor_2 PlayBgm BGM_EZLO_THEME _0807E5F8 0x00000010 WaitForSomething2 0x00000020 @@ -73,21 +73,21 @@ script_0801248A: StopBgm _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 - MoveEntityToPlayer + WaitFor_2 + MoveEntityToPlayer Call sub_0807F844 - CameraTargetPlayer + CameraTargetPlayer SetFadeMask 0xffffffff _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitFor_2 Call sub_0807DF50 - _0807E878 + _0807E878 PlayBGM script_08012566: CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 JumpIfNot script_08012566 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0806DC7C @@ -96,7 +96,7 @@ script_08012566: WaitForSomething2 0x00000001 SetEntityPositionRelative 0x0388, 0x0168 _0807F0B4 0x0001 - CameraTargetEntity + CameraTargetEntity Wait 0x005a _0807E5F8 0x00000004 WaitForSomething2 0x00000008 @@ -116,11 +116,11 @@ script_08012566: StopBgm PlayBgm BGM_FIGHT_THEME2 Call sub_0807DF50 - _0807E878 + _0807E878 _0807E5F8 0x00000050 LoadRoomEntityList gUnk_080F51D0 WaitForSomething2 0x00000008 - _0807E864 + _0807E864 Call sub_0807FA40 Call sub_0807DF28 PlaySound SFX_SECRET @@ -129,7 +129,7 @@ script_08012566: WaitForSomething2 0x00000008 StartPlayerScript script_08012AF0 WaitForSomething2 0x00000001 - _0807E8E4_0 + _0807E8E4_0 PlayBgm BGM_EZLO_THEME Wait 0x001e _0807E5F8 0x00000004 @@ -147,9 +147,9 @@ script_08012566: PlayBGM Call sub_0806DCA0 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807DF50 - _0807E878 + _0807E878 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807E5F8 0x00000004 @@ -163,6 +163,6 @@ script_08012566: SetGlobalFlag 0x0014 CallWithArg sub_0807F6F8, 0x00000008 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index d1952fac..5deb674a 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080126FC - BeginBlock + BeginBlock SetEntitySpeed 0x0040 DoPostScriptAction 0x0007 - EndBlock + EndBlock _0807E930 0x0020 WaitForSomething2 0x00000004 _0807E930 0x0022 @@ -51,30 +51,30 @@ SCRIPT_START script_080126FC _0807EA94 _0807E930 0x0020 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 _0807E5F8 0x00000008 script_080127F2: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIf script_08012824 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080127F2 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806D944 _0807E930 0x0010 MessageFromTargetPos 0x1114, 0x000c _0807EA94 _0807E930 0x0020 - _0807E878 + _0807E878 Jump script_080127F2 script_08012824: - _0807E864 - _0807E9DC + _0807E864 + _0807E9DC CallWithArg sub_0807F5B0, 0x0000003c Call sub_080791D0 - EndBlock + EndBlock _0807E5F8 0x00000008 WaitForSomething2 0x00000004 DoPostScriptAction 0x000b @@ -115,33 +115,33 @@ script_08012824: Call sub_0806D908 _0807EC1C 0x0010 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012904: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0806D944 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_08012920 CheckPlayerInRegion2 0x3030 JumpIfNot script_0801293A Jump script_08012904 script_08012920: - _0807E864 + _0807E864 _0807E930 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 - _0807E878 + _0807E878 Jump script_08012904 script_0801293A: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - _0807EB8C + _0807EB8C Call sub_0806D944 _0807E930 0x0010 MessageFromTargetPos 0x110f, 0x000c @@ -149,35 +149,35 @@ script_0801293A: SetEntitySpeed 0x0080 Call sub_0806D908 _0807EC1C 0x0050 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012984: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0806D944 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_080129A0 CheckPlayerInRegion2 0x3030 JumpIfNot script_080129BA Jump script_08012984 script_080129A0: - _0807E864 + _0807E864 _0807E930 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 - _0807E878 + _0807E878 Jump script_08012984 script_080129BA: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - _0807EB8C + _0807EB8C Call sub_0806D944 _0807E930 0x0010 MessageFromTargetPos 0x1110, 0x000c @@ -186,37 +186,37 @@ script_080129BA: Call sub_0806D908 _0807EC1C 0x0050 _0807E930 0x0018 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012A08: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0806D944 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_08012A24 CheckPlayerInRegion2 0x3030 JumpIfNot script_08012A3E Jump script_08012A08 script_08012A24: - _0807E864 + _0807E864 _0807E930 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 - _0807E878 + _0807E878 Jump script_08012A08 script_08012A3E: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StopBgm DoPostScriptAction 0x000b - _0807EB8C + _0807EB8C Call sub_0806D944 _0807E930 0x0010 MessageFromTargetPos 0x1111, 0x000c @@ -224,20 +224,20 @@ script_08012A3E: SetEntitySpeed 0x0080 Call sub_0806D8A0 script_08012A74: - _0807EE30 + _0807EE30 JumpIfNot script_08012A74 _0807E930 0x001f - _0807EA94 + _0807EA94 StartPlayerScript script_08012B18 Call sub_0806D9A4 DoPostScriptAction 0x0008 Wait 0x0078 PlayBgm BGM_EZLO_THEME - BeginBlock - _0807E8E4_2 + BeginBlock + _0807E8E4_2 _0807EB28 0x1112 - EndBlock - _0807EA94 + EndBlock + _0807EA94 _0807E5F8 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/script_08012AB0.inc index d88f3c06..8c0a07dd 100644 --- a/data/scripts/script_08012AB0.inc +++ b/data/scripts/script_08012AB0.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08012AB0 - EndBlock + EndBlock script_08012AB2: _0807EB44 0x0002 Wait 0x000a diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc index 9600c570..549da3a5 100644 --- a/data/scripts/script_08012AC8.inc +++ b/data/scripts/script_08012AC8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012AC8 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc index 3e4b36e6..3250384f 100644 --- a/data/scripts/script_08012AF0.inc +++ b/data/scripts/script_08012AF0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012AF0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0388, 0x0180 _0807EB44 0x0000 diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc index 4790ca98..7fa4617a 100644 --- a/data/scripts/script_08012B24.inc +++ b/data/scripts/script_08012B24.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B24 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0004 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc index 13cd72a9..8fb19805 100644 --- a/data/scripts/script_08012B50.inc +++ b/data/scripts/script_08012B50.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B50 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0000 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EC64 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc index 015962e2..9b90a21b 100644 --- a/data/scripts/script_08012B7C.inc +++ b/data/scripts/script_08012B7C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B7C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0002 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EC94 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012BA8.inc b/data/scripts/script_08012BA8.inc index 071ced29..b23bee96 100644 --- a/data/scripts/script_08012BA8.inc +++ b/data/scripts/script_08012BA8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012BA8 - BeginBlock + BeginBlock _0807EB44 0x0002 DoPostScriptAction 0x0007 _0807E930 0x0001 - EndBlock + EndBlock WaitForSomething2 0x00000040 _0807E930 0x0005 Wait 0x001e diff --git a/data/scripts/script_08012BF8.inc b/data/scripts/script_08012BF8.inc index 97cea951..2d3bc84f 100644 --- a/data/scripts/script_08012BF8.inc +++ b/data/scripts/script_08012BF8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012BF8 - BeginBlock + BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0007 _0807E930 0x0003 - EndBlock + EndBlock WaitForSomething2 0x00000010 _0807E930 0x0007 Wait 0x001e diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc index 7d27437b..63b3e809 100644 --- a/data/scripts/script_08012C48.inc +++ b/data/scripts/script_08012C48.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012C48 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 SetEntitySpeed 0x0280 - EndBlock + EndBlock _0807EDD4 0x0388, 0x0168 _0807E5F8 0x00000100 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc index 39b15371..22678ad8 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -1,47 +1,51 @@ SCRIPT_START script_08012C68 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x0008 SetIntVariable 0x00000000 Call sub_0806DA04 - EndBlock + EndBlock script_08012C7E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012C7E _0807E864 _0807E8E4_0 MessageFromTarget 0x111d _0807EA94 SetGlobalFlag 0x0022 - _0807E878 + _0807E878 Jump script_08012C7E SCRIPT_START script_08012C98 CheckGlobalFlag 0x0014 JumpIfNot script_08012C98 script_08012CA0: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 JumpIfNot script_08012CA0 - _0807E564 + _0807E564 JumpIf script_08012CD2 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 _0807EB28 0x2202 - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x003a .else .ifdef EU SetLocalFlag 0x003a .else +.ifdef DEMO_JP + SetLocalFlag 0x003a @ TODO deduplicate +.else SetLocalFlag 0x003b .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 script_08012CD2: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc index 900f0de5..7890ec34 100644 --- a/data/scripts/script_08012CD8.inc +++ b/data/scripts/script_08012CD8.inc @@ -1,27 +1,31 @@ SCRIPT_START script_08012CD8 - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIfNot script_08012CD8 CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 JumpIfNot script_08012CD8 ComparePlayerAction 0x0015 JumpIf script_08012CD8 - _0807E864 + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock _0807EB28 0x2203 - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x003d .else .ifdef EU SetLocalFlag 0x003d .else +.ifdef DEMO_JP + SetLocalFlag 0x003d @ TODO deduplicate +.else SetLocalFlag 0x003e .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc index 73cb0ac9..f66473fa 100644 --- a/data/scripts/script_08012D18.inc +++ b/data/scripts/script_08012D18.inc @@ -1,22 +1,22 @@ SCRIPT_START script_08012D18 - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x0014 JumpIfNot script_08012D18 CheckLocalFlagByOffset 0x0200, 0x008d JumpIf script_08012D68 CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 JumpIfNot script_08012D18 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807EB28 0x111a - _0807EA94 + _0807EA94 StartPlayerScript script_08010A38 WaitForSomething2 0x00000001 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08012D18 script_08012D68: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc index 8b936911..f5b97d27 100644 --- a/data/scripts/script_08012D70.inc +++ b/data/scripts/script_08012D70.inc @@ -1,24 +1,28 @@ SCRIPT_START script_08012D70 CheckPlayerInRegion 0x0088, 0x0048, 0x3030 JumpIfNot script_08012D70 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08012DB0 WaitForSomething2 0x00000001 _0807EB28 0x132d - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x0015 .else .ifdef EU SetLocalFlag 0x0015 .else +.ifdef DEMO_JP + SetLocalFlag 0x0015 @ TODO deduplicate +.else SetLocalFlag 0x0014 .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc index 09eef4e2..5e9b2640 100644 --- a/data/scripts/script_08012DB0.inc +++ b/data/scripts/script_08012DB0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012DB0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0088, 0x0068 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc index d7874822..21a77241 100644 --- a/data/scripts/script_08012DD8.inc +++ b/data/scripts/script_08012DD8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012DD8 - BeginBlock - EndBlock - _0807E888 + BeginBlock + EndBlock + _0807E888 Wait 0x0018 - _0807E864 + _0807E864 StartPlayerScript script_08012DF8 WaitForSomething2 0x00000001 _0807E908 0x0002 diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc index 21ed79e5..3e47a89b 100644 --- a/data/scripts/script_08012DF8.inc +++ b/data/scripts/script_08012DF8.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012DF8 - BeginBlock + BeginBlock _0807EB44 0x0000 SetEntitySpeed 0x0140 - EndBlock + EndBlock _0807EDD4 0x00b8, 0x0094 Wait 0x0008 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08012E20.inc b/data/scripts/script_08012E20.inc index 3bae5d40..2a6bee16 100644 --- a/data/scripts/script_08012E20.inc +++ b/data/scripts/script_08012E20.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012E20 - BeginBlock - _0807E864 - EndBlock + BeginBlock + _0807E864 + EndBlock Wait 0x0078 _0807E908 0x0004 StartPlayerScript script_08012E44 diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc index 4d929371..bc828aa9 100644 --- a/data/scripts/script_08012E44.inc +++ b/data/scripts/script_08012E44.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012E44 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 - EndBlock + EndBlock Wait 0x003c _0807EB44 0x0004 Wait 0x000f diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc index 257e134c..5a36cc9d 100644 --- a/data/scripts/script_08012E88.inc +++ b/data/scripts/script_08012E88.inc @@ -1,38 +1,38 @@ SCRIPT_START script_08012E88 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a Call sub_0806B60C - EndBlock + EndBlock script_08012E9E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012E9E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0001 Call sub_0806B4F0 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0000 Jump script_08012E9E .2byte 0x0000 SCRIPT_START script_08012EC0 - BeginBlock + BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000008 DoPostScriptAction 0x000a Call sub_0806B60C - EndBlock + EndBlock script_08012EDC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012EDC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x0000000c Call sub_0806B4F0 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 CallWithArg sub_0807F3D8, 0x00000008 Jump script_08012EDC diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc index c25380c0..405d2900 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08012F0C - BeginBlock + BeginBlock CallWithArg sub_0806A93C, 0x12345678 _0807EB44 0x0004 _0807E930 0x0002 @@ -9,7 +9,7 @@ SCRIPT_START script_08012F0C JumpIf script_08012FD2 CheckGlobalFlag 0x001e JumpIf script_08012F86 - EndBlock + EndBlock CheckLocalFlag 0x0062 JumpIfNot script_08012F48 Call sub_0806A9B0 @@ -23,7 +23,7 @@ script_08012F50: MessageNoOverlap 0x4401 _0807EA94 SetLocalFlag 0x0061 - _0807E878 + _0807E878 _0807E908 0x0001 script_08012F6C: Call sub_0806A96C diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index d14a41cc..ec2ff144 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -1,29 +1,29 @@ SCRIPT_START script_08012F86 - BeginBlock + BeginBlock CheckLocalFlag 0x0060 JumpIf script_08012FD2 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_080130E4 SetLocalFlag 0x0060 ClearLocalFlag 0x0061 - EndBlock + EndBlock WaitForSomething2 0x00000004 _0807E908 0x0004 Call sub_0806A958 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0807DF50 - _0807E878 + _0807E878 SetLocalFlag 0x0062 Jump script_08012FFA script_08012FD2: - BeginBlock + BeginBlock _0807E930 0x000d _0807E908 0x0005 SetLocalFlag 0x0062 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0806AA10 - EndBlock + EndBlock CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: @@ -32,16 +32,16 @@ script_08012FFA: _0807EA94 Jump script_08012FFA script_08013006: - _0807E944 - BeginBlock - _0807E864 + _0807E944 + BeginBlock + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock PlaySound SFX_TASK_COMPLETE _0807F088 0x0038 - WaitPlayerAction8 + WaitPlayerAction8 Wait 0x001e - _0807E8E4_0 + _0807E8E4_0 Call sub_0806AB9C _0807E930 0x000b Wait 0x003c @@ -68,7 +68,7 @@ script_08013006: _0807EA94 _0807E908 0x0001 Call sub_0807DF50 - _0807E878 + _0807E878 script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A @@ -87,13 +87,13 @@ script_080130B6: JumpIfNot script_080130C4 Call sub_0806A9B0 script_080130C4: - EndBlock + EndBlock script_080130C6: Call sub_0806A96C JumpIfNot script_080130C6 - _0807E864 + _0807E864 Call sub_0806AA18 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807E908 0x0001 Jump script_080130C6 diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc index 154a90ed..38df27bf 100644 --- a/data/scripts/script_080130E4.inc +++ b/data/scripts/script_080130E4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080130E4 - BeginBlock + BeginBlock _0807EB44 0x0006 SetEntitySpeed 0x0140 - EndBlock + EndBlock _0807EDD4 0x00a8, 0x0060 Wait 0x0008 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc index 762ffc4e..2f3d1cbc 100644 --- a/data/scripts/script_08013114.inc +++ b/data/scripts/script_08013114.inc @@ -1,40 +1,40 @@ SCRIPT_START script_08013114 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a DoPostScriptAction 0x0012 Call sub_0807F348 - EndBlock + EndBlock script_08013128: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0801313C Call sub_0806AEE4 Jump script_08013128 script_0801313C: - _0807E864 - EndBlock - _0807EB74 + _0807E864 + EndBlock + _0807EB74 Call sub_0806AED8 CallWithArg sub_0806AA50, 0x00000000 - _0807EA94 + _0807EA94 CallWithArg sub_0806AA50, 0x00000001 - _0807EA94 + _0807EA94 CallWithArg sub_0806AA50, 0x00000002 - _0807EA94 + _0807EA94 JumpIf script_08013176 - _0807E878 + _0807E878 Jump script_08013128 script_08013176: SetIntVariable 0x00000403 Call sub_0807F420 - _0807E878 + _0807E878 Jump script_08013128 SCRIPT_START script_08013188 - BeginBlock + BeginBlock CheckLocalFlag 0x0062 JumpIfNot script_0801319A DoPostScriptAction 0x0006 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index a1a3ec09..d3b10195 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -1,34 +1,34 @@ SCRIPT_START script_0801319A - EndBlock - BeginBlock - CameraTargetEntity - MoveEntityToPlayer + EndBlock + BeginBlock + CameraTargetEntity + MoveEntityToPlayer Call sub_0806AB74 Jump script_0801319A SCRIPT_START script_080131AC CheckPlayerInRegion 0x0098, 0x0038, 0x2060 JumpIfNot script_080131AC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_080132E4 WaitForSomething2 0x00000002 _0807EB28 0x1601 - _0807EA94 + _0807EA94 StartPlayerScript script_0801330C WaitForSomething2 0x00000002 _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 LoadRoomEntityList gUnk_080F5680 StartPlayerScript script_08013330 WaitForSomething2 0x00000002 - MoveEntityToPlayer + MoveEntityToPlayer SetEntityPosition 0x0000, 0xfff0 Call sub_0807F844 - CameraTargetEntity + CameraTargetEntity Call sub_080536B8 - _0807E864 + _0807E864 Call sub_0807DF28 WaitFor_2 MessageFromTargetPos 0x1602, 0x000c @@ -51,28 +51,28 @@ SCRIPT_START script_080131AC WaitForSomething2 0x00000040 SetFadeMask 0xffff7fff _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 StopBgm _0807E858 0x0000 Wait 0x003c - CameraTargetPlayer + CameraTargetPlayer Call sub_0807F5C0 MessageFromTargetPos 0x1604, 0x0007 _0807EA94 SetFadeMask 0xffffffff _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807EB28 0x1605 - _0807EA94 + _0807EA94 SetLocalFlag 0x0078 PlayBgm BGM_CASTLE_COLLAPSE SetGlobalFlag 0x005d Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc index 61f3f5ea..78146e83 100644 --- a/data/scripts/script_080132E4.inc +++ b/data/scripts/script_080132E4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080132E4 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0058 _0807EB44 0x0000 diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc index 7963871e..fd756c78 100644 --- a/data/scripts/script_0801330C.inc +++ b/data/scripts/script_0801330C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801330C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EC64 0x0020 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08013330.inc b/data/scripts/script_08013330.inc index 082f3afb..e1622710 100644 --- a/data/scripts/script_08013330.inc +++ b/data/scripts/script_08013330.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013330 - BeginBlock + BeginBlock _0807EB44 0x0000 SetEntityPositionRelative 0x0098, 0x0070 - EndBlock + EndBlock _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc index d210e38e..f353b8f8 100644 --- a/data/scripts/script_0801334C.inc +++ b/data/scripts/script_0801334C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0801334C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x000d - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807ECC4 0x0020 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc index 52231159..7b1a62fd 100644 --- a/data/scripts/script_080133C4.inc +++ b/data/scripts/script_080133C4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080133C4 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00000008 Call sub_08061F94 Wait 0x000a diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc index 042cb44d..d489dda4 100644 --- a/data/scripts/script_080133F8.inc +++ b/data/scripts/script_080133F8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080133F8 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00000020 SetEntityPositionRelative 0x0098, 0x0048 Call sub_08066C94 diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc index 37b49953..077f4297 100644 --- a/data/scripts/script_08013494.inc +++ b/data/scripts/script_08013494.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08013494 - BeginBlock + BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 - EndBlock + EndBlock Wait 0x005a Call sub_08094B6C _0807EDD4 0x0098, 0x0080 - BeginBlock + BeginBlock Call sub_08094B80 PlaySound SFX_1CC Call sub_0807F36C _0807E5F8 0x00000080 - EndBlock + EndBlock DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index dfc15135..a355d9e0 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -1,38 +1,38 @@ SCRIPT_START script_080134DC - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - EndBlock + EndBlock script_080134F8: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080134F8 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F04 PlaySound SFX_ELEMENT_PLACE Wait 0x005a - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E04 CallWithArg sub_08095D54, script_08013E28 - EndBlock + EndBlock WaitForSomething2 0x18000000 - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 - EndBlock + EndBlock Wait 0x001e - BeginBlock + BeginBlock PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 - EndBlock + EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 _0807E5F8 0x00000200 @@ -57,14 +57,14 @@ script_080134F8: Call sub_0807F304 Wait 0x003c _0807E778 0x0004 - DoFade7 + DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 PlaySound SFX_109 MessageFromTargetPos 0x0503, 0x000c _0807EA94 diff --git a/data/scripts/script_08013650.inc b/data/scripts/script_08013650.inc index be9e61d7..f42ba66d 100644 --- a/data/scripts/script_08013650.inc +++ b/data/scripts/script_08013650.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08013650 Wait 0x003c _0807F0B4 0x0007 SetEntityPositionRelative 0x00e8, 0x00a8 - CameraTargetEntity + CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 Wait 0x0078 @@ -12,12 +12,12 @@ SCRIPT_START script_08013650 StartPlayerScript script_080136B4 WaitForSomething2 0x00000002 _0807EB28 0x1501 - _0807EA94 + _0807EA94 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer SetLocalFlag 0x007a Call sub_08053250 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc index da761630..3cd43738 100644 --- a/data/scripts/script_080136B4.inc +++ b/data/scripts/script_080136B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080136B4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x00e8, 0x00a8 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc index 989c33ee..bd7e8f9c 100644 --- a/data/scripts/script_080136D8.inc +++ b/data/scripts/script_080136D8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080136D8 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock Call sub_0807F584 JumpTable script_080136F0, script_080136FA, script_08013704, script_080136FA script_080136F0: diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index bfc8c938..b7321df8 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -1,39 +1,39 @@ SCRIPT_START script_08013720 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - EndBlock + EndBlock script_0801373C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801373C - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F34 PlaySound SFX_ELEMENT_PLACE Wait 0x005a - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E4C - EndBlock + EndBlock WaitForSomething2 0x20000000 - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 CallWithArg sub_08095D8C, script_08014094 - EndBlock + EndBlock Wait 0x001e - BeginBlock + BeginBlock PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 CallWithArg sub_08095D8C, script_08014154 - EndBlock + EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 _0807E5F8 0x00000200 @@ -60,14 +60,14 @@ script_0801373C: Call sub_0807F304 Wait 0x003c _0807E778 0x0004 - DoFade7 + DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 PlaySound SFX_109 MessageFromTargetPos 0x0504, 0x000c _0807EA94 @@ -75,7 +75,7 @@ script_0801373C: SetLocalFlag 0x007b Call sub_08053250 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index d7e542da..e2cce8fe 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -1,41 +1,41 @@ SCRIPT_START script_080138B4 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - EndBlock + EndBlock script_080138D0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080138D0 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F64 PlaySound SFX_ELEMENT_PLACE Wait 0x005a - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E70 - EndBlock + EndBlock WaitForSomething2 0x40000000 - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 CallWithArg sub_08095D8C, script_08014094 CallWithArg sub_08095D8C, script_080140B8 - EndBlock + EndBlock Wait 0x001e - BeginBlock + BeginBlock PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 CallWithArg sub_08095D8C, script_08014154 CallWithArg sub_08095D8C, script_08014198 - EndBlock + EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 _0807E5F8 0x00000200 @@ -65,14 +65,14 @@ script_080138D0: Call sub_0807F304 Wait 0x003c _0807E778 0x0004 - DoFade7 + DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 PlaySound SFX_109 MessageFromTargetPos 0x0505, 0x000c _0807EA94 @@ -80,7 +80,7 @@ script_080138D0: .ifndef EU _0807F0B4 0x0002 SetEntityPositionRelative 0x00e8, 0x00d8 - CameraTargetEntity + CameraTargetEntity .endif Call sub_0806DC3C CallWithArg sub_0807F244, 0x00010001 diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/script_08013AA6.inc index 704a94ee..9aaa52eb 100644 --- a/data/scripts/script_08013AA6.inc +++ b/data/scripts/script_08013AA6.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08013AA6 .ifdef EU _0807F0B4 0x0007 SetEntityPositionRelative 0x00e8, 0x00a8 - CameraTargetEntity + CameraTargetEntity Wait 0x003c .endif _0807E5F8 0x00000008 @@ -14,21 +14,21 @@ SCRIPT_START script_08013AA6 Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x00e8, 0x0050 - CameraTargetEntity + CameraTargetEntity Wait 0x003c LoadRoomEntityList gUnk_080F55D8 Wait 0x0078 _0807F0B4 0x0007 - MoveEntityToPlayer - CameraTargetEntity + MoveEntityToPlayer + CameraTargetEntity Wait 0x003c _0807EB28 0x1502 - _0807EA94 + _0807EA94 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer SetLocalFlag 0x007c Call sub_08053250 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc index e1b11b09..093dd881 100644 --- a/data/scripts/script_08013B18.inc +++ b/data/scripts/script_08013B18.inc @@ -1,24 +1,24 @@ SCRIPT_START script_08013B18 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 script_08013B1E: - EndBlock - BeginBlock + EndBlock + BeginBlock CallWithArg sub_0807F6B4, 0x000001c8 JumpIfNot script_08013B1E CheckInventory1 0x0006 JumpIfNot script_08013B1E CheckLocalFlag 0x0078 JumpIf script_08013B1E - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807EB28 0x1507 - _0807EA94 + _0807EA94 StartPlayerScript script_08010A14 WaitForSomething2 0x00000001 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08013B1E .2byte 0x0000 diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc index b6c87eec..6e6988d0 100644 --- a/data/scripts/script_08013BE8.inc +++ b/data/scripts/script_08013BE8.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08013BE8 - BeginBlock + BeginBlock CheckLocalFlag 0x007a JumpIf script_08013C2A CheckInventory1 0x0003 @@ -10,7 +10,7 @@ SCRIPT_START script_08013BE8 JumpIfNot script_08013C98 CheckInventory1 0x0041 JumpIfNot script_08013C98 - EndBlock + EndBlock DoPostScriptAction 0x0008 WaitForSomething2 0x00000004 _0807E908 0x0002 @@ -20,7 +20,7 @@ script_08013C2A: CheckLocalFlag 0x007c JumpIf script_08013C98 script_08013C32: - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F934 DoPostScriptAction 0x000a @@ -28,17 +28,17 @@ script_08013C32: .ifndef EU CallWithArg sub_0807F8E8, 0x00000004 .endif - EndBlock + EndBlock script_08013C58: - EndBlock - BeginBlock + EndBlock + BeginBlock TestBit 0x00000008 JumpIf script_08013C92 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013C58 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 CheckLocalFlag 0x007d JumpIf script_08013C82 _0807EB28 0x1501 @@ -46,12 +46,12 @@ script_08013C58: script_08013C82: _0807EB28 0x1506 script_08013C86: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08013C58 script_08013C92: - EndBlock + EndBlock _0807E908 0x0004 script_08013C98: DoPostScriptAction 0x0008 diff --git a/data/scripts/script_08013CA4.inc b/data/scripts/script_08013CA4.inc index 923f7045..d83c3e2e 100644 --- a/data/scripts/script_08013CA4.inc +++ b/data/scripts/script_08013CA4.inc @@ -1,25 +1,25 @@ SCRIPT_START script_08013CA4 - EndBlock + EndBlock script_08013CA6: CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 JumpIfNot script_08013CA6 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0001 SetEntityPositionRelative 0x00e8, 0x0138 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 Wait 0x0078 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807F5C0 _0807EB28 0x1504 - _0807EA94 + _0807EA94 SetLocalFlag 0x0079 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc index 94e4b155..c18da600 100644 --- a/data/scripts/script_08013D04.inc +++ b/data/scripts/script_08013D04.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013D04 - BeginBlock + BeginBlock Call sub_0807F92C DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 - EndBlock + EndBlock script_08013D1C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013D1C CallWithArg sub_08095D54, 0x00000000 PlaySound SFX_ELEMENT_PLACE diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc index fb8e239b..b2035e0e 100644 --- a/data/scripts/script_08013D44.inc +++ b/data/scripts/script_08013D44.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013D44 - BeginBlock + BeginBlock Call sub_0807F92C DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 - EndBlock + EndBlock script_08013D5C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013D5C CallWithArg sub_08095D54, 0x00000001 PlaySound SFX_ELEMENT_PLACE diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc index 30973797..99a81862 100644 --- a/data/scripts/script_08013D84.inc +++ b/data/scripts/script_08013D84.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013D84 - BeginBlock + BeginBlock Call sub_0807F92C DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 - EndBlock + EndBlock script_08013D9C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013D9C CallWithArg sub_08095D54, 0x00000002 PlaySound SFX_ELEMENT_PLACE diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc index 620febcf..dbac7069 100644 --- a/data/scripts/script_08013DC4.inc +++ b/data/scripts/script_08013DC4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013DC4 - BeginBlock + BeginBlock Call sub_0807F92C DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 - EndBlock + EndBlock script_08013DDC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013DDC CallWithArg sub_08095D54, 0x00000003 PlaySound SFX_ELEMENT_PLACE diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc index bc6bb9c4..47abff69 100644 --- a/data/scripts/script_08013E04.inc +++ b/data/scripts/script_08013E04.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E04 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0000 - EndBlock + EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x00f8 _0807E930 0x0001 diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc index ebdbe6ce..e996cf56 100644 --- a/data/scripts/script_08013E28.inc +++ b/data/scripts/script_08013E28.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E28 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0002 - EndBlock + EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x00f8 _0807E930 0x0003 diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc index 4cf5047d..7180dae7 100644 --- a/data/scripts/script_08013E4C.inc +++ b/data/scripts/script_08013E4C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E4C - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0004 - EndBlock + EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x0168 _0807E930 0x0005 diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc index f74c3644..fb6a48c8 100644 --- a/data/scripts/script_08013E70.inc +++ b/data/scripts/script_08013E70.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E70 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0006 - EndBlock + EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x0168 _0807E930 0x0007 diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc index a01fcca2..6da73541 100644 --- a/data/scripts/script_08013E94.inc +++ b/data/scripts/script_08013E94.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013E94 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x00b0, 0x00f8 _0807E930 0x0001 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc index 777ce0e7..f02fef23 100644 --- a/data/scripts/script_08013EB0.inc +++ b/data/scripts/script_08013EB0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013EB0 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x0120, 0x00f8 _0807E930 0x0003 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc index daeb7eb8..4ea11b20 100644 --- a/data/scripts/script_08013ECC.inc +++ b/data/scripts/script_08013ECC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013ECC - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x0120, 0x0168 _0807E930 0x0005 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc index 081cdfbb..924a762e 100644 --- a/data/scripts/script_08013EE8.inc +++ b/data/scripts/script_08013EE8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013EE8 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x00b0, 0x0168 _0807E930 0x0007 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc index 8e99a3ff..7b5162e1 100644 --- a/data/scripts/script_08013F04.inc +++ b/data/scripts/script_08013F04.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F04 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000b Call sub_0807F2D4 diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc index 18a770a5..9646a835 100644 --- a/data/scripts/script_08013F34.inc +++ b/data/scripts/script_08013F34.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F34 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0009 - EndBlock + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000c Call sub_0807F2D4 diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc index 5dbd9cdb..3bdd29ac 100644 --- a/data/scripts/script_08013F64.inc +++ b/data/scripts/script_08013F64.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F64 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x000a - EndBlock + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000d Call sub_0807F2D4 diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc index b34394a6..4ca6f3f1 100644 --- a/data/scripts/script_08013F94.inc +++ b/data/scripts/script_08013F94.inc @@ -1,26 +1,26 @@ SCRIPT_START script_08013F94 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock CheckLocalFlag 0x007d JumpIf script_08013FE0 script_08013FA4: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckInventory1 0x0003 JumpIfNot script_08013FA4 CheckPlayerFlags 0x00400000 JumpIfNot script_08013FA4 - EndBlock + EndBlock Call sub_0807FA40 - _0807E888 + _0807E888 Call sub_0807DF38 Wait 0x0078 _0807EB28 0x1505 - _0807EA94 + _0807EA94 SetLocalFlag 0x007d Call sub_0807DF50 - _0807E878 + _0807E878 script_08013FE0: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc index 605788ba..6c30a598 100644 --- a/data/scripts/script_08013FE8.inc +++ b/data/scripts/script_08013FE8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08013FE8 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock script_08013FF0: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckLocalFlag 0x007d JumpIf script_0801404C CheckLocalFlag 0x007a @@ -13,18 +13,18 @@ script_08013FF0: JumpIfNot script_08013FF0 CallWithArg sub_0807F6B4, 0x000000d0 JumpIfNot script_08013FF0 - EndBlock + EndBlock Call sub_0807F9A4 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock _0807EB28 0x1508 - _0807EA94 + _0807EA94 StartPlayerScript script_08010A14 WaitForSomething2 0x00000001 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08013FF0 script_0801404C: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc index b00a8e67..52fc4e4f 100644 --- a/data/scripts/script_08014054.inc +++ b/data/scripts/script_08014054.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014054 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0000 Call sub_0807F738 - EndBlock + EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc index 33a943f1..94ac4516 100644 --- a/data/scripts/script_08014074.inc +++ b/data/scripts/script_08014074.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014074 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0001 Call sub_0807F738 - EndBlock + EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014094.inc b/data/scripts/script_08014094.inc index 6160fb05..804c7748 100644 --- a/data/scripts/script_08014094.inc +++ b/data/scripts/script_08014094.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014094 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0002 Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 - EndBlock + EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140B8.inc b/data/scripts/script_080140B8.inc index 8fb4d8e0..94996896 100644 --- a/data/scripts/script_080140B8.inc +++ b/data/scripts/script_080140B8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080140B8 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0003 Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 - EndBlock + EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140DC.inc b/data/scripts/script_080140DC.inc index 2cce09f5..14d92521 100644 --- a/data/scripts/script_080140DC.inc +++ b/data/scripts/script_080140DC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080140DC - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0004 - EndBlock + EndBlock WaitForSomething2 0x00000200 _0807E930 0x0008 Call sub_0807F2D4 diff --git a/data/scripts/script_08014118.inc b/data/scripts/script_08014118.inc index 350984a1..3576334e 100644 --- a/data/scripts/script_08014118.inc +++ b/data/scripts/script_08014118.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08014118 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0005 - EndBlock + EndBlock WaitForSomething2 0x00000400 _0807E930 0x0009 Call sub_0807F2D4 diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc index 898e3180..5f7ddbf6 100644 --- a/data/scripts/script_08014154.inc +++ b/data/scripts/script_08014154.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014154 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0006 SetEntityPosition 0x0000, 0xfff0 - EndBlock + EndBlock WaitForSomething2 0x00000800 _0807E930 0x000a Call sub_0807F2D4 diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc index a7e84754..c3506e6f 100644 --- a/data/scripts/script_08014198.inc +++ b/data/scripts/script_08014198.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014198 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0007 SetEntityPosition 0x0000, 0xfff0 - EndBlock + EndBlock WaitForSomething2 0x00001000 _0807E930 0x000b Call sub_0807F2D4 diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc index e80ffd66..cdb648e7 100644 --- a/data/scripts/script_080141DC.inc +++ b/data/scripts/script_080141DC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080141DC - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0014 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc - EndBlock + EndBlock WaitForSomething 0x00000020 Wait 0x0078 Call sub_0807F2D4 diff --git a/data/scripts/script_08014210.inc b/data/scripts/script_08014210.inc index 73c8e186..4119ab95 100644 --- a/data/scripts/script_08014210.inc +++ b/data/scripts/script_08014210.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08014210 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0015 Call sub_0807F714 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc - EndBlock + EndBlock WaitForSomething 0x00000020 Wait 0x0078 Call sub_0807F2D4 diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index b8838306..9801bd81 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -11,18 +11,18 @@ script_08014264: .ifndef EU SCRIPT_START script_08014274 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock script_0801427C: CheckLocalFlag 0x0078 JumpIfNot script_0801427C - BeginBlock + BeginBlock Call sub_0807F934 CallWithArg sub_0806DA04, 0x00000008 - EndBlock + EndBlock script_08014298: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014298 _0807E864 MessageFromTargetPos 0x0647, 0x000c diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc index 6fbf9c70..aa5eac36 100644 --- a/data/scripts/script_080142B0.inc +++ b/data/scripts/script_080142B0.inc @@ -1,19 +1,19 @@ SCRIPT_START script_080142B0 - BeginBlock + BeginBlock CheckLocalFlag 0x0054 JumpIf script_08014382 CheckLocalFlag 0x0053 JumpIf script_08014330 - EndBlock + EndBlock script_080142C4: - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIfNot script_080142C4 CheckPlayerInRegion 0x0098, 0x0058, 0x1818 JumpIfNot script_080142C4 - EndBlock - _0807E864 + EndBlock + _0807E864 SetLocalFlag 0x0053 Wait 0x0014 _0807E908 0x0004 @@ -33,19 +33,19 @@ script_080142C4: _0807EA94 Wait 0x0014 _0807E930 0x0004 - _0807E878 + _0807E878 _0807E908 0x0001 script_08014330: - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIf script_08014330 - EntityHasHeight + EntityHasHeight JumpIf script_08014330 CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 JumpIfNot script_08014330 - EndBlock - _0807E864 + EndBlock + _0807E864 SetLocalFlag 0x0054 Wait 0x005a _0807E908 0x0004 @@ -58,6 +58,6 @@ script_08014330: Wait 0x0014 _0807E930 0x0004 _0807E908 0x0001 - _0807E878 + _0807E878 script_08014382: SCRIPT_END diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index dae8da90..7503513a 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -1,22 +1,22 @@ SCRIPT_START script_08014384 - EndBlock - _0807E864 - _0807EA94 - _0807E3E8 + EndBlock + _0807E864 + _0807EA94 + _0807E3E8 JumpIfNot script_080143AC Wait 0x001e Call sub_08065370 JumpIfNot script_080143AC Wait 0x003c - _0807EA94 - _0807EB8C + _0807EA94 + _0807EB8C Wait 0x001e MessageNoOverlapVar script_080143AC: - _0807EA94 + _0807EA94 Wait 0x001e _0807E930 0x0004 _0807E908 0x0001 - _0807E878 + _0807E878 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index 60dca24d..a908f1fe 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080143C0 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 Call sub_080654FC _0807E930 0x0001 @@ -37,5 +37,5 @@ script_0801443E: _0807E930 0x0004 _0807E908 0x0001 Call sub_0807DF50 - _0807E878 + _0807E878 SCRIPT_END diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index 6afadfa1..f6f2473f 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -1,14 +1,14 @@ SCRIPT_START script_08014450 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08014462: - _0807E30C + _0807E30C JumpIfNot script_08014462 - _0807E864 + _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 @@ -38,7 +38,7 @@ script_080144C0: .ifdef USA SetLocalFlag 0x00d3 .else -.ifdef DEMO +.ifdef DEMO_USA SetLocalFlag 0x00d3 .endif .endif @@ -57,14 +57,18 @@ script_080144F0: Wait 0x003c _0807E930 0x0002 script_080144FC: - _0807E878 + _0807E878 CheckRoomFlag 0x0000 JumpIfNot script_08014462 .ifdef USA - _0807E9DC + _0807E9DC .else -.ifdef DEMO - _0807E9DC +.ifdef DEMO_USA + _0807E9DC +.else +.ifdef DEMO_JP + _0807E9DC +.endif .endif .endif SCRIPT_END diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc index 1cd3510e..5046c8c9 100644 --- a/data/scripts/script_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0801450C - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 Call sub_0806E20C - _0807EA94 + _0807EA94 Call sub_0806E23C ClearLocalFlag 0x0093 ClearLocalFlag 0x0092 @@ -16,21 +16,21 @@ SCRIPT_START script_0801450C Jump script_080144FC .2byte 0x0000 SCRIPT_START script_08014548 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0801454C: CheckPlayerInRegion 0x0078, 0x0088, 0x0810 JumpIfNot script_0801454C CheckRoomFlag 0x0000 JumpIfNot script_0801454C - _0807E864 + _0807E864 _0807EB28 0x4217 - _0807EA94 + _0807EA94 StartPlayerScript script_08014588 Wait 0x0010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 - _0807E878 + _0807E878 Jump script_0801454C SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc index 35e475e0..b9971cca 100644 --- a/data/scripts/script_08014588.inc +++ b/data/scripts/script_08014588.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08014588 - EndBlock + EndBlock WaitForSomething2 0x00000001 SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0078 diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc index 4aa7eda2..266ab97d 100644 --- a/data/scripts/script_080145B0.inc +++ b/data/scripts/script_080145B0.inc @@ -1,29 +1,29 @@ SCRIPT_START script_080145B0 - BeginBlock + BeginBlock SetEntityPositionRelative 0x01f8, 0x00e0 CheckLocalFlag 0x005e JumpIf script_080145E4 - EndBlock + EndBlock script_080145C2: CheckRoomFlag 0x0005 JumpIfNot script_080145C2 - _0807E864 + _0807E864 ClearRoomFlag 0x0005 .ifdef EU Wait 0x0018 - _0807E8E4_1 + _0807E8E4_1 _0807EB44 0x0006 .else Wait 0x000c - _0807EB8C + _0807EB8C .endif MessageFromTargetPos 0x432e, 0x000c _0807EA94 .ifdef EU Wait 0x0018 .endif - _0807E878 + _0807E878 Jump script_080145C2 script_080145E4: - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index bdf84c80..edd2babc 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080145E8 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_080145F8: .ifdef EU CheckPlayerInRegion 0x00a8, 0x0054, 0x080c @@ -12,19 +12,19 @@ script_080145F8: JumpIfNot script_080145F8 CheckRoomFlag 0x0009 JumpIf script_08014632 - _0807E864 + _0807E864 Wait 0x0018 - _0807E8E4_3 + _0807E8E4_3 _0807EB44 0x0002 MessageFromTargetPos 0x432b, 0x000c _0807EA94 Wait 0x0018 - _0807E878 + _0807E878 Jump script_080145F8 script_08014632: CheckRoomFlag 0x0000 JumpIfNot script_08014632 - _0807E864 + _0807E864 Call sub_0807DF28 script_08014642: CheckRoomFlag 0x0009 @@ -32,12 +32,12 @@ script_08014642: _0807E5F8 0x00000004 WaitForSomething2 0x00000008 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_080145F8 .else CheckRoomFlag 0x0000 JumpIfNot script_080145F8 - _0807E864 + _0807E864 Call sub_0807DF28 script_08014608: CheckRoomFlag 0x0004 @@ -45,20 +45,20 @@ script_08014608: _0807E5F8 0x00000004 WaitForSomething2 0x00000008 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_080145F8 .endif .align 2, 0 SCRIPT_START script_08014628 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 SetEntityDirection 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801463A: - _0807E30C + _0807E30C .ifdef EU JumpIf script_080146E2 .else @@ -71,18 +71,18 @@ script_0801463A: JumpIfNot script_0801463A CheckRoomFlag 0x0009 JumpIfNot script_0801463A - _0807E864 + _0807E864 _0807EB28 0x431f - _0807EA94 + _0807EA94 script_0801469A: StartPlayerScript script_080147DC Wait 0x0010 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - _0807E878 + _0807E878 Jump script_0801463A script_080146E2: - _0807E864 + _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 @@ -116,26 +116,30 @@ script_0801472E_2: MessageFromTargetPos 0x432b, 0x000c Jump script_080147CE script_08014672: +.ifdef DEMO_JP + Call sub_08088658 +.else .ifdef JP CheckPlayerInRegion 0x0078, 0x0078, 0x0810 .else Call sub_08088658 .endif +.endif JumpIfNot script_0801463A - _0807E864 + _0807E864 _0807EB28 0x431f - _0807EA94 + _0807EA94 StartPlayerScript script_080147DC Wait 0x0010 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - _0807E878 + _0807E878 Jump script_0801463A script_080146A0: - _0807E864 + _0807E864 _0807E930 0x0008 Wait 0x0010 - _0807EB8C + _0807EB8C Wait 0x0010 _0807E930 0x0002 CheckGlobalFlag 0x0059 @@ -193,9 +197,9 @@ script_0801472E: ClearRoomFlag 0x0006 Call sub_08088544 script_0801473C: - _0807E3E8 + _0807E3E8 JumpIfNot script_08014770 - _0807EA94 + _0807EA94 _0807E3BC 0x0001 JumpIfNot script_080147C4 SetRoomFlag 0x0001 @@ -204,7 +208,7 @@ script_08014754: CheckRoomFlag 0x0003 JumpIfNot script_08014754 ClearRoomFlag 0x0003 - _0807EA94 + _0807EA94 .ifdef EU SetRoomFlag 0x0009 .else @@ -218,7 +222,7 @@ script_08014770: .else SetRoomFlag 0x0009 .endif - _0807EA94 + _0807EA94 Jump script_080147CE script_0801477A: CheckRoomFlag 0x0008 @@ -227,9 +231,9 @@ script_0801477A: JumpIf script_080147A4 script_0801478A: Call sub_08088478 - _0807EA94 + _0807EA94 Call sub_080885B0 - WaitPlayerAction8 + WaitPlayerAction8 _0807E5F8 0x00000008 Jump script_080147CE script_080147A4: @@ -250,12 +254,12 @@ script_080147C4: .endif MessageFromTargetPos 0x4307, 0x000c script_080147CE: - _0807EA94 + _0807EA94 .ifdef EU Wait 0x000F .else Wait 0x0004 .endif - _0807E878 + _0807E878 Jump script_0801463A .align 2, 0 diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc index c6e83402..d5b0ad59 100644 --- a/data/scripts/script_080147DC.inc +++ b/data/scripts/script_080147DC.inc @@ -1,5 +1,5 @@ SCRIPT_START script_080147DC - EndBlock + EndBlock WaitForSomething2 0x00000002 SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0068 diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index 3935155d..6ab2315f 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014804 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 DoPostScriptAction 0x000a - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF38 Wait 0x0010 CheckLocalFlag 0x0093 @@ -16,9 +16,9 @@ script_0801482E: JumpIf script_08014862 TestBit 0x00000004 JumpIf script_08014878 - _0807E30C + _0807E30C JumpIfNot script_0801482E - _0807E864 + _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 @@ -42,9 +42,9 @@ script_0801488E: JumpIf script_080148C2 TestBit 0x00000004 JumpIf script_080148D8 - _0807E30C + _0807E30C JumpIfNot script_0801488E - _0807E864 + _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 @@ -66,27 +66,27 @@ script_080148D8: Jump script_0801488E .2byte 0x0000 SCRIPT_START script_080148F0 - BeginBlock - EndBlock + BeginBlock + EndBlock script_080148F4: CheckRoomFlag 0x0000 JumpIfNot script_080148F4 ClearRoomFlag 0x0000 Call sub_0806E140 JumpIfNot script_08014932 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08014938 - _0807E864 + _0807E864 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0806E1E0 - _0807EA94 + _0807EA94 Wait 0x0018 - _0807E878 + _0807E878 Jump script_080148F4 script_08014932: - _0807EA94 + _0807EA94 Jump script_08014938 script_08014938: _0807E5F8 0x00000004 diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc index 9cbae7ab..5d851262 100644 --- a/data/scripts/script_08014958.inc +++ b/data/scripts/script_08014958.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08014958 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 @@ -7,33 +7,33 @@ SCRIPT_START script_08014958 _0807EB44 0x0004 SetEntityPositionRelative 0x0078, 0x0128 script_08014976: - EndBlock + EndBlock script_08014978: - _0807E30C + _0807E30C JumpIfNot script_08014978 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014978 SCRIPT_START script_08014994 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 JumpIfNot script_080149C6 - EndBlock + EndBlock script_080149AA: - _0807E30C + _0807E30C JumpIfNot script_080149AA - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_080149AA script_080149C6: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc index 18150975..4f6024af 100644 --- a/data/scripts/script_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -1,16 +1,16 @@ SCRIPT_START script_080149CC - BeginBlock + BeginBlock SetEntitySpeed 0x0080 Call sub_0806C870 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080149DE: - _0807E30C + _0807E30C JumpIfNot script_080149DE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 CheckLocalFlag 0x0064 JumpIfNot script_08014A20 CheckLocalFlag 0x00b1 @@ -20,42 +20,42 @@ script_080149DE: DoPostScriptAction 0x0001 _0807EDD4 0x0068, 0x00f8 PlaySound SFX_SECRET - _0807EB74 + _0807EB74 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a script_08014A20: - _0807E878 + _0807E878 Jump script_080149DE .2byte 0x0000 SCRIPT_START script_08014A28 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08014A36: - _0807E30C + _0807E30C JumpIfNot script_08014A36 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014A36 .2byte 0x0000 SCRIPT_START script_08014A54 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08014A62: - _0807E30C + _0807E30C JumpIfNot script_08014A62 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014A62 .2byte 0x0000 diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index 4202b530..458e2c90 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014A80 - BeginBlock + BeginBlock DoPostScriptAction 0x000a - EndBlock + EndBlock WaitForSomething2 0x00000001 - _0807EB74 + _0807EB74 DoPostScriptAction 0x0004 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 @@ -11,7 +11,7 @@ SCRIPT_START script_08014A80 _0807EA94 _0807E5F8 0x00000002 script_08014AAC: - _0807E30C + _0807E30C JumpIfNot script_08014AAC _0807E864 _0807EB74 @@ -21,18 +21,18 @@ script_08014AAC: Jump script_08014AAC .2byte 0x0000 SCRIPT_START script_08014AC4 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08014AD2: - _0807E30C + _0807E30C JumpIfNot script_08014AD2 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 StartPlayerScript script_08014B10 WaitForSomething2 0x00000001 - _0807EB74 + _0807EB74 CheckLocalFlag 0x0064 JumpIf script_08014AFE SetLocalFlag 0x0064 @@ -41,8 +41,8 @@ script_08014AD2: script_08014AFE: MessageNoOverlap 0x2f0c script_08014B02: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014AD2 .2byte 0x0000 diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc index 45c292eb..42a6c2b1 100644 --- a/data/scripts/script_08014B10.inc +++ b/data/scripts/script_08014B10.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08014B10 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0078, 0x0040 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index eb6efc4f..d62ae07d 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -1,16 +1,16 @@ SCRIPT_START script_08014B34 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807E930 0x0000 - EndBlock + EndBlock CheckLocalFlag 0x0063 JumpIf script_08014BE8 script_08014B48: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIf script_08014B70 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014B48 EndBlock _0807E864 @@ -18,11 +18,11 @@ script_08014B48: MessageNoOverlap 0x2f01 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014B48 script_08014B70: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 _0807E5F8 0x00000001 DoPostScriptAction 0x0004 @@ -45,14 +45,14 @@ script_08014B70: _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 script_08014BE8: _0807E930 0x0010 Call sub_0806CD4C script_08014BF2: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014BF2 - _0807E864 + _0807E864 CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 @@ -60,27 +60,27 @@ script_08014BF2: _0807EA94 SetIntVariable 0x00000064 _0807F034 0x003f - WaitPlayerAction8 + WaitPlayerAction8 Jump script_08014C22 script_08014C1C: MessageNoOverlap 0x2f08 _0807EA94 script_08014C22: Wait 0x000f - _0807E878 + _0807E878 Jump script_08014BF2 SCRIPT_START script_08014C2C - BeginBlock + BeginBlock Call sub_0806CD58 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0006 - EndBlock + EndBlock script_08014C42: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014C42 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 script_08014C4C: Call sub_0806CCD0 JumpIfNot script_08014C4C @@ -93,38 +93,38 @@ script_08014C56: MessageNoOverlap 0x2f0d _0807EA94 _0807F034 0x000a - WaitPlayerAction8 + WaitPlayerAction8 Jump script_08014C82 script_08014C7C: MessageNoOverlap 0x2f09 _0807EA94 script_08014C82: Wait 0x000f - _0807E878 + _0807E878 _0807EB44 0x0004 _0807E930 0x0006 Jump script_08014C42 SCRIPT_START script_08014C94 - BeginBlock + BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 Call sub_0806C870 DoPostScriptAction 0x000a DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08014CAE: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 - _0807E30C + _0807E30C JumpIfNot script_08014CAE - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08014CAE script_08014CD4: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index 4a490042..71fa1f1f 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08014CDC - BeginBlock + BeginBlock SetEntitySpeed 0x0180 DoPostScriptAction 0x000a Call sub_08066D04 @@ -7,7 +7,7 @@ SCRIPT_START script_08014CDC SetEntityPositionRelative 0x01e8, 0x0180 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000001 Call sub_08066E08 _0807E864 @@ -15,12 +15,12 @@ SCRIPT_START script_08014CDC _0807EA94 _0807E5F8 0x00000002 script_08014D1E: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 JumpIfNot script_08014D1E - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 MessageNoOverlap 0x1012 @@ -30,11 +30,11 @@ script_08014D1E: Call sub_08066E08 SetEntityPositionRelative 0x01f8, 0x00c8 Call sub_0807DF50 - _0807E878 + _0807E878 script_08014D60: CallWithArg sub_0807F6B4, 0x000000e8 JumpIf script_08014D60 - _0807E864 + _0807E864 Call sub_0807DF28 MessageNoOverlap 0x1013 _0807EA94 @@ -43,11 +43,11 @@ script_08014D60: DoPostScriptAction 0x0000 SetEntityPositionRelative 0x01e8, 0x0028 Call sub_0807DF50 - _0807E878 + _0807E878 script_08014D96: CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 JumpIfNot script_08014D96 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 MessageNoOverlap 0x1014 @@ -59,10 +59,14 @@ script_08014D96: .ifdef EU SetLocalFlag 0x006b .else +.ifdef DEMO_JP + SetLocalFlag 0x006b @ TODO deduplicate +.else SetLocalFlag 0x006d .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc index f8df2393..f8d36d7f 100644 --- a/data/scripts/script_08014DCC.inc +++ b/data/scripts/script_08014DCC.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08014DCC - BeginBlock + BeginBlock SetEntityPositionRelative 0x0238, 0x01a8 Call sub_0807F844 Call sub_0807F348 - _0807E864 + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock _0807E778 0x0010 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 9a637147..2de18b8c 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -1,37 +1,37 @@ SCRIPT_START script_08014E14 - BeginBlock + BeginBlock _0807EB44 0x0004 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08014E2C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014E2C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08014E2C .2byte 0x0000 SCRIPT_START script_08014E50 - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08014E64: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014E64 - _0807E864 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 CallWithArg sub_0807F78C, 0x00000022 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08014EBC CallWithArg sub_0807F7C4, 0x00000022 JumpIfNot script_08014EB0 @@ -47,20 +47,20 @@ script_08014EB0: script_08014EB8: MessageNoOverlap 0x0a02 script_08014EBC: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08014E64 .2byte 0x0000 SCRIPT_START script_08014ECC - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08014EE0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014EE0 _0807E864 _0807EB74 @@ -70,17 +70,17 @@ script_08014EE0: Jump script_08014EE0 .2byte 0x0000 SCRIPT_START script_08014EF8 - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x000a - EndBlock + EndBlock script_08014F0C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014F0C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 MessageNoOverlap 0x200e _0807EA94 @@ -90,26 +90,26 @@ script_08014F0C: Jump script_08014F0C .2byte 0x0000 SCRIPT_START script_08014F30 - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x000e - EndBlock + EndBlock Call sub_08065914 script_08014F4A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014F4A - _0807E864 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 DoPostScriptAction 0x0000 BeginBlock MessageNoOverlap 0x3b0b CallWithArg sub_0807F854, 0x00010064 - EndBlock - _0807EA94 - _0807E3E8 + EndBlock + _0807EA94 + _0807E3E8 JumpIfNot script_08014FA6 HasRupees 0x0064 JumpIfNot script_08014F9A @@ -126,26 +126,26 @@ script_08014F9A: script_08014FA2: MessageNoOverlap 0x3b0f script_08014FA6: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 _0807EB44 0x0004 _0807E930 0x000e Jump script_08014F4A SCRIPT_START script_08014FBC - BeginBlock + BeginBlock SetEntityPositionRelative 0x01f8, 0x00e0 Call sub_08054564 - EndBlock + EndBlock script_08014FCC: CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 JumpIfNot script_08014FCC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StopBgm _0807F0B4 0x0001 - CameraTargetEntity + CameraTargetEntity StartPlayerScript script_080152B4 WaitForSomething2 0x00000001 MessageFromTargetPos 0x1301, 0x0002 @@ -168,10 +168,10 @@ script_08014FCC: _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807EB28 0x1306 - _0807EA94 + _0807EA94 StopBgm StartPlayerScript script_080152DC - CameraTargetEntity + CameraTargetEntity _0807F0B4 0x0003 SetEntityPositionRelative 0x01f8, 0x0148 WaitForSomething2 0x00000001 @@ -204,11 +204,11 @@ script_08014FCC: LoadRoomEntityList gUnk_080F7FC0 PlayBgm BGM_FIGHT_THEME Call sub_0807DF50 - _0807E878 + _0807E878 script_08015104: CheckRoomFlag 0x0000 JumpIfNot script_08015104 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StopBgm @@ -238,51 +238,55 @@ script_08015104: Wait 0x003c PlaySound SFX_SECRET _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer .ifdef JP SetLocalFlag 0x008a .else .ifdef EU SetLocalFlag 0x008a .else +.ifdef DEMO_JP + SetLocalFlag 0x008a @ TODO deduplicate +.else SetLocalFlag 0x008c .endif .endif +.endif _0807EB28 0x130c - _0807EA94 - CameraTargetPlayer + _0807EA94 + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitFor_2 Call sub_08053B3C - BeginBlock - _0807E864 + BeginBlock + _0807E864 CallWithArg sub_0807F6E8, 0x00000008 - MoveEntityToPlayer + MoveEntityToPlayer _0807F0B4 0x0004 - CameraTargetEntity + CameraTargetEntity _0807E778 0x0100 - DoFade4 + DoFade4 _0807E80C 0x00000000 - EndBlock + EndBlock StartPlayerScript script_08015360 WaitForSomething2 0x00000001 LoadRoomEntityList gUnk_080F7CB0 _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitFor_2 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 - BeginBlock - _0807E8E4_2 + BeginBlock + _0807E8E4_2 _0807EB28 0x1315 - EndBlock - _0807EA94 + EndBlock + _0807EA94 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_08054570 PlayBGM Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc index fa102af2..c7060e78 100644 --- a/data/scripts/script_08015234.inc +++ b/data/scripts/script_08015234.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015234 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F354 - EndBlock + EndBlock WaitForSomething2 0x00000002 Call sub_08066C94 Wait 0x00e9 diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc index e29fae3e..61ae2f32 100644 --- a/data/scripts/script_080152B4.inc +++ b/data/scripts/script_080152B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080152B4 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00b8 _0807EB44 0x0004 diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc index c16d1795..5e55ee16 100644 --- a/data/scripts/script_080152DC.inc +++ b/data/scripts/script_080152DC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080152DC - BeginBlock + BeginBlock SetEntitySpeed 0x0200 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc index 786e3cf2..5dd2c48f 100644 --- a/data/scripts/script_08015338.inc +++ b/data/scripts/script_08015338.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015338 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc index 73b67bde..98b78e13 100644 --- a/data/scripts/script_08015360.inc +++ b/data/scripts/script_08015360.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015360 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 SetEntityPositionRelative 0x0208, 0x0148 - EndBlock + EndBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 _0807E5F8 0x00000001 diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index d921db1c..953164f8 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015390 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 - EndBlock + EndBlock _0807E930 0x001f Call sub_0806D944 WaitForSomething2 0x00000008 @@ -12,7 +12,7 @@ SCRIPT_START script_08015390 _0807E930 0x0018 Call sub_0806D8A0 script_080153C2: - _0807EE30 + _0807EE30 JumpIfNot script_080153C2 _0807E930 0x001f StartPlayerScript script_08015384 diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index 418d7250..5fc90ba9 100644 --- a/data/scripts/script_080153EC.inc +++ b/data/scripts/script_080153EC.inc @@ -1,13 +1,13 @@ SCRIPT_START script_080153EC - BeginBlock + BeginBlock _0807F0B4 0x0007 SetEntityPositionRelative 0x0078, 0x0068 - CameraTargetEntity - EndBlock + CameraTargetEntity + EndBlock PlayBgm BGM_EZLO_STORY _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 Wait 0x003c _0807E5F8 0x00000080 WaitForSomething2 0x00000100 diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index aba5d017..7ca27f15 100644 --- a/data/scripts/script_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -19,8 +19,8 @@ SCRIPT_START script_0801548E WaitForSomething2 0x00001000 StopBgm _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 SetRoomFlag 0x0001 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index 31767026..267b9dd6 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0801550C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 _0807EB44 0x0000 Call sub_0807F338 - EndBlock + EndBlock CallWithArg sub_0806AF60, 0x00000000 WaitForSomething2 0x00008000 CallWithArg sub_0806AF60, 0x00000004 diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc index 58bf24d6..cc21ef92 100644 --- a/data/scripts/script_08015618.inc +++ b/data/scripts/script_08015618.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015618 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 SetEntitySpeed 0x0040 Call sub_08094B80 - EndBlock + EndBlock WaitForSomething2 0x00000080 CallWithArg CreateManager36, 0x00000003 Call sub_08094B0C diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc index 9d917502..4bcb6dc9 100644 --- a/data/scripts/script_08015684.inc +++ b/data/scripts/script_08015684.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08015684 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807EB44 0x0000 DoPostScriptAction 0x0017 Call sub_0807F180 - EndBlock + EndBlock WaitForSomething2 0x00000800 _0807EB44 0x0002 DoPostScriptAction 0x0017 diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc index e7543e12..8495df7f 100644 --- a/data/scripts/script_08015754.inc +++ b/data/scripts/script_08015754.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015754 - BeginBlock + BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call sub_08094B80 - EndBlock + EndBlock Wait 0x0078 PlaySound SFX_1C5 Call sub_08094B6C diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 7fe63941..e218446c 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -1,17 +1,17 @@ SCRIPT_START script_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot script_080157AC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 script_080157DA: CheckPlayerInRegion 0x0250, 0x0230, 0x3040 JumpIfNot script_080157DA - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0807F3F8 @@ -21,7 +21,7 @@ script_080157DA: StartPlayerScript script_080158F8 _0807F0B4 0x0001 SetEntityPositionRelative 0x0248, 0x0218 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 WaitForSomething2 0x00000010 _0807E5F8 0x00000008 @@ -37,21 +37,21 @@ script_080157DA: _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 Call sub_08066F94 _0807E5F8 0x00000008 script_08015880: CheckRoomFlag 0x0000 JumpIfNot script_08015880 script_08015888: - _0807EA94 + _0807EA94 ComparePlayerAction 0x001c JumpIf script_08015888 - _0807E864 + _0807E864 Call sub_0807DF28 _0807F0B4 0x0002 SetEntityPositionRelative 0x0248, 0x0208 - CameraTargetEntity + CameraTargetEntity StartPlayerScript script_08015938 WaitForSomething2 0x00000010 MessageFromTargetPos 0x106a, 0x000c @@ -69,13 +69,17 @@ script_08015888: .ifdef EU SetLocalFlag 0x0089 .else +.ifdef DEMO_JP + SetLocalFlag 0x0089 @ TODO deduplicate +.else SetLocalFlag 0x008b .endif .endif +.endif Call sub_08066FB8 Call sub_0807DF50 - _0807E878 + _0807E878 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 8756e3e5..4992ef17 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -1,17 +1,17 @@ SCRIPT_START script_08015958 - BeginBlock + BeginBlock SetEntitySpeed 0x0180 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b Call sub_08066D04 - EndBlock + EndBlock WaitForSomething2 0x00000001 - BeginBlock + BeginBlock Call sub_08066D14 - MoveEntityToPlayer - EndBlock + MoveEntityToPlayer + EndBlock DoPostScriptAction 0x0007 - _0807EB74 + _0807EB74 _0807EDD4 0x01f8, 0x02f8 _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -46,22 +46,22 @@ SCRIPT_START script_08015958 _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 _0807E5F8 0x00000002 script_08015A32: - EndBlock - BeginBlock - _0807EB74 + EndBlock + BeginBlock + _0807EB74 CheckRoomFlag 0x0000 JumpIf script_08015A54 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08015A32 EndBlock MessageFromTargetPos 0x1067, 0x0002 _0807EA94 Jump script_08015A32 script_08015A54: - EndBlock + EndBlock DoPostScriptAction 0x000b _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc index fd4dfb84..b0b245f7 100644 --- a/data/scripts/script_08015AC4.inc +++ b/data/scripts/script_08015AC4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015AC4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000008 _0807E908 0x0007 WaitForSomething2 0x00000008 diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc index fced2034..f0f3c82a 100644 --- a/data/scripts/script_08015B14.inc +++ b/data/scripts/script_08015B14.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015B14 - BeginBlock + BeginBlock _0807E930 0x0018 SetEntitySpeed 0x0300 - EndBlock + EndBlock _0807EDD4 0x0248, 0x0218 _0807E5F8 0x00000020 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index bfbfb95d..9bbdebc1 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -1,20 +1,24 @@ SCRIPT_START script_08015B34 - EndBlock - BeginBlock + EndBlock + BeginBlock .ifdef JP CheckLocalFlag 0x0089 .else .ifdef EU CheckLocalFlag 0x0089 .else +.ifdef DEMO_JP + CheckLocalFlag 0x0089 @ TODO deduplicate +.else CheckLocalFlag 0x008b .endif .endif +.endif JumpIf script_08015B7E CallWithArg sub_0807F6B4, 0x00000318 JumpIfNot script_08015B34 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 MessageFromTargetPos 0x2506, 0x0002 @@ -22,7 +26,7 @@ SCRIPT_START script_08015B34 StartPlayerScript script_08015B84 WaitForSomething2 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08015B34 script_08015B7E: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc index 433c22e4..70876df6 100644 --- a/data/scripts/script_08015BA8.inc +++ b/data/scripts/script_08015BA8.inc @@ -1,29 +1,33 @@ SCRIPT_START script_08015BA8 - BeginBlock + BeginBlock .ifdef JP SetLocalFlag 0x008c .else .ifdef EU SetLocalFlag 0x008c .else +.ifdef DEMO_JP + SetLocalFlag 0x008c @ TODO deduplicate +.else SetLocalFlag 0x008e .endif .endif - _0807E864 - MoveEntityToPlayer - CameraTargetEntity +.endif + _0807E864 + MoveEntityToPlayer + CameraTargetEntity SetEntitySpeed 0x0200 - EndBlock + EndBlock Wait 0x000f - _0807E8E4_2 + _0807E8E4_2 Call sub_0807F3F8 Wait 0x001e _0807EDD4 0x00b8, 0x0258 Wait 0x001e SetRoomFlag 0x0065 Wait 0x0078 - _0807EEB4 - CameraTargetPlayer - _0807E878 + _0807EEB4 + CameraTargetPlayer + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc index d066f2e8..8a8040fa 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -1,48 +1,52 @@ SCRIPT_START script_08015BE8 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock script_08015BF0: CheckPlayerInRegion 0x0160, 0x0020, 0x3040 JumpIfNot script_08015BF0 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0807FBC4 StartPlayerScript script_08015C7C WaitForSomething2 0x00000100 - CameraTargetPlayer + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitFor_2 StopBgm Call sub_08053BE8 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807FBC4 - CameraTargetPlayer + CameraTargetPlayer _0807E778 0x0100 - DoFade4 + DoFade4 _0807E80C 0x00000000 - EndBlock + EndBlock _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitFor_2 PlayBGM _0807EB28 0x131f - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x009b .else .ifdef EU SetLocalFlag 0x009b .else +.ifdef DEMO_JP + SetLocalFlag 0x009b @ TODO deduplicate +.else SetLocalFlag 0x009c .endif .endif +.endif Call sub_0807FBCC Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index 79f1bc44..82dfed5b 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015C7C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0168, 0x0058 _0807EB44 0x0004 diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc index c565c3e9..71dd90ee 100644 --- a/data/scripts/script_08015CD4.inc +++ b/data/scripts/script_08015CD4.inc @@ -1,35 +1,35 @@ SCRIPT_START script_08015CD4 - BeginBlock + BeginBlock _0807F0B4 0x0007 SetEntityPositionRelative 0x0088, 0x0068 - CameraTargetEntity - EndBlock + CameraTargetEntity + EndBlock _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x00e0 - CameraTargetEntity + CameraTargetEntity Wait 0x003c PlayBgm BGM_VAATI_THEME _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x0070 - CameraTargetEntity + CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x00e0 - CameraTargetEntity + CameraTargetEntity Wait 0x003c _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x0070 - CameraTargetEntity + CameraTargetEntity Wait 0x003c _0807E5F8 0x00000010 WaitForSomething2 0x00000020 @@ -38,15 +38,15 @@ SCRIPT_START script_08015CD4 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 _0807E5F8 0x00000010 LoadRoomEntityList gUnk_080FCE30 StopBgm Wait 0x0078 _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 PlayBgm BGM_DIGGING_CAVE _0807E5F8 0x00000040 WaitForSomething2 0x00000080 @@ -59,8 +59,8 @@ SCRIPT_START script_08015CD4 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 StopBgm SetRoomFlag 0x0000 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index 0f5a1434..530298f8 100644 --- a/data/scripts/script_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015DF0 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index c91747e8..9b010505 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015E58 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x001d - EndBlock + EndBlock WaitForSomething2 0x00000010 Call sub_08066C94 Wait 0x00e9 diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index 7592fe99..587e9899 100644 --- a/data/scripts/script_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015F08 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000001 MessageNoOverlap 0x131c _0807EA94 diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc index 6cb4e64b..b90cb216 100644 --- a/data/scripts/script_08015F3C.inc +++ b/data/scripts/script_08015F3C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015F3C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 _0807EB44 0x0000 _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething 0x00000040 _0807E930 0x0004 _0807EC64 0x00c0 diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc index 754f1236..685cd467 100644 --- a/data/scripts/script_08015F80.inc +++ b/data/scripts/script_08015F80.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015F80 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething 0x00000200 DoPostScriptAction 0x0005 WaitForSomething 0x00000400 diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc index b33a121f..3f743ae6 100644 --- a/data/scripts/script_08015FA4.inc +++ b/data/scripts/script_08015FA4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015FA4 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 - EndBlock + EndBlock WaitForSomething 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015FC0.inc b/data/scripts/script_08015FC0.inc index 0182664e..a4af16db 100644 --- a/data/scripts/script_08015FC0.inc +++ b/data/scripts/script_08015FC0.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08015FC0 - BeginBlock + BeginBlock Call sub_0806DB84 CheckKinstoneFused 0x0009 JumpIf script_08016028 _0807EA88 0x0009 CallWithArg sub_0806DA04, 0x00000007 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08015FE4: - _0807EA4C - _0807E9F0 - _0807E864 + _0807EA4C + _0807E9F0 + _0807E864 CheckKinstoneFused 0x0009 JumpIf script_08015FFE Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08015FE4 script_08015FFE: _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc index 9a93f3b9..af9de637 100644 --- a/data/scripts/script_08016004.inc +++ b/data/scripts/script_08016004.inc @@ -4,9 +4,9 @@ SCRIPT_START script_08016004 _0807F0C8 0x0000, 0x0000 PlaySound SFX_SECRET _0807EB28 0x0b1f - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 script_08016028: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc index 91553bd0..89472d82 100644 --- a/data/scripts/script_08016030.inc +++ b/data/scripts/script_08016030.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08016030 - BeginBlock + BeginBlock CheckKinstoneFused 0x0009 JumpIf script_08016062 - EndBlock + EndBlock WaitForSomething2 0x00000001 DoPostScriptAction 0x0010 Wait 0x003c diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc index b700d7ba..34937e0f 100644 --- a/data/scripts/script_0801606C.inc +++ b/data/scripts/script_0801606C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0801606C - BeginBlock + BeginBlock CheckKinstoneFused 0x0009 JumpIf script_0801609E - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0010 Wait 0x003c diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 6dac41e0..9910c142 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080160A8 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807E930 0x0008 script_080160B0: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_080160E0 TestBit 0x00000008 JumpIf script_080160D2 @@ -13,15 +13,15 @@ script_080160B0: JumpIf script_080160D2 Jump script_080160B0 script_080160D2: - EndBlock - _0807EB74 + EndBlock + _0807EB74 WaitForSomething2 0x00000004 Jump script_080160B0 script_080160E0: - _0807E864 - _0807EB74 - EndBlock - HasRoomItemForSale + _0807E864 + _0807EB74 + EndBlock + HasRoomItemForSale JumpIfNot script_0801611A MessageFromTarget 0x2d07 _0807EA94 @@ -33,14 +33,14 @@ script_080160E0: _0807EA94 Jump script_08016132 script_0801610C: - WaitPlayerAction8 + WaitPlayerAction8 .ifndef EU _0807EB8C MessageFromTarget 0x2d0d .else MessageFromTarget 0x2d08 .endif - _0807EA94 + _0807EA94 Jump script_08016132 script_0801611A: CheckKinstoneFused 0x0014 @@ -52,19 +52,19 @@ script_0801612C: MessageFromTarget 0x2d01 _0807EA94 script_08016132: - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_080160B0 .align 2, 0 SCRIPT_START script_0801613C - BeginBlock + BeginBlock Call sub_080787B4 - EndBlock + EndBlock script_08016146: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08016146 - _0807E864 + _0807E864 GetInventoryValue 0x0025 MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 _0807E3E8 @@ -82,18 +82,18 @@ script_08016184: WaitPlayerAction8 MessageFromTarget 0x2d06 script_0801618A: - _0807E878 + _0807E878 Jump script_08016146 .align 2, 0 SCRIPT_START script_08016190 - BeginBlock + BeginBlock Call sub_080787B4 - EndBlock + EndBlock script_0801619A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801619A - _0807E864 + _0807E864 GetInventoryValue 0x0024 MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 _0807E3E8 @@ -117,46 +117,46 @@ script_080161D8: MessageFromTarget 0x2d06 .endif script_080161E2: - _0807E878 + _0807E878 Jump script_0801619A .align 2, 0 SCRIPT_START script_080161E8 - BeginBlock + BeginBlock Call sub_0807F348 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_080161FE: Call sub_08068C28 script_08016204: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08016204 - _0807E864 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 Call sub_08068CA0 JumpIf script_0801633E Call sub_08068CFC JumpIfNot script_08016332 Call sub_08068DB8 - _0807EA94 + _0807EA94 Call sub_08068DD0 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08016346 StartPlayerScript script_0801635C WaitForSomething2 0x00000001 - _0807EB74 + _0807EB74 Call sub_08068C8C JumpIf script_08016262 Call sub_08068DE8 - _0807EA94 + _0807EA94 Wait 0x001e script_08016262: Call sub_08068E00 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0001 Call sub_0807F2D4 Call sub_08068E90 @@ -171,31 +171,31 @@ script_08016262: Call sub_08068BD0 Wait 0x001e Call sub_08068E18 - _0807EA94 + _0807EA94 Call sub_08068EB4 Call sub_0807DF50 - _0807E878 + _0807E878 script_080162CC: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08068EC4 JumpIf script_080162F6 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_080162E4 Jump script_080162CC script_080162E4: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08068E78 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080162CC script_080162F6: - EndBlock - _0807E888 + EndBlock + _0807E888 Call sub_0807F594 Call sub_0807DF28 - _0807E864 + _0807E864 StopBgm PlaySound SFX_TASK_COMPLETE Wait 0x003c @@ -203,21 +203,21 @@ script_080162F6: Call sub_08068F3C script_0801631C: Call sub_08068E30 - _0807EA94 + _0807EA94 Call sub_08068C6C - WaitPlayerAction8 - _0807EA94 + WaitPlayerAction8 + _0807EA94 Jump script_08016346 script_08016332: Call sub_08068E60 - _0807EA94 + _0807EA94 Jump script_08016346 script_0801633E: Call sub_08068E48 - _0807EA94 + _0807EA94 script_08016346: Call sub_0807DF50 - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_080161FE diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index cb512c2e..6f6aaa07 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08016384 - BeginBlock - EndBlock + BeginBlock + EndBlock Jump script_08016384 JumpIf script_08016384 JumpIfNot script_08016384 @@ -15,7 +15,7 @@ SCRIPT_START script_08016384 TestBit 0x00000001 CheckInventory1 0x0001 CheckInventory2 0x0001 - HasRoomItemForSale + HasRoomItemForSale CheckLocalFlag 0x0067 .ifdef JP CheckLocalFlagByOffset 0x0100, 0x0069 @@ -23,17 +23,21 @@ SCRIPT_START script_08016384 .ifdef EU CheckLocalFlagByOffset 0x0100, 0x0069 .else +.ifdef DEMO_JP + CheckLocalFlagByOffset 0x0100, 0x0069 @ TODO deduplicate +.else CheckLocalFlagByOffset 0x0100, 0x006b .endif .endif +.endif CheckGlobalFlag 0x0013 CheckRoomFlag 0x0000 CheckPlayerInRegion 0x0000, 0x0000, 0x0000 CheckPlayerInRegion2 0x0000 - CheckEntityInteractType - _0807E30C + CheckEntityInteractType + _0807E30C HasRupees 0x00c8 - _0807E3E8 + _0807E3E8 CheckKinstoneFused 0x0001 BuyItem 0x006c, 0x0000 _0807E48C 0x0020 @@ -41,8 +45,8 @@ SCRIPT_START script_08016384 _0807E4EC 0x00000000 _0807E514 0x00000000 CheckPlayerFlags 0x00000080 - _0807E564 - EntityHasHeight + _0807E564 + EntityHasHeight ComparePlayerAction 0x0001 ComparePlayerAnimationState 0x0004 _0807E5F8 0x00000001 @@ -57,9 +61,9 @@ SCRIPT_START script_08016384 Wait 0x001e WaitForSomething 0x00000001 WaitForSomething2 0x00000002 - WaitPlayerAction8 - WaitForPlayerAction0x17 - WaitFor_1 - WaitFor_2 + WaitPlayerAction8 + WaitForPlayerAction0x17 + WaitFor_1 + WaitFor_2 _0807E778 0x0004 SetFadeMask 0x0000ffff diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index f41cea24..a20d7522 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -1,31 +1,31 @@ SCRIPT_START script_08016482 - _0807E79C + _0807E79C Nop2 0x0080 - DoFade4 - DoFade5 - DoFade6 - DoFade7 + DoFade4 + DoFade5 + DoFade6 + DoFade7 _0807E800 0x00000000 _0807E80C 0x00000000 - _0807E858_0 - _0807E864 - _0807E878 - _0807E888 + _0807E858_0 + _0807E864 + _0807E878 + _0807E888 SetPlayerAction 0x00005408 StartPlayerScript script_08016384 _0807E8D4 0x03a0 - _0807E8E4_0 - _0807E8E4_1 - _0807E8E4_2 - _0807E8E4_3 + _0807E8E4_0 + _0807E8E4_1 + _0807E8E4_2 + _0807E8E4_3 _0807E908 0x0004 SetIntVariable 0x00000000 - _0807E924 + _0807E924 _0807E930 0x0000 - _0807E944 + _0807E944 _0807E974 0x0600 - _0807E9D4 - _0807E9DC + _0807E9D4 + _0807E9DC _0807E9E4 0x0000 _0807EA88 0x0001 _0807EA94 @@ -35,17 +35,17 @@ SCRIPT_START script_08016482 MessageFromTargetTable 0x0601, 0x0602, 0x0603 MessageNoOverlapVar _0807EB28 0x0602 - _0807EB38 + _0807EB38 _0807EB44 0x0000 _0807EB4C 0x0000, 0x0000 - _0807EB74 - _0807EB8C + _0807EB74 + _0807EB8C SetEntityDirection 0x0000 SetEntityDirectionWithAnimationState 0x0000 SetEntitySpeed 0x0100 SetEntity0x20 0x00018000 SetEntityPositionRelative 0x0000, 0x0000 - MoveEntityToPlayer + MoveEntityToPlayer Nop3 _0807EC1C 0x0010 _0807EC64 0x0020 @@ -55,8 +55,8 @@ SCRIPT_START script_08016482 _0807ED24 0x0000, 0x0000, 0x0000 _0807EDD4 0x0000, 0x0000 _0807EE04 0x0000, 0x0000 - _0807EE30 - _0807EEB4 + _0807EE30 + _0807EEB4 _0807EEF4 0xfff0, 0x0014 DoPostScriptAction 0x0000 DoPostScriptAction2 0x0001 @@ -72,8 +72,8 @@ SCRIPT_START script_08016482 GetInventoryValue 0x0001 _0807F078 0x0001, 0x0002 _0807F088 0x0001 - CameraTargetEntity - CameraTargetPlayer + CameraTargetEntity + CameraTargetPlayer _0807F0B4 0x0007 _0807F0C8 0x003c, 0x0003 SCRIPT_END diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc index c8af0ba1..288a6781 100644 --- a/data/scripts/script_080165A4.inc +++ b/data/scripts/script_080165A4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080165A4 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_080165B2: _0807E974 0x0601 Jump script_080165B2 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index a14d5af9..42d14295 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -7,38 +7,38 @@ SCRIPT_START script_080165D8 JumpAbsolute script_080165D8 .2byte 0x0000 SCRIPT_START script_080165F8 - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_080165FE: - _0807E30C + _0807E30C JumpIfNot script_080165FE MessageFromTarget 0x0601 Jump script_080165FE SCRIPT_START script_0801660C - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_08016612: _0807E944 _0807E864 MessageFromTarget 0x0602 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08016612 .2byte 0x0000 SCRIPT_START script_08016628 - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_0801662E: - _0807E944 - _0807E864 + _0807E944 + _0807E864 _0807EB28 0x0603 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0801662E .2byte 0x0000 SCRIPT_START script_08016644 @@ -121,7 +121,7 @@ script_08016700: _0807EB44 0x0004 Wait 0x003c Jump script_08016700 -SCRIPT_START script_08016798 +SCRIPT_START script_08016798 SetEntitySpeed 0x0100 script_0801679C: WaitForSomething 0x00000002 @@ -200,64 +200,64 @@ script_08016848: _0807EB44 0x0004 Jump script_08016848 SCRIPT_START script_080168E0 - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_080168E6: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Wait 0x000f - _0807E878 + _0807E878 Jump script_080168E6 SCRIPT_START script_080168F4 - BeginBlock + BeginBlock Call sub_08064EA4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801690A: - _0807E30C + _0807E30C JumpIfNot script_0801690A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08064F28 - _0807EA94 + _0807EA94 JumpIfNot script_08016926 _0807F034 0x003d - WaitPlayerAction8 + WaitPlayerAction8 script_08016926: - _0807E878 + _0807E878 SetGlobalFlag 0x005c Jump script_0801690A - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801693E: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Wait 0x0018 MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0801693E .2byte 0x0000 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 DoPostScriptAction 0x000a _0807E930 0x0000 - EndBlock + EndBlock script_0801696A: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Wait 0x0018 MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0801696A .2byte 0x0000 |