summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-07-19 18:59:11 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-07-19 18:59:11 -0400
commitc91db56f422a6604d00a2df4e8c9f14879f70928 (patch)
tree5c12cc99bfaeccb4081fb19942683142a7c495b4
parentdb4817ed1b9d3e8e8acee824202d897f72665a4d (diff)
Identify more palettes in CBG layouts
-rw-r--r--engine/gfx/cgb_layouts.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index c0f0dbf5..005cf5b0 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -295,7 +295,7 @@ _CGB_BillsPC:
call WipeAttrmap
hlcoord 1, 4, wAttrmap
lb bc, 7, 7
- ld a, $1
+ ld a, $1 ; mon palette
call FillBoxCGB
call InitPartyMenuOBPals
call ApplyAttrmap
@@ -317,7 +317,7 @@ _CGB_Unknown: ; unreferenced
call WipeAttrmap
hlcoord 1, 1, wAttrmap
lb bc, 7, 7
- ld a, $1
+ ld a, $1 ; mon palette
call FillBoxCGB
call InitPartyMenuOBPals
call ApplyAttrmap
@@ -340,7 +340,7 @@ _CGB_PokedexUnownMode:
call WipeAttrmap
hlcoord 7, 5, wAttrmap
lb bc, 7, 7
- ld a, $1
+ ld a, $1 ; mon palette
call FillBoxCGB
call InitPartyMenuOBPals
call ApplyAttrmap
@@ -357,43 +357,43 @@ _CGB_SlotMachine:
call WipeAttrmap
hlcoord 0, 2, wAttrmap
lb bc, 10, 3
- ld a, $2
+ ld a, $2 ; "3" palette
call FillBoxCGB
hlcoord 17, 2, wAttrmap
lb bc, 10, 3
- ld a, $2
+ ld a, $2 ; "3" palette
call FillBoxCGB
hlcoord 0, 4, wAttrmap
lb bc, 6, 3
- ld a, $3
+ ld a, $3 ; "2" palette
call FillBoxCGB
hlcoord 17, 4, wAttrmap
lb bc, 6, 3
- ld a, $3
+ ld a, $3 ; "2" palette
call FillBoxCGB
hlcoord 0, 6, wAttrmap
lb bc, 2, 3
- ld a, $4
+ ld a, $4 ; "1" palette
call FillBoxCGB
hlcoord 17, 6, wAttrmap
lb bc, 2, 3
- ld a, $4
+ ld a, $4 ; "1" palette
call FillBoxCGB
hlcoord 4, 2, wAttrmap
lb bc, 2, 12
- ld a, $1
+ ld a, $1 ; Vileplume palette
call FillBoxCGB
hlcoord 3, 2, wAttrmap
lb bc, 10, 1
- ld a, $1
+ ld a, $1 ; lights palette
call FillBoxCGB
hlcoord 16, 2, wAttrmap
lb bc, 10, 1
- ld a, $1
+ ld a, $1 ; lights palette
call FillBoxCGB
hlcoord 0, 12, wAttrmap
- ld bc, $78
- ld a, $7
+ ld bc, 6 * SCREEN_WIDTH
+ ld a, $7 ; text palette
call ByteFill
call ApplyAttrmap
call ApplyPals
@@ -769,22 +769,22 @@ _CGB_Pokepic:
sub c
inc a
ld c, a
- ld a, $0
+ ld a, PAL_BG_GRAY
call FillBoxCGB
call ApplyAttrmap
ret
-_CGB_MagnetTrain:
+_CGB_MagnetTrain: ; unused
ld hl, PalPacket_MagnetTrain + 1
call CopyFourPalettes
call WipeAttrmap
hlcoord 0, 4, wAttrmap
lb bc, 10, SCREEN_WIDTH
- ld a, $2
+ ld a, PAL_BG_GREEN
call FillBoxCGB
hlcoord 0, 6, wAttrmap
lb bc, 6, SCREEN_WIDTH
- ld a, $1
+ ld a, PAL_BG_RED
call FillBoxCGB
call ApplyAttrmap
call ApplyPals