Leahnaya/poketcg
1
0
Fork 0
mirror of https://github.com/pret/poketcg.git synced 2026-04-25 15:42:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update sfx 08, 56 and 5D labels

Browse Source
This commit is contained in:
FrenchOrange 2024-05-11 22:00:58 +02:00
parent 151c9b69ed
commit 96ac8094e9
12 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/audio/sfx.asm
View File

@ -505,7 +505,7 @@ INCLUDE "audio/sfx/sfx_denied.asm"
INCLUDE "audio/sfx/sfx_unused_05.asm"
INCLUDE "audio/sfx/sfx_unused_06.asm"
INCLUDE "audio/sfx/sfx_card_shuffle.asm"
INCLUDE "audio/sfx/sfx_placing_prizes.asm"
INCLUDE "audio/sfx/sfx_place_prize.asm"
INCLUDE "audio/sfx/sfx_unused_09.asm"
INCLUDE "audio/sfx/sfx_unused_0a.asm"
INCLUDE "audio/sfx/sfx_coin_toss.asm"
@ -583,13 +583,13 @@ INCLUDE "audio/sfx/sfx_thunderpunch.asm"
INCLUDE "audio/sfx/sfx_fire_punch.asm"
INCLUDE "audio/sfx/sfx_coin_toss_heads.asm"
INCLUDE "audio/sfx/sfx_coin_toss_tails.asm"
INCLUDE "audio/sfx/sfx_saved_game.asm"
INCLUDE "audio/sfx/sfx_save_game.asm"
INCLUDE "audio/sfx/sfx_player_walk_map.asm"
INCLUDE "audio/sfx/sfx_intro_orb.asm"
INCLUDE "audio/sfx/sfx_intro_orb_swoop.asm"
INCLUDE "audio/sfx/sfx_intro_orb_title.asm"
INCLUDE "audio/sfx/sfx_intro_orb_scatter.asm"
INCLUDE "audio/sfx/sfx_firegiver_start.asm"
INCLUDE "audio/sfx/sfx_card_pop_received.asm"
INCLUDE "audio/sfx/sfx_receive_card_pop.asm"
INCLUDE "audio/sfx/sfx_pokemon_evolution.asm"
INCLUDE "audio/sfx/sfx_unused_5f.asm"

2
src/audio/sfx/sfx_placing_prizes.asm → src/audio/sfx/sfx_place_prize.asm
View File

@ -1,4 +1,4 @@
Sfx_PlacingPrizes_Ch1:
Sfx_PlacePrize_Ch1:
sfx_8 17
sfx_1 224
sfx_0 0, 64

6
src/audio/sfx/sfx_card_pop_received.asm → src/audio/sfx/sfx_receive_card_pop.asm
View File

@ -1,4 +1,4 @@
Sfx_CardPopReceived_Ch1:
Sfx_ReceiveCardPop_Ch1:
sfx_1 0
sfx_5 0
sfx_6 6
@ -70,7 +70,7 @@ Sfx_CardPopReceived_Ch1:
sfx_6 1
sfx_end
Sfx_CardPopReceived_Ch2:
Sfx_ReceiveCardPop_Ch2:
sfx_1 196
sfx_8 17
sfx_2 8
@ -101,7 +101,7 @@ Sfx_CardPopReceived_Ch2:
sfx_0 6, 246
sfx_end
Sfx_CardPopReceived_Ch3:
Sfx_ReceiveCardPop_Ch3:
sfx_1 119
sfx_8 17
sfx_0 0, 17

2
src/audio/sfx/sfx_saved_game.asm → src/audio/sfx/sfx_save_game.asm
View File

@ -1,4 +1,4 @@
Sfx_SavedGame_Ch1:
Sfx_SaveGame_Ch1:
sfx_1 247
sfx_8 17
sfx_2 0

22
src/audio/sfx_headers.asm
View File

@ -11,7 +11,7 @@ SFXHeaderPointers:
dw Sfx_Unused05
dw Sfx_Unused06
dw Sfx_CardShuffle
dw Sfx_PlacingPrizes
dw Sfx_PlacePrize
dw Sfx_Unused09
dw Sfx_Unused0a
dw Sfx_CoinToss
@ -89,14 +89,14 @@ SFXHeaderPointers:
dw Sfx_FirePunch
dw Sfx_CoinTossHeads
dw Sfx_CoinTossTails
dw Sfx_SavedGame
dw Sfx_SaveGame
dw Sfx_PlayerWalkMap
dw Sfx_IntroOrb
dw Sfx_IntroOrbSwoop
dw Sfx_IntroOrbTitle
dw Sfx_IntroOrbScatter
dw Sfx_FiregiverStart
dw Sfx_CardPopReceived
dw Sfx_ReceiveCardPop
dw Sfx_PokemonEvolution
dw Sfx_Unused5f
assert_table_length NUM_SFX
@ -132,9 +132,9 @@ Sfx_CardShuffle:
db %1000
dw Sfx_CardShuffle_Ch1
Sfx_PlacingPrizes:
Sfx_PlacePrize:
db %1000
dw Sfx_PlacingPrizes_Ch1
dw Sfx_PlacePrize_Ch1
Sfx_Unused09:
db %1000
@ -453,9 +453,9 @@ Sfx_CoinTossTails:
db %0010
dw Sfx_CoinTossTails_Ch1
Sfx_SavedGame:
Sfx_SaveGame:
db %0010
dw Sfx_SavedGame_Ch1
dw Sfx_SaveGame_Ch1
Sfx_PlayerWalkMap:
db %0010
@ -481,11 +481,11 @@ Sfx_FiregiverStart:
db %1000
dw Sfx_FiregiverStart_Ch1
Sfx_CardPopReceived:
Sfx_ReceiveCardPop:
db %1011
dw Sfx_CardPopReceived_Ch1
dw Sfx_CardPopReceived_Ch2
dw Sfx_CardPopReceived_Ch3
dw Sfx_ReceiveCardPop_Ch1
dw Sfx_ReceiveCardPop_Ch2
dw Sfx_ReceiveCardPop_Ch3
Sfx_PokemonEvolution:
db %0010

