diff --git a/include/functions.h b/include/functions.h index e9d0bafab..5f649ba92 100644 --- a/include/functions.h +++ b/include/functions.h @@ -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); diff --git a/src/code/z_map_disp.c b/src/code/z_map_disp.c index 2f446a62b..f8ec448e0 100644 --- a/src/code/z_map_disp.c +++ b/src/code/z_map_disp.c @@ -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) { diff --git a/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c b/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c index a56afd71b..53e993321 100644 --- a/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c +++ b/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c @@ -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;