diff --git a/include/variables_overlay.h b/include/variables_overlay.h
index ad8e7d4674..bebf551fd4 100644
--- a/include/variables_overlay.h
+++ b/include/variables_overlay.h
@@ -1968,7 +1968,7 @@ extern UNK_TYPE4 D_8089ED38; // D_8089ED38
 extern OverlayRelocationSection enHataOverlayInfo; // D_8089ED40
 extern u32 enHataOverlayRelocations[12]; // D_8089ED54
 extern u32 enHataOverlayInfoOffset; // D_8089ED8C
-extern ActorInit enZl1ActorInitData; // D_8089EDD0
+extern ActorInit En_Zl1_InitVars; // D_8089EDD0
 extern OverlayRelocationSection enZl1OverlayInfo; // D_8089EDF0
 extern u32 enZl1OverlayRelocations[4]; // D_8089EE04
 extern u32 enZl1OverlayInfoOffset; // D_8089EE1C
@@ -2848,7 +2848,7 @@ extern UNK_TYPE4 D_808E1F58; // D_808E1F58
 extern OverlayRelocationSection enEncount2OverlayInfo; // D_808E1F60
 extern u32 enEncount2OverlayRelocations[25]; // D_808E1F74
 extern u32 enEncount2OverlayInfoOffset; // D_808E1FDC
-extern UNK_TYPE1 D_808E2020; // D_808E2020
+extern UNK_TYPE1 En_Fire_Rock_InitVars; // En_Fire_Rock_InitVars
 extern OverlayRelocationSection enFireRockOverlayInfo; // D_808E2040
 extern u32 enFireRockOverlayRelocations[4]; // D_808E2054
 extern u32 enFireRockOverlayInfoOffset; // D_808E206C
@@ -3987,7 +3987,7 @@ extern UNK_TYPE4 D_8092C250; // D_8092C250
 extern OverlayRelocationSection enIkOverlayInfo; // D_8092C260
 extern u32 enIkOverlayRelocations[171]; // D_8092C274
 extern u32 enIkOverlayInfoOffset; // D_8092C52C
-extern UNK_TYPE1 D_8092C570; // D_8092C570
+extern UNK_TYPE1 Demo_Shd_InitVars; // Demo_Shd_InitVars
 extern OverlayRelocationSection demoShdOverlayInfo; // D_8092C590
 extern u32 demoShdOverlayRelocations[4]; // D_8092C5A4
 extern u32 demoShdOverlayInfoOffset; // D_8092C5BC
@@ -6122,15 +6122,15 @@ extern UNK_TYPE4 D_809C3A5C; // D_809C3A5C
 extern OverlayRelocationSection enAob01OverlayInfo; // D_809C3A60
 extern u32 enAob01OverlayRelocations[193]; // D_809C3A74
 extern u32 enAob01OverlayInfoOffset; // D_809C3D7C
-extern UNK_TYPE1 D_809C3DC0; // D_809C3DC0
+extern UNK_TYPE1 En_Boj_01_InitVars; // En_Boj_01_InitVars
 extern OverlayRelocationSection enBoj01OverlayInfo; // D_809C3DE0
 extern u32 enBoj01OverlayRelocations[4]; // D_809C3DF4
 extern u32 enBoj01OverlayInfoOffset; // D_809C3E0C
-extern UNK_TYPE1 D_809C3E50; // D_809C3E50
+extern UNK_TYPE1 En_Boj_02_InitVars; // En_Boj_02_InitVars
 extern OverlayRelocationSection enBoj02OverlayInfo; // D_809C3E70
 extern u32 enBoj02OverlayRelocations[4]; // D_809C3E84
 extern u32 enBoj02OverlayInfoOffset; // D_809C3E9C
-extern UNK_TYPE1 D_809C3EE0; // D_809C3EE0
+extern UNK_TYPE1 En_Boj_03_InitVars; // En_Boj_03_InitVars
 extern OverlayRelocationSection enBoj03OverlayInfo; // D_809C3F00
 extern u32 enBoj03OverlayRelocations[4]; // D_809C3F14
 extern u32 enBoj03OverlayInfoOffset; // D_809C3F2C
@@ -6214,7 +6214,7 @@ extern UNK_TYPE4 D_809CB0FC; // D_809CB0FC
 extern OverlayRelocationSection enSyatekiCrowOverlayInfo; // D_809CB100
 extern u32 enSyatekiCrowOverlayRelocations[56]; // D_809CB114
 extern u32 enSyatekiCrowOverlayInfoOffset; // D_809CB1FC
