From 6c59c2fca70adac3f8fd0e09a53abb14ab41869e Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Fri, 14 Aug 2020 22:46:53 +0100 Subject: [PATCH] swap bg_header raster/palette fields --- include/common_structs.h | 9 +++++++++ src/code_dc470_len_14c0.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/common_structs.h b/include/common_structs.h index aa5a26fc38..e92c078165 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1241,6 +1241,15 @@ typedef struct tile_descriptor { /* 0x2F */ u8 filtering; } tile_descriptor; // size = 0x30 +typedef struct { + /* 0x00 */ u32 palette; + /* 0x04 */ u32 raster; + /* 0x08 */ u16 startX; + /* 0x0A */ u16 startY; + /* 0x0C */ u16 width; + /* 0x0E */ u16 height; +} bg_header; // size = 0x10 + typedef struct model_group_data { /* 0x00 */ UNK_PTR transformMatrix; /* 0x04 */ UNK_PTR lightingGroup; diff --git a/src/code_dc470_len_14c0.c b/src/code_dc470_len_14c0.c index 94d67ccfad..3c7b0078da 100644 --- a/src/code_dc470_len_14c0.c +++ b/src/code_dc470_len_14c0.c @@ -37,8 +37,8 @@ void read_background_size(bg_header *bg) { gameStatus->backgroundMaxH = bg->height; gameStatus->backgroundMinW = bg->startX; gameStatus->backgroundMinH = bg->startY; - gameStatus->backgroundRaster = bg->palette; // wtf? - gameStatus->backgroundPalette = bg->raster; + gameStatus->backgroundRaster = bg->raster; + gameStatus->backgroundPalette = bg->palette; gameStatus->enableBackground |= 1; }