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 18:03:45 -04:00
committed by GitHub
co-authored by Derek Hensley Zach Banks
parent bb7247875b
commit 54aef44a9e
15 changed files with 146 additions and 61 deletions
+5
View File
@@ -422,6 +422,11 @@ D_060004B0 = 0x060004B0;
/* z_en_jc_mato */
D_06000390 = 0x06000390;
/* z_bg_tobira01 */
D_060011C0 = 0x060011C0;
D_06000088 = 0x06000088;
/* obj_bell */
D_06001BA8 = 0x06001BA8;
D_06000840 = 0x06000840;