mirror of
https://github.com/zeldaret/oot.git
synced 2025-10-17 04:00:51 +00:00
Volvagia (ovl_Boss_Fd) and related actors (#352)
* Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
parent
7306d13897
commit
7b2b88d552
95 changed files with 4290 additions and 11359 deletions
20
spec
20
spec
|
@ -1339,8 +1339,7 @@ endseg
|
|||
beginseg
|
||||
name "ovl_Bg_Vb_Sima"
|
||||
include "build/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.o"
|
||||
include "build/data/overlays/actors/z_bg_vb_sima.data.o"
|
||||
include "build/data/overlays/actors/z_bg_vb_sima.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_Bg_Vb_Sima/ovl_Bg_Vb_Sima_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
@ -1376,15 +1375,17 @@ endseg
|
|||
beginseg
|
||||
name "ovl_Boss_Fd"
|
||||
include "build/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.o"
|
||||
include "build/data/overlays/actors/z_boss_fd.data.o"
|
||||
#ifdef NON_MATCHING
|
||||
include "build/src/overlays/actors/ovl_Boss_Fd/ovl_Boss_Fd_reloc.o"
|
||||
#else
|
||||
include "build/data/overlays/actors/z_boss_fd.reloc.o"
|
||||
#endif
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
name "ovl_Boss_Fd2"
|
||||
include "build/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.o"
|
||||
include "build/data/overlays/actors/z_boss_fd2.data.o"
|
||||
include "build/data/overlays/actors/z_boss_fd2.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_Boss_Fd2/ovl_Boss_Fd2_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
@ -3028,8 +3029,7 @@ endseg
|
|||
beginseg
|
||||
name "ovl_En_Vb_Ball"
|
||||
include "build/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.o"
|
||||
include "build/data/overlays/actors/z_en_vb_ball.data.o"
|
||||
include "build/data/overlays/actors/z_en_vb_ball.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Vb_Ball/ovl_En_Vb_Ball_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
@ -4312,7 +4312,8 @@ endseg
|
|||
beginseg
|
||||
name "object_fd"
|
||||
romalign 0x1000
|
||||
include "build/baserom/object_fd.o"
|
||||
include "build/assets/objects/object_fd/object_fd.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
@ -4363,7 +4364,8 @@ endseg
|
|||
beginseg
|
||||
name "object_fd2"
|
||||
romalign 0x1000
|
||||
include "build/baserom/object_fd2.o"
|
||||
include "build/assets/objects/object_fd2/object_fd2.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue