mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-28 19:25:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix a couple of actors to use auto generated reloc (#547)

Browse source 
* 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>
This commit is contained in:
louist103 2020-12-19 11:16:34 -05:00 committed by GitHub
parent eadf85f17c
commit 3237f176cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
data/overlays/actors/z_bg_spot15_saku.reloc.s
View file

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

6
data/overlays/actors/z_en_bird.reloc.s
View file

@ -1,6 +0,0 @@
.section .rodata
.balign 16
D_809C2000:
.incbin "baserom/ovl_En_Bird", 0x450, 0x00000060

4
spec
View file

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