diff options
| author | mzxrules <mzxrules@gmail.com> | 2021-04-25 19:36:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-25 19:36:43 -0400 |
| commit | 1ac9479caeccca1b4f03436a0cd7c91ee58cd505 (patch) | |
| tree | 2480749361341571c6b4ecbea637acfab39dc598 /spec | |
| parent | b7849976cf90a79152f23ff897c3032ffcafa8de (diff) | |
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>
Diffstat (limited to 'spec')
| -rw-r--r-- | spec | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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 |