Initial support of tracking progress per code/boot/overlay, and outputs the stats to csv.

12 files changed, 408 insertions, 408 deletions

diff --git a/src/code/code_0x800AF710.c b/src/code/code_0x800AF710.c
index fe5002783..33697927d 100644
--- a/src/code/code_0x800AF710.c
+++ b/src/code/code_0x800AF710.c
@@ -214,7 +214,7 @@ void Effect_DrawAll(GraphicsContext* gCtxt) {
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_DrawAll.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x800AF710/Effect_DrawAll.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -255,7 +255,7 @@ void Effect_UpdateAll(GlobalContext* ctxt) {
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_UpdateAll.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x800AF710/Effect_UpdateAll.asm")
 #endif
 
 void Effect_Destroy(GlobalContext* ctxt, s32 index) {
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 6715613ec..2a9b9af6e 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -5,7 +5,7 @@
 #define ABS(x) ((x) < 0 ? -(x) : (x))
 #define DECR(x) ((x) == 0 ? 0 : ((x) -= 1))
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PrintLists.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_PrintLists.asm")
 
 void Actor_SetDrawParams(ActorShape* actorShape, f32 yOffset, ActorShadowFunc func, f32 scale) {
     actorShape->yOffset = yOffset;
@@ -14,33 +14,33 @@ void Actor_SetDrawParams(ActorShape* actorShape, f32 yOffset, ActorShadowFunc fu
     actorShape->shadowAlpha = 255;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PostDraw.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_PostDraw.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B3FC0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B3FC0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4024.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4024.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4088.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4088.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B40B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B40B8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B40E0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B40E0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B42F8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B42F8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4A98.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4A98.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4AEC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4AEC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4B50.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4B50.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4EDC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4EDC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4F40.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4F40.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4F78.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4F78.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5040.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5040.asm")
 
 void Actor_TargetContextInit(TargetContext* targetCtxt, Actor* actor, GlobalContext* ctxt) {
     targetCtxt->unk90 = NULL;
@@ -54,9 +54,9 @@ void Actor_TargetContextInit(TargetContext* targetCtxt, Actor* actor, GlobalCont
     func_800B4F78(targetCtxt, actor->category, ctxt);
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5208.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5208.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5814.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5814.asm")
 
 u32 Actor_GetSwitchFlag(GlobalContext* ctxt, s32 flag) {
     if (flag >= 0 && flag < 0x80) {
@@ -147,7 +147,7 @@ void Actor_TitleCardCreate(GlobalContext* ctxt, TitleCardContext* titleCtxt, u32
     titleCtxt->fadeInDelay = 0;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Nop800B5E50.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Nop800B5E50.asm")
 
 void Actor_TitleCardUpdate(GlobalContext* ctxt, TitleCardContext* titleCtxt) {
     if (DECR(titleCtxt->fadeInDelay) == 0) {
@@ -161,23 +161,23 @@ void Actor_TitleCardUpdate(GlobalContext* ctxt, TitleCardContext* titleCtxt) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_TitleCardDraw.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_TitleCardDraw.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6434.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6434.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6468.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6468.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6474.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6474.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B648C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B648C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B64FC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B64FC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6584.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6584.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6608.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6608.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6680.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6680.asm")
 
 void Actor_MarkForDeath(Actor* actor) {
     actor->draw = NULL;
@@ -245,7 +245,7 @@ void Actor_InitToDefaultValues(Actor* actor, GlobalContext* ctxt) {
     }
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_InitToDefaultValues.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_InitToDefaultValues.asm")
 #endif
 
 void Actor_FiniActor(Actor* actor, GlobalContext* ctxt) {
@@ -268,7 +268,7 @@ void Actor_ApplyMovement(Actor* actor) {
     actor->world.pos.z += ((actor->velocity.z * actorMovementScale) + actor->colChkInfo.displacement.z);
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_ApplyMovement.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_ApplyMovement.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -282,7 +282,7 @@ void Actor_SetVelocityYRotationAndGravity(Actor* actor) {
     }
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetVelocityYRotationAndGravity.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SetVelocityYRotationAndGravity.asm")
 #endif
 
 void Actor_SetVelocityAndMoveYRotationAndGravity(Actor* actor) {
@@ -314,9 +314,9 @@ void Actor_SetVelocityAndMoveXYRotationReverse(Actor* actor) {
     Actor_ApplyMovement(actor);
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6C04.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6C04.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6C58.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6C58.asm")
 
 s16 Actor_YawBetweenActors(Actor* from, Actor* to) {
     return Math_Vec3f_Yaw(&from->world.pos, &to->world.pos);
@@ -377,38 +377,38 @@ f32 Actor_YDistance(Actor* actor1, Actor* actor2) {
     return actor2->world.pos.y - actor1->world.pos.y;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6F20.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6F20.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6FC8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6FC8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7090.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7090.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7118.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7118.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7128.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7128.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B715C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B715C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7170.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7170.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B71DC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B71DC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7200.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7200.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B722C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B722C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B724C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B724C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7298.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7298.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B72E0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B72E0.asm")
 
 void func_800B72F8(DynaPolyActor* dpactor, f32 a1, s16 a2) {
     dpactor->unk150 = a2;
     dpactor->unk148 += a1;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsLinkFacingActor.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_IsLinkFacingActor.asm")
 
 s32 Actor_IsActorFacedByActor(Actor* actor, Actor* other, s16 tolerance) {
     s16 angle;
@@ -442,7 +442,7 @@ s32 Actor_IsActorFacingActor(Actor* actor, Actor* other, s16 tolerance) {
     return 0;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsActorFacingLinkAndWithinRange.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_IsActorFacingLinkAndWithinRange.asm")
 
 s32 Actor_IsActorFacingActorAndWithinRange(Actor* actor, Actor* other, f32 range, s16 tolerance) {
     s16 dist;
@@ -456,65 +456,65 @@ s32 Actor_IsActorFacingActorAndWithinRange(Actor* actor, Actor* other, f32 range
     return 0;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B75A0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B75A0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B761C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B761C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7678.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7678.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B78B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B78B8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7E04.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7E04.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7FE0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7FE0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8018.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8018.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8050.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8050.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8118.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8118.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B81E0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B81E0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8214.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8214.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8248.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8248.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B82EC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B82EC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B83BC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B83BC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B83F8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B83F8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B84D0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B84D0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8500.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8500.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B85E0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B85E0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8614.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8614.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B863C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B863C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B867C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B867C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B86C8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B86C8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8708.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8708.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8718.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8718.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B874C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B874C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8804.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8804.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B882C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B882C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B886C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B886C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8898.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8898.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8934.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8934.asm")
 
 u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) {
     if (actor->parent != NULL) {
@@ -524,102 +524,102 @@ u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8A1C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8A1C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8B84.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8B84.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BB0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BB0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BD0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BD0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BFC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BFC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C20.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C20.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C50.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C50.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C78.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C78.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C9C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C9C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8CEC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8CEC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D10.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D10.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D50.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D50.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D98.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D98.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8DD4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8DD4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8E1C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8E1C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8E58.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8E58.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8EC8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8EC8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8EF4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8EF4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8F98.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8F98.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8FC0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8FC0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8FE8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8FE8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9010.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9010.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9038.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9038.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9084.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9084.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9098.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9098.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B90AC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B90AC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B90F4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B90F4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9120.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9120.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Init.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Init.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9334.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9334.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UpdateActor.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_UpdateActor.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UpdateAll.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_UpdateAll.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DrawActor.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_DrawActor.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9D1C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9D1C.asm")
 
 void Actor_DrawAllSetup(GlobalContext* ctxt) {
     ctxt->actorCtx.undrawnActorCount = 0;
     ctxt->actorCtx.unkB = 0;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_RecordUndrawnActor.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_RecordUndrawnActor.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9E84.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9E84.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9EF4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9EF4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA2D8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA2D8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA2FC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA2FC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DrawAll.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_DrawAll.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA6FC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA6FC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA798.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA798.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA8B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA8B8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA9B4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA9B4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_InsertIntoTypeList.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_InsertIntoTypeList.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_RemoveFromTypeList.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_RemoveFromTypeList.asm")
 
 void Actor_FreeOverlay(ActorOverlay* entry) {
     void* ramAddr;
@@ -641,126 +641,126 @@ void Actor_FreeOverlay(ActorOverlay* entry) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Spawn.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Spawn.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_LoadOverlay.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_LoadOverlay.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnWithParentAndCutscene.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnWithParentAndCutscene.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnWithParent.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnWithParent.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnTransitionActors.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnTransitionActors.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB2D0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB2D0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB498.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB498.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB59C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB59C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB604.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB604.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB8EC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB8EC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBA88.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBA88.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBAC0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBAC0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBB74.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBB74.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBC20.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBC20.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBCEC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBCEC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBDAC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBDAC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBFB0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBFB0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC154.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC154.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC188.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC188.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC1B4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC1B4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC270.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC270.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC444.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC444.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC4EC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC4EC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC5B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC5B8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC5EC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC5EC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC620.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC620.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC770.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC770.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC7D8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC7D8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC848.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC848.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC8B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC8B8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCB50.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCB50.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCB70.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCB70.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCBF4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCBF4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCC68.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCC68.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCCDC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCCDC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD2B4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD2B4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD384.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD384.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD6B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD6B8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD6E4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD6E4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD888.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD888.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD9A0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD9A0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD9E0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD9E0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDAA0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDAA0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDB6C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDB6C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDC5C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDC5C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDCF4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDCF4.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDFB0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDFB0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDFC0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDFC0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE03C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE03C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE0B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE0B8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE184.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE184.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE22C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE22C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE258.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE258.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE2B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE2B8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE33C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE33C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE3D0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE3D0.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE504.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE504.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE568.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE568.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE5CC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE5CC.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE63C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE63C.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE680.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE680.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800BF7CC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BF7CC.asm")
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index e4dec7c48..36ce943f5 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -64,369 +64,369 @@ void BgCheck_CreateVertexFromVec3f(BgVertex* vertex, Vec3f* vector) {
     vertex->pos.z = vector->z;
 }
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800BFD84.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800BFD84.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800BFDEC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800BFDEC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonGetMinY.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonGetMinY.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonGetNormal.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonGetNormal.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0094.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0094.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C01B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C01B8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_CreateColTriParamsFromPolygon.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CreateColTriParamsFromPolygon.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C02C0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C02C0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0340.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0340.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0474.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0474.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0668.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0668.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C06A8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C06A8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C074C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C074C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C07F0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C07F0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonCollidesWithSphere.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonCollidesWithSphere.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsInsertSorted.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInsertSorted.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsInsert.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInsert.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C0E74.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0E74.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C10FC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C10FC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C1238.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1238.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C12A4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C12A4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C1B68.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1B68.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C1D7C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1D7C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2008.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2008.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C20F4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C20F4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2310.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2310.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2460.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2460.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2514.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2514.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C25E0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C25E0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetPolyMinSubdivisions.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMinSubdivisions.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetPolyMaxSubdivisions.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMaxSubdivisions.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetPolyMinMaxSubdivisions.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMinMaxSubdivisions.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C2BE0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2BE0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_SplitScenePolygonsIntoSubdivisions.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_SplitScenePolygonsIntoSubdivisions.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetIsDefaultSpecialScene.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetIsDefaultSpecialScene.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetSpecialSceneMaxMemory.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetSpecialSceneMaxMemory.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_CalcSubdivisionSize.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CalcSubdivisionSize.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetSpecialSceneMaxObjects.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetSpecialSceneMaxObjects.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_Init.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_Init.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3C00.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C00.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3C14.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C14.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetActorMeshHeader.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetActorMeshHeader.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3C94.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C94.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3D50.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3D50.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3F40.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3F40.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C3FA0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3FA0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4000.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4000.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4058.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4058.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C40B4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C40B4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C411C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C411C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4188.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4188.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C41E4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C41E4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4240.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4240.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C42A8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C42A8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4314.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4314.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C43CC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C43CC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4488.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4488.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C44F0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C44F0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C455C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C455C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C45C4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C45C4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4C74.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4C74.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4CD8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4CD8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4D3C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4D3C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4DA4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4DA4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4E10.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4E10.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4F38.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4F38.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4F84.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4F84.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C4FD4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4FD4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5464.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5464.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C54AC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C54AC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5538.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5538.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C55C4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C55C4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5650.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5650.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C56E0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C56E0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C576C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C576C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C57F8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C57F8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C583C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C583C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C58C8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C58C8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5954.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5954.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5A20.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5A20.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5A64.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5A64.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsAlloc.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsAlloc.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C5B80.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5B80.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ScenePolygonListsReserveNode.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsReserveNode.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshParamsInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshParamsInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_SetActorMeshParams.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_SetActorMeshParams.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_AreActorMeshParamsEqual.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AreActorMeshParamsEqual.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshPolyListsHeadsInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshPolyListsHeadsInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshPolyListsInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshPolyListsInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshVerticesIndexInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshVerticesIndexInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshWaterboxesIndexInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshWaterboxesIndexInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshInitFromActor.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshInitFromActor.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_HasActorMeshChanged.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_HasActorMeshChanged.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonsInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonsInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_PolygonsAlloc.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonsAlloc.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_VerticesInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_VerticesInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_VerticesListAlloc.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_VerticesListAlloc.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_WaterboxListInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_WaterboxListInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_WaterboxListAlloc.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_WaterboxListAlloc.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ActorMeshUpdateParams.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshUpdateParams.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_IsActorMeshIndexValid.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_IsActorMeshIndexValid.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_DynaInit.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_DynaInit.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_DynaAlloc.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_DynaAlloc.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_AddActorMesh.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AddActorMesh.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetActorOfMesh.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetActorOfMesh.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C62BC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C62BC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C6314.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6314.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C636C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C636C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C63C4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C63C4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C641C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C641C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C6474.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6474.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_RemoveActorMesh.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RemoveActorMesh.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C6554.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6554.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_CalcWaterboxDimensions.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CalcWaterboxDimensions.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_AddActorMeshToLists.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AddActorMeshToLists.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_ResetFlagsIfLoadedActor.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ResetFlagsIfLoadedActor.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_Update.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_Update.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C756C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C756C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_UpdateAllActorMeshes.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_UpdateAllActorMeshes.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C76EC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C76EC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C7974.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C7974.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C7E40.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C7E40.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8580.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8580.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C87D0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C87D0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8A60.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8A60.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8BD0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8BD0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8DC0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8DC0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C8EEC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8EEC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C90AC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C90AC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C921C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C921C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9380.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9380.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_RelocateMeshHeaderPointers.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateMeshHeaderPointers.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_RelocateMeshHeader.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateMeshHeader.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_RelocateAllMeshHeaders.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateAllMeshHeaders.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9640.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9640.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/BgCheck_GetPolygonAttributes.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolygonAttributes.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9704.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9704.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9728.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9728.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9770.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9770.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C97F8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C97F8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9844.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9844.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C98CC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C98CC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9924.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9924.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C99AC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99AC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C99D4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99D4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C99FC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99FC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9A24.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A24.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9A4C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A4C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9A7C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A7C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9AB0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9AB0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9AE4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9AE4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9B18.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B18.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9B40.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B40.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9B68.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B68.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9B90.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B90.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9BB8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9BB8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9BDC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9BDC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9C24.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C24.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9C74.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C74.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9C9C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C9C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9CC4.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9CC4.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9CEC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9CEC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9D14.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D14.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9D50.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D50.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9D8C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D8C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9DDC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9DDC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9E18.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E18.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9E40.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E40.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9E88.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E88.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800C9EBC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9EBC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA1AC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA1AC.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA1E8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA1E8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA22C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA22C.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA568.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA568.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA634.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA634.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA648.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA648.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA6B8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6B8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA6D8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6D8.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA6F0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6F0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CA9D0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA9D0.asm")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_bgcheck/func_800CAA14.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CAA14.asm")
 
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index f4d1d12df..19478622f 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -145,7 +145,7 @@ s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry) {
     return ret;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm")
 #endif
 
 void EffectSS_Copy(GlobalContext* ctxt, LoadedParticleEntry* a1) {
@@ -208,7 +208,7 @@ void EffectSS_LoadParticle(GlobalContext* ctxt, u32 type, u32 priority, void* in
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_LoadParticle.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite/EffectSS_LoadParticle.asm")
 #endif
 
 void EffectSS_UpdateParticle(GlobalContext* ctxt, s32 index) {
@@ -291,7 +291,7 @@ s16 func_800B096C(s16 a0, s16 a1, s32 a2) {
     return ret;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/func_800B096C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite/func_800B096C.asm")
 #endif
 
 s16 func_800B09D0(s16 a0, s16 a1, f32 a2) {
diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index a974790cc..fb02269fa 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -25,7 +25,7 @@ void* Lib_MemSet(u8* a0, u32 a1, u32 a2) {
     return a0;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_MemSet.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Lib_MemSet.asm")
 #endif
 
 f32 Math_Coss(s16 angle) {
@@ -149,7 +149,7 @@ s32 Lib_StepTowardsCheck_f(f32* start, f32 target, f32 step) {
     return 0;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_StepTowardsCheck_f.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Lib_StepTowardsCheck_f.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -168,7 +168,7 @@ s32 func_800FF0D0(s16* a0, s16 a1, s16 a2) {
     return 0;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF0D0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF0D0.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -176,7 +176,7 @@ void func_800FF138() {
 
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF138.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF138.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -184,7 +184,7 @@ void func_800FF1FC(void) {
 
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF1FC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF1FC.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -192,7 +192,7 @@ void func_800FF2A8(void) {
 
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2A8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF2A8.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -201,7 +201,7 @@ void func_800FF2F8(void) {
 }
 
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2F8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF2F8.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -209,7 +209,7 @@ void func_800FF3A0(void) {
 
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF3A0.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF3A0.asm")
 #endif
 
 s16 Math_Rand_S16Offset(s16 base, s16 range) {
@@ -363,7 +363,7 @@ void Math_Vec3f_PushAwayXZ(Vec3f* start, Vec3f* pusher, f32 distanceToApproach)
     start->z = pusher->z + sp20 * f2;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Math_Vec3f_PushAwayXZ.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Math_Vec3f_PushAwayXZ.asm")
 #endif
 
 f32 Math_Vec3f_DiffY(Vec3f* a, Vec3f* b) {
@@ -518,7 +518,7 @@ s32 Math_SmoothScaleMaxMinS(s16* start, s16 target, s16 scale, s16 maxStep, s16
 
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Math_SmoothScaleMaxMinS.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Math_SmoothScaleMaxMinS.asm")
 #endif
 
 void Math_SmoothScaleMaxS(s16* start, s16 target, s16 scale, s16 maxStep) {
@@ -576,7 +576,7 @@ void Lib_LerpRGB(RGB* a, RGB* b, f32 t, RGB* dst) {
     dst->blue = (f32)a->blue + ((f32)b->blue - (f32)a->blue) * t;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_LerpRGB.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/Lib_LerpRGB.asm")
 #endif
 
 f32 Lib_PushAwayVec3f(Vec3f* start, Vec3f* pusher, f32 distanceToApproach) {
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index c1044254d..7ed0b0951 100644
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@@ -70,7 +70,7 @@ void Lights_UploadLights(LightMapper* mapper, GraphicsContext* gCtxt) {
     gSPLight(gCtxt->polyXlu.p++, &mapper->lights.a, i);
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_UploadLights.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/Lights_UploadLights.asm")
 #endif
 
 Light* Lights_MapperGetNextFreeSlot(LightMapper* mapper) {
@@ -126,7 +126,7 @@ void Lights_MapPositionalWithReference(LightMapper* mapper, LightInfoPositionalP
     }
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositionalWithReference.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/Lights_MapPositionalWithReference.asm")
 #endif
 
 // This function matches, but uses .rodata. We don't have a good way to match partial .rodata for a file yet.
@@ -172,7 +172,7 @@ void Lights_MapPositional(LightMapper* mapper, LightInfoPositionalParams* params
     }
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositional.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/Lights_MapPositional.asm")
 #endif
 
 void Lights_MapDirectional(LightMapper* mapper, LightInfoDirectionalParams* params, GlobalContext* ctxt) {
@@ -393,7 +393,7 @@ void func_80102880(GlobalContext* ctxt) {
     }
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_lights/func_80102880.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/func_80102880.asm")
 #endif
 
 // XXX regalloc
@@ -440,5 +440,5 @@ void func_80102A64(GlobalContext* ctxt) {
     }
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_lights/func_80102A64.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/func_80102A64.asm")
 #endif
diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c
index 5a9fee3cb..53120b88d 100644
--- a/src/code/z_prenmi.c
+++ b/src/code/z_prenmi.c
@@ -30,7 +30,7 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) {
     gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, 320 /*SCREEN_WIDTH*/ - 1, prenmiCtx->timer + 100);
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_prenmi/PreNMI_Draw.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_prenmi/PreNMI_Draw.asm")
 #endif
 
 void PreNMI_Main(PreNMIContext* prenmiCtx) {
diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c
index 302e1151b..beb04ef70 100644
--- a/src/code/z_rcp.c
+++ b/src/code/z_rcp.c
@@ -1303,7 +1303,7 @@ void func_8012CF0C(GraphicsContext* gCtxt, s32 iParm2, s32 iParm3, u8 r, u8 g, u
     }
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_rcp/func_8012CF0C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_rcp/func_8012CF0C.asm")
 #endif
 
 void func_8012D374(GraphicsContext* gCtxt, u8 r, u8 g, u8 b) {
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 65c8e82da..2c04cabe8 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -42,13 +42,13 @@ void Room_DrawType0Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_DrawType2Mesh.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_DrawType2Mesh.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012DEE8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012DEE8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012E254.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012E254.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012E32C.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012E32C.asm")
 
 void Room_DrawType1Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
     RoomMeshType1* mesh = &room->mesh->type1;
@@ -72,7 +72,7 @@ void Room_Init(GlobalContext* ctxt, RoomContext* roomCtxt) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_AllocateAndLoad.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_AllocateAndLoad.asm")
 
 #ifdef NON_MATCHING
 s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 index) {
@@ -99,7 +99,7 @@ s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 ind
     return 0;
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_StartRoomTransition.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_StartRoomTransition.asm")
 #endif
 
 s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) {
diff --git a/src/code/z_scene_proc.c b/src/code/z_scene_proc.c
index 6d2d5bd67..11e6fa832 100644
--- a/src/code/z_scene_proc.c
+++ b/src/code/z_scene_proc.c
@@ -104,7 +104,7 @@ void SceneProc_DrawFlashingTexture(GlobalContext* ctxt, u32 segment, FlashingTex
     gSPEndDisplayList(dl++);
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawFlashingTexture.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawFlashingTexture.asm")
 #endif
 
 void SceneProc_DrawType2Texture(GlobalContext* ctxt, u32 segment, FlashingTextureParams* params) {
@@ -188,10 +188,10 @@ void SceneProc_DrawType3Texture(GlobalContext* ctxt, u32 segment, FlashingTextur
     SceneProc_DrawFlashingTexture(ctxt, segment, &primColorIn, envColorPtrIn);
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType3Texture.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawType3Texture.asm")
 #endif
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_Interpolate.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_Interpolate.asm")
 
 u8 SceneProc_InterpolateClamped(u32 numKeyFrames, f32* keyFrames, f32* values, f32 frame) {
     s32 ret = SceneProc_Interpolate(numKeyFrames, keyFrames, values, frame);
@@ -201,7 +201,7 @@ u8 SceneProc_InterpolateClamped(u32 numKeyFrames, f32* keyFrames, f32* values, f
                          ret;
 }
 
-#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType4Texture.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawType4Texture.asm")
 
 void SceneProc_DrawType5Texture(GlobalContext* ctxt, u32 segment, CyclingTextureParams* params) {
     u8* offsets;
@@ -332,7 +332,7 @@ void SceneProc_DrawSceneConfig3(GlobalContext* ctxt) {
     gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawSceneConfig3.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawSceneConfig3.asm")
 #endif
 
 void SceneProc_DrawSceneConfig4(GlobalContext* ctxt) {
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index 98c5eb656..c85e83d8d 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -848,7 +848,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limb
 }
 
 //Function is unused.
-#pragma GLOBAL_ASM("asm/non_matchings/z_skelanime/func_80134FFC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_skelanime/func_80134FFC.asm")
 
 s16 func_801353D4(GenericAnimationHeader* animationSeg) {
     GenericAnimationHeader* animation = Lib_PtrSegToVirt(animationSeg);
diff --git a/src/code/z_view.c b/src/code/z_view.c
index d583c2b13..f72b77ec0 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -349,7 +349,7 @@ s32 View_RenderToPerspectiveMatrix(View* view) {
     return 1;
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToPerspectiveMatrix.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/View_RenderToPerspectiveMatrix.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -393,12 +393,12 @@ s32 View_RenderToOrthographicMatrix(View* view) {
     return 1;
 }
 #else
-#pragma GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToOrthographicMatrix.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/View_RenderToOrthographicMatrix.asm")
 #endif
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_8013FBC8.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/func_8013FBC8.asm")
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_8013FD74.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/func_8013FD74.asm")
 
 s32 func_80140024(View* view) {
     guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z,
@@ -411,5 +411,5 @@ s32 func_80140024(View* view) {
     return 1;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_801400CC.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/func_801400CC.asm")