mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-20 13:40:02 +00:00
Code Issues Projects Releases Wiki Activity

Barinade (Boss_Va) (#529)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* When life gives you Bari, make Barinade

* Now with more names

* merge

* enums everywhere

* just one left

* OK

* more docs

* a little more

* I don't even remember what I changed

* small cleanup

* maybe it's time

* weird

* not sure what's up with sys_matrix

* camera functions

* it's no object

* unused

* back to being unused

* 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"

* hope this works

* 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"

* object fix

* stuff

* test merge

* merge colchk

* merge colchk

* one more thing

* naming things

* naming things

* implement most suggestions, and format

* fixes

* format

* more fixes

* more fixes and format

* body -> get_body

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
petrie911 2021-08-08 12:57:07 -05:00 • committed by GitHub
commit 65f65870a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
84 changed files with 4042 additions and 15337 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec
View file

@ -1440,9 +1440,7 @@ endseg
beginseg
name "ovl_Boss_Va"
include "build/src/overlays/actors/ovl_Boss_Va/z_boss_va.o"
include "build/data/overlays/actors/z_boss_va.data.o"
include "build/data/overlays/actors/z_boss_va.bss.o"
include "build/data/overlays/actors/z_boss_va.reloc.o"
include "build/src/overlays/actors/ovl_Boss_Va/ovl_Boss_Va_reloc.o"
endseg
beginseg
@ -4277,7 +4275,7 @@ endseg
beginseg
name "object_bv"
romalign 0x1000
include "build/baserom/object_bv.o"
include "build/assets/objects/object_bv/object_bv.o"
number 6
endseg