pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary DMG and SGB checking (#7)

Browse Source
This commit is contained in:
xCrystal 2023-07-26 14:29:16 +02:00
parent 15f452ff26
commit acd022d765
30 changed files with 10 additions and 713 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/battle/anim_hp_bar.asm
View File

@ -273,9 +273,6 @@ HPBarAnim_UpdateHPRemaining:
ret
HPBarAnim_PaletteUpdate:
ldh a, [hCGB]
and a
ret z
ld hl, wCurHPAnimPal
call SetHPPal
ld a, [wCurHPAnimPal]
@ -284,14 +281,6 @@ HPBarAnim_PaletteUpdate:
ret
HPBarAnim_BGMapUpdate:
ldh a, [hCGB]
and a
jr nz, .cgb
call DelayFrame
call DelayFrame
ret
.cgb
ld a, [wWhichHPBar]
and a
jr z, .load_0

14
engine/battle/battle_transition.asm
View File

@ -69,7 +69,7 @@ DoBattleTransition:
call UpdateSprites
call DelayFrame
call .LoadPokeballTiles
call BattleStart_CopyTilemapAtOnce
call CopyTilemapAtOnce
ld a, SCREEN_HEIGHT_PX
ldh [hWY], a
call DelayFrame
@ -636,16 +636,6 @@ StartTrainerBattle_LoadPokeBallGraphics:
dec b
jr nz, .tile_loop
ldh a, [hCGB]
and a
jr nz, .cgb
ld a, 1
ldh [hBGMapMode], a
call DelayFrame
call DelayFrame
jr .nextscene
.cgb
ld hl, .pals
ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES
@ -671,7 +661,7 @@ StartTrainerBattle_LoadPokeBallGraphics:
ld a, TRUE
ldh [hCGBPalUpdate], a
call DelayFrame
call BattleStart_CopyTilemapAtOnce
call CopyTilemapAtOnce
.nextscene
call StartTrainerBattle_NextScene

3
engine/battle/battlestart_copytilemapatonce.asm
View File

@ -1,3 +0,0 @@
BattleStart_CopyTilemapAtOnce:
call CGBOnly_CopyTilemapAtOnce
ret

32
engine/battle_anims/anim_commands.asm
View File

@ -176,10 +176,6 @@ BattleAnimRestoreHuds:
ret
BattleAnimRequestPals:
ldh a, [hCGB]
and a
ret z
ldh a, [rBGP]
ld b, a
ld a, [wBGP]
@ -643,12 +639,7 @@ BattleAnimCmd_OBP1:
ret
BattleAnimCmd_ResetObp0:
ldh a, [hSGB]
and a
ld a, $e0
jr z, .not_sgb
ld a, $f0
.not_sgb
ld [wOBP0], a
ret
@ -1336,23 +1327,6 @@ PlayHitSound:
ret
BattleAnimAssignPals:
ldh a, [hCGB]
and a
jr nz, .cgb
ldh a, [hSGB]
and a
ld a, %11100000
jr z, .sgb
ld a, %11110000
.sgb
ld [wOBP0], a
ld a, %11100100
ld [wBGP], a
ld [wOBP1], a
ret
.cgb
ld a, %11100100
ld [wBGP], a
ld [wOBP0], a
@ -1405,9 +1379,6 @@ BattleAnim_RevertPals:
BattleAnim_SetBGPals:
ldh [rBGP], a
ldh a, [hCGB]
and a
ret z
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
@ -1432,9 +1403,6 @@ BattleAnim_SetBGPals:
BattleAnim_SetOBPals:
ldh [rOBP0], a
ldh a, [hCGB]
and a
ret z
ldh a, [rSVBK]
push af
ld a, BANK(wOBPals1)

168
engine/battle_anims/bg_effects.asm
View File

@ -281,14 +281,7 @@ BattleBGEffect_AlternateHues:
db -2
BattleBGEffect_CycleOBPalsGrayAndYellow:
call BattleBGEffects_CheckSGB
jr nz, .sgb
ld de, .PalsCGB
jr .okay
.sgb
ld de, .PalsSGB
.okay
call BattleBGEffect_GetNthDMGPal
ld [wOBP0], a
ret
@ -304,14 +297,7 @@ BattleBGEffect_CycleOBPalsGrayAndYellow:
db -2
BattleBGEffect_CycleMidOBPalsGrayAndYellow:
call BattleBGEffects_CheckSGB
jr nz, .sgb
ld de, .PalsCGB
jr .okay
.sgb
ld de, .PalsSGB
.okay
call BattleBGEffect_GetNthDMGPal
ld [wOBP0], a
ret
@ -1955,90 +1941,6 @@ BattleBGEffect_BetaSendOutMon2: ; unused
ret
BattleBGEffect_FadeMonsToBlackRepeating:
ldh a, [hCGB]
and a
jr nz, .cgb
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
dw .one
dw .two
.zero
call BattleBGEffects_IncAnonJumptableIndex
ld a, $e4
call BattleBGEffects_SetLYOverrides
ld a, LOW(rBGP)
ldh [hLCDCPointer], a
xor a
ldh [hLYOverrideStart], a
ld a, $60
ldh [hLYOverrideEnd], a
ret
.one
ld hl, BG_EFFECT_STRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
ld e, a
and $7
ret nz
ld a, e
and $18
sla a
swap a
sla a
ld e, a
ld d, 0
push bc
call BGEffect_CheckBattleTurn
jr nz, .player
ld hl, .CGB_DMGEnemyData
add hl, de
ld a, [hli]
ld [wOBP1], a
ld d, a
ld e, [hl]
lb bc, $2f, $30
jr .okay
.player
ld hl, .DMG_PlayerData
add hl, de
ld d, [hl]
inc hl
ld a, [hl]
ld [wOBP1], a
ld e, a
lb bc, $37, $28
.okay
call .DMG_LYOverrideLoads
pop bc
ret
.two
call BattleBGEffects_ResetVideoHRAM
ld a, $e4
ld [wBGP], a
ld [wOBP1], a
ret
.DMG_LYOverrideLoads:
ld hl, wLYOverridesBackup
.loop1
ld [hl], d
inc hl
dec b
jr nz, .loop1
.loop2
ld [hl], e
inc hl
dec c
jr nz, .loop2
ret
.cgb
ld de, .Jumptable
call BatttleBGEffects_GetNamedJumptablePointer
jp hl
@ -2397,71 +2299,6 @@ BattleBGEffect_GetNthDMGPal:
BGEffect_RapidCyclePals:
; Last index in DE: $fe signals a loop, $ff signals end
ldh a, [hCGB]
and a
jr nz, .cgb
push de
ld de, .Jumptable_DMG
call BatttleBGEffects_GetNamedJumptablePointer
pop de
jp hl
.Jumptable_DMG:
dw .zero_dmg
dw .one_dmg
dw .two_dmg
.zero_dmg
call BattleBGEffects_IncAnonJumptableIndex
ld a, $e4
call BattleBGEffects_SetLYOverrides
ld a, $47
call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd]
inc a
ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_PARAM
add hl, bc
ld a, [hl]
ld [hl], $0
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], a
ret
.one_dmg
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld a, [hl]
and $f
jr z, .okay_1_dmg
dec [hl]
ret
.okay_1_dmg
ld a, [hl]
swap a
or [hl]
ld [hl], a
call BattleBGEffect_GetFirstDMGPal
jr c, .okay_2_dmg
call BGEffect_FillLYOverridesBackup
ret
.okay_2_dmg
ld hl, BG_EFFECT_STRUCT_PARAM
add hl, bc
dec [hl]
ret
.two_dmg
call BattleBGEffects_ResetVideoHRAM
ld a, %11100100
ldh [rBGP], a
call EndBattleBGEffect
ret
.cgb
push de
ld de, .Jumptable_CGB
call BatttleBGEffects_GetNamedJumptablePointer
@ -2919,11 +2756,6 @@ BGEffect_CheckFlyDigStatus:
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret
BattleBGEffects_CheckSGB:
ldh a, [hSGB]
and a
ret
BattleBGEffects_Sine:
ld e, a
callfar BattleAnim_Sine_e

