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

Armos and object_am OK (#652)

Browse source 
* started

* all but 2

* OK

* docs progress

* lots of docs

* add gitkeep back

* all funcs named

* small fix

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0305ec2c2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0305ec2c2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* object_am

* change

* ready i think

* last thing

* asm

* progress
This commit is contained in:
fig02 2021-02-15 13:41:55 -05:00 • committed by GitHub
commit 982c645167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
131 changed files with 1077 additions and 2585 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec
View file

@ -1839,8 +1839,7 @@ endseg
beginseg
name "ovl_En_Am"
include "build/src/overlays/actors/ovl_En_Am/z_en_am.o"
include "build/data/overlays/actors/z_en_am.data.o"
include "build/data/overlays/actors/z_en_am.reloc.o"
include "build/src/overlays/actors/ovl_En_Am/ovl_En_Am_reloc.o"
endseg
beginseg
@ -3800,7 +3799,8 @@ endseg
beginseg
name "object_am"
romalign 0x1000
include "build/baserom/object_am.o"
include "build/assets/objects/object_am/object_am.o"
number 6
endseg
beginseg