-extern UNK_TYPE1 D_809CB240; // D_809CB240
+extern UNK_TYPE1 En_Boj_04_InitVars; // En_Boj_04_InitVars
 extern OverlayRelocationSection enBoj04OverlayInfo; // D_809CB260
 extern u32 enBoj04OverlayRelocations[4]; // D_809CB274
 extern u32 enBoj04OverlayInfoOffset; // D_809CB28C
@@ -6991,7 +6991,7 @@ extern UNK_TYPE4 D_80A0C560; // D_80A0C560
 extern OverlayRelocationSection bgDyYoseizoOverlayInfo; // D_80A0C570
 extern u32 bgDyYoseizoOverlayRelocations[123]; // D_80A0C584
 extern u32 bgDyYoseizoOverlayInfoOffset; // D_80A0C77C
-extern UNK_TYPE1 D_80A0C7C0; // D_80A0C7C0
+extern UNK_TYPE1 En_Boj_05_InitVars; // En_Boj_05_InitVars
 extern OverlayRelocationSection enBoj05OverlayInfo; // D_80A0C7E0
 extern u32 enBoj05OverlayRelocations[4]; // D_80A0C7F4
 extern u32 enBoj05OverlayInfoOffset; // D_80A0C80C
@@ -8168,7 +8168,7 @@ extern UNK_TYPE4 D_80A55E40; // D_80A55E40
 extern OverlayRelocationSection objHugebombiwaOverlayInfo; // D_80A55E50
 extern u32 objHugebombiwaOverlayRelocations[147]; // D_80A55E64
 extern u32 objHugebombiwaOverlayInfoOffset; // D_80A560BC
-extern UNK_TYPE1 D_80A56100; // D_80A56100
+extern UNK_TYPE1 En_Firefly2_InitVars; // En_Firefly2_InitVars
 extern OverlayRelocationSection enFirefly2OverlayInfo; // D_80A56120
 extern u32 enFirefly2OverlayRelocations[4]; // D_80A56134
 extern u32 enFirefly2OverlayInfoOffset; // D_80A5614C
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt
index c7b692627a..cad6f2f53e 100644
--- a/linker_scripts/code_script.txt
+++ b/linker_scripts/code_script.txt
@@ -945,8 +945,9 @@ SECTIONS
     ovl_En_Zl1 : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o(.text)
-        build/asm/ovl_En_Zl1_data.o(.data)
-        build/asm/ovl_En_Zl1_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o(.data)
+        build/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o(.rodata)
+        build/src/overlays/actors/ovl_En_Zl1/z_en_zl1_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
@@ -1430,8 +1431,9 @@ SECTIONS
     ovl_En_Fire_Rock : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.o(.text)
-        build/asm/ovl_En_Fire_Rock_data.o(.data)
-        build/asm/ovl_En_Fire_Rock_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.o(.data)
+        build/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.o(.rodata)
+        build/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
@@ -1713,8 +1715,9 @@ SECTIONS
     ovl_Demo_Shd : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.o(.text)
-        build/asm/ovl_Demo_Shd_data.o(.data)
-        build/asm/ovl_Demo_Shd_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.o(.data)
+        build/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.o(.rodata)
+        build/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
@@ -3080,8 +3083,9 @@ SECTIONS
     ovl_En_Boj_01 : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.o(.text)
-        build/asm/ovl_En_Boj_01_data.o(.data)
-        build/asm/ovl_En_Boj_01_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.o(.data)
+        build/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
@@ -3091,8 +3095,9 @@ SECTIONS
     ovl_En_Boj_02 : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.o(.text)
-        build/asm/ovl_En_Boj_02_data.o(.data)
-        build/asm/ovl_En_Boj_02_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.o(.data)
+        build/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
@@ -3102,8 +3107,9 @@ SECTIONS
     ovl_En_Boj_03 : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.o(.text)
-        build/asm/ovl_En_Boj_03_data.o(.data)
-        build/asm/ovl_En_Boj_03_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.o(.data)
+        build/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
@@ -3168,8 +3174,9 @@ SECTIONS
     ovl_En_Boj_04 : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.o(.text)
-        build/asm/ovl_En_Boj_04_data.o(.data)
-        build/asm/ovl_En_Boj_04_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.o(.data)
+        build/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
@@ -3336,8 +3343,9 @@ SECTIONS
     ovl_En_Boj_05 : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.o(.text)
-        build/asm/ovl_En_Boj_05_data.o(.data)
-        build/asm/ovl_En_Boj_05_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.o(.data)
+        build/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.o(.rodata)
+        build/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
@@ -3951,8 +3959,9 @@ SECTIONS
     ovl_En_Firefly2 : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.o(.text)
