diff options
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/intro_menu.asm | 2 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 6 | ||||
| -rw-r--r-- | engine/menus/menu.asm | 3 | ||||
| -rw-r--r-- | engine/menus/save.asm | 4 | ||||
| -rw-r--r-- | engine/menus/start_menu.asm | 4 |
5 files changed, 11 insertions, 8 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 414c733f..6be015cb 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -1,4 +1,5 @@ MainMenu_NewGame: +NewGame: xor a ld [wDebugFlags], a call ResetWRAM @@ -242,6 +243,7 @@ LoadOrRegenerateLuckyIDNumber: jp CloseSRAM MainMenu_Continue: +Continue: farcall TryLoadSaveFile jr c, .FailToLoad call LoadStandardMenuHeader diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 97ac8ed6..4e9113a8 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -171,7 +171,7 @@ MainMenu_PrintCurrentTimeAndDay: jp nz, .PrintTimeNotSet call UpdateTime hlcoord 1, 13 - ld bc, IncGradGBPalTable_11 + 1 + lb bc, 4, 13 call ClearBox call GetWeekday ld b, a @@ -241,11 +241,13 @@ ClearTilemapEtc: ret MainMenu_MysteryGift: +MysteryGift: call UpdateTime farcall DoMysteryGiftIfDayHasPassed farcall DoMysteryGift ret MainMenu_Options: - farcall OptionsMenu +OptionsMenu: + farcall _OptionsMenu ret diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 2073e5ca..b678d714 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -559,8 +559,7 @@ _ExitMenu:: ld a, [wSpriteUpdatesEnabled] cp 0 ret z - - call Functiond2a + call ReloadPalettes ret Function2434b: diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 1eafbe46..f8207204 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -19,7 +19,7 @@ SaveMenu: .refused call ExitMenu - call Functiond2a + call ReloadPalettes farcall SaveMenu_CopyTilemapAtOnce scf ret @@ -204,7 +204,7 @@ SaveTheGame_yesorno: dec a call CloseWindow push af - call Functiond2a + call ReloadPalettes pop af and a ret diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index fa574d07..dbadf637 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -151,7 +151,7 @@ StartMenu:: call DrawVariableLengthMenuBox call .DrawBugContestStatus call UpdateSprites - call Functiond2a + call ReloadPalettes call FinishExitMenu ret @@ -444,7 +444,7 @@ StartMenu_Option: ; Game options. call FadeToMenu - farcall MainMenu_Options + farcall OptionsMenu ld a, 6 ret |