github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-13 01:57:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
commit 1d9adcd5a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -210,8 +210,6 @@ static const char* actionsTbl[] =
gNum8DoActionENGTex,
};
static const char gDoEmptyTexture[] = "__OTR__textures/virtual/gEmptyTexture";
// original name: "alpha_change"
void Interface_ChangeAlpha(u16 alphaType) {
if (alphaType != gSaveContext.unk_13EA) {
@ -2859,7 +2857,7 @@ void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 l
}
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];
}
@ -2926,7 +2924,7 @@ void Interface_LoadActionLabelB(PlayState* play, u16 action) {
interfaceCtx->unk_1FC = action;
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);
interfaceCtx->unk_1FA = 1;