diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-04-20 21:24:44 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-04-20 21:24:44 -0700 |
| commit | c99408c8498b44007f7cf859636d6bbe9509e15b (patch) | |
| tree | 8c3ec54b46cb811851a65c60b072f4b6ac010b10 /data/scripts | |
| parent | 167fe388b68802bdf17d4017bff8e60b76bf372c (diff) | |
merge + fix
Diffstat (limited to 'data/scripts')
154 files changed, 454 insertions, 294 deletions
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 4ba55575..d7e5a9cc 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -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 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index 6f419bac..e92f7fbb 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -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 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc index dd2791f8..664aabe5 100644 --- a/data/scripts/script_08008FC0.inc +++ b/data/scripts/script_08008FC0.inc @@ -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 diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc index 318ebf1f..34d38b3d 100644 --- a/data/scripts/script_08008FFC.inc +++ b/data/scripts/script_08008FFC.inc @@ -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 diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index ba813a3f..e78894a2 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -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 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 25a70cb1..49342031 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -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 diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc index 6c0e9858..fb908878 100644 --- a/data/scripts/script_080094FC.inc +++ b/data/scripts/script_080094FC.inc @@ -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 diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index c16c4201..bee0fd26 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -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 diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc index 707cc5e4..c2cb5886 100644 --- a/data/scripts/script_08009740.inc +++ b/data/scripts/script_08009740.inc @@ -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 diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc index 85d253ee..6732d029 100644 --- a/data/scripts/script_080097F0.inc +++ b/data/scripts/script_080097F0.inc @@ -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 diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc index 144383f8..00776ede 100644 --- a/data/scripts/script_08009838.inc +++ b/data/scripts/script_08009838.inc @@ -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 diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc index d0cc3325..b6cf02a9 100644 --- a/data/scripts/script_0800987C.inc +++ b/data/scripts/script_0800987C.inc @@ -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 diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc index d70c103a..e86e879e 100644 --- a/data/scripts/script_08009A34.inc +++ b/data/scripts/script_08009A34.inc @@ -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 diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc index 8e1ae84a..0e66a292 100644 --- a/data/scripts/script_08009AF8.inc +++ b/data/scripts/script_08009AF8.inc @@ -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 diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc index aa448258..d51e200f 100644 --- a/data/scripts/script_08009CFC.inc +++ b/data/scripts/script_08009CFC.inc @@ -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 diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc index 51f47a09..869b107a 100644 --- a/data/scripts/script_08009DB0.inc +++ b/data/scripts/script_08009DB0.inc @@ -15,6 +15,7 @@ script_08009DD2: _0807E908 0x0003 _0807E930 0x000c Jump script_08009DD2 +SCRIPT_START script_08009DEC BeginBlock EndBlock script_08009DF0: diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 828f4cf9..ac5dfd38 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -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 diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc index 5585c44b..3645cdfc 100644 --- a/data/scripts/script_0800A0B4.inc +++ b/data/scripts/script_0800A0B4.inc @@ -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 diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc index c7e7f59c..80b3c50f 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/data/scripts/script_0800A0FC.inc @@ -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 diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc index 52e561c8..d6a90fe0 100644 --- a/data/scripts/script_0800A160.inc +++ b/data/scripts/script_0800A160.inc @@ -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 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index 96faa56d..2aaed6d4 100644 --- a/data/scripts/script_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -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 diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc index 50a0bc11..77e8e6b0 100644 --- a/data/scripts/script_0800A310.inc +++ b/data/scripts/script_0800A310.inc @@ -11,6 +11,7 @@ SCRIPT_START script_0800A310 _0807E5F8 0x00000001 Call sub_080791BC .2byte 0x0000 +SCRIPT_START script_0800A340 BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc index 114943d5..17bc1479 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/data/scripts/script_0800A3D8.inc @@ -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 diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc index d9f29737..be0160a5 100644 --- a/data/scripts/script_0800A500.inc +++ b/data/scripts/script_0800A500.inc @@ -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 diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc index 4a6dd099..9df69772 100644 --- a/data/scripts/script_0800A590.inc +++ b/data/scripts/script_0800A590.inc @@ -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 diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc index b59a7fdf..906bdf0b 100644 --- a/data/scripts/script_0800A6A4.inc +++ b/data/scripts/script_0800A6A4.inc @@ -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 diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc index 0c4d8409..c655fe02 100644 --- a/data/scripts/script_0800A6D4.inc +++ b/data/scripts/script_0800A6D4.inc @@ -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 diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc index ad6120c2..cf586372 100644 --- a/data/scripts/script_0800A704.inc +++ b/data/scripts/script_0800A704.inc @@ -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 diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc index 1bbc5b98..c9767016 100644 --- a/data/scripts/script_0800A734.inc +++ b/data/scripts/script_0800A734.inc @@ -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 diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc index e89ebe2c..098abea1 100644 --- a/data/scripts/script_0800A764.inc +++ b/data/scripts/script_0800A764.inc @@ -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 diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc index bb2a3700..f6662e0e 100644 --- a/data/scripts/script_0800A7E4.inc +++ b/data/scripts/script_0800A7E4.inc @@ -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 diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc index 869e2aec..277ab505 100644 --- a/data/scripts/script_0800AAD8.inc +++ b/data/scripts/script_0800AAD8.inc @@ -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 diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index 2c38aa99..d0cea700 100644 --- a/data/scripts/script_0800AB08.inc +++ b/data/scripts/script_0800AB08.inc @@ -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 diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc index 7f22b9cf..2f8a0e05 100644 --- a/data/scripts/script_0800ACE0.inc +++ b/data/scripts/script_0800ACE0.inc @@ -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 diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc index 03b12d66..1e49d980 100644 --- a/data/scripts/script_0800AD54.inc +++ b/data/scripts/script_0800AD54.inc @@ -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 diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc index 71358dea..53eb509f 100644 --- a/data/scripts/script_0800AF18.inc +++ b/data/scripts/script_0800AF18.inc @@ -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 diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc index c4687bdc..9ad7992a 100644 --- a/data/scripts/script_0800B0D0.inc +++ b/data/scripts/script_0800B0D0.inc @@ -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 diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc index 3686156d..cfe10656 100644 --- a/data/scripts/script_0800B254.inc +++ b/data/scripts/script_0800B254.inc @@ -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 diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc index 4163885a..12365628 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -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 diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index 6af14ec8..f5e2d2ba 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -15,7 +15,7 @@ SCRIPT_START script_0800B41C WaitForSomething2 0x00000004 _0807EB74 Wait 0x003c - SoundReq 0x00cd + PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 WaitPlayerAction8 _0807EB8C diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc index c42e9417..f5acdf53 100644 --- a/data/scripts/script_0800B574.inc +++ b/data/scripts/script_0800B574.inc @@ -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 diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc index 45c39e1e..7365b9aa 100644 --- a/data/scripts/script_0800B5C4.inc +++ b/data/scripts/script_0800B5C4.inc @@ -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 diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index e549b811..d4e33835 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -14,6 +14,7 @@ script_0800B5FA: _0807E878 _0807EB44 0x0004 Jump script_0800B5FA +SCRIPT_START script_0800B614 BeginBlock EndBlock script_0800B618: diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index 18560a5c..4ff26db2 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -25,6 +25,7 @@ script_0800B6D4: _0807F034 0x0064 Jump script_0800B698 .2byte 0x0000 +SCRIPT_START script_0800B730 BeginBlock EndBlock script_0800B734: diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index 4bf415cf..db081eea 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -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 diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 1a1519f2..91f99499 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -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 diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 2cc1a6d6..9e7d93e1 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -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 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index ef5f897c..5fed6585 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -15,6 +15,7 @@ SCRIPT_START script_0800BE1C Wait 0x003c Jump script_0800BE88 .2byte 0x0000 +SCRIPT_START script_0800BE54 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index c136745f..be10cfed 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -15,6 +15,7 @@ SCRIPT_START script_0800BF38 Wait 0x003c Jump script_0800BFA4 .2byte 0x0000 +SCRIPT_START script_0800BF70 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 04950467..784fa358 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -15,6 +15,7 @@ SCRIPT_START script_0800C0B0 Wait 0x003c Jump script_0800C11C .2byte 0x0000 +SCRIPT_START script_0800C0E8 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index 9eaf26a5..be502e1f 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -15,6 +15,7 @@ SCRIPT_START script_0800C1D8 Wait 0x003c Jump script_0800C244 .2byte 0x0000 +SCRIPT_START script_0800C210 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc index 54d6aa9b..e50a0f31 100644 --- a/data/scripts/script_0800C3CC.inc +++ b/data/scripts/script_0800C3CC.inc @@ -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 diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc index 4e3767b4..2d796192 100644 --- a/data/scripts/script_0800C410.inc +++ b/data/scripts/script_0800C410.inc @@ -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 diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc index 5c8767cc..a3882952 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -6,7 +6,7 @@ SCRIPT_START script_0800C45C EndBlock Wait 0x000a DoPostScriptAction 0x0007 - SoundReq 0x0136 + PlaySound SFX_136 script_0800C47A: _0807EE30 JumpIfNot script_0800C47A diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc index f35af231..ec34449e 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -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 diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc index 6365aa7e..6a096484 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -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 diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc index 0c8bc2b1..031cc83f 100644 --- a/data/scripts/script_0800C50C.inc +++ b/data/scripts/script_0800C50C.inc @@ -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 diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 2a718869..4c598340 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -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 diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc index 0387d84e..8c741a64 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -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 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc index 1ba664af..9293653e 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -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 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc index 81dde4c6..facb5c9a 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -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 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index bac529fa..7fb12f17 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -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 diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc index 2ff93e40..6a4350fa 100644 --- a/data/scripts/script_0800D1E0.inc +++ b/data/scripts/script_0800D1E0.inc @@ -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 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index 16ef4204..e9a10577 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -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 diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc index d1901242..fa00f3c6 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -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 diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc index e81cc3d9..53cf6c21 100644 --- a/data/scripts/script_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -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 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index f16e938f..d1d1d3ed 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -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 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index b745268a..a86c3da9 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -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 diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index c810df2f..829bc9d0 100644 --- a/data/scripts/script_0800DB78.inc +++ b/data/scripts/script_0800DB78.inc @@ -40,7 +40,7 @@ script_0800DBCA: _0807EA94 Call sub_0807F3F8 _0807E5F8 0x00000001 - SoundReq0x80100000 + StopBgm Call sub_08094F98 CallWithArg sub_0805DDEC, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800DC4C.inc b/data/scripts/script_0800DC4C.inc index 305493d4..1c84c162 100644 --- a/data/scripts/script_0800DC4C.inc +++ b/data/scripts/script_0800DC4C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DC4C Wait 0x003c - SoundReq2 0x0031 + PlayBgm BGM_CASTLE_COLLAPSE StartPlayerScript script_0800DE50 WaitForSomething2 0x00000006 _0807EB28 0x1646 diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index c3bef3db..7ac06b7e 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -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 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index 1bbcf592..5711733f 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -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 diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc index 1a66bdab..e3de08af 100644 --- a/data/scripts/script_0800DFB4.inc +++ b/data/scripts/script_0800DFB4.inc @@ -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 diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index d1de2e0b..46080434 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -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 diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc index f44b8f44..7bafd454 100644 --- a/data/scripts/script_0800E050.inc +++ b/data/scripts/script_0800E050.inc @@ -3,8 +3,8 @@ SCRIPT_START script_0800E050 Call sub_0807DF28 _0807E864 EndBlock - SoundReq0x80100000 - SoundReq0x80100000 + StopBgm + StopBgm Wait 0x0078 _0807EB28 0x1638 _0807EA94 diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index 8ca8ff20..abd2f9e7 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -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 diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc index aa6d96c5..3beea212 100644 --- a/data/scripts/script_0800E504.inc +++ b/data/scripts/script_0800E504.inc @@ -10,7 +10,7 @@ script_0800E510: Wait 0x001e Call sub_0807F3F8 Wait 0x003c - SoundReq 0x0105 + PlaySound SFX_105 Wait 0x001e _0807EB28 0x1617 SetLocalFlag 0x007d diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc index 7b085256..d56ce3ff 100644 --- a/data/scripts/script_0800E544.inc +++ b/data/scripts/script_0800E544.inc @@ -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 diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index 54971859..f32c3d6e 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -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 diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index 049dc195..c345a277 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -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 diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index 84d61ce1..90180d0e 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -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 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index f432b00a..e114b2e9 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -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 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index bec9c5ec..cf88816f 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -43,6 +43,7 @@ script_0800F082: Call sub_0806AEE4 Jump script_0800F082 .2byte 0x0000 +SCRIPT_START script_0800F090 BeginBlock _0807F0B4 0x0001 CameraTargetPlayer diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index e8de87fb..8668612d 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -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 diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index 6a89a421..2d686bbc 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -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 diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc index fd161ece..024ecd82 100644 --- a/data/scripts/script_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -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 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index c74dadee..2d79be0d 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -51,7 +51,7 @@ script_08010014: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 - SoundReq 0x00cd + PlaySound SFX_TASK_COMPLETE TextboxNoOverlap 0x340a _0807EA94 _0807EB44 0x0004 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index fd50b2f9..562efdf5 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -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 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index eac67e79..08c027a3 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -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 diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc index 46a97af4..72d28a10 100644 --- a/data/scripts/script_08010964.inc +++ b/data/scripts/script_08010964.inc @@ -14,7 +14,7 @@ script_08010994: Call sub_0807DF50 _0807E878 Jump script_08010964 -script_080109A0: +SCRIPT_START script_080109A0 BeginBlock EndBlock CheckLocalFlag 0x00d1 diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc index 78022f8b..96232387 100644 --- a/data/scripts/script_08010A98.inc +++ b/data/scripts/script_08010A98.inc @@ -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 diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index 34745b7b..9bd7cb7f 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -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 diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index 7c9cb0f8..2804a046 100644 --- a/data/scripts/script_08010E5A.inc +++ b/data/scripts/script_08010E5A.inc @@ -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 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index ef33d17d..d10ec983 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -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 diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc index 03f283c4..e65fa936 100644 --- a/data/scripts/script_080110E8.inc +++ b/data/scripts/script_080110E8.inc @@ -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 diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc index 8756d389..4d5a8961 100644 --- a/data/scripts/script_080111CC.inc +++ b/data/scripts/script_080111CC.inc @@ -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 diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc index 2fa640e4..6f11ef20 100644 --- a/data/scripts/script_080112C4.inc +++ b/data/scripts/script_080112C4.inc @@ -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 diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc index 847d0cf9..c2dd7844 100644 --- a/data/scripts/script_080113AA.inc +++ b/data/scripts/script_080113AA.inc @@ -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 diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc index f2eb4214..60fb8b68 100644 --- a/data/scripts/script_08011442.inc +++ b/data/scripts/script_08011442.inc @@ -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 diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc index bc282731..4b312019 100644 --- a/data/scripts/script_08011508.inc +++ b/data/scripts/script_08011508.inc @@ -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 diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc index ee570b92..782fe44e 100644 --- a/data/scripts/script_080115D0.inc +++ b/data/scripts/script_080115D0.inc @@ -6,7 +6,7 @@ SCRIPT_START script_080115D0 EndBlock WaitForSomething2 0x00080000 _0807E930 0x0005 - SoundReq 0x011c + PlaySound SFX_11C _0807ECF4 0x0010 _0807E930 0x0001 _0807E5F8 0x00100000 diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc index 957a381c..115fd3d0 100644 --- a/data/scripts/script_08011608.inc +++ b/data/scripts/script_08011608.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08011608 EndBlock WaitForSomething2 0x00200000 _0807E930 0x0007 - SoundReq 0x011c + PlaySound SFX_11C _0807EC94 0x0010 _0807E930 0x0003 _0807E5F8 0x00400000 diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc index f931651a..72f45453 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -32,11 +32,11 @@ SCRIPT_START script_080116A8 WaitForSomething2 0x00000100 _0807EB44 0x0000 DoPostScriptAction 0x0014 - SoundReq 0x0120 + PlaySound SFX_CHARGING_UP CallWithArg sub_08095420, script_08011890 Wait 0x00f0 DoPostScriptAction 0x0016 - SoundReq 0x01cb + PlaySound SFX_1CB WaitForSomething2 0x10000000 DoPostScriptAction 0x0000 _0807E5F8 0x00000200 @@ -49,13 +49,13 @@ SCRIPT_START script_080116A8 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 DoPostScriptAction 0x0014 - SoundReq 0x01c4 + PlaySound SFX_1C4 CallWithArg sub_0809545C, script_080118D4 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 Wait 0x003c DoPostScriptAction 0x0016 - SoundReq 0x01c5 + PlaySound SFX_1C5 _0807E5F8 0x08000000 WaitForSomething2 0x10000000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc index 09d8d177..8b854d03 100644 --- a/data/scripts/script_0801183C.inc +++ b/data/scripts/script_0801183C.inc @@ -7,7 +7,7 @@ SCRIPT_START script_0801183C _0807E5F8 0x01000000 WaitForSomething2 0x00800000 Call sub_08095364 - SoundReq 0x0122 + PlaySound SFX_122 Wait 0x003c _0807E5F8 0x01000000 WaitForSomething2 0x00800000 diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc index 3c6c2c90..4c9f0bc0 100644 --- a/data/scripts/script_08011890.inc +++ b/data/scripts/script_08011890.inc @@ -9,7 +9,7 @@ SCRIPT_START script_08011890 Call sub_08094B6C _0807EDD4 0x01f8, 0x0088 Call sub_08094B80 - SoundReq 0x01cc + PlaySound SFX_1CC _0807E5F8 0x10000000 WaitForSomething2 0x08000000 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc index 5c14c403..d0633936 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -11,11 +11,11 @@ SCRIPT_START script_080118D4 StartPlayerScript script_080110E8 _0807EDD4 0x01d8, 0x0058 Call sub_08094B80 - SoundReq 0x009a - SoundReq 0x01c6 + PlaySound SFX_VO_ZELDA7 + PlaySound SFX_1C6 _0807E5F8 0x10000000 WaitForSomething2 0x08000000 - SoundReq 0x011d + PlaySound SFX_11D DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index 7d19a55f..3f7fee61 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -3,10 +3,12 @@ SCRIPT_START script_0801194C _0807EB44 0x0002 Jump script_0801196A .2byte 0x0000 +SCRIPT_START script_08011958 BeginBlock _0807EB44 0x0006 Jump script_0801196A .2byte 0x0000 +SCRIPT_START script_08011964 BeginBlock _0807EB44 0x0004 script_0801196A: @@ -31,6 +33,7 @@ script_080119A4: Wait 0x000f _0807E878 Jump script_0801197C +SCRIPT_START script_080119B0 BeginBlock _0807E9D4 _0807EB44 0x0004 @@ -42,14 +45,17 @@ script_080119C8: Call sub_0806407C Jump script_080119C8 .2byte 0x0000 +SCRIPT_START script_080119D8 BeginBlock _0807EB44 0x0002 Jump script_080119F6 .2byte 0x0000 +SCRIPT_START script_080119E4 BeginBlock _0807EB44 0x0004 Jump script_080119F6 .2byte 0x0000 +SCRIPT_START script_080119F0 BeginBlock _0807EB44 0x0006 script_080119F6: @@ -68,6 +74,7 @@ script_08011A08: _0807E878 Jump script_08011A08 .2byte 0x0000 +SCRIPT_START script_08011A2C BeginBlock _0807EB44 0x0004 _0807E9D4 @@ -84,6 +91,7 @@ script_08011A44: _0807EA94 _0807E878 Jump script_08011A44 +SCRIPT_START script_08011A64 BeginBlock _0807EB44 0x0002 _0807E9D4 @@ -119,7 +127,7 @@ script_08011AC4: _0807EA94 _0807E878 Jump script_08011AC4 -script_08011AE4: +SCRIPT_START script_08011AE4 CheckRoomFlag 0x000f JumpIfNot script_08011AE4 _0807E864 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 435cfc37..4d7d15d8 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -48,6 +48,7 @@ script_08011BBC: Wait 0x003c Call sub_0806C224 Jump script_08011B9A +SCRIPT_START script_08011BE4 BeginBlock _0807E888 EndBlock @@ -56,11 +57,11 @@ script_08011BBC: Wait 0x003c _0807E878 SetRoomFlag 0x0000 - SoundReq2 0x0033 + PlayBgm BGM_FIGHT_THEME2 script_08011C04: CheckRoomFlag 0x0064 JumpIfNot script_08011C04 - SoundReq0x80100000 + StopBgm _0807E864 Wait 0x003c CameraTargetEntity diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index bd6a73f6..93e409c8 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -58,6 +58,7 @@ script_08011D0E: DoPostScriptAction 0x0001 Jump script_08011D00 .2byte 0x0000 +SCRIPT_START script_08011D28 BeginBlock Call sub_08064928 _0807EB44 0x0004 @@ -117,6 +118,7 @@ script_08011DBA: DoPostScriptAction 0x0001 Jump script_08011DAC .2byte 0x0000 +SCRIPT_START script_08011DD4 BeginBlock Call sub_08064A28 _0807EB44 0x0004 @@ -176,6 +178,7 @@ script_08011E66: DoPostScriptAction 0x0001 Jump script_08011E58 .2byte 0x0000 +SCRIPT_START script_08011E80 BeginBlock Call sub_08064828 _0807EB44 0x0004 @@ -224,6 +227,7 @@ script_08011EF4: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011EE6 +SCRIPT_START script_08011F0C BeginBlock Call sub_08064928 _0807EB44 0x0004 @@ -272,6 +276,7 @@ script_08011F80: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011F72 +SCRIPT_START script_08011F98 BeginBlock Call sub_08064A28 _0807EB44 0x0004 @@ -320,6 +325,7 @@ script_0801200C: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011FFE +SCRIPT_START script_08012024 BeginBlock Call sub_08064828 _0807EB44 0x0004 @@ -366,6 +372,7 @@ script_0801209E: DoPostScriptAction 0x0001 Jump script_0801203A .2byte 0x0000 +SCRIPT_START script_080120B0 BeginBlock Call sub_08064928 _0807EB44 0x0004 @@ -412,6 +419,7 @@ script_0801212A: DoPostScriptAction 0x0001 Jump script_080120C6 .2byte 0x0000 +SCRIPT_START script_0801213C BeginBlock Call sub_08064A28 _0807EB44 0x0004 @@ -458,6 +466,7 @@ script_080121B6: DoPostScriptAction 0x0001 Jump script_08012152 .2byte 0x0000 +SCRIPT_START script_080121C8 BeginBlock Call sub_08064828 _0807EB44 0x0004 @@ -476,6 +485,7 @@ script_080121DE: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_080121DE +SCRIPT_START script_08012200 BeginBlock Call sub_08064928 _0807EB44 0x0004 @@ -494,6 +504,7 @@ script_08012216: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08012216 +SCRIPT_START script_08012238 BeginBlock Call sub_08064A28 _0807EB44 0x0004 @@ -512,6 +523,7 @@ script_0801224E: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0801224E +SCRIPT_START script_08012270 BeginBlock _0807EB44 0x0004 Call sub_08061FD8 @@ -566,7 +578,7 @@ script_080122EC: LoadRoomEntityList gUnk_080F2758 DoPostScriptAction 0x0008 Wait 0x003c - SoundReq 0x0072 + PlaySound SFX_SECRET SetLocalFlag 0x0043 Wait 0x001e _0807E878 diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 08b3dd09..cca78f35 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -19,6 +19,7 @@ script_08012338: script_0801235A: _0807E878 Jump script_08012338 +SCRIPT_START script_08012360 BeginBlock DoPostScriptAction 0x0008 EndBlock @@ -27,7 +28,7 @@ script_08012368: JumpIfNot script_08012368 Call sub_0807DF28 _0807E864 - SoundReq0x80100000 + StopBgm BeginBlock _0807E778 0x0004 _0807E788 0x00007fff @@ -35,13 +36,13 @@ script_08012368: _0807E858 0x0080 EndBlock WaitFor_2 - SoundReq2 0x002c + PlayBgm BGM_ELEMENTAL_SANCTUARY _0807EB28 0x1401 _0807EA94 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 - SoundReq 0x01ce + PlaySound SFX_ELEMENT_FLOAT SetEntity0x20 0xffff8000 Wait 0x003c _0807E8E4_0 @@ -49,7 +50,7 @@ script_08012368: WaitForSomething2 0x00000001 TextboxNoOverlap 0x1402 _0807EA94 - SoundReq0x80100000 + StopBgm SetEntity0x20 0x00010000 Wait 0x003c BeginBlock @@ -59,7 +60,7 @@ script_08012368: _0807E858 0x0080 EndBlock WaitFor_2 - SoundReq2 0xffff + PlayBGM _0807EB28 0x1403 _0807EA94 SetIntVariable 0x00000203 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 4827856a..28277936 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -24,13 +24,14 @@ script_08012474: _0807E930 0x0000 Jump script_08012440 .2byte 0x0000 +SCRIPT_START script_08012480 BeginBlock Call sub_08054564 EndBlock script_0801248A: CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 JumpIfNot script_0801248A - SoundReq0x80100000 + StopBgm _0807E864 Call sub_0807F9A4 Call sub_0807DF28 @@ -50,7 +51,7 @@ script_0801248A: _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 - SoundReq2 0x000e + PlayBgm BGM_EZLO_THEME _0807E5F8 0x00000010 WaitForSomething2 0x00000020 WaitForSomething2 0x00000100 @@ -61,7 +62,7 @@ script_0801248A: WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq0x80100000 + StopBgm _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 @@ -74,7 +75,7 @@ script_0801248A: WaitFor_2 Call sub_0807DF50 _0807E878 - SoundReq2 0xffff + PlayBGM script_08012566: CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 JumpIfNot script_08012566 @@ -82,7 +83,7 @@ script_08012566: Call sub_0807F9A4 Call sub_0807DF28 Call sub_0806DC7C - SoundReq0x80100000 + StopBgm StartPlayerScript script_08012AC8 WaitForSomething2 0x00000001 SetEntityPositionRelative 0x0388, 0x0168 @@ -91,7 +92,7 @@ script_08012566: Wait 0x005a _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq2 0x000e + PlayBgm BGM_EZLO_THEME _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807E5F8 0x00000040 @@ -104,8 +105,8 @@ script_08012566: WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq0x80100000 - SoundReq2 0x0033 + StopBgm + PlayBgm BGM_FIGHT_THEME2 Call sub_0807DF50 _0807E878 _0807E5F8 0x00000050 @@ -114,14 +115,14 @@ script_08012566: _0807E864 Call sub_0807FA40 Call sub_0807DF28 - SoundReq 0x0072 - SoundReq0x80100000 + PlaySound SFX_SECRET + StopBgm _0807E5F8 0x00000004 WaitForSomething2 0x00000008 StartPlayerScript script_08012AF0 WaitForSomething2 0x00000001 _0807E8E4_0 - SoundReq2 0x000e + PlayBgm BGM_EZLO_THEME Wait 0x001e _0807E5F8 0x00000004 WaitForSomething2 0x00000008 @@ -133,9 +134,9 @@ script_08012566: WaitForSomething2 0x00000008 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq0x80100000 + StopBgm Wait 0x003c - SoundReq2 0xffff + PlayBGM Call sub_0806DCA0 _0807F0B4 0x0004 CameraTargetPlayer @@ -147,9 +148,9 @@ script_08012566: WaitForSomething2 0x00000008 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq0x80100000 + StopBgm Wait 0x003c - SoundReq2 0xffff + PlayBGM Call sub_08054570 SetGlobalFlag 0x0014 CallWithArg sub_0807F6F8, 0x00000008 diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index 90957ad6..123e7ed8 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -214,7 +214,7 @@ script_08012A3E: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - SoundReq0x80100000 + StopBgm DoPostScriptAction 0x000b _0807EB8C Call sub_0806D944 @@ -232,7 +232,7 @@ script_08012A74: Call sub_0806D9A4 DoPostScriptAction 0x0008 Wait 0x0078 - SoundReq2 0x000e + PlayBgm BGM_EZLO_THEME BeginBlock _0807E8E4_2 _0807EB28 0x1112 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc index 30fa7e4c..033fc43f 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -15,7 +15,7 @@ script_08012C7E: SetGlobalFlag 0x0022 _0807E878 Jump script_08012C7E -script_08012C98: +SCRIPT_START script_08012C98 CheckGlobalFlag 0x0014 JumpIfNot script_08012C98 script_08012CA0: diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc index bf393c4d..257e134c 100644 --- a/data/scripts/script_08012E88.inc +++ b/data/scripts/script_08012E88.inc @@ -17,6 +17,7 @@ script_08012E9E: DoPostScriptAction 0x0000 Jump script_08012E9E .2byte 0x0000 +SCRIPT_START script_08012EC0 BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000008 diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index 2a5ea045..69c5f405 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -37,7 +37,7 @@ script_08013006: _0807E864 Call sub_0807DF28 EndBlock - SoundReq 0x00cd + PlaySound SFX_TASK_COMPLETE _0807F088 0x0038 WaitPlayerAction8 Wait 0x001e diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc index 8173e078..762ffc4e 100644 --- a/data/scripts/script_08013114.inc +++ b/data/scripts/script_08013114.inc @@ -31,6 +31,7 @@ script_08013176: Call sub_0807F420 _0807E878 Jump script_08013128 +SCRIPT_START script_08013188 BeginBlock CheckLocalFlag 0x0062 JumpIfNot script_0801319A diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 5d272cf2..4e7727b2 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0801319A MoveEntityToPlayer Call sub_0806AB74 Jump script_0801319A -script_080131AC: +SCRIPT_START script_080131AC CheckPlayerInRegion 0x0098, 0x0038, 0x2060 JumpIfNot script_080131AC _0807E864 @@ -37,7 +37,7 @@ script_080131AC: WaitForSomething2 0x00000010 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 - SoundReq2 0x000d + PlayBgm BGM_VAATI_THEME StartPlayerScript script_0801334C WaitForSomething2 0x00000002 _0807E5F8 0x00000020 @@ -53,7 +53,7 @@ script_080131AC: _0807E778 0x0004 DoFade5 WaitFor_2 - SoundReq0x80100000 + StopBgm _0807E858 0x0000 Wait 0x003c CameraTargetPlayer @@ -69,7 +69,7 @@ script_080131AC: _0807EB28 0x1605 _0807EA94 SetLocalFlag 0x0078 - SoundReq2 0x0031 + PlayBgm BGM_CASTLE_COLLAPSE SetGlobalFlag 0x005d Call sub_0807DF50 _0807E878 diff --git a/data/scripts/script_08013378.inc b/data/scripts/script_08013378.inc index e6a8ec58..3c2a52bf 100644 --- a/data/scripts/script_08013378.inc +++ b/data/scripts/script_08013378.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08013378 Call sub_0807F2D4 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - SoundReq 0x007c + PlaySound SFX_PLY_JUMP _0807EB44 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc index 1e720d3b..042cb44d 100644 --- a/data/scripts/script_080133F8.inc +++ b/data/scripts/script_080133F8.inc @@ -14,7 +14,7 @@ SCRIPT_START script_080133F8 WaitForSomething2 0x00000020 Wait 0x003c DoPostScriptAction 0x0014 - SoundReq 0x0120 + PlaySound SFX_CHARGING_UP CallWithArg sub_08095420, script_08013494 Wait 0x005a DoPostScriptAction 0x0016 diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc index d0722887..37b49953 100644 --- a/data/scripts/script_08013494.inc +++ b/data/scripts/script_08013494.inc @@ -10,7 +10,7 @@ SCRIPT_START script_08013494 _0807EDD4 0x0098, 0x0080 BeginBlock Call sub_08094B80 - SoundReq 0x01cc + PlaySound SFX_1CC Call sub_0807F36C _0807E5F8 0x00000080 EndBlock diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index 702550f2..9431e96d 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -14,22 +14,22 @@ script_080134F8: StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F04 - SoundReq 0x01cd + PlaySound SFX_ELEMENT_PLACE Wait 0x005a BeginBlock - SoundReq 0x01ce + PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E04 CallWithArg sub_08095D54, script_08013E28 EndBlock WaitForSomething2 0x18000000 BeginBlock - SoundReq 0x01cf + PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 EndBlock Wait 0x001e BeginBlock - SoundReq 0x01d0 + PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 EndBlock @@ -37,7 +37,7 @@ script_080134F8: CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 WaitForSomething2 0x00002000 - SoundReq 0x01d2 + PlaySound SFX_1D2 CallWithArg sub_08095D8C, script_080141DC CallWithArg sub_08095D8C, script_08014210 _0807E5F8 0x00000400 @@ -58,14 +58,14 @@ script_080134F8: Wait 0x003c _0807E778 0x0004 DoFade7 - SoundReq 0x00f6 + PlaySound SFX_EVAPORATE WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 DoFade6 WaitFor_2 - SoundReq 0x0109 + PlaySound SFX_109 TextboxNoOverlapFollowPos 0x0503, 0x000c _0807EA94 _0807E5F8 0x00040000 diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index e3ef357e..b7718584 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -14,22 +14,22 @@ script_0801373C: StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F34 - SoundReq 0x01cd + PlaySound SFX_ELEMENT_PLACE Wait 0x005a BeginBlock - SoundReq 0x01ce + PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E4C EndBlock WaitForSomething2 0x20000000 BeginBlock - SoundReq 0x01cf + PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 CallWithArg sub_08095D8C, script_08014094 EndBlock Wait 0x001e BeginBlock - SoundReq 0x01d0 + PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 CallWithArg sub_08095D8C, script_08014154 @@ -38,7 +38,7 @@ script_0801373C: CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 WaitForSomething2 0x00002000 - SoundReq 0x01d2 + PlaySound SFX_1D2 CallWithArg sub_08095D8C, script_080141DC CallWithArg sub_08095D8C, script_08014210 _0807E5F8 0x00000400 @@ -61,14 +61,14 @@ script_0801373C: Wait 0x003c _0807E778 0x0004 DoFade7 - SoundReq 0x00f6 + PlaySound SFX_EVAPORATE WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 DoFade6 WaitFor_2 - SoundReq 0x0109 + PlaySound SFX_109 TextboxNoOverlapFollowPos 0x0504, 0x000c _0807EA94 _0807E5F8 0x00040000 diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index 0d496673..9a63f5c8 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -14,15 +14,15 @@ script_080138D0: StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F64 - SoundReq 0x01cd + PlaySound SFX_ELEMENT_PLACE Wait 0x005a BeginBlock - SoundReq 0x01ce + PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E70 EndBlock WaitForSomething2 0x40000000 BeginBlock - SoundReq 0x01cf + PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 CallWithArg sub_08095D8C, script_08014094 @@ -30,7 +30,7 @@ script_080138D0: EndBlock Wait 0x001e BeginBlock - SoundReq 0x01d0 + PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 CallWithArg sub_08095D8C, script_08014154 @@ -40,7 +40,7 @@ script_080138D0: CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 WaitForSomething2 0x00002000 - SoundReq 0x01d2 + PlaySound SFX_1D2 CallWithArg sub_08095D8C, script_080141DC CallWithArg sub_08095D8C, script_08014210 _0807E5F8 0x00000400 @@ -66,14 +66,14 @@ script_080138D0: Wait 0x003c _0807E778 0x0004 DoFade7 - SoundReq 0x00f6 + PlaySound SFX_EVAPORATE WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 DoFade6 WaitFor_2 - SoundReq 0x0109 + PlaySound SFX_109 TextboxNoOverlapFollowPos 0x0505, 0x000c _0807EA94 _0807E5F8 0x00040000 diff --git a/data/scripts/script_08013B70.inc b/data/scripts/script_08013B70.inc index 76310119..15c75a3c 100644 --- a/data/scripts/script_08013B70.inc +++ b/data/scripts/script_08013B70.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08013B70 - SoundReq 0x01d3 + PlaySound SFX_1D3 CallWithArg sub_0807F238, 0x000008bf Call sub_08096028 Wait 0x003c diff --git a/data/scripts/script_08013BA8.inc b/data/scripts/script_08013BA8.inc index d171c4fb..dd34bd58 100644 --- a/data/scripts/script_08013BA8.inc +++ b/data/scripts/script_08013BA8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013BA8 CallWithArg sub_08095E7C, script_08014248 - SoundReq 0x01d3 + PlaySound SFX_1D3 CallWithArg sub_0807F238, 0x000008e3 Call sub_08096028 Wait 0x0078 diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc index a49ba76f..ea87d86b 100644 --- a/data/scripts/script_08013BE8.inc +++ b/data/scripts/script_08013BE8.inc @@ -14,7 +14,7 @@ SCRIPT_START script_08013BE8 DoPostScriptAction 0x0008 WaitForSomething2 0x00000004 _0807E908 0x0002 - SoundReq 0x0134 + PlaySound SFX_134 Jump script_08013C32 script_08013C2A: CheckLocalFlag 0x007c diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc index 025d0eb7..94e4b155 100644 --- a/data/scripts/script_08013D04.inc +++ b/data/scripts/script_08013D04.inc @@ -8,7 +8,7 @@ script_08013D1C: CheckEntityInteractType JumpIfNot script_08013D1C CallWithArg sub_08095D54, 0x00000000 - SoundReq 0x01cd + PlaySound SFX_ELEMENT_PLACE _0807E5F8 0x08000000 Call sub_080791BC DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc index 0dfb9d8c..fb8e239b 100644 --- a/data/scripts/script_08013D44.inc +++ b/data/scripts/script_08013D44.inc @@ -8,7 +8,7 @@ script_08013D5C: CheckEntityInteractType JumpIfNot script_08013D5C CallWithArg sub_08095D54, 0x00000001 - SoundReq 0x01cd + PlaySound SFX_ELEMENT_PLACE _0807E5F8 0x10000000 Call sub_080791BC DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc index b61269d4..30973797 100644 --- a/data/scripts/script_08013D84.inc +++ b/data/scripts/script_08013D84.inc @@ -8,7 +8,7 @@ script_08013D9C: CheckEntityInteractType JumpIfNot script_08013D9C CallWithArg sub_08095D54, 0x00000002 - SoundReq 0x01cd + PlaySound SFX_ELEMENT_PLACE _0807E5F8 0x20000000 Call sub_080791BC DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc index fa1c2572..620febcf 100644 --- a/data/scripts/script_08013DC4.inc +++ b/data/scripts/script_08013DC4.inc @@ -8,7 +8,7 @@ script_08013DDC: CheckEntityInteractType JumpIfNot script_08013DDC CallWithArg sub_08095D54, 0x00000003 - SoundReq 0x01cd + PlaySound SFX_ELEMENT_PLACE _0807E5F8 0x40000000 Call sub_080791BC DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index c49a5bc0..56ab6d41 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -8,6 +8,7 @@ script_08014264: CallWithArg sub_08095EAC, 0x00000001 Jump script_08014264 .2byte 0x0000 +SCRIPT_START script_08014274 BeginBlock DoPostScriptAction 0x0008 EndBlock diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index ad470edd..ce1cc804 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -39,7 +39,7 @@ script_080144C0: script_080144C8: ModRupees 0xfff6 TextboxNoOverlapFollow 0x420c - SoundReq 0x010c + PlaySound SFX_10C Wait 0x0018 SetRoomFlag 0x0000 SetLocalFlag 0x0092 diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc index 9965924d..1cd3510e 100644 --- a/data/scripts/script_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -15,6 +15,7 @@ SCRIPT_START script_0801450C Call sub_0807DF50 Jump script_080144FC .2byte 0x0000 +SCRIPT_START script_08014548 BeginBlock EndBlock script_0801454C: diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index 4bd860cd..0e32d77a 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -17,6 +17,7 @@ script_08014608: Call sub_0807DF50 _0807E878 Jump script_080145F8 +SCRIPT_START script_08014628 BeginBlock _0807E9D4 _0807EB44 0x0004 diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index 26b288d3..b5f500dd 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -65,6 +65,7 @@ script_080148D8: _0807E5F8 0x00000008 Jump script_0801488E .2byte 0x0000 +SCRIPT_START script_080148F0 BeginBlock EndBlock script_080148F4: diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc index 8dffa2f0..9cbae7ab 100644 --- a/data/scripts/script_08014958.inc +++ b/data/scripts/script_08014958.inc @@ -18,6 +18,7 @@ script_08014978: Wait 0x000f _0807E878 Jump script_08014978 +SCRIPT_START script_08014994 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc index 46812d26..18150975 100644 --- a/data/scripts/script_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -19,7 +19,7 @@ script_080149DE: DoPostScriptAction 0x000b DoPostScriptAction 0x0001 _0807EDD4 0x0068, 0x00f8 - SoundReq 0x0072 + PlaySound SFX_SECRET _0807EB74 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -27,6 +27,7 @@ script_08014A20: _0807E878 Jump script_080149DE .2byte 0x0000 +SCRIPT_START script_08014A28 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a @@ -42,6 +43,7 @@ script_08014A36: _0807E878 Jump script_08014A36 .2byte 0x0000 +SCRIPT_START script_08014A54 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index ff503803..753bfa0b 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -20,6 +20,7 @@ script_08014AAC: _0807E878 Jump script_08014AAC .2byte 0x0000 +SCRIPT_START script_08014AC4 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index 03c382c6..31ec68fd 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -41,7 +41,7 @@ script_08014B70: Call sub_0806CD3C Wait 0x0014 Call sub_0806CD4C - SoundReq 0x0072 + PlaySound SFX_SECRET _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 @@ -69,6 +69,7 @@ script_08014C22: Wait 0x000f _0807E878 Jump script_08014BF2 +SCRIPT_START script_08014C2C BeginBlock Call sub_0806CD58 DoPostScriptAction 0x000a @@ -103,6 +104,7 @@ script_08014C82: _0807EB44 0x0004 _0807E930 0x0006 Jump script_08014C42 +SCRIPT_START script_08014C94 BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index f6497d3c..1acf6e0c 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -16,6 +16,7 @@ script_08014E2C: _0807E878 Jump script_08014E2C .2byte 0x0000 +SCRIPT_START script_08014E50 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -51,6 +52,7 @@ script_08014EBC: _0807E878 Jump script_08014E64 .2byte 0x0000 +SCRIPT_START script_08014ECC BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -67,6 +69,7 @@ script_08014EE0: _0807E878 Jump script_08014EE0 .2byte 0x0000 +SCRIPT_START script_08014EF8 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -86,6 +89,7 @@ script_08014F0C: _0807E930 0x000a Jump script_08014F0C .2byte 0x0000 +SCRIPT_START script_08014F30 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -128,6 +132,7 @@ script_08014FA6: _0807EB44 0x0004 _0807E930 0x000e Jump script_08014F4A +SCRIPT_START script_08014FBC BeginBlock SetEntityPositionRelative 0x01f8, 0x00e0 Call sub_08054564 @@ -138,7 +143,7 @@ script_08014FCC: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - SoundReq0x80100000 + StopBgm _0807F0B4 0x0001 CameraTargetEntity StartPlayerScript script_080152B4 @@ -151,7 +156,7 @@ script_08014FCC: WaitForSomething2 0x00000004 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - SoundReq2 0x000d + PlayBgm BGM_VAATI_THEME _0807EB28 0x1302 _0807EA94 TextboxNoOverlapFollowPos 0x1303, 0x0002 @@ -164,7 +169,7 @@ script_08014FCC: WaitForSomething2 0x00000004 _0807EB28 0x1306 _0807EA94 - SoundReq0x80100000 + StopBgm StartPlayerScript script_080152DC CameraTargetEntity _0807F0B4 0x0003 @@ -173,31 +178,31 @@ script_08014FCC: Call sub_0804F6A8 Wait 0x0004 Call sub_0804F808 - SoundReq 0x010b + PlaySound SFX_10B StartPlayerScript script_08015304 Call sub_0804F6C8 Wait 0x0004 Call sub_0804F830 - SoundReq 0x010b + PlaySound SFX_10B Call sub_0804F6E8 Wait 0x0004 Call sub_0804F854 - SoundReq 0x010b + PlaySound SFX_10B Call sub_0804F724 Wait 0x0004 Call sub_0804F89C - SoundReq 0x010b + PlaySound SFX_10B Call sub_0804F760 Wait 0x0004 Call sub_0804F8E0 - SoundReq 0x010b + PlaySound SFX_10B Wait 0x003c WaitForSomething2 0x00000001 - SoundReq 0x01b0 + PlaySound SFX_1B0 Call sub_0804F79C Wait 0x000a LoadRoomEntityList gUnk_080F7FC0 - SoundReq2 0x002d + PlayBgm BGM_FIGHT_THEME Call sub_0807DF50 _0807E878 script_08015104: @@ -206,32 +211,32 @@ script_08015104: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - SoundReq0x80100000 + StopBgm StartPlayerScript script_08015338 WaitForSomething2 0x00000001 Wait 0x003c Call sub_0804F6A8 Wait 0x0004 Call sub_0804F928 - SoundReq 0x010b + PlaySound SFX_10B Call sub_0804F6C8 Wait 0x0004 Call sub_0804F944 - SoundReq 0x010b + PlaySound SFX_10B Call sub_0804F6E8 Wait 0x0004 Call sub_0804F960 - SoundReq 0x010b + PlaySound SFX_10B Call sub_0804F724 Wait 0x0004 Call sub_0804F994 - SoundReq 0x010b + PlaySound SFX_10B Call sub_0804F760 Wait 0x0004 Call sub_0804F9C8 - SoundReq 0x010b + PlaySound SFX_10B Wait 0x003c - SoundReq 0x0072 + PlaySound SFX_SECRET _0807F0B4 0x0004 CameraTargetPlayer SetLocalFlag 0x008c @@ -268,7 +273,7 @@ script_08015104: _0807F0B4 0x0004 CameraTargetPlayer Call sub_08054570 - SoundReq2 0xffff + PlayBGM Call sub_0807DF50 _0807E878 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc index 600e376d..fa102af2 100644 --- a/data/scripts/script_08015234.inc +++ b/data/scripts/script_08015234.inc @@ -19,7 +19,7 @@ SCRIPT_START script_08015234 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - SoundReq 0x00f5 + PlaySound SFX_F5 DoPostScriptAction 0x001f SetEntitySpeed 0x0200 DoPostScriptAction 0x000d diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index 4d1bc1ee..4b6215c6 100644 --- a/data/scripts/script_080153EC.inc +++ b/data/scripts/script_080153EC.inc @@ -4,7 +4,7 @@ SCRIPT_START script_080153EC SetEntityPositionRelative 0x0078, 0x0068 CameraTargetEntity EndBlock - SoundReq2 0x002a + PlayBgm BGM_EZLO_STORY _0807E778 0x0004 DoFade4 WaitFor_2 diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index 5b27435f..4c3abbd4 100644 --- a/data/scripts/script_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801548E _0807E5F8 0x00000800 WaitForSomething2 0x00001000 - SoundReq 0x0125 + PlaySound SFX_125 CallWithArg sub_0807FB28, 0x00000003 _0807E5F8 0x00048000 WaitForSomething2 0x00090000 @@ -17,7 +17,7 @@ SCRIPT_START script_0801548E _0807EA94 _0807E5F8 0x00000800 WaitForSomething2 0x00001000 - SoundReq0x80100000 + StopBgm _0807E778 0x0004 DoFade5 WaitFor_2 diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index 60940bdc..31767026 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -23,10 +23,10 @@ SCRIPT_START script_0801550C CallWithArg sub_0806AF60, 0x00000000 DoPostScriptAction 0x0010 Wait 0x0028 - SoundReq 0x0125 + PlaySound SFX_125 CallWithArg sub_0807FB28, 0x00000003 Wait 0x000a - SoundReq 0x0125 + PlaySound SFX_125 CallWithArg sub_0807FB28, 0x00000003 Wait 0x000a DoPostScriptAction 0x0010 diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc index 8c4ca549..9d917502 100644 --- a/data/scripts/script_08015684.inc +++ b/data/scripts/script_08015684.inc @@ -30,7 +30,7 @@ SCRIPT_START script_08015684 _0807EB44 0x0004 DoPostScriptAction 0x0014 CallWithArg sub_0809545C, script_08015754 - SoundReq 0x01c4 + PlaySound SFX_1C4 Wait 0x0078 DoPostScriptAction 0x0016 WaitForSomething2 0x00020000 diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc index 4dbe2747..e7543e12 100644 --- a/data/scripts/script_08015754.inc +++ b/data/scripts/script_08015754.inc @@ -5,10 +5,10 @@ SCRIPT_START script_08015754 Call sub_08094B80 EndBlock Wait 0x0078 - SoundReq 0x01c5 + PlaySound SFX_1C5 Call sub_08094B6C _0807EDD4 0x0078, 0x00b8 - SoundReq 0x01c6 + PlaySound SFX_1C6 Call sub_08094B80 _0807E5F8 0x00020000 SetEntitySpeed 0x0080 diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 362d76c9..4af73e8a 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -28,7 +28,7 @@ SCRIPT_START script_08015958 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 Call sub_0807F3C8 - SoundReq 0x0096 + PlaySound SFX_VO_ZELDA3 SetEntitySpeed 0x0200 _0807ECC4 0x0008 _0807E930 0x0040 diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc index f2de00b5..fd4dfb84 100644 --- a/data/scripts/script_08015AC4.inc +++ b/data/scripts/script_08015AC4.inc @@ -14,7 +14,7 @@ SCRIPT_START script_08015AC4 DoPostScriptAction 0x0000 WaitForSomething2 0x00000008 Wait 0x003c - SoundReq 0x0072 + PlaySound SFX_SECRET Call sub_08046078 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc index afbdefbc..091c95fc 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -15,7 +15,7 @@ script_08015BF0: _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 - SoundReq0x80100000 + StopBgm Call sub_08053BE8 BeginBlock _0807E864 @@ -28,7 +28,7 @@ script_08015BF0: _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 - SoundReq2 0xffff + PlayBGM _0807EB28 0x131f _0807EA94 SetLocalFlag 0x009c diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc index 118b74bc..c565c3e9 100644 --- a/data/scripts/script_08015CD4.inc +++ b/data/scripts/script_08015CD4.inc @@ -12,7 +12,7 @@ SCRIPT_START script_08015CD4 SetEntityPositionRelative 0x0088, 0x00e0 CameraTargetEntity Wait 0x003c - SoundReq2 0x000d + PlayBgm BGM_VAATI_THEME _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807F0B4 0x0004 @@ -42,12 +42,12 @@ SCRIPT_START script_08015CD4 WaitFor_2 _0807E5F8 0x00000010 LoadRoomEntityList gUnk_080FCE30 - SoundReq0x80100000 + StopBgm Wait 0x0078 _0807E778 0x0004 DoFade4 WaitFor_2 - SoundReq2 0x0034 + PlayBgm BGM_DIGGING_CAVE _0807E5F8 0x00000040 WaitForSomething2 0x00000080 _0807E5F8 0x00000001 @@ -61,7 +61,7 @@ SCRIPT_START script_08015CD4 _0807E778 0x0004 DoFade5 WaitFor_2 - SoundReq0x80100000 + StopBgm SetRoomFlag 0x0000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc index 7bcdb876..9a93f3b9 100644 --- a/data/scripts/script_08016004.inc +++ b/data/scripts/script_08016004.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08016004 _0807E5F8 0x00000003 WaitForSomething2 0x0000000c _0807F0C8 0x0000, 0x0000 - SoundReq 0x0072 + PlaySound SFX_SECRET _0807EB28 0x0b1f _0807EA94 Call sub_0807DF50 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index bcd54937..91d91fa6 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -51,6 +51,7 @@ script_08016132: _0807E878 _0807EB44 0x0004 Jump script_080160B0 +SCRIPT_START script_0801613C BeginBlock Call sub_080787B4 EndBlock @@ -77,6 +78,7 @@ script_08016184: script_0801618A: _0807E878 Jump script_08016146 +SCRIPT_START script_08016190 BeginBlock Call sub_080787B4 EndBlock @@ -105,6 +107,7 @@ script_080161D8: script_080161E2: _0807E878 Jump script_0801619A +SCRIPT_START script_080161E8 BeginBlock Call sub_0807F348 DoPostScriptAction 0x000a @@ -179,10 +182,10 @@ script_080162F6: Call sub_0807F594 Call sub_0807DF28 _0807E864 - SoundReq0x80100000 - SoundReq 0x00cd + StopBgm + PlaySound SFX_TASK_COMPLETE Wait 0x003c - SoundReq2 0x005e + PlayBgm BGM_LEARN_SCROLL Call sub_08068F3C script_0801631C: Call sub_08068E30 diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index b55e1150..9ca8e7f6 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -60,10 +60,10 @@ SCRIPT_START script_08016482 _0807EEF4 0xfff0, 0x0014 DoPostScriptAction 0x0000 DoPostScriptAction2 0x0001 - SoundReq 0x0074 - SoundReq2 0x001d - SoundReq3 0x00000074 - SoundReq0x80100000 + PlaySound SFX_METAL_CLINK + PlayBgm BGM_MINISH_WOODS + SoundReq 0x00000074 + StopBgm ModRupees 0xff38 ModHealth 0x0010 IncreaseMaxHealth diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index 58a4c806..ac2b01c1 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -209,6 +209,7 @@ script_080168E6: Wait 0x000f _0807E878 Jump script_080168E6 +SCRIPT_START script_080168F4 BeginBlock Call sub_08064EA4 _0807EB44 0x0004 |