diff options
Diffstat (limited to 'data/scripts')
24 files changed, 37 insertions, 37 deletions
diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc index 95fac91b..80b3c50f 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/data/scripts/script_0800A0FC.inc @@ -6,7 +6,7 @@ script_0800A0FE: BeginBlock _0807E864 Call sub_0807DF28 - SoundReq0x80100000 + StopBgm Call sub_0807FBFC SetEntityPositionRelative 0x00b0, 0x0058 Call sub_0807F844 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index c5e46d75..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 diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc index 03b12d66..fb45912a 100644 --- a/data/scripts/script_0800AD54.inc +++ b/data/scripts/script_0800AD54.inc @@ -45,7 +45,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_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 0c51b534..f6fc9214 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -51,7 +51,7 @@ script_0800BA46: _0807EA94 _0807E3E8 JumpIfNot script_0800BA6C - SoundReq0x80100000 + StopBgm Call sub_0806E964 PlayBGM script_0800BA6C: 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_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index 7f7db9f6..7ac06b7e 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -14,7 +14,7 @@ script_0800DCD0: DoPostScriptAction 0x0010 SetEntityPositionRelative 0x0078, 0x0068 WaitForSomething2 0x00000001 - SoundReq0x80100000 + StopBgm Call sub_08066E50 PlaySound SFX_1C9 Call sub_0807F2D4 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index ec233b1c..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 diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc index ab607bb6..e3de08af 100644 --- a/data/scripts/script_0800DFB4.inc +++ b/data/scripts/script_0800DFB4.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800DFB4 script_0800DFB6: CheckRoomFlag 0x0001 JumpIfNot script_0800DFB6 - SoundReq0x80100000 + StopBgm _0807E864 Call sub_0807DF28 PlaySound SFX_EVAPORATE diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index 9c5fb927..46080434 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800DFE4 Call sub_0807DF28 _0807E864 EndBlock - SoundReq0x80100000 + StopBgm TextboxNoOverlapFollowPos 0x1632, 0x0002 _0807EA94 SetRoomFlag 0x0003 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_080100C8.inc b/data/scripts/script_080100C8.inc index 23a9d13e..b136cbde 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -80,7 +80,7 @@ script_080101AC: Call sub_0807DF28 TextboxNoOverlapFollowPos 0x3004, 0x0007 _0807EA94 - SoundReq0x80100000 + StopBgm _0807E778 0x0004 DoFade5 WaitFor_2 diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index cb38dd26..2caa5a7f 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -33,7 +33,7 @@ script_08010BCA: WaitForSomething2 0x00000020 TextboxNoOverlapFollowPos 0x1038, 0x000c _0807EA94 - SoundReq0x80100000 + StopBgm _0807E778 0x0004 DoFade5 WaitFor_2 @@ -95,7 +95,7 @@ script_08010BCA: Wait 0x003c WaitForSomething2 0x00000200 _0807E5F8 0x00280000 - SoundReq0x80100000 + StopBgm PlaySound SFX_9B _0807E5F8 0x00000100 WaitForSomething2 0x00000200 @@ -118,7 +118,7 @@ script_08010BCA: TextboxNoOverlapFollowPos 0x1044, 0x0000 _0807EA94 SetEntityPositionRelative 0x01f8, 0x0098 - SoundReq0x80100000 + StopBgm Wait 0x003c PlayBgm BGM_VAATI_REBORN _0807E5F8 0x00028000 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index 0b534de1..d10ec983 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -26,7 +26,7 @@ SCRIPT_START script_08010F84 _0807F0C8 0x0000, 0x0000 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - SoundReq0x80100000 + StopBgm Wait 0x003c TextboxNoOverlapFollowPos 0x104a, 0x0000 _0807EA94 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 28efb83c..4c2d3a58 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -60,7 +60,7 @@ script_08011BBC: script_08011C04: CheckRoomFlag 0x0064 JumpIfNot script_08011C04 - SoundReq0x80100000 + StopBgm _0807E864 Wait 0x003c CameraTargetEntity diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index ac4e25d5..51bdb1e9 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -27,7 +27,7 @@ script_08012368: JumpIfNot script_08012368 Call sub_0807DF28 _0807E864 - SoundReq0x80100000 + StopBgm BeginBlock _0807E778 0x0004 _0807E788 0x00007fff @@ -49,7 +49,7 @@ script_08012368: WaitForSomething2 0x00000001 TextboxNoOverlap 0x1402 _0807EA94 - SoundReq0x80100000 + StopBgm SetEntity0x20 0x00010000 Wait 0x003c BeginBlock diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 03bfdd21..9a96deb9 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -30,7 +30,7 @@ script_08012474: script_0801248A: CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 JumpIfNot script_0801248A - SoundReq0x80100000 + StopBgm _0807E864 Call sub_0807F9A4 Call sub_0807DF28 @@ -61,7 +61,7 @@ script_0801248A: WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq0x80100000 + StopBgm _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 @@ -82,7 +82,7 @@ script_08012566: Call sub_0807F9A4 Call sub_0807DF28 Call sub_0806DC7C - SoundReq0x80100000 + StopBgm StartPlayerScript script_08012AC8 WaitForSomething2 0x00000001 SetEntityPositionRelative 0x0388, 0x0168 @@ -104,7 +104,7 @@ script_08012566: WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq0x80100000 + StopBgm PlayBgm BGM_FIGHT_THEME2 Call sub_0807DF50 _0807E878 @@ -115,7 +115,7 @@ script_08012566: Call sub_0807FA40 Call sub_0807DF28 PlaySound SFX_SECRET - SoundReq0x80100000 + StopBgm _0807E5F8 0x00000004 WaitForSomething2 0x00000008 StartPlayerScript script_08012AF0 @@ -133,7 +133,7 @@ script_08012566: WaitForSomething2 0x00000008 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq0x80100000 + StopBgm Wait 0x003c PlayBGM Call sub_0806DCA0 @@ -147,7 +147,7 @@ script_08012566: WaitForSomething2 0x00000008 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - SoundReq0x80100000 + StopBgm Wait 0x003c PlayBGM Call sub_08054570 diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index 930acbc1..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 diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 65a5b20e..95f13185 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -53,7 +53,7 @@ script_080131AC: _0807E778 0x0004 DoFade5 WaitFor_2 - SoundReq0x80100000 + StopBgm _0807E858 0x0000 Wait 0x003c CameraTargetPlayer diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 7f06d9c2..ce05736b 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -138,7 +138,7 @@ script_08014FCC: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - SoundReq0x80100000 + StopBgm _0807F0B4 0x0001 CameraTargetEntity StartPlayerScript script_080152B4 @@ -164,7 +164,7 @@ script_08014FCC: WaitForSomething2 0x00000004 _0807EB28 0x1306 _0807EA94 - SoundReq0x80100000 + StopBgm StartPlayerScript script_080152DC CameraTargetEntity _0807F0B4 0x0003 @@ -206,7 +206,7 @@ script_08015104: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - SoundReq0x80100000 + StopBgm StartPlayerScript script_08015338 WaitForSomething2 0x00000001 Wait 0x003c diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index 8a97209e..4c3abbd4 100644 --- a/data/scripts/script_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -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_08015BE8.inc b/data/scripts/script_08015BE8.inc index 7e551f52..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 diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc index 15699b72..c565c3e9 100644 --- a/data/scripts/script_08015CD4.inc +++ b/data/scripts/script_08015CD4.inc @@ -42,7 +42,7 @@ SCRIPT_START script_08015CD4 WaitFor_2 _0807E5F8 0x00000010 LoadRoomEntityList gUnk_080FCE30 - SoundReq0x80100000 + StopBgm Wait 0x0078 _0807E778 0x0004 DoFade4 @@ -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_080160A8.inc b/data/scripts/script_080160A8.inc index d46b5f74..95381b9a 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -179,7 +179,7 @@ script_080162F6: Call sub_0807F594 Call sub_0807DF28 _0807E864 - SoundReq0x80100000 + StopBgm PlaySound SFX_TASK_COMPLETE Wait 0x003c PlayBgm BGM_LEARN_SCROLL diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index df0eea91..9ca8e7f6 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -63,7 +63,7 @@ SCRIPT_START script_08016482 PlaySound SFX_METAL_CLINK PlayBgm BGM_MINISH_WOODS SoundReq 0x00000074 - SoundReq0x80100000 + StopBgm ModRupees 0xff38 ModHealth 0x0010 IncreaseMaxHealth |