1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-20 05:30:26 +00:00

en_mm and object_mm OK (#735)

* almost done

* progress

* OK

* update mm2

* delete asm

* whitespace

* Update assets/xml/objects/object_mm.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Mm/z_en_mm.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* name data

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
fig02 2021-03-28 19:18:41 -04:00 committed by GitHub
commit 7f3be6e37f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 648 additions and 1515 deletions

6
spec
View file

@ -2653,8 +2653,7 @@ endseg
beginseg
name "ovl_En_Mm"
include "build/src/overlays/actors/ovl_En_Mm/z_en_mm.o"
include "build/data/overlays/actors/z_en_mm.data.o"
include "build/data/overlays/actors/z_en_mm.reloc.o"
include "build/src/overlays/actors/ovl_En_Mm/ovl_En_Mm_reloc.o"
endseg
beginseg
@ -5330,7 +5329,8 @@ endseg
beginseg
name "object_mm"
romalign 0x1000
include "build/baserom/object_mm.o"
include "build/assets/objects/object_mm/object_mm.o"
number 6
endseg
beginseg