6
src/constants/sfx_constants.asm
View File

@ -7,7 +7,7 @@
const SFX_UNUSED_05 ; $05
const SFX_UNUSED_06 ; $06
const SFX_CARD_SHUFFLE ; $07
const SFX_PLACING_PRIZES ; $08
const SFX_PLACE_PRIZE ; $08
const SFX_UNUSED_09 ; $09
const SFX_UNUSED_0A ; $0a
const SFX_COIN_TOSS ; $0b
@ -85,14 +85,14 @@
const SFX_FIRE_PUNCH ; $53
const SFX_COIN_TOSS_HEADS ; $54
const SFX_COIN_TOSS_TAILS ; $55
const SFX_SAVED_GAME ; $56
const SFX_SAVE_GAME ; $56
const SFX_PLAYER_WALK_MAP ; $57
const SFX_INTRO_ORB ; $58
const SFX_INTRO_ORB_SWOOP ; $59
const SFX_INTRO_ORB_TITLE ; $5a
const SFX_INTRO_ORB_SCATTER ; $5b
const SFX_FIREGIVER_START ; $5c
const SFX_CARD_POP_RECEIVED ; $5d
const SFX_RECEIVE_CARD_POP ; $5d
const SFX_POKEMON_EVOLUTION ; $5e
const SFX_UNUSED_5F ; $5f

2
src/engine/duel/core.asm
View File

@ -1858,7 +1858,7 @@ HandleDuelSetup:
call .DrawPrizeTile
push hl
ld a, SFX_PLACING_PRIZES
ld a, SFX_PLACE_PRIZE
call PlaySFX
; print new deck card number
lb bc, 3, 5

2
src/engine/link/card_pop.asm
View File

@ -43,7 +43,7 @@ _DoCardPop:
call LoadTxRam2
ld a, PLAYER_TURN
ldh [hWhoseTurn], a
ld a, SFX_CARD_POP_RECEIVED
ld a, SFX_RECEIVE_CARD_POP
call PlaySFX
.wait_sfx
call AssertSFXFinished

2
src/engine/menus/diary.asm
View File

@ -21,7 +21,7 @@ _PauseMenu_Diary:
jr c, .cancel
farcall BackupPlayerPosition
call SaveAndBackupData
ld a, SFX_SAVED_GAME
ld a, SFX_SAVE_GAME
call PlaySFX
ldtx hl, PlayerDiarySaveConfirmText
jr .print_result_text

2
src/macros/scripts.asm
View File

@ -582,7 +582,7 @@ ENDM
; Plays a sound effect
MACRO play_sfx
run_command ScriptCommand_PlaySFX
db \1 ; Sound Effect (ex SFX_56)
db \1 ; Sound Effect (ex SFX_SAVE_GAME)
ENDM
; Pauses the current song

4
src/scripts/gift_center.asm
View File

@ -27,7 +27,7 @@ Func_fc7a:
.ows_fca0
save_game 0
play_sfx SFX_SAVED_GAME
play_sfx SFX_SAVE_GAME
print_text Text06d1
gift_center 1
quit_script_fully
@ -41,7 +41,7 @@ Func_fcad:
set_event_value EVENT_GIFT_CENTER_MENU_CHOICE
start_script
play_sfx SFX_SAVED_GAME
play_sfx SFX_SAVE_GAME
save_game 0
jump_if_event_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_SEND_CARD, .ows_fccc
jump_if_event_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_SEND_DECK, .ows_fccf

6
tools/constants.py
View File

@ -615,7 +615,7 @@ sfxs = [
"SFX_UNUSED_05",
"SFX_UNUSED_06",
"SFX_CARD_SHUFFLE",
"SFX_PLACING_PRIZES",
"SFX_PLACE_PRIZE",
"SFX_UNUSED_09",
"SFX_UNUSED_0A",
"SFX_COIN_TOSS",
@ -693,14 +693,14 @@ sfxs = [
"SFX_FIRE_PUNCH",
"SFX_COIN_TOSS_HEADS",
"SFX_COIN_TOSS_TAILS",
"SFX_SAVED_GAME",
"SFX_SAVE_GAME",
"SFX_PLAYER_WALK_MAP",
"SFX_INTRO_ORB",
"SFX_INTRO_ORB_SWOOP",
"SFX_INTRO_ORB_TITLE",
"SFX_INTRO_ORB_SCATTER",
"SFX_FIREGIVER_START",
"SFX_CARD_POP_RECEIVED",
"SFX_RECEIVE_CARD_POP",
"SFX_POKEMON_EVOLUTION",
"SFX_UNUSED_5F",
]