z_bg_tobira01 OK (#168)

* data merge

* two funcs

* one left

* actor OK

* file done

* fix warnings with jenkins

* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update z_bg_tobira01.c

* Update z_en_encount2.h

* Update z_obj_bell.c

* Update z_en_pametfrog.c

* Update z_en_minifrog.c

* Update include/functions.h

Co-authored-by: Zach Banks <zjbanks@gmail.com>

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Zach Banks <zjbanks@gmail.com>
This commit is contained in:
Zelllll
2021-06-11 17:03:45 -05:00
committed by GitHub
parent bb7247875b
commit 54aef44a9e
15 changed files with 146 additions and 61 deletions
+2 -2
View File
@@ -6480,9 +6480,9 @@ SECTIONS
ovl_Bg_Tobira01 : AT(RomLocation)
{
build/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.o(.text)
build/asm/overlays/ovl_Bg_Tobira01_data.o(.data)
build/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.o(.data)
build/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.o(.rodata)
build/asm/overlays/ovl_Bg_Tobira01_rodata.o(.rodata)
build/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;