diff options
| author | mzxrules <mzxrules@gmail.com> | 2023-01-02 20:53:22 -0500 |
|---|---|---|
| committer | mzxrules <mzxrules@gmail.com> | 2023-01-02 20:53:22 -0500 |
| commit | 98c44d571c32e58a3a5e09feab9d7796e515dc60 (patch) | |
| tree | 55fe3657ad43b0117b86952fa56f9a419d487c26 /src/code | |
| parent | 88a9eb5708504206ff7dc1491bf0b77b2279ac8a (diff) | |
func_801068FC OK
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_map_disp.c | 16 |
1 files changed, 9 insertions, 7 deletions
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) { |