-        build/asm/ovl_En_Firefly2_data.o(.data)
-        build/asm/ovl_En_Firefly2_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.o(.data)
+        build/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.o(.rodata)
+        build/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
index 336e43e19c..d1f844e233 100644
--- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
+++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
@@ -9,7 +9,6 @@ void DemoShd_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void DemoShd_Update(Actor* thisx, GlobalContext* globalCtx);
 void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit Demo_Shd_InitVars = {
     ACTOR_DEMO_SHD,
     ACTORTYPE_ENEMY,
@@ -21,12 +20,12 @@ const ActorInit Demo_Shd_InitVars = {
     (ActorFunc)DemoShd_Update,
     (ActorFunc)DemoShd_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_Demo_Shd_0x8092C530/DemoShd_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_Demo_Shd_0x8092C530/DemoShd_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_Demo_Shd_0x8092C530/DemoShd_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_Demo_Shd_0x8092C530/DemoShd_Draw.asm")
+void DemoShd_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void DemoShd_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void DemoShd_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c
index b2e134503c..c940627ecf 100644
--- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c
+++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c
@@ -9,7 +9,6 @@ void EnBoj01_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj01_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj01_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Boj_01_InitVars = {
     ACTOR_EN_BOJ_01,
     ACTORTYPE_NPC,
@@ -21,12 +20,12 @@ const ActorInit En_Boj_01_InitVars = {
     (ActorFunc)EnBoj01_Update,
     (ActorFunc)EnBoj01_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_01_0x809C3D80/EnBoj01_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_01_0x809C3D80/EnBoj01_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_01_0x809C3D80/EnBoj01_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_01_0x809C3D80/EnBoj01_Draw.asm")
+void EnBoj01_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj01_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj01_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj01_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c
index d9fbc648f2..ae00e435f4 100644
--- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c
+++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c
@@ -9,7 +9,6 @@ void EnBoj02_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj02_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj02_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Boj_02_InitVars = {
     ACTOR_EN_BOJ_02,
     ACTORTYPE_NPC,
@@ -21,12 +20,12 @@ const ActorInit En_Boj_02_InitVars = {
     (ActorFunc)EnBoj02_Update,
     (ActorFunc)EnBoj02_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_02_0x809C3E10/EnBoj02_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_02_0x809C3E10/EnBoj02_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_02_0x809C3E10/EnBoj02_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_02_0x809C3E10/EnBoj02_Draw.asm")
+void EnBoj02_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj02_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj02_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj02_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c
index f88b1c9b29..11f9aa21ce 100644
--- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c
+++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c
@@ -9,7 +9,6 @@ void EnBoj03_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj03_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj03_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Boj_03_InitVars = {
     ACTOR_EN_BOJ_03,
     ACTORTYPE_NPC,
@@ -21,12 +20,12 @@ const ActorInit En_Boj_03_InitVars = {
     (ActorFunc)EnBoj03_Update,
     (ActorFunc)EnBoj03_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_03_0x809C3EA0/EnBoj03_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_03_0x809C3EA0/EnBoj03_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_03_0x809C3EA0/EnBoj03_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_03_0x809C3EA0/EnBoj03_Draw.asm")
+void EnBoj03_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj03_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj03_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj03_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c
index 1f0daef1a0..b148a4ec82 100644
--- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c
+++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c
@@ -9,7 +9,6 @@ void EnBoj04_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj04_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj04_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Boj_04_InitVars = {
     ACTOR_EN_BOJ_04,
     ACTORTYPE_NPC,
@@ -21,12 +20,12 @@ const ActorInit En_Boj_04_InitVars = {
     (ActorFunc)EnBoj04_Update,
     (ActorFunc)EnBoj04_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_04_0x809CB200/EnBoj04_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_04_0x809CB200/EnBoj04_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_04_0x809CB200/EnBoj04_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_04_0x809CB200/EnBoj04_Draw.asm")
+void EnBoj04_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj04_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj04_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj04_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c
index 6aa7154554..eedbcf887c 100644
--- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c
+++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c
@@ -9,7 +9,6 @@ void EnBoj05_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj05_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnBoj05_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Boj_05_InitVars = {
     ACTOR_EN_BOJ_05,
     ACTORTYPE_NPC,
@@ -21,12 +20,12 @@ const ActorInit En_Boj_05_InitVars = {
     (ActorFunc)EnBoj05_Update,
     (ActorFunc)EnBoj05_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_05_0x80A0C780/EnBoj05_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_05_0x80A0C780/EnBoj05_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_05_0x80A0C780/EnBoj05_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_05_0x80A0C780/EnBoj05_Draw.asm")
+void EnBoj05_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj05_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj05_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnBoj05_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
index 4efffe49ce..8509c258d9 100644
--- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
+++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
@@ -9,7 +9,6 @@ void EnFireRock_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnFireRock_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnFireRock_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Fire_Rock_InitVars = {
     ACTOR_EN_FIRE_ROCK,
     ACTORTYPE_ENEMY,
@@ -21,12 +20,12 @@ const ActorInit En_Fire_Rock_InitVars = {
     (ActorFunc)EnFireRock_Update,
     (ActorFunc)EnFireRock_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_En_Fire_Rock_0x808E1FE0/EnFireRock_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Fire_Rock_0x808E1FE0/EnFireRock_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Fire_Rock_0x808E1FE0/EnFireRock_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Fire_Rock_0x808E1FE0/EnFireRock_Draw.asm")
+void EnFireRock_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnFireRock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnFireRock_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnFireRock_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c
index 8383dde52e..1ac8faa5ee 100644
--- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c
+++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c
@@ -9,7 +9,6 @@ void EnFirefly2_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnFirefly2_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnFirefly2_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Firefly2_InitVars = {
     ACTOR_EN_FIREFLY2,
     ACTORTYPE_ENEMY,
@@ -21,12 +20,12 @@ const ActorInit En_Firefly2_InitVars = {
     (ActorFunc)EnFirefly2_Update,
     (ActorFunc)EnFirefly2_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly2_0x80A560C0/EnFirefly2_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly2_0x80A560C0/EnFirefly2_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly2_0x80A560C0/EnFirefly2_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly2_0x80A560C0/EnFirefly2_Draw.asm")
+void EnFirefly2_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnFirefly2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnFirefly2_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnFirefly2_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
index e5810b2a68..63f62e409f 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
@@ -9,7 +9,6 @@ void EnZl1_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Zl1_InitVars = {
     ACTOR_EN_ZL1,
     ACTORTYPE_NPC,
@@ -21,12 +20,12 @@ const ActorInit En_Zl1_InitVars = {
     (ActorFunc)EnZl1_Update,
     (ActorFunc)EnZl1_Draw
 };
-*/
 
-GLOBAL_ASM("asm/non_matchings/ovl_En_Zl1_0x8089ED90/EnZl1_Init.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Zl1_0x8089ED90/EnZl1_Destroy.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Zl1_0x8089ED90/EnZl1_Update.asm")
-
-GLOBAL_ASM("asm/non_matchings/ovl_En_Zl1_0x8089ED90/EnZl1_Draw.asm")
+void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnZl1_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx) {
+}
diff --git a/tables/variables.txt b/tables/variables.txt
index 610b43e964..ae3e27ca91 100644
--- a/tables/variables.txt
+++ b/tables/variables.txt
@@ -6624,7 +6624,7 @@
     0x8089ED40:("enHataOverlayInfo","OverlayRelocationSection","",0x14),
     0x8089ED54:("enHataOverlayRelocations","u32","[12]",0x30),
     0x8089ED8C:("enHataOverlayInfoOffset","u32","",0x4),
-    0x8089EDD0:("enZl1ActorInitData","ActorInit","",0x20),
+    0x8089EDD0:("En_Zl1_InitVars","ActorInit","",0x20),
     0x8089EDF0:("enZl1OverlayInfo","OverlayRelocationSection","",0x14),
     0x8089EE04:("enZl1OverlayRelocations","u32","[4]",0x10),
     0x8089EE1C:("enZl1OverlayInfoOffset","u32","",0x4),
@@ -7520,7 +7520,7 @@
     0x808E1F60:("enEncount2OverlayInfo","OverlayRelocationSection","",0x14),
     0x808E1F74:("enEncount2OverlayRelocations","u32","[25]",0x64),
     0x808E1FDC:("enEncount2OverlayInfoOffset","u32","",0x4),
-    0x808E2020:("D_808E2020","UNK_TYPE1","",0x1),
+    0x808E2020:("En_Fire_Rock_InitVars","UNK_TYPE1","",0x1),
     0x808E2040:("enFireRockOverlayInfo","OverlayRelocationSection","",0x14),
     0x808E2054:("enFireRockOverlayRelocations","u32","[4]",0x10),
     0x808E206C:("enFireRockOverlayInfoOffset","u32","",0x4),
@@ -8678,7 +8678,7 @@
     0x8092C260:("enIkOverlayInfo","OverlayRelocationSection","",0x14),
     0x8092C274:("enIkOverlayRelocations","u32","[171]",0x2ac),
     0x8092C52C:("enIkOverlayInfoOffset","u32","",0x4),
-    0x8092C570:("D_8092C570","UNK_TYPE1","",0x1),
+    0x8092C570:("Demo_Shd_InitVars","UNK_TYPE1","",0x1),
     0x8092C590:("demoShdOverlayInfo","OverlayRelocationSection","",0x14),
     0x8092C5A4:("demoShdOverlayRelocations","u32","[4]",0x10),
     0x8092C5BC:("demoShdOverlayInfoOffset","u32","",0x4),
@@ -10869,15 +10869,15 @@
     0x809C3A60:("enAob01OverlayInfo","OverlayRelocationSection","",0x14),
     0x809C3A74:("enAob01OverlayRelocations","u32","[193]",0x304),
     0x809C3D7C:("enAob01OverlayInfoOffset","u32","",0x4),
-    0x809C3DC0:("D_809C3DC0","UNK_TYPE1","",0x1),
+    0x809C3DC0:("En_Boj_01_InitVars","UNK_TYPE1","",0x1),
     0x809C3DE0:("enBoj01OverlayInfo","OverlayRelocationSection","",0x14),
     0x809C3DF4:("enBoj01OverlayRelocations","u32","[4]",0x10),
     0x809C3E0C:("enBoj01OverlayInfoOffset","u32","",0x4),
-    0x809C3E50:("D_809C3E50","UNK_TYPE1","",0x1),
+    0x809C3E50:("En_Boj_02_InitVars","UNK_TYPE1","",0x1),
     0x809C3E70:("enBoj02OverlayInfo","OverlayRelocationSection","",0x14),
     0x809C3E84:("enBoj02OverlayRelocations","u32","[4]",0x10),
     0x809C3E9C:("enBoj02OverlayInfoOffset","u32","",0x4),
-    0x809C3EE0:("D_809C3EE0","UNK_TYPE1","",0x1),
+    0x809C3EE0:("En_Boj_03_InitVars","UNK_TYPE1","",0x1),
     0x809C3F00:("enBoj03OverlayInfo","OverlayRelocationSection","",0x14),
     0x809C3F14:("enBoj03OverlayRelocations","u32","[4]",0x10),
     0x809C3F2C:("enBoj03OverlayInfoOffset","u32","",0x4),
@@ -10966,7 +10966,7 @@
     0x809CB100:("enSyatekiCrowOverlayInfo","OverlayRelocationSection","",0x14),
     0x809CB114:("enSyatekiCrowOverlayRelocations","u32","[56]",0xe0),
     0x809CB1FC:("enSyatekiCrowOverlayInfoOffset","u32","",0x4),
-    0x809CB240:("D_809CB240","UNK_TYPE1","",0x1),
+    0x809CB240:("En_Boj_04_InitVars","UNK_TYPE1","",0x1),
     0x809CB260:("enBoj04OverlayInfo","OverlayRelocationSection","",0x14),
     0x809CB274:("enBoj04OverlayRelocations","u32","[4]",0x10),
     0x809CB28C:("enBoj04OverlayInfoOffset","u32","",0x4),
@@ -11762,7 +11762,7 @@
     0x80A0C570:("bgDyYoseizoOverlayInfo","OverlayRelocationSection","",0x14),
     0x80A0C584:("bgDyYoseizoOverlayRelocations","u32","[123]",0x1ec),
     0x80A0C77C:("bgDyYoseizoOverlayInfoOffset","u32","",0x4),
-    0x80A0C7C0:("D_80A0C7C0","UNK_TYPE1","",0x1),
+    0x80A0C7C0:("En_Boj_05_InitVars","UNK_TYPE1","",0x1),
     0x80A0C7E0:("enBoj05OverlayInfo","OverlayRelocationSection","",0x14),
     0x80A0C7F4:("enBoj05OverlayRelocations","u32","[4]",0x10),
     0x80A0C80C:("enBoj05OverlayInfoOffset","u32","",0x4),
@@ -12952,7 +12952,7 @@
     0x80A55E50:("objHugebombiwaOverlayInfo","OverlayRelocationSection","",0x14),
     0x80A55E64:("objHugebombiwaOverlayRelocations","u32","[147]",0x24c),
     0x80A560BC:("objHugebombiwaOverlayInfoOffset","u32","",0x4),
-    0x80A56100:("D_80A56100","UNK_TYPE1","",0x1),
+    0x80A56100:("En_Firefly2_InitVars","UNK_TYPE1","",0x1),
     0x80A56120:("enFirefly2OverlayInfo","OverlayRelocationSection","",0x14),
     0x80A56134:("enFirefly2OverlayRelocations","u32","[4]",0x10),
     0x80A5614C:("enFirefly2OverlayInfoOffset","u32","",0x4),