mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-22 01:12:19 -05:00
Code Issues Projects Releases Wiki Activity

fix remaining unaligned assets for mac (#3138)

Browse Source
This commit is contained in:
Adam Bird 2023-09-10 19:21:26 +02:00 committed by GitHub
parent b2ad348508
commit 1d9adcd5a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soh/src/code/gfxprint.c
View File

@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "align_asset_macro.h"
u16 sGfxPrintFontTLUT[64] = { u16 sGfxPrintFontTLUT[64] = {
0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000,
@ -128,8 +129,12 @@ u8 sGfxPrintFontData[(16 * 256) / 2] = {
// Can be used to set GFXP_FLAG_ENLARGE by default // Can be used to set GFXP_FLAG_ENLARGE by default
static u8 sDefaultSpecialFlags; static u8 sDefaultSpecialFlags;
static const char rGfxPrintFontData[] = "__OTR__textures/font/sGfxPrintFontData";
static const char rGfxPrintFontDataAlt[] = "__OTR__alt/textures/font/sGfxPrintFontData"; #define drGfxPrintFontData "__OTR__textures/font/sGfxPrintFontData";
static const ALIGN_ASSET(2) char rGfxPrintFontData[] = drGfxPrintFontData;
#define drGfxPrintFontDataAlt "__OTR__alt/textures/font/sGfxPrintFontData";
static const ALIGN_ASSET(2) char rGfxPrintFontDataAlt[] = drGfxPrintFontDataAlt;
// OTRTODO: this isn't as clean as it could be if we implemented // OTRTODO: this isn't as clean as it could be if we implemented
// the GfxPrint texture extraction to `.otr` as described in // the GfxPrint texture extraction to `.otr` as described in

6
soh/src/code/z_parameter.c
View File

@ -210,8 +210,6 @@ static const char* actionsTbl[] =
gNum8DoActionENGTex, gNum8DoActionENGTex,
}; };
static const char gDoEmptyTexture[] = "__OTR__textures/virtual/gEmptyTexture";
// original name: "alpha_change" // original name: "alpha_change"
void Interface_ChangeAlpha(u16 alphaType) { void Interface_ChangeAlpha(u16 alphaType) {
if (alphaType != gSaveContext.unk_13EA) { if (alphaType != gSaveContext.unk_13EA) {
@ -2859,7 +2857,7 @@ void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 l
} }
char* segment = interfaceCtx->doActionSegment[loadOffset]; char* segment = interfaceCtx->doActionSegment[loadOffset];
interfaceCtx->doActionSegment[loadOffset] = action != DO_ACTION_NONE ? doAction : gDoEmptyTexture; interfaceCtx->doActionSegment[loadOffset] = action != DO_ACTION_NONE ? doAction : gEmptyTexture;
gSegments[7] = interfaceCtx->doActionSegment[loadOffset]; gSegments[7] = interfaceCtx->doActionSegment[loadOffset];
} }
@ -2926,7 +2924,7 @@ void Interface_LoadActionLabelB(PlayState* play, u16 action) {
interfaceCtx->unk_1FC = action; interfaceCtx->unk_1FC = action;
char* segment = interfaceCtx->doActionSegment[1]; char* segment = interfaceCtx->doActionSegment[1];
interfaceCtx->doActionSegment[1] = action != DO_ACTION_NONE ? doAction : gDoEmptyTexture; interfaceCtx->doActionSegment[1] = action != DO_ACTION_NONE ? doAction : gEmptyTexture;
osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
interfaceCtx->unk_1FA = 1; interfaceCtx->unk_1FA = 1;