mirror of
https://github.com/zeldaret/oot
synced 2026-07-08 06:21:06 -04:00
En_Torch2 (#486)
* Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * Oh boy more giant functions * now functional, but not equivalent * Now only non-matching * cleaned up illusion room * much closer. static variables still suck though * much closer. static variables still suck though * some docs and cleanup. matching is horrible. * static varaibles are a troublesome lot * ifdef * merge ZAP * merge again * small cleanup * small fixes * swordstate * resolve conflict * comments and such Co-authored-by: fig <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
@@ -3072,9 +3072,11 @@ endseg
|
||||
beginseg
|
||||
name "ovl_En_Torch2"
|
||||
include "build/src/overlays/actors/ovl_En_Torch2/z_en_torch2.o"
|
||||
include "build/data/overlays/actors/z_en_torch2.data.o"
|
||||
include "build/data/overlays/actors/z_en_torch2.bss.o"
|
||||
#ifdef NON_MATCHING
|
||||
include "build/src/overlays/actors/ovl_En_Torch2/ovl_En_Torch2_reloc.o"
|
||||
#else
|
||||
include "build/data/overlays/actors/z_en_torch2.reloc.o"
|
||||
#endif
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
Reference in New Issue
Block a user