8
engine/battle_anims/functions.asm
View File

@ -3399,15 +3399,7 @@ BattleAnimFunction_SkyAttack:
srl a
ld e, a
ld d, 0
ldh a, [hSGB]
and a
jr nz, .sgb
ld hl, .GBCPals
jr .got_pals
.sgb
ld hl, .SGBPals
.got_pals
add hl, de
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_VAR1

58
engine/debug/color_picker.asm
View File

@ -34,14 +34,6 @@
DebugColorPicker: ; unreferenced
; A debug menu to test monster and trainer palettes at runtime.
ldh a, [hCGB]
and a
jr nz, .cgb
ldh a, [hSGB]
and a
ret z
.cgb
ldh a, [hInMenu]
push af
ld a, TRUE
@ -180,10 +172,6 @@ DebugColor_LoadGFX:
ret
DebugColor_InitPalettes:
ldh a, [hCGB]
and a
ret z
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals2)
@ -439,17 +427,11 @@ DebugColor_SetRGBMeter:
ret
DebugColor_UpdateScreen:
ldh a, [hCGB]
and a
jr z, .sgb
ld a, 2
ldh [hBGMapMode], a
call DelayFrame
call DelayFrame
call DelayFrame
.sgb
call WaitBGMap
ld a, DEBUGCOLORMAIN_UPDATEPALETTES
@ -457,11 +439,6 @@ DebugColor_UpdateScreen:
ret
DebugColor_UpdatePalettes:
ldh a, [hCGB]
and a
jr z, .sgb
; cgb
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals2)
@ -489,41 +466,6 @@ DebugColor_UpdatePalettes:
ldh [rSVBK], a
ret
.sgb
ld hl, wSGBPals
ld a, 1
ld [hli], a
ld a, LOW(PALRGB_WHITE)
ld [hli], a
ld a, HIGH(PALRGB_WHITE)
ld [hli], a
ld a, [wDebugLightColor + 0]
ld [hli], a
ld a, [wDebugLightColor + 1]
ld [hli], a
ld a, [wDebugDarkColor + 0]
ld [hli], a
ld a, [wDebugDarkColor + 1]
ld [hli], a
xor a
ld [hli], a
ld [hli], a
ld [hl], a
ld hl, wSGBPals
call DebugColor_PushSGBPals
hlcoord 10, 2
ld de, wDebugLightColor
call DebugColor_PrintHexColor
hlcoord 15, 2
ld de, wDebugDarkColor
call DebugColor_PrintHexColor
ld a, DEBUGCOLORMAIN_JOYPAD
ld [wJumptableIndex], a
ret
DebugColor_PrintHexColor:
inc hl
inc hl

