Empty actors (Demo_Shd, en_firefly, en_fire_rock, and en_boj_01-05) OK (#24)

* Finished two empty actors

* Demo_Shd, en_firefly, en_fire_rock, and en_boj_01-05 OK and formatted

* en_zl1 OK (also an empty actor)

9 files changed, 72 insertions, 81 deletions

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 336e43e19..d1f844e23 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 b2e134503..c940627ec 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 d9fbc648f..ae00e435f 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 f88b1c9b2..11f9aa21c 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 1f0daef1a..b148a4ec8 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 6aa715455..eedbcf887 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 4efffe49c..8509c258d 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 8383dde52..1ac8faa5e 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 e5810b2a6..63f62e409 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) {
+}