Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)

This commit is contained in:
xCrystal
2023-07-26 17:01:20 +02:00
parent acd022d765
commit d30b9dd60f
68 changed files with 284 additions and 1826 deletions

View File

@@ -1,7 +1,7 @@
_DeleteSaveData:
farcall BlankScreen
ld b, SCGB_DIPLOMA
call GetSGBLayout
ld b, CGB_DIPLOMA
call GetCGBLayout
call LoadStandardFont
call LoadFontsExtra
ld de, MUSIC_MAIN_MENU

View File

@@ -591,8 +591,8 @@ OakSpeech:
ld [wTrainerClass], a
call Intro_PrepTrainerPic
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld b, CGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call Intro_RotatePalettesLeftFrontpic
ld hl, OakText1
@@ -612,8 +612,8 @@ OakSpeech:
ld [wTempMonDVs], a
ld [wTempMonDVs + 1], a
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld b, CGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call Intro_WipeInFrontpic
ld hl, OakText2
@@ -629,8 +629,8 @@ OakSpeech:
ld [wTrainerClass], a
call Intro_PrepTrainerPic
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld b, CGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call Intro_RotatePalettesLeftFrontpic
ld hl, OakText5
@@ -642,8 +642,8 @@ OakSpeech:
ld [wCurPartySpecies], a
farcall DrawIntroPlayerPic
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld b, CGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call Intro_RotatePalettesLeftFrontpic
ld hl, OakText6
@@ -712,8 +712,8 @@ NamePlayer:
ld [wCurPartySpecies], a
farcall DrawIntroPlayerPic
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld b, CGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call RotateThreePalettesLeft
ld hl, wPlayerName
@@ -949,8 +949,8 @@ StartTitleScreen:
ldh [hWX], a
ld a, $90
ldh [hWY], a
ld b, SCGB_DIPLOMA
call GetSGBLayout
ld b, CGB_DIPLOMA
call GetCGBLayout
call UpdateTimePals
ld a, [wTitleScreenSelectedOption]
cp NUM_TITLESCREENOPTIONS

View File

@@ -15,8 +15,8 @@ MainMenu:
xor a
ld [wDisableTextAcceleration], a
call ClearTilemapEtc
ld b, SCGB_DIPLOMA
call GetSGBLayout
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
ld hl, wGameTimerPaused
res GAME_TIMER_PAUSED_F, [hl]

View File

@@ -45,8 +45,8 @@ NamingScreen:
.SetUpNamingScreen:
call ClearBGPalettes
ld b, SCGB_DIPLOMA
call GetSGBLayout
ld b, CGB_DIPLOMA
call GetCGBLayout
call DisableLCD
call LoadNamingScreenGFX
call NamingScreen_InitText
@@ -942,8 +942,8 @@ _ComposeMailMessage:
ld a, LCDC_DEFAULT
ldh [rLCDC], a
call .initwNamingScreenMaxNameLength
ld b, SCGB_DIPLOMA
call GetSGBLayout
ld b, CGB_DIPLOMA
call GetCGBLayout
call WaitBGMap
call WaitTop
ld a, %11100100

View File

@@ -46,8 +46,8 @@ _Option:
inc a
ldh [hBGMapMode], a
call WaitBGMap
ld b, SCGB_DIPLOMA
call GetSGBLayout
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
.joypad_loop

View File

@@ -66,8 +66,8 @@ TrainerCard:
call EnableLCD
call WaitBGMap
ld b, SCGB_TRAINER_CARD
call GetSGBLayout
ld b, CGB_TRAINER_CARD
call GetCGBLayout
call SetPalettes
call WaitBGMap
ld hl, wJumptableIndex