mirror of
https://github.com/zeldaret/oot
synced 2026-07-10 15:04:07 -04:00
z_bg_mizu_movebg and object_mizu_objects (#747)
* OK a few functions * BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall * migrate data * create mizu_objects, defines for water temple water level * clean up some code * implement most suggestions * review * review2 * formatting Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
@@ -1028,9 +1028,11 @@ endseg
|
||||
beginseg
|
||||
name "ovl_Bg_Mizu_Movebg"
|
||||
include "build/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.o"
|
||||
include "build/data/overlays/actors/z_bg_mizu_movebg.data.o"
|
||||
include "build/data/overlays/actors/z_bg_mizu_movebg.bss.o"
|
||||
#ifdef NON_MATCHING
|
||||
include "build/src/overlays/actors/ovl_Bg_Mizu_Movebg/ovl_Bg_Mizu_Movebg_reloc.o"
|
||||
#else
|
||||
include "build/data/overlays/actors/z_bg_mizu_movebg.reloc.o"
|
||||
#endif
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
@@ -3969,7 +3971,8 @@ endseg
|
||||
beginseg
|
||||
name "object_mizu_objects"
|
||||
romalign 0x1000
|
||||
include "build/baserom/object_mizu_objects.o"
|
||||
include "build/assets/objects/object_mizu_objects/object_mizu_objects.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
Reference in New Issue
Block a user