From ee8217d4324abbde41309ec4b68d1ff4e89a9b21 Mon Sep 17 00:00:00 2001 From: Ethan Date: Fri, 13 Sep 2024 22:20:58 +0900 Subject: [PATCH] eth changes --- src/world/common/todo/LoadPartyImage.inc.c | 57 ++++++++++------------ 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/src/world/common/todo/LoadPartyImage.inc.c b/src/world/common/todo/LoadPartyImage.inc.c index afc026f237..1c228d1038 100644 --- a/src/world/common/todo/LoadPartyImage.inc.c +++ b/src/world/common/todo/LoadPartyImage.inc.c @@ -5,56 +5,51 @@ #error "Define PARTY_IMAGE to the asset name to use LoadPartyImage." #endif -#ifdef SHIFT -//this is required on modern compilers to guarantee the raster comes directly after the palette -typedef struct Img { - u16 palette[256]; - u8 raster[0x3D90]; // 10 bytes added for padding: 150 * 105 = 0x3D86 +#define PARTY_IMAGE_PALETTE_SIZE 256 +#define PARTY_IMAGE_WIDTH 150 +#define PARTY_IMAGE_HEIGHT 105 + +typedef struct PartyImage { + PAL_BIN palette[PARTY_IMAGE_PALETTE_SIZE]; + IMG_BIN raster[PARTY_IMAGE_WIDTH * PARTY_IMAGE_HEIGHT]; + char padding[10]; } PartyImage; -static PartyImage img; - API_CALLABLE(N(LoadPartyImage)) { + #ifdef SHIFT + static PartyImage img; + #else + static PAL_BIN palette[PARTY_IMAGE_PALETTE_SIZE]; + static IMG_BIN raster[PARTY_IMAGE_WIDTH * PARTY_IMAGE_HEIGHT]; + static u8 padding[10]; + #endif static MessageImageData image; u32 decompressedSize; void* compressed = load_asset_by_name(PARTY_IMAGE, &decompressedSize); + #ifdef SHIFT decode_yay0(compressed, &img); + #else + decode_yay0(compressed, palette); + #endif + general_heap_free(compressed); + #ifdef SHIFT image.raster = img.raster; image.palette = img.palette; - image.width = 150; - image.height = 105; - image.format = G_IM_FMT_CI; - image.bitDepth = G_IM_SIZ_8b; - set_message_images(&image); - return ApiStatus_DONE2; -} -#else - -API_CALLABLE(N(LoadPartyImage)) { - static PAL_BIN palette[256]; - static IMG_BIN raster[0x3D90]; // 10 bytes added for padding: 150 * 105 = 3D86 - static MessageImageData image; - - u32 decompressedSize; - void* compressed = load_asset_by_name(PARTY_IMAGE, &decompressedSize); - - decode_yay0(compressed, &palette); - general_heap_free(compressed); - + #else image.raster = raster; image.palette = palette; - image.width = 150; - image.height = 105; + #endif + + image.width = PARTY_IMAGE_WIDTH; + image.height = PARTY_IMAGE_HEIGHT; image.format = G_IM_FMT_CI; image.bitDepth = G_IM_SIZ_8b; set_message_images(&image); return ApiStatus_DONE2; } -#endif - #undef PARTY_IMAGE