summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2021-10-10 21:42:24 +0100
committerElectroDeoxys <ElectroDeoxys@gmail.com>2021-10-10 21:42:24 +0100
commit63a687d613e79cc2f8dd27198e45f9071a350ce6 (patch)
treef6fee3873e8a26fe02fd6eeb145b46395e6b4b77
parent0d133430e5a6258b1b2496378243f29c62723b32 (diff)
WD -> Window
-rw-r--r--src/engine/bank04.asm2
-rw-r--r--src/engine/bank07.asm14
-rw-r--r--src/engine/credits.asm4
-rw-r--r--src/engine/input_name.asm2
-rw-r--r--src/engine/sequences/credits_sequence_commands.asm4
-rw-r--r--src/home/lcd.asm4
6 files changed, 15 insertions, 15 deletions
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 940df79..5fb216f 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -5337,7 +5337,7 @@ Func_12871: ; 12871 (4:6871)
ldh [hSCY], a
ldh [hWX], a
ldh [hWY], a
- call SetWDOff
+ call SetWindowOff
ret
Func_1288c: ; 1288c (4:688c)
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index 93ef008..cf9da13 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -1,5 +1,5 @@
-JumpSetWDOff:
- jp SetWDOff
+JumpSetWindowOff:
+ jp SetWindowOff
; debug function
; prints player's coordinates by pressing B
@@ -7,18 +7,18 @@ JumpSetWDOff:
Func_1c003: ; unreferenced
ld a, [wCurMap]
or a
- jr z, JumpSetWDOff
+ jr z, JumpSetWindowOff
ld a, [wOverworldMode]
cp OWMODE_START_SCRIPT
- jr nc, JumpSetWDOff
+ jr nc, JumpSetWindowOff
ldh a, [hKeysHeld]
ld b, a
and A_BUTTON | B_BUTTON
cp b
- jr nz, JumpSetWDOff
+ jr nz, JumpSetWindowOff
and B_BUTTON
- jr z, JumpSetWDOff
+ jr z, JumpSetWindowOff
ld bc, $20
ld a, [wPlayerXCoord]
@@ -46,7 +46,7 @@ Func_1c003: ; unreferenced
ld a, $68
ldh [hWY], a
.set_wd_on
- call Set_WD_on
+ call SetWindowOn
ret
Func_1c056:
diff --git a/src/engine/credits.asm b/src/engine/credits.asm
index d2da5d8..8ead323 100644
--- a/src/engine/credits.asm
+++ b/src/engine/credits.asm
@@ -23,7 +23,7 @@ PlayCreditsSequence:
call PlaySong
farcall Func_10ab4
call Func_3ca4
- call SetWDOff
+ call SetWindowOff
call Func_1d758
call EnableLCD
call DoFrameIfLCDEnabled
@@ -52,7 +52,7 @@ Func_1d705:
ld [wd648], a
ld [wd64a], a
call Func_1d765
- call Set_WD_on
+ call SetWindowOn
call .Func_1d73a ; can be fallthrough
ret
diff --git a/src/engine/input_name.asm b/src/engine/input_name.asm
index c9d222e..edcac4c 100644
--- a/src/engine/input_name.asm
+++ b/src/engine/input_name.asm
@@ -2,7 +2,7 @@ WhatIsYourNameData:
textitem 1, 1, WhatIsYourNameText
db $ff
; [Deck1Data ~ Deck4Data]
-; These are directed from around (2:4f05),
+; These are directed from InputCurDeckName,
; without any bank description.
; That is, the developers hard-coded it. -_-;;
Deck1Data:
diff --git a/src/engine/sequences/credits_sequence_commands.asm b/src/engine/sequences/credits_sequence_commands.asm
index 263ecff..d80df8b 100644
--- a/src/engine/sequences/credits_sequence_commands.asm
+++ b/src/engine/sequences/credits_sequence_commands.asm
@@ -300,7 +300,7 @@ CreditsSequenceCmd_DisableLCD: ; 1d9db (7:59db)
CreditsSequenceCmd_FadeIn: ; 1d9e1 (7:59e1)
call DisableLCD
- call Set_WD_on
+ call SetWindowOn
farcall Func_10af9
jp AdvanceCreditsSequenceCmdPtrBy2
@@ -310,7 +310,7 @@ CreditsSequenceCmd_FadeOut: ; 1d9ee (7:59ee)
call EnableLCD
call DoFrameIfLCDEnabled
call DisableLCD
- call SetWDOff
+ call SetWindowOff
jp AdvanceCreditsSequenceCmdPtrBy2
CreditsSequenceCmd_DrawRectangle: ; 1da04 (7:5a04)
diff --git a/src/home/lcd.asm b/src/home/lcd.asm
index 5d82c72..415aea0 100644
--- a/src/home/lcd.asm
+++ b/src/home/lcd.asm
@@ -69,14 +69,14 @@ Set_OBJ_8x16:
ret
; set Window Display on
-Set_WD_on:
+SetWindowOn:
ld a, [wLCDC]
or LCDC_WINON
ld [wLCDC], a
ret
; set Window Display off
-SetWDOff:
+SetWindowOff:
ld a, [wLCDC]
and LCDC_WINOFF
ld [wLCDC], a