You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Save game and clear board menu cursor position during game menu (#17)
This commit is contained in:
@@ -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
|
||||
|
||||
|
@@ -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:
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user