Save game and clear board menu cursor position during game menu (#17)

constants/engine_flags.asm

@@ -95,7 +95,7 @@ endc
 ; wSwarmFlags
 	const ENGINE_BUENAS_PASSWORD_2
 	const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
-; wGameTimerPaused
+; wGameTimer
 	const ENGINE_62
 ; wPlayerGender
 	const ENGINE_PLAYER_IS_FEMALE

constants/wram_constants.asm

@@ -27,7 +27,7 @@ DEF AUTO_INPUT EQU $ff
 	const TEMPMON    ; 3
 	const WILDMON    ; 4
 
-; wGameTimerPaused::
+; wGameTimer::
 DEF GAME_TIMER_COUNTING_F EQU 0
 
 ; wJoypadDisable::

data/events/engine_flags.asm

@@ -106,7 +106,7 @@ endc
 	engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F
 	engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F
 
-	engine_flag wGameTimerPaused, 7 ; unused
+	engine_flag wGameTimer, 7 ; unused
 
 	engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F
 

engine/gfx/color.asm

@@ -698,7 +698,7 @@ LoadMapPals:
 	ld a, BANK(wOBPals1)
 	ld de, wOBPals1
 	ld hl, MapObjectDarknessPals
-	ld bc, 7 palettes
+	ld bc, 7 palettes ; all but PAL_OW_MISC
 	jp FarCopyWRAM
 
 .not_darkness
@@ -708,7 +708,7 @@ LoadMapPals:
 	ld hl, MapObjectPals
 	call AddNTimes
 	ld de, wOBPals1
-	ld bc, 7 palettes
+	ld bc, 7 palettes ; all but PAL_OW_MISC
 	ld a, BANK(wOBPals1)
 	call FarCopyWRAM
 

engine/menus/game_menu.asm

@@ -122,13 +122,15 @@ GameMenu_WorldMap:
 	xor a
 	ld [wDontPlayMapMusicOnReload], a ; play map music
 	ld [wLinkMode], a
-	ld hl, wGameTimerPaused
+	ld [wBoardMenuLastCursorPosition], a
+	ld hl, wGameTimer
 	set GAME_TIMER_COUNTING_F, [hl] ; start game timer counter
 	farcall OverworldLoop
 
 ; return from overworld loop
 	call ClearBGPalettes
 	call ClearSprites
+	farcall AutoSaveGameOutsideOverworld
 	ret
 
 GameMenu_Shop:

engine/menus/main_menu.asm

@@ -21,8 +21,6 @@ MainMenu:
 	ld b, CGB_DIPLOMA
 	call GetCGBLayout
 	call SetPalettes
-	ld hl, wGameTimerPaused
-	res GAME_TIMER_COUNTING_F, [hl]
 	call MainMenu_GetWhichMenu
 	ld [wWhichIndexSet], a
 	call MainMenu_PrintCurrentTimeAndDay

engine/overworld/events.asm

@@ -12,7 +12,7 @@ OverworldLoop::
 	jr nz, .loop
 .done
 	call DisableOverworldHUD
-	ld hl, wGameTimerPaused
+	ld hl, wGameTimer
 	res GAME_TIMER_COUNTING_F, [hl] ; stop game timer counter
 	ld a, FALSE
 	ld [wText2bpp], a

engine/overworld/scripting.asm

@@ -2314,10 +2314,10 @@ Script_endall:
 	ret
 
 Script_halloffame:
-	ld hl, wGameTimerPaused
+	ld hl, wGameTimer
 	res GAME_TIMER_COUNTING_F, [hl]
 	farcall HallOfFame
-	ld hl, wGameTimerPaused
+	ld hl, wGameTimer
 	set GAME_TIMER_COUNTING_F, [hl]
 	jr ReturnFromCredits
 

home/game_time.asm

@@ -32,7 +32,7 @@ GameTimer::
 	ret nz
 
 ; Is the timer paused?
-	ld hl, wGameTimerPaused
+	ld hl, wGameTimer
 	bit GAME_TIMER_COUNTING_F, [hl]
 	ret z
 

ram/wram.asm

@@ -1200,7 +1200,7 @@ wPredefHL:: dw
 wPredefAddress:: dw
 wFarCallBC:: dw
 
-wGameTimerPaused::
+wGameTimer::
 ; bit 0: game timer paused
 ; bit 7: something mobile
 	db