merge + fix

This commit is contained in:
theo3
2021-04-20 21:24:44 -07:00
parent 167fe388b6
commit c99408c849
282 changed files with 27480 additions and 19142 deletions
+9 -6
View File
@@ -16,6 +16,7 @@ script_08008B6E:
_0807E878
Jump script_08008B6E
.2byte 0x0000
SCRIPT_START script_08008B90
BeginBlock
_0807E9D4
_0807EB44 0x0004
@@ -32,6 +33,7 @@ script_08008BA2:
_0807E930 0x0008
_0807E878
Jump script_08008BA2
SCRIPT_START script_08008BC0
BeginBlock
_0807E9D4
_0807EB44 0x0004
@@ -59,7 +61,7 @@ script_08008BD2:
WaitForSomething 0x00000001
WaitForSomething 0x00000004
Wait 0x000f
SoundReq 0x0072
PlaySound SFX_SECRET
_0807E930 0x0004
Call sub_0807F2D4
TextboxNoOverlap 0x4913
@@ -74,13 +76,14 @@ script_08008C5C:
_0807EA94
_0807E878
Jump script_08008BD2
SCRIPT_START script_08008C64
BeginBlock
SetEntityPositionRelative 0x0068, 0x0018
DoPostScriptAction 0x000f
_0807EB44 0x0004
_0807E930 0x0004
SetEntitySpeed 0x0300
SoundReq 0x0121
PlaySound SFX_STAIRS
EndBlock
WaitForSomething 0x00000002
TextboxNoOverlap 0x490d
@@ -97,19 +100,19 @@ script_08008C5C:
Call sub_08064D10
Wait 0x000f
_0807EB44 0x0004
SoundReq 0x007f
PlaySound SFX_PLY_LIFT
Wait 0x000f
_0807EB44 0x0002
_0807EDD4 0x00ac, 0x0078
Wait 0x000f
_0807EB44 0x0004
SoundReq 0x007f
PlaySound SFX_PLY_LIFT
Wait 0x000f
_0807EB44 0x0002
_0807EDD4 0x00c0, 0x0078
Wait 0x000f
_0807EB44 0x0004
SoundReq 0x007f
PlaySound SFX_PLY_LIFT
Wait 0x000f
_0807EB44 0x0006
Wait 0x001e
@@ -122,7 +125,7 @@ script_08008C5C:
Call sub_08064D08
_0807EDD4 0x0068, 0x0018
Call sub_08064D10
SoundReq 0x0121
PlaySound SFX_STAIRS
_0807E5F8 0x00000001
DoPostScriptAction 0x0006
SCRIPT_END
+2
View File
@@ -15,6 +15,7 @@ script_08008DA0:
_0807E878
Jump script_08008DA0
.2byte 0x0000
SCRIPT_START script_08008DC0
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
@@ -33,6 +34,7 @@ script_08008DD8:
_0807EB44 0x0004
CallWithArg sub_0807F3D8, 0x00000000
Jump script_08008DD8
SCRIPT_START script_08008E08
BeginBlock
SetEntityPositionRelative 0x0088, 0x0078
EndBlock
+1 -1
View File
@@ -1,7 +1,7 @@
SCRIPT_START script_08008FC0
_0807F078 0x0001, 0x0001
CallWithArg sub_0807F918, 0x00000001
SoundReq 0x0109
PlaySound SFX_109
CallWithArg sub_0807F238, 0x0000045f
Call sub_0807F304
TextboxNoOverlapFollowPos 0x0501, 0x000e
+2 -2
View File
@@ -4,10 +4,10 @@ SCRIPT_START script_08008FFC
_0807E930 0x0000
EndBlock
WaitForSomething 0x00000010
SoundReq 0x011c
PlaySound SFX_11C
_0807E930 0x0001
Wait 0x0010
SoundReq 0x011c
PlaySound SFX_11C
_0807EB44 0x0004
_0807E930 0x0006
Wait 0x0010
+8 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_0800903C
DoPostScriptAction 0x0000
EndBlock
WaitForSomething2 0x00000004
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
_0807EB44 0x0002
_0807E5F8 0x00000008
@@ -16,6 +16,7 @@ SCRIPT_START script_0800903C
DoPostScriptAction 0x000a
Jump script_0800927E
.2byte 0x0000
SCRIPT_START script_08009080
BeginBlock
Call sub_0807F348
SetEntitySpeed 0x0100
@@ -82,6 +83,7 @@ script_0800917C:
Wait 0x000f
_0807E878
Jump script_0800917C
SCRIPT_START script_08009198
BeginBlock
Call sub_0807F348
_0807EB44 0x0006
@@ -135,6 +137,7 @@ script_0800917C:
DoPostScriptAction 0x000a
Jump script_080092B2
.2byte 0x0000
SCRIPT_START script_08009274
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
@@ -153,6 +156,7 @@ script_0800928A:
_0807E878
Jump script_0800928A
.2byte 0x0000
SCRIPT_START script_080092A8
BeginBlock
_0807EB44 0x0006
DoPostScriptAction 0x0000
@@ -170,6 +174,7 @@ script_080092BA:
Wait 0x000f
_0807E878
Jump script_080092BA
SCRIPT_START script_080092D4
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
@@ -178,6 +183,7 @@ script_080092BA:
EndBlock
Jump script_0800917C
.2byte 0x0000
SCRIPT_START script_080092F0
BeginBlock
DoPostScriptAction 0x000a
Call sub_08066E38
@@ -193,6 +199,7 @@ script_08009300:
_0807E878
Jump script_08009300
.2byte 0x0000
SCRIPT_START script_08009318
BeginBlock
EndBlock
SCRIPT_END
+1
View File
@@ -15,6 +15,7 @@ SCRIPT_START script_08009464
Wait 0x000a
Jump script_08009376
.2byte 0x0000
SCRIPT_START script_080094A4
BeginBlock
Call sub_0806D7C4
SetEntitySpeed 0x0080
+3
View File
@@ -18,6 +18,7 @@ script_08009512:
DoPostScriptAction 0x0000
Jump script_08009512
.2byte 0x0000
SCRIPT_START script_08009538
BeginBlock
Call sub_08067100
DoPostScriptAction 0x000a
@@ -37,6 +38,7 @@ script_0800954E:
DoPostScriptAction 0x0000
Jump script_0800954E
.2byte 0x0000
SCRIPT_START script_08009574
BeginBlock
Call sub_08067314
DoPostScriptAction 0x000a
@@ -60,6 +62,7 @@ script_08009592:
Call sub_080672B0
Jump script_08009592
.2byte 0x0000
SCRIPT_START script_080095CC
BeginBlock
Call sub_0806BE3C
DoPostScriptAction 0x000a
+7 -5
View File
@@ -7,7 +7,7 @@ SCRIPT_START script_080095F2
Call sub_0806BE84
_0807EA94
JumpIfNot script_08009622
SoundReq 0x0109
PlaySound SFX_109
_0807F088 0x003c
TextboxNoOverlapFollow 0x053c
WaitPlayerAction8
@@ -17,6 +17,7 @@ script_08009622:
_0807E878
DoPostScriptAction 0x0000
Jump script_080095DE
SCRIPT_START script_0800962C
BeginBlock
DoPostScriptAction 0x000b
DoPostScriptAction 0x0008
@@ -43,14 +44,15 @@ script_08009660:
Call sub_0806BEC8
_0807EA94
JumpIfNot script_0800968E
SoundReq 0x0111
SoundReq 0x0072
PlaySound SFX_111
PlaySound SFX_SECRET
_0807F078 0x003c, 0x0002
Call sub_0806BEFC
script_0800968E:
_0807E878
DoPostScriptAction 0x0000
Jump script_08009660
SCRIPT_START script_08009698
BeginBlock
DoPostScriptAction 0x0007
Jump script_080096FC
@@ -65,11 +67,11 @@ script_080096AC:
Call sub_0807DF28
StartPlayerScript script_08009704
WaitForSomething2 0x00000001
SoundReq 0x0111
PlaySound SFX_111
DoPostScriptAction 0x0008
LoadRoomEntityList gUnk_080D9048
Wait 0x000f
SoundReq 0x0111
PlaySound SFX_111
DoPostScriptAction 0x0007
script_080096EC:
CheckGlobalFlag 0x0020
+2 -1
View File
@@ -17,10 +17,11 @@ script_0800975A:
_0807E878
Jump script_0800975A
.2byte 0x0000
SCRIPT_START script_08009778
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
SoundReq 0x01f3
PlaySound SFX_1F3
Call sub_0807F40C
_0807E8E4_1
Wait 0x000a
+2 -2
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_080097F0
Call sub_0807F348
EndBlock
WaitForSomething2 0x00000002
SoundReq 0x0123
PlaySound SFX_123
Call sub_0807F1A0
script_08009816:
EndBlock
@@ -16,6 +16,6 @@ script_08009816:
EndBlock
_0807E5F8 0x00000004
Call sub_0807FBD4
SoundReq 0x01f3
PlaySound SFX_1F3
DoPostScriptAction 0x0006
SCRIPT_END
+2 -2
View File
@@ -8,9 +8,9 @@ SCRIPT_START script_08009838
WaitForSomething2 0x00000008
Call sub_0809E0A0
Call sub_0809E0D4
SoundReq 0x01f3
PlaySound SFX_1F3
Call sub_0807FBD4
SoundReq 0x01f3
PlaySound SFX_1F3
_0807E5F8 0x00000010
DoPostScriptAction 0x0006
SCRIPT_END
+3 -3
View File
@@ -1,7 +1,7 @@
SCRIPT_START script_0800987C
SoundReq 0x007a
PlaySound SFX_PLY_VO6
_0807EB44 0x0004
SoundReq 0x0086
PlaySound SFX_86
Call sub_0807F36C
SetEntitySpeed 0x0400
_0807ECF4 0x0004
@@ -9,7 +9,7 @@ SCRIPT_START script_0800987C
Wait 0x001e
_0807E5F8 0x00000040
WaitForSomething2 0x00000020
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EB44 0x0004
Call sub_0807F210
_0807EF3C 0x0200, 0x0020
+2 -1
View File
@@ -6,11 +6,12 @@ script_08009A38:
Call sub_08066258
Wait 0x005a
Jump script_08009A38
SCRIPT_START script_08009A50
SetEntityPositionRelative 0x0240, 0x0178
CameraTargetEntity
SetEntitySpeed 0x0080
Wait 0x0078
SoundReq2 0x0036
PlayBgm BGM_MINISH_CAP
_0807E778 0x0002
DoFade4
WaitFor_2
+2 -2
View File
@@ -2,10 +2,10 @@ SCRIPT_START script_08009AF8
BeginBlock
EndBlock
WaitForSomething2 0x00000010
SoundReq 0x00f0
PlaySound SFX_F0
DoPostScriptAction 0x0008
Wait 0x001e
SoundReq 0x00f1
PlaySound SFX_F1
DoPostScriptAction 0x0007
Wait 0x005a
_0807E778 0x0004
+1 -1
View File
@@ -12,7 +12,7 @@ SCRIPT_START script_08009CFC
DoPostScriptAction 0x0000
_0807E8E4_0
Wait 0x000f
SoundReq 0x0094
PlaySound SFX_VO_ZELDA1
DoPostScriptAction 0x0000
Wait 0x001e
_0807E5F8 0x00000008
+1
View File
@@ -15,6 +15,7 @@ script_08009DD2:
_0807E908 0x0003
_0807E930 0x000c
Jump script_08009DD2
SCRIPT_START script_08009DEC
BeginBlock
EndBlock
script_08009DF0:
+1 -1
View File
@@ -47,7 +47,7 @@ script_08009F86:
Jump script_08009F86
script_08009FB6:
Wait 0x0008
SoundReq 0x0103
PlaySound SFX_103
CallWithArg sub_0806030C, 0x00000063
Wait 0x0008
_0807E878
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_0800A0B4
Call sub_0807DF28
EndBlock
Wait 0x0078
SoundReq2 0x0018
PlayBgm BGM_ELEMENT_THEME
Call sub_080A0464
script_0800A0D2:
_0807EE30
+2 -2
View File
@@ -6,14 +6,14 @@ script_0800A0FE:
BeginBlock
_0807E864
Call sub_0807DF28
SoundReq0x80100000
StopBgm
Call sub_0807FBFC
SetEntityPositionRelative 0x00b0, 0x0058
Call sub_0807F844
_0807E8E4_3
CallWithArg sub_0807F75C, 0x00d00060
CallWithArg sub_08094AE8, script_0800A160
SoundReq 0x00f7
PlaySound SFX_APPARATE
_0807E778 0x0002
DoFade6
EndBlock
+2 -2
View File
@@ -8,9 +8,9 @@ SCRIPT_START script_0800A160
CallWithArg sub_0807F98C, 0xff800000
CallWithArg sub_080960C4, script_0800A1B4
EndBlock
SoundReq 0x0142
PlaySound SFX_SPARKLES
_0807EF3C 0xff80, 0x0000
SoundReq 0x0143
PlaySound SFX_143
_0807E930 0x0004
_0807E5F8 0x00000002
Wait 0x003c
+3 -3
View File
@@ -47,7 +47,7 @@ SCRIPT_START script_0800A1D8
WaitForSomething2 0x000000c0
TextboxNoOverlapFollowPos 0x165c, 0x000e
_0807EA94
SoundReq0x80100000
StopBgm
TextboxNoOverlapFollowPos 0x165d, 0x000e
_0807EA94
_0807E5F8 0x00000006
@@ -56,8 +56,8 @@ SCRIPT_START script_0800A1D8
WaitForSomething2 0x00000080
_0807E5F8 0x00000008
WaitForSomething2 0x00000100
SoundReq2 0x0008
SoundReq 0x00f7
PlayBgm BGM_INTRO_CUTSCENE
PlaySound SFX_APPARATE
CallWithArg sub_0806DA1C, 0x00000007
DoPostScriptAction 0x0006
SCRIPT_END
+1
View File
@@ -11,6 +11,7 @@ SCRIPT_START script_0800A310
_0807E5F8 0x00000001
Call sub_080791BC
.2byte 0x0000
SCRIPT_START script_0800A340
BeginBlock
DoPostScriptAction 0x0008
SetEntitySpeed 0x0080
+8 -8
View File
@@ -27,32 +27,32 @@ SCRIPT_START script_0800A3D8
WaitForSomething2 0x00000004
_0807EB44 0x0004
DoPostScriptAction 0x0000
SoundReq 0x0142
PlaySound SFX_SPARKLES
CallWithArg sub_080960C4, script_0800A638
_0807E5F8 0x00000080
WaitForSomething2 0x00000004
SoundReq 0x0143
PlaySound SFX_143
_0807E5F8 0x00001000
_0807E5F8 0x00000080
WaitForSomething2 0x00000004
Call sub_08066E68
_0807E5F8 0x00000080
WaitForSomething2 0x00000004
SoundReq 0x0142
PlaySound SFX_SPARKLES
CallWithArg sub_080960C4, script_0800A680
Wait 0x0078
SoundReq 0x0153
PlaySound SFX_153
CallWithArg sub_0807FADC, 0x00000003
Wait 0x000f
SoundReq 0x0153
PlaySound SFX_153
CallWithArg sub_0807FADC, 0x00000003
Wait 0x000f
SoundReq 0x0153
PlaySound SFX_153
CallWithArg sub_0807FADC, 0x00000003
Wait 0x003c
SoundReq 0x0153
PlaySound SFX_153
CallWithArg sub_0807FADC, 0x00000001
SoundReq 0x0143
PlaySound SFX_143
_0807E5F8 0x00000080
WaitForSomething2 0x00000004
DoPostScriptAction 0x0006
+3 -3
View File
@@ -7,7 +7,7 @@ SCRIPT_START script_0800A500
Call sub_0807F348
EndBlock
WaitForSomething2 0x00000008
SoundReq 0x0142
PlaySound SFX_SPARKLES
_0807E610 0x00000800
CallWithArg sub_080960C4, script_0800A65C
_0807E930 0x0002
@@ -19,12 +19,12 @@ SCRIPT_START script_0800A500
Call sub_08094B3C
_0807E930 0x0004
_0807E5F8 0x00000800
SoundReq 0x0143
PlaySound SFX_143
_0807E5F8 0x00000100
WaitForSomething2 0x00000008
DoPostScriptAction 0x0008
Call sub_080961B0
SoundReq 0x00fa
PlaySound SFX_FA
Wait 0x003c
_0807E5F8 0x00000100
SCRIPT_END
+2 -2
View File
@@ -12,14 +12,14 @@ SCRIPT_START script_0800A590
WaitForSomething2 0x00000010
CallWithArg sub_0807F6E8, 0x00000008
DoPostScriptAction 0x0007
SoundReq 0x0142
PlaySound SFX_SPARKLES
_0807E610 0x00000800
CallWithArg sub_080960C4, script_0800A65C
Wait 0x003c
_0807EDD4 0x0088, 0x0068
Wait 0x0078
_0807E5F8 0x00000800
SoundReq 0x0143
PlaySound SFX_143
_0807EF3C 0x0000, 0x0020
_0807E930 0x001f
_0807E5F8 0x00000200
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_0800A6A4
Call sub_0807F844
EndBlock
Wait 0x003c
SoundReq 0x00f6
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x00000008
DoPostScriptAction 0x0006
SCRIPT_END
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_0800A6D4
Call sub_0807DF28
SetEntityPositionRelative 0x0088, 0x0070
Call sub_0807F844
SoundReq 0x00f7
PlaySound SFX_APPARATE
EndBlock
Wait 0x003c
CallWithArg sub_0806DA1C, 0x00000009
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_0800A704
Call sub_0807F844
EndBlock
Wait 0x003c
SoundReq 0x00f6
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x0000000a
DoPostScriptAction 0x0006
SCRIPT_END
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_0800A734
Call sub_0807DF28
SetEntityPositionRelative 0x00d8, 0x01c8
Call sub_0807F844
SoundReq 0x00f7
PlaySound SFX_APPARATE
EndBlock
Wait 0x003c
CallWithArg sub_0806DA1C, 0x0000000b
+2 -2
View File
@@ -6,12 +6,12 @@ SCRIPT_START script_0800A764
Call sub_0807F844
EndBlock
Wait 0x003c
SoundReq 0x00f6
PlaySound SFX_EVAPORATE
_0807E778 0x0004
DoFade7
WaitFor_2
_0807E5F8 0x00000001
SoundReq 0x00f7
PlaySound SFX_APPARATE
_0807E778 0x0002
DoFade6
WaitFor_2
+5
View File
@@ -15,6 +15,7 @@ script_0800A80C:
_0807E930 0x0003
Wait 0x001e
Jump script_0800A80C
SCRIPT_START script_0800A820
BeginBlock
DoPostScriptAction 0x0007
_0807EB44 0x0004
@@ -31,6 +32,7 @@ script_0800A848:
_0807E930 0x0003
Wait 0x0014
Jump script_0800A848
SCRIPT_START script_0800A85C
BeginBlock
DoPostScriptAction 0x0007
_0807EB44 0x0004
@@ -47,6 +49,7 @@ script_0800A884:
_0807E930 0x0003
Wait 0x000a
Jump script_0800A884
SCRIPT_START script_0800A898
BeginBlock
DoPostScriptAction 0x0007
_0807EB44 0x0004
@@ -63,6 +66,7 @@ script_0800A8C0:
_0807EB44 0x0006
Wait 0x0019
Jump script_0800A8C0
SCRIPT_START script_0800A8D4
BeginBlock
DoPostScriptAction 0x0007
_0807EB44 0x0004
@@ -79,6 +83,7 @@ script_0800A8FC:
_0807EB44 0x0006
Wait 0x000f
Jump script_0800A8FC
SCRIPT_START script_0800A910
BeginBlock
_0807E864
Call sub_0807DF28
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_0800AAD8
Call sub_0807F844
EndBlock
Wait 0x003c
SoundReq 0x00f6
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x0000000f
DoPostScriptAction 0x0006
SCRIPT_END
+1 -1
View File
@@ -7,7 +7,7 @@ SCRIPT_START script_0800AB08
_0807E8E4_3
CallWithArg sub_0807F6E8, 0x00000008
CallWithArg sub_0807F75C, 0x00a80088
SoundReq 0x00f7
PlaySound SFX_APPARATE
EndBlock
Wait 0x0078
_0807F0B4 0x0001
+1 -1
View File
@@ -2,7 +2,7 @@ SCRIPT_START script_0800ACE0
BeginBlock
Call sub_08094BE0
CallWithArg sub_0807F238, 0x0000045b
SoundReq 0x0109
PlaySound SFX_109
EndBlock
Call sub_0807F304
Wait 0x005a
+2 -1
View File
@@ -7,6 +7,7 @@ SCRIPT_START script_0800AD54
DoPostScriptAction 0x0000
_0807E5F8 0x00000001
Call sub_080791BC
SCRIPT_START script_0800AD74
BeginBlock
SetEntitySpeed 0x0080
DoPostScriptAction 0x0007
@@ -45,7 +46,7 @@ SCRIPT_START script_0800AD54
Call sub_0807F2D4
Wait 0x001e
_0807E5F8 0x00000020
SoundReq0x80100000
StopBgm
Call CreateDust
Call sub_0806305C
Call sub_080630A4
+2 -2
View File
@@ -3,10 +3,10 @@ SCRIPT_START script_0800AF18
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
CallWithArg sub_0807F994, 0x0000fff8
SoundReq 0x0142
PlaySound SFX_SPARKLES
EndBlock
WaitForSomething 0x00000020
SoundReq 0x0143
PlaySound SFX_143
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
+2 -1
View File
@@ -36,6 +36,7 @@ script_0800B160:
Call sub_0806BCB8
CallWithArg sub_0806BC94, 0x00000000
Jump script_0800B0E8
SCRIPT_START script_0800B17C
BeginBlock
Call sub_0807DF28
SetLocalFlag 0x0039
@@ -48,7 +49,7 @@ script_0800B160:
WaitForSomething2 0x00000001
SetRoomFlag 0x0000
Wait 0x0010
SoundReq2 0x002d
PlayBgm BGM_FIGHT_THEME
_0807EB28 0x2701
_0807E878
Call sub_0807DF50
+2
View File
@@ -15,6 +15,7 @@ script_0800B268:
_0807E878
Jump script_0800B268
.2byte 0x0000
SCRIPT_START script_0800B284
BeginBlock
CheckKinstoneFused 0x0007
JumpIf script_0800B302
@@ -31,6 +32,7 @@ script_0800B298:
_0807E878
Jump script_0800B298
.2byte 0x0000
SCRIPT_START script_0800B2B4
BeginBlock
CheckKinstoneFused 0x0008
JumpIf script_0800B302
+2 -2
View File
@@ -22,7 +22,7 @@ script_0800B348:
script_0800B350:
EndBlock
WaitForSomething2 0x00000002
SoundReq 0x00fd
PlaySound SFX_ITEM_BOMB_EXPLODE
Call sub_080676D8
Call sub_0806757C
Call sub_080675D4
@@ -37,7 +37,7 @@ script_0800B350:
JumpIfNot script_0800B350
EndBlock
SetLocalFlag 0x001d
SoundReq 0x0072
PlaySound SFX_SECRET
script_0800B39C:
DoPostScriptAction 0x0006
SCRIPT_END
+1 -1
View File
@@ -15,7 +15,7 @@ SCRIPT_START script_0800B41C
WaitForSomething2 0x00000004
_0807EB74
Wait 0x003c
SoundReq 0x00cd
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0037
WaitPlayerAction8
_0807EB8C
+4 -4
View File
@@ -6,16 +6,16 @@ SCRIPT_START script_0800B574
EndBlock
WaitForSomething2 0x00000010
DoPostScriptAction 0x0008
SoundReq 0x0111
PlaySound SFX_111
WaitForSomething2 0x00000010
DoPostScriptAction 0x0007
SoundReq 0x0111
PlaySound SFX_111
WaitForSomething2 0x00000010
DoPostScriptAction 0x0008
SoundReq 0x0111
PlaySound SFX_111
WaitForSomething2 0x00000010
DoPostScriptAction 0x0007
SoundReq 0x0111
PlaySound SFX_111
script_0800B5BC:
Call sub_0808692C
SCRIPT_END
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_0800B5C4
_0807EB44 0x0004
EndBlock
Wait 0x001e
SoundReq 0x00d1
PlaySound SFX_VO_DOG
_0807EDD4 0x008a, 0x005a
Wait 0x000a
Call sub_08069EE8
+1
View File
@@ -14,6 +14,7 @@ script_0800B5FA:
_0807E878
_0807EB44 0x0004
Jump script_0800B5FA
SCRIPT_START script_0800B614
BeginBlock
EndBlock
script_0800B618:
+1
View File
@@ -25,6 +25,7 @@ script_0800B6D4:
_0807F034 0x0064
Jump script_0800B698
.2byte 0x0000
SCRIPT_START script_0800B730
BeginBlock
EndBlock
script_0800B734:
+4
View File
@@ -49,6 +49,7 @@ script_0800B89E:
Wait 0x000f
_0807E878
Jump script_0800B89E
SCRIPT_START script_0800B8B8
BeginBlock
_0807E9D4
_0807EB44 0x0004
@@ -61,6 +62,7 @@ script_0800B8D4:
Call sub_080646A4
Jump script_0800B8D4
.2byte 0x0000
SCRIPT_START script_0800B8E4
BeginBlock
Call sub_08061E70
DoPostScriptAction 0x000a
@@ -78,6 +80,7 @@ script_0800B8FC:
_0807E878
Jump script_0800B8FC
.2byte 0x0000
SCRIPT_START script_0800B91C
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
@@ -104,6 +107,7 @@ script_0800B94E:
_0807EA94
_0807E878
Jump script_0800B94E
SCRIPT_START script_0800B964
BeginBlock
DoPostScriptAction 0x000b
DoPostScriptAction 0x0008
+4 -2
View File
@@ -39,6 +39,7 @@ script_0800BA24:
Call sub_0807DF50
_0807E878
Jump script_0800B9CA
SCRIPT_START script_0800BA3C
BeginBlock
Call sub_0807F934
EndBlock
@@ -51,13 +52,14 @@ script_0800BA46:
_0807EA94
_0807E3E8
JumpIfNot script_0800BA6C
SoundReq0x80100000
StopBgm
Call sub_0806E964
SoundReq2 0xffff
PlayBGM
script_0800BA6C:
Call sub_0807DF50
_0807E878
Jump script_0800BA46
SCRIPT_START script_0800BA78
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
+1 -1
View File
@@ -30,7 +30,7 @@ script_0800BC62:
Call sub_0807F158
CallWithArg sub_0807F4F8, 0x0000035c
Wait 0x001e
SoundReq 0x0188
PlaySound SFX_STAIRS_DESCEND
DoPostScriptAction 0x0008
Wait 0x0078
Call sub_08054968
+1
View File
@@ -15,6 +15,7 @@ SCRIPT_START script_0800BE1C
Wait 0x003c
Jump script_0800BE88
.2byte 0x0000
SCRIPT_START script_0800BE54
BeginBlock
_0807EB44 0x0004
_0807E930 0x0008
+1
View File
@@ -15,6 +15,7 @@ SCRIPT_START script_0800BF38
Wait 0x003c
Jump script_0800BFA4
.2byte 0x0000
SCRIPT_START script_0800BF70
BeginBlock
_0807EB44 0x0004
_0807E930 0x0008
+1
View File
@@ -15,6 +15,7 @@ SCRIPT_START script_0800C0B0
Wait 0x003c
Jump script_0800C11C
.2byte 0x0000
SCRIPT_START script_0800C0E8
BeginBlock
_0807EB44 0x0004
_0807E930 0x0008
+1
View File
@@ -15,6 +15,7 @@ SCRIPT_START script_0800C1D8
Wait 0x003c
Jump script_0800C244
.2byte 0x0000
SCRIPT_START script_0800C210
BeginBlock
_0807EB44 0x0004
_0807E930 0x0008
+1 -1
View File
@@ -10,5 +10,5 @@ SCRIPT_START script_0800C3CC
CallWithArg sub_0807F4F8, 0x00000068
Call sub_0806D67C
_0807F0C8 0x001e, 0x0000
SoundReq 0x010b
PlaySound SFX_10B
SCRIPT_END
+1 -1
View File
@@ -10,7 +10,7 @@ SCRIPT_START script_0800C410
CallWithArg sub_0807F4F8, 0x00000068
Call sub_0806D67C
_0807F0C8 0x001e, 0x0000
SoundReq 0x010b
PlaySound SFX_10B
_0807E5F8 0x00000001
SCRIPT_END
.2byte 0x0000
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_0800C45C
EndBlock
Wait 0x000a
DoPostScriptAction 0x0007
SoundReq 0x0136
PlaySound SFX_136
script_0800C47A:
_0807EE30
JumpIfNot script_0800C47A
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_0800C494
EndBlock
Wait 0x000a
DoPostScriptAction 0x0007
SoundReq 0x0136
PlaySound SFX_136
_0807EEF4 0x0000, 0xff90
Wait 0x001e
_0807EEF4 0x0000, 0xffb0
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_0800C4D0
EndBlock
Wait 0x000a
DoPostScriptAction 0x0007
SoundReq 0x0136
PlaySound SFX_136
_0807EEF4 0x00c0, 0x0000
Wait 0x001e
_0807EEF4 0x0070, 0x0000
+1 -1
View File
@@ -7,7 +7,7 @@ SCRIPT_START script_0800C50C
WaitForSomething2 0x00000001
Wait 0x000a
DoPostScriptAction 0x0007
SoundReq 0x0136
PlaySound SFX_136
_0807EEF4 0x0000, 0x0060
Wait 0x003c
_0807EEF4 0x0000, 0x0060
+4 -2
View File
@@ -82,6 +82,7 @@ script_0800C61E:
Wait 0x000f
_0807E878
Jump script_0800C60A
SCRIPT_START script_0800C634
BeginBlock
DoPostScriptAction 0x000a
SetEntitySpeed 0x0080
@@ -142,7 +143,7 @@ script_0800C6DC:
_0807EC94 0x0020
_0807EB44 0x0004
Wait 0x000f
SoundReq 0x0072
PlaySound SFX_SECRET
SetLocalFlag 0x0082
script_0800C712:
DoPostScriptAction 0x0002
@@ -173,6 +174,7 @@ script_0800C756:
Call sub_0807DF50
_0807E878
Jump script_0800C652
SCRIPT_START script_0800C774
BeginBlock
DoPostScriptAction 0x000a
_0807EB44 0x0004
@@ -235,7 +237,7 @@ script_0800C824:
Wait 0x000f
SetLocalFlag 0x0083
Wait 0x003c
SoundReq 0x0072
PlaySound SFX_SECRET
Wait 0x003c
_0807EB74
_0807EB8C
+2 -2
View File
@@ -13,9 +13,9 @@ SCRIPT_START script_0800CABC
DoPostScriptAction 0x0000
_0807E5F8 0x00000400
WaitForSomething2 0x00000200
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
_0807E5F8 0x00000400
WaitForSomething2 0x00000200
+2 -2
View File
@@ -19,9 +19,9 @@ SCRIPT_START script_0800CBD4
DoPostScriptAction 0x0000
_0807E5F8 0x00004000
WaitForSomething2 0x00002000
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
_0807E5F8 0x00004000
WaitForSomething2 0x00002000
+2 -2
View File
@@ -19,9 +19,9 @@ SCRIPT_START script_0800CC6C
DoPostScriptAction 0x0000
_0807E5F8 0x00010000
WaitForSomething2 0x00008000
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
_0807E5F8 0x00010000
WaitForSomething2 0x00008000
+9 -6
View File
@@ -41,7 +41,7 @@ script_0800CDEC:
_0807EA94
_0807E3E8
JumpIfNot script_0800CF40
SoundReq 0x00cd
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0023
WaitPlayerAction8
Jump script_0800CE32
@@ -52,7 +52,7 @@ script_0800CE14:
_0807EA94
_0807E3E8
JumpIfNot script_0800CF40
SoundReq 0x00cd
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0022
WaitPlayerAction8
script_0800CE32:
@@ -81,7 +81,7 @@ script_0800CE6E:
_0807EA94
_0807E3E8
JumpIfNot script_0800CF40
SoundReq 0x00cd
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0027
WaitPlayerAction8
_0807EB8C
@@ -109,7 +109,7 @@ script_0800CECE:
_0807EA94
_0807E3E8
JumpIfNot script_0800CF40
SoundReq 0x00cd
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0024
WaitPlayerAction8
_0807EB8C
@@ -145,6 +145,7 @@ script_0800CF40:
_0807E878
Jump script_0800CD92
.2byte 0x0000
SCRIPT_START script_0800CF50
BeginBlock
Call sub_08068104
DoPostScriptAction 0x000a
@@ -164,6 +165,7 @@ script_0800CF72:
Wait 0x000f
_0807E878
Jump script_0800CF5E
SCRIPT_START script_0800CF88
BeginBlock
Call sub_08068104
DoPostScriptAction 0x000a
@@ -176,6 +178,7 @@ script_0800CF96:
Wait 0x000f
_0807E878
Jump script_0800CF96
SCRIPT_START script_0800CFAC
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
@@ -257,12 +260,12 @@ script_0800D0A8:
_0807EB44 0x0002
SetIntVariable 0x00000000
Call sub_0806C028
SoundReq 0x00cd
PlaySound SFX_TASK_COMPLETE
Call sub_08068964
script_0800D108:
ComparePlayerAction 0x0008
JumpIf script_0800D108
SoundReq 0x00f8
PlaySound SFX_F8
_0807E5F8 0x00000010
SetLocalFlag 0x007e
TextboxNoOverlapFollowPos 0x123e, 0x0002
+1 -1
View File
@@ -1,7 +1,7 @@
SCRIPT_START script_0800D1E0
_0807F078 0x0002, 0x0001
CallWithArg sub_0807F918, 0x00000002
SoundReq 0x0109
PlaySound SFX_109
CallWithArg sub_0807F238, 0x000001e2
Call sub_0807F304
TextboxNoOverlap 0x0502
+3 -1
View File
@@ -44,6 +44,7 @@ script_0800D2EE:
Wait 0x000f
_0807E878
Jump script_0800D2EE
SCRIPT_START script_0800D308
BeginBlock
Call sub_08068884
DoPostScriptAction 0x000a
@@ -66,6 +67,7 @@ script_0800D31E:
Wait 0x000f
_0807E878
Jump script_0800D31E
SCRIPT_START script_0800D350
BeginBlock
Call sub_08068104
DoPostScriptAction 0x000a
@@ -101,7 +103,7 @@ script_0800D3B2:
_0807E930 0x0003
SetIntVariable 0x00000004
Call sub_080681D8
SoundReq 0x00cd
PlaySound SFX_TASK_COMPLETE
Wait 0x001e
DoPostScriptAction 0x000a
SetLocalFlag 0x007f
+2
View File
@@ -95,6 +95,7 @@ script_0800D584:
Wait 0x000f
_0807E878
Jump script_0800D4E4
SCRIPT_START script_0800D59C
BeginBlock
DoPostScriptAction 0x000a
Call sub_08062A48
@@ -125,6 +126,7 @@ script_0800D5F2:
JumpIfNot script_0800D5F2
Jump script_0800D5AC
.2byte 0x0000
SCRIPT_START script_0800D60C
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x000b
+5 -4
View File
@@ -9,20 +9,21 @@ SCRIPT_START script_0800D76C
WaitForSomething2 0x00000008
DoPostScriptAction 0x0004
Wait 0x003c
SoundReq 0x0123
PlaySound SFX_123
CallWithArg sub_0807F464, 0x000001e0
_0807EDD4 0x01e0, 0x01d8
_0807EB44 0x0002
DoPostScriptAction 0x0000
_0807E5F8 0x00000010
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
SoundReq 0x007c
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
_0807EB44 0x0002
DoPostScriptAction 0x0001
WaitForSomething2 0x00000008
Jump script_0800D80C
SCRIPT_START script_0800D7DC
BeginBlock
Call sub_0807F360
DoPostScriptAction 0x000b
@@ -39,7 +40,7 @@ script_0800D80C:
DoPostScriptAction 0x000e
Call sub_0806CA5C
SetEntity0x20 0x00040000
SoundReq 0x00f5
PlaySound SFX_F5
script_0800D82A:
CallWithArg sub_0807F8D0, 0xffffe000
Call sub_0807F8BC
+2 -1
View File
@@ -31,6 +31,7 @@ script_0800D8D6:
_0807E878
Jump script_0800D88E
.2byte 0x0000
SCRIPT_START script_0800D8E4
BeginBlock
DoPostScriptAction 0x0008
CheckInventory1 0x0017
@@ -44,7 +45,7 @@ script_0800D8F4:
WaitPlayerAction8
_0807EB28 0x1325
_0807EA94
SoundReq 0x0113
PlaySound SFX_113
SetIntVariable 0x00000000
Call sub_0806DA1C
_0807E878
+2 -2
View File
@@ -15,7 +15,7 @@ script_0800D962:
_0807EB44 0x0004
DoPostScriptAction 0x0000
DoPostScriptAction 0x0007
SoundReq 0x01ce
PlaySound SFX_ELEMENT_FLOAT
SetEntity0x20 0xffff8000
TextboxNoOverlap 0x1701
_0807EA94
@@ -32,7 +32,7 @@ script_0800D962:
_0807EA94
Wait 0x003c
SetLocalFlag 0x0032
SoundReq 0x0113
PlaySound SFX_113
SetIntVariable 0x00000001
Call sub_0806DA1C
Call sub_0807DF50
+1 -1
View File
@@ -40,7 +40,7 @@ script_0800DBCA:
_0807EA94
Call sub_0807F3F8
_0807E5F8 0x00000001
SoundReq0x80100000
StopBgm
Call sub_08094F98
CallWithArg sub_0805DDEC, 0x00000001
_0807F0C8 0xffff, 0x0000
+1 -1
View File
@@ -1,6 +1,6 @@
SCRIPT_START script_0800DC4C
Wait 0x003c
SoundReq2 0x0031
PlayBgm BGM_CASTLE_COLLAPSE
StartPlayerScript script_0800DE50
WaitForSomething2 0x00000006
_0807EB28 0x1646
+4 -4
View File
@@ -14,14 +14,14 @@ script_0800DCD0:
DoPostScriptAction 0x0010
SetEntityPositionRelative 0x0078, 0x0068
WaitForSomething2 0x00000001
SoundReq0x80100000
StopBgm
Call sub_08066E50
SoundReq 0x01c9
PlaySound SFX_1C9
Call sub_0807F2D4
SoundReq 0x01ca
PlaySound SFX_1CA
Wait 0x003c
DoPostScriptAction 0x0004
SoundReq2 0x000b
PlayBgm BGM_SAVING_ZELDA
Wait 0x0078
_0807EB44 0x0002
DoPostScriptAction 0x0000
+3 -3
View File
@@ -7,7 +7,7 @@ SCRIPT_START script_0800DF24
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
SoundReq0x80100000
StopBgm
_0807E8E4_2
Wait 0x005a
Call sub_0807F3F8
@@ -21,9 +21,9 @@ SCRIPT_START script_0800DF24
DoPostScriptAction 0x0007
TextboxNoOverlapFollowPos 0x162f, 0x0002
_0807EA94
SoundReq2 0x002f
PlayBgm BGM_VAATI_REBORN
DoPostScriptAction 0x0019
SoundReq 0x0198
PlaySound SFX_198
Call sub_0807F2D4
SetRoomFlag 0x0000
DoPostScriptAction 0x0008
+2 -2
View File
@@ -3,10 +3,10 @@ SCRIPT_START script_0800DFB4
script_0800DFB6:
CheckRoomFlag 0x0001
JumpIfNot script_0800DFB6
SoundReq0x80100000
StopBgm
_0807E864
Call sub_0807DF28
SoundReq 0x00f6
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x00000004
Call sub_0807DF50
_0807E878
+3 -3
View File
@@ -3,14 +3,14 @@ SCRIPT_START script_0800DFE4
Call sub_0807DF28
_0807E864
EndBlock
SoundReq0x80100000
StopBgm
TextboxNoOverlapFollowPos 0x1632, 0x0002
_0807EA94
SetRoomFlag 0x0003
script_0800DFFE:
CheckRoomFlag 0x0000
JumpIfNot script_0800DFFE
SoundReq2 0x0030
PlayBgm BGM_VAATI_TRANSFIGURED
Call sub_0807DF50
_0807E878
script_0800E012:
@@ -22,7 +22,7 @@ script_0800E012:
TextboxNoOverlapFollowPos 0x1639, 0x000c
_0807EA94
Wait 0x0096
SoundReq 0x00f6
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x00000005
Call sub_0807DF50
_0807E878
+2 -2
View File
@@ -3,8 +3,8 @@ SCRIPT_START script_0800E050
Call sub_0807DF28
_0807E864
EndBlock
SoundReq0x80100000
SoundReq0x80100000
StopBgm
StopBgm
Wait 0x0078
_0807EB28 0x1638
_0807EA94
+20 -13
View File
@@ -13,13 +13,13 @@ script_0800E0DE:
_0807E864
Wait 0x001e
DoPostScriptAction 0x0010
SoundReq 0x01c9
PlaySound SFX_1C9
_0807E930 0x0009
Wait 0x003c
SoundReq 0x01ca
PlaySound SFX_1CA
DoPostScriptAction 0x0010
Wait 0x001e
SoundReq 0x0072
PlaySound SFX_SECRET
Wait 0x0078
DoPostScriptAction 0x0004
Wait 0x001e
@@ -45,6 +45,7 @@ script_0800E138:
_0807E878
Jump script_0800E138
.2byte 0x0000
SCRIPT_START script_0800E154
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x000a
@@ -59,13 +60,13 @@ script_0800E176:
_0807E864
Wait 0x001e
DoPostScriptAction 0x0010
SoundReq 0x01c9
PlaySound SFX_1C9
_0807E930 0x0015
Wait 0x003c
SoundReq 0x01ca
PlaySound SFX_1CA
DoPostScriptAction 0x0010
Wait 0x001e
SoundReq 0x0072
PlaySound SFX_SECRET
Wait 0x0078
DoPostScriptAction 0x0004
Wait 0x001e
@@ -92,6 +93,7 @@ script_0800E1E0:
_0807EA94
_0807E878
Jump script_0800E1E0
SCRIPT_START script_0800E200
BeginBlock
SetEntitySpeed 0x0100
_0807EB44 0x0004
@@ -116,13 +118,13 @@ script_0800E24A:
_0807E864
Wait 0x001e
DoPostScriptAction 0x0010
SoundReq 0x01c9
PlaySound SFX_1C9
_0807E930 0x0015
Wait 0x003c
SoundReq 0x01ca
PlaySound SFX_1CA
DoPostScriptAction 0x0010
Wait 0x001e
SoundReq 0x0072
PlaySound SFX_SECRET
Wait 0x0078
DoPostScriptAction 0x0004
Wait 0x001e
@@ -181,6 +183,7 @@ script_0800E32E:
_0807E878
Jump script_0800E32E
.2byte 0x0000
SCRIPT_START script_0800E350
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x000a
@@ -197,13 +200,13 @@ script_0800E37A:
_0807E864
Wait 0x001e
DoPostScriptAction 0x0010
SoundReq 0x01c9
PlaySound SFX_1C9
_0807E930 0x000d
Wait 0x003c
SoundReq 0x01ca
PlaySound SFX_1CA
DoPostScriptAction 0x0010
Wait 0x001e
SoundReq 0x0072
PlaySound SFX_SECRET
Wait 0x0078
DoPostScriptAction 0x0004
Wait 0x001e
@@ -241,6 +244,7 @@ script_0800E3EE:
Wait 0x000f
_0807E878
Jump script_0800E3EE
SCRIPT_START script_0800E408
BeginBlock
_0807EB44 0x0002
DoPostScriptAction 0x000a
@@ -256,6 +260,7 @@ script_0800E41A:
Wait 0x000f
_0807E878
Jump script_0800E41A
SCRIPT_START script_0800E434
BeginBlock
_0807EB44 0x0002
CallWithArg sub_0807F3D8, 0x00000000
@@ -272,6 +277,7 @@ script_0800E44C:
_0807EA94
_0807E878
Jump script_0800E44C
SCRIPT_START script_0800E46C
BeginBlock
_0807EB44 0x0004
CallWithArg sub_0807F3D8, 0x00000000
@@ -288,6 +294,7 @@ script_0800E484:
_0807EA94
_0807E878
Jump script_0800E484
SCRIPT_START script_0800E4A4
BeginBlock
Call sub_0807F354
EndBlock
@@ -311,7 +318,7 @@ script_0800E4B6:
Wait 0x003c
_0807EA94
BeginBlock
SoundReq2 0x0033
PlayBgm BGM_FIGHT_THEME2
SetLocalFlag 0x007c
script_0800E4FA:
_0807E878
+1 -1
View File
@@ -10,7 +10,7 @@ script_0800E510:
Wait 0x001e
Call sub_0807F3F8
Wait 0x003c
SoundReq 0x0105
PlaySound SFX_105
Wait 0x001e
_0807EB28 0x1617
SetLocalFlag 0x007d
+1 -1
View File
@@ -10,7 +10,7 @@ script_0800E550:
Wait 0x001e
Call sub_0807F3F8
Wait 0x003c
SoundReq 0x0105
PlaySound SFX_105
Wait 0x001e
_0807EB28 0x1622
Call sub_08053494
+2 -2
View File
@@ -5,9 +5,9 @@ SCRIPT_START script_0800E58C
DoPostScriptAction 0x0014
EndBlock
Wait 0x003c
SoundReq 0x0105
PlaySound SFX_105
Wait 0x003c
SoundReq 0x009b
PlaySound SFX_9B
Wait 0x001e
TextboxNoOverlap 0x1625
_0807EA94
+5
View File
@@ -18,6 +18,7 @@ script_0800E6D2:
Wait 0x000f
_0807E878
Jump script_0800E6BE
SCRIPT_START script_0800E6E8
BeginBlock
Call sub_0806ADFC
DoPostScriptAction 0x000a
@@ -45,6 +46,7 @@ script_0800E722:
_0807E878
Jump script_0800E6F4
.2byte 0x0000
SCRIPT_START script_0800E734
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
@@ -59,6 +61,7 @@ script_0800E73E:
_0807EA94
_0807E878
Jump script_0800E73E
SCRIPT_START script_0800E760
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
@@ -105,6 +108,7 @@ script_0800E7D8:
JumpIf script_0800E7D8
EndBlock
Jump script_0800E6F4
SCRIPT_START script_0800E7F4
BeginBlock
Call sub_0806C674
DoPostScriptAction 0x000a
@@ -121,6 +125,7 @@ script_0800E806:
_0807EB44 0x0004
Jump script_0800E806
.2byte 0x0000
SCRIPT_START script_0800E824
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
+3 -1
View File
@@ -8,6 +8,7 @@ script_0800E914:
_0807E878
_0807EB44 0x0000
Jump script_0800E832
SCRIPT_START script_0800E920
BeginBlock
Call sub_0806C4F8
DoPostScriptAction 0x000a
@@ -29,6 +30,7 @@ script_0800E942:
_0807E930 0x0000
Jump script_0800E932
.2byte 0x0000
SCRIPT_START script_0800E964
BeginBlock
DoPostScriptAction 0x000a
_0807EB44 0x0004
@@ -58,7 +60,7 @@ script_0800E974:
StartPlayerScript script_0800EA1C
WaitForSomething2 0x00000001
SetLocalFlag 0x0074
SoundReq 0x0072
PlaySound SFX_SECRET
Wait 0x00f0
TextboxNoOverlapFollow 0x4a26
_0807EA94
+13
View File
@@ -20,6 +20,7 @@ script_0800EA6A:
Call sub_0807F2D4
_0807E930 0x0008
Jump script_0800EA6A
SCRIPT_START script_0800EAA4
BeginBlock
_0807E9D4
Call sub_0806C09C
@@ -45,6 +46,7 @@ script_0800EAD4:
_0807E878
_0807E930 0x0000
Jump script_0800EABC
SCRIPT_START script_0800EAF8
BeginBlock
Call sub_0806C870
DoPostScriptAction 0x000a
@@ -62,6 +64,7 @@ script_0800EB0E:
_0807E878
Jump script_0800EB0E
.2byte 0x0000
SCRIPT_START script_0800EB2C
BeginBlock
Call sub_08061E70
DoPostScriptAction 0x000a
@@ -79,6 +82,7 @@ script_0800EB44:
_0807E878
Jump script_0800EB44
.2byte 0x0000
SCRIPT_START script_0800EB64
BeginBlock
Call sub_08061E70
DoPostScriptAction 0x000a
@@ -104,6 +108,7 @@ script_0800EB7C:
Call sub_08061FD8
EndBlock
Jump script_0800EBF4
SCRIPT_START script_0800EBC0
BeginBlock
Call sub_08061E70
DoPostScriptAction 0x000a
@@ -111,6 +116,7 @@ script_0800EB7C:
Call sub_08061FD8
EndBlock
Jump script_0800EBF4
SCRIPT_START script_0800EBDC
BeginBlock
Call sub_08061E70
DoPostScriptAction 0x000a
@@ -128,6 +134,7 @@ script_0800EBF4:
_0807E878
Jump script_0800EBF4
.2byte 0x0000
SCRIPT_START script_0800EC14
BeginBlock
Call sub_08061E70
DoPostScriptAction 0x000a
@@ -146,6 +153,7 @@ script_0800EC2C:
_0807EB44 0x0002
Call sub_08061FD8
Jump script_0800EC2C
SCRIPT_START script_0800EC54
BeginBlock
Call sub_08061E70
DoPostScriptAction 0x000a
@@ -163,6 +171,7 @@ script_0800EC6C:
_0807E878
Jump script_0800EC6C
.2byte 0x0000
SCRIPT_START script_0800EC8C
BeginBlock
_0807E9D4
CallWithArg sub_08061FB8, 0x00000001
@@ -193,6 +202,7 @@ script_0800ECAC:
_0807E930 0x0003
Wait 0x001e
Jump script_0800ECAC
SCRIPT_START script_0800ED04
BeginBlock
Call sub_080639D0
DoPostScriptAction 0x000a
@@ -216,6 +226,7 @@ script_0800ED46:
Call sub_08063874
CallWithArg sub_08063850, 0x00000000
Jump script_0800ED20
SCRIPT_START script_0800ED5C
BeginBlock
Call sub_08064CC0
DoPostScriptAction 0x000a
@@ -233,6 +244,7 @@ script_0800ED76:
_0807E878
Jump script_0800ED76
.2byte 0x0000
SCRIPT_START script_0800ED90
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
@@ -283,6 +295,7 @@ script_0800EE3E:
Call sub_0807DF50
_0807E878
Jump script_0800ED98
SCRIPT_START script_0800EE50
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
+1
View File
@@ -43,6 +43,7 @@ script_0800F082:
Call sub_0806AEE4
Jump script_0800F082
.2byte 0x0000
SCRIPT_START script_0800F090
BeginBlock
_0807F0B4 0x0001
CameraTargetPlayer
+7 -1
View File
@@ -15,7 +15,7 @@ script_0800F564:
_0807E878
Jump script_0800F564
.2byte 0x0000
script_0800F584:
SCRIPT_START script_0800F584
BeginBlock
DoPostScriptAction 0x0001
_0807E9D4
@@ -32,6 +32,7 @@ script_0800F592:
DoPostScriptAction 0x0001
Jump script_0800F592
.2byte 0x0000
SCRIPT_START script_0800F5B0
BeginBlock
_0807EB44 0x0006
_0807E9D4
@@ -49,6 +50,7 @@ script_0800F5C8:
_0807E878
Jump script_0800F5C8
.2byte 0x0000
SCRIPT_START script_0800F5EC
BeginBlock
_0807EB44 0x0004
_0807E930 0x0000
@@ -67,6 +69,7 @@ script_0800F604:
Wait 0x000f
_0807E878
Jump script_0800F604
SCRIPT_START script_0800F628
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
@@ -82,6 +85,7 @@ script_0800F636:
_0807E878
Jump script_0800F636
.2byte 0x0000
SCRIPT_START script_0800F650
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
@@ -101,6 +105,7 @@ script_0800F662:
DoPostScriptAction 0x0000
Jump script_0800F662
.2byte 0x0000
SCRIPT_START script_0800F688
BeginBlock
_0807EB44 0x0004
_0807E930 0x0000
@@ -127,6 +132,7 @@ script_0800F6C8:
CallWithArg sub_0807F3D8, 0x00000000
Jump script_0800F6A0
.2byte 0x0000
SCRIPT_START script_0800F6E0
BeginBlock
DoPostScriptAction 0x0001
_0807E9D4
+3 -2
View File
@@ -7,6 +7,7 @@ script_0800F72C:
JumpIfNot script_0800F72C
DoPostScriptAction 0x0007
Jump script_0800F584
SCRIPT_START script_0800F73C
CheckLocalFlag 0x00cd
JumpIf script_0800FA4C
_0807E864
@@ -79,7 +80,7 @@ script_0800F72C:
_0807E864
Call sub_0807DF28
Call sub_08063C5C
SoundReq 0x00e2
PlaySound SFX_CUCCO_MINIGAME_BELL
Wait 0x001e
_0807E8E4_0
Call sub_0807F3F8
@@ -134,7 +135,7 @@ script_0800F72C:
_0807EA94
Call sub_08063C14
Call sub_08094D70
SoundReq 0x0103
PlaySound SFX_103
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
Call sub_08063C14
+3
View File
@@ -15,6 +15,7 @@ script_0800FDB2:
_0807E878
Jump script_0800FDB2
.2byte 0x0000
SCRIPT_START script_0800FDCC
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
@@ -51,6 +52,7 @@ script_0800FE06:
Call sub_08069A3C
Jump script_0800FDE8
.2byte 0x0000
SCRIPT_START script_0800FE44
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
@@ -87,6 +89,7 @@ script_0800FE7E:
Call sub_08069A84
Jump script_0800FE60
.2byte 0x0000
SCRIPT_START script_0800FEBC
BeginBlock
CheckInventory1 0x0012
JumpIf script_0800FF0E
+1 -1
View File
@@ -51,7 +51,7 @@ script_08010014:
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000008
SoundReq 0x00cd
PlaySound SFX_TASK_COMPLETE
TextboxNoOverlap 0x340a
_0807EA94
_0807EB44 0x0004
+6 -3
View File
@@ -15,6 +15,7 @@ script_080100DC:
_0807E878
Jump script_080100DC
.2byte 0x0000
SCRIPT_START script_080100FC
BeginBlock
Call sub_08061FE4
Call sub_08061E70
@@ -25,6 +26,7 @@ script_08010110:
Call sub_08061E90
Jump script_08010110
.2byte 0x0000
SCRIPT_START script_08010120
BeginBlock
_0807E9D4
_0807EB44 0x0004
@@ -40,6 +42,7 @@ script_08010132:
_0807EA94
_0807E878
Jump script_08010132
SCRIPT_START script_08010148
BeginBlock
DoPostScriptAction 0x0001
Call sub_0806C354
@@ -61,7 +64,7 @@ script_0801015A:
_0807E878
CallWithArg sub_080A1550, script_080101AC
JumpIfNot script_0801015A
SoundReq2 0x0015
PlayBgm BGM_CUCCO_MINIGAME
SetRoomFlag 0x0001
Jump script_0801015A
script_0801019E:
@@ -80,7 +83,7 @@ script_080101AC:
Call sub_0807DF28
TextboxNoOverlapFollowPos 0x3004, 0x0007
_0807EA94
SoundReq0x80100000
StopBgm
_0807E778 0x0004
DoFade5
WaitFor_2
@@ -99,7 +102,7 @@ script_080101AC:
_0807E778 0x0004
DoFade4
WaitFor_2
SoundReq2 0xffff
PlayBGM
Call sub_080A13B4
_0807EA94
JumpIfNot script_08010240
+20 -1
View File
@@ -16,6 +16,7 @@ script_0801027A:
_0807E878
Jump script_0801027A
.2byte 0x0000
SCRIPT_START script_08010294
BeginBlock
DoPostScriptAction 0x0000
Call sub_08062A48
@@ -41,6 +42,7 @@ script_080102CC:
_0807E878
Jump script_080102A6
.2byte 0x0000
SCRIPT_START script_080102E0
BeginBlock
DoPostScriptAction 0x0000
Call sub_08062A48
@@ -56,6 +58,7 @@ script_080102F2:
_0807E878
Jump script_080102F2
.2byte 0x0000
SCRIPT_START script_0801030C
BeginBlock
DoPostScriptAction 0x0000
EndBlock
@@ -100,6 +103,7 @@ script_08010396:
JumpIfNot script_08010396
Jump script_08010314
.2byte 0x0000
SCRIPT_START script_080103B0
BeginBlock
DoPostScriptAction 0x0000
Call sub_08062A48
@@ -109,6 +113,7 @@ script_080103C2:
Wait 0x001e
Call sub_08062948
Jump script_080103C2
SCRIPT_START script_080103D0
BeginBlock
_0807E9D4
_0807EB44 0x0004
@@ -120,6 +125,7 @@ script_080103E8:
Call sub_0806407C
Jump script_080103E8
.2byte 0x0000
SCRIPT_START script_080103F8
BeginBlock
_0807E9D4
_0807EB44 0x0004
@@ -135,6 +141,7 @@ script_08010410:
_0807EA94
_0807E878
Jump script_08010410
SCRIPT_START script_08010428
BeginBlock
_0807E9D4
_0807EB44 0x0004
@@ -147,6 +154,7 @@ script_08010446:
Wait 0x003c
Call sub_080646A4
Jump script_08010446
SCRIPT_START script_08010454
BeginBlock
_0807EB44 0x0004
_0807E930 0x0000
@@ -166,6 +174,7 @@ script_08010470:
_0807E878
CallWithArg sub_0807F3D8, 0x00000000
Jump script_08010470
SCRIPT_START script_080104A0
BeginBlock
_0807EB44 0x0004
_0807E930 0x0000
@@ -185,6 +194,7 @@ script_080104BC:
_0807E878
CallWithArg sub_0807F3D8, 0x00000000
Jump script_080104BC
SCRIPT_START script_080104EC
BeginBlock
_0807EB44 0x0004
_0807E930 0x0000
@@ -273,6 +283,7 @@ script_08010602:
_0807E878
_0807EB44 0x0004
Jump script_08010602
SCRIPT_START script_0801061C
BeginBlock
_0807E930 0x0008
script_08010622:
@@ -287,10 +298,12 @@ script_0801062E:
_0807EA94
_0807E878
Jump script_0801062E
SCRIPT_START script_08010644
BeginBlock
_0807E930 0x0009
Jump script_08010622
.2byte 0x0000
SCRIPT_START script_08010650
BeginBlock
_0807E930 0x000b
Jump script_08010622
@@ -303,6 +316,7 @@ script_0801062E:
_0807E930 0x000d
Jump script_08010622
.2byte 0x0000
SCRIPT_START script_08010674
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
@@ -322,6 +336,7 @@ script_08010686:
_0807EB44 0x0004
Jump script_08010686
.2byte 0x0000
SCRIPT_START script_080106AC
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
@@ -365,6 +380,7 @@ script_08010726:
DoPostScriptAction 0x0001
Jump script_080106BE
.2byte 0x0000
SCRIPT_START script_08010734
BeginBlock
DoPostScriptAction 0x0007
_0807E9D4
@@ -397,6 +413,7 @@ script_08010786:
_0807E878
_0807E930 0x0008
Jump script_08010746
SCRIPT_START script_08010794
BeginBlock
DoPostScriptAction 0x0007
_0807E9D4
@@ -416,6 +433,7 @@ script_080107AA:
DoPostScriptAction 0x0000
Jump script_080107AA
.2byte 0x0000
SCRIPT_START script_080107D0
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
@@ -495,7 +513,7 @@ script_080108BA:
_0807EB44 0x0004
DoPostScriptAction 0x0000
Jump script_08010804
script_080108D0:
SCRIPT_START script_080108D0
CheckPlayerInRegion2 0x0808
JumpIfNot script_080108D0
_0807E864
@@ -511,6 +529,7 @@ script_08010900:
Call sub_0807DF50
_0807E878
Jump script_080108D0
SCRIPT_START script_0801090C
BeginBlock
DoPostScriptAction 0x0007
CheckKinstoneFused 0x001b
+1 -1
View File
@@ -14,7 +14,7 @@ script_08010994:
Call sub_0807DF50
_0807E878
Jump script_08010964
script_080109A0:
SCRIPT_START script_080109A0
BeginBlock
EndBlock
CheckLocalFlag 0x00d1
+1
View File
@@ -17,6 +17,7 @@ script_08010AB4:
_0807EB44 0x0004
CallWithArg sub_080672B0, 0x00000000
Jump script_08010AB4
SCRIPT_START script_08010AE4
BeginBlock
CheckInventory1 0x0067
JumpIfNot script_08010B62
+12 -11
View File
@@ -17,6 +17,7 @@ script_08010BCA:
_0807E930 0x0008
Jump script_08010BCA
.2byte 0x0000
SCRIPT_START script_08010BEC
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
@@ -33,7 +34,7 @@ script_08010BCA:
WaitForSomething2 0x00000020
TextboxNoOverlapFollowPos 0x1038, 0x000c
_0807EA94
SoundReq0x80100000
StopBgm
_0807E778 0x0004
DoFade5
WaitFor_2
@@ -70,7 +71,7 @@ script_08010BCA:
WaitForSomething2 0x00000008
TextboxNoOverlapFollowPos 0x1039, 0x000c
_0807EA94
SoundReq2 0x0001
PlayBgm BGM_CASTLE_TOURNAMENT
_0807E8E4_2
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
@@ -95,19 +96,19 @@ script_08010BCA:
Wait 0x003c
WaitForSomething2 0x00000200
_0807E5F8 0x00280000
SoundReq0x80100000
SoundReq 0x009b
StopBgm
PlaySound SFX_9B
_0807E5F8 0x00000100
WaitForSomething2 0x00000200
TextboxNoOverlapFollowPos 0x1043, 0x0000
_0807EA94
SoundReq2 0x000d
PlayBgm BGM_VAATI_THEME
_0807E5F8 0x00000100
WaitForSomething2 0x00000200
_0807E5F8 0x0002a800
WaitForSomething2 0x00055000
SoundReq 0x01c7
SoundReq 0x00e5
PlaySound SFX_1C7
PlaySound SFX_BUTTON_DEPRESS
_0807E5F8 0x00000100
_0807E5F8 0x00002800
CallWithArg sub_0807FB28, 0x00000003
@@ -118,18 +119,18 @@ script_08010BCA:
TextboxNoOverlapFollowPos 0x1044, 0x0000
_0807EA94
SetEntityPositionRelative 0x01f8, 0x0098
SoundReq0x80100000
StopBgm
Wait 0x003c
SoundReq2 0x002f
PlayBgm BGM_VAATI_REBORN
_0807E5F8 0x00028000
_0807E5F8 0x00000100
WaitForSomething2 0x00000200
WaitForSomething2 0x00050000
CallWithArg sub_0807FB28, 0x00000003
SoundReq 0x00e5
PlaySound SFX_BUTTON_DEPRESS
_0807E5F8 0x00028000
WaitForSomething2 0x00050000
SoundReq 0x0125
PlaySound SFX_125
CallWithArg sub_0807FB28, 0x00000003
_0807E5F8 0x08000000
_0807E5F8 0x00800000
+7 -7
View File
@@ -1,23 +1,23 @@
SCRIPT_START script_08010E5A
Wait 0x001e
SoundReq 0x0125
PlaySound SFX_125
CallWithArg sub_0807FB28, 0x00000003
Wait 0x003c
SoundReq 0x0125
PlaySound SFX_125
CallWithArg sub_0807FB28, 0x00000003
Wait 0x0004
SoundReq 0x0125
PlaySound SFX_125
CallWithArg sub_0807FB28, 0x00000003
Wait 0x001e
SoundReq 0x012c
PlaySound SFX_12C
_0807E5F8 0x00800000
WaitForSomething2 0x01000000
_0807E778 0x0004
DoFade7
WaitFor_2
Wait 0x003c
SoundReq 0x00ab
SoundReq 0x01c2
PlaySound SFX_SPIRITS_RELEASE
PlaySound SFX_1C2
LoadRoomEntityList gUnk_080F0770
_0807E5F8 0x00000010
WaitForSomething2 0x00000020
@@ -37,7 +37,7 @@ SCRIPT_START script_08010E5A
_0807E5F8 0x00000040
WaitForSomething2 0x00000008
WaitForSomething2 0x00000080
SoundReq 0x01c3
PlaySound SFX_1C3
_0807E5F8 0x20000000
Wait 0x0078
CallWithArg sub_0807F29C, 0x00000000
+3 -3
View File
@@ -17,16 +17,16 @@ SCRIPT_START script_08010F84
Call sub_0806DC58
Wait 0x003c
_0807E5F8 0x08000000
SoundReq 0x0125
PlaySound SFX_125
CallWithArg sub_0807FB28, 0x00000003
Wait 0x000f
SoundReq 0x0125
PlaySound SFX_125
CallWithArg sub_0807FB28, 0x00000003
CallWithArg sub_0805DE18, 0x00000002
_0807F0C8 0x0000, 0x0000
_0807E5F8 0x00000010
WaitForSomething2 0x00000020
SoundReq0x80100000
StopBgm
Wait 0x003c
TextboxNoOverlapFollowPos 0x104a, 0x0000
_0807EA94
+2 -2
View File
@@ -1,8 +1,8 @@
SCRIPT_START script_080110E8
SoundReq 0x007a
PlaySound SFX_PLY_VO6
_0807EB44 0x0004
DoPostScriptAction 0x000d
SoundReq 0x0086
PlaySound SFX_86
Call sub_0807F36C
SetEntitySpeed 0x0400
_0807ECF4 0x0008
+2 -2
View File
@@ -41,14 +41,14 @@ script_08011206:
DoPostScriptAction 0x0000
_0807E5F8 0x00000020
WaitForSomething2 0x00000010
SoundReq 0x01c9
PlaySound SFX_1C9
DoPostScriptAction 0x0010
Wait 0x0014
Call sub_08066E20
Wait 0x0014
DoPostScriptAction 0x0010
Call sub_0807F2D4
SoundReq 0x01ca
PlaySound SFX_1CA
_0807E5F8 0x00000020
WaitForSomething2 0x00000010
DoPostScriptAction 0x0006
+1 -1
View File
@@ -30,7 +30,7 @@ script_08011312:
DoPostScriptAction 0x0004
Wait 0x003c
_0807E930 0x0012
SoundReq 0x011e
PlaySound SFX_EM_MOBLIN_SPEAR
Wait 0x003c
_0807E930 0x0014
SetEntitySpeed 0x0100
+1 -1
View File
@@ -12,7 +12,7 @@ SCRIPT_START script_080113AA
DoPostScriptAction 0x0004
Wait 0x003c
_0807E930 0x0012
SoundReq 0x011e
PlaySound SFX_EM_MOBLIN_SPEAR
Wait 0x003c
_0807E930 0x0014
SetEntitySpeed 0x0100
+1 -1
View File
@@ -14,7 +14,7 @@ SCRIPT_START script_08011442
DoPostScriptAction 0x0004
Wait 0x003c
_0807E930 0x0012
SoundReq 0x011e
PlaySound SFX_EM_MOBLIN_SPEAR
_0807E5F8 0x00010000
WaitForSomething2 0x00008000
_0807E930 0x0014
+1 -1
View File
@@ -14,7 +14,7 @@ SCRIPT_START script_08011508
DoPostScriptAction 0x0004
Wait 0x003c
_0807E930 0x0012
SoundReq 0x011e
PlaySound SFX_EM_MOBLIN_SPEAR
_0807E5F8 0x00040000
WaitForSomething2 0x00020000
_0807E930 0x0014

Some files were not shown because too many files have changed in this diff Show More