From f7187808bcd39f1130ea017ce92c25bdaf6e62db Mon Sep 17 00:00:00 2001
From: Roman971 <32455037+Roman971@users.noreply.github.com>
Date: Wed, 6 May 2020 01:09:57 +0200
Subject: [PATCH] Fix BSS of 2 actors to avoid hardcoded increments in the spec
 (#119)

---
 data/overlays/actors/z_en_box.bss.s | 11 +++++++++++
 data/overlays/actors/z_en_sw.bss.s  | 11 +++++++++++
 spec                                |  6 ++----
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 data/overlays/actors/z_en_box.bss.s
 create mode 100644 data/overlays/actors/z_en_sw.bss.s

diff --git a/data/overlays/actors/z_en_box.bss.s b/data/overlays/actors/z_en_box.bss.s
new file mode 100644
index 0000000000..d3fcb9210c
--- /dev/null
+++ b/data/overlays/actors/z_en_box.bss.s
@@ -0,0 +1,11 @@
+.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 purposee registers
+
+.bss
+
+glabel D_809CAB00
+    .space 0x10
diff --git a/data/overlays/actors/z_en_sw.bss.s b/data/overlays/actors/z_en_sw.bss.s
new file mode 100644
index 0000000000..992a934b69
--- /dev/null
+++ b/data/overlays/actors/z_en_sw.bss.s
@@ -0,0 +1,11 @@
+.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 purposee registers
+
+.bss
+
+glabel D_80B0F630
+    .space 0x80
diff --git a/spec b/spec
index 468a8ae676..4f5ac168ff 100644
--- a/spec
+++ b/spec
@@ -593,8 +593,6 @@ beginseg
     include "build/src/overlays/gamestates/ovl_opening/z_opening_reloc.o"
 endseg
 
-// note: increment commands account for segments who have BSS data but reflect a Virt addr range difference.
-
 beginseg
     name "ovl_file_choose"
     include "build/src/overlays/gamestates/ovl_file_choose/z_file_choose.o"
@@ -2193,9 +2191,9 @@ endseg
 
 beginseg
     name "ovl_En_Box"
-    increment 0x10
     include "build/src/overlays/actors/ovl_En_Box/z_en_box.o"
     include "build/data/overlays/actors/z_en_box.data.o"
+    include "build/data/overlays/actors/z_en_box.bss.o"
     include "build/data/overlays/actors/z_en_box.reloc.o"
 endseg
 
@@ -3267,9 +3265,9 @@ endseg
 
 beginseg
     name "ovl_En_Sw"
-    increment 0x80
     include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o"
     include "build/data/overlays/actors/z_en_sw.data.o"
+    include "build/data/overlays/actors/z_en_sw.bss.o"
     include "build/data/overlays/actors/z_en_sw.reloc.o"
 endseg