15
engine/events/heal_machine_anim.asm
View File

@ -155,13 +155,6 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
dbsprite 11, 7, 5, 1, $7d, PAL_OW_TREE | OBP_NUM
.LoadPalettes:
call IsCGB
jr nz, .cgb
ld a, %11100000
ldh [rOBP1], a
ret
.cgb
ld hl, .palettes
ld de, wOBPals2 palette PAL_OW_TREE
ld bc, 1 palettes
@ -187,14 +180,6 @@ INCLUDE "gfx/overworld/heal_machine.pal"
ret
.FlashPalettes:
call IsCGB
jr nz, .go
ldh a, [rOBP1]
xor %00101000
ldh [rOBP1], a
ret
.go
ldh a, [rSVBK]
push af
ld a, BANK(wOBPals2)

2
engine/events/mom.asm
View File

@ -438,7 +438,7 @@ Mom_ContinueMenuSetup:
lb bc, PRINTNUM_MONEY | PRINTNUM_LEADINGZEROS | 3, 6
call PrintNum
call UpdateSprites
call CGBOnly_CopyTilemapAtOnce
call CopyTilemapAtOnce
ret
Mom_Wait10Frames:

22
engine/events/poisonstep_pals.asm
View File

@ -1,30 +1,8 @@
LoadPoisonBGPals:
call .LoadPals
ldh a, [hCGB]
and a
ret nz
; code was probably dummied out here
ret
.LoadPals:
ldh a, [hCGB]
and a
jr nz, .cgb
ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES
cp DARKNESS_F
ld a, %00000000
jr z, .convert_pals
ld a, %10101010
.convert_pals
call DmgToCgbBGPals
ld c, 4
call DelayFrames
farcall _UpdateTimePals
ret
.cgb
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals2)

17
engine/games/card_flip.asm
View File

@ -443,11 +443,6 @@ CardFlip_DisplayCardFaceUp:
jr nz, .row
pop hl
; Pointless CGB check
ldh a, [hCGB]
and a
ret z
; Set the attributes
ld de, wAttrmap - wTilemap
add hl, de
@ -1313,14 +1308,6 @@ ChooseCard_HandleJoypad:
CardFlip_UpdateCursorOAM:
call ClearSprites
ldh a, [hCGB]
and a
jr nz, .skip
ldh a, [hVBlankCounter]
and $4
ret nz
.skip
call CollapseCursorPosition
add hl, hl
add hl, hl
@ -1546,10 +1533,6 @@ ENDM
dbsprite 1, 1, 0, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY
CardFlip_InitAttrPals:
ldh a, [hCGB]
and a
ret z
hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a

5
engine/games/slot_machine.asm
View File

