Identify more palettes in CBG layouts

This commit is contained in:
Rangi
2021-07-19 18:59:16 -04:00
parent 1e9befdf18
commit d93c13c94c

View File

@@ -313,7 +313,7 @@ _CGB_BillsPC:
call WipeAttrmap call WipeAttrmap
hlcoord 1, 4, wAttrmap hlcoord 1, 4, wAttrmap
lb bc, 7, 7 lb bc, 7, 7
ld a, $1 ld a, $1 ; mon palette
call FillBoxCGB call FillBoxCGB
call InitPartyMenuOBPals call InitPartyMenuOBPals
call ApplyAttrmap call ApplyAttrmap
@@ -335,7 +335,7 @@ _CGB_Unknown: ; unreferenced
call WipeAttrmap call WipeAttrmap
hlcoord 1, 1, wAttrmap hlcoord 1, 1, wAttrmap
lb bc, 7, 7 lb bc, 7, 7
ld a, $1 ld a, $1 ; mon palette
call FillBoxCGB call FillBoxCGB
call InitPartyMenuOBPals call InitPartyMenuOBPals
call ApplyAttrmap call ApplyAttrmap
@@ -358,7 +358,7 @@ _CGB_PokedexUnownMode:
call WipeAttrmap call WipeAttrmap
hlcoord 7, 5, wAttrmap hlcoord 7, 5, wAttrmap
lb bc, 7, 7 lb bc, 7, 7
ld a, $1 ld a, $1 ; mon palette
call FillBoxCGB call FillBoxCGB
call InitPartyMenuOBPals call InitPartyMenuOBPals
call ApplyAttrmap call ApplyAttrmap
@@ -376,43 +376,43 @@ _CGB_SlotMachine:
call WipeAttrmap call WipeAttrmap
hlcoord 0, 2, wAttrmap hlcoord 0, 2, wAttrmap
lb bc, 10, 3 lb bc, 10, 3
ld a, $2 ld a, $2 ; "3" palette
call FillBoxCGB call FillBoxCGB
hlcoord 17, 2, wAttrmap hlcoord 17, 2, wAttrmap
lb bc, 10, 3 lb bc, 10, 3
ld a, $2 ld a, $2 ; "3" palette
call FillBoxCGB call FillBoxCGB
hlcoord 0, 4, wAttrmap hlcoord 0, 4, wAttrmap
lb bc, 6, 3 lb bc, 6, 3
ld a, $3 ld a, $3 ; "2" palette
call FillBoxCGB call FillBoxCGB
hlcoord 17, 4, wAttrmap hlcoord 17, 4, wAttrmap
lb bc, 6, 3 lb bc, 6, 3
ld a, $3 ld a, $3 ; "2" palette
call FillBoxCGB call FillBoxCGB
hlcoord 0, 6, wAttrmap hlcoord 0, 6, wAttrmap
lb bc, 2, 3 lb bc, 2, 3
ld a, $4 ld a, $4 ; "1" palette
call FillBoxCGB call FillBoxCGB
hlcoord 17, 6, wAttrmap hlcoord 17, 6, wAttrmap
lb bc, 2, 3 lb bc, 2, 3
ld a, $4 ld a, $4 ; "1" palette
call FillBoxCGB call FillBoxCGB
hlcoord 4, 2, wAttrmap hlcoord 4, 2, wAttrmap
lb bc, 2, 12 lb bc, 2, 12
ld a, $1 ld a, $1 ; Vileplume palette
call FillBoxCGB call FillBoxCGB
hlcoord 3, 2, wAttrmap hlcoord 3, 2, wAttrmap
lb bc, 10, 1 lb bc, 10, 1
ld a, $1 ld a, $1 ; lights palette
call FillBoxCGB call FillBoxCGB
hlcoord 16, 2, wAttrmap hlcoord 16, 2, wAttrmap
lb bc, 10, 1 lb bc, 10, 1
ld a, $1 ld a, $1 ; lights palette
call FillBoxCGB call FillBoxCGB
hlcoord 0, 12, wAttrmap hlcoord 0, 12, wAttrmap
ld bc, $78 ld bc, 6 * SCREEN_WIDTH
ld a, $7 ld a, $7 ; text palette
call ByteFill call ByteFill
call ApplyAttrmap call ApplyAttrmap
call ApplyPals call ApplyPals
@@ -848,22 +848,22 @@ _CGB_Pokepic:
sub c sub c
inc a inc a
ld c, a ld c, a
ld a, $0 ld a, PAL_BG_GRAY
call FillBoxCGB call FillBoxCGB
call ApplyAttrmap call ApplyAttrmap
ret ret
_CGB_MagnetTrain: _CGB_MagnetTrain: ; unused
ld hl, PalPacket_MagnetTrain + 1 ld hl, PalPacket_MagnetTrain + 1
call CopyFourPalettes call CopyFourPalettes
call WipeAttrmap call WipeAttrmap
hlcoord 0, 4, wAttrmap hlcoord 0, 4, wAttrmap
lb bc, 10, SCREEN_WIDTH lb bc, 10, SCREEN_WIDTH
ld a, $2 ld a, PAL_BG_GREEN
call FillBoxCGB call FillBoxCGB
hlcoord 0, 6, wAttrmap hlcoord 0, 6, wAttrmap
lb bc, 6, SCREEN_WIDTH lb bc, 6, SCREEN_WIDTH
ld a, $1 ld a, PAL_BG_RED
call FillBoxCGB call FillBoxCGB
call ApplyAttrmap call ApplyAttrmap
call ApplyPals call ApplyPals