Name sound effects

This commit is contained in:
dannye 2015-07-19 03:46:12 -05:00
parent 340230e997
commit ea9cc86949
56 changed files with 487 additions and 311 deletions

View file

@ -674,10 +674,10 @@ PlayMapChangeSound:: ; 08c9 (0:08c9)
aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on
cp a,$0b ; door tile in tileset 0
jr nz,.didNotGoThroughDoor
ld a,(SFX_02_57 - SFX_Headers_02) / 3
ld a,SFX_GO_INSIDE
jr .playSound
.didNotGoThroughDoor
ld a,(SFX_02_5c - SFX_Headers_02) / 3
ld a,SFX_GO_OUTSIDE
.playSound
call PlaySound
ld a,[wMapPalOffset]
@ -1227,9 +1227,9 @@ CollisionCheckOnLand:: ; 0bd1 (0:0bd1)
jr nc,.noCollision
.collision
ld a,[wc02a]
cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing
cp a,SFX_COLLISION ; check if collision sound is already playing
jr z,.setCarry
ld a,(SFX_02_5b - SFX_Headers_02) / 3
ld a,SFX_COLLISION
call PlaySound ; play collision sound (if it's not already playing)
.setCarry
scf
@ -1930,9 +1930,9 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7)
jr .loop
.collision
ld a,[wc02a]
cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing
cp a,SFX_COLLISION ; check if collision sound is already playing
jr z,.setCarry
ld a,(SFX_02_5b - SFX_Headers_02) / 3
ld a,SFX_COLLISION
call PlaySound ; play collision sound (if it's not already playing)
.setCarry
scf

View file

@ -626,13 +626,13 @@ TextCommand0B:: ; 1c31 (0:1c31)
; format: text command ID, sound ID or cry ID
TextCommandSounds:: ; 1c64 (0:1c64)
db $0B,(SFX_02_3a - SFX_Headers_02) / 3
db $12,(SFX_08_46 - SFX_Headers_08) / 3
db $0E,(SFX_02_41 - SFX_Headers_02) / 3
db $0F,(SFX_02_3a - SFX_Headers_02) / 3
db $10,(SFX_02_3b - SFX_Headers_02) / 3
db $11,(SFX_02_42 - SFX_Headers_02) / 3
db $13,(SFX_08_45 - SFX_Headers_08) / 3
db $0B,SFX_GET_ITEM_1
db $12,SFX_BATTLE_06
db $0E,SFX_POKEDEX_RATING
db $0F,SFX_GET_ITEM_1
db $10,SFX_GET_ITEM_2
db $11,SFX_GET_KEY_ITEM
db $13,SFX_BATTLE_05
db $14,NIDORINA ; used in OakSpeech
db $15,PIDGEOT ; used in SaffronCityText12
db $16,DEWGONG ; unused?