summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/celadongamecorner.asm4
-rwxr-xr-xscripts/cinnabargym.asm2
-rwxr-xr-xscripts/daycarem.asm2
-rwxr-xr-xscripts/lance.asm2
-rwxr-xr-xscripts/mansion1.asm2
-rwxr-xr-xscripts/mansion2.asm2
-rwxr-xr-xscripts/museum1f.asm2
-rwxr-xr-xscripts/rockethideout1.asm2
-rwxr-xr-xscripts/rockethideout2.asm2
-rwxr-xr-xscripts/rockethideout3.asm2
-rwxr-xr-xscripts/rockethideout4.asm2
-rwxr-xr-xscripts/route22gate.asm2
-rwxr-xr-xscripts/route23.asm2
-rwxr-xr-xscripts/vermiliondock.asm4
-rwxr-xr-xscripts/vermiliongym.asm2
-rwxr-xr-xscripts/viridiangym.asm2
16 files changed, 18 insertions, 18 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm
index 519c0c67..53e55872 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -454,7 +454,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd)
ld hl, CeladonGameCornerText_48f09
call PrintText
call WaitForSoundToFinish
- ld a, (SFX_02_57 - SFX_Headers_02) / 3
+ ld a, SFX_GO_INSIDE
call PlaySound
call WaitForSoundToFinish
ld hl, wd77e
@@ -468,7 +468,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd)
CeladonGameCornerText_48f09: ; 48f09 (12:4f09)
TX_FAR _CeladonGameCornerText_48f09
TX_ASM
- ld a, (SFX_02_49 - SFX_Headers_02) / 3
+ ld a, SFX_SWITCH
call PlaySound
call WaitForSoundToFinish
jp TextScriptEnd
diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm
index dbede0d3..9b308bd3 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -106,7 +106,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6)
and a
jr nz, .asm_7581b
call WaitForSoundToFinish
- ld a, (SFX_02_57 - SFX_Headers_02) / 3
+ ld a, SFX_GO_INSIDE
call PlaySound
call WaitForSoundToFinish
.asm_7581b
diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm
index 330f2234..a9798f19 100755
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@@ -156,7 +156,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld de, wPlayerMoney + 2
ld c, $3
predef SubBCDPredef
- ld a, (SFX_02_5a - SFX_Headers_02) / 3
+ ld a, SFX_PURCHASE
call PlaySoundWaitForCurrent
ld a, MONEY_BOX
ld [wTextBoxID], a
diff --git a/scripts/lance.asm b/scripts/lance.asm
index e335914b..f5095a69 100755
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -75,7 +75,7 @@ LanceScript0: ; 5a305 (16:6305)
ret nz
ld hl, wd126
set 5, [hl]
- ld a, (SFX_02_57 - SFX_Headers_02) / 3
+ ld a, SFX_GO_INSIDE
call PlaySound
jp LanceScript_5a2c4
diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm
index 6673e03b..a9e2616a 100755
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -111,7 +111,7 @@ Mansion1Text4: ; 4435a (11:435a)
set 5, [hl]
ld hl, MansionSwitchPressedText
call PrintText
- ld a, (SFX_02_57 - SFX_Headers_02) / 3
+ ld a, SFX_GO_INSIDE
call PlaySound
ld hl, wd796
bit 0, [hl]
diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm
index 27ccbdfb..1cacae02 100755
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -117,7 +117,7 @@ Mansion2Text5: ; 52087 (14:6087)
set 5, [hl]
ld hl, Mansion2Text_520c7
call PrintText
- ld a, (SFX_02_57 - SFX_Headers_02) / 3
+ ld a, SFX_GO_INSIDE
call PlaySound
ld hl, wd796
bit 0, [hl]
diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm
index 38c3f717..f41f05ff 100755
--- a/scripts/museum1f.asm
+++ b/scripts/museum1f.asm
@@ -107,7 +107,7 @@ Museum1FText1: ; 5c135 (17:4135)
ld a, MONEY_BOX
ld [wTextBoxID], a
call DisplayTextBoxID
- ld a, (SFX_02_5a - SFX_Headers_02) / 3
+ ld a, SFX_PURCHASE
call PlaySoundWaitForCurrent
call WaitForSoundToFinish
jr .asm_0b094
diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm
index 967ab77b..b798744d 100755
--- a/scripts/rockethideout1.asm
+++ b/scripts/rockethideout1.asm
@@ -21,7 +21,7 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0)
ld a, $54
jr .asm_44c03
.asm_44bf7
- ld a, (SFX_02_57 - SFX_Headers_02) / 3
+ ld a, SFX_GO_INSIDE
call PlaySound
ld hl, wd815
bit 7, [hl]
diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm
index c2184bdb..ead69458 100755
--- a/scripts/rockethideout2.asm
+++ b/scripts/rockethideout2.asm
@@ -25,7 +25,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42)
ld hl, wd736
set 7, [hl]
call StartSimulatingJoypadStates
- ld a, (SFX_02_52 - SFX_Headers_02) / 3
+ ld a, SFX_ARROW_TILES
call PlaySound
ld a, $ff
ld [wJoyIgnore], a
diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm
index b025acd0..2060c26c 100755
--- a/scripts/rockethideout3.asm
+++ b/scripts/rockethideout3.asm
@@ -25,7 +25,7 @@ RocketHideout3Script0: ; 45240 (11:5240)
ld hl, wd736
set 7, [hl]
call StartSimulatingJoypadStates
- ld a, (SFX_02_52 - SFX_Headers_02) / 3
+ ld a, SFX_ARROW_TILES
call PlaySound
ld a, $ff
ld [wJoyIgnore], a
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm
index 635c6095..44536279 100755
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -22,7 +22,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473)
ld a, $2d
jr .asm_45498
.asm_4548c
- ld a, (SFX_02_57 - SFX_Headers_02) / 3
+ ld a, SFX_GO_INSIDE
call PlaySound
ld hl, wd81b
set 5, [hl]
diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm
index 8b24c820..95546a99 100755
--- a/scripts/route22gate.asm
+++ b/scripts/route22gate.asm
@@ -77,7 +77,7 @@ Route22GateText1: ; 1e6e1 (7:66e1)
Route22GateText_1e704: ; 1e704 (7:6704)
TX_FAR _Route22GateText_1e704
TX_ASM
- ld a, (SFX_02_51 - SFX_Headers_02) / 3
+ ld a, SFX_DENIED
call PlaySoundWaitForCurrent
call WaitForSoundToFinish
ld hl, Route22GateText_1e715
diff --git a/scripts/route23.asm b/scripts/route23.asm
index eeaf2a2b..a258b88a 100755
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -224,7 +224,7 @@ Route23Script_51388: ; 51388 (14:5388)
VictoryRoadGuardText1: ; 5138e (14:538e)
TX_FAR _VictoryRoadGuardText1
TX_ASM
- ld a, (SFX_02_51 - SFX_Headers_02) / 3
+ ld a, SFX_DENIED
call PlaySoundWaitForCurrent
call WaitForSoundToFinish
jp TextScriptEnd
diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm
index a8cf3b8d..c65c7aea 100755
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@@ -72,7 +72,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
ld b, [hl]
push bc
push hl
- ld a, (SFX_02_54 - SFX_Headers_02) / 3
+ ld a, SFX_SS_ANNE_HORN
call PlaySoundWaitForCurrent
ld a, $ff
ld [wUpdateSpritesEnabled], a
@@ -193,7 +193,7 @@ VermilionDock_1dc94: ; 1dc94 (7:5c94)
ld [hli], a
ld [hli], a
ld [hl], a
- ld a, (SFX_02_54 - SFX_Headers_02) / 3
+ ld a, SFX_SS_ANNE_HORN
call PlaySound
ld c, 120
call DelayFrames
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index 193b3a06..614e0b4d 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -34,7 +34,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
ld a, $24
jr .asm_5ca7f
.asm_5ca78
- ld a, (SFX_02_57 - SFX_Headers_02) / 3
+ ld a, SFX_GO_INSIDE
call PlaySound
ld a, $5
.asm_5ca7f
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm
index 9a0ce855..7a577095 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -41,7 +41,7 @@ ViridianGymScript0: ; 748eb (1d:48eb)
call StartSimulatingJoypadStates
ld hl, wd736
set 7, [hl]
- ld a, (SFX_02_52 - SFX_Headers_02) / 3
+ ld a, SFX_ARROW_TILES
call PlaySound
ld a, $ff
ld [wJoyIgnore], a
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 03:36:10 +0000