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

@@ -52,7 +52,7 @@ EvolutionAnimation:
ld [wPlayerHPPal], a
ld c, FALSE
call .GetSGBLayout
call .GetCGBLayout
ld a, [wEvolutionOldSpecies]
ld [wCurPartySpecies], a
@@ -92,7 +92,7 @@ EvolutionAnimation:
call DelayFrames
ld c, TRUE
call .GetSGBLayout
call .GetCGBLayout
call .AnimationSequence
jr c, .cancel_evo
@@ -108,7 +108,7 @@ EvolutionAnimation:
ld [wPlayerHPPal], a
ld c, FALSE
call .GetSGBLayout
call .GetCGBLayout
call .PlayEvolvedSFX
farcall ClearSpriteAnims
@@ -146,7 +146,7 @@ EvolutionAnimation:
ld [wPlayerHPPal], a
ld c, FALSE
call .GetSGBLayout
call .GetCGBLayout
call .PlayEvolvedSFX
farcall ClearSpriteAnims
@@ -157,9 +157,9 @@ EvolutionAnimation:
call PlayMonCry
ret
.GetSGBLayout:
ld b, SCGB_EVOLUTION
jp GetSGBLayout
.GetCGBLayout:
ld b, CGB_EVOLUTION
jp GetCGBLayout
.PlaceFrontpic:
call GetBaseData

View File

@@ -17,8 +17,8 @@ SplashScreen:
ld a, SCREEN_HEIGHT_PX
ldh [hWY], a
call WaitBGMap
ld b, SCGB_GAMEFREAK_LOGO
call GetSGBLayout
ld b, CGB_GAMEFREAK_LOGO
call GetCGBLayout
call SetPalettes
ld c, 10
call DelayFrames

View File

@@ -372,8 +372,8 @@ TradeAnim_InitTubeAnim:
ld [hl], b
call WaitBGMap
ld b, SCGB_TRADE_TUBE
call GetSGBLayout
ld b, CGB_TRADE_TUBE
call GetCGBLayout
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
ld a, %11010000
@@ -633,8 +633,8 @@ TradeAnim_EnterLinkTube1:
lb bc, 3, 12
call TradeAnim_CopyBoxFromDEtoHL
call WaitBGMap
ld b, SCGB_TRADE_TUBE
call GetSGBLayout
ld b, CGB_TRADE_TUBE
call GetCGBLayout
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
lb de, %11100100, %11100100 ; 3,2,1,0, 3,2,1,0
@@ -764,8 +764,8 @@ TradeAnim_ShowGivemonData:
ld [wTempMonDVs], a
ld a, [wPlayerTrademonDVs + 1]
ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld b, CGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
call TradeAnim_ShowGivemonFrontpic
@@ -789,8 +789,8 @@ TradeAnim_ShowGetmonData:
ld [wTempMonDVs], a
ld a, [wOTTrademonDVs + 1]
ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld b, CGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
call TradeAnim_ShowGetmonFrontpic