thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pack and Party SGB colors

Browse source
This commit is contained in:
Zeta_Null 2025-08-01 21:14:14 -04:00
parent ad183ad01c
commit 1c209cbfa2
1 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
engine/gfx/cgb_layouts.asm
View file

@ -702,10 +702,26 @@ _CGB_PartyMenu:
call CopyFourPalettes call CopyFourPalettes
call InitPartyMenuBGPal0 call InitPartyMenuBGPal0
call InitPartyMenuBGPal7 call InitPartyMenuBGPal7
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
jr z, .SGBmode
call InitPartyMenuOBPals call InitPartyMenuOBPals
call ApplyAttrmap call ApplyAttrmap
ret ret
.SGBmode
ld a, PREDEFPAL_PARTY_ICON ; SGB Party object Palette
call GetPredefPal
ld de, wOBPals1
; Copy 8 OB palettes
ld b, 8
.ob_loop
call LoadHLOBPaletteIntoDE
dec b
jr nz, .ob_loop
call ApplyAttrmap
ret
_CGB_Evolution: _CGB_Evolution:
ld de, wBGPals1 ld de, wBGPals1
ld a, c ld a, c
@ -941,9 +957,7 @@ INCLUDE "gfx/trainer_card/badges.pal"
; Copy 8 OB palettes ; Copy 8 OB palettes
ld b, 8 ld b, 8
.ob_loop .ob_loop
push hl call LoadHLOBPaletteIntoDE
call LoadHLPaletteIntoDE
pop hl
dec b dec b
jr nz, .ob_loop jr nz, .ob_loop
ret ret
@ -1102,9 +1116,7 @@ INCLUDE "gfx/trainer_card/kanto_badges.pal"
; Copy 8 OB palettes ; Copy 8 OB palettes
ld b, 8 ld b, 8
.ob_loop .ob_loop
push hl call LoadHLOBPaletteIntoDE
call LoadHLPaletteIntoDE
pop hl
dec b dec b
jr nz, .ob_loop jr nz, .ob_loop
ret ret
@ -1157,6 +1169,10 @@ _CGB_PokedexSearchOption:
_CGB_PackPals: _CGB_PackPals:
; pack pals ; pack pals
ld a, [wOptions2] ; Are we in SGB mode?
and 1 << MENU_ACCOUNT
jp z, .SGBpack ; Get SGB style palettes
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .tutorial_male jr z, .tutorial_male
@ -1218,6 +1234,26 @@ INCLUDE "gfx/pack/pack_f.pal"
.EnbyPackPals: .EnbyPackPals:
INCLUDE "gfx/pack/pack_nb.pal" INCLUDE "gfx/pack/pack_nb.pal"
.SGBpack
ld a, PREDEFPAL_PACK ; SGB Pack Palette
call GetPredefPal
ld de, wBGPals1
; Copy 8 BG palettes
ld b, 8
.bg_loop
push hl
call LoadHLPaletteIntoDE
pop hl
dec b
jr nz, .bg_loop
; Copy 8 OB palettes
ld b, 8
.ob_loop
call LoadHLOBPaletteIntoDE
dec b
jr nz, .ob_loop
ret
_CGB_Pokepic: _CGB_Pokepic:
call _CGB_MapPals call _CGB_MapPals
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH