First batch of functions

2 files changed, 854 insertions, 49 deletions

diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c
index a854a37e7..f61a02fee 100644
--- a/src/code/z_map_data.c
+++ b/src/code/z_map_data.c
@@ -1,44 +1,157 @@
 #include "global.h"
+#include "z64map.h"
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801094A0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801094C8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801094F8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109528.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010954C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010956C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010958C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801095AC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801095DC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010960C.s")
+extern T_D_801BED4C D_801BED4C[];
+extern T_D_801BED88 D_801BED88[];
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109630.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109650.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109670.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801096D4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109714.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109754.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801097C8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010983C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801098A0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109908.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801094A0.s")
+// extern ? D_801BED40;
+
+// void func_801094A0(s32 arg0, ?* arg1) {
+//     *arg1 = (unaligned s32) *((arg0 * 4) + &D_801BED40);
+// }
+
+void func_801094C8(s32 arg0, s32 *arg1, s32 *arg2) {
+    *arg1 = D_801BED4C[arg0].unk4;
+    *arg2 = D_801BED4C[arg0].unk5;
+}
+
+void func_801094F8(s32 arg0, s32* arg1, s32* arg2) {
+    *arg1 = D_801BED4C[arg0].unk6;
+    *arg2 = D_801BED4C[arg0].unk7;
+}
+
+void func_80109528(s32 arg0, s32* arg1) {
+    *arg1 = D_801BED4C[arg0].unk8;
+}
+
+u8 func_8010954C(s32 arg0) {
+    return D_801BED4C[arg0].unk9;
+}
+
+s16 func_8010956C(s32 arg0) {
+    return D_801BED4C[arg0].unkA;
+}
+
+s32 func_8010958C(s32 arg0) {
+    return D_801BED4C[arg0].unk0;
+}
+
+void func_801095AC(s32 arg0, s32 *arg1, s32 *arg2) {
+    *arg1 = D_801BED88[arg0-0x100].unk0;
+    *arg2 = D_801BED88[arg0-0x100].unk1;
+}
+
+void func_801095DC(s32 arg0, s32* arg1, s32* arg2) {
+    *arg1 = D_801BED88[arg0-0x100].unk2;
+    *arg2 = D_801BED88[arg0-0x100].unk4;
+}
+
+void func_8010960C(s32 arg0, s32* arg1) {
+    *arg1 = D_801BED88[arg0-0x100].unk6;
+}
+
+u8 func_80109630(s32 arg0) {
+    return D_801BED88[arg0-0x100].unk7;
+}
+
+s16 func_80109650(s32 arg0) {
+    return D_801BED88[arg0-0x100].unk8;
+}
+
+s32 func_80109670(s32 arg0) {
+    s32 cond = arg0 - 0x100;
+    s32 var_s1 = 0;
+    s32 i;
+
+    for(i = 1; i < cond + 1; i++) {
+        var_s1 += func_801096D4((i-1) + 0x100);
+    }
+    return var_s1;
+}
+
+s32 func_801096D4(s32 arg0) {
+    return (D_801BED88[arg0 - 0x100].unk0 * D_801BED88[arg0 - 0x100].unk1) / 2;
+}
+
+s32 func_80109714(s32 arg0) {
+    if ((arg0 >= 0) && (arg0 < 5)) {
+        return 0;
+    }
+    if ((arg0 >= 0x100) && (arg0 < 0x162)) {
+        return 1;
+    }
+    return 2;
+}
+
+void func_80109754(s32 arg0, s32 *arg1, s32 *arg2) {
+    switch (func_80109714(arg0)) {
+    case 0:
+        func_801094C8(arg0, arg1, arg2);
+        return;
+    case 1:
+        func_801095AC(arg0, arg1, arg2);
+        return;
+    default:
+        *arg2 = 0;
+        *arg1 = 0;
+        return;
+    }
+}
+
+void func_801097C8(s32 arg0, s32* arg1, s32* arg2) {
+    switch (func_80109714(arg0)) {
+    case 0:
+        func_801094F8(arg0, arg1, arg2);
+        return;
+    case 1:
+        func_801095DC(arg0, arg1, arg2);
+        return;
+    default:
+        *arg2 = 0;
+        *arg1 = 0;
+        return;
+    }
+}
+
+void func_8010983C(s32 arg0, s32 *arg1) {
+    switch(func_80109714(arg0)){
+        default:
+            *arg1 = 0;
+            return;
+        case 0:
+            *arg1 = func_8010956C(arg0);
+            return;
+        case 1:
+            *arg1 = func_80109650(arg0);
+            return;
+    }
+}
+
+void func_801098A0(s32 arg0, s32* arg1) {
+    switch (func_80109714(arg0)) {
+    case 0:
+        func_80109528(arg0, arg1);
+        return;
+    case 1:
+        func_8010960C(arg0, arg1);
+        return;
+    default:
+        *arg1 = 0;
+        return;
+    }
+}
+
+u8 func_80109908(s32 arg0) {
+    switch (func_80109714(arg0)) {
+    case 0:
+        return func_8010954C(arg0);
+    case 1:
+        return func_80109630(arg0);
+    default:
+        return 0;
+    }
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109964.s")
 
diff --git a/src/code/z_map_disp.c b/src/code/z_map_disp.c
index d1f09f440..d75b12a0b 100644
--- a/src/code/z_map_disp.c
+++ b/src/code/z_map_disp.c
@@ -1,4 +1,26 @@
 #include "global.h"
+#include "z64map.h"
+#define PlayState GlobalContext
+
+void func_801031D0(PlayState* play, s32, s32, s32, s32, f32);
+void func_80103090(u16*, s32*, s32*);
+void func_80105FE0(PlayState* play, s32 x, s32 z, s32 rot);
+void func_80106644(PlayState* play, s32 x, s32 z, s32 rot);
+s32 func_801039EC(PlayState* play);
+void func_80103A58(PlayState* play, Actor* actor);
+
+// ? func_80104AE8(GlobalContext *);                   /* extern */
+// ? func_80105FE0(GlobalContext *, s32, s32, s32);    /* extern */
+// s32 func_80106450(GlobalContext *);                 /* extern */
+// s32 func_801064CC(GlobalContext *);                 /* extern */
+// s32 func_8010657C(s32, s32);                        /* extern */
+extern T_D_801BEBB8 D_801BEBB8;
+extern s32 D_801BEC1C; //scene rooms
+extern T_D_801BEC5C D_801BEC5C[5];
+extern TexturePtr D_801BEB38;
+
+extern MinimapList D_801BEC14;
+extern MinimapEntry D_801F5130[0x50];
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80102E40.s")
 
@@ -14,31 +36,617 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80102F9C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80103090.s")
+void func_80103090(u16* arg0, s32* out1, s32* out2){
+    func_80109754(*arg0, out1, out2);
+}
+
+//func_801030B4(u16 *, s32 *, u16 *, T_D_801BEBB8 *);
+void func_801030B4(u16 *arg0, s32 *arg1) {
+    func_8010983C(*arg0, arg1);
+    if (*arg1 == 0) {
+        *arg1 = 0x14;
+    }
+}
+
+void func_801030F4(T_func_801030F4* arg0, s32* arg1, s32* arg2) {
+    s32 sp2C;
+    s32 sp28;
+    s32 temp_v0;
+    s32 temp_v0_2;
+
+    if (arg0->unk0 == 0xFFFF) {
+        *arg1 = 0;
+        *arg2 = 0;
+        return;
+    }
+    func_80103090(arg0, &sp2C, &sp28);
+    func_801097C8(arg0->unk0, arg1, arg2);
+    if (arg0->unk8 & 1) {
+        temp_v0 = sp2C / 2;
+        *arg1 = (temp_v0 - *arg1) + temp_v0;
+    }
+    if (arg0->unk8 & 2) {
+        temp_v0_2 = sp28 / 2;
+        *arg2 = (temp_v0_2 - *arg2) + temp_v0_2;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_801030B4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_801030F4.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_801031D0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_801039EC.s")
+s32 func_801039EC(GlobalContext *play) {
+    if (play->sceneNum == SCENE_35TAKI) {
+        return true;
+    }
+    return false;
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80103A10.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80103A58.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_8010439C.s")
-
+// void func_80103A58(GlobalContext *play, Actor *actor) {
+//     u16 *spDC;
+//     s32 spD8;
+//     s32 spD4;
+//     s32 spD0;
+//     s32 spCC;
+//     s32 spC8;
+//     s32 spC4;
+//     f32 spC0;
+//     Actor *spB4;
+//     s32 spAC;
+//     GraphicsContext *spA8;
+//     s16 spA2;
+//     Gfx *sp88;
+//     f32 sp2C;
+//     void *sp1C;
+//     Gfx *temp_a2;
+//     Gfx *temp_v0_10;
+//     Gfx *temp_v0_11;
+//     Gfx *temp_v0_12;
+//     Gfx *temp_v0_13;
+//     Gfx *temp_v0_14;
+//     Gfx *temp_v0_15;
+//     Gfx *temp_v0_16;
+//     Gfx *temp_v0_17;
+//     Gfx *temp_v0_18;
+//     Gfx *temp_v0_20;
+//     Gfx *temp_v0_21;
+//     Gfx *temp_v0_22;
+//     Gfx *temp_v0_23;
+//     Gfx *temp_v0_24;
+//     Gfx *temp_v0_25;
+//     Gfx *temp_v0_26;
+//     Gfx *temp_v0_27;
+//     Gfx *temp_v0_28;
+//     Gfx *temp_v0_29;
+//     Gfx *temp_v0_30;
+//     Gfx *temp_v0_3;
+//     Gfx *temp_v0_4;
+//     Gfx *temp_v0_5;
+//     Gfx *temp_v0_6;
+//     Gfx *temp_v0_7;
+//     Gfx *temp_v0_8;
+//     Gfx *temp_v0_9;
+//     GraphicsContext *temp_a0_2;
+//     f32 temp_fv0;
+//     s16 temp_v0;
+//     s16 temp_v0_2;
+//     s16 temp_v1;
+//     s16 temp_v1_2;
+//     s16 temp_v1_3;
+//     s16 var_v0;
+//     s16 var_v1;
+//     s32 temp_t3;
+//     s32 temp_v1_4;
+//     s32 var_t2;
+//     s32 var_t8;
+//     u16 *temp_a0;
+//     u32 temp_v0_19;
+//     u32 temp_v1_5;
+//     u32 var_a0;
+//     u32 var_a1;
+//     u32 var_v1_2;
+//     void *temp_v1_6;
+
+//     temp_a0 = D_801BEBB8.unk0->unk0 + (D_801BEBB8.unk4 * 0xA);
+//     if (*temp_a0 != 0xFFFF) {
+//         spB4 = play->actorCtx.actorLists[2].first;
+//         spDC = temp_a0;
+//         func_801030F4(temp_a0, &spD0, &spCC, &D_801BEBB8);
+//         func_80103090(spDC, &spC8, &spC4);
+//         temp_v1 = D_801BEBB8.unk0->unk4;
+//         var_v0 = temp_v1;
+//         if (temp_v1 == 0) {
+//             var_v0 = 0x14;
+//         } else if (temp_v1 == -1) {
+//             func_801030B4(spDC, &spAC, spDC, &D_801BEBB8);
+//             var_v0 = (s16) spAC;
+//         }
+//         temp_fv0 = 1.0f / (f32) var_v0;
+//         spC0 = temp_fv0;
+//         if (func_801039EC(play) == 0) {
+//             temp_v0 = D_801BEBB8.unk8;
+//             temp_v1_2 = D_801BEBB8.unkA;
+//             var_t2 = (((s32) ((actor->world.pos.x - (f32) spDC->unk2) * temp_fv0) + temp_v0 + D_801BEBB8.unkC) - temp_v0) + spD0;
+//             var_t8 = ((s32) ((actor->world.pos.z - (f32) spDC->unk6) * temp_fv0) + temp_v1_2 + D_801BEBB8.unkE) - temp_v1_2;
+//         } else {
+//             temp_v0_2 = D_801BEBB8.unk8;
+//             temp_v1_3 = D_801BEBB8.unkA;
+//             var_t2 = (((temp_v0_2 - (s32) ((actor->world.pos.x - (f32) spDC->unk2) * temp_fv0)) + D_801BEBB8.unkC) - temp_v0_2) + spD0;
+//             var_t8 = ((temp_v1_3 - (s32) ((actor->world.pos.z - (f32) spDC->unk6) * temp_fv0)) + D_801BEBB8.unkE) - temp_v1_3;
+//         }
+//         temp_t3 = var_t8 + spCC;
+//         if ((var_t2 > 0) && (var_t2 < 0x3FF) && (temp_t3 > 0) && (temp_t3 < 0x3FF)) {
+//             temp_a0_2 = play->state.gfxCtx;
+//             if ((actor->category == 2) && (actor->flags & 0x80000000)) {
+//                 spA8 = temp_a0_2;
+//                 spD8 = var_t2;
+//                 spD4 = temp_t3;
+//                 func_8012C8D4(temp_a0_2);
+//                 temp_v0_3 = spA8->overlay.p;
+//                 spA8->overlay.p = temp_v0_3 + 8;
+//                 temp_v0_3->words.w0 = 0xDA380003;
+//                 temp_v0_3->words.w1 = (u32) &gIdentityMtx;
+//                 temp_v0_4 = spA8->overlay.p;
+//                 spA8->overlay.p = temp_v0_4 + 8;
+//                 temp_v0_4->words.w0 = 0xFC309661;
+//                 temp_v0_4->words.w1 = 0x552EFF7F;
+//                 temp_v0_5 = spA8->overlay.p;
+//                 spA8->overlay.p = temp_v0_5 + 8;
+//                 temp_v0_5->words.w0 = 0xFB000000;
+//                 temp_v0_5->words.w1 = play->interfaceCtx.minimapAlpha & 0xFF;
+//                 temp_v0_6 = spA8->overlay.p;
+//                 spA8->overlay.p = temp_v0_6 + 8;
+//                 temp_v0_6->words.w1 = 0xFFFDF6FB;
+//                 temp_v0_6->words.w0 = 0xFCFFFFFF;
+//                 temp_v0_7 = spA8->overlay.p;
+//                 spA8->overlay.p = temp_v0_7 + 8;
+//                 temp_v0_7->words.w0 = 0xE200001C;
+//                 temp_v0_7->words.w1 = 0x407248;
+//                 sp1C = play + 0x10000;
+//                 spA8 = spA8;
+//                 Matrix_Translate((f32) var_t2 - 160.0f, 120.0f - (f32) temp_t3, 0.0f, MTXMODE_NEW);
+//                 Matrix_RotateXFApply(-1.6f);
+//                 temp_v1_4 = (s32) (0x7FFF - actor->focus.rot.y) / 1024;
+//                 spA2 = (s16) temp_v1_4;
+//                 var_v1 = (s16) temp_v1_4;
+//                 if (func_801039EC(play) != 0) {
+//                     var_v1 += 0x7FFF;
+//                 }
+//                 spA8 = spA8;
+//                 Matrix_RotateYF((f32) var_v1 / 10.0f, MTXMODE_APPLY);
+//                 Matrix_Scale(0.4f, 0.4f, 0.4f, MTXMODE_APPLY);
+//                 temp_v0_8 = spA8->overlay.p;
+//                 spA8->overlay.p = temp_v0_8 + 8;
+//                 temp_v0_8->words.w0 = 0xDA380003;
+//                 spA8 = spA8;
+//                 sp88 = temp_v0_8;
+//                 sp88->words.w1 = Matrix_NewMtx(play->state.gfxCtx);
+//                 temp_v0_9 = spA8->overlay.p;
+//                 spA8->overlay.p = temp_v0_9 + 8;
+//                 temp_v0_9->words.w0 = 0xFA000000;
+//                 temp_v0_9->words.w1 = (sp1C->unk6C5C & 0xFF) | 0xC8FF0000;
+//                 temp_v0_10 = spA8->overlay.p;
+//                 spA8->overlay.p = temp_v0_10 + 8;
+//                 temp_v0_10->words.w1 = (u32) &D_0401ED00;
+//                 temp_v0_10->words.w0 = 0xDE000000;
+//                 return;
+//             }
+//             if (actor->id == 6) {
+//                 spD4 = temp_t3;
+//                 spD8 = var_t2;
+//                 spA8 = temp_a0_2;
+//                 if (Flags_GetTreasure(play, actor->params & 0x1F) == 0) {
+//                     spD4 = temp_t3;
+//                     spD8 = var_t2;
+//                     spA8 = temp_a0_2;
+//                     sp2C = func_80102F9C(spB4->world.pos.y);
+//                     if (func_80102F9C(actor->world.pos.y) == sp2C) {
+//                         spD4 = temp_t3;
+//                         spD8 = var_t2;
+//                         spA8 = temp_a0_2;
+//                         func_8012C654(play->state.gfxCtx);
+//                         temp_v0_11 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_11 + 8;
+//                         temp_v0_11->words.w1 = 0;
+//                         temp_v0_11->words.w0 = 0xE7000000;
+//                         temp_v0_12 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_12 + 8;
+//                         temp_v0_12->words.w1 = 0;
+//                         temp_v0_12->words.w0 = 0xE3001001;
+//                         temp_v0_13 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_13 + 8;
+//                         temp_v0_13->words.w0 = 0xFA000000;
+//                         temp_v0_13->words.w1 = (play->interfaceCtx.minimapAlpha & 0xFF) | ~0xFF;
+//                         temp_v0_14 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_14 + 8;
+//                         temp_v0_14->words.w0 = 0xFB000000;
+//                         temp_v0_14->words.w1 = play->interfaceCtx.minimapAlpha & 0xFF;
+//                         temp_v0_15 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_15 + 8;
+//                         temp_v0_15->words.w1 = 0;
+//                         temp_v0_15->words.w0 = 0xE7000000;
+//                         temp_v0_16 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_16 + 8;
+//                         temp_v0_16->words.w0 = ((D_801BEAE0.unk8 & 3) << 0x13) | 0xFD000000;
+//                         temp_v0_16->words.w1 = (u32) &D_02003F20;
+//                         temp_v0_17 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_17 + 8;
+//                         temp_v0_17->words.w1 = 0x07000000;
+//                         temp_v0_17->words.w0 = ((D_801BEAE0.unk8 & 3) << 0x13) | 0xF5000000;
+//                         temp_v0_18 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_18 + 8;
+//                         temp_v0_18->words.w1 = 0;
+//                         temp_v0_18->words.w0 = 0xE6000000;
+//                         temp_a2 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_a2 + 8;
+//                         temp_a2->words.w0 = 0xF3000000;
+//                         temp_v1_5 = ((u32) (D_801BEAF8 + 0x40) >> D_801BEB08) - 1;
+//                         var_a0 = 0x7FF;
+//                         if (temp_v1_5 < 0x7FFU) {
+//                             var_a0 = temp_v1_5;
+//                         }
+//                         temp_v0_19 = (u32) (D_801BEB18 * 8) >> 3;
+//                         var_a1 = temp_v0_19;
+//                         if (temp_v0_19 == 0) {
+//                             var_a1 = 1;
+//                         }
+//                         if (temp_v0_19 == 0) {
+//                             var_v1_2 = 1;
+//                         } else {
+//                             var_v1_2 = temp_v0_19;
+//                         }
+//                         temp_a2->words.w1 = (((u32) (var_a1 + 0x7FF) / var_v1_2) & 0xFFF) | 0x07000000U | ((var_a0 & 0xFFF) << 0xC);
+//                         temp_v0_20 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_20 + 8;
+//                         temp_v0_20->words.w1 = 0;
+//                         temp_v0_20->words.w0 = 0xE7000000;
+//                         temp_v0_21 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_21 + 8;
+//                         temp_v0_21->words.w0 = ((((u32) ((D_801BEB28 * 8) + 7) >> 3) & 0x1FF) << 9) | 0xF5000000 | ((D_801BEAD8 & 3) << 0x13);
+//                         temp_v0_21->words.w1 = 0;
+//                         temp_v0_22 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_22 + 8;
+//                         temp_v0_22->words.w0 = 0xF2000000;
+//                         temp_v0_22->words.w1 = 0x1C01C;
+//                         temp_v0_23 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_23 + 8;
+//                         temp_v0_23->words.w0 = ((((var_t2 + 4) * 4) & 0xFFF) << 0xC) | 0xE4000000 | (((temp_t3 + 4) * 4) & 0xFFF);
+//                         temp_v0_23->words.w1 = ((((var_t2 - 4) * 4) & 0xFFF) << 0xC) | (((temp_t3 - 4) * 4) & 0xFFF);
+//                         temp_v0_24 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_24 + 8;
+//                         temp_v0_24->words.w1 = 0;
+//                         temp_v0_24->words.w0 = 0xE1000000;
+//                         temp_v0_25 = temp_a0_2->overlay.p;
+//                         temp_a0_2->overlay.p = temp_v0_25 + 8;
+//                         temp_v0_25->words.w1 = 0x04000400;
+//                         temp_v0_25->words.w0 = 0xF1000000;
+//                         return;
+//                     }
+//                 }
+//             }
+//             spD4 = temp_t3;
+//             spD8 = var_t2;
+//             spA8 = temp_a0_2;
+//             func_8012C654(play->state.gfxCtx);
+//             temp_v0_26 = temp_a0_2->overlay.p;
+//             temp_a0_2->overlay.p = temp_v0_26 + 8;
+//             temp_v0_26->words.w0 = 0xFC119623;
+//             temp_v0_26->words.w1 = 0xFF2FFFFF;
+//             if (actor->flags & 0x80000000) {
+//                 temp_v0_27 = temp_a0_2->overlay.p;
+//                 temp_a0_2->overlay.p = temp_v0_27 + 8;
+//                 temp_v0_27->words.w0 = 0xFA000000;
+//                 temp_v1_6 = (actor->category * 4) + &D_801BEC2C;
+//                 temp_v0_27->words.w1 = (temp_v1_6->unk2 << 8) | (temp_v1_6->unk0 << 0x18) | (temp_v1_6->unk1 << 0x10) | (play->interfaceCtx.minimapAlpha & 0xFF);
+//                 temp_v0_28 = temp_a0_2->overlay.p;
+//                 temp_a0_2->overlay.p = temp_v0_28 + 8;
+//                 temp_v0_28->words.w0 = ((((var_t2 + 1) * 4) & 0xFFF) << 0xC) | 0xE4000000 | (((temp_t3 + 1) * 4) & 0xFFF);
+//                 temp_v0_28->words.w1 = ((((var_t2 - 1) * 4) & 0xFFF) << 0xC) | (((temp_t3 - 1) * 4) & 0xFFF);
+//                 temp_v0_29 = temp_a0_2->overlay.p;
+//                 temp_a0_2->overlay.p = temp_v0_29 + 8;
+//                 temp_v0_29->words.w1 = 0;
+//                 temp_v0_29->words.w0 = 0xE1000000;
+//                 temp_v0_30 = temp_a0_2->overlay.p;
+//                 temp_a0_2->overlay.p = temp_v0_30 + 8;
+//                 temp_v0_30->words.w1 = 0x10001;
+//                 temp_v0_30->words.w0 = 0xF1000000;
+//             }
+//         }
+//     }
+// }
+
+void func_8010439C(GlobalContext *play) {
+    ActorContext *actorCtx;
+    s32 i;
+
+    if (play->roomCtx.currRoom.num != -1) {
+        OPEN_DISPS(play->state.gfxCtx);
+        gDPLoadTextureBlock_4b(OVERLAY_DISP++, &D_801BEB38, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+
+        actorCtx = &play->actorCtx;
+        for (i = 0; i < ACTORCAT_MAX; i++) {
+            Actor *actor = actorCtx->actorLists[i].first;
+            if (actor != NULL) {
+                do {
+                    if (
+                        (actor->update != NULL) 
+                        && (actor->init == NULL) 
+                        && (Object_IsLoaded(&play->objectCtx, actor->objBankIndex))
+                        && ((actor->id == ACTOR_EN_BOX) || (i == ACTORCAT_PLAYER) || (actor->flags & ACTOR_FLAG_80000000))
+                        && ((D_801BEBB8.unk4 == actor->room) || (actor->room == -1))) {
+                        func_80103A58(play, actor);
+                    }
+                    actor = actor->next;
+                } while (actor != NULL);
+            }
+        }
+        CLOSE_DISPS(play->state.gfxCtx);
+    }
+}
+
+//#ifdef NON_MATCHING
+// ? func_80103090(u16*, ?*, ?*);                      /* extern */
+// ? func_801030B4(u16*, s32*, GraphicsContext*, T_D_801BEBB8*); /* extern */
+// ? func_801030F4(f32, f32, u16*, s32*, s32*, T_D_801BEBB8*); /* extern */
+// s32 func_80103A10(GlobalContext*);                  /* extern */
+// extern ? D_801BEC2C;
+
+// void func_801045AC(GlobalContext* play, Actor* actor) {
+//     u16* sp7C;
+//     s32 sp78;
+//     s32 sp74;
+//     s32 sp70;
+//     s32 sp6C;
+//     ? sp68;
+//     ? sp64;
+//     f32 sp5C;
+//     f32 sp50;
+//     s32 sp4C;
+//     GraphicsContext* sp48;
+//     s32 sp34;
+//     Gfx* temp_a0_3;
+//     Gfx* temp_v0_10;
+//     Gfx* temp_v0_11;
+//     Gfx* temp_v0_4;
+//     Gfx* temp_v0_6;
+//     Gfx* temp_v0_7;
+//     Gfx* temp_v0_8;
+//     Gfx* temp_v0_9;
+//     GraphicsContext* temp_a0_2;
+//     GraphicsContext* var_a2;
+//     f32 temp_fv0;
+//     f32 temp_fv1;
+//     f32 var_fa0;
+//     f32 var_ft1;
+//     s16 temp_v0;
+//     s16 temp_v0_2;
+//     s16 temp_v0_3;
+//     s16 temp_v0_5;
+//     s16 temp_v1;
+//     s16 temp_v1_2;
+//     s16 var_v1;
+//     s16 var_v1_2;
+//     s32 var_t0;
+//     s32 var_t0_2;
+//     s32 var_t1;
+//     s32 var_t1_2;
+//     u16* temp_a0;
+//     u8 temp_t7;
+//     void* temp_v1_3;
+
+//     temp_fv1 = 0.0028571428f * fabsf(play->actorCtx.actorLists[2].first->world.pos.y - actor->world.pos.y);
+//     var_fa0 = 1.0f - temp_fv1;
+//     if (temp_fv1 > 1.0f) {
+//         var_fa0 = 0.0f;
+//     }
+//     temp_a0 = D_801BEBB8.unk0->unk0 + (D_801BEBB8.unk4 * 0xA);
+//     if (*temp_a0 != 0xFFFF) {
+//         sp7C = temp_a0;
+//         sp50 = var_fa0;
+//         func_801030F4(var_fa0, 1.0f, temp_a0, &sp70, &sp6C, &D_801BEBB8);
+//         func_80103090(sp7C, &sp68, &sp64);
+//         temp_v0 = D_801BEBB8.unk0->unk4;
+//         var_v1 = temp_v0;
+//         if (temp_v0 == 0) {
+//             var_v1 = 0x14;
+//         } else if (temp_v0 == -1) {
+//             func_801030B4(sp7C, &sp4C);
+//             var_v1 = (s16) sp4C;
+//         }
+//         temp_fv0 = 1.0f / (f32) var_v1;
+//         sp5C = temp_fv0;
+//         if (func_801039EC(play) == 0) {
+//             temp_v0_2 = D_801BEBB8.unk8;
+//             temp_v1 = D_801BEBB8.unkA;
+//             var_t0 = (((s32) ((actor->world.pos.x - (f32) sp7C->unk2) * temp_fv0) + temp_v0_2 + D_801BEBB8.unkC) - temp_v0_2) + sp70;
+//             var_t1 = (((s32) ((actor->world.pos.z - (f32) sp7C->unk6) * temp_fv0) + temp_v1 + D_801BEBB8.unkE) - temp_v1) + sp6C;
+//         } else {
+//             temp_v0_3 = D_801BEBB8.unk8;
+//             temp_v1_2 = D_801BEBB8.unkA;
+//             var_t0 = (((temp_v0_3 - (s32) ((actor->world.pos.x - (f32) sp7C->unk2) * temp_fv0)) + D_801BEBB8.unkC) - temp_v0_3) + sp70;
+//             var_t1 = (((temp_v1_2 - (s32) ((actor->world.pos.z - (f32) sp7C->unk6) * temp_fv0)) + D_801BEBB8.unkE) - temp_v1_2) + sp6C;
+//         }
+//         if ((var_t0 > 0) && (var_t0 < 0x3FF) && (var_t1 > 0) && (var_t1 < 0x3FF) && (temp_a0_2 = play->state.gfxCtx, sp74 = var_t1, sp78 = var_t0, sp48 = temp_a0_2, func_8012C654(temp_a0_2), temp_v0_4 = sp48->overlay.p, sp48->overlay.p = temp_v0_4 + 8, temp_v0_4->words.w0 = 0xFC119623, temp_v0_4->words.w1 = 0xFF2FFFFF, (actor->category == 0xA)) && (sp48 = sp48, sp78 = var_t0, sp74 = var_t1, var_a2 = sp48, var_t0_2 = var_t0, var_t1_2 = var_t1, (func_80103A10(play) != 0))) {
+//             temp_a0_3 = var_a2->overlay.p;
+//             var_a2->overlay.p = temp_a0_3 + 8;
+//             temp_a0_3->words.w0 = 0xFA000000;
+//             temp_v1_3 = (actor->category * 4) + &D_801BEC2C;
+//             temp_t7 = temp_v1_3->unk3;
+//             var_ft1 = (f32) temp_t7;
+//             if ((s32) temp_t7 < 0) {
+//                 var_ft1 += 4294967296.0f;
+//             }
+//             temp_a0_3->words.w1 = ((s32) ((var_ft1 * (1.0f - ((f32) D_801BEBB8.unk24 * 0.05f)) * sp50 * (f32) play->interfaceCtx.minimapAlpha) / 255.0f) & 0xFF) | (temp_v1_3->unk0 << 0x18) | (temp_v1_3->unk1 << 0x10) | (temp_v1_3->unk2 << 8);
+//             temp_v0_5 = D_801BEBB8.unk0->unk4;
+//             var_v1_2 = temp_v0_5;
+//             if (temp_v0_5 == 0) {
+//                 var_v1_2 = 0x14;
+//             } else if (temp_v0_5 == -1) {
+//                 sp48 = var_a2;
+//                 sp78 = var_t0_2;
+//                 sp74 = var_t1_2;
+//                 func_801030B4(sp7C, &sp34, var_a2, &D_801BEBB8);
+//                 var_a2 = sp48;
+//                 var_t0_2 = sp78;
+//                 var_t1_2 = sp74;
+//                 var_v1_2 = (s16) sp34;
+//             }
+//             if (var_v1_2 < 0x33) {
+//                 temp_v0_6 = var_a2->overlay.p;
+//                 var_a2->overlay.p = temp_v0_6 + 8;
+//                 temp_v0_6->words.w0 = ((((var_t0_2 + 2) * 4) & 0xFFF) << 0xC) | 0xE4000000 | (((var_t1_2 + 2) * 4) & 0xFFF);
+//                 temp_v0_6->words.w1 = ((((var_t0_2 - 2) * 4) & 0xFFF) << 0xC) | (((var_t1_2 - 2) * 4) & 0xFFF);
+//                 temp_v0_7 = var_a2->overlay.p;
+//                 var_a2->overlay.p = temp_v0_7 + 8;
+//                 temp_v0_7->words.w1 = 0;
+//                 temp_v0_7->words.w0 = 0xE1000000;
+//                 temp_v0_8 = var_a2->overlay.p;
+//                 var_a2->overlay.p = temp_v0_8 + 8;
+//                 temp_v0_8->words.w1 = 0x10001;
+//                 temp_v0_8->words.w0 = 0xF1000000;
+//                 return;
+//             }
+//             temp_v0_9 = var_a2->overlay.p;
+//             var_a2->overlay.p = temp_v0_9 + 8;
+//             temp_v0_9->words.w0 = ((((var_t0_2 + 1) * 4) & 0xFFF) << 0xC) | 0xE4000000 | (((var_t1_2 + 1) * 4) & 0xFFF);
+//             temp_v0_9->words.w1 = ((((var_t0_2 - 1) * 4) & 0xFFF) << 0xC) | (((var_t1_2 - 1) * 4) & 0xFFF);
+//             temp_v0_10 = var_a2->overlay.p;
+//             var_a2->overlay.p = temp_v0_10 + 8;
+//             temp_v0_10->words.w1 = 0;
+//             temp_v0_10->words.w0 = 0xE1000000;
+//             temp_v0_11 = var_a2->overlay.p;
+//             var_a2->overlay.p = temp_v0_11 + 8;
+//             temp_v0_11->words.w1 = 0x10001;
+//             temp_v0_11->words.w0 = 0xF1000000;
+//         }
+//     }
+// }
+// #else
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_801045AC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80104AE8.s")
+// #endif
+
+void func_80104AE8(GlobalContext *play) {
+    s32 i;
+    Actor* actor;
+
+    if (play->roomCtx.currRoom.num != -1) {
+        OPEN_DISPS(play->state.gfxCtx);
+        gDPLoadTextureBlock_4b(OVERLAY_DISP++, &D_801BEB38, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+
+        actor = play->actorCtx.actorLists[ACTORCAT_DOOR].first;
+        if (actor != NULL) {
+            do {
+                if (
+                    (actor->update != NULL) 
+                    && (actor->init == NULL) 
+                    && Object_IsLoaded(&play->objectCtx, actor->objBankIndex)
+                    && ((D_801BEBB8.unk4 == actor->room) || (actor->room == -1))) {
+                    func_801045AC(play, actor);
+                }
+                actor = actor->next;
+            } while (actor != NULL);
+        }
+        CLOSE_DISPS(play->state.gfxCtx);
+    }
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80104C80.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80104CF4.s")
 
+#ifdef NON_MATCHING
+void func_80104F34(GlobalContext* arg0) {
+    s16 temp_a3;
+    s16 temp_s0;
+    s16 temp_t3;
+    s16 temp_t5;
+    s32 var_t2;
+    s16* temp_a3_2;
+    s16* temp_t2_2;
+    s32 temp_t0;
+    s32 var_a3;
+    s32 var_a3_2;
+    s32 var_t0;
+    s32 var_t0_2;
+    s32 var_t1_4;
+    s32 var_t3;
+    s32 var_t5;
+    MinimapEntry* temp_t2;
+    MinimapEntry* temp_t0_2;
+    void* temp_t9;
+    void* temp_v1;
+    s32 i;
+
+    for (var_t0 = 0; var_t0 < 32; var_t0++){
+        D_801BEBB8.unk48[var_t0] = -0x7FFF;
+    }
+    for (var_t3 = 0; var_t3 < D_801BEC1C; var_t3++) {
+        var_t0_2 = 0;
+        temp_t2 = D_801BEBB8.unk0->entry + var_t3;
+        if (temp_t2->unk0  == 0xFFFF) {
+            
+        } else {
+            for (var_t0_2 = 0; var_t0_2 < 32; var_t0_2++)
+            {
+                if (D_801BEBB8.unk48[var_t0_2] == -0x7FFF) {
+                    D_801BEBB8.unk48[var_t0_2] = temp_t2->unk4;
+                    break;
+                }
+                else if(fabsf((f32) D_801BEBB8.unk48[var_t0_2] - (f32) temp_t2->unk4) < 5.0f) {
+                    break;
+                }
+            }
+        }
+    }
+    for (var_a3 = 0; var_a3 < D_801BEC1C; var_a3++) {
+        if (D_801BEBB8.unk48[var_a3] == -0x7FFF) {
+            break;
+        } else {
+            for (temp_t0 = var_a3+ 1; temp_t0 < D_801BEC1C; temp_t0++) {
+                temp_s0 = D_801BEBB8.unk48[temp_t0];
+                temp_t2_2 = &D_801BEBB8.unk48[var_a3];
+                if (temp_s0 != -0x7FFF) {
+                    temp_t3 = *temp_t2_2;
+                    if (temp_s0 < temp_t3) {
+                        *temp_t2_2 = temp_s0;
+                        D_801BEBB8.unk48[temp_t0] = temp_t3;
+                    }
+                }
+                else {
+                    break;
+                }
+            }
+        }
+    }
+    for (var_a3 = 0; var_a3 < D_801BEC1C; var_a3++) {
+        D_801BEBB8.unk3C[var_a3] = -1;
+        temp_t0_2 = &D_801BEBB8.unk0->entry[var_a3]; 
+
+        for (var_t2 = 0; var_t2 < D_801BEC1C; var_t2++) {
+            if ((D_801BEBB8.unk48[var_t2] != -0x7FFF) && (fabsf((f32) D_801BEBB8.unk48[var_t2] - (f32) temp_t0_2->unk4) < 5.0f)) {
+                D_801BEBB8.unk3C[var_a3] = var_t2;
+                break;
+            }
+        }
+    }
+    D_801BEBB8.unk40 = 0;
+    for (var_t1_4 = 0; var_t1_4 < D_801BEC1C; var_t1_4++) {
+        if (D_801BEBB8.unk48[var_t1_4] != -0x7FFF) {
+            D_801BEBB8.unk40++;
+        }
+    }
+    D_801BEBB8.unk44 = 0;
+    for (i = 0; i < 5; i++) {
+        if (arg0->sceneNum == D_801BEC5C[i].unk0) {
+            D_801BEBB8.unk44 = D_801BEC5C[i].unk2;
+        }
+    }
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80104F34.s")
+#endif
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80105294.s")
 
@@ -48,7 +656,44 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_8010534C.s")
 
+
+// ? func_80104F34(GlobalContext*);                    /* extern */
+// ? func_8010534C(GlobalContext*);                    /* extern */
+
+#ifdef NON_MATCHING
+void func_8010549C(GlobalContext* globalCtx, void* segmentAddress) {
+    MinimapEntry* var_v1;
+    MinimapList* temp_v0;
+    s32 i;
+
+    if (func_8010A208(globalCtx) == 0) {
+        D_801BEC1C = globalCtx->numRooms;
+        temp_v0 = Lib_SegmentedToVirtual(segmentAddress);
+        D_801BEC14 = *temp_v0;
+        var_v1 = Lib_SegmentedToVirtual(temp_v0->entry);
+
+        for (i = 0; i < D_801BEC1C; i++)
+        {
+            D_801F5130[i] = var_v1[i];
+        }
+        
+        D_801BEC14.entry = &D_801F5130;
+        if (globalCtx->colCtx.colHeader != NULL) {
+            D_801BEBB8.unk30 = globalCtx->colCtx.colHeader->minBounds.x;
+            D_801BEBB8.unk32 = globalCtx->colCtx.colHeader->minBounds.z;
+            D_801BEBB8.unk34 = globalCtx->colCtx.colHeader->maxBounds.x - globalCtx->colCtx.colHeader->minBounds.x;
+            D_801BEBB8.unk36 = globalCtx->colCtx.colHeader->maxBounds.z - globalCtx->colCtx.colHeader->minBounds.z;
+            D_801BEBB8.unk38 = (s16) (D_801BEBB8.unk30 + (D_801BEBB8.unk34 * 0.5f));
+            D_801BEBB8.unk3A = (s16) (D_801BEBB8.unk32 + (D_801BEBB8.unk36 * 0.5f));
+        }
+    }
+    D_801BEBB8.unk0 = &D_801BEC14;
+    func_80104F34(globalCtx);
+    func_8010534C(globalCtx);
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_8010549C.s")
+#endif
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_8010565C.s")
 
@@ -71,8 +716,55 @@
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80106530.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_8010657C.s")
-
+// s32 func_8010657C(s32 arg0, s32 arg1) {
+//     s16 temp_a3;
+//     s16 temp_t0;
+//     s32 temp_a2;
+//     s32 temp_v1;
+
+//     if ((arg0 == -1) || (arg1 == -1)) {
+//         return 0;
+//     }
+//     //temp_a2 = D_801BEBB8.unk3C[arg];
+//     temp_a3 = D_801BEBB8.unk3C[arg1];//*(temp_a2 + (arg1 * 2));
+//     temp_t0 = D_801BEBB8.unk3C[arg0];//*(temp_a2 + (arg0 * 2));
+//     temp_v1 = *D_801BEBB8.unk0;
+//     if ((temp_a3 >= temp_t0) && ((temp_t0 + (((s32) (temp_v1 + (arg0 * 0xA))->unk8 >> 2) & 7)) >= temp_a3)) {
+//         return 1;
+//     }
+//     if ((temp_t0 >= temp_a3) && ((temp_a3 + (((s32) (temp_v1 + (arg1 * 0xA))->unk8 >> 2) & 7)) >= temp_t0)) {
+//         return 1;
+//     }
+//     return 0;
+// }
+
+#ifdef NON_MATCHING
+void func_80106644(PlayState *play, s32 x, s32 z, s32 rot) {
+    s32 pad[2];
+    
+    if ((D_801BEBB8.unk0 != 0) && ((s32) play->pauseCtx.state < 4) && (XREG(95) == 0) && (play->interfaceCtx.minimapAlpha != 0)) {
+        //sp2C = ;// + 0x10000;
+        if ((func_801064CC(play) == 0) && (D_801BEC1C != 0)) {
+            if (func_80106450(play) != 0) {
+                func_801031D0(play, D_801BEBB8.unk10, D_801BEBB8.unkC, D_801BEBB8.unkE, D_801BEBB8.unk4, 1.0f - ((f32) D_801BEBB8.unk24 * 0.05f));
+                if ((D_801BEBB8.unk4 != D_801BEBB8.unk14) && (func_8010657C(D_801BEBB8.unk4, D_801BEBB8.unk14) != 0)) {
+                    func_801031D0(play, D_801BEBB8.unk18, D_801BEBB8.unkC + D_801BEBB8.unk1C, D_801BEBB8.unkE + D_801BEBB8.unk1E, D_801BEBB8.unk14, (f32) D_801BEBB8.unk24 * 0.05f);
+                }
+                func_80104AE8(play);
+            }
+            if (((func_8010A0A4(play) == 0) || (gSaveContext.save.inventory.dungeonItems[gSaveContext.mapIndex] & gBitFlags[1]) )
+                 && ((func_8010A0A4(play) != 0) || Inventory_IsMapVisible(play->sceneNum))) {
+                if (play->interfaceCtx.unk_280 == 0) {
+                    func_80105FE0(play, x, z, rot);
+                }
+                func_8010439C(play);
+            }
+        }
+    }
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_80106644.s")
+#endif
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_disp/func_8010683C.s")