mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 12:54:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix BSS of 2 actors to avoid hardcoded increments in the spec (#119)

Browse Source
This commit is contained in:
Roman971 2020-05-06 01:09:57 +02:00 committed by GitHub
parent 1425678d8a
commit f7187808bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/overlays/actors/z_en_box.bss.s Normal file
View File

@ -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

11
data/overlays/actors/z_en_sw.bss.s Normal file
View File

@ -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

6
spec
View File

@ -593,8 +593,6 @@ beginseg
include "build/src/overlays/gamestates/ovl_opening/z_opening_reloc.o" include "build/src/overlays/gamestates/ovl_opening/z_opening_reloc.o"
endseg endseg
// note: increment commands account for segments who have BSS data but reflect a Virt addr range difference.
beginseg beginseg
name "ovl_file_choose" name "ovl_file_choose"
include "build/src/overlays/gamestates/ovl_file_choose/z_file_choose.o" include "build/src/overlays/gamestates/ovl_file_choose/z_file_choose.o"
@ -2193,9 +2191,9 @@ endseg
beginseg beginseg
name "ovl_En_Box" name "ovl_En_Box"
increment 0x10
include "build/src/overlays/actors/ovl_En_Box/z_en_box.o" 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.data.o"
include "build/data/overlays/actors/z_en_box.bss.o"
include "build/data/overlays/actors/z_en_box.reloc.o" include "build/data/overlays/actors/z_en_box.reloc.o"
endseg endseg
@ -3267,9 +3265,9 @@ endseg
beginseg beginseg
name "ovl_En_Sw" name "ovl_En_Sw"
increment 0x80
include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o" 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.data.o"
include "build/data/overlays/actors/z_en_sw.bss.o"
include "build/data/overlays/actors/z_en_sw.reloc.o" include "build/data/overlays/actors/z_en_sw.reloc.o"
endseg endseg