@ -172,11 +172,6 @@ Slots_GetPals:
ld a, %11100100
call DmgToCgbBGPals
lb de, %11100100, %11100100
ldh a, [hCGB]
and a
jr nz, .cgb
lb de, %11000000, %11100100
.cgb
call DmgToCgbObjPals
ret

78
engine/gfx/color.asm
View File

@ -161,77 +161,6 @@ INCLUDE "gfx/intro/gs_magikarp_bg.pal"
.MagikarpOBPal:
INCLUDE "gfx/intro/gs_magikarp_ob.pal"
Intro_LoadAllPal0: ; unreferenced
call CheckCGB
ret nz
ldh a, [hSGB]
and a
ret z
ld hl, BlkPacket_AllPal0
jp PushSGBPals
Intro_LoadBetaIntroVenusaurPalettes: ; unreferenced
call CheckCGB
jr nz, .cgb
ldh a, [hSGB]
and a
ret z
ld hl, PalPacket_BetaIntroVenusaur
jp PushSGBPals
.cgb
ld de, wOBPals1
ld a, PREDEFPAL_BETA_INTRO_VENUSAUR
call GetPredefPal
jp LoadHLPaletteIntoDE
Intro_LoadPackPalettes: ; unreferenced
call CheckCGB
jr nz, .cgb
ldh a, [hSGB]
and a
ret z
ld hl, PalPacket_Pack
jp PushSGBPals
.cgb
ld de, wOBPals1
ld a, PREDEFPAL_PACK
call GetPredefPal
jp LoadHLPaletteIntoDE
GSIntro_LoadMonPalette: ; unreferenced
call CheckCGB
jr nz, .cgb
ldh a, [hSGB]
and a
ret z
ld a, c
push af
ld hl, PalPacket_Pal01
ld de, wSGBPals
ld bc, PALPACKET_LENGTH
call CopyBytes
pop af
call GetMonPalettePointer
ld a, [hli]
ld [wSGBPals + 3], a
ld a, [hli]
ld [wSGBPals + 4], a
ld a, [hli]
ld [wSGBPals + 5], a
ld a, [hl]
ld [wSGBPals + 6], a
ld hl, wSGBPals
jp PushSGBPals
.cgb
ld de, wOBPals1
ld a, c
call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
ret
LoadTrainerClassPaletteAsNthBGPal:
ld a, [wTrainerClass]
call GetTrainerPalettePointer
@ -269,13 +198,6 @@ LoadNthMiddleBGPal:
ret
LoadBetaPokerPalettes: ; unreferenced
ldh a, [hCGB]
and a
jr nz, .cgb
ld hl, wBetaPokerSGBPals
jp PushSGBPals
.cgb
ld a, [wBetaPokerSGBCol]
ld c, a
ld a, [wBetaPokerSGBRow]

8
engine/gfx/sprites.asm
View File

@ -545,13 +545,7 @@ Sprites_Sine:
calc_sine_wave
AnimateEndOfExpBar:
ldh a, [hSGB]
ld de, EndOfExpBarGFX
and a
jr z, .load
ld de, SGBEndOfExpBarGFX
.load
ld hl, vTiles0 tile $00
lb bc, BANK(EndOfExpBarGFX), 1
call Request2bpp
@ -609,8 +603,6 @@ AnimateEndOfExpBar:
EndOfExpBarGFX:
INCBIN "gfx/battle/expbarend.2bpp"
SGBEndOfExpBarGFX:
INCBIN "gfx/battle/expbarend_sgb.2bpp"
ClearSpriteAnims2:
push hl

4
engine/menus/savemenu_copytilemapatonce.asm
View File

@ -1,8 +1,4 @@
SaveMenu_CopyTilemapAtOnce:
ldh a, [hCGB]
and a
jp z, WaitBGMap
; The following is a modified version of _CopyTilemapAtOnce
; that waits for [rLY] to be $60 instead of $80 - 1.
ldh a, [hBGMapMode]

11
engine/movie/trade_animation.asm
View File

@ -162,9 +162,7 @@ RunTradeAnimScript:
call DisableLCD
call LoadFontsBattleExtra
callfar ClearSpriteAnims
ldh a, [hCGB]
and a
jr z, .NotCGB
ld a, $1
ldh [rVBK], a
ld hl, vTiles0
@ -174,7 +172,6 @@ RunTradeAnimScript:
ld a, $0
ldh [rVBK], a
.NotCGB:
hlbgcoord 0, 0
ld bc, VRAM_End - vBGMap0
ld a, " "
@ -1302,13 +1299,7 @@ TradeAnim_CopyBoxFromDEtoHL:
ret
TradeAnim_NormalPals:
ldh a, [hSGB]
and a
ld a, %11100100 ; 3,2,1,0
jr z, .not_sgb
ld a, $f0
.not_sgb
call DmgToCgbObjPal0
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals

