diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-18 11:16:24 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-18 11:16:24 -0500 |
| commit | 226d1812b34dad7ee0bb758c4c4970a731c9c79e (patch) | |
| tree | 0bf722b4df1ab0376faa6b6590a573bde116b787 /engine | |
| parent | 99f26a60973b33185d46720edfad8067c35e1a5a (diff) | |
Only graphics data goes in gfx/
Introduce PALRGB_WHITE constant for $7fff
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/color.asm | 18 | ||||
| -rw-r--r-- | engine/init_hof_credits.asm | 4 | ||||
| -rw-r--r-- | engine/sgb_layouts.asm | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engine/color.asm b/engine/color.asm index 827a49184..870dfd85b 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -514,10 +514,10 @@ LoadPalette_White_Col1_Col2_Black: ld a, BANK(wBGPals1) ld [rSVBK], a - ld a, LOW(palred 31 + palgreen 31 + palblue 31) + ld a, LOW(PALRGB_WHITE) ld [de], a inc de - ld a, HIGH(palred 31 + palgreen 31 + palblue 31) + ld a, HIGH(PALRGB_WHITE) ld [de], a inc de @@ -903,9 +903,9 @@ InitCGBPals:: ld [rBGPI], a ld c, 4 * 8 .bgpals_loop - ld a, LOW(palred 31 + palgreen 31 + palblue 31) + ld a, LOW(PALRGB_WHITE) ld [rBGPD], a - ld a, HIGH(palred 31 + palgreen 31 + palblue 31) + ld a, HIGH(PALRGB_WHITE) ld [rBGPD], a dec c jr nz, .bgpals_loop @@ -913,9 +913,9 @@ InitCGBPals:: ld [rOBPI], a ld c, 4 * 8 .obpals_loop - ld a, LOW(palred 31 + palgreen 31 + palblue 31) + ld a, LOW(PALRGB_WHITE) ld [rOBPD], a - ld a, HIGH(palred 31 + palgreen 31 + palblue 31) + ld a, HIGH(PALRGB_WHITE) ld [rOBPD], a dec c jr nz, .obpals_loop @@ -934,9 +934,9 @@ InitCGBPals:: .LoadWhitePals: ld c, 4 * 16 .loop - ld a, LOW(palred 31 + palgreen 31 + palblue 31) + ld a, LOW(PALRGB_WHITE) ld [hli], a - ld a, HIGH(palred 31 + palgreen 31 + palblue 31) + ld a, HIGH(PALRGB_WHITE) ld [hli], a dec c jr nz, .loop @@ -1189,7 +1189,7 @@ SGBDelayCycles: INCLUDE "gfx/sgb/blk_packets.asm" INCLUDE "gfx/sgb/pal_packets.asm" -INCLUDE "gfx/sgb/data_snd_packets.asm" +INCLUDE "data/sgb_ctrl_packets.asm" PredefPals: INCLUDE "gfx/sgb/predef.pal" diff --git a/engine/init_hof_credits.asm b/engine/init_hof_credits.asm index e72ae011c..d8eb7670a 100644 --- a/engine/init_hof_credits.asm +++ b/engine/init_hof_credits.asm @@ -46,9 +46,9 @@ InitDisplayForRedCredits: ; 4e8c2 ld hl, wBGPals1 ld c, 4 tiles .load_white_palettes - ld a, LOW(palred 31 + palgreen 31 + palblue 31) + ld a, LOW(PALRGB_WHITE) ld [hli], a - ld a, HIGH(palred 31 + palgreen 31 + palblue 31) + ld a, HIGH(PALRGB_WHITE) ld [hli], a dec c jr nz, .load_white_palettes diff --git a/engine/sgb_layouts.asm b/engine/sgb_layouts.asm index a2d0201a2..bc9f35c27 100644 --- a/engine/sgb_layouts.asm +++ b/engine/sgb_layouts.asm @@ -595,7 +595,7 @@ endr ret ; 8a45 -INCLUDE "gfx/sgb/roof_pal_inds.asm" +INCLUDE "data/maps/sgb_roof_pal_inds.asm" _LoadSGBLayout_ReturnFromJumpTable: ; 8a60 push de |