MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-06-30 16:29:55 +00:00
Code Releases Wiki Activity

A button fix (#175)

Browse Source 
* Fixed the A button texture problem by introducing an empty texture.

* Added a global empty texture to improve the previous commit.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
This commit is contained in:
DaMarkov 2022-02-20 18:15:07 +01:00 committed by GitHub
parent 7b8364472f
commit 5e5d5d64dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/code/z_parameter.cpp
View File

@ -44,6 +44,8 @@
#define DO_ACTION_TEX_HEIGHT 16
#define DO_ACTION_TEX_SIZE ((DO_ACTION_TEX_WIDTH * DO_ACTION_TEX_HEIGHT) / 2) // (sizeof(gCheckDoActionENGTex))
static const u8 gEmptyTex[DO_ACTION_TEX_SIZE] = { 0 };
typedef struct {
/* 0x00 */ u8 scene;
/* 0x01 */ u8 flags1;
@ -2069,7 +2071,7 @@ s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) {
return 0;
}
void func_80086D5C(s32* buf, u16 size) {
void Interface_ClearData(s32* buf, u16 size) {
u16 i;
for (i = 0; i < size; i++) {
@ -2078,8 +2080,6 @@ void func_80086D5C(s32* buf, u16 size) {
}
void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 loadOffset) {
static void* sDoActionTextures[] = { gAttackDoActionENGTex, gCheckDoActionENGTex };
if (action >= DO_ACTION_MAX) {
action = DO_ACTION_NONE;
}
@ -2107,7 +2107,15 @@ void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 l
}
} else {
gSegments[7] = (uintptr_t)VIRTUAL_TO_PHYSICAL(interfaceCtx->doActionSegment1);
func_80086D5C((s32*)SEGMENTED_TO_VIRTUAL(sDoActionTextures[loadOffset]), DO_ACTION_TEX_SIZE / 4);
#ifdef N64_VERSION
static void* sDoActionTextures[] = { gAttackDoActionENGTex, gCheckDoActionENGTex };
Interface_ClearData((s32*)SEGMENTED_TO_VIRTUAL(sDoActionTextures[loadOffset]), DO_ACTION_TEX_SIZE / 4);
#else
if (loadOffset == 0)
interfaceCtx->doActionSegment1 = (u8*)gEmptyTex;
else
interfaceCtx->doActionSegment2 = (u8*)gEmptyTex;
#endif
}
}