izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improvement on func_80111CB4

Browse Source
This commit is contained in:
engineer124
2022-04-17 14:36:31 +10:00
parent a9103d926b
commit ea6746ff5e
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -2735,7 +2735,7 @@ void func_80165690(void);
Gfx* func_801660B8(GlobalContext* globalCtx, Gfx* gfx);
void Play_Fini(GameState* gameState);
// void func_801663C4(void);
void func_80166644(u8* arg0, void* arg1, s32 arg2);
void func_80166644(u8* arg0, u8* arg1, s32 arg2);
// void func_801668B4(void);
void func_80166968(GlobalContext* globalCtx, Camera* camera);
void func_80166B30(GlobalContext* globalCtx);
include/variables.h
+1 -1
View File
@@ -3320,7 +3320,7 @@ extern OSViMode D_801FBB30;
extern u32* gFramebuffers[2];
extern OSViMode* D_801FBB88;
extern u16* gZBufferPtr;
extern void* D_801FBB90;
extern u8* D_801FBB90;
extern u64* gGfxSPTaskOutputBufferPtr;
extern size_t gGfxSPTaskOutputBufferSize;
// extern UNK_TYPE1 D_801FBB9C;
include/z64.h
+1 -1
View File
@@ -1418,7 +1418,7 @@ struct GlobalContext {
/* 0x18B9C */ char unk_18B9C[0x2B8];
/* 0x18E54 */ SceneTableEntry* loadedScene;
/* 0x18E58 */ char unk_18E58[0x4];
/* 0x18E5C */ void* unk_18E5C;
/* 0x18E5C */ u8* unk_18E5C;
/* 0x18E60 */ char unk_18E60[0x8];
/* 0x18E68 */ s32 unk_18E68;
/* 0x18E6C */ char unk_18E6C[0x3EC];
src/code/graph.c
+1 -1
View File
@@ -349,7 +349,7 @@ void Graph_ThreadEntry(void* arg) {
gGfxSPTaskOutputBufferEnd2 = (u8*)gGfxSPTaskOutputBuffer2 + sizeof(*gGfxSPTaskOutputBuffer2);
func_80178978();
Fault_SetFB(D_801FBB90, SCREEN_WIDTH, SCREEN_HEIGHT);
Fault_SetFB((void*)D_801FBB90, SCREEN_WIDTH, SCREEN_HEIGHT);
Graph_Init(&gfxCtx);
while (nextOvl) {
src/code/z_parameter.c
+10 -8
View File
@@ -1990,11 +1990,12 @@ void func_80110038(GlobalContext* globalCtx) {
}
}
// a0/a1 swap. Likely related to globalCtx->unk_18E5C
#ifdef NON_MATCHING
void func_80111CB4(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Player* player = GET_PLAYER(globalCtx);
void* phi_a1;
s32 pad;
s32 sp28;
sp28 = false;
@@ -2049,6 +2050,7 @@ void func_80111CB4(GlobalContext* globalCtx) {
gSaveContext.buttonStatus[3] = BTN_DISABLED;
} else {
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_BOW;
if (globalCtx->unk_1887C >= 2) {
Interface_LoadItemIconImpl(globalCtx, 0);
} else if (gSaveContext.save.inventory.items[SLOT_BOW] == ITEM_NONE) {
@@ -2056,6 +2058,7 @@ void func_80111CB4(GlobalContext* globalCtx) {
} else {
Interface_LoadItemIconImpl(globalCtx, 0);
}
gSaveContext.buttonStatus[1] = BTN_DISABLED;
gSaveContext.buttonStatus[2] = BTN_DISABLED;
gSaveContext.buttonStatus[3] = BTN_DISABLED;
@@ -2142,8 +2145,8 @@ void func_80111CB4(GlobalContext* globalCtx) {
} else if (D_801BF884 != 0) {
if (D_801BF884 == 1) {
if (!(globalCtx->actorCtx.unk5 & 4)) {
func_801663C4((u8*)((globalCtx->unk_18E5C != NULL) ? globalCtx->unk_18E5C : D_801FBB90),
gSaveContext.pictoPhoto, 0x4600);
func_801663C4((globalCtx->unk_18E5C != NULL) ? globalCtx->unk_18E5C : D_801FBB90,
(u8*)gSaveContext.pictoPhoto, 0x4600);
interfaceCtx->unk_224 = 0;
interfaceCtx->unk_222 = interfaceCtx->unk_224;
sp28 = true;
@@ -2182,8 +2185,8 @@ void func_80111CB4(GlobalContext* globalCtx) {
Interface_ChangeAlpha(50);
D_801BF884 = 0;
if (D_801BF888) {
func_801663C4((u8*)((globalCtx->unk_18E5C != NULL) ? globalCtx->unk_18E5C : D_801FBB90),
gSaveContext.pictoPhoto, 0x4600);
func_801663C4((globalCtx->unk_18E5C != NULL) ? globalCtx->unk_18E5C : D_801FBB90,
(u8*)gSaveContext.pictoPhoto, 0x4600);
func_8013A240(globalCtx);
}
globalCtx->actorCtx.unk5 &= ~0x4;
@@ -2209,8 +2212,7 @@ void func_80111CB4(GlobalContext* globalCtx) {
Interface_ChangeAlpha(21);
D_801BF884 = 1;
} else {
phi_a1 = (globalCtx->unk_18E5C != NULL) ? globalCtx->unk_18E5C : D_801FBB90;
func_80166644(gSaveContext.pictoPhoto, phi_a1, 0x4600);
func_80166644((u8*)gSaveContext.pictoPhoto, ((void)0, (globalCtx->unk_18E5C != NULL) ? globalCtx->unk_18E5C : D_801FBB90), 0x4600);
globalCtx->unk_18845 = 1;
D_801BF884 = 2;
}
@@ -5728,7 +5730,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
if (D_801BF884 >= 2) {
if ((globalCtx->actorCtx.unk5 & 4) == 0) {
func_801663C4((u8*)((globalCtx->unk_18E5C != NULL) ? globalCtx->unk_18E5C : D_801FBB90),
gSaveContext.pictoPhoto, 0x4600);
(u8*)gSaveContext.pictoPhoto, 0x4600);
interfaceCtx->unk_224 = 0;
interfaceCtx->unk_222 = interfaceCtx->unk_224;