From cb9d85de344e906b85f12304e09116d19da4d513 Mon Sep 17 00:00:00 2001 From: petrie911 <69443847+petrie911@users.noreply.github.com> Date: Mon, 18 Jan 2021 18:15:04 -0600 Subject: [PATCH] relocs (#645) Co-authored-by: petrie911 --- data/overlays/actors/z_en_owl.reloc.s | 13 ------------- data/overlays/actors/z_en_viewer.reloc.s | 13 ------------- spec | 8 -------- 3 files changed, 34 deletions(-) delete mode 100644 data/overlays/actors/z_en_owl.reloc.s delete mode 100644 data/overlays/actors/z_en_viewer.reloc.s diff --git a/data/overlays/actors/z_en_owl.reloc.s b/data/overlays/actors/z_en_owl.reloc.s deleted file mode 100644 index 6590b3ca3c..0000000000 --- a/data/overlays/actors/z_en_owl.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_80ACD870 - .incbin "baserom/ovl_En_Owl", 0x3950, 0x00000560 diff --git a/data/overlays/actors/z_en_viewer.reloc.s b/data/overlays/actors/z_en_viewer.reloc.s deleted file mode 100644 index 5933845977..0000000000 --- a/data/overlays/actors/z_en_viewer.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_80B2D1D0 - .incbin "baserom/ovl_En_Viewer", 0x2FD0, 0x00000270 diff --git a/spec b/spec index 00dff8369f..adb67587c3 100644 --- a/spec +++ b/spec @@ -2783,11 +2783,7 @@ endseg beginseg name "ovl_En_Owl" include "build/src/overlays/actors/ovl_En_Owl/z_en_owl.o" -#ifdef NON_MATCHING include "build/src/overlays/actors/ovl_En_Owl/ovl_En_Owl_reloc.o" -#else - include "build/data/overlays/actors/z_en_owl.reloc.o" -#endif endseg beginseg @@ -3107,11 +3103,7 @@ endseg beginseg name "ovl_En_Viewer" include "build/src/overlays/actors/ovl_En_Viewer/z_en_viewer.o" -#ifdef NON_MATCHING include "build/src/overlays/actors/ovl_En_Viewer/ovl_En_Viewer_reloc.o" -#else - include "build/data/overlays/actors/z_en_viewer.reloc.o" -#endif endseg beginseg