mirror of
https://github.com/zeldaret/oot
synced 2026-07-11 15:18:59 -04:00
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442)
* Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * It's Phantom Ganon time * Fhg_Fire matched * small touch up * more documentation * starting naming fire * renaming * cleanup * hooray for new names * merge * first pass * camera status * bgcheck * object 1 * object 2 * .s * .s * fig's comments * implementing zel's suggestions and a few other things * the work begins * work continues * docs, shifts, cleanup * cleanup * texture names * addressing the rest of the notes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
@@ -1412,8 +1412,7 @@ endseg
|
||||
beginseg
|
||||
name "ovl_Boss_Ganondrof"
|
||||
include "build/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.o"
|
||||
include "build/data/overlays/actors/z_boss_ganondrof.data.o"
|
||||
include "build/data/overlays/actors/z_boss_ganondrof.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_Boss_Ganondrof/ovl_Boss_Ganondrof_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
@@ -2212,8 +2211,7 @@ endseg
|
||||
beginseg
|
||||
name "ovl_En_Fhg_Fire"
|
||||
include "build/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.o"
|
||||
include "build/data/overlays/actors/z_en_fhg_fire.data.o"
|
||||
include "build/data/overlays/actors/z_en_fhg_fire.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Fhg_Fire/ovl_En_Fhg_Fire_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
@@ -3198,8 +3196,7 @@ endseg
|
||||
beginseg
|
||||
name "ovl_En_fHG"
|
||||
include "build/src/overlays/actors/ovl_En_fHG/z_en_fhg.o"
|
||||
include "build/data/overlays/actors/z_en_fhg.data.o"
|
||||
include "build/data/overlays/actors/z_en_fhg.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_fHG/ovl_En_fHG_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
@@ -3794,7 +3791,8 @@ endseg
|
||||
beginseg
|
||||
name "object_gnd"
|
||||
romalign 0x1000
|
||||
include "build/baserom/object_gnd.o"
|
||||
include "build/assets/objects/object_gnd/object_gnd.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
@@ -4002,7 +4000,8 @@ endseg
|
||||
beginseg
|
||||
name "object_fhg"
|
||||
romalign 0x1000
|
||||
include "build/baserom/object_fhg.o"
|
||||
include "build/assets/objects/object_fhg/object_fhg.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
Reference in New Issue
Block a user