summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjidoc01 <jidoc01@naver.com>2019-09-27 12:03:29 +0200
committerjidoc01 <jidoc01@naver.com>2019-09-27 12:03:29 +0200
commitdbefbe866839f91f0911508aa05f19ec56e9defe (patch)
tree6362ba0ae4d3dc935a079085026b76a5ed9b9ec6 /src
parentfb01f5b17f051430299345199da1108f54b7d466 (diff)
Rename wcfe3
Diffstat (limited to 'src')
-rw-r--r--src/engine/bank02.asm18
-rw-r--r--src/engine/bank06.asm24
-rw-r--r--src/wram.asm5
3 files changed, 23 insertions, 24 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index 51127a2..d48250f 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -1215,7 +1215,7 @@ DrawPlayArea_HandText: ; 8676 (2:4676)
; returns a = $ff if B pressed
HandleCheckMenuInput_YourOrOppPlayArea: ; 86ac (2:46ac)
xor a
- ld [wcfe3], a
+ ld [wPlaysSfx], a
ld a, [wCheckMenuCursorXPosition]
ld d, a
ld a, [wCheckMenuCursorYPosition]
@@ -1283,7 +1283,7 @@ HandleCheckMenuInput_YourOrOppPlayArea: ; 86ac (2:46ac)
.erase
ld a, $01
- ld [wcfe3], a
+ ld [wPlaysSfx], a
push de
call EraseCheckMenuCursor_YourOrOppPlayArea
pop de
@@ -1319,7 +1319,7 @@ HandleCheckMenuInput_YourOrOppPlayArea: ; 86ac (2:46ac)
ret
.sfx
- ld a, [wcfe3]
+ ld a, [wPlaysSfx]
or a
jr z, .draw_cursor
call PlaySFX
@@ -1638,7 +1638,7 @@ LoadCursorTile: ; 8992 (2:4992)
; similar to OpenInPlayAreaScreen_HandleInput
Func_89ae: ; 89ae (2:49ae)
xor a
- ld [wcfe3], a
+ ld [wPlaysSfx], a
ld hl, wce53
ld e, [hl]
@@ -1757,7 +1757,7 @@ Func_89ae: ; 89ae (2:49ae)
.next
ld a, $01
- ld [wcfe3], a
+ ld [wPlaysSfx], a
; reset cursor blink
xor a
@@ -1784,7 +1784,7 @@ Func_89ae: ; 89ae (2:49ae)
ret
.return
- ld a, [wcfe3]
+ ld a, [wPlaysSfx]
or a
jr z, .skip_sfx
call PlaySFX
@@ -2267,7 +2267,7 @@ ResetCheckMenuCursorPositionAndBlink: ; 905a (2:505a)
; returns a = $ff if B pressed
HandleCheckMenuInput: ; 9065 (2:5065)
xor a
- ld [wcfe3], a
+ ld [wPlaysSfx], a
ld a, [wCheckMenuCursorXPosition]
ld d, a
ld a, [wCheckMenuCursorYPosition]
@@ -2304,7 +2304,7 @@ HandleCheckMenuInput: ; 9065 (2:5065)
.okay
ld a, $01
- ld [wcfe3], a
+ ld [wPlaysSfx], a
push de
call EraseCheckMenuCursor
pop de
@@ -2337,7 +2337,7 @@ HandleCheckMenuInput: ; 9065 (2:5065)
ret
.no_input
- ld a, [wcfe3]
+ ld a, [wPlaysSfx]
or a
jr z, .check_blink
call PlaySFX
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index dcfbf68..fae87bf 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -523,7 +523,7 @@ OpenInPlayAreaScreen_TransitionTable2:
OpenInPlayAreaScreen_HandleInput: ; 183bb (6:43bb)
xor a
- ld [wcfe3], a
+ ld [wPlaysSfx], a
ld hl, wInPlayAreaInputTablePointer
ld e, [hl]
inc hl
@@ -655,7 +655,7 @@ OpenInPlayAreaScreen_HandleInput: ; 183bb (6:43bb)
ld [wInPlayAreaCurPosition], a
.next
ld a, $01
- ld [wcfe3], a
+ ld [wPlaysSfx], a
xor a
ld [wCheckMenuCursorBlinkCounter], a
.check_button
@@ -681,7 +681,7 @@ OpenInPlayAreaScreen_HandleInput: ; 183bb (6:43bb)
ret
.return
- ld a, [wcfe3]
+ ld a, [wPlaysSfx]
or a
jr z, .skip_sfx
call PlaySFX
@@ -947,7 +947,7 @@ GlossaryData2:
Func_18661: ; 18661 (6:4661)
xor a
- ld [wcfe3], a
+ ld [wPlaysSfx], a
ld a, [wCheckMenuCursorXPosition]
ld d, a
ld a, [wCheckMenuCursorYPosition]
@@ -978,7 +978,7 @@ Func_18661: ; 18661 (6:4661)
ld e, a
.cursor_moved
ld a, $1
- ld [wcfe3], a
+ ld [wPlaysSfx], a
push de
call .draw_blank_cursor
pop de
@@ -1010,7 +1010,7 @@ Func_18661: ; 18661 (6:4661)
ret
.check_cursor_moved
- ld a, [wcfe3]
+ ld a, [wPlaysSfx]
or a
jr z, .check_cursor_blink
call PlaySFX
@@ -2128,7 +2128,7 @@ endr
; if pressed, set the carry bit on.
NamingScreen_CheckButtonState:
xor a
- ld [wcfe3], a
+ ld [wPlaysSfx], a
ldh a, [hDPadHeld]
or a
jp z, .no_press
@@ -2277,7 +2277,7 @@ NamingScreen_CheckButtonState:
cp d
jp z, NamingScreen_CheckButtonState
ld a, $01
- ld [wcfe3], a
+ ld [wPlaysSfx], a
.no_press
ldh a, [hKeysPressed]
and A_BUTTON | B_BUTTON
@@ -2293,7 +2293,7 @@ NamingScreen_CheckButtonState:
scf
ret
.asm_69ef
- ld a, [wcfe3]
+ ld a, [wPlaysSfx]
or a
jr z, .asm_69f8
call PlaySFX
@@ -3001,7 +3001,7 @@ Func_1aec3: ; 1aec3 (6:6ec3)
Func_1aefb: ; 1aefb (6:6efb)
xor a
- ld [wcfe3], a
+ ld [wPlaysSfx], a
ldh a, [hDPadHeld]
or a
jp z, .asm_6f73
@@ -3075,7 +3075,7 @@ Func_1aefb: ; 1aefb (6:6efb)
cp d
jp z, Func_1aefb
ld a, $01
- ld [wcfe3], a
+ ld [wPlaysSfx], a
.asm_6f73
ldh a, [hKeysPressed]
and $03
@@ -3091,7 +3091,7 @@ Func_1aefb: ; 1aefb (6:6efb)
scf
ret
.asm_6f89
- ld a, [wcfe3]
+ ld a, [wPlaysSfx]
or a
jr z, .asm_6f92
call PlaySFX
diff --git a/src/wram.asm b/src/wram.asm
index 401cc44..df240ac 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -1677,9 +1677,8 @@ wcfda:: ; cfda
ds $7
-; it's a flag variable being used in play-area view.
-; need analysis.
-wcfe3:: ; cfe3
+; a flag indicating whether sfx should be played.
+wPlaysSfx:: ; cfe3
ds $1
wcfe4:: ; cfe4