mirror of
https://github.com/zeldaret/oot.git
synced 2025-10-18 12:40:05 +00:00
EnJj and object_jj OK (#741)
* Shift to new branch * object_jj decomped * docs * Documented blinking, various other things * more naming * Most stuff in the object named * implement eye enums * delete asm * Changes from Fig's review * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
parent
1639417327
commit
ed4021a6fe
22 changed files with 532 additions and 761 deletions
6
spec
6
spec
|
@ -2511,8 +2511,7 @@ endseg
|
|||
beginseg
|
||||
name "ovl_En_Jj"
|
||||
include "build/src/overlays/actors/ovl_En_Jj/z_en_jj.o"
|
||||
include "build/data/overlays/actors/z_en_jj.data.o"
|
||||
include "build/data/overlays/actors/z_en_jj.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Jj/ovl_En_Jj_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
@ -3845,7 +3844,8 @@ endseg
|
|||
beginseg
|
||||
name "object_jj"
|
||||
romalign 0x1000
|
||||
include "build/baserom/object_jj.o"
|
||||
include "build/assets/objects/object_jj/object_jj.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue