diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-07-07 16:13:50 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-07-07 16:13:50 +0100 |
| commit | e3b4ae38b01c2b248ebbf1e02382a1f1da525397 (patch) | |
| tree | c248ff3cb1298199503c541269c03f856bb09216 /src | |
| parent | cfe78ab4c072977de3371ec1de337582c100f8fa (diff) | |
Label Func_90fb
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank02.asm | 35 | ||||
| -rw-r--r-- | src/engine/bank06.asm | 8 |
2 files changed, 24 insertions, 19 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 40e0344..b5c13b1 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -998,14 +998,14 @@ HandleDuelMenuInput_OppPlayArea: ; 86ac (2:46ac) ; b pressed ld a, $ff - call Func_90fb + call PlaySFXConfirmOrCancel scf ret .a_pressed call Func_8760 ld a, $01 - call Func_90fb + call PlaySFXConfirmOrCancel scf ret @@ -1196,14 +1196,14 @@ Func_8dea: ; 8dea (2:4dea) call Func_8ff2 jp nc, Func_8e05 ld a, $ff - call Func_90fb + call PlaySFXConfirmOrCancel call Func_8fe8 scf ret Func_8e05: ; 8e05 (2:4e05) ld a, $1 - call Func_90fb + call PlaySFXConfirmOrCancel call GetPointerToDeckCards push hl call GetPointerToDeckName @@ -1559,14 +1559,14 @@ HandleDuelMenuInput_YourPlayArea: ; 9065 (2:5065) and A_BUTTON jr nz, .a_press ld a, $ff - call Func_90fb + call PlaySFXConfirmOrCancel scf ret .a_press call Func_90f7 ld a, $1 - call Func_90fb + call PlaySFXConfirmOrCancel scf ret @@ -1618,15 +1618,20 @@ Func_90f7: ; 90f7 (2:50f7) ld a, $f jr DrawByteInCursor_YourPlayArea -Func_90fb: ; 90fb (2:50fb) +; plays sound depending on value in a +; input: +; a = $ff: play cancel sound +; a != $ff: play confirm sound +PlaySFXConfirmOrCancel: ; 90fb (2:50fb) push af inc a - jr z, .asm_9103 - ld a, $2 - jr .asm_9105 -.asm_9103 - ld a, $3 -.asm_9105 + jr z, .cancel + ld a, $2 ; confirmation sfx + jr .sfx +.cancel + ld a, $3 ; cancellation sfx + +.sfx call PlaySFX pop af ret @@ -2103,7 +2108,7 @@ Func_ba04: ; ba04 (2:7a04) or a jr z, .asm_ba40 ld a, $1 - call Func_90fb + call PlaySFXConfirmOrCancel call $7653 call Func_8e1f call $7644 @@ -2200,7 +2205,7 @@ Func_ba04: ; ba04 (2:7a04) or a jp z, $7a40 ld a, $1 - call Func_90fb + call PlaySFXConfirmOrCancel call $7653 xor a call $6dfe diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index abb4425..348fce1 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -517,13 +517,13 @@ Func_006_43bb: ; 183bb (6:43bb) and $01 jr nz, .asm_006_447d ld a, $ff - farcall Func_90fb + farcall PlaySFXConfirmOrCancel scf ret .asm_006_447d call Func_006_44a0 ld a, $01 - farcall Func_90fb + farcall PlaySFXConfirmOrCancel ld a, [$ce52] scf ret @@ -609,7 +609,7 @@ Func_006_44c8: ; 184c8 (6:44c8) jr .asm_006_44e5 .asm_006_4518 ld a, $01 - farcall Func_90fb + farcall PlaySFXConfirmOrCancel .asm_006_451e ld a, [wGlossaryPageNo] xor $01 @@ -733,7 +733,7 @@ Func_006_4598: ; 18598 (6:4598) and B_BUTTON jr z, .asm_006_45f7 ld a, $ff - farcall Func_90fb + farcall PlaySFXConfirmOrCancel ret ; unit: 5 bytes. |