4
engine/overworld/warp_connection.asm
View File

@ -255,10 +255,6 @@ LoadMapTimeOfDay:
.PushAttrmap:
decoord 0, 0
call .copy
ldh a, [hCGB]
and a
ret z
decoord 0, 0, wAttrmap
ld a, $1
ldh [rVBK], a

3
engine/phone/phonering_copytilemapatonce.asm
View File

@ -1,7 +1,4 @@
PhoneRing_CopyTilemapAtOnce:
ldh a, [hCGB]
and a
jp z, WaitBGMap
ld a, [wSpriteUpdatesEnabled]
cp $0
jp z, WaitBGMap

31
engine/pokedex/pokedex.asm
View File

@ -218,7 +218,7 @@ Pokedex_InitMainScreen:
ld a, 7
ld [wDexListingHeight], a
call Pokedex_PrintListing
call Pokedex_SetBGMapMode_3ifDMG_4ifCGB
call Pokedex_SetBGMapMode4
call Pokedex_ResetBGMapMode
call Pokedex_DrawMainScreenBG
ld a, POKEDEX_SCX
@ -814,12 +814,6 @@ Pokedex_UpdateUnownMode:
ld a, DEXSTATE_OPTION_SCR
ld [wJumptableIndex], a
call DelayFrame
call Pokedex_CheckSGB
jr nz, .decompress
farcall LoadSGBPokedexGFX2
jr .done
.decompress
ld hl, PokedexLZ
ld de, vTiles2 tile $31
lb bc, BANK(PokedexLZ), 58
@ -2420,12 +2414,6 @@ Pokedex_LoadGFX:
ld hl, vTiles2 tile $60
ld bc, $20 tiles
call Pokedex_InvertTiles
call Pokedex_CheckSGB
jr nz, .LoadPokedexLZ
farcall LoadSGBPokedexGFX
jr .LoadPokedexSlowpokeLZ
.LoadPokedexLZ:
ld hl, PokedexLZ
ld de, vTiles2 tile $31
call Decompress
@ -2461,14 +2449,6 @@ INCBIN "gfx/pokedex/pokedex.2bpp.lz"
PokedexSlowpokeLZ:
INCBIN "gfx/pokedex/slowpoke.2bpp.lz"
Pokedex_CheckSGB:
ldh a, [hCGB]
or a
ret nz
ldh a, [hSGB]
dec a
ret
Pokedex_LoadUnownFont:
ld a, BANK(sScratch)
call OpenSRAM
@ -2553,15 +2533,6 @@ Pokedex_SetBGMapMode4:
call DelayFrames
ret
Pokedex_SetBGMapMode_3ifDMG_4ifCGB:
ldh a, [hCGB]
and a
jr z, .DMG
call Pokedex_SetBGMapMode4
.DMG:
call Pokedex_SetBGMapMode3
ret
Pokedex_ResetBGMapMode:
xor a
ldh [hBGMapMode], a

19
engine/pokegear/pokegear.asm
View File

@ -104,9 +104,6 @@ PokeGear:
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
ldh a, [hCGB]
and a
ret z
ld a, %11100100
call DmgToCgbObjPal0
ret
@ -256,14 +253,10 @@ InitPokegearTilemap:
ret
.UpdateBGMap:
ldh a, [hCGB]
and a
jr z, .dmg
ld a, $2
ldh [hBGMapMode], a
ld c, 3
call DelayFrames
.dmg
call WaitBGMap
ret
@ -1676,14 +1669,9 @@ _TownMap:
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
ldh a, [hCGB]
and a
jr z, .dmg
ld a, %11100100
call DmgToCgbObjPal0
call DelayFrame
.dmg
ld d, 0
ld e, 1
call .loop
@ -2387,19 +2375,14 @@ TownMapBGUpdate:
ldh [hBGMapAddress], a
ld a, h
ldh [hBGMapAddress + 1], a
; Only update palettes on CGB
ldh a, [hCGB]
and a
jr z, .tiles
; BG Map mode 2 (palettes)
ld a, 2
ldh [hBGMapMode], a
; The BG Map is updated in thirds, so we wait
; 3 frames to update the whole screen's palettes.
ld c, 3
call DelayFrames
.tiles
; Update BG Map tiles
call WaitBGMap
; Turn off BG Map update

Some files were not shown because too many files have changed in this diff Show More