From f39d412bfe940afef4e152ad863ecc79cb2b2bd3 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sat, 1 Apr 2023 21:10:00 -0300 Subject: Actors revert cleanup (#1221) * Revert "ovl_Bg_Keikoku_Spr OK (#111)" This reverts commit fed1b37da1dcab04124f27d32bec98275f7fe3f2. * Revert "z_bg_tobira01 OK (#168)" This reverts commit 54aef44a9e8b70591d1b626f21fa4d309cf7a595. * Revert "Bg_Lotus OK (#86)" This reverts commit d0af9587bae947909890c63a9f72f5bc5c107253. * Revert "Door_Spiral OK (from zel) (#87)" This reverts commit 6e4d156ad788f4add678481d38f6cfa5f35e33e2. * Revert "en_invadepoh OK (#200)" This reverts commit e1219e7351e0522327696006fd6577045f343ad5. * Revert "ovl_Item_B_Heart OK (#110)" This reverts commit f0cd2db05579c0237b2fa7836ac696de824844e1. * Revert "ovl_Obj_Boyo OK (#112)" This reverts commit 536a484f73f4a8a54611d8f4d692faa4bf572d3e. * more reverts and fix building * restore timeconv.py * restore func_800BFD84 --- spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'spec') diff --git a/spec b/spec index 325fffa4a..a10cb67ce 100644 --- a/spec +++ b/spec @@ -999,7 +999,8 @@ beginseg name "ovl_Item_B_Heart" compress include "build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o" - include "build/src/overlays/actors/ovl_Item_B_Heart/ovl_Item_B_Heart_reloc.o" + include "build/data/ovl_Item_B_Heart/ovl_Item_B_Heart.data.o" + include "build/data/ovl_Item_B_Heart/ovl_Item_B_Heart.reloc.o" endseg beginseg @@ -1034,7 +1035,8 @@ beginseg name "ovl_Bg_Keikoku_Spr" compress include "build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o" - include "build/src/overlays/actors/ovl_Bg_Keikoku_Spr/ovl_Bg_Keikoku_Spr_reloc.o" + include "build/data/ovl_Bg_Keikoku_Spr/ovl_Bg_Keikoku_Spr.data.o" + include "build/data/ovl_Bg_Keikoku_Spr/ovl_Bg_Keikoku_Spr.reloc.o" endseg beginseg @@ -2113,7 +2115,8 @@ beginseg name "ovl_Door_Spiral" compress include "build/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.o" - include "build/src/overlays/actors/ovl_Door_Spiral/ovl_Door_Spiral_reloc.o" + include "build/data/ovl_Door_Spiral/ovl_Door_Spiral.data.o" + include "build/data/ovl_Door_Spiral/ovl_Door_Spiral.reloc.o" endseg beginseg @@ -2141,7 +2144,8 @@ beginseg name "ovl_Obj_Boyo" compress include "build/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.o" - include "build/src/overlays/actors/ovl_Obj_Boyo/ovl_Obj_Boyo_reloc.o" + include "build/data/ovl_Obj_Boyo/ovl_Obj_Boyo.data.o" + include "build/data/ovl_Obj_Boyo/ovl_Obj_Boyo.reloc.o" endseg beginseg @@ -3334,7 +3338,8 @@ beginseg name "ovl_Bg_Lotus" compress include "build/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.o" - include "build/src/overlays/actors/ovl_Bg_Lotus/ovl_Bg_Lotus_reloc.o" + include "build/data/ovl_Bg_Lotus/ovl_Bg_Lotus.data.o" + include "build/data/ovl_Bg_Lotus/ovl_Bg_Lotus.reloc.o" endseg beginseg @@ -3593,7 +3598,8 @@ beginseg name "ovl_Bg_Tobira01" compress include "build/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.o" - include "build/src/overlays/actors/ovl_Bg_Tobira01/ovl_Bg_Tobira01_reloc.o" + include "build/data/ovl_Bg_Tobira01/ovl_Bg_Tobira01.data.o" + include "build/data/ovl_Bg_Tobira01/ovl_Bg_Tobira01.reloc.o" endseg beginseg @@ -3811,7 +3817,9 @@ beginseg name "ovl_En_Invadepoh" compress include "build/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.o" - include "build/src/overlays/actors/ovl_En_Invadepoh/ovl_En_Invadepoh_reloc.o" + include "build/data/ovl_En_Invadepoh/ovl_En_Invadepoh.data.o" + include "build/data/ovl_En_Invadepoh/ovl_En_Invadepoh.bss.o" + include "build/data/ovl_En_Invadepoh/ovl_En_Invadepoh.reloc.o" endseg beginseg -- cgit v1.2.3