summaryrefslogtreecommitdiff
path: root/engine/titlescreen.asm
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-09-09 12:01:24 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-09-09 12:01:24 -0700
commit4b59cbae1d0f6e4058e40e82b1e1bd986489007b (patch)
tree2d7d7378833eaad09477b1f0d0d58e1368ff9ff4 /engine/titlescreen.asm
parent24399a8a19932f940dc78f6f84e9681c9fce7bbb (diff)
More various labeling of wram
Diffstat (limited to 'engine/titlescreen.asm')
-rw-r--r--engine/titlescreen.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index 01a1aac..6157eed 100644
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -66,7 +66,7 @@ TitlescreenLoop: ; 0xc089
and a
jr nz, .asm_c0d3
; player chose "Game Start"
- ld a, [wd7c2] ; if this is non-zero, the main menu will prompt for "continue or new game?".
+ ld a, [wSavedGame] ; if this is non-zero, the main menu will prompt for "continue or new game?".
and a
jr z, .noPreviouslySavedGame
lb de, $00, $01
@@ -149,31 +149,31 @@ Func_c10e: ; 0xc10e
jr z, .asm_c177
call FadeOut
call DisableLCD
- ld a, [wd7c2]
+ ld a, [wSavedGame]
and a
- jr z, .asm_c173
+ jr z, .notLoadingSavedGame
ld hl, sSaveGame
ld de, wPartyMons
ld bc, $04c3
call LoadSavedData
- jr nc, .asm_c173
+ jr nc, .notLoadingSavedGame
xor a
- ld [wd7c2], a
+ ld [wSavedGame], a
ld hl, wPartyMons
ld de, sSaveGame
ld bc, $04c3
call SaveData
ld a, $1
- ld [wd7c1], a
+ ld [wLoadingSavedGame], a
ld a, SCREEN_PINBALL_GAME
ld [wCurrentScreen], a
ld a, $0
ld [wScreenState], a
ret
-.asm_c173
+.notLoadingSavedGame
xor a
- ld [wd7c1], a
+ ld [wLoadingSavedGame], a
.asm_c177
ld hl, wScreenState
inc [hl]