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

func_801068FC OK

Browse Source
This commit is contained in:
mzxrules
2023-01-02 20:53:22 -05:00
parent 88a9eb5708
commit 98c44d571c
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -1552,7 +1552,7 @@ s32 func_80106530(PlayState* play);
// void func_8010657C(void);
void func_80106644(PlayState* play, s32 x, s32 z, s32 rot);
// void func_8010683C(void);
void* func_801068FC(PlayState* play, void* heap, size_t size);
void* func_801068FC(PlayState* play, void* heap);
// void func_80106BEC(void);
// void func_80106D08(void);
// void func_80106D5C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
src/code/z_map_disp.c
+9 -7
View File
@@ -1054,10 +1054,9 @@ void MapDisp_DestroyIMap(PlayState* play) {
MapDisp_ResetIMap();
}
#ifdef NON_MATCHING
// alloc pause screen dungeon map
void* func_801068FC(PlayState* play, void* heap, size_t size) {
void* heapNext; // sp3C
void* func_801068FC(PlayState* play, void* heap) {
void* heapNext;
s32 temp_s2;
s32 temp_v0;
s32 var_s1;
@@ -1120,14 +1119,17 @@ void* func_801068FC(PlayState* play, void* heap, size_t size) {
break;
}
}
D_801F56B0.unk104[var_s4] = (!var_s3) ? NULL : D_801F56B0.unk84[var_s1];
if (!var_s3) {
D_801F56B0.unk104[var_s4] = NULL;
} else {
void* dummy = D_801F56B0.unk84[var_s1]; //! FAKE:
D_801F56B0.unk104[var_s4] = D_801F56B0.unk84[var_s1];
}
}
}
return heapNext;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_801068FC.s")
#endif
s32 func_80106BEC(s32 arg0, f32 arg1) {
if (arg0 == 0) {
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
+1 -1
View File
@@ -631,7 +631,7 @@ void KaleidoScope_Update(PlayState* play) {
DmaMgr_SendRequest0(pauseCtx->iconItemAltSegment, SEGMENT_ROM_START(icon_item_dungeon_static), size);
iconItemLangSegment =
func_801068FC(play, (void*)ALIGN16((uintptr_t)pauseCtx->iconItemAltSegment + size), size);
func_801068FC(play, (void*)ALIGN16((uintptr_t)pauseCtx->iconItemAltSegment + size));
sInDungeonScene = true;
} else {
size_t size;