Apply most of pokecrystal PR 1105

This commit is contained in:
xCrystal
2024-02-11 00:16:00 +01:00
parent 971c4aa2c7
commit 5c4d982702
74 changed files with 276 additions and 276 deletions

View File

@@ -12,14 +12,14 @@ ClearedLevelScreen:
call ClearMenuAndWindowData
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call EnableLCD
ld hl, .LevelCleared1Text
bccoord 3, 1
call PrintHLTextAtBC
call PrintTextboxTextAt
ld hl, .LevelCleared2Text
bccoord 3, 3
call PrintHLTextAtBC
call PrintTextboxTextAt
.loop
call DelayFrame
call GetJoypad

View File

@@ -23,7 +23,7 @@ GameMenu_KeepMusic:
call ClearMenuAndWindowData
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
xor a
ld [wWhichIndexSet], a
ld hl, .MenuHeader

View File

@@ -3,7 +3,7 @@ InitGender:
call LoadGenderScreenPal
call LoadGenderScreenLightBlueTile
call WaitBGMap2
call SetPalettes
call SetDefaultBGPAndOBP
ld hl, AreYouABoyOrAreYouAGirlText
call PrintText1bpp
ld hl, .MenuHeader

View File

@@ -58,7 +58,7 @@ LevelSelectionMenu::
call LevelSelectionMenu_DrawTimeOfDaySymbol
ld b, CGB_LEVEL_SELECTION_MENU
call GetCGBLayout ; apply and commit pals
call SetPalettes
call SetDefaultBGPAndOBP
ld c, 20 ;
call DelayFrames ; page shown --> page and textbox shown
@@ -105,7 +105,7 @@ LevelSelectionMenu::
call LevelSelectionMenu_DrawTimeOfDaySymbol
ld b, CGB_LEVEL_SELECTION_MENU
call GetCGBLayout ; apply and commit pals
call SetPalettes
call SetDefaultBGPAndOBP
ld de, MUSIC_GAME_CORNER
call PlayMusic

View File

@@ -20,7 +20,7 @@ MainMenu:
call ClearMenuAndWindowData
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call MainMenu_GetWhichMenu
ld [wWhichIndexSet], a
call MainMenu_PrintCurrentTimeAndDay

View File

@@ -624,7 +624,7 @@ RestoreOverworldMapTiles: ; unreferenced
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes
call CloseSRAM
call LoadScreenTilemapAndAttrmapPals
call LoadOverworldTilemapAndAttrmapPals
xor a ; sScratch
call OpenSRAM
ld hl, sScratch

View File

@@ -55,7 +55,7 @@ NamingScreen:
call .GetNamingScreenSetup
call WaitBGMap
call WaitTop
call SetPalettes
call SetDefaultBGPAndOBP
call NamingScreen_InitNameEntry
ret

View File

@@ -48,7 +48,7 @@ _Option:
call WaitBGMap
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
.joypad_loop
call JoyTextDelay

View File

@@ -36,7 +36,7 @@ StartMenu::
call DrawVariableLengthMenuBox
call .DrawBugContestStatusBox
call SafeUpdateSprites
call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
call HDMATransferTilemapAndAttrmap_Menu
farcall LoadFont_NoOAMUpdate
call .DrawBugContestStatus
call UpdateTimePals

View File

@@ -67,7 +67,7 @@ TrainerCard:
call WaitBGMap
ld b, CGB_TRAINER_CARD
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call WaitBGMap
ld hl, wJumptableIndex
xor a ; TRAINERCARDSTATE_PAGE1_LOADGFX