diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2019-07-06 22:01:58 +0200 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2019-07-06 22:02:57 +0200 |
| commit | 5a51337c7340c73d458454e421249a0fd1b7d06a (patch) | |
| tree | 673387675bd032c63f037a84820cba5a4c5a910f /src/engine | |
| parent | 2a3224db7a082994acaa24e01c04406babefd840 (diff) | |
Create default SFX constants
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/bank01.asm | 8 | ||||
| -rw-r--r-- | src/engine/bank02.asm | 4 | ||||
| -rw-r--r-- | src/engine/bank03.asm | 2 | ||||
| -rw-r--r-- | src/engine/bank04.asm | 8 | ||||
| -rw-r--r-- | src/engine/bank06.asm | 8 | ||||
| -rw-r--r-- | src/engine/bank07.asm | 2 | ||||
| -rw-r--r-- | src/engine/home.asm | 12 |
7 files changed, 22 insertions, 22 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index a159b07..df61f37 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -1921,7 +1921,7 @@ Func_4b60: ; 4b60 (1:4b60) call .asm_4cb4 call .asm_4cb4 push hl - ld a, $08 + ld a, SFX_08 call PlaySFX lb bc, 3, 5 ld a, e @@ -6428,7 +6428,7 @@ PrintAttachedEnergyToPokemon: ; 68e4 (1:68e4) ; print the PokemonEvolvedIntoPokemonText, given the Pokemon card to evolve in wccee, ; and the evolved Pokemon card in hTempCardIndex_ff98. also play a sound effect. PrintPokemonEvolvedIntoPokemon: ; 68fa (1:68fa) - ld a, $5e + ld a, SFX_5E call PlaySFX ld a, [wccee] call LoadCardNameToTxRam2 @@ -7556,11 +7556,11 @@ _TossCoin: ; 71ad (1:71ad) ld e, a .asm_728a - ld d, $54 + ld d, SFX_54 ld a, e or a jr nz, .asm_7292 - ld d, $55 + ld d, SFX_55 .asm_7292 ld a, d diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 4bbf7ca..f22d584 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -532,10 +532,10 @@ Func_90fb: ; 90fb (2:50fb) push af inc a jr z, .asm_9103 - ld a, $2 + ld a, SFX_02 jr .asm_9105 .asm_9103 - ld a, $3 + ld a, SFX_03 .asm_9105 call PlaySFX pop af diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 00c6c88..b33fd35 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -64,7 +64,7 @@ LoadMap: ; c000 (3:4000) ld a, [hl] bit 4, [hl] jr z, .asm_c0b6 - ld a, $c + ld a, SFX_0C call PlaySFX jp .asm_c037 .asm_c0b6 diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 290b004..e2ca66c 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -372,7 +372,7 @@ Func_10e71: ; 10e71 (4:4e71) ldh a, [hKeysPressed] and A_BUTTON jr z, .asm_10e96 - ld a, $2 + ld a, SFX_02 call PlaySFX call Func_11016 call Func_11024 @@ -398,7 +398,7 @@ Func_10e97: ; 10e97 (4:4e97) jr z, .asm_10eb9 ld [wd32e], a call Func_10f2e - ld a, $1 + ld a, SFX_01 call PlaySFX .asm_10eb9 pop bc @@ -548,7 +548,7 @@ Func_11016: ; 11016 (4:5016) ret Func_11024: ; 11024 (4:5024) - ld a, $57 + ld a, SFX_57 call PlaySFX ld a, [wd336] ld [wWhichSprite], a @@ -1191,7 +1191,7 @@ DisplayPlayerNamingScreen:: ; 128a9 (4:68a9) ; from the user into hl. ld hl, wNameBuffer farcall InputPlayerName - + farcall WhiteOutDMGPals call DoFrameIfLCDEnabled call DisableLCD diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 0c28bbe..9b1e54d 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -1531,16 +1531,16 @@ ClearMemory: ; (6:6787) ret ; play different sfx by a. -; if a is 0xff play sfx with 0x03 (usually following a B press), -; else with 0x02 (usually following an A press). +; if a is 0xff play SFX_03 (usually following a B press), +; else play SFX_02 (usually following an A press). PlayAcceptOrDeclineSFX: ; (6:6794) push af inc a jr z, .sfx_decline - ld a, $02 + ld a, SFX_02 jr .sfx_accept .sfx_decline - ld a, $03 + ld a, SFX_03 .sfx_accept call PlaySFX pop af diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index dfae95a..a79f27a 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -451,7 +451,7 @@ Func_1d078: ; 1d078 (7:5078) ldh a, [hKeysPressed] and A_BUTTON | START jr z, .asm_1d095 - ld a, $2 + ld a, SFX_02 call PlaySFX farcall Func_10ab4 diff --git a/src/engine/home.asm b/src/engine/home.asm index 510887f..c4507ef 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -7376,17 +7376,17 @@ HandleMenuInput: ; 264b (0:264b) scf ret -; plays an "open screen" sound if [hCurMenuItem] != 0xff -; plays an "exit screen" sound if [hCurMenuItem] == 0xff +; plays an "open screen" sound (SFX_02) if [hCurMenuItem] != 0xff +; plays an "exit screen" sound (SFX_03) if [hCurMenuItem] == 0xff PlayOpenOrExitScreenSFX: ; 26c0 (0:26c0) push af ldh a, [hCurMenuItem] inc a jr z, .play_exit_sfx - ld a, $2 + ld a, SFX_02 jr .play_sfx .play_exit_sfx - ld a, $3 + ld a, SFX_03 .play_sfx call PlaySFX pop af @@ -7490,7 +7490,7 @@ HandleDuelMenuInput: ; 271a (0:271a) and 1 .dpad_pressed push af - ld a, $1 + ld a, SFX_01 call PlaySFX call .erase_cursor pop af @@ -8172,7 +8172,7 @@ HandleYesOrNoMenu: and D_RIGHT | D_LEFT jr z, .wait_button_loop ; left or right pressed, so switch to the other menu item - ld a, $1 + ld a, SFX_01 call PlaySFX call EraseCursor .refresh_menu |
