summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/options_menu.asm4
-rw-r--r--engine/menus/save.asm8
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm
index 46fa33621..370eba3f6 100644
--- a/engine/menus/options_menu.asm
+++ b/engine/menus/options_menu.asm
@@ -165,7 +165,7 @@ GetTextSpeed:
; converts TEXT_DELAY_* value in a to OPT_TEXT_SPEED_* value in c,
; with previous/next TEXT_DELAY_* values in d/e
ld a, [wOptions]
- and $7
+ and TEXT_DELAY_MASK
cp TEXT_DELAY_SLOW
jr z, .slow
cp TEXT_DELAY_FAST
@@ -467,7 +467,7 @@ Options_Frame:
dec a
.Save:
- and $7
+ maskbits NUM_FRAMES
ld [hl], a
UpdateFrame:
ld a, [wTextBoxFrame]
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 469c55abd..190f5f887 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -89,7 +89,7 @@ MoveMonWOMail_InsertMon_SaveGame:
pop de
ld a, e
ld [wCurBox], a
- ld a, $1
+ ld a, TRUE
ld [wSaveFileExists], a
farcall StageRTCTimeForSave
farcall BackupMysteryGift
@@ -253,7 +253,7 @@ SavedTheGame:
ret
SaveGameData_:
- ld a, 1
+ ld a, TRUE
ld [wSaveFileExists], a
farcall StageRTCTimeForSave
farcall BackupMysteryGift
@@ -627,7 +627,7 @@ TryLoadSaveFile:
ret
TryLoadSaveData:
- xor a
+ xor a ; FALSE
ld [wSaveFileExists], a
call CheckPrimarySaveFile
ld a, [wSaveFileExists]
@@ -690,7 +690,7 @@ CheckPrimarySaveFile:
ld bc, wOptionsEnd - wOptions
call CopyBytes
call CloseSRAM
- ld a, $1
+ ld a, TRUE
ld [wSaveFileExists], a
.nope