falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix LoadPartyImage for shift builds

This commit is contained in:
Rainchus 2024-09-12 17:49:29 -05:00
parent 2cfb7258d1
commit 3e6d7df86b
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/world/common/todo/LoadPartyImage.inc.c
View File

@ -5,6 +5,35 @@
#error "Define PARTY_IMAGE to the asset name to use LoadPartyImage." #error "Define PARTY_IMAGE to the asset name to use LoadPartyImage."
#endif #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
} PartyImage;
static PartyImage img;
API_CALLABLE(N(LoadPartyImage)) {
static MessageImageData image;
u32 decompressedSize;
void* compressed = load_asset_by_name(PARTY_IMAGE, &decompressedSize);
decode_yay0(compressed, &img);
general_heap_free(compressed);
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)) { API_CALLABLE(N(LoadPartyImage)) {
static PAL_BIN palette[256]; static PAL_BIN palette[256];
static IMG_BIN raster[0x3D90]; // 10 bytes added for padding: 150 * 105 = 3D86 static IMG_BIN raster[0x3D90]; // 10 bytes added for padding: 150 * 105 = 3D86
@ -26,4 +55,6 @@ API_CALLABLE(N(LoadPartyImage)) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
#endif
#undef PARTY_IMAGE #undef PARTY_IMAGE