diff --git a/src/overlays/actors/ovl_Arms_Hook/overlay.cfg b/src/overlays/actors/ovl_Arms_Hook/overlay.cfg
deleted file mode 100644
index 4a8f598228..0000000000
--- a/src/overlays/actors/ovl_Arms_Hook/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Arms_Hook
-z_arms_hook.c
diff --git a/src/overlays/actors/ovl_Arrow_Fire/overlay.cfg b/src/overlays/actors/ovl_Arrow_Fire/overlay.cfg
deleted file mode 100644
index a2d1a6ad65..0000000000
--- a/src/overlays/actors/ovl_Arrow_Fire/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Arrow_Fire
-z_arrow_fire.c
diff --git a/src/overlays/actors/ovl_Arrow_Ice/overlay.cfg b/src/overlays/actors/ovl_Arrow_Ice/overlay.cfg
deleted file mode 100644
index b95f23d3c6..0000000000
--- a/src/overlays/actors/ovl_Arrow_Ice/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Arrow_Ice
-z_arrow_ice.c
diff --git a/src/overlays/actors/ovl_Arrow_Light/overlay.cfg b/src/overlays/actors/ovl_Arrow_Light/overlay.cfg
deleted file mode 100644
index d5bda9b4cf..0000000000
--- a/src/overlays/actors/ovl_Arrow_Light/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Arrow_Light
-z_arrow_light.c
diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Astr_Bombwall/overlay.cfg
deleted file mode 100644
index 735382eadc..0000000000
--- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Astr_Bombwall
-z_bg_astr_bombwall.c
diff --git a/src/overlays/actors/ovl_Bg_Botihasira/overlay.cfg b/src/overlays/actors/ovl_Bg_Botihasira/overlay.cfg
deleted file mode 100644
index 48da75cb3e..0000000000
--- a/src/overlays/actors/ovl_Bg_Botihasira/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Botihasira
-z_bg_botihasira.c
diff --git a/src/overlays/actors/ovl_Bg_Breakwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Breakwall/overlay.cfg
deleted file mode 100644
index 77c1ecf0d2..0000000000
--- a/src/overlays/actors/ovl_Bg_Breakwall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Breakwall
-z_bg_breakwall.c
diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/overlay.cfg b/src/overlays/actors/ovl_Bg_Crace_Movebg/overlay.cfg
deleted file mode 100644
index ab8eb44057..0000000000
--- a/src/overlays/actors/ovl_Bg_Crace_Movebg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Crace_Movebg
-z_bg_crace_movebg.c
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/overlay.cfg b/src/overlays/actors/ovl_Bg_Ctower_Gear/overlay.cfg
deleted file mode 100644
index 244f98e32c..0000000000
--- a/src/overlays/actors/ovl_Bg_Ctower_Gear/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ctower_Gear
-z_bg_ctower_gear.c
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/overlay.cfg b/src/overlays/actors/ovl_Bg_Ctower_Rot/overlay.cfg
deleted file mode 100644
index c41e36b27c..0000000000
--- a/src/overlays/actors/ovl_Bg_Ctower_Rot/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ctower_Rot
-z_bg_ctower_rot.c
diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/overlay.cfg b/src/overlays/actors/ovl_Bg_Danpei_Movebg/overlay.cfg
deleted file mode 100644
index beb2b30109..0000000000
--- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Danpei_Movebg
-z_bg_danpei_movebg.c
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/overlay.cfg b/src/overlays/actors/ovl_Bg_Dblue_Balance/overlay.cfg
deleted file mode 100644
index f0f5a4f1ab..0000000000
--- a/src/overlays/actors/ovl_Bg_Dblue_Balance/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Dblue_Balance
-z_bg_dblue_balance.c
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/overlay.cfg b/src/overlays/actors/ovl_Bg_Dblue_Elevator/overlay.cfg
deleted file mode 100644
index 8193509f4d..0000000000
--- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Dblue_Elevator
-z_bg_dblue_elevator.c
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/overlay.cfg b/src/overlays/actors/ovl_Bg_Dblue_Movebg/overlay.cfg
deleted file mode 100644
index 7188cf2ea1..0000000000
--- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Dblue_Movebg
-z_bg_dblue_movebg.c
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/overlay.cfg b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/overlay.cfg
deleted file mode 100644
index 08aaa6100f..0000000000
--- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Dblue_Waterfall
-z_bg_dblue_waterfall.c
diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/overlay.cfg b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/overlay.cfg
deleted file mode 100644
index 4a1aa8be1c..0000000000
--- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Dkjail_Ivy
-z_bg_dkjail_ivy.c
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/overlay.cfg b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/overlay.cfg
deleted file mode 100644
index 59c99de934..0000000000
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Dy_Yoseizo
-z_bg_dy_yoseizo.c
diff --git a/src/overlays/actors/ovl_Bg_F40_Block/overlay.cfg b/src/overlays/actors/ovl_Bg_F40_Block/overlay.cfg
deleted file mode 100644
index b5030fcaa7..0000000000
--- a/src/overlays/actors/ovl_Bg_F40_Block/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_F40_Block
-z_bg_f40_block.c
diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/overlay.cfg b/src/overlays/actors/ovl_Bg_F40_Flift/overlay.cfg
deleted file mode 100644
index f771926dbf..0000000000
--- a/src/overlays/actors/ovl_Bg_F40_Flift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_F40_Flift
-z_bg_f40_flift.c
diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/overlay.cfg b/src/overlays/actors/ovl_Bg_F40_Switch/overlay.cfg
deleted file mode 100644
index b5e0454594..0000000000
--- a/src/overlays/actors/ovl_Bg_F40_Switch/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_F40_Switch
-z_bg_f40_switch.c
diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/overlay.cfg b/src/overlays/actors/ovl_Bg_F40_Swlift/overlay.cfg
deleted file mode 100644
index 83d9bffed0..0000000000
--- a/src/overlays/actors/ovl_Bg_F40_Swlift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_F40_Swlift
-z_bg_f40_swlift.c
diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/overlay.cfg b/src/overlays/actors/ovl_Bg_Fire_Wall/overlay.cfg
deleted file mode 100644
index 8405309d0d..0000000000
--- a/src/overlays/actors/ovl_Bg_Fire_Wall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Fire_Wall
-z_bg_fire_wall.c
diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/overlay.cfg b/src/overlays/actors/ovl_Bg_Fu_Kaiten/overlay.cfg
deleted file mode 100644
index 30736ca5db..0000000000
--- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Fu_Kaiten
-z_bg_fu_kaiten.c
diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/overlay.cfg b/src/overlays/actors/ovl_Bg_Fu_Mizu/overlay.cfg
deleted file mode 100644
index 295d23d049..0000000000
--- a/src/overlays/actors/ovl_Bg_Fu_Mizu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Fu_Mizu
-z_bg_fu_mizu.c
diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/overlay.cfg b/src/overlays/actors/ovl_Bg_Goron_Oyu/overlay.cfg
deleted file mode 100644
index cd6286ed11..0000000000
--- a/src/overlays/actors/ovl_Bg_Goron_Oyu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Goron_Oyu
-z_bg_goron_oyu.c
diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Haka_Bombwall/overlay.cfg
deleted file mode 100644
index dd9b391ee5..0000000000
--- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Haka_Bombwall
-z_bg_haka_bombwall.c
diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/overlay.cfg b/src/overlays/actors/ovl_Bg_Haka_Curtain/overlay.cfg
deleted file mode 100644
index eba48c8727..0000000000
--- a/src/overlays/actors/ovl_Bg_Haka_Curtain/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Haka_Curtain
-z_bg_haka_curtain.c
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/overlay.cfg b/src/overlays/actors/ovl_Bg_Haka_Tomb/overlay.cfg
deleted file mode 100644
index 3e83b3fb68..0000000000
--- a/src/overlays/actors/ovl_Bg_Haka_Tomb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Haka_Tomb
-z_bg_haka_tomb.c
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/overlay.cfg
deleted file mode 100644
index 9b4288e951..0000000000
--- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Hakugin_Bombwall
-z_bg_hakugin_bombwall.c
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/overlay.cfg b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/overlay.cfg
deleted file mode 100644
index cc7d95cdce..0000000000
--- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Hakugin_Elvpole
-z_bg_hakugin_elvpole.c
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/overlay.cfg b/src/overlays/actors/ovl_Bg_Hakugin_Post/overlay.cfg
deleted file mode 100644
index fc47ccb4fc..0000000000
--- a/src/overlays/actors/ovl_Bg_Hakugin_Post/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Hakugin_Post
-z_bg_hakugin_post.c
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/overlay.cfg b/src/overlays/actors/ovl_Bg_Hakugin_Switch/overlay.cfg
deleted file mode 100644
index 3887196c77..0000000000
--- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Hakugin_Switch
-z_bg_hakugin_switch.c
diff --git a/src/overlays/actors/ovl_Bg_Icefloe/overlay.cfg b/src/overlays/actors/ovl_Bg_Icefloe/overlay.cfg
deleted file mode 100644
index f8da71e62d..0000000000
--- a/src/overlays/actors/ovl_Bg_Icefloe/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Icefloe
-z_bg_icefloe.c
diff --git a/src/overlays/actors/ovl_Bg_Icicle/overlay.cfg b/src/overlays/actors/ovl_Bg_Icicle/overlay.cfg
deleted file mode 100644
index 88c4deec09..0000000000
--- a/src/overlays/actors/ovl_Bg_Icicle/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Icicle
-z_bg_icicle.c
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Block/overlay.cfg
deleted file mode 100644
index af448437b7..0000000000
--- a/src/overlays/actors/ovl_Bg_Ikana_Block/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ikana_Block
-z_bg_ikana_block.c
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/overlay.cfg
deleted file mode 100644
index 4888c9532f..0000000000
--- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ikana_Bombwall
-z_bg_ikana_bombwall.c
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Dharma/overlay.cfg
deleted file mode 100644
index 13c58ba86f..0000000000
--- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ikana_Dharma
-z_bg_ikana_dharma.c
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Mirror/overlay.cfg
deleted file mode 100644
index d735febc00..0000000000
--- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ikana_Mirror
-z_bg_ikana_mirror.c
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Ray/overlay.cfg
deleted file mode 100644
index b091b0a519..0000000000
--- a/src/overlays/actors/ovl_Bg_Ikana_Ray/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ikana_Ray
-z_bg_ikana_ray.c
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/overlay.cfg
deleted file mode 100644
index c51c2a5980..0000000000
--- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ikana_Rotaryroom
-z_bg_ikana_rotaryroom.c
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Shutter/overlay.cfg
deleted file mode 100644
index e86cc272b1..0000000000
--- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ikana_Shutter
-z_bg_ikana_shutter.c
diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/overlay.cfg b/src/overlays/actors/ovl_Bg_Iknin_Susceil/overlay.cfg
deleted file mode 100644
index e7df7599d6..0000000000
--- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Iknin_Susceil
-z_bg_iknin_susceil.c
diff --git a/src/overlays/actors/ovl_Bg_Ikninside/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikninside/overlay.cfg
deleted file mode 100644
index 43d45dac70..0000000000
--- a/src/overlays/actors/ovl_Bg_Ikninside/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ikninside
-z_bg_ikninside.c
diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/overlay.cfg b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/overlay.cfg
deleted file mode 100644
index 0eca2bc55d..0000000000
--- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Iknv_Doukutu
-z_bg_iknv_doukutu.c
diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/overlay.cfg b/src/overlays/actors/ovl_Bg_Iknv_Obj/overlay.cfg
deleted file mode 100644
index 971c9f9479..0000000000
--- a/src/overlays/actors/ovl_Bg_Iknv_Obj/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Iknv_Obj
-z_bg_iknv_obj.c
diff --git a/src/overlays/actors/ovl_Bg_Ingate/overlay.cfg b/src/overlays/actors/ovl_Bg_Ingate/overlay.cfg
deleted file mode 100644
index 68501515e6..0000000000
--- a/src/overlays/actors/ovl_Bg_Ingate/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ingate
-z_bg_ingate.c
diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/overlay.cfg b/src/overlays/actors/ovl_Bg_Inibs_Movebg/overlay.cfg
deleted file mode 100644
index 8777870430..0000000000
--- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Inibs_Movebg
-z_bg_inibs_movebg.c
diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/overlay.cfg b/src/overlays/actors/ovl_Bg_Keikoku_Saku/overlay.cfg
deleted file mode 100644
index 78f2c76688..0000000000
--- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Keikoku_Saku
-z_bg_keikoku_saku.c
diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/overlay.cfg b/src/overlays/actors/ovl_Bg_Keikoku_Spr/overlay.cfg
deleted file mode 100644
index 74d068ea4e..0000000000
--- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Keikoku_Spr
-z_bg_keikoku_spr.c
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/overlay.cfg
deleted file mode 100644
index b61d1617fd..0000000000
--- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Kin2_Bombwall
-z_bg_kin2_bombwall.c
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/overlay.cfg b/src/overlays/actors/ovl_Bg_Kin2_Fence/overlay.cfg
deleted file mode 100644
index d3984fea95..0000000000
--- a/src/overlays/actors/ovl_Bg_Kin2_Fence/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Kin2_Fence
-z_bg_kin2_fence.c
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/overlay.cfg b/src/overlays/actors/ovl_Bg_Kin2_Picture/overlay.cfg
deleted file mode 100644
index ddd62c8234..0000000000
--- a/src/overlays/actors/ovl_Bg_Kin2_Picture/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Kin2_Picture
-z_bg_kin2_picture.c
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/overlay.cfg b/src/overlays/actors/ovl_Bg_Kin2_Shelf/overlay.cfg
deleted file mode 100644
index 84a84fd495..0000000000
--- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Kin2_Shelf
-z_bg_kin2_shelf.c
diff --git a/src/overlays/actors/ovl_Bg_Ladder/overlay.cfg b/src/overlays/actors/ovl_Bg_Ladder/overlay.cfg
deleted file mode 100644
index 6f88bdf1b5..0000000000
--- a/src/overlays/actors/ovl_Bg_Ladder/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Ladder
-z_bg_ladder.c
diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Last_Bwall/overlay.cfg
deleted file mode 100644
index ec560aa15f..0000000000
--- a/src/overlays/actors/ovl_Bg_Last_Bwall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Last_Bwall
-z_bg_last_bwall.c
diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/overlay.cfg b/src/overlays/actors/ovl_Bg_Lbfshot/overlay.cfg
deleted file mode 100644
index 520be10f09..0000000000
--- a/src/overlays/actors/ovl_Bg_Lbfshot/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Lbfshot
-z_bg_lbfshot.c
diff --git a/src/overlays/actors/ovl_Bg_Lotus/overlay.cfg b/src/overlays/actors/ovl_Bg_Lotus/overlay.cfg
deleted file mode 100644
index 95702c51ba..0000000000
--- a/src/overlays/actors/ovl_Bg_Lotus/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Lotus
-z_bg_lotus.c
diff --git a/src/overlays/actors/ovl_Bg_Market_Step/overlay.cfg b/src/overlays/actors/ovl_Bg_Market_Step/overlay.cfg
deleted file mode 100644
index 07ff7cee87..0000000000
--- a/src/overlays/actors/ovl_Bg_Market_Step/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Market_Step
-z_bg_market_step.c
diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/overlay.cfg b/src/overlays/actors/ovl_Bg_Mbar_Chair/overlay.cfg
deleted file mode 100644
index 8cfa06dece..0000000000
--- a/src/overlays/actors/ovl_Bg_Mbar_Chair/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Mbar_Chair
-z_bg_mbar_chair.c
diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/overlay.cfg b/src/overlays/actors/ovl_Bg_Numa_Hana/overlay.cfg
deleted file mode 100644
index 63ed804b17..0000000000
--- a/src/overlays/actors/ovl_Bg_Numa_Hana/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Numa_Hana
-z_bg_numa_hana.c
diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/overlay.cfg b/src/overlays/actors/ovl_Bg_Open_Shutter/overlay.cfg
deleted file mode 100644
index 8bf55bec25..0000000000
--- a/src/overlays/actors/ovl_Bg_Open_Shutter/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Open_Shutter
-z_bg_open_shutter.c
diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/overlay.cfg b/src/overlays/actors/ovl_Bg_Open_Spot/overlay.cfg
deleted file mode 100644
index 757c3fbfdc..0000000000
--- a/src/overlays/actors/ovl_Bg_Open_Spot/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Open_Spot
-z_bg_open_spot.c
diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/overlay.cfg b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/overlay.cfg
deleted file mode 100644
index b2a92fdbff..0000000000
--- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Sinkai_Kabe
-z_bg_sinkai_kabe.c
diff --git a/src/overlays/actors/ovl_Bg_Spdweb/overlay.cfg b/src/overlays/actors/ovl_Bg_Spdweb/overlay.cfg
deleted file mode 100644
index 9411f40928..0000000000
--- a/src/overlays/actors/ovl_Bg_Spdweb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Spdweb
-z_bg_spdweb.c
diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/overlay.cfg b/src/overlays/actors/ovl_Bg_Spout_Fire/overlay.cfg
deleted file mode 100644
index bad8eedab0..0000000000
--- a/src/overlays/actors/ovl_Bg_Spout_Fire/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Spout_Fire
-z_bg_spout_fire.c
diff --git a/src/overlays/actors/ovl_Bg_Tobira01/overlay.cfg b/src/overlays/actors/ovl_Bg_Tobira01/overlay.cfg
deleted file mode 100644
index 7b142082d3..0000000000
--- a/src/overlays/actors/ovl_Bg_Tobira01/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Tobira01
-z_bg_tobira01.c
diff --git a/src/overlays/actors/ovl_Bg_Umajump/overlay.cfg b/src/overlays/actors/ovl_Bg_Umajump/overlay.cfg
deleted file mode 100644
index 3678ab523c..0000000000
--- a/src/overlays/actors/ovl_Bg_Umajump/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Bg_Umajump
-z_bg_umajump.c
diff --git a/src/overlays/actors/ovl_Boss_01/overlay.cfg b/src/overlays/actors/ovl_Boss_01/overlay.cfg
deleted file mode 100644
index d11a70ed1b..0000000000
--- a/src/overlays/actors/ovl_Boss_01/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Boss_01
-z_boss_01.c
diff --git a/src/overlays/actors/ovl_Boss_02/overlay.cfg b/src/overlays/actors/ovl_Boss_02/overlay.cfg
deleted file mode 100644
index 6bf46fe21e..0000000000
--- a/src/overlays/actors/ovl_Boss_02/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Boss_02
-z_boss_02.c
diff --git a/src/overlays/actors/ovl_Boss_03/overlay.cfg b/src/overlays/actors/ovl_Boss_03/overlay.cfg
deleted file mode 100644
index 285cc55879..0000000000
--- a/src/overlays/actors/ovl_Boss_03/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Boss_03
-z_boss_03.c
diff --git a/src/overlays/actors/ovl_Boss_04/overlay.cfg b/src/overlays/actors/ovl_Boss_04/overlay.cfg
deleted file mode 100644
index 16d818a430..0000000000
--- a/src/overlays/actors/ovl_Boss_04/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Boss_04
-z_boss_04.c
diff --git a/src/overlays/actors/ovl_Boss_05/overlay.cfg b/src/overlays/actors/ovl_Boss_05/overlay.cfg
deleted file mode 100644
index db19abb801..0000000000
--- a/src/overlays/actors/ovl_Boss_05/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Boss_05
-z_boss_05.c
diff --git a/src/overlays/actors/ovl_Boss_06/overlay.cfg b/src/overlays/actors/ovl_Boss_06/overlay.cfg
deleted file mode 100644
index 3f5b0e7d58..0000000000
--- a/src/overlays/actors/ovl_Boss_06/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Boss_06
-z_boss_06.c
diff --git a/src/overlays/actors/ovl_Boss_07/overlay.cfg b/src/overlays/actors/ovl_Boss_07/overlay.cfg
deleted file mode 100644
index 79c564cccb..0000000000
--- a/src/overlays/actors/ovl_Boss_07/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Boss_07
-z_boss_07.c
diff --git a/src/overlays/actors/ovl_Boss_Hakugin/overlay.cfg b/src/overlays/actors/ovl_Boss_Hakugin/overlay.cfg
deleted file mode 100644
index 059dde3810..0000000000
--- a/src/overlays/actors/ovl_Boss_Hakugin/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Boss_Hakugin
-z_boss_hakugin.c
diff --git a/src/overlays/actors/ovl_Demo_Effect/overlay.cfg b/src/overlays/actors/ovl_Demo_Effect/overlay.cfg
deleted file mode 100644
index 8f2105acfc..0000000000
--- a/src/overlays/actors/ovl_Demo_Effect/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Demo_Effect
-z_demo_effect.c
diff --git a/src/overlays/actors/ovl_Demo_Getitem/overlay.cfg b/src/overlays/actors/ovl_Demo_Getitem/overlay.cfg
deleted file mode 100644
index df09fe2ea2..0000000000
--- a/src/overlays/actors/ovl_Demo_Getitem/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Demo_Getitem
-z_demo_getitem.c
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg b/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg
deleted file mode 100644
index b9c10f3119..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Demo_Kankyo
-z_demo_kankyo.c
diff --git a/src/overlays/actors/ovl_Demo_Moonend/overlay.cfg b/src/overlays/actors/ovl_Demo_Moonend/overlay.cfg
deleted file mode 100644
index 3d2793e42b..0000000000
--- a/src/overlays/actors/ovl_Demo_Moonend/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Demo_Moonend
-z_demo_moonend.c
diff --git a/src/overlays/actors/ovl_Demo_Shd/overlay.cfg b/src/overlays/actors/ovl_Demo_Shd/overlay.cfg
deleted file mode 100644
index 0cf96d92aa..0000000000
--- a/src/overlays/actors/ovl_Demo_Shd/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Demo_Shd
-z_demo_shd.c
diff --git a/src/overlays/actors/ovl_Demo_Syoten/overlay.cfg b/src/overlays/actors/ovl_Demo_Syoten/overlay.cfg
deleted file mode 100644
index 8fde4e6f62..0000000000
--- a/src/overlays/actors/ovl_Demo_Syoten/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Demo_Syoten
-z_demo_syoten.c
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/overlay.cfg b/src/overlays/actors/ovl_Demo_Tre_Lgt/overlay.cfg
deleted file mode 100644
index a063264ea8..0000000000
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Demo_Tre_Lgt
-z_demo_tre_lgt.c
diff --git a/src/overlays/actors/ovl_Dm_Ah/overlay.cfg b/src/overlays/actors/ovl_Dm_Ah/overlay.cfg
deleted file mode 100644
index 22f1cf7a3d..0000000000
--- a/src/overlays/actors/ovl_Dm_Ah/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Ah
-z_dm_ah.c
diff --git a/src/overlays/actors/ovl_Dm_Al/overlay.cfg b/src/overlays/actors/ovl_Dm_Al/overlay.cfg
deleted file mode 100644
index 92999ffdd3..0000000000
--- a/src/overlays/actors/ovl_Dm_Al/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Al
-z_dm_al.c
diff --git a/src/overlays/actors/ovl_Dm_An/overlay.cfg b/src/overlays/actors/ovl_Dm_An/overlay.cfg
deleted file mode 100644
index 03f82edfa5..0000000000
--- a/src/overlays/actors/ovl_Dm_An/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_An
-z_dm_an.c
diff --git a/src/overlays/actors/ovl_Dm_Bal/overlay.cfg b/src/overlays/actors/ovl_Dm_Bal/overlay.cfg
deleted file mode 100644
index fa51bac6a6..0000000000
--- a/src/overlays/actors/ovl_Dm_Bal/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Bal
-z_dm_bal.c
diff --git a/src/overlays/actors/ovl_Dm_Char00/overlay.cfg b/src/overlays/actors/ovl_Dm_Char00/overlay.cfg
deleted file mode 100644
index 0d49d3bbc7..0000000000
--- a/src/overlays/actors/ovl_Dm_Char00/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char00
-z_dm_char00.c
diff --git a/src/overlays/actors/ovl_Dm_Char01/overlay.cfg b/src/overlays/actors/ovl_Dm_Char01/overlay.cfg
deleted file mode 100644
index babdfc2f2a..0000000000
--- a/src/overlays/actors/ovl_Dm_Char01/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char01
-z_dm_char01.c
diff --git a/src/overlays/actors/ovl_Dm_Char02/overlay.cfg b/src/overlays/actors/ovl_Dm_Char02/overlay.cfg
deleted file mode 100644
index b5c165061a..0000000000
--- a/src/overlays/actors/ovl_Dm_Char02/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char02
-z_dm_char02.c
diff --git a/src/overlays/actors/ovl_Dm_Char03/overlay.cfg b/src/overlays/actors/ovl_Dm_Char03/overlay.cfg
deleted file mode 100644
index dd50d58fa1..0000000000
--- a/src/overlays/actors/ovl_Dm_Char03/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char03
-z_dm_char03.c
diff --git a/src/overlays/actors/ovl_Dm_Char04/overlay.cfg b/src/overlays/actors/ovl_Dm_Char04/overlay.cfg
deleted file mode 100644
index a8f5bd501e..0000000000
--- a/src/overlays/actors/ovl_Dm_Char04/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char04
-z_dm_char04.c
diff --git a/src/overlays/actors/ovl_Dm_Char05/overlay.cfg b/src/overlays/actors/ovl_Dm_Char05/overlay.cfg
deleted file mode 100644
index cb8b10bcc2..0000000000
--- a/src/overlays/actors/ovl_Dm_Char05/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char05
-z_dm_char05.c
diff --git a/src/overlays/actors/ovl_Dm_Char06/overlay.cfg b/src/overlays/actors/ovl_Dm_Char06/overlay.cfg
deleted file mode 100644
index 8c0666c9b1..0000000000
--- a/src/overlays/actors/ovl_Dm_Char06/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char06
-z_dm_char06.c
diff --git a/src/overlays/actors/ovl_Dm_Char07/overlay.cfg b/src/overlays/actors/ovl_Dm_Char07/overlay.cfg
deleted file mode 100644
index 5b5ad5acd5..0000000000
--- a/src/overlays/actors/ovl_Dm_Char07/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char07
-z_dm_char07.c
diff --git a/src/overlays/actors/ovl_Dm_Char08/overlay.cfg b/src/overlays/actors/ovl_Dm_Char08/overlay.cfg
deleted file mode 100644
index 5f69d0c826..0000000000
--- a/src/overlays/actors/ovl_Dm_Char08/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char08
-z_dm_char08.c
diff --git a/src/overlays/actors/ovl_Dm_Char09/overlay.cfg b/src/overlays/actors/ovl_Dm_Char09/overlay.cfg
deleted file mode 100644
index 99eda9b12c..0000000000
--- a/src/overlays/actors/ovl_Dm_Char09/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Char09
-z_dm_char09.c
diff --git a/src/overlays/actors/ovl_Dm_Gm/overlay.cfg b/src/overlays/actors/ovl_Dm_Gm/overlay.cfg
deleted file mode 100644
index e12011867c..0000000000
--- a/src/overlays/actors/ovl_Dm_Gm/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Gm
-z_dm_gm.c
diff --git a/src/overlays/actors/ovl_Dm_Hina/overlay.cfg b/src/overlays/actors/ovl_Dm_Hina/overlay.cfg
deleted file mode 100644
index 824085b3ee..0000000000
--- a/src/overlays/actors/ovl_Dm_Hina/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Hina
-z_dm_hina.c
diff --git a/src/overlays/actors/ovl_Dm_Nb/overlay.cfg b/src/overlays/actors/ovl_Dm_Nb/overlay.cfg
deleted file mode 100644
index 7af01c8ccf..0000000000
--- a/src/overlays/actors/ovl_Dm_Nb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Nb
-z_dm_nb.c
diff --git a/src/overlays/actors/ovl_Dm_Opstage/overlay.cfg b/src/overlays/actors/ovl_Dm_Opstage/overlay.cfg
deleted file mode 100644
index 17e40ea810..0000000000
--- a/src/overlays/actors/ovl_Dm_Opstage/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Opstage
-z_dm_opstage.c
diff --git a/src/overlays/actors/ovl_Dm_Ravine/overlay.cfg b/src/overlays/actors/ovl_Dm_Ravine/overlay.cfg
deleted file mode 100644
index a3287c4077..0000000000
--- a/src/overlays/actors/ovl_Dm_Ravine/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Ravine
-z_dm_ravine.c
diff --git a/src/overlays/actors/ovl_Dm_Sa/overlay.cfg b/src/overlays/actors/ovl_Dm_Sa/overlay.cfg
deleted file mode 100644
index 3916c7965b..0000000000
--- a/src/overlays/actors/ovl_Dm_Sa/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Sa
-z_dm_sa.c
diff --git a/src/overlays/actors/ovl_Dm_Statue/overlay.cfg b/src/overlays/actors/ovl_Dm_Statue/overlay.cfg
deleted file mode 100644
index d01c4284e0..0000000000
--- a/src/overlays/actors/ovl_Dm_Statue/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Statue
-z_dm_statue.c
diff --git a/src/overlays/actors/ovl_Dm_Stk/overlay.cfg b/src/overlays/actors/ovl_Dm_Stk/overlay.cfg
deleted file mode 100644
index 6282311226..0000000000
--- a/src/overlays/actors/ovl_Dm_Stk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Stk
-z_dm_stk.c
diff --git a/src/overlays/actors/ovl_Dm_Tag/overlay.cfg b/src/overlays/actors/ovl_Dm_Tag/overlay.cfg
deleted file mode 100644
index e1895969ed..0000000000
--- a/src/overlays/actors/ovl_Dm_Tag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Tag
-z_dm_tag.c
diff --git a/src/overlays/actors/ovl_Dm_Tsg/overlay.cfg b/src/overlays/actors/ovl_Dm_Tsg/overlay.cfg
deleted file mode 100644
index cf5632fbbf..0000000000
--- a/src/overlays/actors/ovl_Dm_Tsg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Tsg
-z_dm_tsg.c
diff --git a/src/overlays/actors/ovl_Dm_Zl/overlay.cfg b/src/overlays/actors/ovl_Dm_Zl/overlay.cfg
deleted file mode 100644
index 5411031276..0000000000
--- a/src/overlays/actors/ovl_Dm_Zl/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Dm_Zl
-z_dm_zl.c
diff --git a/src/overlays/actors/ovl_Door_Ana/overlay.cfg b/src/overlays/actors/ovl_Door_Ana/overlay.cfg
deleted file mode 100644
index cb3d1a5fd9..0000000000
--- a/src/overlays/actors/ovl_Door_Ana/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Door_Ana
-z_door_ana.c
diff --git a/src/overlays/actors/ovl_Door_Shutter/overlay.cfg b/src/overlays/actors/ovl_Door_Shutter/overlay.cfg
deleted file mode 100644
index f3b63c1cc9..0000000000
--- a/src/overlays/actors/ovl_Door_Shutter/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Door_Shutter
-z_door_shutter.c
diff --git a/src/overlays/actors/ovl_Door_Spiral/overlay.cfg b/src/overlays/actors/ovl_Door_Spiral/overlay.cfg
deleted file mode 100644
index f33e851b57..0000000000
--- a/src/overlays/actors/ovl_Door_Spiral/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Door_Spiral
-z_door_spiral.c
diff --git a/src/overlays/actors/ovl_Door_Warp1/overlay.cfg b/src/overlays/actors/ovl_Door_Warp1/overlay.cfg
deleted file mode 100644
index 7646036548..0000000000
--- a/src/overlays/actors/ovl_Door_Warp1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Door_Warp1
-z_door_warp1.c
diff --git a/src/overlays/actors/ovl_Eff_Change/overlay.cfg b/src/overlays/actors/ovl_Eff_Change/overlay.cfg
deleted file mode 100644
index 6ab11cfbd9..0000000000
--- a/src/overlays/actors/ovl_Eff_Change/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Eff_Change
-z_eff_change.c
diff --git a/src/overlays/actors/ovl_Eff_Dust/overlay.cfg b/src/overlays/actors/ovl_Eff_Dust/overlay.cfg
deleted file mode 100644
index 2833a83d08..0000000000
--- a/src/overlays/actors/ovl_Eff_Dust/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Eff_Dust
-z_eff_dust.c
diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/overlay.cfg b/src/overlays/actors/ovl_Eff_Kamejima_Wave/overlay.cfg
deleted file mode 100644
index 7decfb871b..0000000000
--- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Eff_Kamejima_Wave
-z_eff_kamejima_wave.c
diff --git a/src/overlays/actors/ovl_Eff_Lastday/overlay.cfg b/src/overlays/actors/ovl_Eff_Lastday/overlay.cfg
deleted file mode 100644
index 8e1cc8e1d8..0000000000
--- a/src/overlays/actors/ovl_Eff_Lastday/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Eff_Lastday
-z_eff_lastday.c
diff --git a/src/overlays/actors/ovl_Eff_Stk/overlay.cfg b/src/overlays/actors/ovl_Eff_Stk/overlay.cfg
deleted file mode 100644
index 725fd80b3e..0000000000
--- a/src/overlays/actors/ovl_Eff_Stk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Eff_Stk
-z_eff_stk.c
diff --git a/src/overlays/actors/ovl_Eff_Zoraband/overlay.cfg b/src/overlays/actors/ovl_Eff_Zoraband/overlay.cfg
deleted file mode 100644
index 57858dabd2..0000000000
--- a/src/overlays/actors/ovl_Eff_Zoraband/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Eff_Zoraband
-z_eff_zoraband.c
diff --git a/src/overlays/actors/ovl_Elf_Msg/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg/overlay.cfg
deleted file mode 100644
index 91ab171571..0000000000
--- a/src/overlays/actors/ovl_Elf_Msg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Elf_Msg
-z_elf_msg.c
diff --git a/src/overlays/actors/ovl_Elf_Msg2/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg2/overlay.cfg
deleted file mode 100644
index 15a73db5de..0000000000
--- a/src/overlays/actors/ovl_Elf_Msg2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Elf_Msg2
-z_elf_msg2.c
diff --git a/src/overlays/actors/ovl_Elf_Msg3/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg3/overlay.cfg
deleted file mode 100644
index e39f7e2901..0000000000
--- a/src/overlays/actors/ovl_Elf_Msg3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Elf_Msg3
-z_elf_msg3.c
diff --git a/src/overlays/actors/ovl_Elf_Msg4/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg4/overlay.cfg
deleted file mode 100644
index 2bfe9ff86c..0000000000
--- a/src/overlays/actors/ovl_Elf_Msg4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Elf_Msg4
-z_elf_msg4.c
diff --git a/src/overlays/actors/ovl_Elf_Msg5/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg5/overlay.cfg
deleted file mode 100644
index d528de3424..0000000000
--- a/src/overlays/actors/ovl_Elf_Msg5/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Elf_Msg5
-z_elf_msg5.c
diff --git a/src/overlays/actors/ovl_Elf_Msg6/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg6/overlay.cfg
deleted file mode 100644
index 9ded97384e..0000000000
--- a/src/overlays/actors/ovl_Elf_Msg6/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Elf_Msg6
-z_elf_msg6.c
diff --git a/src/overlays/actors/ovl_En_Ah/overlay.cfg b/src/overlays/actors/ovl_En_Ah/overlay.cfg
deleted file mode 100644
index 694256c538..0000000000
--- a/src/overlays/actors/ovl_En_Ah/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ah
-z_en_ah.c
diff --git a/src/overlays/actors/ovl_En_Akindonuts/overlay.cfg b/src/overlays/actors/ovl_En_Akindonuts/overlay.cfg
deleted file mode 100644
index a3e371656a..0000000000
--- a/src/overlays/actors/ovl_En_Akindonuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Akindonuts
-z_en_akindonuts.c
diff --git a/src/overlays/actors/ovl_En_Al/overlay.cfg b/src/overlays/actors/ovl_En_Al/overlay.cfg
deleted file mode 100644
index ccd80736ff..0000000000
--- a/src/overlays/actors/ovl_En_Al/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Al
-z_en_al.c
diff --git a/src/overlays/actors/ovl_En_Am/overlay.cfg b/src/overlays/actors/ovl_En_Am/overlay.cfg
deleted file mode 100644
index 8f03945db6..0000000000
--- a/src/overlays/actors/ovl_En_Am/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Am
-z_en_am.c
diff --git a/src/overlays/actors/ovl_En_An/overlay.cfg b/src/overlays/actors/ovl_En_An/overlay.cfg
deleted file mode 100644
index 14a6d7d5f2..0000000000
--- a/src/overlays/actors/ovl_En_An/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_An
-z_en_an.c
diff --git a/src/overlays/actors/ovl_En_And/overlay.cfg b/src/overlays/actors/ovl_En_And/overlay.cfg
deleted file mode 100644
index f62d705f09..0000000000
--- a/src/overlays/actors/ovl_En_And/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_And
-z_en_and.c
diff --git a/src/overlays/actors/ovl_En_Ani/overlay.cfg b/src/overlays/actors/ovl_En_Ani/overlay.cfg
deleted file mode 100644
index f0622d0c02..0000000000
--- a/src/overlays/actors/ovl_En_Ani/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ani
-z_en_ani.c
diff --git a/src/overlays/actors/ovl_En_Aob_01/overlay.cfg b/src/overlays/actors/ovl_En_Aob_01/overlay.cfg
deleted file mode 100644
index 592d6a8346..0000000000
--- a/src/overlays/actors/ovl_En_Aob_01/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Aob_01
-z_en_aob_01.c
diff --git a/src/overlays/actors/ovl_En_Arrow/overlay.cfg b/src/overlays/actors/ovl_En_Arrow/overlay.cfg
deleted file mode 100644
index 5ae277d228..0000000000
--- a/src/overlays/actors/ovl_En_Arrow/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Arrow
-z_en_arrow.c
diff --git a/src/overlays/actors/ovl_En_Attack_Niw/overlay.cfg b/src/overlays/actors/ovl_En_Attack_Niw/overlay.cfg
deleted file mode 100644
index 2b4aa71bea..0000000000
--- a/src/overlays/actors/ovl_En_Attack_Niw/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Attack_Niw
-z_en_attack_niw.c
diff --git a/src/overlays/actors/ovl_En_Az/overlay.cfg b/src/overlays/actors/ovl_En_Az/overlay.cfg
deleted file mode 100644
index e929d9380f..0000000000
--- a/src/overlays/actors/ovl_En_Az/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Az
-z_en_az.c
diff --git a/src/overlays/actors/ovl_En_Baba/overlay.cfg b/src/overlays/actors/ovl_En_Baba/overlay.cfg
deleted file mode 100644
index 8d3dddae0f..0000000000
--- a/src/overlays/actors/ovl_En_Baba/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Baba
-z_en_baba.c
diff --git a/src/overlays/actors/ovl_En_Baguo/overlay.cfg b/src/overlays/actors/ovl_En_Baguo/overlay.cfg
deleted file mode 100644
index 19e80c5e0f..0000000000
--- a/src/overlays/actors/ovl_En_Baguo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Baguo
-z_en_baguo.c
diff --git a/src/overlays/actors/ovl_En_Baisen/overlay.cfg b/src/overlays/actors/ovl_En_Baisen/overlay.cfg
deleted file mode 100644
index e1ba96f41a..0000000000
--- a/src/overlays/actors/ovl_En_Baisen/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Baisen
-z_en_baisen.c
diff --git a/src/overlays/actors/ovl_En_Bal/overlay.cfg b/src/overlays/actors/ovl_En_Bal/overlay.cfg
deleted file mode 100644
index 53fdf3ee56..0000000000
--- a/src/overlays/actors/ovl_En_Bal/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bal
-z_en_bal.c
diff --git a/src/overlays/actors/ovl_En_Bat/overlay.cfg b/src/overlays/actors/ovl_En_Bat/overlay.cfg
deleted file mode 100644
index 1d11f79a3b..0000000000
--- a/src/overlays/actors/ovl_En_Bat/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bat
-z_en_bat.c
diff --git a/src/overlays/actors/ovl_En_Bb/overlay.cfg b/src/overlays/actors/ovl_En_Bb/overlay.cfg
deleted file mode 100644
index 048245caf6..0000000000
--- a/src/overlays/actors/ovl_En_Bb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bb
-z_en_bb.c
diff --git a/src/overlays/actors/ovl_En_Bba_01/overlay.cfg b/src/overlays/actors/ovl_En_Bba_01/overlay.cfg
deleted file mode 100644
index e26bcdd36f..0000000000
--- a/src/overlays/actors/ovl_En_Bba_01/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bba_01
-z_en_bba_01.c
diff --git a/src/overlays/actors/ovl_En_Bbfall/overlay.cfg b/src/overlays/actors/ovl_En_Bbfall/overlay.cfg
deleted file mode 100644
index 711e74e296..0000000000
--- a/src/overlays/actors/ovl_En_Bbfall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bbfall
-z_en_bbfall.c
diff --git a/src/overlays/actors/ovl_En_Bee/overlay.cfg b/src/overlays/actors/ovl_En_Bee/overlay.cfg
deleted file mode 100644
index ef6192fc4a..0000000000
--- a/src/overlays/actors/ovl_En_Bee/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bee
-z_en_bee.c
diff --git a/src/overlays/actors/ovl_En_Bh/overlay.cfg b/src/overlays/actors/ovl_En_Bh/overlay.cfg
deleted file mode 100644
index 2fea0e1e5b..0000000000
--- a/src/overlays/actors/ovl_En_Bh/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bh
-z_en_bh.c
diff --git a/src/overlays/actors/ovl_En_Bigokuta/overlay.cfg b/src/overlays/actors/ovl_En_Bigokuta/overlay.cfg
deleted file mode 100644
index 40f0939870..0000000000
--- a/src/overlays/actors/ovl_En_Bigokuta/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bigokuta
-z_en_bigokuta.c
diff --git a/src/overlays/actors/ovl_En_Bigpamet/overlay.cfg b/src/overlays/actors/ovl_En_Bigpamet/overlay.cfg
deleted file mode 100644
index df083a1703..0000000000
--- a/src/overlays/actors/ovl_En_Bigpamet/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bigpamet
-z_en_bigpamet.c
diff --git a/src/overlays/actors/ovl_En_Bigpo/overlay.cfg b/src/overlays/actors/ovl_En_Bigpo/overlay.cfg
deleted file mode 100644
index 1519b5573d..0000000000
--- a/src/overlays/actors/ovl_En_Bigpo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bigpo
-z_en_bigpo.c
diff --git a/src/overlays/actors/ovl_En_Bigslime/overlay.cfg b/src/overlays/actors/ovl_En_Bigslime/overlay.cfg
deleted file mode 100644
index c7441440e7..0000000000
--- a/src/overlays/actors/ovl_En_Bigslime/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bigslime
-z_en_bigslime.c
diff --git a/src/overlays/actors/ovl_En_Bji_01/overlay.cfg b/src/overlays/actors/ovl_En_Bji_01/overlay.cfg
deleted file mode 100644
index 6455065bdc..0000000000
--- a/src/overlays/actors/ovl_En_Bji_01/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bji_01
-z_en_bji_01.c
diff --git a/src/overlays/actors/ovl_En_Bjt/overlay.cfg b/src/overlays/actors/ovl_En_Bjt/overlay.cfg
deleted file mode 100644
index ab6f05a540..0000000000
--- a/src/overlays/actors/ovl_En_Bjt/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bjt
-z_en_bjt.c
diff --git a/src/overlays/actors/ovl_En_Boj_01/overlay.cfg b/src/overlays/actors/ovl_En_Boj_01/overlay.cfg
deleted file mode 100644
index 01b4cce6ed..0000000000
--- a/src/overlays/actors/ovl_En_Boj_01/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Boj_01
-z_en_boj_01.c
diff --git a/src/overlays/actors/ovl_En_Boj_02/overlay.cfg b/src/overlays/actors/ovl_En_Boj_02/overlay.cfg
deleted file mode 100644
index 7deb95ef2a..0000000000
--- a/src/overlays/actors/ovl_En_Boj_02/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Boj_02
-z_en_boj_02.c
diff --git a/src/overlays/actors/ovl_En_Boj_03/overlay.cfg b/src/overlays/actors/ovl_En_Boj_03/overlay.cfg
deleted file mode 100644
index 90f393836d..0000000000
--- a/src/overlays/actors/ovl_En_Boj_03/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Boj_03
-z_en_boj_03.c
diff --git a/src/overlays/actors/ovl_En_Boj_04/overlay.cfg b/src/overlays/actors/ovl_En_Boj_04/overlay.cfg
deleted file mode 100644
index fd93a10799..0000000000
--- a/src/overlays/actors/ovl_En_Boj_04/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Boj_04
-z_en_boj_04.c
diff --git a/src/overlays/actors/ovl_En_Boj_05/overlay.cfg b/src/overlays/actors/ovl_En_Boj_05/overlay.cfg
deleted file mode 100644
index 038e0e91ca..0000000000
--- a/src/overlays/actors/ovl_En_Boj_05/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Boj_05
-z_en_boj_05.c
diff --git a/src/overlays/actors/ovl_En_Bom/overlay.cfg b/src/overlays/actors/ovl_En_Bom/overlay.cfg
deleted file mode 100644
index c752520396..0000000000
--- a/src/overlays/actors/ovl_En_Bom/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bom
-z_en_bom.c
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/overlay.cfg b/src/overlays/actors/ovl_En_Bom_Bowl_Man/overlay.cfg
deleted file mode 100644
index 2d762ca9b0..0000000000
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bom_Bowl_Man
-z_en_bom_bowl_man.c
diff --git a/src/overlays/actors/ovl_En_Bom_Chu/overlay.cfg b/src/overlays/actors/ovl_En_Bom_Chu/overlay.cfg
deleted file mode 100644
index d1b0f7dc2d..0000000000
--- a/src/overlays/actors/ovl_En_Bom_Chu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bom_Chu
-z_en_bom_chu.c
diff --git a/src/overlays/actors/ovl_En_Bombal/overlay.cfg b/src/overlays/actors/ovl_En_Bombal/overlay.cfg
deleted file mode 100644
index a715cfbf52..0000000000
--- a/src/overlays/actors/ovl_En_Bombal/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bombal
-z_en_bombal.c
diff --git a/src/overlays/actors/ovl_En_Bombers/overlay.cfg b/src/overlays/actors/ovl_En_Bombers/overlay.cfg
deleted file mode 100644
index 95cb0c1f86..0000000000
--- a/src/overlays/actors/ovl_En_Bombers/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bombers
-z_en_bombers.c
diff --git a/src/overlays/actors/ovl_En_Bombers2/overlay.cfg b/src/overlays/actors/ovl_En_Bombers2/overlay.cfg
deleted file mode 100644
index 6cbb956fe2..0000000000
--- a/src/overlays/actors/ovl_En_Bombers2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bombers2
-z_en_bombers2.c
diff --git a/src/overlays/actors/ovl_En_Bombf/overlay.cfg b/src/overlays/actors/ovl_En_Bombf/overlay.cfg
deleted file mode 100644
index 831b98c2ff..0000000000
--- a/src/overlays/actors/ovl_En_Bombf/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bombf
-z_en_bombf.c
diff --git a/src/overlays/actors/ovl_En_Bomjima/overlay.cfg b/src/overlays/actors/ovl_En_Bomjima/overlay.cfg
deleted file mode 100644
index 61e77897f1..0000000000
--- a/src/overlays/actors/ovl_En_Bomjima/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bomjima
-z_en_bomjima.c
diff --git a/src/overlays/actors/ovl_En_Bomjimb/overlay.cfg b/src/overlays/actors/ovl_En_Bomjimb/overlay.cfg
deleted file mode 100644
index 3b2ee6496a..0000000000
--- a/src/overlays/actors/ovl_En_Bomjimb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bomjimb
-z_en_bomjimb.c
diff --git a/src/overlays/actors/ovl_En_Boom/overlay.cfg b/src/overlays/actors/ovl_En_Boom/overlay.cfg
deleted file mode 100644
index d0ff420fdc..0000000000
--- a/src/overlays/actors/ovl_En_Boom/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Boom
-z_en_boom.c
diff --git a/src/overlays/actors/ovl_En_Box/overlay.cfg b/src/overlays/actors/ovl_En_Box/overlay.cfg
deleted file mode 100644
index bdbd8b7544..0000000000
--- a/src/overlays/actors/ovl_En_Box/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Box
-z_en_box.c
diff --git a/src/overlays/actors/ovl_En_Bsb/overlay.cfg b/src/overlays/actors/ovl_En_Bsb/overlay.cfg
deleted file mode 100644
index 8542407fec..0000000000
--- a/src/overlays/actors/ovl_En_Bsb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bsb
-z_en_bsb.c
diff --git a/src/overlays/actors/ovl_En_Bu/overlay.cfg b/src/overlays/actors/ovl_En_Bu/overlay.cfg
deleted file mode 100644
index 970a005fb8..0000000000
--- a/src/overlays/actors/ovl_En_Bu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bu
-z_en_bu.c
diff --git a/src/overlays/actors/ovl_En_Bubble/overlay.cfg b/src/overlays/actors/ovl_En_Bubble/overlay.cfg
deleted file mode 100644
index 9c86d2e3fc..0000000000
--- a/src/overlays/actors/ovl_En_Bubble/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Bubble
-z_en_bubble.c
diff --git a/src/overlays/actors/ovl_En_Butte/overlay.cfg b/src/overlays/actors/ovl_En_Butte/overlay.cfg
deleted file mode 100644
index 04a22c1083..0000000000
--- a/src/overlays/actors/ovl_En_Butte/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Butte
-z_en_butte.c
diff --git a/src/overlays/actors/ovl_En_Cha/overlay.cfg b/src/overlays/actors/ovl_En_Cha/overlay.cfg
deleted file mode 100644
index a409e7d556..0000000000
--- a/src/overlays/actors/ovl_En_Cha/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Cha
-z_en_cha.c
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Clear_Tag/overlay.cfg
deleted file mode 100644
index edfefada00..0000000000
--- a/src/overlays/actors/ovl_En_Clear_Tag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Clear_Tag
-z_en_clear_tag.c
diff --git a/src/overlays/actors/ovl_En_Cne_01/overlay.cfg b/src/overlays/actors/ovl_En_Cne_01/overlay.cfg
deleted file mode 100644
index 7678c1374b..0000000000
--- a/src/overlays/actors/ovl_En_Cne_01/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Cne_01
-z_en_cne_01.c
diff --git a/src/overlays/actors/ovl_En_Col_Man/overlay.cfg b/src/overlays/actors/ovl_En_Col_Man/overlay.cfg
deleted file mode 100644
index 4f2df34a66..0000000000
--- a/src/overlays/actors/ovl_En_Col_Man/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Col_Man
-z_en_col_man.c
diff --git a/src/overlays/actors/ovl_En_Cow/overlay.cfg b/src/overlays/actors/ovl_En_Cow/overlay.cfg
deleted file mode 100644
index d7215aa84e..0000000000
--- a/src/overlays/actors/ovl_En_Cow/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Cow
-z_en_cow.c
diff --git a/src/overlays/actors/ovl_En_Crow/overlay.cfg b/src/overlays/actors/ovl_En_Crow/overlay.cfg
deleted file mode 100644
index deb12c01d7..0000000000
--- a/src/overlays/actors/ovl_En_Crow/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Crow
-z_en_crow.c
diff --git a/src/overlays/actors/ovl_En_Dai/overlay.cfg b/src/overlays/actors/ovl_En_Dai/overlay.cfg
deleted file mode 100644
index 6a1c6a9296..0000000000
--- a/src/overlays/actors/ovl_En_Dai/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dai
-z_en_dai.c
diff --git a/src/overlays/actors/ovl_En_Daiku/overlay.cfg b/src/overlays/actors/ovl_En_Daiku/overlay.cfg
deleted file mode 100644
index cde668b4bf..0000000000
--- a/src/overlays/actors/ovl_En_Daiku/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Daiku
-z_en_daiku.c
diff --git a/src/overlays/actors/ovl_En_Daiku2/overlay.cfg b/src/overlays/actors/ovl_En_Daiku2/overlay.cfg
deleted file mode 100644
index c5eafa2b80..0000000000
--- a/src/overlays/actors/ovl_En_Daiku2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Daiku2
-z_en_daiku2.c
diff --git a/src/overlays/actors/ovl_En_Death/overlay.cfg b/src/overlays/actors/ovl_En_Death/overlay.cfg
deleted file mode 100644
index 17c27c8508..0000000000
--- a/src/overlays/actors/ovl_En_Death/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Death
-z_en_death.c
diff --git a/src/overlays/actors/ovl_En_Dekubaba/overlay.cfg b/src/overlays/actors/ovl_En_Dekubaba/overlay.cfg
deleted file mode 100644
index cb209dea47..0000000000
--- a/src/overlays/actors/ovl_En_Dekubaba/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dekubaba
-z_en_dekubaba.c
diff --git a/src/overlays/actors/ovl_En_Dekunuts/overlay.cfg b/src/overlays/actors/ovl_En_Dekunuts/overlay.cfg
deleted file mode 100644
index dbbc3d2ed8..0000000000
--- a/src/overlays/actors/ovl_En_Dekunuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dekunuts
-z_en_dekunuts.c
diff --git a/src/overlays/actors/ovl_En_Demo_heishi/overlay.cfg b/src/overlays/actors/ovl_En_Demo_heishi/overlay.cfg
deleted file mode 100644
index bff118f72a..0000000000
--- a/src/overlays/actors/ovl_En_Demo_heishi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Demo_heishi
-z_en_demo_heishi.c
diff --git a/src/overlays/actors/ovl_En_Dg/overlay.cfg b/src/overlays/actors/ovl_En_Dg/overlay.cfg
deleted file mode 100644
index b9e9281163..0000000000
--- a/src/overlays/actors/ovl_En_Dg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dg
-z_en_dg.c
diff --git a/src/overlays/actors/ovl_En_Dinofos/overlay.cfg b/src/overlays/actors/ovl_En_Dinofos/overlay.cfg
deleted file mode 100644
index 61af267959..0000000000
--- a/src/overlays/actors/ovl_En_Dinofos/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dinofos
-z_en_dinofos.c
diff --git a/src/overlays/actors/ovl_En_Dnb/overlay.cfg b/src/overlays/actors/ovl_En_Dnb/overlay.cfg
deleted file mode 100644
index 074d3340a5..0000000000
--- a/src/overlays/actors/ovl_En_Dnb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dnb
-z_en_dnb.c
diff --git a/src/overlays/actors/ovl_En_Dnh/overlay.cfg b/src/overlays/actors/ovl_En_Dnh/overlay.cfg
deleted file mode 100644
index 85a45176f6..0000000000
--- a/src/overlays/actors/ovl_En_Dnh/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dnh
-z_en_dnh.c
diff --git a/src/overlays/actors/ovl_En_Dnk/overlay.cfg b/src/overlays/actors/ovl_En_Dnk/overlay.cfg
deleted file mode 100644
index 93ce82d2ce..0000000000
--- a/src/overlays/actors/ovl_En_Dnk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dnk
-z_en_dnk.c
diff --git a/src/overlays/actors/ovl_En_Dno/overlay.cfg b/src/overlays/actors/ovl_En_Dno/overlay.cfg
deleted file mode 100644
index 9aa2bd93c1..0000000000
--- a/src/overlays/actors/ovl_En_Dno/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dno
-z_en_dno.c
diff --git a/src/overlays/actors/ovl_En_Dnp/overlay.cfg b/src/overlays/actors/ovl_En_Dnp/overlay.cfg
deleted file mode 100644
index ea78e5340c..0000000000
--- a/src/overlays/actors/ovl_En_Dnp/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dnp
-z_en_dnp.c
diff --git a/src/overlays/actors/ovl_En_Dnq/overlay.cfg b/src/overlays/actors/ovl_En_Dnq/overlay.cfg
deleted file mode 100644
index 169a416214..0000000000
--- a/src/overlays/actors/ovl_En_Dnq/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dnq
-z_en_dnq.c
diff --git a/src/overlays/actors/ovl_En_Dns/overlay.cfg b/src/overlays/actors/ovl_En_Dns/overlay.cfg
deleted file mode 100644
index 3fc03b2179..0000000000
--- a/src/overlays/actors/ovl_En_Dns/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dns
-z_en_dns.c
diff --git a/src/overlays/actors/ovl_En_Dodongo/overlay.cfg b/src/overlays/actors/ovl_En_Dodongo/overlay.cfg
deleted file mode 100644
index 05d2f0a6e7..0000000000
--- a/src/overlays/actors/ovl_En_Dodongo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dodongo
-z_en_dodongo.c
diff --git a/src/overlays/actors/ovl_En_Door/overlay.cfg b/src/overlays/actors/ovl_En_Door/overlay.cfg
deleted file mode 100644
index 9c737bc9dd..0000000000
--- a/src/overlays/actors/ovl_En_Door/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Door
-z_en_door.c
diff --git a/src/overlays/actors/ovl_En_Door_Etc/overlay.cfg b/src/overlays/actors/ovl_En_Door_Etc/overlay.cfg
deleted file mode 100644
index fa6a13d8a2..0000000000
--- a/src/overlays/actors/ovl_En_Door_Etc/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Door_Etc
-z_en_door_etc.c
diff --git a/src/overlays/actors/ovl_En_Dragon/overlay.cfg b/src/overlays/actors/ovl_En_Dragon/overlay.cfg
deleted file mode 100644
index 2720fb7f17..0000000000
--- a/src/overlays/actors/ovl_En_Dragon/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dragon
-z_en_dragon.c
diff --git a/src/overlays/actors/ovl_En_Drs/overlay.cfg b/src/overlays/actors/ovl_En_Drs/overlay.cfg
deleted file mode 100644
index 7a0ab3db7b..0000000000
--- a/src/overlays/actors/ovl_En_Drs/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Drs
-z_en_drs.c
diff --git a/src/overlays/actors/ovl_En_Ds2n/overlay.cfg b/src/overlays/actors/ovl_En_Ds2n/overlay.cfg
deleted file mode 100644
index d0764f1c1a..0000000000
--- a/src/overlays/actors/ovl_En_Ds2n/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ds2n
-z_en_ds2n.c
diff --git a/src/overlays/actors/ovl_En_Dt/overlay.cfg b/src/overlays/actors/ovl_En_Dt/overlay.cfg
deleted file mode 100644
index 6eb5532378..0000000000
--- a/src/overlays/actors/ovl_En_Dt/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dt
-z_en_dt.c
diff --git a/src/overlays/actors/ovl_En_Dy_Extra/overlay.cfg b/src/overlays/actors/ovl_En_Dy_Extra/overlay.cfg
deleted file mode 100644
index 04c14d5ce2..0000000000
--- a/src/overlays/actors/ovl_En_Dy_Extra/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Dy_Extra
-z_en_dy_extra.c
diff --git a/src/overlays/actors/ovl_En_Egblock/overlay.cfg b/src/overlays/actors/ovl_En_Egblock/overlay.cfg
deleted file mode 100644
index c80635d344..0000000000
--- a/src/overlays/actors/ovl_En_Egblock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Egblock
-z_en_egblock.c
diff --git a/src/overlays/actors/ovl_En_Egol/overlay.cfg b/src/overlays/actors/ovl_En_Egol/overlay.cfg
deleted file mode 100644
index 1073044cd8..0000000000
--- a/src/overlays/actors/ovl_En_Egol/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Egol
-z_en_egol.c
diff --git a/src/overlays/actors/ovl_En_Elf/overlay.cfg b/src/overlays/actors/ovl_En_Elf/overlay.cfg
deleted file mode 100644
index cc1ddac286..0000000000
--- a/src/overlays/actors/ovl_En_Elf/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Elf
-z_en_elf.c
diff --git a/src/overlays/actors/ovl_En_Elfbub/overlay.cfg b/src/overlays/actors/ovl_En_Elfbub/overlay.cfg
deleted file mode 100644
index 91957fdd0f..0000000000
--- a/src/overlays/actors/ovl_En_Elfbub/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Elfbub
-z_en_elfbub.c
diff --git a/src/overlays/actors/ovl_En_Elfgrp/overlay.cfg b/src/overlays/actors/ovl_En_Elfgrp/overlay.cfg
deleted file mode 100644
index a371edb2f8..0000000000
--- a/src/overlays/actors/ovl_En_Elfgrp/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Elfgrp
-z_en_elfgrp.c
diff --git a/src/overlays/actors/ovl_En_Elforg/overlay.cfg b/src/overlays/actors/ovl_En_Elforg/overlay.cfg
deleted file mode 100644
index 124b13ce0b..0000000000
--- a/src/overlays/actors/ovl_En_Elforg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Elforg
-z_en_elforg.c
diff --git a/src/overlays/actors/ovl_En_Encount1/overlay.cfg b/src/overlays/actors/ovl_En_Encount1/overlay.cfg
deleted file mode 100644
index 132566c389..0000000000
--- a/src/overlays/actors/ovl_En_Encount1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Encount1
-z_en_encount1.c
diff --git a/src/overlays/actors/ovl_En_Encount2/overlay.cfg b/src/overlays/actors/ovl_En_Encount2/overlay.cfg
deleted file mode 100644
index 31c83ff6fd..0000000000
--- a/src/overlays/actors/ovl_En_Encount2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Encount2
-z_en_encount2.c
diff --git a/src/overlays/actors/ovl_En_Encount3/overlay.cfg b/src/overlays/actors/ovl_En_Encount3/overlay.cfg
deleted file mode 100644
index 5527756557..0000000000
--- a/src/overlays/actors/ovl_En_Encount3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Encount3
-z_en_encount3.c
diff --git a/src/overlays/actors/ovl_En_Encount4/overlay.cfg b/src/overlays/actors/ovl_En_Encount4/overlay.cfg
deleted file mode 100644
index 124d2e4b4d..0000000000
--- a/src/overlays/actors/ovl_En_Encount4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Encount4
-z_en_encount4.c
diff --git a/src/overlays/actors/ovl_En_Ending_Hero/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero/overlay.cfg
deleted file mode 100644
index a512a6a47b..0000000000
--- a/src/overlays/actors/ovl_En_Ending_Hero/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ending_Hero
-z_en_ending_hero.c
diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero2/overlay.cfg
deleted file mode 100644
index eeddcc9c78..0000000000
--- a/src/overlays/actors/ovl_En_Ending_Hero2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ending_Hero2
-z_en_ending_hero2.c
diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero3/overlay.cfg
deleted file mode 100644
index 13ddc6d82f..0000000000
--- a/src/overlays/actors/ovl_En_Ending_Hero3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ending_Hero3
-z_en_ending_hero3.c
diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero4/overlay.cfg
deleted file mode 100644
index 314fdd5629..0000000000
--- a/src/overlays/actors/ovl_En_Ending_Hero4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ending_Hero4
-z_en_ending_hero4.c
diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero5/overlay.cfg
deleted file mode 100644
index 1b49c5572c..0000000000
--- a/src/overlays/actors/ovl_En_Ending_Hero5/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ending_Hero5
-z_en_ending_hero5.c
diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero6/overlay.cfg
deleted file mode 100644
index d6911ffa0b..0000000000
--- a/src/overlays/actors/ovl_En_Ending_Hero6/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ending_Hero6
-z_en_ending_hero6.c
diff --git a/src/overlays/actors/ovl_En_Estone/overlay.cfg b/src/overlays/actors/ovl_En_Estone/overlay.cfg
deleted file mode 100644
index b847b42fa8..0000000000
--- a/src/overlays/actors/ovl_En_Estone/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Estone
-z_en_estone.c
diff --git a/src/overlays/actors/ovl_En_Fall/overlay.cfg b/src/overlays/actors/ovl_En_Fall/overlay.cfg
deleted file mode 100644
index 48cfdea221..0000000000
--- a/src/overlays/actors/ovl_En_Fall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fall
-z_en_fall.c
diff --git a/src/overlays/actors/ovl_En_Fall2/overlay.cfg b/src/overlays/actors/ovl_En_Fall2/overlay.cfg
deleted file mode 100644
index 4219364f55..0000000000
--- a/src/overlays/actors/ovl_En_Fall2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fall2
-z_en_fall2.c
diff --git a/src/overlays/actors/ovl_En_Famos/overlay.cfg b/src/overlays/actors/ovl_En_Famos/overlay.cfg
deleted file mode 100644
index 375bd1638a..0000000000
--- a/src/overlays/actors/ovl_En_Famos/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Famos
-z_en_famos.c
diff --git a/src/overlays/actors/ovl_En_Fg/overlay.cfg b/src/overlays/actors/ovl_En_Fg/overlay.cfg
deleted file mode 100644
index 7121862622..0000000000
--- a/src/overlays/actors/ovl_En_Fg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fg
-z_en_fg.c
diff --git a/src/overlays/actors/ovl_En_Fire_Rock/overlay.cfg b/src/overlays/actors/ovl_En_Fire_Rock/overlay.cfg
deleted file mode 100644
index e1d38e60a1..0000000000
--- a/src/overlays/actors/ovl_En_Fire_Rock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fire_Rock
-z_en_fire_rock.c
diff --git a/src/overlays/actors/ovl_En_Firefly/overlay.cfg b/src/overlays/actors/ovl_En_Firefly/overlay.cfg
deleted file mode 100644
index 8b88be0b8c..0000000000
--- a/src/overlays/actors/ovl_En_Firefly/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Firefly
-z_en_firefly.c
diff --git a/src/overlays/actors/ovl_En_Firefly2/overlay.cfg b/src/overlays/actors/ovl_En_Firefly2/overlay.cfg
deleted file mode 100644
index 0872be9ea6..0000000000
--- a/src/overlays/actors/ovl_En_Firefly2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Firefly2
-z_en_firefly2.c
diff --git a/src/overlays/actors/ovl_En_Fish/overlay.cfg b/src/overlays/actors/ovl_En_Fish/overlay.cfg
deleted file mode 100644
index a78daf631d..0000000000
--- a/src/overlays/actors/ovl_En_Fish/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fish
-z_en_fish.c
diff --git a/src/overlays/actors/ovl_En_Fish2/overlay.cfg b/src/overlays/actors/ovl_En_Fish2/overlay.cfg
deleted file mode 100644
index cba83b7356..0000000000
--- a/src/overlays/actors/ovl_En_Fish2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fish2
-z_en_fish2.c
diff --git a/src/overlays/actors/ovl_En_Fishing/overlay.cfg b/src/overlays/actors/ovl_En_Fishing/overlay.cfg
deleted file mode 100644
index 193cfdb5f7..0000000000
--- a/src/overlays/actors/ovl_En_Fishing/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fishing
-z_en_fishing.c
diff --git a/src/overlays/actors/ovl_En_Floormas/overlay.cfg b/src/overlays/actors/ovl_En_Floormas/overlay.cfg
deleted file mode 100644
index 16ece1e424..0000000000
--- a/src/overlays/actors/ovl_En_Floormas/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Floormas
-z_en_floormas.c
diff --git a/src/overlays/actors/ovl_En_Fr/overlay.cfg b/src/overlays/actors/ovl_En_Fr/overlay.cfg
deleted file mode 100644
index b21ec21455..0000000000
--- a/src/overlays/actors/ovl_En_Fr/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fr
-z_en_fr.c
diff --git a/src/overlays/actors/ovl_En_Fsn/overlay.cfg b/src/overlays/actors/ovl_En_Fsn/overlay.cfg
deleted file mode 100644
index c173063cfb..0000000000
--- a/src/overlays/actors/ovl_En_Fsn/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fsn
-z_en_fsn.c
diff --git a/src/overlays/actors/ovl_En_Fu/overlay.cfg b/src/overlays/actors/ovl_En_Fu/overlay.cfg
deleted file mode 100644
index 0cc55f8eb7..0000000000
--- a/src/overlays/actors/ovl_En_Fu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fu
-z_en_fu.c
diff --git a/src/overlays/actors/ovl_En_Fu_Kago/overlay.cfg b/src/overlays/actors/ovl_En_Fu_Kago/overlay.cfg
deleted file mode 100644
index 9a946e3098..0000000000
--- a/src/overlays/actors/ovl_En_Fu_Kago/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fu_Kago
-z_en_fu_kago.c
diff --git a/src/overlays/actors/ovl_En_Fu_Mato/overlay.cfg b/src/overlays/actors/ovl_En_Fu_Mato/overlay.cfg
deleted file mode 100644
index 78253baff7..0000000000
--- a/src/overlays/actors/ovl_En_Fu_Mato/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fu_Mato
-z_en_fu_mato.c
diff --git a/src/overlays/actors/ovl_En_Fz/overlay.cfg b/src/overlays/actors/ovl_En_Fz/overlay.cfg
deleted file mode 100644
index 0eba400a54..0000000000
--- a/src/overlays/actors/ovl_En_Fz/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Fz
-z_en_fz.c
diff --git a/src/overlays/actors/ovl_En_Gakufu/overlay.cfg b/src/overlays/actors/ovl_En_Gakufu/overlay.cfg
deleted file mode 100644
index 9f421707a8..0000000000
--- a/src/overlays/actors/ovl_En_Gakufu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Gakufu
-z_en_gakufu.c
diff --git a/src/overlays/actors/ovl_En_Gamelupy/overlay.cfg b/src/overlays/actors/ovl_En_Gamelupy/overlay.cfg
deleted file mode 100644
index a9b07ebaea..0000000000
--- a/src/overlays/actors/ovl_En_Gamelupy/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Gamelupy
-z_en_gamelupy.c
diff --git a/src/overlays/actors/ovl_En_Gb2/overlay.cfg b/src/overlays/actors/ovl_En_Gb2/overlay.cfg
deleted file mode 100644
index d604decdc3..0000000000
--- a/src/overlays/actors/ovl_En_Gb2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Gb2
-z_en_gb2.c
diff --git a/src/overlays/actors/ovl_En_Ge1/overlay.cfg b/src/overlays/actors/ovl_En_Ge1/overlay.cfg
deleted file mode 100644
index ebd643e2a1..0000000000
--- a/src/overlays/actors/ovl_En_Ge1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ge1
-z_en_ge1.c
diff --git a/src/overlays/actors/ovl_En_Ge2/overlay.cfg b/src/overlays/actors/ovl_En_Ge2/overlay.cfg
deleted file mode 100644
index 965bfcf194..0000000000
--- a/src/overlays/actors/ovl_En_Ge2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ge2
-z_en_ge2.c
diff --git a/src/overlays/actors/ovl_En_Ge3/overlay.cfg b/src/overlays/actors/ovl_En_Ge3/overlay.cfg
deleted file mode 100644
index 5eec23b4bd..0000000000
--- a/src/overlays/actors/ovl_En_Ge3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ge3
-z_en_ge3.c
diff --git a/src/overlays/actors/ovl_En_Geg/overlay.cfg b/src/overlays/actors/ovl_En_Geg/overlay.cfg
deleted file mode 100644
index 412bb71c1b..0000000000
--- a/src/overlays/actors/ovl_En_Geg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Geg
-z_en_geg.c
diff --git a/src/overlays/actors/ovl_En_Gg/overlay.cfg b/src/overlays/actors/ovl_En_Gg/overlay.cfg
deleted file mode 100644
index 5c782de1bc..0000000000
--- a/src/overlays/actors/ovl_En_Gg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Gg
-z_en_gg.c
diff --git a/src/overlays/actors/ovl_En_Gg2/overlay.cfg b/src/overlays/actors/ovl_En_Gg2/overlay.cfg
deleted file mode 100644
index 24b42b858a..0000000000
--- a/src/overlays/actors/ovl_En_Gg2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Gg2
-z_en_gg2.c
diff --git a/src/overlays/actors/ovl_En_Giant/overlay.cfg b/src/overlays/actors/ovl_En_Giant/overlay.cfg
deleted file mode 100644
index a56d149b73..0000000000
--- a/src/overlays/actors/ovl_En_Giant/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Giant
-z_en_giant.c
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/overlay.cfg b/src/overlays/actors/ovl_En_Ginko_Man/overlay.cfg
deleted file mode 100644
index 5d02f02dcb..0000000000
--- a/src/overlays/actors/ovl_En_Ginko_Man/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ginko_Man
-z_en_ginko_man.c
diff --git a/src/overlays/actors/ovl_En_GirlA/overlay.cfg b/src/overlays/actors/ovl_En_GirlA/overlay.cfg
deleted file mode 100644
index 2083a33774..0000000000
--- a/src/overlays/actors/ovl_En_GirlA/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_GirlA
-z_en_girla.c
diff --git a/src/overlays/actors/ovl_En_Gk/overlay.cfg b/src/overlays/actors/ovl_En_Gk/overlay.cfg
deleted file mode 100644
index 15b8f08e60..0000000000
--- a/src/overlays/actors/ovl_En_Gk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Gk
-z_en_gk.c
diff --git a/src/overlays/actors/ovl_En_Gm/overlay.cfg b/src/overlays/actors/ovl_En_Gm/overlay.cfg
deleted file mode 100644
index d39cd1d30e..0000000000
--- a/src/overlays/actors/ovl_En_Gm/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Gm
-z_en_gm.c
diff --git a/src/overlays/actors/ovl_En_Go/overlay.cfg b/src/overlays/actors/ovl_En_Go/overlay.cfg
deleted file mode 100644
index 3ab4530a45..0000000000
--- a/src/overlays/actors/ovl_En_Go/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Go
-z_en_go.c
diff --git a/src/overlays/actors/ovl_En_Goroiwa/overlay.cfg b/src/overlays/actors/ovl_En_Goroiwa/overlay.cfg
deleted file mode 100644
index 0f4bb5a326..0000000000
--- a/src/overlays/actors/ovl_En_Goroiwa/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Goroiwa
-z_en_goroiwa.c
diff --git a/src/overlays/actors/ovl_En_Grasshopper/overlay.cfg b/src/overlays/actors/ovl_En_Grasshopper/overlay.cfg
deleted file mode 100644
index a5fa8bb0a5..0000000000
--- a/src/overlays/actors/ovl_En_Grasshopper/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Grasshopper
-z_en_grasshopper.c
diff --git a/src/overlays/actors/ovl_En_Gs/overlay.cfg b/src/overlays/actors/ovl_En_Gs/overlay.cfg
deleted file mode 100644
index 0fc22a8560..0000000000
--- a/src/overlays/actors/ovl_En_Gs/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Gs
-z_en_gs.c
diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/overlay.cfg b/src/overlays/actors/ovl_En_Guard_Nuts/overlay.cfg
deleted file mode 100644
index 135b80f6cc..0000000000
--- a/src/overlays/actors/ovl_En_Guard_Nuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Guard_Nuts
-z_en_guard_nuts.c
diff --git a/src/overlays/actors/ovl_En_Guruguru/overlay.cfg b/src/overlays/actors/ovl_En_Guruguru/overlay.cfg
deleted file mode 100644
index 727ca7b59b..0000000000
--- a/src/overlays/actors/ovl_En_Guruguru/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Guruguru
-z_en_guruguru.c
diff --git a/src/overlays/actors/ovl_En_Hakurock/overlay.cfg b/src/overlays/actors/ovl_En_Hakurock/overlay.cfg
deleted file mode 100644
index 93c363b8d9..0000000000
--- a/src/overlays/actors/ovl_En_Hakurock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hakurock
-z_en_hakurock.c
diff --git a/src/overlays/actors/ovl_En_Hanabi/overlay.cfg b/src/overlays/actors/ovl_En_Hanabi/overlay.cfg
deleted file mode 100644
index 67feefe27c..0000000000
--- a/src/overlays/actors/ovl_En_Hanabi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hanabi
-z_en_hanabi.c
diff --git a/src/overlays/actors/ovl_En_Hata/overlay.cfg b/src/overlays/actors/ovl_En_Hata/overlay.cfg
deleted file mode 100644
index e670da2627..0000000000
--- a/src/overlays/actors/ovl_En_Hata/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hata
-z_en_hata.c
diff --git a/src/overlays/actors/ovl_En_Heishi/overlay.cfg b/src/overlays/actors/ovl_En_Heishi/overlay.cfg
deleted file mode 100644
index 3b8a0e40e7..0000000000
--- a/src/overlays/actors/ovl_En_Heishi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Heishi
-z_en_heishi.c
diff --git a/src/overlays/actors/ovl_En_Hg/overlay.cfg b/src/overlays/actors/ovl_En_Hg/overlay.cfg
deleted file mode 100644
index d3037b31d5..0000000000
--- a/src/overlays/actors/ovl_En_Hg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hg
-z_en_hg.c
diff --git a/src/overlays/actors/ovl_En_Hgo/overlay.cfg b/src/overlays/actors/ovl_En_Hgo/overlay.cfg
deleted file mode 100644
index 242079637b..0000000000
--- a/src/overlays/actors/ovl_En_Hgo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hgo
-z_en_hgo.c
diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/overlay.cfg b/src/overlays/actors/ovl_En_Hidden_Nuts/overlay.cfg
deleted file mode 100644
index 491a14d601..0000000000
--- a/src/overlays/actors/ovl_En_Hidden_Nuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hidden_Nuts
-z_en_hidden_nuts.c
diff --git a/src/overlays/actors/ovl_En_Hint_Skb/overlay.cfg b/src/overlays/actors/ovl_En_Hint_Skb/overlay.cfg
deleted file mode 100644
index 95449a9a4e..0000000000
--- a/src/overlays/actors/ovl_En_Hint_Skb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hint_Skb
-z_en_hint_skb.c
diff --git a/src/overlays/actors/ovl_En_Hit_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Hit_Tag/overlay.cfg
deleted file mode 100644
index e7ee964c99..0000000000
--- a/src/overlays/actors/ovl_En_Hit_Tag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hit_Tag
-z_en_hit_tag.c
diff --git a/src/overlays/actors/ovl_En_Holl/overlay.cfg b/src/overlays/actors/ovl_En_Holl/overlay.cfg
deleted file mode 100644
index 35c8d8f8e3..0000000000
--- a/src/overlays/actors/ovl_En_Holl/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Holl
-z_en_holl.c
diff --git a/src/overlays/actors/ovl_En_Honotrap/overlay.cfg b/src/overlays/actors/ovl_En_Honotrap/overlay.cfg
deleted file mode 100644
index 4a20640dee..0000000000
--- a/src/overlays/actors/ovl_En_Honotrap/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Honotrap
-z_en_honotrap.c
diff --git a/src/overlays/actors/ovl_En_Horse/overlay.cfg b/src/overlays/actors/ovl_En_Horse/overlay.cfg
deleted file mode 100644
index 90043637c2..0000000000
--- a/src/overlays/actors/ovl_En_Horse/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Horse
-z_en_horse.c
diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/overlay.cfg b/src/overlays/actors/ovl_En_Horse_Game_Check/overlay.cfg
deleted file mode 100644
index b950cc9c29..0000000000
--- a/src/overlays/actors/ovl_En_Horse_Game_Check/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Horse_Game_Check
-z_en_horse_game_check.c
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/overlay.cfg b/src/overlays/actors/ovl_En_Horse_Link_Child/overlay.cfg
deleted file mode 100644
index 09ec53e20e..0000000000
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Horse_Link_Child
-z_en_horse_link_child.c
diff --git a/src/overlays/actors/ovl_En_Hs/overlay.cfg b/src/overlays/actors/ovl_En_Hs/overlay.cfg
deleted file mode 100644
index dab1cacf78..0000000000
--- a/src/overlays/actors/ovl_En_Hs/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hs
-z_en_hs.c
diff --git a/src/overlays/actors/ovl_En_Hs2/overlay.cfg b/src/overlays/actors/ovl_En_Hs2/overlay.cfg
deleted file mode 100644
index a34ed88c5f..0000000000
--- a/src/overlays/actors/ovl_En_Hs2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Hs2
-z_en_hs2.c
diff --git a/src/overlays/actors/ovl_En_Ig/overlay.cfg b/src/overlays/actors/ovl_En_Ig/overlay.cfg
deleted file mode 100644
index fa0125cbf3..0000000000
--- a/src/overlays/actors/ovl_En_Ig/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ig
-z_en_ig.c
diff --git a/src/overlays/actors/ovl_En_Ik/overlay.cfg b/src/overlays/actors/ovl_En_Ik/overlay.cfg
deleted file mode 100644
index c4cc60ed31..0000000000
--- a/src/overlays/actors/ovl_En_Ik/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ik
-z_en_ik.c
diff --git a/src/overlays/actors/ovl_En_In/overlay.cfg b/src/overlays/actors/ovl_En_In/overlay.cfg
deleted file mode 100644
index 2a1b953aaa..0000000000
--- a/src/overlays/actors/ovl_En_In/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_In
-z_en_in.c
diff --git a/src/overlays/actors/ovl_En_Insect/overlay.cfg b/src/overlays/actors/ovl_En_Insect/overlay.cfg
deleted file mode 100644
index f439a7c1b7..0000000000
--- a/src/overlays/actors/ovl_En_Insect/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Insect
-z_en_insect.c
diff --git a/src/overlays/actors/ovl_En_Invadepoh/overlay.cfg b/src/overlays/actors/ovl_En_Invadepoh/overlay.cfg
deleted file mode 100644
index a05f98b613..0000000000
--- a/src/overlays/actors/ovl_En_Invadepoh/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Invadepoh
-z_en_invadepoh.c
diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/overlay.cfg b/src/overlays/actors/ovl_En_Invadepoh_Demo/overlay.cfg
deleted file mode 100644
index 192412f5fd..0000000000
--- a/src/overlays/actors/ovl_En_Invadepoh_Demo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Invadepoh_Demo
-z_en_invadepoh_demo.c
diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/overlay.cfg b/src/overlays/actors/ovl_En_Invisible_Ruppe/overlay.cfg
deleted file mode 100644
index 18c1eed56a..0000000000
--- a/src/overlays/actors/ovl_En_Invisible_Ruppe/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Invisible_Ruppe
-z_en_invisible_ruppe.c
diff --git a/src/overlays/actors/ovl_En_Ishi/overlay.cfg b/src/overlays/actors/ovl_En_Ishi/overlay.cfg
deleted file mode 100644
index 689d8deb5d..0000000000
--- a/src/overlays/actors/ovl_En_Ishi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ishi
-z_en_ishi.c
diff --git a/src/overlays/actors/ovl_En_Ja/overlay.cfg b/src/overlays/actors/ovl_En_Ja/overlay.cfg
deleted file mode 100644
index aab759e94e..0000000000
--- a/src/overlays/actors/ovl_En_Ja/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ja
-z_en_ja.c
diff --git a/src/overlays/actors/ovl_En_Jc_Mato/overlay.cfg b/src/overlays/actors/ovl_En_Jc_Mato/overlay.cfg
deleted file mode 100644
index 361e01617f..0000000000
--- a/src/overlays/actors/ovl_En_Jc_Mato/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Jc_Mato
-z_en_jc_mato.c
diff --git a/src/overlays/actors/ovl_En_Jg/overlay.cfg b/src/overlays/actors/ovl_En_Jg/overlay.cfg
deleted file mode 100644
index a60b43afc9..0000000000
--- a/src/overlays/actors/ovl_En_Jg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Jg
-z_en_jg.c
diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/overlay.cfg b/src/overlays/actors/ovl_En_Jgame_Tsn/overlay.cfg
deleted file mode 100644
index 9d3fbbf9d8..0000000000
--- a/src/overlays/actors/ovl_En_Jgame_Tsn/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Jgame_Tsn
-z_en_jgame_tsn.c
diff --git a/src/overlays/actors/ovl_En_Js/overlay.cfg b/src/overlays/actors/ovl_En_Js/overlay.cfg
deleted file mode 100644
index 6923c80b4b..0000000000
--- a/src/overlays/actors/ovl_En_Js/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Js
-z_en_js.c
diff --git a/src/overlays/actors/ovl_En_Jso/overlay.cfg b/src/overlays/actors/ovl_En_Jso/overlay.cfg
deleted file mode 100644
index 050d8bc675..0000000000
--- a/src/overlays/actors/ovl_En_Jso/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Jso
-z_en_jso.c
diff --git a/src/overlays/actors/ovl_En_Jso2/overlay.cfg b/src/overlays/actors/ovl_En_Jso2/overlay.cfg
deleted file mode 100644
index 907202195d..0000000000
--- a/src/overlays/actors/ovl_En_Jso2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Jso2
-z_en_jso2.c
diff --git a/src/overlays/actors/ovl_En_Kaizoku/overlay.cfg b/src/overlays/actors/ovl_En_Kaizoku/overlay.cfg
deleted file mode 100644
index 4f77e7de75..0000000000
--- a/src/overlays/actors/ovl_En_Kaizoku/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kaizoku
-z_en_kaizoku.c
diff --git a/src/overlays/actors/ovl_En_Kakasi/overlay.cfg b/src/overlays/actors/ovl_En_Kakasi/overlay.cfg
deleted file mode 100644
index f933ca862e..0000000000
--- a/src/overlays/actors/ovl_En_Kakasi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kakasi
-z_en_kakasi.c
diff --git a/src/overlays/actors/ovl_En_Kame/overlay.cfg b/src/overlays/actors/ovl_En_Kame/overlay.cfg
deleted file mode 100644
index 8f2bff1c1a..0000000000
--- a/src/overlays/actors/ovl_En_Kame/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kame
-z_en_kame.c
diff --git a/src/overlays/actors/ovl_En_Kanban/overlay.cfg b/src/overlays/actors/ovl_En_Kanban/overlay.cfg
deleted file mode 100644
index 1ae4caed5b..0000000000
--- a/src/overlays/actors/ovl_En_Kanban/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kanban
-z_en_kanban.c
diff --git a/src/overlays/actors/ovl_En_Karebaba/overlay.cfg b/src/overlays/actors/ovl_En_Karebaba/overlay.cfg
deleted file mode 100644
index 0045038473..0000000000
--- a/src/overlays/actors/ovl_En_Karebaba/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Karebaba
-z_en_karebaba.c
diff --git a/src/overlays/actors/ovl_En_Kbt/overlay.cfg b/src/overlays/actors/ovl_En_Kbt/overlay.cfg
deleted file mode 100644
index d9195b4b0f..0000000000
--- a/src/overlays/actors/ovl_En_Kbt/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kbt
-z_en_kbt.c
diff --git a/src/overlays/actors/ovl_En_Kendo_Js/overlay.cfg b/src/overlays/actors/ovl_En_Kendo_Js/overlay.cfg
deleted file mode 100644
index dd63f4c4a8..0000000000
--- a/src/overlays/actors/ovl_En_Kendo_Js/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kendo_Js
-z_en_kendo_js.c
diff --git a/src/overlays/actors/ovl_En_Kgy/overlay.cfg b/src/overlays/actors/ovl_En_Kgy/overlay.cfg
deleted file mode 100644
index 9a9ddfd5ce..0000000000
--- a/src/overlays/actors/ovl_En_Kgy/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kgy
-z_en_kgy.c
diff --git a/src/overlays/actors/ovl_En_Kitan/overlay.cfg b/src/overlays/actors/ovl_En_Kitan/overlay.cfg
deleted file mode 100644
index cd24348d58..0000000000
--- a/src/overlays/actors/ovl_En_Kitan/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kitan
-z_en_kitan.c
diff --git a/src/overlays/actors/ovl_En_Knight/overlay.cfg b/src/overlays/actors/ovl_En_Knight/overlay.cfg
deleted file mode 100644
index 150eab3c7b..0000000000
--- a/src/overlays/actors/ovl_En_Knight/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Knight
-z_en_knight.c
diff --git a/src/overlays/actors/ovl_En_Kujiya/overlay.cfg b/src/overlays/actors/ovl_En_Kujiya/overlay.cfg
deleted file mode 100644
index a47b9648bc..0000000000
--- a/src/overlays/actors/ovl_En_Kujiya/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kujiya
-z_en_kujiya.c
diff --git a/src/overlays/actors/ovl_En_Kusa/overlay.cfg b/src/overlays/actors/ovl_En_Kusa/overlay.cfg
deleted file mode 100644
index 9cded0ca35..0000000000
--- a/src/overlays/actors/ovl_En_Kusa/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kusa
-z_en_kusa.c
diff --git a/src/overlays/actors/ovl_En_Kusa2/overlay.cfg b/src/overlays/actors/ovl_En_Kusa2/overlay.cfg
deleted file mode 100644
index 0e08a700ba..0000000000
--- a/src/overlays/actors/ovl_En_Kusa2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Kusa2
-z_en_kusa2.c
diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/overlay.cfg b/src/overlays/actors/ovl_En_Lift_Nuts/overlay.cfg
deleted file mode 100644
index df2faa5f07..0000000000
--- a/src/overlays/actors/ovl_En_Lift_Nuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Lift_Nuts
-z_en_lift_nuts.c
diff --git a/src/overlays/actors/ovl_En_Light/overlay.cfg b/src/overlays/actors/ovl_En_Light/overlay.cfg
deleted file mode 100644
index 763d0ad6dc..0000000000
--- a/src/overlays/actors/ovl_En_Light/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Light
-z_en_light.c
diff --git a/src/overlays/actors/ovl_En_Look_Nuts/overlay.cfg b/src/overlays/actors/ovl_En_Look_Nuts/overlay.cfg
deleted file mode 100644
index 8d594952f8..0000000000
--- a/src/overlays/actors/ovl_En_Look_Nuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Look_Nuts
-z_en_look_nuts.c
diff --git a/src/overlays/actors/ovl_En_M_Fire1/overlay.cfg b/src/overlays/actors/ovl_En_M_Fire1/overlay.cfg
deleted file mode 100644
index 1d43db7312..0000000000
--- a/src/overlays/actors/ovl_En_M_Fire1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_M_Fire1
-z_en_m_fire1.c
diff --git a/src/overlays/actors/ovl_En_M_Thunder/overlay.cfg b/src/overlays/actors/ovl_En_M_Thunder/overlay.cfg
deleted file mode 100644
index 5de5ce33a1..0000000000
--- a/src/overlays/actors/ovl_En_M_Thunder/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_M_Thunder
-z_en_m_thunder.c
diff --git a/src/overlays/actors/ovl_En_Ma4/overlay.cfg b/src/overlays/actors/ovl_En_Ma4/overlay.cfg
deleted file mode 100644
index 3a0c5af889..0000000000
--- a/src/overlays/actors/ovl_En_Ma4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ma4
-z_en_ma4.c
diff --git a/src/overlays/actors/ovl_En_Ma_Yto/overlay.cfg b/src/overlays/actors/ovl_En_Ma_Yto/overlay.cfg
deleted file mode 100644
index a1085bf0ef..0000000000
--- a/src/overlays/actors/ovl_En_Ma_Yto/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ma_Yto
-z_en_ma_yto.c
diff --git a/src/overlays/actors/ovl_En_Ma_Yts/overlay.cfg b/src/overlays/actors/ovl_En_Ma_Yts/overlay.cfg
deleted file mode 100644
index c185a0e537..0000000000
--- a/src/overlays/actors/ovl_En_Ma_Yts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ma_Yts
-z_en_ma_yts.c
diff --git a/src/overlays/actors/ovl_En_Mag/overlay.cfg b/src/overlays/actors/ovl_En_Mag/overlay.cfg
deleted file mode 100644
index 14fce0372c..0000000000
--- a/src/overlays/actors/ovl_En_Mag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mag
-z_en_mag.c
diff --git a/src/overlays/actors/ovl_En_Maruta/overlay.cfg b/src/overlays/actors/ovl_En_Maruta/overlay.cfg
deleted file mode 100644
index 6816a8c92b..0000000000
--- a/src/overlays/actors/ovl_En_Maruta/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Maruta
-z_en_maruta.c
diff --git a/src/overlays/actors/ovl_En_Minideath/overlay.cfg b/src/overlays/actors/ovl_En_Minideath/overlay.cfg
deleted file mode 100644
index deffea103b..0000000000
--- a/src/overlays/actors/ovl_En_Minideath/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Minideath
-z_en_minideath.c
diff --git a/src/overlays/actors/ovl_En_Minifrog/overlay.cfg b/src/overlays/actors/ovl_En_Minifrog/overlay.cfg
deleted file mode 100644
index db7e2a8424..0000000000
--- a/src/overlays/actors/ovl_En_Minifrog/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Minifrog
-z_en_minifrog.c
diff --git a/src/overlays/actors/ovl_En_Minislime/overlay.cfg b/src/overlays/actors/ovl_En_Minislime/overlay.cfg
deleted file mode 100644
index 795b335cb1..0000000000
--- a/src/overlays/actors/ovl_En_Minislime/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Minislime
-z_en_minislime.c
diff --git a/src/overlays/actors/ovl_En_Mk/overlay.cfg b/src/overlays/actors/ovl_En_Mk/overlay.cfg
deleted file mode 100644
index 7463d059af..0000000000
--- a/src/overlays/actors/ovl_En_Mk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mk
-z_en_mk.c
diff --git a/src/overlays/actors/ovl_En_Mkk/overlay.cfg b/src/overlays/actors/ovl_En_Mkk/overlay.cfg
deleted file mode 100644
index 490c7cd58a..0000000000
--- a/src/overlays/actors/ovl_En_Mkk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mkk
-z_en_mkk.c
diff --git a/src/overlays/actors/ovl_En_Mm/overlay.cfg b/src/overlays/actors/ovl_En_Mm/overlay.cfg
deleted file mode 100644
index db9f54ab33..0000000000
--- a/src/overlays/actors/ovl_En_Mm/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mm
-z_en_mm.c
diff --git a/src/overlays/actors/ovl_En_Mm2/overlay.cfg b/src/overlays/actors/ovl_En_Mm2/overlay.cfg
deleted file mode 100644
index ee3394df9e..0000000000
--- a/src/overlays/actors/ovl_En_Mm2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mm2
-z_en_mm2.c
diff --git a/src/overlays/actors/ovl_En_Mm3/overlay.cfg b/src/overlays/actors/ovl_En_Mm3/overlay.cfg
deleted file mode 100644
index d1162759f0..0000000000
--- a/src/overlays/actors/ovl_En_Mm3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mm3
-z_en_mm3.c
diff --git a/src/overlays/actors/ovl_En_Mnk/overlay.cfg b/src/overlays/actors/ovl_En_Mnk/overlay.cfg
deleted file mode 100644
index 456c850ac3..0000000000
--- a/src/overlays/actors/ovl_En_Mnk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mnk
-z_en_mnk.c
diff --git a/src/overlays/actors/ovl_En_Ms/overlay.cfg b/src/overlays/actors/ovl_En_Ms/overlay.cfg
deleted file mode 100644
index f8f57266ec..0000000000
--- a/src/overlays/actors/ovl_En_Ms/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ms
-z_en_ms.c
diff --git a/src/overlays/actors/ovl_En_Mt_tag/overlay.cfg b/src/overlays/actors/ovl_En_Mt_tag/overlay.cfg
deleted file mode 100644
index dcf4dadff8..0000000000
--- a/src/overlays/actors/ovl_En_Mt_tag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mt_tag
-z_en_mt_tag.c
diff --git a/src/overlays/actors/ovl_En_Mushi2/overlay.cfg b/src/overlays/actors/ovl_En_Mushi2/overlay.cfg
deleted file mode 100644
index d8a7c2e85f..0000000000
--- a/src/overlays/actors/ovl_En_Mushi2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Mushi2
-z_en_mushi2.c
diff --git a/src/overlays/actors/ovl_En_Muto/overlay.cfg b/src/overlays/actors/ovl_En_Muto/overlay.cfg
deleted file mode 100644
index 3fd3e42b55..0000000000
--- a/src/overlays/actors/ovl_En_Muto/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Muto
-z_en_muto.c
diff --git a/src/overlays/actors/ovl_En_Nb/overlay.cfg b/src/overlays/actors/ovl_En_Nb/overlay.cfg
deleted file mode 100644
index 27d485b84d..0000000000
--- a/src/overlays/actors/ovl_En_Nb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Nb
-z_en_nb.c
diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/overlay.cfg b/src/overlays/actors/ovl_En_Neo_Reeba/overlay.cfg
deleted file mode 100644
index b5d488d53f..0000000000
--- a/src/overlays/actors/ovl_En_Neo_Reeba/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Neo_Reeba
-z_en_neo_reeba.c
diff --git a/src/overlays/actors/ovl_En_Nimotsu/overlay.cfg b/src/overlays/actors/ovl_En_Nimotsu/overlay.cfg
deleted file mode 100644
index 8558fc330c..0000000000
--- a/src/overlays/actors/ovl_En_Nimotsu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Nimotsu
-z_en_nimotsu.c
diff --git a/src/overlays/actors/ovl_En_Niw/overlay.cfg b/src/overlays/actors/ovl_En_Niw/overlay.cfg
deleted file mode 100644
index 26dacb3bbe..0000000000
--- a/src/overlays/actors/ovl_En_Niw/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Niw
-z_en_niw.c
diff --git a/src/overlays/actors/ovl_En_Nnh/overlay.cfg b/src/overlays/actors/ovl_En_Nnh/overlay.cfg
deleted file mode 100644
index 01d2bec044..0000000000
--- a/src/overlays/actors/ovl_En_Nnh/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Nnh
-z_en_nnh.c
diff --git a/src/overlays/actors/ovl_En_Nutsball/overlay.cfg b/src/overlays/actors/ovl_En_Nutsball/overlay.cfg
deleted file mode 100644
index cc188400cf..0000000000
--- a/src/overlays/actors/ovl_En_Nutsball/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Nutsball
-z_en_nutsball.c
diff --git a/src/overlays/actors/ovl_En_Nwc/overlay.cfg b/src/overlays/actors/ovl_En_Nwc/overlay.cfg
deleted file mode 100644
index d479e7da40..0000000000
--- a/src/overlays/actors/ovl_En_Nwc/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Nwc
-z_en_nwc.c
diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/overlay.cfg b/src/overlays/actors/ovl_En_Okarina_Effect/overlay.cfg
deleted file mode 100644
index 02325ddea1..0000000000
--- a/src/overlays/actors/ovl_En_Okarina_Effect/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Okarina_Effect
-z_en_okarina_effect.c
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Okarina_Tag/overlay.cfg
deleted file mode 100644
index 908da18884..0000000000
--- a/src/overlays/actors/ovl_En_Okarina_Tag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Okarina_Tag
-z_en_okarina_tag.c
diff --git a/src/overlays/actors/ovl_En_Okuta/overlay.cfg b/src/overlays/actors/ovl_En_Okuta/overlay.cfg
deleted file mode 100644
index 8863e71691..0000000000
--- a/src/overlays/actors/ovl_En_Okuta/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Okuta
-z_en_okuta.c
diff --git a/src/overlays/actors/ovl_En_Onpuman/overlay.cfg b/src/overlays/actors/ovl_En_Onpuman/overlay.cfg
deleted file mode 100644
index 50f24d4ace..0000000000
--- a/src/overlays/actors/ovl_En_Onpuman/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Onpuman
-z_en_onpuman.c
diff --git a/src/overlays/actors/ovl_En_Osk/overlay.cfg b/src/overlays/actors/ovl_En_Osk/overlay.cfg
deleted file mode 100644
index 3d963dc09c..0000000000
--- a/src/overlays/actors/ovl_En_Osk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Osk
-z_en_osk.c
diff --git a/src/overlays/actors/ovl_En_Osn/overlay.cfg b/src/overlays/actors/ovl_En_Osn/overlay.cfg
deleted file mode 100644
index 59f9f2343a..0000000000
--- a/src/overlays/actors/ovl_En_Osn/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Osn
-z_en_osn.c
diff --git a/src/overlays/actors/ovl_En_Ossan/overlay.cfg b/src/overlays/actors/ovl_En_Ossan/overlay.cfg
deleted file mode 100644
index be58d6c1ec..0000000000
--- a/src/overlays/actors/ovl_En_Ossan/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ossan
-z_en_ossan.c
diff --git a/src/overlays/actors/ovl_En_Ot/overlay.cfg b/src/overlays/actors/ovl_En_Ot/overlay.cfg
deleted file mode 100644
index 53a5992e9a..0000000000
--- a/src/overlays/actors/ovl_En_Ot/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ot
-z_en_ot.c
diff --git a/src/overlays/actors/ovl_En_Owl/overlay.cfg b/src/overlays/actors/ovl_En_Owl/overlay.cfg
deleted file mode 100644
index c3609f9923..0000000000
--- a/src/overlays/actors/ovl_En_Owl/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Owl
-z_en_owl.c
diff --git a/src/overlays/actors/ovl_En_Pamera/overlay.cfg b/src/overlays/actors/ovl_En_Pamera/overlay.cfg
deleted file mode 100644
index 544499e92c..0000000000
--- a/src/overlays/actors/ovl_En_Pamera/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Pamera
-z_en_pamera.c
diff --git a/src/overlays/actors/ovl_En_Pametfrog/overlay.cfg b/src/overlays/actors/ovl_En_Pametfrog/overlay.cfg
deleted file mode 100644
index de6a9fa77d..0000000000
--- a/src/overlays/actors/ovl_En_Pametfrog/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Pametfrog
-z_en_pametfrog.c
diff --git a/src/overlays/actors/ovl_En_Paper/overlay.cfg b/src/overlays/actors/ovl_En_Paper/overlay.cfg
deleted file mode 100644
index f2b122194d..0000000000
--- a/src/overlays/actors/ovl_En_Paper/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Paper
-z_en_paper.c
diff --git a/src/overlays/actors/ovl_En_Part/overlay.cfg b/src/overlays/actors/ovl_En_Part/overlay.cfg
deleted file mode 100644
index 883554d5bb..0000000000
--- a/src/overlays/actors/ovl_En_Part/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Part
-z_en_part.c
diff --git a/src/overlays/actors/ovl_En_Peehat/overlay.cfg b/src/overlays/actors/ovl_En_Peehat/overlay.cfg
deleted file mode 100644
index 588e53bd7b..0000000000
--- a/src/overlays/actors/ovl_En_Peehat/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Peehat
-z_en_peehat.c
diff --git a/src/overlays/actors/ovl_En_Pm/overlay.cfg b/src/overlays/actors/ovl_En_Pm/overlay.cfg
deleted file mode 100644
index 43905ae8cf..0000000000
--- a/src/overlays/actors/ovl_En_Pm/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Pm
-z_en_pm.c
diff --git a/src/overlays/actors/ovl_En_Po_Composer/overlay.cfg b/src/overlays/actors/ovl_En_Po_Composer/overlay.cfg
deleted file mode 100644
index 25791e887e..0000000000
--- a/src/overlays/actors/ovl_En_Po_Composer/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Po_Composer
-z_en_po_composer.c
diff --git a/src/overlays/actors/ovl_En_Po_Fusen/overlay.cfg b/src/overlays/actors/ovl_En_Po_Fusen/overlay.cfg
deleted file mode 100644
index 71a747b65c..0000000000
--- a/src/overlays/actors/ovl_En_Po_Fusen/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Po_Fusen
-z_en_po_fusen.c
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/overlay.cfg b/src/overlays/actors/ovl_En_Po_Sisters/overlay.cfg
deleted file mode 100644
index 7c59c1704f..0000000000
--- a/src/overlays/actors/ovl_En_Po_Sisters/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Po_Sisters
-z_en_po_sisters.c
diff --git a/src/overlays/actors/ovl_En_Poh/overlay.cfg b/src/overlays/actors/ovl_En_Poh/overlay.cfg
deleted file mode 100644
index d83d8bd2f7..0000000000
--- a/src/overlays/actors/ovl_En_Poh/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Poh
-z_en_poh.c
diff --git a/src/overlays/actors/ovl_En_Pp/overlay.cfg b/src/overlays/actors/ovl_En_Pp/overlay.cfg
deleted file mode 100644
index 3cca2c18d2..0000000000
--- a/src/overlays/actors/ovl_En_Pp/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Pp
-z_en_pp.c
diff --git a/src/overlays/actors/ovl_En_Pr/overlay.cfg b/src/overlays/actors/ovl_En_Pr/overlay.cfg
deleted file mode 100644
index efb1dfb564..0000000000
--- a/src/overlays/actors/ovl_En_Pr/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Pr
-z_en_pr.c
diff --git a/src/overlays/actors/ovl_En_Pr2/overlay.cfg b/src/overlays/actors/ovl_En_Pr2/overlay.cfg
deleted file mode 100644
index 11a975ed02..0000000000
--- a/src/overlays/actors/ovl_En_Pr2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Pr2
-z_en_pr2.c
diff --git a/src/overlays/actors/ovl_En_Prz/overlay.cfg b/src/overlays/actors/ovl_En_Prz/overlay.cfg
deleted file mode 100644
index dc79492a03..0000000000
--- a/src/overlays/actors/ovl_En_Prz/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Prz
-z_en_prz.c
diff --git a/src/overlays/actors/ovl_En_Pst/overlay.cfg b/src/overlays/actors/ovl_En_Pst/overlay.cfg
deleted file mode 100644
index 857d2ee7e7..0000000000
--- a/src/overlays/actors/ovl_En_Pst/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Pst
-z_en_pst.c
diff --git a/src/overlays/actors/ovl_En_Racedog/overlay.cfg b/src/overlays/actors/ovl_En_Racedog/overlay.cfg
deleted file mode 100644
index 6461b9ff5a..0000000000
--- a/src/overlays/actors/ovl_En_Racedog/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Racedog
-z_en_racedog.c
diff --git a/src/overlays/actors/ovl_En_Raf/overlay.cfg b/src/overlays/actors/ovl_En_Raf/overlay.cfg
deleted file mode 100644
index 086e64a725..0000000000
--- a/src/overlays/actors/ovl_En_Raf/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Raf
-z_en_raf.c
diff --git a/src/overlays/actors/ovl_En_Rail_Skb/overlay.cfg b/src/overlays/actors/ovl_En_Rail_Skb/overlay.cfg
deleted file mode 100644
index df550bd198..0000000000
--- a/src/overlays/actors/ovl_En_Rail_Skb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Rail_Skb
-z_en_rail_skb.c
diff --git a/src/overlays/actors/ovl_En_Railgibud/overlay.cfg b/src/overlays/actors/ovl_En_Railgibud/overlay.cfg
deleted file mode 100644
index 6c055c27c3..0000000000
--- a/src/overlays/actors/ovl_En_Railgibud/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Railgibud
-z_en_railgibud.c
diff --git a/src/overlays/actors/ovl_En_Rat/overlay.cfg b/src/overlays/actors/ovl_En_Rat/overlay.cfg
deleted file mode 100644
index 3562582caf..0000000000
--- a/src/overlays/actors/ovl_En_Rat/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Rat
-z_en_rat.c
diff --git a/src/overlays/actors/ovl_En_Rd/overlay.cfg b/src/overlays/actors/ovl_En_Rd/overlay.cfg
deleted file mode 100644
index 3864774ca9..0000000000
--- a/src/overlays/actors/ovl_En_Rd/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Rd
-z_en_rd.c
diff --git a/src/overlays/actors/ovl_En_Recepgirl/overlay.cfg b/src/overlays/actors/ovl_En_Recepgirl/overlay.cfg
deleted file mode 100644
index bec7425dee..0000000000
--- a/src/overlays/actors/ovl_En_Recepgirl/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Recepgirl
-z_en_recepgirl.c
diff --git a/src/overlays/actors/ovl_En_Rg/overlay.cfg b/src/overlays/actors/ovl_En_Rg/overlay.cfg
deleted file mode 100644
index 4cbc296973..0000000000
--- a/src/overlays/actors/ovl_En_Rg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Rg
-z_en_rg.c
diff --git a/src/overlays/actors/ovl_En_River_Sound/overlay.cfg b/src/overlays/actors/ovl_En_River_Sound/overlay.cfg
deleted file mode 100644
index 82d1e4c4ab..0000000000
--- a/src/overlays/actors/ovl_En_River_Sound/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_River_Sound
-z_en_river_sound.c
diff --git a/src/overlays/actors/ovl_En_Rr/overlay.cfg b/src/overlays/actors/ovl_En_Rr/overlay.cfg
deleted file mode 100644
index d7730c1f0c..0000000000
--- a/src/overlays/actors/ovl_En_Rr/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Rr
-z_en_rr.c
diff --git a/src/overlays/actors/ovl_En_Rsn/overlay.cfg b/src/overlays/actors/ovl_En_Rsn/overlay.cfg
deleted file mode 100644
index f99efb1a6b..0000000000
--- a/src/overlays/actors/ovl_En_Rsn/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Rsn
-z_en_rsn.c
diff --git a/src/overlays/actors/ovl_En_Ru/overlay.cfg b/src/overlays/actors/ovl_En_Ru/overlay.cfg
deleted file mode 100644
index 4080303857..0000000000
--- a/src/overlays/actors/ovl_En_Ru/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ru
-z_en_ru.c
diff --git a/src/overlays/actors/ovl_En_Ruppecrow/overlay.cfg b/src/overlays/actors/ovl_En_Ruppecrow/overlay.cfg
deleted file mode 100644
index 63f0bbb60c..0000000000
--- a/src/overlays/actors/ovl_En_Ruppecrow/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ruppecrow
-z_en_ruppecrow.c
diff --git a/src/overlays/actors/ovl_En_Rz/overlay.cfg b/src/overlays/actors/ovl_En_Rz/overlay.cfg
deleted file mode 100644
index 10c34f949b..0000000000
--- a/src/overlays/actors/ovl_En_Rz/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Rz
-z_en_rz.c
diff --git a/src/overlays/actors/ovl_En_S_Goro/overlay.cfg b/src/overlays/actors/ovl_En_S_Goro/overlay.cfg
deleted file mode 100644
index 195f952eae..0000000000
--- a/src/overlays/actors/ovl_En_S_Goro/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_S_Goro
-z_en_s_goro.c
diff --git a/src/overlays/actors/ovl_En_Sb/overlay.cfg b/src/overlays/actors/ovl_En_Sb/overlay.cfg
deleted file mode 100644
index 12658e7639..0000000000
--- a/src/overlays/actors/ovl_En_Sb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sb
-z_en_sb.c
diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/overlay.cfg b/src/overlays/actors/ovl_En_Sc_Ruppe/overlay.cfg
deleted file mode 100644
index 2262aa0bbf..0000000000
--- a/src/overlays/actors/ovl_En_Sc_Ruppe/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sc_Ruppe
-z_en_sc_ruppe.c
diff --git a/src/overlays/actors/ovl_En_Scopecoin/overlay.cfg b/src/overlays/actors/ovl_En_Scopecoin/overlay.cfg
deleted file mode 100644
index 2c605c8bc2..0000000000
--- a/src/overlays/actors/ovl_En_Scopecoin/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Scopecoin
-z_en_scopecoin.c
diff --git a/src/overlays/actors/ovl_En_Scopecrow/overlay.cfg b/src/overlays/actors/ovl_En_Scopecrow/overlay.cfg
deleted file mode 100644
index 880bf55391..0000000000
--- a/src/overlays/actors/ovl_En_Scopecrow/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Scopecrow
-z_en_scopecrow.c
diff --git a/src/overlays/actors/ovl_En_Scopenuts/overlay.cfg b/src/overlays/actors/ovl_En_Scopenuts/overlay.cfg
deleted file mode 100644
index 5989378a15..0000000000
--- a/src/overlays/actors/ovl_En_Scopenuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Scopenuts
-z_en_scopenuts.c
diff --git a/src/overlays/actors/ovl_En_Sda/overlay.cfg b/src/overlays/actors/ovl_En_Sda/overlay.cfg
deleted file mode 100644
index 694122dd7a..0000000000
--- a/src/overlays/actors/ovl_En_Sda/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sda
-z_en_sda.c
diff --git a/src/overlays/actors/ovl_En_Sekihi/overlay.cfg b/src/overlays/actors/ovl_En_Sekihi/overlay.cfg
deleted file mode 100644
index 96c2eae2ff..0000000000
--- a/src/overlays/actors/ovl_En_Sekihi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sekihi
-z_en_sekihi.c
diff --git a/src/overlays/actors/ovl_En_Sellnuts/overlay.cfg b/src/overlays/actors/ovl_En_Sellnuts/overlay.cfg
deleted file mode 100644
index f3b9a3eca1..0000000000
--- a/src/overlays/actors/ovl_En_Sellnuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sellnuts
-z_en_sellnuts.c
diff --git a/src/overlays/actors/ovl_En_Shn/overlay.cfg b/src/overlays/actors/ovl_En_Shn/overlay.cfg
deleted file mode 100644
index f0526f58cd..0000000000
--- a/src/overlays/actors/ovl_En_Shn/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Shn
-z_en_shn.c
diff --git a/src/overlays/actors/ovl_En_Si/overlay.cfg b/src/overlays/actors/ovl_En_Si/overlay.cfg
deleted file mode 100644
index 67fe955184..0000000000
--- a/src/overlays/actors/ovl_En_Si/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Si
-z_en_si.c
diff --git a/src/overlays/actors/ovl_En_Skb/overlay.cfg b/src/overlays/actors/ovl_En_Skb/overlay.cfg
deleted file mode 100644
index dfa528943e..0000000000
--- a/src/overlays/actors/ovl_En_Skb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Skb
-z_en_skb.c
diff --git a/src/overlays/actors/ovl_En_Slime/overlay.cfg b/src/overlays/actors/ovl_En_Slime/overlay.cfg
deleted file mode 100644
index ad13869e8c..0000000000
--- a/src/overlays/actors/ovl_En_Slime/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Slime
-z_en_slime.c
diff --git a/src/overlays/actors/ovl_En_Snowman/overlay.cfg b/src/overlays/actors/ovl_En_Snowman/overlay.cfg
deleted file mode 100644
index 97b6aa6e91..0000000000
--- a/src/overlays/actors/ovl_En_Snowman/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Snowman
-z_en_snowman.c
diff --git a/src/overlays/actors/ovl_En_Snowwd/overlay.cfg b/src/overlays/actors/ovl_En_Snowwd/overlay.cfg
deleted file mode 100644
index 4a44958334..0000000000
--- a/src/overlays/actors/ovl_En_Snowwd/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Snowwd
-z_en_snowwd.c
diff --git a/src/overlays/actors/ovl_En_Sob1/overlay.cfg b/src/overlays/actors/ovl_En_Sob1/overlay.cfg
deleted file mode 100644
index cd2fa2a2ea..0000000000
--- a/src/overlays/actors/ovl_En_Sob1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sob1
-z_en_sob1.c
diff --git a/src/overlays/actors/ovl_En_Ssh/overlay.cfg b/src/overlays/actors/ovl_En_Ssh/overlay.cfg
deleted file mode 100644
index f8a88c0bed..0000000000
--- a/src/overlays/actors/ovl_En_Ssh/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Ssh
-z_en_ssh.c
diff --git a/src/overlays/actors/ovl_En_St/overlay.cfg b/src/overlays/actors/ovl_En_St/overlay.cfg
deleted file mode 100644
index b384f8265a..0000000000
--- a/src/overlays/actors/ovl_En_St/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_St
-z_en_st.c
diff --git a/src/overlays/actors/ovl_En_Sth/overlay.cfg b/src/overlays/actors/ovl_En_Sth/overlay.cfg
deleted file mode 100644
index 9420fb8f13..0000000000
--- a/src/overlays/actors/ovl_En_Sth/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sth
-z_en_sth.c
diff --git a/src/overlays/actors/ovl_En_Sth2/overlay.cfg b/src/overlays/actors/ovl_En_Sth2/overlay.cfg
deleted file mode 100644
index 594b965737..0000000000
--- a/src/overlays/actors/ovl_En_Sth2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sth2
-z_en_sth2.c
diff --git a/src/overlays/actors/ovl_En_Stone_heishi/overlay.cfg b/src/overlays/actors/ovl_En_Stone_heishi/overlay.cfg
deleted file mode 100644
index 743a4bb0f1..0000000000
--- a/src/overlays/actors/ovl_En_Stone_heishi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Stone_heishi
-z_en_stone_heishi.c
diff --git a/src/overlays/actors/ovl_En_Stop_heishi/overlay.cfg b/src/overlays/actors/ovl_En_Stop_heishi/overlay.cfg
deleted file mode 100644
index cf5960b30a..0000000000
--- a/src/overlays/actors/ovl_En_Stop_heishi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Stop_heishi
-z_en_stop_heishi.c
diff --git a/src/overlays/actors/ovl_En_Stream/overlay.cfg b/src/overlays/actors/ovl_En_Stream/overlay.cfg
deleted file mode 100644
index 3789ae1fee..0000000000
--- a/src/overlays/actors/ovl_En_Stream/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Stream
-z_en_stream.c
diff --git a/src/overlays/actors/ovl_En_Suttari/overlay.cfg b/src/overlays/actors/ovl_En_Suttari/overlay.cfg
deleted file mode 100644
index 9eea97af53..0000000000
--- a/src/overlays/actors/ovl_En_Suttari/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Suttari
-z_en_suttari.c
diff --git a/src/overlays/actors/ovl_En_Sw/overlay.cfg b/src/overlays/actors/ovl_En_Sw/overlay.cfg
deleted file mode 100644
index af7fca6eaa..0000000000
--- a/src/overlays/actors/ovl_En_Sw/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Sw
-z_en_sw.c
diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Crow/overlay.cfg
deleted file mode 100644
index 5a90d72e02..0000000000
--- a/src/overlays/actors/ovl_En_Syateki_Crow/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Syateki_Crow
-z_en_syateki_crow.c
diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Dekunuts/overlay.cfg
deleted file mode 100644
index 1165e9df02..0000000000
--- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Syateki_Dekunuts
-z_en_syateki_dekunuts.c
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Man/overlay.cfg
deleted file mode 100644
index 492b143b5c..0000000000
--- a/src/overlays/actors/ovl_En_Syateki_Man/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Syateki_Man
-z_en_syateki_man.c
diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Okuta/overlay.cfg
deleted file mode 100644
index 5c4c2e7c53..0000000000
--- a/src/overlays/actors/ovl_En_Syateki_Okuta/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Syateki_Okuta
-z_en_syateki_okuta.c
diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Wf/overlay.cfg
deleted file mode 100644
index 4a5373e732..0000000000
--- a/src/overlays/actors/ovl_En_Syateki_Wf/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Syateki_Wf
-z_en_syateki_wf.c
diff --git a/src/overlays/actors/ovl_En_Tab/overlay.cfg b/src/overlays/actors/ovl_En_Tab/overlay.cfg
deleted file mode 100644
index 2342018302..0000000000
--- a/src/overlays/actors/ovl_En_Tab/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tab
-z_en_tab.c
diff --git a/src/overlays/actors/ovl_En_Tag_Obj/overlay.cfg b/src/overlays/actors/ovl_En_Tag_Obj/overlay.cfg
deleted file mode 100644
index 0939c8b841..0000000000
--- a/src/overlays/actors/ovl_En_Tag_Obj/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tag_Obj
-z_en_tag_obj.c
diff --git a/src/overlays/actors/ovl_En_Takaraya/overlay.cfg b/src/overlays/actors/ovl_En_Takaraya/overlay.cfg
deleted file mode 100644
index 3fbedd25e5..0000000000
--- a/src/overlays/actors/ovl_En_Takaraya/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Takaraya
-z_en_takaraya.c
diff --git a/src/overlays/actors/ovl_En_Talk/overlay.cfg b/src/overlays/actors/ovl_En_Talk/overlay.cfg
deleted file mode 100644
index 3fed504a46..0000000000
--- a/src/overlays/actors/ovl_En_Talk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Talk
-z_en_talk.c
diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/overlay.cfg b/src/overlays/actors/ovl_En_Talk_Gibud/overlay.cfg
deleted file mode 100644
index 9f776a0932..0000000000
--- a/src/overlays/actors/ovl_En_Talk_Gibud/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Talk_Gibud
-z_en_talk_gibud.c
diff --git a/src/overlays/actors/ovl_En_Tanron1/overlay.cfg b/src/overlays/actors/ovl_En_Tanron1/overlay.cfg
deleted file mode 100644
index 5a6959a4e4..0000000000
--- a/src/overlays/actors/ovl_En_Tanron1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tanron1
-z_en_tanron1.c
diff --git a/src/overlays/actors/ovl_En_Tanron2/overlay.cfg b/src/overlays/actors/ovl_En_Tanron2/overlay.cfg
deleted file mode 100644
index c585d560b3..0000000000
--- a/src/overlays/actors/ovl_En_Tanron2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tanron2
-z_en_tanron2.c
diff --git a/src/overlays/actors/ovl_En_Tanron3/overlay.cfg b/src/overlays/actors/ovl_En_Tanron3/overlay.cfg
deleted file mode 100644
index 1084615efe..0000000000
--- a/src/overlays/actors/ovl_En_Tanron3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tanron3
-z_en_tanron3.c
diff --git a/src/overlays/actors/ovl_En_Tanron4/overlay.cfg b/src/overlays/actors/ovl_En_Tanron4/overlay.cfg
deleted file mode 100644
index 734d70ac7d..0000000000
--- a/src/overlays/actors/ovl_En_Tanron4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tanron4
-z_en_tanron4.c
diff --git a/src/overlays/actors/ovl_En_Tanron5/overlay.cfg b/src/overlays/actors/ovl_En_Tanron5/overlay.cfg
deleted file mode 100644
index 4a522458e8..0000000000
--- a/src/overlays/actors/ovl_En_Tanron5/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tanron5
-z_en_tanron5.c
diff --git a/src/overlays/actors/ovl_En_Tanron6/overlay.cfg b/src/overlays/actors/ovl_En_Tanron6/overlay.cfg
deleted file mode 100644
index 2e81ae1217..0000000000
--- a/src/overlays/actors/ovl_En_Tanron6/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tanron6
-z_en_tanron6.c
diff --git a/src/overlays/actors/ovl_En_Test/overlay.cfg b/src/overlays/actors/ovl_En_Test/overlay.cfg
deleted file mode 100644
index 3f264536a7..0000000000
--- a/src/overlays/actors/ovl_En_Test/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Test
-z_en_test.c
diff --git a/src/overlays/actors/ovl_En_Test2/overlay.cfg b/src/overlays/actors/ovl_En_Test2/overlay.cfg
deleted file mode 100644
index 8a698679cd..0000000000
--- a/src/overlays/actors/ovl_En_Test2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Test2
-z_en_test2.c
diff --git a/src/overlays/actors/ovl_En_Test3/overlay.cfg b/src/overlays/actors/ovl_En_Test3/overlay.cfg
deleted file mode 100644
index 25736e068d..0000000000
--- a/src/overlays/actors/ovl_En_Test3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Test3
-z_en_test3.c
diff --git a/src/overlays/actors/ovl_En_Test4/overlay.cfg b/src/overlays/actors/ovl_En_Test4/overlay.cfg
deleted file mode 100644
index 06bfe78393..0000000000
--- a/src/overlays/actors/ovl_En_Test4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Test4
-z_en_test4.c
diff --git a/src/overlays/actors/ovl_En_Test5/overlay.cfg b/src/overlays/actors/ovl_En_Test5/overlay.cfg
deleted file mode 100644
index 9ad6cee31d..0000000000
--- a/src/overlays/actors/ovl_En_Test5/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Test5
-z_en_test5.c
diff --git a/src/overlays/actors/ovl_En_Test6/overlay.cfg b/src/overlays/actors/ovl_En_Test6/overlay.cfg
deleted file mode 100644
index 35635730d5..0000000000
--- a/src/overlays/actors/ovl_En_Test6/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Test6
-z_en_test6.c
diff --git a/src/overlays/actors/ovl_En_Test7/overlay.cfg b/src/overlays/actors/ovl_En_Test7/overlay.cfg
deleted file mode 100644
index 5a898f7c09..0000000000
--- a/src/overlays/actors/ovl_En_Test7/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Test7
-z_en_test7.c
diff --git a/src/overlays/actors/ovl_En_Tg/overlay.cfg b/src/overlays/actors/ovl_En_Tg/overlay.cfg
deleted file mode 100644
index 99ad048ba3..0000000000
--- a/src/overlays/actors/ovl_En_Tg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tg
-z_en_tg.c
diff --git a/src/overlays/actors/ovl_En_Thiefbird/overlay.cfg b/src/overlays/actors/ovl_En_Thiefbird/overlay.cfg
deleted file mode 100644
index f469c156a6..0000000000
--- a/src/overlays/actors/ovl_En_Thiefbird/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Thiefbird
-z_en_thiefbird.c
diff --git a/src/overlays/actors/ovl_En_Time_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Time_Tag/overlay.cfg
deleted file mode 100644
index 9759bee865..0000000000
--- a/src/overlays/actors/ovl_En_Time_Tag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Time_Tag
-z_en_time_tag.c
diff --git a/src/overlays/actors/ovl_En_Tite/overlay.cfg b/src/overlays/actors/ovl_En_Tite/overlay.cfg
deleted file mode 100644
index 0d91c61fe0..0000000000
--- a/src/overlays/actors/ovl_En_Tite/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tite
-z_en_tite.c
diff --git a/src/overlays/actors/ovl_En_Tk/overlay.cfg b/src/overlays/actors/ovl_En_Tk/overlay.cfg
deleted file mode 100644
index a7ca23e6e7..0000000000
--- a/src/overlays/actors/ovl_En_Tk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tk
-z_en_tk.c
diff --git a/src/overlays/actors/ovl_En_Torch/overlay.cfg b/src/overlays/actors/ovl_En_Torch/overlay.cfg
deleted file mode 100644
index 0815135431..0000000000
--- a/src/overlays/actors/ovl_En_Torch/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Torch
-z_en_torch.c
diff --git a/src/overlays/actors/ovl_En_Torch2/overlay.cfg b/src/overlays/actors/ovl_En_Torch2/overlay.cfg
deleted file mode 100644
index 25ddefa7f1..0000000000
--- a/src/overlays/actors/ovl_En_Torch2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Torch2
-z_en_torch2.c
diff --git a/src/overlays/actors/ovl_En_Toto/overlay.cfg b/src/overlays/actors/ovl_En_Toto/overlay.cfg
deleted file mode 100644
index 48534631ec..0000000000
--- a/src/overlays/actors/ovl_En_Toto/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Toto
-z_en_toto.c
diff --git a/src/overlays/actors/ovl_En_Trt/overlay.cfg b/src/overlays/actors/ovl_En_Trt/overlay.cfg
deleted file mode 100644
index d0b1d075f4..0000000000
--- a/src/overlays/actors/ovl_En_Trt/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Trt
-z_en_trt.c
diff --git a/src/overlays/actors/ovl_En_Trt2/overlay.cfg b/src/overlays/actors/ovl_En_Trt2/overlay.cfg
deleted file mode 100644
index 60a280872a..0000000000
--- a/src/overlays/actors/ovl_En_Trt2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Trt2
-z_en_trt2.c
diff --git a/src/overlays/actors/ovl_En_Tru/overlay.cfg b/src/overlays/actors/ovl_En_Tru/overlay.cfg
deleted file mode 100644
index 49e1ffdd98..0000000000
--- a/src/overlays/actors/ovl_En_Tru/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tru
-z_en_tru.c
diff --git a/src/overlays/actors/ovl_En_Tru_Mt/overlay.cfg b/src/overlays/actors/ovl_En_Tru_Mt/overlay.cfg
deleted file mode 100644
index 8c432043ff..0000000000
--- a/src/overlays/actors/ovl_En_Tru_Mt/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tru_Mt
-z_en_tru_mt.c
diff --git a/src/overlays/actors/ovl_En_Tsn/overlay.cfg b/src/overlays/actors/ovl_En_Tsn/overlay.cfg
deleted file mode 100644
index 7c91103898..0000000000
--- a/src/overlays/actors/ovl_En_Tsn/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tsn
-z_en_tsn.c
diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/overlay.cfg b/src/overlays/actors/ovl_En_Tubo_Trap/overlay.cfg
deleted file mode 100644
index 364d4c7e9b..0000000000
--- a/src/overlays/actors/ovl_En_Tubo_Trap/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Tubo_Trap
-z_en_tubo_trap.c
diff --git a/src/overlays/actors/ovl_En_Twig/overlay.cfg b/src/overlays/actors/ovl_En_Twig/overlay.cfg
deleted file mode 100644
index 29491912c0..0000000000
--- a/src/overlays/actors/ovl_En_Twig/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Twig
-z_en_twig.c
diff --git a/src/overlays/actors/ovl_En_Viewer/overlay.cfg b/src/overlays/actors/ovl_En_Viewer/overlay.cfg
deleted file mode 100644
index 3faa113d44..0000000000
--- a/src/overlays/actors/ovl_En_Viewer/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Viewer
-z_en_viewer.c
diff --git a/src/overlays/actors/ovl_En_Vm/overlay.cfg b/src/overlays/actors/ovl_En_Vm/overlay.cfg
deleted file mode 100644
index 7c1774086f..0000000000
--- a/src/overlays/actors/ovl_En_Vm/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Vm
-z_en_vm.c
diff --git a/src/overlays/actors/ovl_En_Wallmas/overlay.cfg b/src/overlays/actors/ovl_En_Wallmas/overlay.cfg
deleted file mode 100644
index badbf57d02..0000000000
--- a/src/overlays/actors/ovl_En_Wallmas/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Wallmas
-z_en_wallmas.c
diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/overlay.cfg b/src/overlays/actors/ovl_En_Warp_Uzu/overlay.cfg
deleted file mode 100644
index 833f1a0b61..0000000000
--- a/src/overlays/actors/ovl_En_Warp_Uzu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Warp_Uzu
-z_en_warp_uzu.c
diff --git a/src/overlays/actors/ovl_En_Warp_tag/overlay.cfg b/src/overlays/actors/ovl_En_Warp_tag/overlay.cfg
deleted file mode 100644
index a70ec6a5c2..0000000000
--- a/src/overlays/actors/ovl_En_Warp_tag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Warp_tag
-z_en_warp_tag.c
diff --git a/src/overlays/actors/ovl_En_Water_Effect/overlay.cfg b/src/overlays/actors/ovl_En_Water_Effect/overlay.cfg
deleted file mode 100644
index 7aac8fdd83..0000000000
--- a/src/overlays/actors/ovl_En_Water_Effect/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Water_Effect
-z_en_water_effect.c
diff --git a/src/overlays/actors/ovl_En_Wdhand/overlay.cfg b/src/overlays/actors/ovl_En_Wdhand/overlay.cfg
deleted file mode 100644
index 501a7b6ed8..0000000000
--- a/src/overlays/actors/ovl_En_Wdhand/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Wdhand
-z_en_wdhand.c
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Weather_Tag/overlay.cfg
deleted file mode 100644
index 9b75932442..0000000000
--- a/src/overlays/actors/ovl_En_Weather_Tag/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Weather_Tag
-z_en_weather_tag.c
diff --git a/src/overlays/actors/ovl_En_Wf/overlay.cfg b/src/overlays/actors/ovl_En_Wf/overlay.cfg
deleted file mode 100644
index d24cd8a277..0000000000
--- a/src/overlays/actors/ovl_En_Wf/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Wf
-z_en_wf.c
diff --git a/src/overlays/actors/ovl_En_Wiz/overlay.cfg b/src/overlays/actors/ovl_En_Wiz/overlay.cfg
deleted file mode 100644
index a52f236dcf..0000000000
--- a/src/overlays/actors/ovl_En_Wiz/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Wiz
-z_en_wiz.c
diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/overlay.cfg b/src/overlays/actors/ovl_En_Wiz_Brock/overlay.cfg
deleted file mode 100644
index 8976343c87..0000000000
--- a/src/overlays/actors/ovl_En_Wiz_Brock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Wiz_Brock
-z_en_wiz_brock.c
diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/overlay.cfg b/src/overlays/actors/ovl_En_Wiz_Fire/overlay.cfg
deleted file mode 100644
index 47aa9022a7..0000000000
--- a/src/overlays/actors/ovl_En_Wiz_Fire/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Wiz_Fire
-z_en_wiz_fire.c
diff --git a/src/overlays/actors/ovl_En_Wood02/overlay.cfg b/src/overlays/actors/ovl_En_Wood02/overlay.cfg
deleted file mode 100644
index 52dbc67e44..0000000000
--- a/src/overlays/actors/ovl_En_Wood02/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Wood02
-z_en_wood02.c
diff --git a/src/overlays/actors/ovl_En_Yb/overlay.cfg b/src/overlays/actors/ovl_En_Yb/overlay.cfg
deleted file mode 100644
index 5293ea603c..0000000000
--- a/src/overlays/actors/ovl_En_Yb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Yb
-z_en_yb.c
diff --git a/src/overlays/actors/ovl_En_Zl1/overlay.cfg b/src/overlays/actors/ovl_En_Zl1/overlay.cfg
deleted file mode 100644
index 188c2f1d51..0000000000
--- a/src/overlays/actors/ovl_En_Zl1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zl1
-z_en_zl1.c
diff --git a/src/overlays/actors/ovl_En_Zl4/overlay.cfg b/src/overlays/actors/ovl_En_Zl4/overlay.cfg
deleted file mode 100644
index 91cec56107..0000000000
--- a/src/overlays/actors/ovl_En_Zl4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zl4
-z_en_zl4.c
diff --git a/src/overlays/actors/ovl_En_Zo/overlay.cfg b/src/overlays/actors/ovl_En_Zo/overlay.cfg
deleted file mode 100644
index eeedbff837..0000000000
--- a/src/overlays/actors/ovl_En_Zo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zo
-z_en_zo.c
diff --git a/src/overlays/actors/ovl_En_Zob/overlay.cfg b/src/overlays/actors/ovl_En_Zob/overlay.cfg
deleted file mode 100644
index e8a11666fc..0000000000
--- a/src/overlays/actors/ovl_En_Zob/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zob
-z_en_zob.c
diff --git a/src/overlays/actors/ovl_En_Zod/overlay.cfg b/src/overlays/actors/ovl_En_Zod/overlay.cfg
deleted file mode 100644
index 8acdefc35f..0000000000
--- a/src/overlays/actors/ovl_En_Zod/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zod
-z_en_zod.c
diff --git a/src/overlays/actors/ovl_En_Zog/overlay.cfg b/src/overlays/actors/ovl_En_Zog/overlay.cfg
deleted file mode 100644
index fe913a71e4..0000000000
--- a/src/overlays/actors/ovl_En_Zog/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zog
-z_en_zog.c
diff --git a/src/overlays/actors/ovl_En_Zoraegg/overlay.cfg b/src/overlays/actors/ovl_En_Zoraegg/overlay.cfg
deleted file mode 100644
index f7f5fde0b1..0000000000
--- a/src/overlays/actors/ovl_En_Zoraegg/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zoraegg
-z_en_zoraegg.c
diff --git a/src/overlays/actors/ovl_En_Zos/overlay.cfg b/src/overlays/actors/ovl_En_Zos/overlay.cfg
deleted file mode 100644
index a83ca10170..0000000000
--- a/src/overlays/actors/ovl_En_Zos/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zos
-z_en_zos.c
diff --git a/src/overlays/actors/ovl_En_Zot/overlay.cfg b/src/overlays/actors/ovl_En_Zot/overlay.cfg
deleted file mode 100644
index 0d4db225f4..0000000000
--- a/src/overlays/actors/ovl_En_Zot/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zot
-z_en_zot.c
diff --git a/src/overlays/actors/ovl_En_Zov/overlay.cfg b/src/overlays/actors/ovl_En_Zov/overlay.cfg
deleted file mode 100644
index 6e8d4a17a5..0000000000
--- a/src/overlays/actors/ovl_En_Zov/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zov
-z_en_zov.c
diff --git a/src/overlays/actors/ovl_En_Zow/overlay.cfg b/src/overlays/actors/ovl_En_Zow/overlay.cfg
deleted file mode 100644
index ba17bffc79..0000000000
--- a/src/overlays/actors/ovl_En_Zow/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_En_Zow
-z_en_zow.c
diff --git a/src/overlays/actors/ovl_Item_B_Heart/overlay.cfg b/src/overlays/actors/ovl_Item_B_Heart/overlay.cfg
deleted file mode 100644
index 092976e2b5..0000000000
--- a/src/overlays/actors/ovl_Item_B_Heart/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Item_B_Heart
-z_item_b_heart.c
diff --git a/src/overlays/actors/ovl_Item_Etcetera/overlay.cfg b/src/overlays/actors/ovl_Item_Etcetera/overlay.cfg
deleted file mode 100644
index bf610d3f65..0000000000
--- a/src/overlays/actors/ovl_Item_Etcetera/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Item_Etcetera
-z_item_etcetera.c
diff --git a/src/overlays/actors/ovl_Item_Inbox/overlay.cfg b/src/overlays/actors/ovl_Item_Inbox/overlay.cfg
deleted file mode 100644
index e6d4ee8244..0000000000
--- a/src/overlays/actors/ovl_Item_Inbox/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Item_Inbox
-z_item_inbox.c
diff --git a/src/overlays/actors/ovl_Mir_Ray/overlay.cfg b/src/overlays/actors/ovl_Mir_Ray/overlay.cfg
deleted file mode 100644
index 9010673e36..0000000000
--- a/src/overlays/actors/ovl_Mir_Ray/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Mir_Ray
-z_mir_ray.c
diff --git a/src/overlays/actors/ovl_Mir_Ray2/overlay.cfg b/src/overlays/actors/ovl_Mir_Ray2/overlay.cfg
deleted file mode 100644
index 2a1947005c..0000000000
--- a/src/overlays/actors/ovl_Mir_Ray2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Mir_Ray2
-z_mir_ray2.c
diff --git a/src/overlays/actors/ovl_Mir_Ray3/overlay.cfg b/src/overlays/actors/ovl_Mir_Ray3/overlay.cfg
deleted file mode 100644
index b2553ef0fe..0000000000
--- a/src/overlays/actors/ovl_Mir_Ray3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Mir_Ray3
-z_mir_ray3.c
diff --git a/src/overlays/actors/ovl_Obj_Aqua/overlay.cfg b/src/overlays/actors/ovl_Obj_Aqua/overlay.cfg
deleted file mode 100644
index fa2c65abcd..0000000000
--- a/src/overlays/actors/ovl_Obj_Aqua/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Aqua
-z_obj_aqua.c
diff --git a/src/overlays/actors/ovl_Obj_Armos/overlay.cfg b/src/overlays/actors/ovl_Obj_Armos/overlay.cfg
deleted file mode 100644
index 1b54f7a3e0..0000000000
--- a/src/overlays/actors/ovl_Obj_Armos/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Armos
-z_obj_armos.c
diff --git a/src/overlays/actors/ovl_Obj_Bean/overlay.cfg b/src/overlays/actors/ovl_Obj_Bean/overlay.cfg
deleted file mode 100644
index 24317cd060..0000000000
--- a/src/overlays/actors/ovl_Obj_Bean/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Bean
-z_obj_bean.c
diff --git a/src/overlays/actors/ovl_Obj_Bell/overlay.cfg b/src/overlays/actors/ovl_Obj_Bell/overlay.cfg
deleted file mode 100644
index 40a295642b..0000000000
--- a/src/overlays/actors/ovl_Obj_Bell/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Bell
-z_obj_bell.c
diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/overlay.cfg b/src/overlays/actors/ovl_Obj_Bigicicle/overlay.cfg
deleted file mode 100644
index 7f70ff3502..0000000000
--- a/src/overlays/actors/ovl_Obj_Bigicicle/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Bigicicle
-z_obj_bigicicle.c
diff --git a/src/overlays/actors/ovl_Obj_Blockstop/overlay.cfg b/src/overlays/actors/ovl_Obj_Blockstop/overlay.cfg
deleted file mode 100644
index 0c337eb0e6..0000000000
--- a/src/overlays/actors/ovl_Obj_Blockstop/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Blockstop
-z_obj_blockstop.c
diff --git a/src/overlays/actors/ovl_Obj_Boat/overlay.cfg b/src/overlays/actors/ovl_Obj_Boat/overlay.cfg
deleted file mode 100644
index 8617a82288..0000000000
--- a/src/overlays/actors/ovl_Obj_Boat/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Boat
-z_obj_boat.c
diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/overlay.cfg b/src/overlays/actors/ovl_Obj_Bombiwa/overlay.cfg
deleted file mode 100644
index d18e4301f3..0000000000
--- a/src/overlays/actors/ovl_Obj_Bombiwa/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Bombiwa
-z_obj_bombiwa.c
diff --git a/src/overlays/actors/ovl_Obj_Boyo/overlay.cfg b/src/overlays/actors/ovl_Obj_Boyo/overlay.cfg
deleted file mode 100644
index c024ce5ed8..0000000000
--- a/src/overlays/actors/ovl_Obj_Boyo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Boyo
-z_obj_boyo.c
diff --git a/src/overlays/actors/ovl_Obj_Chan/overlay.cfg b/src/overlays/actors/ovl_Obj_Chan/overlay.cfg
deleted file mode 100644
index 6480f28ff6..0000000000
--- a/src/overlays/actors/ovl_Obj_Chan/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Chan
-z_obj_chan.c
diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/overlay.cfg b/src/overlays/actors/ovl_Obj_Chikuwa/overlay.cfg
deleted file mode 100644
index d2599907ae..0000000000
--- a/src/overlays/actors/ovl_Obj_Chikuwa/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Chikuwa
-z_obj_chikuwa.c
diff --git a/src/overlays/actors/ovl_Obj_Comb/overlay.cfg b/src/overlays/actors/ovl_Obj_Comb/overlay.cfg
deleted file mode 100644
index 69f62abc44..0000000000
--- a/src/overlays/actors/ovl_Obj_Comb/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Comb
-z_obj_comb.c
diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/overlay.cfg b/src/overlays/actors/ovl_Obj_Danpeilift/overlay.cfg
deleted file mode 100644
index d2836d0123..0000000000
--- a/src/overlays/actors/ovl_Obj_Danpeilift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Danpeilift
-z_obj_danpeilift.c
diff --git a/src/overlays/actors/ovl_Obj_Demo/overlay.cfg b/src/overlays/actors/ovl_Obj_Demo/overlay.cfg
deleted file mode 100644
index feba3b348c..0000000000
--- a/src/overlays/actors/ovl_Obj_Demo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Demo
-z_obj_demo.c
diff --git a/src/overlays/actors/ovl_Obj_Dhouse/overlay.cfg b/src/overlays/actors/ovl_Obj_Dhouse/overlay.cfg
deleted file mode 100644
index 0e58d06667..0000000000
--- a/src/overlays/actors/ovl_Obj_Dhouse/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Dhouse
-z_obj_dhouse.c
diff --git a/src/overlays/actors/ovl_Obj_Dinner/overlay.cfg b/src/overlays/actors/ovl_Obj_Dinner/overlay.cfg
deleted file mode 100644
index 3fc58dccdf..0000000000
--- a/src/overlays/actors/ovl_Obj_Dinner/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Dinner
-z_obj_dinner.c
diff --git a/src/overlays/actors/ovl_Obj_Dora/overlay.cfg b/src/overlays/actors/ovl_Obj_Dora/overlay.cfg
deleted file mode 100644
index 1bb5f302a3..0000000000
--- a/src/overlays/actors/ovl_Obj_Dora/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Dora
-z_obj_dora.c
diff --git a/src/overlays/actors/ovl_Obj_Dowsing/overlay.cfg b/src/overlays/actors/ovl_Obj_Dowsing/overlay.cfg
deleted file mode 100644
index e8dbfc20ae..0000000000
--- a/src/overlays/actors/ovl_Obj_Dowsing/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Dowsing
-z_obj_dowsing.c
diff --git a/src/overlays/actors/ovl_Obj_Driftice/overlay.cfg b/src/overlays/actors/ovl_Obj_Driftice/overlay.cfg
deleted file mode 100644
index 1b85d29a1d..0000000000
--- a/src/overlays/actors/ovl_Obj_Driftice/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Driftice
-z_obj_driftice.c
diff --git a/src/overlays/actors/ovl_Obj_Ending/overlay.cfg b/src/overlays/actors/ovl_Obj_Ending/overlay.cfg
deleted file mode 100644
index 4930e52266..0000000000
--- a/src/overlays/actors/ovl_Obj_Ending/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Ending
-z_obj_ending.c
diff --git a/src/overlays/actors/ovl_Obj_Entotu/overlay.cfg b/src/overlays/actors/ovl_Obj_Entotu/overlay.cfg
deleted file mode 100644
index 55d5ebe5f9..0000000000
--- a/src/overlays/actors/ovl_Obj_Entotu/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Entotu
-z_obj_entotu.c
diff --git a/src/overlays/actors/ovl_Obj_Etcetera/overlay.cfg b/src/overlays/actors/ovl_Obj_Etcetera/overlay.cfg
deleted file mode 100644
index d8a2390689..0000000000
--- a/src/overlays/actors/ovl_Obj_Etcetera/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Etcetera
-z_obj_etcetera.c
diff --git a/src/overlays/actors/ovl_Obj_Fireshield/overlay.cfg b/src/overlays/actors/ovl_Obj_Fireshield/overlay.cfg
deleted file mode 100644
index e5006379ab..0000000000
--- a/src/overlays/actors/ovl_Obj_Fireshield/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Fireshield
-z_obj_fireshield.c
diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/overlay.cfg b/src/overlays/actors/ovl_Obj_Flowerpot/overlay.cfg
deleted file mode 100644
index f6aa9dc164..0000000000
--- a/src/overlays/actors/ovl_Obj_Flowerpot/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Flowerpot
-z_obj_flowerpot.c
diff --git a/src/overlays/actors/ovl_Obj_Funen/overlay.cfg b/src/overlays/actors/ovl_Obj_Funen/overlay.cfg
deleted file mode 100644
index e67ba5e19a..0000000000
--- a/src/overlays/actors/ovl_Obj_Funen/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Funen
-z_obj_funen.c
diff --git a/src/overlays/actors/ovl_Obj_Ghaka/overlay.cfg b/src/overlays/actors/ovl_Obj_Ghaka/overlay.cfg
deleted file mode 100644
index c760e169fb..0000000000
--- a/src/overlays/actors/ovl_Obj_Ghaka/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Ghaka
-z_obj_ghaka.c
diff --git a/src/overlays/actors/ovl_Obj_Grass/overlay.cfg b/src/overlays/actors/ovl_Obj_Grass/overlay.cfg
deleted file mode 100644
index 6aec3207dd..0000000000
--- a/src/overlays/actors/ovl_Obj_Grass/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Grass
-z_obj_grass.c
diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/overlay.cfg b/src/overlays/actors/ovl_Obj_Grass_Carry/overlay.cfg
deleted file mode 100644
index 41ae3cfcda..0000000000
--- a/src/overlays/actors/ovl_Obj_Grass_Carry/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Grass_Carry
-z_obj_grass_carry.c
diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/overlay.cfg b/src/overlays/actors/ovl_Obj_Grass_Unit/overlay.cfg
deleted file mode 100644
index d67028b99e..0000000000
--- a/src/overlays/actors/ovl_Obj_Grass_Unit/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Grass_Unit
-z_obj_grass_unit.c
diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/overlay.cfg b/src/overlays/actors/ovl_Obj_Hakaisi/overlay.cfg
deleted file mode 100644
index 5d1fb24adf..0000000000
--- a/src/overlays/actors/ovl_Obj_Hakaisi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Hakaisi
-z_obj_hakaisi.c
diff --git a/src/overlays/actors/ovl_Obj_Hamishi/overlay.cfg b/src/overlays/actors/ovl_Obj_Hamishi/overlay.cfg
deleted file mode 100644
index 902311cdcf..0000000000
--- a/src/overlays/actors/ovl_Obj_Hamishi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Hamishi
-z_obj_hamishi.c
diff --git a/src/overlays/actors/ovl_Obj_Hana/overlay.cfg b/src/overlays/actors/ovl_Obj_Hana/overlay.cfg
deleted file mode 100644
index 8d04d632c0..0000000000
--- a/src/overlays/actors/ovl_Obj_Hana/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Hana
-z_obj_hana.c
diff --git a/src/overlays/actors/ovl_Obj_Hariko/overlay.cfg b/src/overlays/actors/ovl_Obj_Hariko/overlay.cfg
deleted file mode 100644
index 98c352eb49..0000000000
--- a/src/overlays/actors/ovl_Obj_Hariko/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Hariko
-z_obj_hariko.c
diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/overlay.cfg b/src/overlays/actors/ovl_Obj_Hgdoor/overlay.cfg
deleted file mode 100644
index 4bd3103fbf..0000000000
--- a/src/overlays/actors/ovl_Obj_Hgdoor/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Hgdoor
-z_obj_hgdoor.c
diff --git a/src/overlays/actors/ovl_Obj_HsStump/overlay.cfg b/src/overlays/actors/ovl_Obj_HsStump/overlay.cfg
deleted file mode 100644
index ddf618a65d..0000000000
--- a/src/overlays/actors/ovl_Obj_HsStump/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_HsStump
-z_obj_hsstump.c
diff --git a/src/overlays/actors/ovl_Obj_Hsblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Hsblock/overlay.cfg
deleted file mode 100644
index 19cd6470bf..0000000000
--- a/src/overlays/actors/ovl_Obj_Hsblock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Hsblock
-z_obj_hsblock.c
diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/overlay.cfg b/src/overlays/actors/ovl_Obj_Hugebombiwa/overlay.cfg
deleted file mode 100644
index baf0417f66..0000000000
--- a/src/overlays/actors/ovl_Obj_Hugebombiwa/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Hugebombiwa
-z_obj_hugebombiwa.c
diff --git a/src/overlays/actors/ovl_Obj_Hunsui/overlay.cfg b/src/overlays/actors/ovl_Obj_Hunsui/overlay.cfg
deleted file mode 100644
index 939fc35641..0000000000
--- a/src/overlays/actors/ovl_Obj_Hunsui/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Hunsui
-z_obj_hunsui.c
diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/overlay.cfg b/src/overlays/actors/ovl_Obj_Ice_Poly/overlay.cfg
deleted file mode 100644
index d77c80fcbf..0000000000
--- a/src/overlays/actors/ovl_Obj_Ice_Poly/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Ice_Poly
-z_obj_ice_poly.c
diff --git a/src/overlays/actors/ovl_Obj_Iceblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Iceblock/overlay.cfg
deleted file mode 100644
index a72f4e3c80..0000000000
--- a/src/overlays/actors/ovl_Obj_Iceblock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Iceblock
-z_obj_iceblock.c
diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/overlay.cfg b/src/overlays/actors/ovl_Obj_Jg_Gakki/overlay.cfg
deleted file mode 100644
index f4ae147d73..0000000000
--- a/src/overlays/actors/ovl_Obj_Jg_Gakki/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Jg_Gakki
-z_obj_jg_gakki.c
diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/overlay.cfg b/src/overlays/actors/ovl_Obj_Jgame_Light/overlay.cfg
deleted file mode 100644
index 932e67c12e..0000000000
--- a/src/overlays/actors/ovl_Obj_Jgame_Light/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Jgame_Light
-z_obj_jgame_light.c
diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/overlay.cfg b/src/overlays/actors/ovl_Obj_Kendo_Kanban/overlay.cfg
deleted file mode 100644
index e1992b42b3..0000000000
--- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Kendo_Kanban
-z_obj_kendo_kanban.c
diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/overlay.cfg b/src/overlays/actors/ovl_Obj_Kepn_Koya/overlay.cfg
deleted file mode 100644
index 8a6c7b560d..0000000000
--- a/src/overlays/actors/ovl_Obj_Kepn_Koya/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Kepn_Koya
-z_obj_kepn_koya.c
diff --git a/src/overlays/actors/ovl_Obj_Kibako/overlay.cfg b/src/overlays/actors/ovl_Obj_Kibako/overlay.cfg
deleted file mode 100644
index d0a8b240a3..0000000000
--- a/src/overlays/actors/ovl_Obj_Kibako/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Kibako
-z_obj_kibako.c
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/overlay.cfg b/src/overlays/actors/ovl_Obj_Kibako2/overlay.cfg
deleted file mode 100644
index 436504fc83..0000000000
--- a/src/overlays/actors/ovl_Obj_Kibako2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Kibako2
-z_obj_kibako2.c
diff --git a/src/overlays/actors/ovl_Obj_Kinoko/overlay.cfg b/src/overlays/actors/ovl_Obj_Kinoko/overlay.cfg
deleted file mode 100644
index 071ad6a34d..0000000000
--- a/src/overlays/actors/ovl_Obj_Kinoko/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Kinoko
-z_obj_kinoko.c
diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/overlay.cfg b/src/overlays/actors/ovl_Obj_Kzsaku/overlay.cfg
deleted file mode 100644
index c2a20d7055..0000000000
--- a/src/overlays/actors/ovl_Obj_Kzsaku/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Kzsaku
-z_obj_kzsaku.c
diff --git a/src/overlays/actors/ovl_Obj_Lift/overlay.cfg b/src/overlays/actors/ovl_Obj_Lift/overlay.cfg
deleted file mode 100644
index fca4821746..0000000000
--- a/src/overlays/actors/ovl_Obj_Lift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Lift
-z_obj_lift.c
diff --git a/src/overlays/actors/ovl_Obj_Lightblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Lightblock/overlay.cfg
deleted file mode 100644
index ecf5da6faa..0000000000
--- a/src/overlays/actors/ovl_Obj_Lightblock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Lightblock
-z_obj_lightblock.c
diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/overlay.cfg b/src/overlays/actors/ovl_Obj_Lightswitch/overlay.cfg
deleted file mode 100644
index cafaebb115..0000000000
--- a/src/overlays/actors/ovl_Obj_Lightswitch/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Lightswitch
-z_obj_lightswitch.c
diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/overlay.cfg b/src/overlays/actors/ovl_Obj_Lupygamelift/overlay.cfg
deleted file mode 100644
index ad62438910..0000000000
--- a/src/overlays/actors/ovl_Obj_Lupygamelift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Lupygamelift
-z_obj_lupygamelift.c
diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/overlay.cfg b/src/overlays/actors/ovl_Obj_Makekinsuta/overlay.cfg
deleted file mode 100644
index d636029699..0000000000
--- a/src/overlays/actors/ovl_Obj_Makekinsuta/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Makekinsuta
-z_obj_makekinsuta.c
diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/overlay.cfg b/src/overlays/actors/ovl_Obj_Makeoshihiki/overlay.cfg
deleted file mode 100644
index 7d4fbe22da..0000000000
--- a/src/overlays/actors/ovl_Obj_Makeoshihiki/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Makeoshihiki
-z_obj_makeoshihiki.c
diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/overlay.cfg b/src/overlays/actors/ovl_Obj_Milk_Bin/overlay.cfg
deleted file mode 100644
index a5f995b328..0000000000
--- a/src/overlays/actors/ovl_Obj_Milk_Bin/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Milk_Bin
-z_obj_milk_bin.c
diff --git a/src/overlays/actors/ovl_Obj_Mine/overlay.cfg b/src/overlays/actors/ovl_Obj_Mine/overlay.cfg
deleted file mode 100644
index 7d0fb28e9f..0000000000
--- a/src/overlays/actors/ovl_Obj_Mine/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Mine
-z_obj_mine.c
diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/overlay.cfg b/src/overlays/actors/ovl_Obj_Moon_Stone/overlay.cfg
deleted file mode 100644
index 0b388c672f..0000000000
--- a/src/overlays/actors/ovl_Obj_Moon_Stone/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Moon_Stone
-z_obj_moon_stone.c
diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/overlay.cfg b/src/overlays/actors/ovl_Obj_Mu_Pict/overlay.cfg
deleted file mode 100644
index 77c10a6df0..0000000000
--- a/src/overlays/actors/ovl_Obj_Mu_Pict/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Mu_Pict
-z_obj_mu_pict.c
diff --git a/src/overlays/actors/ovl_Obj_Mure/overlay.cfg b/src/overlays/actors/ovl_Obj_Mure/overlay.cfg
deleted file mode 100644
index 99c755b9a0..0000000000
--- a/src/overlays/actors/ovl_Obj_Mure/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Mure
-z_obj_mure.c
diff --git a/src/overlays/actors/ovl_Obj_Mure2/overlay.cfg b/src/overlays/actors/ovl_Obj_Mure2/overlay.cfg
deleted file mode 100644
index dcb1eb3ac9..0000000000
--- a/src/overlays/actors/ovl_Obj_Mure2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Mure2
-z_obj_mure2.c
diff --git a/src/overlays/actors/ovl_Obj_Mure3/overlay.cfg b/src/overlays/actors/ovl_Obj_Mure3/overlay.cfg
deleted file mode 100644
index 7774442db7..0000000000
--- a/src/overlays/actors/ovl_Obj_Mure3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Mure3
-z_obj_mure3.c
diff --git a/src/overlays/actors/ovl_Obj_Nozoki/overlay.cfg b/src/overlays/actors/ovl_Obj_Nozoki/overlay.cfg
deleted file mode 100644
index 9173a80559..0000000000
--- a/src/overlays/actors/ovl_Obj_Nozoki/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Nozoki
-z_obj_nozoki.c
diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/overlay.cfg b/src/overlays/actors/ovl_Obj_Ocarinalift/overlay.cfg
deleted file mode 100644
index 3d9eef7c45..0000000000
--- a/src/overlays/actors/ovl_Obj_Ocarinalift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Ocarinalift
-z_obj_ocarinalift.c
diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/overlay.cfg b/src/overlays/actors/ovl_Obj_Oshihiki/overlay.cfg
deleted file mode 100644
index 48cf4049fb..0000000000
--- a/src/overlays/actors/ovl_Obj_Oshihiki/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Oshihiki
-z_obj_oshihiki.c
diff --git a/src/overlays/actors/ovl_Obj_Purify/overlay.cfg b/src/overlays/actors/ovl_Obj_Purify/overlay.cfg
deleted file mode 100644
index 966356722d..0000000000
--- a/src/overlays/actors/ovl_Obj_Purify/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Purify
-z_obj_purify.c
diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Pzlblock/overlay.cfg
deleted file mode 100644
index d2b05c1ff0..0000000000
--- a/src/overlays/actors/ovl_Obj_Pzlblock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Pzlblock
-z_obj_pzlblock.c
diff --git a/src/overlays/actors/ovl_Obj_Raillift/overlay.cfg b/src/overlays/actors/ovl_Obj_Raillift/overlay.cfg
deleted file mode 100644
index 69c3fc70c5..0000000000
--- a/src/overlays/actors/ovl_Obj_Raillift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Raillift
-z_obj_raillift.c
diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/overlay.cfg b/src/overlays/actors/ovl_Obj_Roomtimer/overlay.cfg
deleted file mode 100644
index b4eef84273..0000000000
--- a/src/overlays/actors/ovl_Obj_Roomtimer/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Roomtimer
-z_obj_roomtimer.c
diff --git a/src/overlays/actors/ovl_Obj_Rotlift/overlay.cfg b/src/overlays/actors/ovl_Obj_Rotlift/overlay.cfg
deleted file mode 100644
index 7c2884ce4a..0000000000
--- a/src/overlays/actors/ovl_Obj_Rotlift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Rotlift
-z_obj_rotlift.c
diff --git a/src/overlays/actors/ovl_Obj_Shutter/overlay.cfg b/src/overlays/actors/ovl_Obj_Shutter/overlay.cfg
deleted file mode 100644
index 9b5210eb47..0000000000
--- a/src/overlays/actors/ovl_Obj_Shutter/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Shutter
-z_obj_shutter.c
diff --git a/src/overlays/actors/ovl_Obj_Skateblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Skateblock/overlay.cfg
deleted file mode 100644
index bb4e2fec88..0000000000
--- a/src/overlays/actors/ovl_Obj_Skateblock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Skateblock
-z_obj_skateblock.c
diff --git a/src/overlays/actors/ovl_Obj_Smork/overlay.cfg b/src/overlays/actors/ovl_Obj_Smork/overlay.cfg
deleted file mode 100644
index 35a105b7d0..0000000000
--- a/src/overlays/actors/ovl_Obj_Smork/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Smork
-z_obj_smork.c
diff --git a/src/overlays/actors/ovl_Obj_Snowball/overlay.cfg b/src/overlays/actors/ovl_Obj_Snowball/overlay.cfg
deleted file mode 100644
index 45a8a39bda..0000000000
--- a/src/overlays/actors/ovl_Obj_Snowball/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Snowball
-z_obj_snowball.c
diff --git a/src/overlays/actors/ovl_Obj_Snowball2/overlay.cfg b/src/overlays/actors/ovl_Obj_Snowball2/overlay.cfg
deleted file mode 100644
index 5d740b086a..0000000000
--- a/src/overlays/actors/ovl_Obj_Snowball2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Snowball2
-z_obj_snowball2.c
diff --git a/src/overlays/actors/ovl_Obj_Sound/overlay.cfg b/src/overlays/actors/ovl_Obj_Sound/overlay.cfg
deleted file mode 100644
index d1863878bc..0000000000
--- a/src/overlays/actors/ovl_Obj_Sound/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Sound
-z_obj_sound.c
diff --git a/src/overlays/actors/ovl_Obj_Spidertent/overlay.cfg b/src/overlays/actors/ovl_Obj_Spidertent/overlay.cfg
deleted file mode 100644
index f5f13b8ad0..0000000000
--- a/src/overlays/actors/ovl_Obj_Spidertent/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Spidertent
-z_obj_spidertent.c
diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/overlay.cfg b/src/overlays/actors/ovl_Obj_Spinyroll/overlay.cfg
deleted file mode 100644
index 38ea69b6d7..0000000000
--- a/src/overlays/actors/ovl_Obj_Spinyroll/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Spinyroll
-z_obj_spinyroll.c
diff --git a/src/overlays/actors/ovl_Obj_Switch/overlay.cfg b/src/overlays/actors/ovl_Obj_Switch/overlay.cfg
deleted file mode 100644
index 683d4ae005..0000000000
--- a/src/overlays/actors/ovl_Obj_Switch/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Switch
-z_obj_switch.c
diff --git a/src/overlays/actors/ovl_Obj_Swprize/overlay.cfg b/src/overlays/actors/ovl_Obj_Swprize/overlay.cfg
deleted file mode 100644
index 4b73ca304f..0000000000
--- a/src/overlays/actors/ovl_Obj_Swprize/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Swprize
-z_obj_swprize.c
diff --git a/src/overlays/actors/ovl_Obj_Syokudai/overlay.cfg b/src/overlays/actors/ovl_Obj_Syokudai/overlay.cfg
deleted file mode 100644
index e03e132b7c..0000000000
--- a/src/overlays/actors/ovl_Obj_Syokudai/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Syokudai
-z_obj_syokudai.c
diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/overlay.cfg b/src/overlays/actors/ovl_Obj_Takaraya_Wall/overlay.cfg
deleted file mode 100644
index 71b838a3a4..0000000000
--- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Takaraya_Wall
-z_obj_takaraya_wall.c
diff --git a/src/overlays/actors/ovl_Obj_Taru/overlay.cfg b/src/overlays/actors/ovl_Obj_Taru/overlay.cfg
deleted file mode 100644
index 70ba0b5b39..0000000000
--- a/src/overlays/actors/ovl_Obj_Taru/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Taru
-z_obj_taru.c
diff --git a/src/overlays/actors/ovl_Obj_Toge/overlay.cfg b/src/overlays/actors/ovl_Obj_Toge/overlay.cfg
deleted file mode 100644
index 0a249ec38c..0000000000
--- a/src/overlays/actors/ovl_Obj_Toge/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Toge
-z_obj_toge.c
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/overlay.cfg b/src/overlays/actors/ovl_Obj_Tokei_Step/overlay.cfg
deleted file mode 100644
index 1f100873ca..0000000000
--- a/src/overlays/actors/ovl_Obj_Tokei_Step/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Tokei_Step
-z_obj_tokei_step.c
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/overlay.cfg b/src/overlays/actors/ovl_Obj_Tokei_Tobira/overlay.cfg
deleted file mode 100644
index 3182fc3f45..0000000000
--- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Tokei_Tobira
-z_obj_tokei_tobira.c
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/overlay.cfg b/src/overlays/actors/ovl_Obj_Tokei_Turret/overlay.cfg
deleted file mode 100644
index 57bac89fa6..0000000000
--- a/src/overlays/actors/ovl_Obj_Tokei_Turret/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Tokei_Turret
-z_obj_tokei_turret.c
diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/overlay.cfg b/src/overlays/actors/ovl_Obj_Tokeidai/overlay.cfg
deleted file mode 100644
index 4458dfd697..0000000000
--- a/src/overlays/actors/ovl_Obj_Tokeidai/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Tokeidai
-z_obj_tokeidai.c
diff --git a/src/overlays/actors/ovl_Obj_Toudai/overlay.cfg b/src/overlays/actors/ovl_Obj_Toudai/overlay.cfg
deleted file mode 100644
index fec5d2975c..0000000000
--- a/src/overlays/actors/ovl_Obj_Toudai/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Toudai
-z_obj_toudai.c
diff --git a/src/overlays/actors/ovl_Obj_Tree/overlay.cfg b/src/overlays/actors/ovl_Obj_Tree/overlay.cfg
deleted file mode 100644
index c3a0007c9e..0000000000
--- a/src/overlays/actors/ovl_Obj_Tree/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Tree
-z_obj_tree.c
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/overlay.cfg b/src/overlays/actors/ovl_Obj_Tsubo/overlay.cfg
deleted file mode 100644
index 00f17aeb56..0000000000
--- a/src/overlays/actors/ovl_Obj_Tsubo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Tsubo
-z_obj_tsubo.c
diff --git a/src/overlays/actors/ovl_Obj_Um/overlay.cfg b/src/overlays/actors/ovl_Obj_Um/overlay.cfg
deleted file mode 100644
index a8eb50a9b0..0000000000
--- a/src/overlays/actors/ovl_Obj_Um/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Um
-z_obj_um.c
diff --git a/src/overlays/actors/ovl_Obj_Usiyane/overlay.cfg b/src/overlays/actors/ovl_Obj_Usiyane/overlay.cfg
deleted file mode 100644
index 82fd486bbf..0000000000
--- a/src/overlays/actors/ovl_Obj_Usiyane/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Usiyane
-z_obj_usiyane.c
diff --git a/src/overlays/actors/ovl_Obj_Visiblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Visiblock/overlay.cfg
deleted file mode 100644
index 9436fe9e31..0000000000
--- a/src/overlays/actors/ovl_Obj_Visiblock/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Visiblock
-z_obj_visiblock.c
diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/overlay.cfg b/src/overlays/actors/ovl_Obj_Vspinyroll/overlay.cfg
deleted file mode 100644
index 0b324c9664..0000000000
--- a/src/overlays/actors/ovl_Obj_Vspinyroll/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Vspinyroll
-z_obj_vspinyroll.c
diff --git a/src/overlays/actors/ovl_Obj_Warpstone/overlay.cfg b/src/overlays/actors/ovl_Obj_Warpstone/overlay.cfg
deleted file mode 100644
index 2f3fe66eab..0000000000
--- a/src/overlays/actors/ovl_Obj_Warpstone/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Warpstone
-z_obj_warpstone.c
diff --git a/src/overlays/actors/ovl_Obj_Wind/overlay.cfg b/src/overlays/actors/ovl_Obj_Wind/overlay.cfg
deleted file mode 100644
index 7f65da5cf7..0000000000
--- a/src/overlays/actors/ovl_Obj_Wind/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Wind
-z_obj_wind.c
diff --git a/src/overlays/actors/ovl_Obj_Wturn/overlay.cfg b/src/overlays/actors/ovl_Obj_Wturn/overlay.cfg
deleted file mode 100644
index 07e4b563d2..0000000000
--- a/src/overlays/actors/ovl_Obj_Wturn/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Wturn
-z_obj_wturn.c
diff --git a/src/overlays/actors/ovl_Obj_Y2lift/overlay.cfg b/src/overlays/actors/ovl_Obj_Y2lift/overlay.cfg
deleted file mode 100644
index 432bb3e7fc..0000000000
--- a/src/overlays/actors/ovl_Obj_Y2lift/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Y2lift
-z_obj_y2lift.c
diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/overlay.cfg b/src/overlays/actors/ovl_Obj_Y2shutter/overlay.cfg
deleted file mode 100644
index 913e424059..0000000000
--- a/src/overlays/actors/ovl_Obj_Y2shutter/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Y2shutter
-z_obj_y2shutter.c
diff --git a/src/overlays/actors/ovl_Obj_Yado/overlay.cfg b/src/overlays/actors/ovl_Obj_Yado/overlay.cfg
deleted file mode 100644
index 091dbfce7a..0000000000
--- a/src/overlays/actors/ovl_Obj_Yado/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Yado
-z_obj_yado.c
diff --git a/src/overlays/actors/ovl_Obj_Yasi/overlay.cfg b/src/overlays/actors/ovl_Obj_Yasi/overlay.cfg
deleted file mode 100644
index e1d3b9f4e0..0000000000
--- a/src/overlays/actors/ovl_Obj_Yasi/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Obj_Yasi
-z_obj_yasi.c
diff --git a/src/overlays/actors/ovl_Object_Kankyo/overlay.cfg b/src/overlays/actors/ovl_Object_Kankyo/overlay.cfg
deleted file mode 100644
index 9c4704cae2..0000000000
--- a/src/overlays/actors/ovl_Object_Kankyo/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Object_Kankyo
-z_object_kankyo.c
diff --git a/src/overlays/actors/ovl_Oceff_Spot/overlay.cfg b/src/overlays/actors/ovl_Oceff_Spot/overlay.cfg
deleted file mode 100644
index e302cce9a0..0000000000
--- a/src/overlays/actors/ovl_Oceff_Spot/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Spot
-z_oceff_spot.c
diff --git a/src/overlays/actors/ovl_Oceff_Storm/overlay.cfg b/src/overlays/actors/ovl_Oceff_Storm/overlay.cfg
deleted file mode 100644
index 6845a11171..0000000000
--- a/src/overlays/actors/ovl_Oceff_Storm/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Storm
-z_oceff_storm.c
diff --git a/src/overlays/actors/ovl_Oceff_Wipe/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe/overlay.cfg
deleted file mode 100644
index c10e855cf6..0000000000
--- a/src/overlays/actors/ovl_Oceff_Wipe/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Wipe
-z_oceff_wipe.c
diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe2/overlay.cfg
deleted file mode 100644
index a8d56b9bba..0000000000
--- a/src/overlays/actors/ovl_Oceff_Wipe2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Wipe2
-z_oceff_wipe2.c
diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe3/overlay.cfg
deleted file mode 100644
index 5aca74d993..0000000000
--- a/src/overlays/actors/ovl_Oceff_Wipe3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Wipe3
-z_oceff_wipe3.c
diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe4/overlay.cfg
deleted file mode 100644
index 64cd25b042..0000000000
--- a/src/overlays/actors/ovl_Oceff_Wipe4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Wipe4
-z_oceff_wipe4.c
diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe5/overlay.cfg
deleted file mode 100644
index 274c53c0fc..0000000000
--- a/src/overlays/actors/ovl_Oceff_Wipe5/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Wipe5
-z_oceff_wipe5.c
diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe6/overlay.cfg
deleted file mode 100644
index 722d519790..0000000000
--- a/src/overlays/actors/ovl_Oceff_Wipe6/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Wipe6
-z_oceff_wipe6.c
diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe7/overlay.cfg
deleted file mode 100644
index 0956cdd61b..0000000000
--- a/src/overlays/actors/ovl_Oceff_Wipe7/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Oceff_Wipe7
-z_oceff_wipe7.c
diff --git a/src/overlays/actors/ovl_Shot_Sun/overlay.cfg b/src/overlays/actors/ovl_Shot_Sun/overlay.cfg
deleted file mode 100644
index bd210022d0..0000000000
--- a/src/overlays/actors/ovl_Shot_Sun/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Shot_Sun
-z_shot_sun.c
diff --git a/src/overlays/actors/ovl_TG_Sw/overlay.cfg b/src/overlays/actors/ovl_TG_Sw/overlay.cfg
deleted file mode 100644
index d0341bf095..0000000000
--- a/src/overlays/actors/ovl_TG_Sw/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_TG_Sw
-z_tg_sw.c
diff --git a/src/overlays/actors/ovl_player_actor/overlay.cfg b/src/overlays/actors/ovl_player_actor/overlay.cfg
deleted file mode 100644
index 2d48492357..0000000000
--- a/src/overlays/actors/ovl_player_actor/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_player_actor
-z_player.c
diff --git a/src/overlays/effects/ovl_Effect_En_Ice_Block/overlay.cfg b/src/overlays/effects/ovl_Effect_En_Ice_Block/overlay.cfg
deleted file mode 100644
index 3035ab72e6..0000000000
--- a/src/overlays/effects/ovl_Effect_En_Ice_Block/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_En_Ice_Block
-z_eff_en_ice_block.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Blast/overlay.cfg
deleted file mode 100644
index 2bb72beac6..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Blast
-z_eff_ss_blast.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Bomb2/overlay.cfg
deleted file mode 100644
index f964deb729..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Bomb2
-z_eff_ss_bomb2.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Bubble/overlay.cfg
deleted file mode 100644
index bdf4b40698..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Bubble/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Bubble
-z_eff_ss_bubble.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_D_Fire/overlay.cfg
deleted file mode 100644
index 2c439ec558..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_D_Fire
-z_eff_ss_d_fire.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/overlay.cfg
deleted file mode 100644
index 61ff413120..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Dead_Db
-z_eff_ss_dead_db.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/overlay.cfg
deleted file mode 100644
index 86355de674..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Dead_Dd
-z_eff_ss_dead_dd.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/overlay.cfg
deleted file mode 100644
index 40a9f45d15..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Dead_Ds
-z_eff_ss_dead_ds.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/overlay.cfg
deleted file mode 100644
index f3b368b9ee..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Dt_Bubble
-z_eff_ss_dt_bubble.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Dust/overlay.cfg
deleted file mode 100644
index fa47efe59e..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Dust
-z_eff_ss_dust.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_En_Fire/overlay.cfg
deleted file mode 100644
index 0652dd2355..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_En_Fire
-z_eff_ss_en_fire.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_En_Ice/overlay.cfg
deleted file mode 100644
index a761dda6e6..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_En_Ice
-z_eff_ss_en_ice.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Extra/overlay.cfg
deleted file mode 100644
index b83dab7ec3..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Extra/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Extra
-z_eff_ss_extra.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/overlay.cfg
deleted file mode 100644
index 3b701b7377..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Fhg_Flash
-z_eff_ss_fhg_flash.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/overlay.cfg
deleted file mode 100644
index 233962db36..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Fire_Tail
-z_eff_ss_fire_tail.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_G_Fire/overlay.cfg
deleted file mode 100644
index 0041d4fac3..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_G_Fire
-z_eff_ss_g_fire.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/overlay.cfg
deleted file mode 100644
index f5997e9086..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_G_Ripple
-z_eff_ss_g_ripple.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_G_Spk/overlay.cfg
deleted file mode 100644
index d49c555de5..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_G_Spk
-z_eff_ss_g_spk.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_G_Splash/overlay.cfg
deleted file mode 100644
index 6f49625f8c..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_G_Splash
-z_eff_ss_g_splash.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Hahen/overlay.cfg
deleted file mode 100644
index fd5cb9c8fd..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Hahen
-z_eff_ss_hahen.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hitmark/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Hitmark/overlay.cfg
deleted file mode 100644
index 3623bfcfc9..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Hitmark/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Hitmark
-z_eff_ss_hitmark.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/overlay.cfg
deleted file mode 100644
index 643644dd74..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Ice_Piece
-z_eff_ss_ice_piece.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/overlay.cfg
deleted file mode 100644
index 854b90889e..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Ice_Smoke
-z_eff_ss_ice_smoke.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_K_Fire/overlay.cfg
deleted file mode 100644
index 0d9080c15c..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_K_Fire
-z_eff_ss_k_fire.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Kakera/overlay.cfg
deleted file mode 100644
index 4a7f62d118..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Kakera/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Kakera
-z_eff_ss_kakera.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Kirakira/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Kirakira/overlay.cfg
deleted file mode 100644
index 02edf776c2..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Kirakira/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Kirakira
-z_eff_ss_kirakira.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Lightning/overlay.cfg
deleted file mode 100644
index b698e915ff..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Lightning
-z_eff_ss_lightning.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sbn/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Sbn/overlay.cfg
deleted file mode 100644
index c958b3df5d..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Sbn/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Sbn
-z_eff_ss_sbn.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Sibuki/overlay.cfg
deleted file mode 100644
index 66dfae07c4..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Sibuki
-z_eff_ss_sibuki.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/overlay.cfg
deleted file mode 100644
index 82cde43688..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Solder_Srch_Ball
-z_eff_ss_solder_srch_ball.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Stick/overlay.cfg
deleted file mode 100644
index 5f691232a2..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Stick/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Stick
-z_eff_ss_stick.c
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/overlay.cfg b/src/overlays/effects/ovl_Effect_Ss_Stone1/overlay.cfg
deleted file mode 100644
index a6706c0140..0000000000
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_Effect_Ss_Stone1
-z_eff_ss_stone1.c
diff --git a/src/overlays/fbdemos/ovl_fbdemo_triforce/overlay.cfg b/src/overlays/fbdemos/ovl_fbdemo_triforce/overlay.cfg
deleted file mode 100644
index d5f678c11f..0000000000
--- a/src/overlays/fbdemos/ovl_fbdemo_triforce/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_fbdemo_triforce
-z_fbdemo_triforce.c
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe1/overlay.cfg b/src/overlays/fbdemos/ovl_fbdemo_wipe1/overlay.cfg
deleted file mode 100644
index 5b3efc6add..0000000000
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe1/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_fbdemo_wipe1
-z_fbdemo_wipe1.c
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe3/overlay.cfg b/src/overlays/fbdemos/ovl_fbdemo_wipe3/overlay.cfg
deleted file mode 100644
index 73258114b9..0000000000
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe3/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_fbdemo_wipe3
-z_fbdemo_wipe3.c
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe4/overlay.cfg b/src/overlays/fbdemos/ovl_fbdemo_wipe4/overlay.cfg
deleted file mode 100644
index e18ed98587..0000000000
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe4/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_fbdemo_wipe4
-z_fbdemo_wipe4.c
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe5/overlay.cfg b/src/overlays/fbdemos/ovl_fbdemo_wipe5/overlay.cfg
deleted file mode 100644
index 297aa770c7..0000000000
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe5/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_fbdemo_wipe5
-z_fbdemo_wipe5.c
diff --git a/src/overlays/gamestates/ovl_daytelop/overlay.cfg b/src/overlays/gamestates/ovl_daytelop/overlay.cfg
deleted file mode 100644
index 3766a9b419..0000000000
--- a/src/overlays/gamestates/ovl_daytelop/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_daytelop
-z_daytelop.c
diff --git a/src/overlays/gamestates/ovl_file_choose/overlay.cfg b/src/overlays/gamestates/ovl_file_choose/overlay.cfg
deleted file mode 100644
index b187241613..0000000000
--- a/src/overlays/gamestates/ovl_file_choose/overlay.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-ovl_file_choose
-z_file_nameset_NES.c
-z_file_choose_80807940.c
-z_file_choose_NES.c
diff --git a/src/overlays/gamestates/ovl_opening/overlay.cfg b/src/overlays/gamestates/ovl_opening/overlay.cfg
deleted file mode 100644
index 6366c3afd5..0000000000
--- a/src/overlays/gamestates/ovl_opening/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_opening
-z_opening.c
diff --git a/src/overlays/gamestates/ovl_select/overlay.cfg b/src/overlays/gamestates/ovl_select/overlay.cfg
deleted file mode 100644
index 5250bd7fb7..0000000000
--- a/src/overlays/gamestates/ovl_select/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_select
-z_select.c
diff --git a/src/overlays/gamestates/ovl_title/overlay.cfg b/src/overlays/gamestates/ovl_title/overlay.cfg
deleted file mode 100644
index 11343031f7..0000000000
--- a/src/overlays/gamestates/ovl_title/overlay.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-ovl_title
-z_title.c
diff --git a/src/overlays/kaleido_scope/ovl_kaleido_scope/overlay.cfg b/src/overlays/kaleido_scope/ovl_kaleido_scope/overlay.cfg
deleted file mode 100644
index c35d945184..0000000000
--- a/src/overlays/kaleido_scope/ovl_kaleido_scope/overlay.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-ovl_kaleido_scope
-z_kaleido_collect.c
-z_kaleido_debug.c
-z_kaleido_item.c
-z_kaleido_map.c
-z_kaleido_mask.c
-z_kaleido_scope_NES.c
diff --git a/tools/buildtools/elf2rom.c b/tools/buildtools/elf2rom.c
index 8f44412936..1473246cec 100644
--- a/tools/buildtools/elf2rom.c
+++ b/tools/buildtools/elf2rom.c
@@ -12,45 +12,41 @@
 #define ROM_SEG_START_SUFFIX ".rom_start"
 #define ROM_SEG_END_SUFFIX ".rom_end"
 
