From 3237f176cd7dcbc97370c21a62de543c9fc03ffb Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Sat, 19 Dec 2020 11:16:34 -0500
Subject: [PATCH] Fix a couple of actors to use auto generated reloc (#547)

* FIX RELOC

* Update spec

* Delete z_bg_spot15_saku.reloc.s

* Add endseg back

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
---
 data/overlays/actors/z_bg_spot15_saku.reloc.s | 13 -------------
 data/overlays/actors/z_en_bird.reloc.s        |  6 ------
 spec                                          |  4 ++--
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 data/overlays/actors/z_bg_spot15_saku.reloc.s
 delete mode 100644 data/overlays/actors/z_en_bird.reloc.s

diff --git a/data/overlays/actors/z_bg_spot15_saku.reloc.s b/data/overlays/actors/z_bg_spot15_saku.reloc.s
deleted file mode 100644
index b504bbe200..0000000000
--- a/data/overlays/actors/z_bg_spot15_saku.reloc.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purpose registers
-
-.section .rodata
-
-.balign 16
-
-glabel D_808B4BB0
-    .incbin "baserom/ovl_Bg_Spot15_Saku", 0x360, 0x00000080
diff --git a/data/overlays/actors/z_en_bird.reloc.s b/data/overlays/actors/z_en_bird.reloc.s
deleted file mode 100644
index fc04c7d552..0000000000
--- a/data/overlays/actors/z_en_bird.reloc.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.section .rodata
-
-.balign 16
-
-D_809C2000:
-.incbin "baserom/ovl_En_Bird", 0x450, 0x00000060
diff --git a/spec b/spec
index 06935e7f8e..7cfd54a3eb 100644
--- a/spec
+++ b/spec
@@ -1278,7 +1278,7 @@ endseg
 beginseg
     name "ovl_Bg_Spot15_Saku"
     include "build/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.o"
-    include "build/data/overlays/actors/z_bg_spot15_saku.reloc.o"
+    include "build/src/overlays/actors/ovl_Bg_Spot15_Saku/ovl_Bg_Spot15_Saku_reloc.o"
 endseg
 
 beginseg
@@ -1955,7 +1955,7 @@ endseg
 beginseg
     name "ovl_En_Bird"
     include "build/src/overlays/actors/ovl_En_Bird/z_en_bird.o"
-    include "build/data/overlays/actors/z_en_bird.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Bird/ovl_En_Bird_reloc.o"
 endseg
 
 beginseg