-struct RomSegment
-{
-    const char *name;
-    const void *data;
+struct RomSegment {
+    const char* name;
+    const void* data;
     int size;
     int romStart;
     int romEnd;
 };
 
-static struct RomSegment *g_romSegments = NULL;
+static struct RomSegment* g_romSegments = NULL;
 static int g_romSegmentsCount = 0;
 static int g_romSize;
 
-static bool parse_number(const char *str, int *num)
-{
-    char *endptr;
+static bool parse_number(const char* str, int* num) {
+    char* endptr;
     long int n = strtol(str, &endptr, 0);
     *num = n;
     return endptr > str;
 }
 
-static unsigned int round_up(unsigned int num, unsigned int multiple)
-{
+static unsigned int round_up(unsigned int num, unsigned int multiple) {
     num += multiple - 1;
     return num / multiple * multiple;
 }
 
-static char *sprintf_alloc(const char *fmt, ...)
-{
+static char* sprintf_alloc(const char* fmt, ...) {
     va_list args;
     int size;
-    char *buffer;
+    char* buffer;
 
     va_start(args, fmt);
     size = vsnprintf(NULL, 0, fmt, args) + 1;
     va_end(args);
 
     buffer = malloc(size);
-    
+
     va_start(args, fmt);
     vsprintf(buffer, fmt, args);
     va_end(args);
@@ -58,8 +54,7 @@ static char *sprintf_alloc(const char *fmt, ...)
     return buffer;
 }
 
-static struct RomSegment *add_rom_segment(const char *name)
-{
+static struct RomSegment* add_rom_segment(const char* name) {
     int index = g_romSegmentsCount;
 
     g_romSegmentsCount++;
@@ -71,50 +66,44 @@ static struct RomSegment *add_rom_segment(const char *name)
     return &g_romSegments[index];
 }
 
-static void find_segment_info(struct Elf32 *elf, struct RomSegment *segment)
-{
+static void find_segment_info(struct Elf32* elf, struct RomSegment* segment) {
     int i;
-    char *romStartSymName = sprintf_alloc("_%sSegmentRomStart", segment->name);
-    char *romEndSymName = sprintf_alloc("_%sSegmentRomEnd", segment->name);
+    char* romStartSymName = sprintf_alloc("_%sSegmentRomStart", segment->name);
+    char* romEndSymName = sprintf_alloc("_%sSegmentRomEnd", segment->name);
 
     segment->romStart = -1;
     segment->romEnd = -1;
 
     // TODO: use a hashmap for this instead of an O(n) loop
-    for (i = 0; i < elf->numsymbols; i++)
-    {
+    for (i = 0; i < elf->numsymbols; i++) {
         struct Elf32_Symbol sym;
-        
+
         if (!elf32_get_symbol(elf, &sym, i))
             util_fatal_error("invalid or corrupt ELF file");
 
-        if (strcmp(sym.name, romStartSymName) == 0)
-        {
+        if (strcmp(sym.name, romStartSymName) == 0) {
             segment->romStart = sym.value;
             if (segment->romEnd != -1)
                 break;
-        }
-        else if (strcmp(sym.name, romEndSymName) == 0)
-        {
+        } else if (strcmp(sym.name, romEndSymName) == 0) {
             segment->romEnd = sym.value;
             if (segment->romStart != -1)
                 break;
         }
     }
-    
+
     if (segment->romStart == -1)
         util_fatal_error("ROM start address of %s is not defined\n", segment->name);
     if (segment->romEnd == -1)
         util_fatal_error("ROM end address of %s is not defined\n", segment->name);
-    
+
     free(romStartSymName);
     free(romEndSymName);
 }
 
-static void parse_input_file(const char *filename)
-{
+static void parse_input_file(const char* filename) {
     struct Elf32 elf;
-    const void *data;
+    const void* data;
     size_t size;
     int i;
 
@@ -125,45 +114,40 @@ static void parse_input_file(const char *filename)
 
     // get ROM segments
     // sections of type SHT_PROGBITS and  whose name is ..secname are considered ROM segments
-    for (i = 0; i < elf.shnum; i++)
-    {
+    for (i = 0; i < elf.shnum; i++) {
         struct Elf32_Section sec;
-        struct RomSegment *segment;
+        struct RomSegment* segment;
 
         if (!elf32_get_section(&elf, &sec, i))
             util_fatal_error("invalid or corrupt ELF file");
-        if (sec.type == SHT_PROGBITS && sec.name[0] == '.' && sec.name[1] == '.'
-        // HACK! ld sometimes marks NOLOAD sections as SHT_PROGBITS for no apparent reason,
-        // so we must ignore the ..secname.bss sections explicitly
-         && strchr(sec.name + 2, '.') == NULL)
-        {
-            
+        if (sec.type == SHT_PROGBITS && sec.name[0] == '.' &&
+            sec.name[1] == '.'
+            // HACK! ld sometimes marks NOLOAD sections as SHT_PROGBITS for no apparent reason,
+            // so we must ignore the ..secname.bss sections explicitly
+            && strchr(sec.name + 2, '.') == NULL) {
+
             segment = add_rom_segment(sec.name + 2);
             find_segment_info(&elf, segment);
             segment->data = elf.data + sec.offset;
         }
-            
     }
 
     // find ROM size
-    for (i = 0; i < elf.numsymbols; i++)
-    {
+    for (i = 0; i < elf.numsymbols; i++) {
         struct Elf32_Symbol sym;
 
         if (!elf32_get_symbol(&elf, &sym, i))
             util_fatal_error("invalid or corrupt ELF file");
-        if (strcmp(sym.name, "_RomSize") == 0)
-        {
+        if (strcmp(sym.name, "_RomSize") == 0) {
             g_romSize = sym.value;
             goto got_rom_size;
         }
     }
     util_fatal_error("could not find symbol _RomSize");
-  got_rom_size:
+got_rom_size:
 
     // verify segment info
-    for (i = 0; i < g_romSegmentsCount; i++)
-    {
+    for (i = 0; i < g_romSegmentsCount; i++) {
         if (g_romSegments[i].romStart == -1)
             util_fatal_error("segment %s has no ROM start address defined.", g_romSegments[i].name);
         if (g_romSegments[i].romEnd == -1)
@@ -172,23 +156,21 @@ static void parse_input_file(const char *filename)
 }
 
 // Writes the N64 ROM, padding the file size to a multiple of 1 MiB
-static void write_rom_file(const char *filename, int cicType)
-{
+static void write_rom_file(const char* filename, int cicType) {
     size_t fileSize = round_up(g_romSize, 0x100000);
-    uint8_t *buffer = calloc(fileSize, 1);
+    uint8_t* buffer = calloc(fileSize, 1);
     int i;
     uint32_t chksum[2];
 
     // write segments
-    for (i = 0; i < g_romSegmentsCount; i++)
-    {
+    for (i = 0; i < g_romSegmentsCount; i++) {
         int size = g_romSegments[i].romEnd - g_romSegments[i].romStart;
 
         memcpy(buffer + g_romSegments[i].romStart, g_romSegments[i].data, size);
     }
 
     // pad the remaining space with 0xFF
-    for (i = g_romSize; i < (int) fileSize; i++)
+    for (i = g_romSize; i < (int)fileSize; i++)
         buffer[i] = 0xFF;
 
     // write checksum
@@ -201,67 +183,51 @@ static void write_rom_file(const char *filename, int cicType)
     free(buffer);
 }
 
-static void usage(const char *execname)
-{
+static void usage(const char* execname) {
     printf("usage: %s\n", execname);
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char** argv) {
     int i;
-    const char *inputFileName = NULL;
-    const char *outputFileName = NULL;
+    const char* inputFileName = NULL;
+    const char* outputFileName = NULL;
     int cicType = -1;
 
-    for (i = 1; i < argc; i++)
-    {
-        if (argv[i][0] == '-')
-        {
-            if (strcmp(argv[i], "-cic") == 0)
-            {
+    for (i = 1; i < argc; i++) {
+        if (argv[i][0] == '-') {
+            if (strcmp(argv[i], "-cic") == 0) {
                 i++;
-                if (i >= argc || !parse_number(argv[i], &cicType))
-                {
+                if (i >= argc || !parse_number(argv[i], &cicType)) {
                     fputs("error: expected number after -cic\n", stderr);
                     goto bad_args;
                 }
-            }
-            else if (strcmp(argv[i], "-help") == 0)
-            {
+            } else if (strcmp(argv[i], "-help") == 0) {
                 usage(argv[0]);
                 return 0;
-            }
-            else
-            {
+            } else {
                 fprintf(stderr, "unknown option %s\n", argv[i]);
                 goto bad_args;
             }
-        }
-        else
-        {
+        } else {
             if (inputFileName == NULL)
                 inputFileName = argv[i];
             else if (outputFileName == NULL)
                 outputFileName = argv[i];
-            else
-            {
+            else {
                 fputs("error: too many parameters specified\n", stderr);
                 goto bad_args;
             }
         }
     }
-    if (inputFileName == NULL)
-    {
+    if (inputFileName == NULL) {
         fputs("error: no input file specified\n", stderr);
         goto bad_args;
     }
-    if (outputFileName == NULL)
-    {
+    if (outputFileName == NULL) {
         fputs("error: no output file specified\n", stderr);
         goto bad_args;
     }
-    if (cicType == -1)
-    {
+    if (cicType == -1) {
         fputs("error: no CIC type specified\n", stderr);
         goto bad_args;
     }
diff --git a/tools/buildtools/elf32.c b/tools/buildtools/elf32.c
index f5dcafc0dc..7540406fb4 100644
--- a/tools/buildtools/elf32.c
+++ b/tools/buildtools/elf32.c
@@ -5,36 +5,23 @@
 
 #include "elf32.h"
 
-static uint16_t read16_le(const uint8_t *data)
-{
-    return data[0] << 0
-         | data[1] << 8;
+static uint16_t read16_le(const uint8_t* data) {
+    return data[0] << 0 | data[1] << 8;
 }
 
-static uint32_t read32_le(const uint8_t *data)
-{
-    return data[0] << 0
-         | data[1] << 8
-         | data[2] << 16
-         | data[3] << 24;
+static uint32_t read32_le(const uint8_t* data) {
+    return data[0] << 0 | data[1] << 8 | data[2] << 16 | data[3] << 24;
 }
 
-static uint16_t read16_be(const uint8_t *data)
-{
-    return data[0] << 8
-         | data[1] << 0;
+static uint16_t read16_be(const uint8_t* data) {
+    return data[0] << 8 | data[1] << 0;
 }
 
-static uint32_t read32_be(const uint8_t *data)
-{
-    return data[0] << 24
-         | data[1] << 16
-         | data[2] << 8
-         | data[3] << 0;
+static uint32_t read32_be(const uint8_t* data) {
+    return data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3] << 0;
 }
 
-static const void *get_section_header(struct Elf32 *e, int secnum)
-{
+static const void* get_section_header(struct Elf32* e, int secnum) {
     size_t secoffset = e->shoff + secnum * 0x28;
 
     if (secnum >= e->shnum || secoffset >= e->dataSize)
@@ -42,76 +29,70 @@ static const void *get_section_header(struct Elf32 *e, int secnum)
     return e->data + secoffset;
 }
 
-static const void *get_section_contents(struct Elf32 *e, int secnum)
-{
+static const void* get_section_contents(struct Elf32* e, int secnum) {
     size_t secoffset = e->shoff + secnum * 0x28;
     size_t dataoffset;
-    
+
     if (secnum >= e->shnum || secoffset >= e->dataSize)
         return NULL;
     dataoffset = e->read32(e->data + secoffset + 0x10);
     return e->data + dataoffset;
 }
 
-static bool verify_magic(const uint8_t *data)
-{
+static bool verify_magic(const uint8_t* data) {
     return (data[0] == 0x7F && data[1] == 'E' && data[2] == 'L' && data[3] == 'F');
 }
 
-bool elf32_init(struct Elf32 *e, const void *data, size_t size)
-{
+bool elf32_init(struct Elf32* e, const void* data, size_t size) {
     unsigned int i;
 
     e->data = data;
     e->dataSize = size;
 
     if (size < 0x34)
-        return false;  // not big enough for header
+        return false; // not big enough for header
 
     if (!verify_magic(e->data))
         return false;
 
     if (e->data[4] != 1)
-        return false;  // must be 32-bit
+        return false; // must be 32-bit
 
     e->endian = e->data[5];
 
-    switch (e->endian)
-    {
-    case 1:
-        e->read16 = read16_le;
-        e->read32 = read32_le;
-        break;
-    case 2:
-        e->read16 = read16_be;
-        e->read32 = read32_be;
-        break;
-    default:
-        return false;
+    switch (e->endian) {
+        case 1:
+            e->read16 = read16_le;
+            e->read32 = read32_le;
+            break;
+        case 2:
+            e->read16 = read16_be;
+            e->read32 = read32_be;
+            break;
+        default:
+            return false;
     }
 
-    e->type      = e->read16(e->data + 0x10);
-    e->machine   = e->read16(e->data + 0x12);
-    e->version   = e->data[6];
-    e->entry     = e->read32(e->data + 0x18);
-    e->phoff     = e->read32(e->data + 0x1C);
-    e->shoff     = e->read32(e->data + 0x20);
-    e->ehsize    = e->read16(e->data + 0x28);
+    e->type = e->read16(e->data + 0x10);
+    e->machine = e->read16(e->data + 0x12);
+    e->version = e->data[6];
+    e->entry = e->read32(e->data + 0x18);
+    e->phoff = e->read32(e->data + 0x1C);
+    e->shoff = e->read32(e->data + 0x20);
+    e->ehsize = e->read16(e->data + 0x28);
     e->phentsize = e->read16(e->data + 0x2A);
-    e->phnum     = e->read16(e->data + 0x2C);
+    e->phnum = e->read16(e->data + 0x2C);
     e->shentsize = e->read16(e->data + 0x2E);
-    e->shnum     = e->read16(e->data + 0x30);
-    e->shstrndx  = e->read16(e->data + 0x32);
-    
+    e->shnum = e->read16(e->data + 0x30);
+    e->shstrndx = e->read16(e->data + 0x32);
+
     // find symbol table section
     e->symtabndx = -1;
-    for (i = 0; i < e->shnum; i++)
-    {
-        const uint8_t *sechdr = get_section_header(e, i);
+    for (i = 0; i < e->shnum; i++) {
+        const uint8_t* sechdr = get_section_header(e, i);
         uint32_t type = e->read32(sechdr + 0x04);
-        
-        if (type == SHT_SYMTAB)
-        {
+
+        if (type == SHT_SYMTAB) {
             e->symtabndx = i;
             break;
         }
@@ -119,59 +100,53 @@ bool elf32_init(struct Elf32 *e, const void *data, size_t size)
 
     // find .strtab section
     e->strtabndx = -1;
-    for (i = 0; i < e->shnum; i++)
-    {
-        const uint8_t *sechdr = get_section_header(e, i);
+    for (i = 0; i < e->shnum; i++) {
+        const uint8_t* sechdr = get_section_header(e, i);
         uint32_t type = e->read32(sechdr + 0x04);
-        
-        if (type == SHT_STRTAB)
-        {
-            const char *strings = get_section_contents(e, e->shstrndx);
-            const char *secname = strings + e->read32(sechdr + 0);
-            
-            if (strcmp(secname, ".strtab") == 0)
-            {
+
+        if (type == SHT_STRTAB) {
+            const char* strings = get_section_contents(e, e->shstrndx);
+            const char* secname = strings + e->read32(sechdr + 0);
+
+            if (strcmp(secname, ".strtab") == 0) {
                 e->strtabndx = i;
                 break;
             }
         }
     }
-    
+
     e->numsymbols = 0;
-    if (e->symtabndx != -1)
-    {
-        const uint8_t *sechdr = get_section_header(e, e->symtabndx);
-        //const uint8_t *symtab = get_section_contents(e, e->symtabndx);
-        
+    if (e->symtabndx != -1) {
+        const uint8_t* sechdr = get_section_header(e, e->symtabndx);
+        // const uint8_t *symtab = get_section_contents(e, e->symtabndx);
+
         e->numsymbols = e->read32(sechdr + 0x14) / e->read32(sechdr + 0x24);
     }
 
     if (e->shoff + e->shstrndx * 0x28 >= e->dataSize)
         return false;
-    
+
     return true;
 }
 
-bool elf32_get_section(struct Elf32 *e, struct Elf32_Section *sec, int secnum)
-{
-    const uint8_t *sechdr = get_section_header(e, secnum);
-    const char *strings = get_section_contents(e, e->shstrndx);
+bool elf32_get_section(struct Elf32* e, struct Elf32_Section* sec, int secnum) {
+    const uint8_t* sechdr = get_section_header(e, secnum);
+    const char* strings = get_section_contents(e, e->shstrndx);
 
-    sec->name      = strings + e->read32(sechdr + 0);
-    sec->type      = e->read32(sechdr + 0x04);
-    sec->flags     = e->read32(sechdr + 0x08);
-    sec->addr      = e->read32(sechdr + 0x0C);
-    sec->offset    = e->read32(sechdr + 0x10);
+    sec->name = strings + e->read32(sechdr + 0);
+    sec->type = e->read32(sechdr + 0x04);
+    sec->flags = e->read32(sechdr + 0x08);
+    sec->addr = e->read32(sechdr + 0x0C);
+    sec->offset = e->read32(sechdr + 0x10);
     sec->addralign = e->read32(sechdr + 0x20);
-    sec->entsize   = e->read32(sechdr + 0x24);
+    sec->entsize = e->read32(sechdr + 0x24);
     return true;
 }
 
-bool elf32_get_symbol(struct Elf32 *e, struct Elf32_Symbol *sym, int symnum)
-{
-    const uint8_t *sechdr;
-    const uint8_t *symtab;
-    const char *strings;
+bool elf32_get_symbol(struct Elf32* e, struct Elf32_Symbol* sym, int symnum) {
+    const uint8_t* sechdr;
+    const uint8_t* symtab;
+    const char* strings;
     int symcount;
 
     if (e->symtabndx == -1)
diff --git a/tools/buildtools/elf32.h b/tools/buildtools/elf32.h
index 666f6e917b..0dae635f26 100644
--- a/tools/buildtools/elf32.h
+++ b/tools/buildtools/elf32.h
@@ -1,22 +1,22 @@
-#ifndef _ELF_H_
-#define _ELF_H_
+#ifndef ELF32_H
+#define ELF32_H
 
-enum
-{
+#include <stddef.h>
+#include <stdint.h>
+
+enum {
     ELF_MACHINE_NONE = 0,
     ELF_MACHINE_MIPS = 8,
 };
 
-enum
-{
+enum {
     ELF_TYPE_RELOC = 1,
     ELF_TYPE_EXEC,
     ELF_TYPE_SHARED,
     ELF_TYPE_CORE,
 };
 
-struct Elf32
-{
+struct Elf32 {
     uint8_t endian;
     uint16_t type;
     uint16_t machine;
@@ -34,23 +34,21 @@ struct Elf32
     int strtabndx;
     int numsymbols;
 
-    const uint8_t *data;
+    const uint8_t* data;
     size_t dataSize;
-    uint16_t (*read16)(const uint8_t *);
-    uint32_t (*read32)(const uint8_t *);
+    uint16_t (*read16)(const uint8_t*);
+    uint32_t (*read32)(const uint8_t*);
 };
 
-enum
-{
+enum {
     SHT_NULL = 0,
     SHT_PROGBITS,
     SHT_SYMTAB,
     SHT_STRTAB,
 };
 
-struct Elf32_Section
-{
-    const char *name;
+struct Elf32_Section {
+    const char* name;
     uint32_t type;
     uint32_t flags;
     uint32_t addr;
@@ -59,14 +57,13 @@ struct Elf32_Section
     uint32_t entsize;
 };
 
-struct Elf32_Symbol
-{
-    const char *name;
+struct Elf32_Symbol {
+    const char* name;
     uint32_t value;
 };
 
-bool elf32_init(struct Elf32 *e, const void *data, size_t size);
-bool elf32_get_section(struct Elf32 *e, struct Elf32_Section *sec, int secnum);
-bool elf32_get_symbol(struct Elf32 *e, struct Elf32_Symbol *sym, int symnum);
+bool elf32_init(struct Elf32* e, const void* data, size_t size);
+bool elf32_get_section(struct Elf32* e, struct Elf32_Section* sec, int secnum);
+bool elf32_get_symbol(struct Elf32* e, struct Elf32_Symbol* sym, int symnum);
 
 #endif
diff --git a/tools/buildtools/makeromfs.c b/tools/buildtools/makeromfs.c
index a61c8e0196..198f8adc59 100644
--- a/tools/buildtools/makeromfs.c
+++ b/tools/buildtools/makeromfs.c
@@ -12,18 +12,16 @@
 
 #define ROM_SIZE 0x02000000
 
-enum InputObjType
-{
+enum InputObjType {
     OBJ_NULL,
     OBJ_FILE,
     OBJ_TABLE,
 };
 
-struct InputFile
-{
+struct InputFile {
     enum InputObjType type;
-    const char *name;
-    uint8_t *data;
+    const char* name;
+    uint8_t* data;
     size_t size;
     unsigned int valign;
 
@@ -33,73 +31,58 @@ struct InputFile
     uint32_t physEnd;
 };
 
-static struct InputFile *g_inputFiles = NULL;
+static struct InputFile* g_inputFiles = NULL;
 static int g_inputFilesCount = 0;
 
-static unsigned int round_up(unsigned int num, unsigned int multiple)
-{
+static unsigned int round_up(unsigned int num, unsigned int multiple) {
     num += multiple - 1;
     return num / multiple * multiple;
 }
 
-static bool is_yaz0_header(const uint8_t *data)
-{
-    return data[0] == 'Y'
-        && data[1] == 'a'
-        && data[2] == 'z'
-        && data[3] == '0';
+static bool is_yaz0_header(const uint8_t* data) {
+    return data[0] == 'Y' && data[1] == 'a' && data[2] == 'z' && data[3] == '0';
 }
 
-static void compute_offsets(void)
-{
+static void compute_offsets(void) {
     size_t physOffset = 0;
     size_t virtOffset = 0;
     int i;
 
-    for (i = 0; i < g_inputFilesCount; i++)
-    {
+    for (i = 0; i < g_inputFilesCount; i++) {
         bool compressed = false;
 
-        if (g_inputFiles[i].type == OBJ_FILE)
-        {
+        if (g_inputFiles[i].type == OBJ_FILE) {
             if (is_yaz0_header(g_inputFiles[i].data))
                 compressed = true;
-        }
-        else if (g_inputFiles[i].type == OBJ_TABLE)
-        {
+        } else if (g_inputFiles[i].type == OBJ_TABLE) {
             g_inputFiles[i].size = g_inputFilesCount * 16;
         }
 
         virtOffset = round_up(virtOffset, g_inputFiles[i].valign);
 
-        if (g_inputFiles[i].type == OBJ_NULL)
-        {
+        if (g_inputFiles[i].type == OBJ_NULL) {
             g_inputFiles[i].virtStart = 0;
-            g_inputFiles[i].virtEnd   = 0;
+            g_inputFiles[i].virtEnd = 0;
             g_inputFiles[i].physStart = 0;
-            g_inputFiles[i].physEnd   = 0;
-        }
-        else if (compressed)
-        {
+            g_inputFiles[i].physEnd = 0;
+        } else if (compressed) {
             size_t compSize = round_up(g_inputFiles[i].size, 16);
             size_t uncompSize = util_read_uint32_be(g_inputFiles[i].data + 4);
 
             g_inputFiles[i].virtStart = virtOffset;
-            g_inputFiles[i].virtEnd   = virtOffset + uncompSize;
+            g_inputFiles[i].virtEnd = virtOffset + uncompSize;
             g_inputFiles[i].physStart = physOffset;
-            g_inputFiles[i].physEnd   = physOffset + compSize;
+            g_inputFiles[i].physEnd = physOffset + compSize;
 
             physOffset += compSize;
             virtOffset += uncompSize;
-        }
-        else
-        {
+        } else {
             size_t size = g_inputFiles[i].size;
 
             g_inputFiles[i].virtStart = virtOffset;
-            g_inputFiles[i].virtEnd   = virtOffset + size;
+            g_inputFiles[i].virtEnd = virtOffset + size;
             g_inputFiles[i].physStart = physOffset;
-            g_inputFiles[i].physEnd   = 0;
+            g_inputFiles[i].physEnd = 0;
 
             physOffset += size;
             virtOffset += size;
@@ -107,17 +90,15 @@ static void compute_offsets(void)
     }
 }
 
-static void build_rom(const char *filename)
-{
-    uint8_t *romData = calloc(ROM_SIZE, 1);
+static void build_rom(const char* filename) {
+    uint8_t* romData = calloc(ROM_SIZE, 1);
     size_t pos = 0;
     int i;
     int j;
     uint32_t chksum[2];
-    FILE *outFile;
+    FILE* outFile;
 
-    for (i = 0; i < g_inputFilesCount; i++)
-    {
+    for (i = 0; i < g_inputFilesCount; i++) {
         size_t size = g_inputFiles[i].size;
 
         if (pos + round_up(size, 16) > ROM_SIZE)
@@ -125,34 +106,31 @@ static void build_rom(const char *filename)
 
         assert(pos % 16 == 0);
 
-        switch (g_inputFiles[i].type)
-        {
-        case OBJ_FILE:
-            // write file data
-            memcpy(romData + pos, g_inputFiles[i].data, size);
-            pos += round_up(size, 16);
+        switch (g_inputFiles[i].type) {
+            case OBJ_FILE:
+                // write file data
+                memcpy(romData + pos, g_inputFiles[i].data, size);
+                pos += round_up(size, 16);
 
-            free(g_inputFiles[i].data);
-            break;
-        case OBJ_TABLE:
-            for (j = 0; j < g_inputFilesCount; j++)
-            {
-                util_write_uint32_be(romData + pos +  0, g_inputFiles[j].virtStart);
-                util_write_uint32_be(romData + pos +  4, g_inputFiles[j].virtEnd);
-                util_write_uint32_be(romData + pos +  8, g_inputFiles[j].physStart);
-                util_write_uint32_be(romData + pos + 12, g_inputFiles[j].physEnd);
+                free(g_inputFiles[i].data);
+                break;
+            case OBJ_TABLE:
+                for (j = 0; j < g_inputFilesCount; j++) {
+                    util_write_uint32_be(romData + pos + 0, g_inputFiles[j].virtStart);
+                    util_write_uint32_be(romData + pos + 4, g_inputFiles[j].virtEnd);
+                    util_write_uint32_be(romData + pos + 8, g_inputFiles[j].physStart);
+                    util_write_uint32_be(romData + pos + 12, g_inputFiles[j].physEnd);
 
-                pos += 16;
-            }
-            break;
-        case OBJ_NULL:
-            break;
+                    pos += 16;
+                }
+                break;
+            case OBJ_NULL:
+                break;
         }
     }
 
     // Pad the rest of the ROM
-    while (pos < ROM_SIZE)
-    {
+    while (pos < ROM_SIZE) {
         // This is such a weird thing to pad with. Whatever, Nintendo.
         romData[pos] = pos & 0xFF;
         pos++;
@@ -173,8 +151,7 @@ static void build_rom(const char *filename)
     free(romData);
 }
 
-static struct InputFile *new_file(void)
-{
+static struct InputFile* new_file(void) {
     int index = g_inputFilesCount;
 
     g_inputFilesCount++;
@@ -186,15 +163,13 @@ static struct InputFile *new_file(void)
 }
 
 // null terminates the current token and returns a pointer to the next token
-static char *token_split(char *str)
-{
-    while (!isspace(*str))
-    {
+static char* token_split(char* str) {
+    while (!isspace(*str)) {
         if (*str == 0)
-            return str;  // end of string
+            return str; // end of string
         str++;
     }
-    *str = 0;  // terminate token
+    *str = 0; // terminate token
     str++;
 
     // skip remaining whitespace
@@ -204,104 +179,94 @@ static char *token_split(char *str)
 }
 
 // null terminates the current line and returns a pointer to the next line
-static char *line_split(char *str)
-{
-    while (*str != '\n')
-    {
+static char* line_split(char* str) {
+    while (*str != '\n') {
         if (*str == 0)
-            return str;  // end of string
+            return str; // end of string
         str++;
     }
-    *str = 0;  // terminate line
+    *str = 0; // terminate line
     return str + 1;
 }
 
-static void parse_line(char *line, int lineNum)
-{
-    char *token = line;
+static void parse_line(char* line, int lineNum) {
+    char* token = line;
     int i = 0;
 
-    char *filename = NULL;
+    char* filename = NULL;
     enum InputObjType type = -1;
     int valign = 1;
-    struct InputFile *file;
+    struct InputFile* file;
 
     // iterate through each token
-    while (token[0] != 0)
-    {
-        char *nextToken = token_split(token);
+    while (token[0] != 0) {
+        char* nextToken = token_split(token);
 
-        if (token[0] == '#')  // comment - ignore rest of line
+        if (token[0] == '#') // comment - ignore rest of line
             return;
 
-        switch (i)
-        {
-        case 0:
-            if (strcmp(token, "file") == 0)
-                type = OBJ_FILE;
-            else if (strcmp(token, "filetable") == 0)
-                type = OBJ_TABLE;
-            else if (strcmp(token, "null") == 0)
-                type = OBJ_NULL;
-            else
-                util_fatal_error("unknown object type '%s' on line %i", token, lineNum);
-            break;
-        case 1:
-            filename = token;
-            break;
-        case 2:
-            {
+        switch (i) {
+            case 0:
+                if (strcmp(token, "file") == 0)
+                    type = OBJ_FILE;
+                else if (strcmp(token, "filetable") == 0)
+                    type = OBJ_TABLE;
+                else if (strcmp(token, "null") == 0)
+                    type = OBJ_NULL;
+                else
+                    util_fatal_error("unknown object type '%s' on line %i", token, lineNum);
+                break;
+            case 1:
+                filename = token;
+                break;
+            case 2: {
                 int n;
 
                 if (sscanf(token, "align(%i)", &n) == 1)
                     valign = n;
                 else
                     goto junk;
-            }
-            break;
-        default:
-        junk:
-            util_fatal_error("junk '%s' on line %i", token, lineNum);
-            break;
+            } break;
+            default:
+            junk:
+                util_fatal_error("junk '%s' on line %i", token, lineNum);
+                break;
         }
 
         token = nextToken;
         i++;
     }
 
-    if (i == 0)  // empty line
+    if (i == 0) // empty line
         return;
 
     file = new_file();
     file->valign = valign;
 
-    switch (type)
-    {
-    case OBJ_FILE:
-        if (filename == NULL)
-            util_fatal_error("no filename specified on line %i", lineNum);
-        file->type = OBJ_FILE;
-        file->data = util_read_whole_file(filename, &file->size);
-        break;
-    case OBJ_TABLE:
-        file->type = OBJ_TABLE;
-        break;
-    case OBJ_NULL:
-        file->type = OBJ_NULL;
-        file->size = 0;
-        break;
+    switch (type) {
+        case OBJ_FILE:
+            if (filename == NULL)
+                util_fatal_error("no filename specified on line %i", lineNum);
+            file->type = OBJ_FILE;
+            file->data = util_read_whole_file(filename, &file->size);
+            break;
+        case OBJ_TABLE:
+            file->type = OBJ_TABLE;
+            break;
+        case OBJ_NULL:
+            file->type = OBJ_NULL;
+            file->size = 0;
+            break;
     }
 }
 
-static void parse_list(char *list)
-{
-    char *line = list;
+static void parse_list(char* list) {
+    char* line = list;
     int lineNum = 1;
 
     // iterate through each line
-    while (line[0] != 0)
-    {
-        char *nextLine = line_split(line);
+    while (line[0] != 0) {
+        char* nextLine = line_split(line);
 
         parse_line(line, lineNum);
 
@@ -310,8 +275,7 @@ static void parse_list(char *list)
     }
 }
 
-static void usage(const char *execName)
-{
+static void usage(const char* execName) {
     printf("usage: %s FILE_LIST OUTPUT_FILE\n"
            "where FILE_LIST is a list of files to include\n"
            "and OUTPUT_FILE is the name of the output ROM\n"
@@ -319,12 +283,10 @@ static void usage(const char *execName)
            execName);
 }
 
-int main(int argc, char **argv)
-{
-    char *list;
+int main(int argc, char** argv) {
+    char* list;
 
-    if (argc != 3)
-    {
+    if (argc != 3) {
         puts("invalid args");
         usage(argv[0]);
         return 1;
diff --git a/tools/buildtools/n64chksum.c b/tools/buildtools/n64chksum.c
index 64cfd3aad5..add34b0296 100644
--- a/tools/buildtools/n64chksum.c
+++ b/tools/buildtools/n64chksum.c
@@ -6,12 +6,11 @@
 #include "n64chksum.h"
 #include "util.h"
 
-//Based on uCON64's N64 checksum algorithm by Andreas Sterbenz
+// Based on uCON64's N64 checksum algorithm by Andreas Sterbenz
 
 #define ROL(i, b) (((i) << (b)) | ((i) >> (32 - (b))))
 
-bool n64chksum_calculate(const uint8_t *romData, int cicType, uint32_t *chksum)
-{
+bool n64chksum_calculate(const uint8_t* romData, int cicType, uint32_t* chksum) {
     unsigned int seed;
     unsigned int t1, t2, t3, t4, t5, t6;
     size_t pos;
@@ -20,29 +19,27 @@ bool n64chksum_calculate(const uint8_t *romData, int cicType, uint32_t *chksum)
     const size_t END = START + 0x100000;
 
     // determine initial seed
-    switch (cicType)
-    {
-    case 6101:
-    case 6102:
-        seed = 0xF8CA4DDC;
-        break;
-    case 6103:
-        seed = 0xA3886759;
-        break;
-    case 6105:
-        seed = 0xDF26F436;
-        break;
-    case 6106:
-        seed = 0x1FEA617A;
-        break;
-    default:
-        return false;  // unknown CIC type
+    switch (cicType) {
+        case 6101:
+        case 6102:
+            seed = 0xF8CA4DDC;
+            break;
+        case 6103:
+            seed = 0xA3886759;
+            break;
+        case 6105:
+            seed = 0xDF26F436;
+            break;
+        case 6106:
+            seed = 0x1FEA617A;
+            break;
+        default:
+            return false; // unknown CIC type
     }
 
     t1 = t2 = t3 = t4 = t5 = t6 = seed;
 
-    for (pos = START; pos < END; pos += 4)
-    {
+    for (pos = START; pos < END; pos += 4) {
         unsigned int d = util_read_uint32_be(romData + pos);
         unsigned int r = ROL(d, (d & 0x1F));
 
@@ -65,18 +62,13 @@ bool n64chksum_calculate(const uint8_t *romData, int cicType, uint32_t *chksum)
             t1 += t5 ^ d;
     }
 
-    if (cicType == 6103)
-    {
+    if (cicType == 6103) {
         chksum[0] = (t6 ^ t4) + t3;
         chksum[1] = (t5 ^ t2) + t1;
-    }
-    else if (cicType == 6106)
-    {
+    } else if (cicType == 6106) {
         chksum[0] = (t6 * t4) + t3;
         chksum[1] = (t5 * t2) + t1;
-    }
-    else
-    {
+    } else {
         chksum[0] = t6 ^ t4 ^ t3;
         chksum[1] = t5 ^ t2 ^ t1;
     }
diff --git a/tools/buildtools/n64chksum.h b/tools/buildtools/n64chksum.h
index 0ca13a819b..5cea0edc83 100644
--- a/tools/buildtools/n64chksum.h
+++ b/tools/buildtools/n64chksum.h
@@ -1,6 +1,6 @@
-#ifndef _N64CHKSUM_H_
-#define _N64CHKSUM_H_
+#ifndef N64CHKSUM_H
+#define N64CHKSUM_H
 
-bool n64chksum_calculate(const uint8_t *romData, int cicType, uint32_t *chksum);
+bool n64chksum_calculate(const uint8_t* romData, int cicType, uint32_t* chksum);
 
 #endif
diff --git a/tools/buildtools/spec.h b/tools/buildtools/spec.h
index aeabd07d1f..01c6b3d841 100644
--- a/tools/buildtools/spec.h
+++ b/tools/buildtools/spec.h
@@ -55,9 +55,9 @@ typedef struct Segment {
 
 void parse_rom_spec(char* spec, struct Segment** segments, int* segment_count);
 
-bool get_single_segment_by_name(struct Segment* dstSegment, char *spec, const char *segmentName);
+bool get_single_segment_by_name(struct Segment* dstSegment, char* spec, const char* segmentName);
 
-void free_single_segment_elements(struct Segment *segment);
+void free_single_segment_elements(struct Segment* segment);
 
 void free_rom_spec(struct Segment* segments, int segment_count);
 
diff --git a/tools/buildtools/util.c b/tools/buildtools/util.c
index 824e089e07..941ac1ffdb 100644
--- a/tools/buildtools/util.c
+++ b/tools/buildtools/util.c
@@ -8,8 +8,7 @@
 #include "util.h"
 
 // displays an error message and exits
-void util_fatal_error(const char *msgfmt, ...)
-{
+void util_fatal_error(const char* msgfmt, ...) {
     va_list args;
 
     fputs(ERRMSG_START, stderr);
@@ -24,10 +23,9 @@ void util_fatal_error(const char *msgfmt, ...)
 }
 
 // reads a whole file into memory, and returns a malloc'd pointer to the data.
-void *util_read_whole_file(const char *filename, size_t *pSize)
-{
-    FILE *file = fopen(filename, "rb");
-    uint8_t *buffer;
+void* util_read_whole_file(const char* filename, size_t* pSize) {
+    FILE* file = fopen(filename, "rb");
+    uint8_t* buffer;
     size_t size;
 
     if (file == NULL)
@@ -56,9 +54,8 @@ void *util_read_whole_file(const char *filename, size_t *pSize)
 }
 
 // writes data to file
-void util_write_whole_file(const char *filename, const void *data, size_t size)
-{
-    FILE *file = fopen(filename, "wb");
+void util_write_whole_file(const char* filename, const void* data, size_t size) {
+    FILE* file = fopen(filename, "wb");
 
     if (file == NULL)
         util_fatal_error("failed to open file '%s' for writing: %s", filename, strerror(errno));
@@ -69,17 +66,12 @@ void util_write_whole_file(const char *filename, const void *data, size_t size)
     fclose(file);
 }
 
-uint32_t util_read_uint32_be(const uint8_t *data)
-{
-    return data[0] << 24
-         | data[1] << 16
-         | data[2] << 8
-         | data[3] << 0;
+uint32_t util_read_uint32_be(const uint8_t* data) {
+    return data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3] << 0;
 }
 
 // writes a big-endian 32-bit integer
-void util_write_uint32_be(uint8_t *data, uint32_t val)
-{
+void util_write_uint32_be(uint8_t* data, uint32_t val) {
     data[0] = val >> 24;
     data[1] = val >> 16;
     data[2] = val >> 8;
diff --git a/tools/buildtools/util.h b/tools/buildtools/util.h
index ed692bf53d..d073407062 100644
--- a/tools/buildtools/util.h
+++ b/tools/buildtools/util.h
@@ -13,12 +13,12 @@ __attribute__((format(printf, 1, 2), noreturn))
 #endif
 void util_fatal_error(const char *msgfmt, ...);
 
-void *util_read_whole_file(const char *filename, size_t *pSize);
+void* util_read_whole_file(const char* filename, size_t* pSize);
 
-void util_write_whole_file(const char *filename, const void *data, size_t size);
+void util_write_whole_file(const char* filename, const void* data, size_t size);
 
-uint32_t util_read_uint32_be(const uint8_t *data);
+uint32_t util_read_uint32_be(const uint8_t* data);
 
-void util_write_uint32_be(uint8_t *data, uint32_t val);
+void util_write_uint32_be(uint8_t* data, uint32_t val);
 
 #endif
diff --git a/tools/buildtools/yaz0.c b/tools/buildtools/yaz0.c
index 5b3156e443..346b37e79e 100644
--- a/tools/buildtools/yaz0.c
+++ b/tools/buildtools/yaz0.c
@@ -10,31 +10,25 @@
 // src points to the yaz0 source data (to the "real" source data, not at the header!)
 // dst points to a buffer uncompressedSize bytes large (you get uncompressedSize from
 // the second 4 bytes in the Yaz0 header).
-void yaz0_decode(uint8_t* src, uint8_t* dst, int uncompressedSize)
-{
-    int srcPlace = 0, dstPlace = 0;  // current read/write positions
+void yaz0_decode(uint8_t* src, uint8_t* dst, int uncompressedSize) {
+    int srcPlace = 0, dstPlace = 0; // current read/write positions
 
-    unsigned int validBitCount = 0;  // number of valid bits left in "code" byte
+    unsigned int validBitCount = 0; // number of valid bits left in "code" byte
     uint8_t currCodeByte;
-    while (dstPlace < uncompressedSize)
-    {
+    while (dstPlace < uncompressedSize) {
         // read new "code" byte if the current one is used up
-        if (validBitCount == 0)
-        {
+        if (validBitCount == 0) {
             currCodeByte = src[srcPlace];
             ++srcPlace;
             validBitCount = 8;
         }
 
-        if ((currCodeByte & 0x80) != 0)
-        {
+        if ((currCodeByte & 0x80) != 0) {
             // straight copy
             dst[dstPlace] = src[srcPlace];
             dstPlace++;
             srcPlace++;
-        }
-        else
-        {
+        } else {
             // RLE part
             uint8_t byte1 = src[srcPlace];
             uint8_t byte2 = src[srcPlace + 1];
@@ -44,19 +38,15 @@ void yaz0_decode(uint8_t* src, uint8_t* dst, int uncompressedSize)
             unsigned int copySource = dstPlace - (dist + 1);
 
             unsigned int numBytes = byte1 >> 4;
-            if (numBytes == 0)
-            {
+            if (numBytes == 0) {
                 numBytes = src[srcPlace] + 0x12;
                 srcPlace++;
-            }
-            else
-            {
+            } else {
                 numBytes += 2;
             }
 
             // copy run
-            for (unsigned int i = 0; i < numBytes; ++i)
-            {
+            for (unsigned int i = 0; i < numBytes; ++i) {
                 dst[dstPlace] = dst[copySource];
                 copySource++;
                 dstPlace++;
@@ -77,8 +67,7 @@ typedef uint8_t uint8_t;
 #define MAX_RUNLEN (0xFF + 0x12)
 
 // simple and straight encoding scheme for Yaz0
-static uint32_t simpleEnc(uint8_t *src, int size, int pos, uint32_t *pMatchPos)
-{
+static uint32_t simpleEnc(uint8_t* src, int size, int pos, uint32_t* pMatchPos) {
     int numBytes = 1;
     int matchPos = 0;
 
@@ -92,17 +81,14 @@ static uint32_t simpleEnc(uint8_t *src, int size, int pos, uint32_t *pMatchPos)
     if (end > MAX_RUNLEN)
         end = MAX_RUNLEN;
 
-    for (int i = startPos; i < pos; i++)
-    {
+    for (int i = startPos; i < pos; i++) {
         int j;
 
-        for (j = 0; j < end; j++)
-        {
+        for (j = 0; j < end; j++) {
             if (src[i + j] != src[j + pos])
                 break;
         }
-        if (j > numBytes)
-        {
+        if (j > numBytes) {
             numBytes = j;
             matchPos = i;
         }
@@ -117,8 +103,7 @@ static uint32_t simpleEnc(uint8_t *src, int size, int pos, uint32_t *pMatchPos)
 }
 
 // a lookahead encoding scheme for ngc Yaz0
-static uint32_t nintendoEnc(uint8_t *src, int size, int pos, uint32_t *pMatchPos)
-{
+static uint32_t nintendoEnc(uint8_t* src, int size, int pos, uint32_t* pMatchPos) {
     uint32_t numBytes = 1;
     static uint32_t numBytes1;
     static uint32_t matchPos;
@@ -128,8 +113,7 @@ static uint32_t nintendoEnc(uint8_t *src, int size, int pos, uint32_t *pMatchPos
     // was determined by look-ahead try.
     // so just use it. this is not the best optimization,
     // but nintendo's choice for speed.
-    if (prevFlag == 1)
-    {
+    if (prevFlag == 1) {
         *pMatchPos = matchPos;
         prevFlag = 0;
         return numBytes1;
@@ -140,13 +124,11 @@ static uint32_t nintendoEnc(uint8_t *src, int size, int pos, uint32_t *pMatchPos
     *pMatchPos = matchPos;
 
     // if this position is RLE encoded, then compare to copying 1 byte and next position(pos+1) encoding
-    if (numBytes >= 3)
-    {
+    if (numBytes >= 3) {
         numBytes1 = simpleEnc(src, size, pos + 1, &matchPos);
         // if the next position encoding is +2 longer than current position, choose it.
         // this does not guarantee the best optimization, but fairly good optimization with speed.
-        if (numBytes1 >= numBytes + 2)
-        {
+        if (numBytes1 >= numBytes + 2) {
             numBytes = 1;
             prevFlag = 1;
         }
@@ -154,8 +136,7 @@ static uint32_t nintendoEnc(uint8_t *src, int size, int pos, uint32_t *pMatchPos
     return numBytes;
 }
 
-int yaz0_encode(uint8_t *src, uint8_t *dst, int srcSize)
-{
+int yaz0_encode(uint8_t* src, uint8_t* dst, int srcSize) {
     int srcPos = 0;
     int dstPos = 0;
     int bufPos = 0;
@@ -163,30 +144,26 @@ int yaz0_encode(uint8_t *src, uint8_t *dst, int srcSize)
     uint8_t buf[24]; // 8 codes * 3 bytes maximum
 
     uint32_t validBitCount = 0; // number of valid bits left in "code" byte
-    uint8_t currCodeByte = 0; // a bitfield, set bits meaning copy, unset meaning RLE
+    uint8_t currCodeByte = 0;   // a bitfield, set bits meaning copy, unset meaning RLE
 
-    while (srcPos < srcSize)
-    {
+    while (srcPos < srcSize) {
         uint32_t numBytes;
         uint32_t matchPos;
 
         numBytes = nintendoEnc(src, srcSize, srcPos, &matchPos);
-        if (numBytes < 3)
-        {
+        if (numBytes < 3) {
             // straight copy
             buf[bufPos] = src[srcPos];
             bufPos++;
             srcPos++;
-            //set flag for straight copy
+            // set flag for straight copy
             currCodeByte |= (0x80 >> validBitCount);
-        }
-        else
-        {
-            //RLE part
+        } else {
+            // RLE part
             uint32_t dist = srcPos - matchPos - 1;
             uint8_t byte1, byte2, byte3;
 
-            if (numBytes >= 0x12)  // 3 byte encoding
+            if (numBytes >= 0x12) // 3 byte encoding
             {
                 byte1 = 0 | (dist >> 8);
                 byte2 = dist & 0xFF;
@@ -197,8 +174,7 @@ int yaz0_encode(uint8_t *src, uint8_t *dst, int srcSize)
                     numBytes = MAX_RUNLEN;
                 byte3 = numBytes - 0x12;
                 buf[bufPos++] = byte3;
-            }
-            else  // 2 byte encoding
+            } else // 2 byte encoding
             {
                 byte1 = ((numBytes - 2) << 4) | (dist >> 8);
                 byte2 = dist & 0xFF;
@@ -211,8 +187,7 @@ int yaz0_encode(uint8_t *src, uint8_t *dst, int srcSize)
         validBitCount++;
 
         // write eight codes
-        if (validBitCount == 8)
-        {
+        if (validBitCount == 8) {
             dst[dstPos++] = currCodeByte;
             for (int j = 0; j < bufPos; j++)
                 dst[dstPos++] = buf[j];
@@ -223,8 +198,7 @@ int yaz0_encode(uint8_t *src, uint8_t *dst, int srcSize)
         }
     }
 
-    if (validBitCount > 0)
-    {
+    if (validBitCount > 0) {
         dst[dstPos++] = currCodeByte;
         for (int j = 0; j < bufPos; j++)
             dst[dstPos++] = buf[j];
diff --git a/tools/buildtools/yaz0.h b/tools/buildtools/yaz0.h
index 0cc3703ec9..97656aac53 100644
--- a/tools/buildtools/yaz0.h
+++ b/tools/buildtools/yaz0.h
@@ -1,10 +1,10 @@
-#ifndef _YAZ0_H_
-#define _YAZ0_H_
+#ifndef YAZ0_H
+#define YAZ0_H
 
-int yaz0_encode2(uint8_t *src, uint8_t *dest, int uncompressedSize);
+int yaz0_encode2(uint8_t* src, uint8_t* dest, int uncompressedSize);
 
 void yaz0_decode(uint8_t* src, uint8_t* dst, int uncompressedSize);
 
-int yaz0_encode(uint8_t *src, uint8_t *dest, int srcSize);
+int yaz0_encode(uint8_t* src, uint8_t* dest, int srcSize);
 
-#endif  // _YAZ0_H_
+#endif // YAZ0_H