1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Commit graph

493 commits

Author SHA1 Message Date
Ethan Roseman
ecedc4f059
Decompiled ovl_Bg_Hidan_Hrock (#690)
* Fixing mkldscript.c for mac

* 1 to go

* merge update

* almost

* small update

* updating API with master

* NON_MATCHING

* names of vars

* almost matching

Signed-off-by: angie <angheloalf95@gmail.com>

* BgHidanHrock_Init matching

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* renames

* format

* PR suggestions

Co-authored-by: angie <angheloalf95@gmail.com>
2021-02-15 14:33:41 -05:00
fig02
982c645167
Armos and object_am OK (#652)
* 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
2021-02-15 19:41:55 +01:00
Anghelo Carvajal
5bc23f58f8
ovl_En_Anubice_Fire OK (#687)
* init, destroy and other func

Signed-off-by: angie <angheloalf95@gmail.com>

* func_809B2B48

Signed-off-by: angie <angheloalf95@gmail.com>

* EnAnubiceFire_Update

Signed-off-by: angie <angheloalf95@gmail.com>

* EnAnubiceFire_Draw NON_MATCHING

Signed-off-by: angie <angheloalf95@gmail.com>

* import data

Signed-off-by: angie <angheloalf95@gmail.com>

* inline some static variables

Signed-off-by: angie <angheloalf95@gmail.com>

* EnAnubiceFire_Draw

Signed-off-by: angie <angheloalf95@gmail.com>

* func_809B27D8

Signed-off-by: angie <angheloalf95@gmail.com>

* final cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* ups

Signed-off-by: angie <angheloalf95@gmail.com>

* changes requested by @petrie911

Signed-off-by: angie <angheloalf95@gmail.com>

* changes requested by @Roman971

Signed-off-by: angie <angheloalf95@gmail.com>

* I somehow forgot to delete that file

Signed-off-by: angie <angheloalf95@gmail.com>

* i don't know what to put in this message

Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-14 15:37:22 -05:00
AdamKiddle
97cfe49797
Magic Fire OK (#662)
* all done, graphics commands written in draw however very messy and non matching

* figuring out data

* OK

* formatting before merge

* pr stuff

* more pr stuff

* pr changes
2021-02-14 12:55:11 -05:00
mzxrules
d615ec4f31
z_bg_jya_ironobj and object_jya_iron OK (#676)
* z_bg_jya_ironobj OK

* decompile object_jya_iron, clean up code

* implement requested changes
2021-02-13 19:10:40 -05:00
mzxrules
f9886c1097
z_bg_hidan_sima OK (#680)
* z_bg_hidan_sima OK

* cleanup code

* implement suggestions
2021-02-13 18:31:25 -05:00
DefinedBehavior
12348ca3df
ObjWarp2block OK (#685)
* ObjWarp2block OK

* Address petrie's comments

* Rename unused temp to reflect that it's padding

* Address fig comments

* Use a single byte in offset and size comments

* Address roman's comments
2021-02-13 17:51:08 -05:00
krimtonz
cf06b27b15
Decompile en_sw (#679)
* decompile ovl_en_sw

* remove unused asm

* some cleanup, run format

* review

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-12 20:52:39 -05:00
Zelllll
4d30626033
Bg_Breakwall OK and documented (#684)
* cleanup breakwall

* fix mistake in header

* make some data static

* reloc stuffs

* ready for pr

* Remove asm

* Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* fix petrie's stuff

* fixed all feedback

* Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 20:51:59 -05:00
Anghelo Carvajal
6d01247f34
ovl_Eff_Dust OK (#655)
* void func_8099D8D0(void *arg0, s32 arg1)

Signed-off-by: angie <angheloalf95@gmail.com>

* void func_8099D8D8(void *arg0, s32 arg1)

Signed-off-by: angie <angheloalf95@gmail.com>

* void EffDust_Destroy(Actor *thisx, GlobalContext *globalCtx)

Signed-off-by: angie <angheloalf95@gmail.com>

* Fix some pointers in the struct

Signed-off-by: angie <angheloalf95@gmail.com>

* Fix functions declarations

Signed-off-by: angie <angheloalf95@gmail.com>

* void EffDust_Init(Actor *thisx, GlobalContext *globalCtx)

Signed-off-by: angie <angheloalf95@gmail.com>

* EffDust_Update, EffDust_Draw, renaming and cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* void func_8099D8E0(EffDust *this)

Signed-off-by: angie <angheloalf95@gmail.com>

* void func_8099DB28(EffDust *this, GlobalContext *globalCtx)

Signed-off-by: angie <angheloalf95@gmail.com>

* void EffDust_UpdateFunc_8099DD74(EffDust *this, GlobalContext *globalCtx)

Signed-off-by: angie <angheloalf95@gmail.com>

* Members renaming

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* NON_MATCHING void func_8099E4F4(EffDust *this, GlobalContext *globalCtx)

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* void func_8099DFC0(EffDust *this, GlobalContext *globalCtx)

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* NON_MATCHING void func_8099E784(EffDust *this, GlobalContext *globalCtx)

Signed-off-by: angie <angheloalf95@gmail.com>

* NON_MATCHING func_8099E784 - score 100

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* func_8099E784 still not matching

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* almost there (func_8099E784)

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* func_8099E784 matching. needs cleanup

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* void func_8099E784(EffDust *this, GlobalContext *globalCtx)

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Rename most members of the struct

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* void func_8099E4F4(EffDust *this, GlobalContext *globalCtx) matching

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Rename a few variables and functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Add an enum for the possibles values for actor.param

Signed-off-by: angie <angheloalf95@gmail.com>

* format files

Signed-off-by: angie <angheloalf95@gmail.com>

* fix merge problems

Signed-off-by: angie <angheloalf95@gmail.com>

* delete reloc

Signed-off-by: angie <angheloalf95@gmail.com>

* remove defined symbols from undefined_syms

Signed-off-by: angie <angheloalf95@gmail.com>

* a bunch of functions

Signed-off-by: angie <angheloalf95@gmail.com>

* another bunch of functions

Signed-off-by: angie <angheloalf95@gmail.com>

* add dummies to func_8097911C to match it

Signed-off-by: angie <angheloalf95@gmail.com>

* fix some functions declarations

Signed-off-by: angie <angheloalf95@gmail.com>

* Add functions of the array used by the update function

Signed-off-by: angie <angheloalf95@gmail.com>

* add functions used by draw

Signed-off-by: angie <angheloalf95@gmail.com>

* draw and update functions

Signed-off-by: angie <angheloalf95@gmail.com>

* DemoGj_Init

Signed-off-by: angie <angheloalf95@gmail.com>

* fix some functions declarations

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* 9 small functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Some unmatched functions and 12 small matched functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* another 7 small functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add data

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* small types fixes

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* six more functions

Signed-off-by: angie <angheloalf95@gmail.com>

* func_80978C20

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8097BA48

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* five repeated functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Array of cylinders and two other functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* seven equals and problematic functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* func_80978F60 and func_80979860

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8097923C doesn't want to match :c

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* three not matching functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* func_80978AFC

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* three more

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* DemoGj_FindGanon

Signed-off-by: angie <angheloalf95@gmail.com>

* func_809797E4

Signed-off-by: angie <angheloalf95@gmail.com>

* func_80978B90

Signed-off-by: angie <angheloalf95@gmail.com>

* last non matching function

Signed-off-by: angie <angheloalf95@gmail.com>

* erase reloc

Signed-off-by: angie <angheloalf95@gmail.com>

* a bit of renaming

Signed-off-by: angie <angheloalf95@gmail.com>

* another chunk of renaming

Signed-off-by: angie <angheloalf95@gmail.com>

* fix reg macros and a few comments

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* vt, arrayfuncs renaming and another bit of renaming

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* More renaming

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* i'm hating this actor

Signed-off-by: angie <angheloalf95@gmail.com>

* format

Signed-off-by: angie <angheloalf95@gmail.com>

* Changes asked by @shawlucas

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* changes asked by @louist103

Signed-off-by: angie <angheloalf95@gmail.com>

* Revert "Merge branch 'ovl_Demo_Gj' of github.com:AngheloAlf/oot into ovl_Eff_Dust"

This reverts commit 12e0e5d2a6, reversing
changes made to b251f1d234.

* fix merge problems

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Rename the param's enum and move it to header

Signed-off-by: angie <angheloalf95@gmail.com>

* add file description

Signed-off-by: angie <angheloalf95@gmail.com>

* Some changes requested by @Roman971

Signed-off-by: angie <angheloalf95@gmail.com>

* more changes

Signed-off-by: angie <angheloalf95@gmail.com>

* Change the particles amount from hex to decimal

Signed-off-by: angie <angheloalf95@gmail.com>

* `format.sh` should also format headers :s

Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-12 19:04:22 -05:00
gamestabled
fb1909bb92
En_Sth OK (#672)
* all functions matching

* en_sth OK

* text formatting and added a description at the top

* some suggested changes

* merge master and remove text comments

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-12 18:34:37 -05:00
Tharo
61dacd0882
Ovl_En_Gb OK (#691)
* Progress

* Matched

* Cleanup, some names

Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 17:37:13 -05:00
Anghelo Carvajal
0b2a4e9d7f
ovl_Bg_Hidan_Rock OK (#657)
* void BgHidanRock_Init(Actor *thisx, GlobalContext *globalCtx)

Signed-off-by: angie <angheloalf95@gmail.com>

* small functions

Signed-off-by: angie <angheloalf95@gmail.com>

* BgHidanRock_Destroy

Signed-off-by: angie <angheloalf95@gmail.com>

* BgHidanRock_Update

Signed-off-by: angie <angheloalf95@gmail.com>

* BgHidanRock_Draw

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8088B69C

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8088B79C

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8088B990

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8088B268 and move data

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8088BC40

Signed-off-by: angie <angheloalf95@gmail.com>

* erase reloc

Signed-off-by: angie <angheloalf95@gmail.com>

* a bit of cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* ups

Signed-off-by: angie <angheloalf95@gmail.com>

* another bit of cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* Changes requested by @petrie911

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* More changes requested by @petrie911

Signed-off-by: angie <angheloalf95@gmail.com>

* fix some types

Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-12 17:33:03 -05:00
Parker Burnett
43bba20796
Bg haka huta OK (#682)
* starting haka_huta with new changes

* matched last func, deleting asm

* added changes from review
2021-02-12 17:29:05 -05:00
petrie911
b8c2ec1f60
Forest Stage and related actors and objects (#618)
* starting out

* match demo

* full match

* cleanup

* more names

* more names

* headers

* dist from link

* docs

* objects

* format

* organization of xmls

* merge actor

* Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* format

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 17:25:02 -05:00
gamestabled
ef272322eb
dekunuts OK (#664)
* dekunuts OK

* named unk_19A

* improved the match, got rid of volatile

* one unaccounted blob

* finished object_dekunuts

* capitalization consistency

* suggested changes

* suggested changes again
2021-02-12 17:22:48 -05:00
petrie911
da55eaa2d8
En_Zl4 (#590)
* significant progress

* cutscene data

* match

* docs

* dist from link

* compiler warnings

* cutscene and such

* object decomp

* stuff

* cleanup

* name some things

* stuff

* cutscenes fixed

* git subrepo pull --force tools/ZAPD

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

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

* reorder

* unused content

* documented cutscene dlists

* enviewer update

* Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* formatter

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 17:16:40 -05:00
EllipticEllipsis
ec31611c0e
EnBili OK and documented (#654)
* OK, data imported

* reloc

* some naming, some floats

* named almost everything

* description

* delete asm

* missing static

* Address review comments

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bili/z_en_bili.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-07 20:43:02 -05:00
maekclena
b029225000
ovl_En_Weiyer (#650)
* ovl_En_Weiyer

* PR review

* PR review
2021-02-07 18:31:24 -05:00
fig02
dff2dfef0f
En_Arrow OK (#648)
* fix colliderinit typo

* fix initchain

* start init

* match init

* progress

* progress

* more funcs

* match func_809B3DD8

* progress

* last func almost done

* enum

* name some more types

* progress

* all but one

* fix warning

* remove undefined syms

* match arrows

* review

* spec

* remove asm
2021-02-02 20:30:21 -05:00
fig02
6221723aad
Bombchu OK (#647)
* all but 1

* done

* asm

* rename collider data

* final changes and format

* matched, ty petrie

* asm

* review
2021-02-02 20:12:03 -05:00
EllipticEllipsis
33ce2c977b
BgDyYoseizo OK and documented (#634)
* OK, data imported

* naming

* spec, more naming

* more naming, in EnDyExtra too

* more naming

* deleat asm

* change one function name

* addressed review comments

* Actor changes

* Address review comments

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-02 19:29:40 -05:00
EllipticEllipsis
ced724fb9b
BgSpot08Iceblock OK, some documentation (#641)
* OK, spec

* all functions and variables named,
some docs on the complicated function

* delete asm

* updated to reflect Actor changes

* simplify one thing into a ternary

* Address review comments
2021-02-02 17:28:29 -05:00
emilybrooks
7eaf57be59
ovl_en_mm2 OK (#636)
* decompiled ovl_en_mm2

* resolved conflicts

* add back huta

* review suggestions

* review 2 suggestions

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-02 16:41:03 -05:00
engineer124
cce6880bc0
En_Fr Frogs 47 of 48 func decomped (#576)
* En_Fr 47 of 48 func decomped

* EnFr more cleanup

* uncommented out EnFr_Update

* more cleanup

* added format document

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Null Pointers

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* feedback from pr

* more cleanup

* more pr feedback

* more cleaning and updates

* remove data.s

* review 2

* review

* missed one

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
2021-02-02 15:17:51 -05:00
EllipticEllipsis
ea60ad6017
Gerudo1 OK and mostly documented (#607)
* all functions matched, data imported

* some function names

* more naming

* corrections, naming

* some state flags named

* naming completed (some may be inaccurate)

* spec

* delete asm

* Review changes

* review

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 15:20:16 -05:00
EllipticEllipsis
45deae6357
Gerudo2 OK and mostly documented (#610)
* OK, inlined small data, began naming

* spec

* more naming

* finished naming

* remove ASM

* hex to dec

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 15:12:24 -05:00
mzxrules
43f47f9561
bg_ydan_sp OK (#628)
* BgYdanSp OK

* clean up for PR

* fix thisx, run format.sh

* delete unused asm

* implement roman's changes

* unnecessary comments
2021-02-01 14:56:33 -05:00
petrie911
6615d212eb
Demo_Kekkai, its object, and its cutscenes (#627)
* first pass

* scene

* object

* name

* git subrepo pull --force tools/ZAPD

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

* now with cutscenes

* one last name

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

* ZAPD works

* git subrepo pull --force tools/ZAPD

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

* now with vtx arrays

* revert zap changes

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 14:52:23 -05:00
EllipticEllipsis
1fbc0f1943
Gerudo3 OK and documented (#593)
* Ge3: OK and data migrated

* Functions and most variables named

* finished enums for limbs, inlined data

* spec updated, asm deleted

* fix dists

* changes

* changes

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 18:39:41 -05:00
Tharo
badb1d9d5e
ovl_Demo_Kankyo OK (#608)
* Decompiled, not yet matched

* Another match

* Fix merge

* OK

* Move cutscene data to separate source files, name some functions and variables

* Small cleanup

* Some docs

* Small improvements

* Struct_Unk_150 -> DemoKankyo_Unk_150

* Review Suggestions

Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Further review changes

* rm reloc asm

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 18:38:23 -05:00
Zelllll
5da5263176
En_Cs OK and mostly documented (#639)
* all except one matching

* documented and ready for pr

* remove unused asm

* change mass thing
2021-01-31 18:32:19 -05:00
Zelllll
da993894d3
En_Daiku_Kakariko OK (Kakariko Village Carpenters) (#635)
* mostly done, one function left

* daiku_kakariko OK

* should be ready for pr

* removed unused asm

* should build OK now

* builds OK now

* all of fig's suggestions resolved
2021-01-31 18:14:47 -05:00
petrie911
8137c016a2
Demo_Ik (#620)
* match

* docs might be a while

* cues

* .s

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 15:33:48 -05:00
louist103
45a21b0ac7
EnNy OK (#624)
* get data in

* Match Init and one other

* match some more

* match a bunch more

* merge master

* OK

* Some naming done

* OBJECT_NY almost done. waiting on ZAP changes

* Remove ASM

* Cleanup

* Commit before merge

* fix damage table

* Change comment
2021-01-31 15:32:55 -05:00
Zelllll
a25ae3a584
En_Mk OK (lakeside lab dude) (#616)
* en_mk OK

* ready for pr

* ok now

* anim mode enums

* fixed dodojr

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2021-01-31 15:26:34 -05:00
Zelllll
9b91229422
Bg_Spot00_Hanebasi (Drawbridge) OK (#614)
* drawbridge progress

* matched cursed draw functions

* drawbridge OK

* fix error that made it not OK

* documentation improvements

* format fix

* update with new actor struct

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 15:09:04 -05:00
Zelllll
dde70e3c66
En_Dodojr (Baby Dodongo) OK (#609)
* some functions finished

* some more progress

* a bit more progress

* more functions done, one wip

* 2 functions remain

* one function remains

* actor mostly done, still one function left

* some progress, still not equivalent

* dodojr OK

* dodojr ready

* correct actor struct

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* builds OK now

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 14:59:50 -05:00
Tharo
3e322f5d35
ovl_En_Sa (#625)
* Decompiled

* Add missing sfx id name

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 14:35:58 -05:00
Tharo
31b0ea2db8
ovl_En_Du (#630)
* Decompiled

* asm

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 14:01:16 -05:00
engineer124
8e8421fdec
Gorons: En_Go & En_Go2 OK (#556)
* moved en_go rodata

* EnGo 20/45 functions decompiled

* EnGo 25/45 functions decompiled

* EnGo 28/45 functions decompiled

* EnGo 32/45 functions decompiled

* minor attempts

* init Goron 2 6/98 decompiled (baby functions)

* Goron2 14/98 func decompiled

* Goron2 30/98 func decompiled

* EnGo 34/45 functions decompiled

* EnGo 38/45 functions decompiled

* Goron2 44/98 functions decompiled

* Goron2 58/98 functions decompiled

* Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled

* EnGo EnGo2: 38/45, 65/98 functions decompiled

* EnGo EnGo2: 38/45, 70/98 functions decompiled

* EnGo EnGo2: 39/45, 72/98 functions decompiled

* EnGo EnGo2: 39/45, 80/98 functions decompiled

* EnGo EnGo2: 39/45, 88/98 functions decompiled

* EnGo EnGo2: 39/45, 92/98 functions decompiled

* typo in GoronType

* EnGo EnGo2: 40/45, 93/98 functions decompiled

* EnGo EnGo2: 45/45, 93/98 functions decompiled

* EnGo EnGo2 fully decomped

* begin cleanup

* the cleanup continues

* continue cleaning

* Documentation and renaming attempt

* more cleanup

* more cleanup

* Apply suggestions from code review

Committing suggestions

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>

* more pr suggestions

* more pr and gns feedback

* fixed comment

* cleanup

* update math & skelAnime names

* goron1

* goron2

* relocs

* review

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig <fig02srl@gmail.com>
2021-01-31 13:02:28 -05:00
engineer124
9f3e8cbf97
En_Fz Freezard (#519)
* En_Fr 47 of 48 func decomped

* En_Fz Frezzard 26/36 func decompiled

* En_Fz Freezard fully decomped

* revert EnFr to independently submit EnFz

* EnFz fully decompiled

* more cleanup

* pr feedback

* pr feedback

* petries review

* asm

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 18:47:34 +01:00
EllipticEllipsis
c2b5ae3ed2
EnTr, 1 nonmatching, mostly documented (#621)
* 2 functions left, data imported

* one function left

* setup for NON_MATCHING

* struct variables named

* most of the functions named, type enums

* delete ASM

* Actor fixes
2021-01-31 00:07:58 -05:00
AdamKiddle
3db87244b4
EnTrap OK (#615)
* Manual migration of work to new branch due to screwing up git

* removing unused asm

* formatting

* Fixing a comment

* Adding a missing sound define
2021-01-30 13:29:37 -05:00
petrie911
6f6270100b
En_Horse_Game_Check (#619)
* stuff

* name functions

* whoops

* horse head

* matched and documented

* merge actor

* relocs

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-30 13:17:43 -05:00
Zelllll
20c1f4e648
Decompile Gameplay_Keep and fix all existing decompiled objects (#595)
* First batch of files

* Add missing folders back

* Fix missing folders again

* Finish fixing existing texture files

* Gameplay_Keep XML finished

* Most actor gameplay_keep undefined syms removed

* Only ~200 gkeep symbols remain

* All gkeep symbols that ZAP supports are fixed

* Cleanup, and make gkeep names more accurate

* Starting to figure out what some unknown blobs are, merge zeldaret in

* fix a few more things

* refactor gkeep

* Change how gitkeep is handled

* gkeep xml cleanup

* Gkeep finished, now just waiting up ZAP updates

* 100 link animations finished

* 150 link animations finished

* 200 link animations finished

* 250 link animations finished

* 350 link animations finished

* 400 link animations finished

* 450 link animations finished

* 500 link animations finished

* 550 link animations finished

* All Link animations finished

cannot build yet because ZAP doesn't have LinkAnimationHeader yet

* xml changes for new zap stuff

* finish gameplay_keep

* fixing existing objects

* ready for pr besides zap padding issue

* mostly ready for pr

* format all c files

* all conflicts fixed

* make changes that roman requested

* fix thing i didn't mean to change

* some animation symbols renamed

* fixed roman's stuff

* lifemeter hardcoded pointers removed

* fix issue with incorrect data in gameplay_keep

* removed unused asm

* fixed most of fig's comments

* fix all of fig's comments

* reformat files

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* fixed stuff

* fixed most of roman's comments

* remove leading zeroes

* should build now

* git subrepo pull --force tools/ZAPD

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

* all of gkeep symbols fixed

* compiler error fixed

* format files

* final changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-24 19:36:40 -05:00
Zelllll
84195fcef6
Bg_Spot06_Objects OK and documented (#605)
* stuck on init

* init matches

* more functions matched

* just a few functions left

* three functions left

* all finished

* fix compiler error

* various improvements

* add actor description

* remove unused asm

* fix remaining dyna things

* Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* fixed all of roman's comments

* format c files

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-22 19:55:38 -05:00
Zelllll
d739765031
Bg_Haka_Zou OK (#598)
* started init, not matched yet

* all except init matched

* haka_zou OK

* haka_zou done

* fix jenkins problem

* various improvements

* removed unused asm

* fixed things

* fixed new dyna names

* more dyna fixes

* ok now?????

* this better build OK

* applied roman's suggestions

* function renames

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-21 10:21:05 -05:00
Blackop778
3f669bea1e
Decompile Bg Jya Cobra (#588)
* Start work on Jya Cobra

* Match two functions

* Work on func_80896ABC

* func_80896CB4 and most of func_80896D78

* Fix func_80895BEC, clean up func_80896ABC

* Work on func_80896EE4

* Match func_80896EE4

* Nearly match func_80895A70, finish BgJyaCobra_Draw

* Match func_808969F8, start on func_80895C74

* Work on func_80895C74 and func_80895EF0, data move
Also ran permuter

* Some cleanup

* Almost match func_80895C74, tiny bit of work on func_80895EF0

* Remove variables in func_80895EF0

* Make init match nicer

* Work on func_80896518

* Progress in func_80896518

* Figured something out in func_80896518
Going to experiment with stack stuff

* func_80896518 has tiny stack and regalloc issues

* Work on func_80895EF0

* Some work on func_80895EF0

* Update diff script

* Work on func_90995EF0
Use 2d array indexing in func_80895EF0
Small regalloc improvement in func_80896518
Change not equal to to less than where possible

* match func_80896ABC and func_80896D78

* Improve func_80895EF0 a bit

* Do some cleanup

* Change commented out functions to ifdefs

* Another bit of cleanup

* Run formatter

* Remove now unused include

* Another another bit of cleanup

* Revert update to diff script

* PR suggestions

* PR comments

* PR comments, a bit of documentation

* Run formatter

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* More PR comments

* actor fixes

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-21 09:55:11 -05:00
Roman971
70a3acf111
Match Player_Init (player_actor OK) (#651) 2021-01-21 08:48:21 -05:00
EllipticEllipsis
0e76c84c45
EnMThunder, 1 nonmatching (#604)
* Data migrated, all but Draw matched

* Draw likely equivalent
but serious regalloc issues,
and that last Gfx_TwoTexScroll is being very stubborn

* Merge remote-tracking branch 'upstream/master' into Thunder

* some improvements, set up to PR as nonmatching

* spec

* corrected header

* added function to functions.h

* delete asm

* Added new collider init

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-01-21 00:47:38 -05:00
maekclena
d2563b3b91
ovl_En_Hy (#602)
* ovl_En_Hy

* Remove extra EOL

* Rebase + PR review
2021-01-20 13:28:04 -05:00
petrie911
cb9d85de34
relocs (#645)
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-18 19:15:04 -05:00
engineer124
f786f958bb
En_Viewer (one non-matching) (#570)
* init commit

* en_viewer 20/24 functions decompiled

* en_viewer 22/24 functions decompiled

* EnViewer 1 func non-matching, down to stack

* cleanup, 1 non-matching

* ran formatter

* remove extra space in undefined_syms.txt

* remove data.s

* update math & skelAnime names

* pr feedback

* review

* semicolon

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-16 12:33:37 -05:00
gamestabled
ed4d8af39e
Shopnuts (#577)
* matched functions, still need data

* shopnuts OK

* cleaned up some things in hintnuts by comparing to shopnuts

* merge with new animation stuff

* fixing merge 2

* suggested changes

* missed a DECR

* suggestions
2021-01-15 16:00:01 -05:00
petrie911
11a021a9a5
En_Honotrap (#580)
* a good start

* match

* docs

* slight error

* to Link

* fixes

* format

* come on formatter

* Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-14 15:19:28 -05:00
krimtonz
2810aa2b9c
ovl_En_Owl (#573)
* begin En_Owl

* EnOwl wip

* fix conflicts

* owl wip

* wip

* cleanup

* more cleanup

* remove unused asm

* run formatter

* match EnOwl_Init

* formatting

* pr updates

* forgot the enum values in WaitZoraRiver

* merge fixes

* Fix merge issues

* review changes + more

* name

Co-authored-by: fig <fig02srl@gmail.com>
2021-01-14 15:17:03 -05:00
petrie911
fcc4a8190d
En_Sda (#581)
* match

* bug note

* textureblock

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-14 15:14:55 -05:00
EllipticEllipsis
65e956a272
DemoExt OK and documented (#586)
* OK

* all functions and variables named

* delete asm

* data inlined

* Merge remote-tracking branch 'upstream/master' into demo_ext

* addressed review comments

* formatter

* addressed review comments
2021-01-14 14:28:36 -05:00
Tom Overton
3b4a1c23d6
z_obj_kibako2 (large wooden crate) OK (#582)
* Migrate data to C

* Partially decompile Init

* func_80B959D0 OK

* ObjKibako2_Destroy OK

* ObjKibako2_Update OK

* ObjKibako2_Draw OK

* func_80B95CA4 OK

* ObjKibako2_Init OK

* func_80B95DFC

* func_80B95ED4 OK

* func_80B95A28 OK

* Name functions

* Delete unused asm and update spec

* Fixup math post rebase

* Name statics

* Clean up variable names

* Run formatter

* xzDistFromLink -> xzDistToLink

* Respond to feedback in ObjKibako2_Break

* Type sp2C as a CollisionHeader* and initalize it when declaring it

* Respond to remaining review feedback

* Respond to review feedback from Roman
2021-01-14 13:22:48 -05:00
EllipticEllipsis
3e5f6b3485
EnWood02 OK (#578)
* OK, some documentation

* delete asm

* dists updated

* addressed review comments

* one more comment

* remove one comment

* addressed review comments
2021-01-14 12:58:17 -05:00
Zelllll
a0e2ce7211
Cleanup z_lifemeter (#552)
* z_lifemeter cleanup finished, one non-matching

* made Health_UpdateData a bit better, nowhere near matching still

* lifemeter done for now

* fixed define issue

* improve z_lifemeter, still doesn't match

* z_lifemeter done

* Rename functions

* Add files via upload

* Update Health_Update.s

* fix missing symbols in asm file

* Update Health_Update.s

* Update Health_Update.s

* fixed stuff

* Add files via upload

* Delete Health_Update.s

* Rename things according to Roman's suggestions

* lifemeter done hopefully

* fix unused asm that for some reason didn't merge

* fix feedback

* compiles right now

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2021-01-10 16:33:58 -05:00
mzxrules
3cef03f5ff
z_bgcheck.c, 800430A0.c, 80043480.c (#256)
* beginning of migrating changes

* got matching

* changed order a bit

* clean up bgcheck

* fix conflict

* fix conflict again

* first stab at identifying types, some oks

* Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs

* more OKs, z_bgcheck.bss migration, update some sys_math3d.c args

* couple more OKs

* pushing some OKs

* fix compilation issues

* code_800430A0.c OK, more files decomp'd

* 8003A3E0 big OK :)

* Decomp most of func_8003C614, decomp helper funcs

* Decomp SurfaceType, CamData, and WaterBox property related functions

* more OKs, big OK in 8003C078

* more OKs, more progress, move a function definition in z_collision_check to functions.h

* more clean-ups, more OKs, dyn_vtx is now defined as u8*

* 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better

* data migrated, more OKs

* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled

* func_80040284, 800409A8 non_matching, add IS_ZERO macro

* All asm files have C representations, some big OKs, lots of minor tweaks

* More OKs, non-matching code cleanup

* 8003FBF4 and 80040BE4 OK, improve codegen for most functions

* format z_bgcheck.c

* fix warnings, compile errors on NON_MATCHING

* func_8003EE80 is now NON_MATCHING

* begin documenting some functions

* formatting

* more documentation, func_8003A95C OK

* fix PHYSICAL_TO_VIRTUAL changes

* fix var rename

* More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP

* func_8004239C ok, more NON_MATCHING improvements, more documentation

* Implement most suggested changes

* Convert comments to slower comments

* /**

* Implement ZAP2 changes

* my anti-virus ate my format.sh results

* Rename a couple hundred functions, fix minor stuff

* rename var so that clang formats correctly

* run format.sh

* implement Petrie's matches/suggestions

* format

* matches

* and the asm

* slight error

* Add SSList

* two more matches

* stuff

* implement code changes

* clean up Petrie's matchings

Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-08 06:12:58 -05:00
notyourav
209f0d21b8
En_Toryo OK (#569)
* En_Toryo OK

* en_Toryo fixes

Co-authored-by: fig <fig02srl@gmail.com>
2021-01-07 14:10:15 -05:00
Tharo
510b3c4bd5
ovl_En_In OK (#545)
* Initial progress

* Further progress

* One nonmatching left

* Fix merge

* OK

* Cleanup

* Remove unused asm

* Use generated reloc

* nightFlag changes and requiredObject -> objectIdx

* Some suggestions

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Revert nightflag changes, early return after Actor_Kill, objectIdx -> ingoObjBankIndex

* Fix accidental nightFlag change in z_sram

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-04 14:52:36 -05:00
petrie911
8cd367c43b
Automatic object xml creation (#596)
* new tool

* fixes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-04 12:06:51 -05:00
gamestabled
ae5a8f2700
Shabom OK (#571)
* 2 nonmatchings left

* shabom OK

* suggested changes

* more suggested changes
2021-01-01 19:56:57 -05:00
petrie911
7daadc5ea1
En_Ex_Item (#567)
* first go

* match

* vt

* docs

* one last thing

* formatted

* bowling, why not

* header

* Update src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* press FFFF

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-31 19:56:02 -05:00
AdamKiddle
600bad1f20
En_Tite OK (#555)
* EnTite_Update matching

* Fixes to update

* made good progress, func_80B1A2A0 is in a good place to be matching soon

* Merge stuff

* func_80B19E94 done, func_80B18CC4 done

* EnTite_Destroy and EnTite_Init done

* Commenting out sDamageTable and EnTite_Init until all the data matches

* Some more small functions done

* more progress

* func_80B19918 done

* func_80B18E7C done

* func_80B19524 done

* more progress

* EnTite_Draw equiv but nonmatching, file otherwise done

* Found some unstaged changed on old laptop

* Draw matching: File fully matching!

* Documentation

* finished documentation

* deleted data files

* update spec

* fixed waterY -> yDistToWater rename after merge

* ran format.sh

* fixing accidental renames in camera

* Fixed some obvious number/comment formatting issues

* Removed unecessary prototypes

* merge

* running format.sh

* suggestions

* more pr comment changes

* format to push

* one more change

* more renames (see pr comments)

* merge

* renames

* format.sh

* fix renames

* function comment formatting

* merge + format

* endless merge fixes

* merge fixes until  die

* yet again a merge fix

* pr suggestions
2020-12-31 15:00:30 -05:00
mnzlmstr
5a2bd7a035
z_bg_bombwall OK (#506)
* Update spec

remove z_bg_bombwall.o from spec

* Update z_bg_bombwall.h

updated actor struct

* Update z_bg_bombwall.c

* Delete BgBombwall_Destroy.s

no longer needed

* Delete BgBombwall_Draw.s

no longer needed

* Delete BgBombwall_Init.s

no longer needed

* Delete BgBombwall_Update.s

no longer needed

* Delete func_8086E7D0.s

no longer needed

* Delete func_8086E850.s

no longer needed

* Delete func_8086EAC0.s

no longer needed

* Delete func_8086EB5C.s

no longer needed

* Delete func_8086ED50.s

no longer needed

* Delete func_8086ED70.s

no longer needed

* Delete func_8086EDFC.s

no longer needed

* Delete func_8086EE40.s

no longer needed

* Delete func_8086EE94.s

no longer needed

* Update spec

update path to reloc

* Delete z_bg_bombwall.data.s

no longer needed

* Delete z_bg_bombwall.reloc.s

no longer needed

* Update spec

fix path to reloc of bombwall

* Update z_bg_bombwall.c

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-30 11:36:17 -05:00
Zelllll
257fc54195
Bg_Hidan_Hamstep OK (#544)
* BgHidanHamstep 7/15

* 9/15 matched

* hamstep 14/15

* cleanup

* fix not OK

* fix ctrl+f mistake

* All functions OK

* cleanup

* Update z_bg_hidan_hamstep.c

* Update z_bg_hidan_hamstep.h

* fix math

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-12-29 22:48:57 -05:00
Zelllll
dd38520a9e
Obj_Mure2 (one non-matching) (#550)
* objmure2 about halfway

* all decompiled, one non-matching

* some documentation

* mure2 done, one nonmatching

* Update spec

* Update z_obj_mure2.c

* Update z_obj_mure2.c

* Add files via upload

* fix formatting

* Fix fake match

* Changed data formatting

* More formatting changes

* fixed name of var

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-12-29 20:14:04 -05:00
Zelllll
8f3dc3db94
Bg_Hidan_Kowarerukabe OK (#562)
* 10/12 functions decompiled and matched

* 12/12 matched

* file done

* kowarerukabe OK

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>

* hopefully fixed build issue

* OK now

* Fix new math function names

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
2020-12-29 20:13:38 -05:00
petrie911
c71b8183ae
Bg_Haka_Gate (#557)
* 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

* match

* sfx fix

* should be good to go

* comments and such

* Matrix macros escape me

* format

* fix bubble

* remove comments

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-29 19:39:30 -05:00
petrie911
22758f06d7
En_Kanban (#533)
* 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

* matching

* more stuff

* names

* names and formatting

* vt

* header

* adjusted gfx

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 18:28:50 -05:00
petrie911
e4d88bf942
En_Bb (Bubble (flying skull)) (#551)
* 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

* bubbles!

* match

* stuff

* more names

* let's go

* SFX error

* fixes

* also formatting

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-29 16:06:20 -05:00
petrie911
94d51ce86f
Bg_Mizu_Bwall (#543)
* 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

* bwall

* cleanup

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 13:35:01 -05:00
petrie911
9fcf8a4430
En_Bw (Torch Slug) (#537)
* 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

* slug-o-cola

* sfx macros

* Matched

* this will have to do

* well maybe a little more

* good enough
2020-12-29 13:32:32 -05:00
petrie911
695bc37be4
Bg_Gnd_Iceblock and Bg_Ice_Objects (sliding ice blocks) (#534)
* 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

* a good start

* done

* Log

* formatting

* thisx

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 13:11:11 -05:00
EllipticEllipsis
21e367a7cb
Bigmirror OK and documented (#530)
* OK

* documented (with one odd float value)

* delete asm and alter spec

* uniformise spawn data to sIsSpawned,
fix compile warnings in Bg_Jya_Lift and Bg_Mori_Elevator

* translate last printf

* re-delete modified asm

* addressed review comments

* remove outdated comment

* addressed comments, made defines

* untrack scenes dir

* remove scenes dir
2020-12-29 03:50:56 -05:00
Tharo
b50e079e1b
Decompile z_skin.c (#548)
* z_skin progress

* Some more progress

* Some real progress

* Decompiled, 1 nonmatching

* Remove unused asm

* pad -> D_80160FC0

Co-authored-by: Thar0 <maximilianc64@gmail.com>
2020-12-29 00:30:23 -05:00
petrie911
42f2d38b8f
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>
2020-12-28 20:56:24 -05:00
Lucas Shaw
81c269b417
z_demo_tre_lgt OK (#521)
* z_demo_tre_lgt ok

* ok

* made suggested changes

* fixed
2020-12-25 19:24:16 -05:00
EllipticEllipsis
df704a9f80
MirRay OK and documented (#528)
* init, destroy, update, couple of others decomped

* 2 functions remain

* data migrated

* 1 function left

* OK
thanks mostly to Petrie and the permuter,
and no thanks to my find/replace skills

* documented and deleted asm

* updated spec

* delete data

* address review comments

* Apply review suggestions
2020-12-21 12:28:57 -05:00
Zelllll
06ceb6ad40
Obj_Hamishi OK (#539)
* obj_hamishi OK

* Update src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* made suggested changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-20 13:39:06 -05:00
Parker Burnett
2d35a25212
z_bg_jya_haheniron OK (#524)
* getting things started

* all matched, rock solid

* deleted assembly, formatted, and cleaned spec

* yikes, forgot to hit -d on deleting the asm

* Fixed suggestions and some documentation

* fixing a few compiler warnings

* added suggestions

* removing assembly to fix merge issues

* Documented function names
2020-12-20 13:03:31 -05:00
Synray
5ab8a39cd0
En_Zl3 OK (#546)
* zl3 OK

* Remove asm

* Use generated reloc
2020-12-20 12:21:09 -05:00
Synray
b0200efbeb
ovl_En_Zo OK (#522)
* Decompile ovl_En_Zo

* Label ovl_En_Zo

* clang-format

* Cleanup

* Review changes

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Use generated reloc

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Review Changes

* Remove reloc data

* Review changes

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-20 02:38:08 -05:00
louist103
3237f176cd
Fix a couple of actors to use auto generated reloc (#547)
* FIX RELOC

* Update spec

* Delete z_bg_spot15_saku.reloc.s

* Add endseg back

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2020-12-19 11:16:34 -05:00
Zelllll
eadf85f17c
Bg_Haka_Sgami OK (#532)
* spinning scythe trap, 4/6 matching

* fixed typo

* Almost matched sgami init

* Matched sgami Init

* starting to clean up func_8087E858

* func_8087E858 half-way done

* Scythe matched

* update scythe

* Removed asm files

* Delete z_bg_haka_sgami.reloc.s

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update z_bg_haka_sgami.c

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-19 04:59:35 -05:00
Zelllll
3369d0657d
Bg_Relay_Objects OK (#536)
* bg_relay_objects OK

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update z_bg_relay_objects.c

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-18 23:46:52 -05:00
Roman971
83e53bbaf2
Fix some non matchings in actors and parameter (#540)
* Fix some non matchings in actors and parameter

- `EnTuboTrap_HandleImpact` from `z_en_tubo_trap.c` (fully matching)
- `func_80ADA35C` from `z_en_po_sisters.c` (fully matching)
- `func_80B0B81C` from `z_en_stream.c` (fully matching)
- `Item_Give` from `z_parameter.c` (1 non matching left)

* Rectify bss ordering comment
2020-12-17 19:12:22 -05:00
petrie911
6e78efd0c5
Remove some unaligned fake symbols (#535)
* 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

* a few fake syms

* two more

* format
2020-12-16 22:10:42 -05:00
Tom Overton
3062045acd
En_Stream (vortex) 7/8 matching, 1 equivalent (#512)
* EnStream_Init OK

* func_80B0B7A0 OK

* EnStream_Destroy OK

* EnStream_Update OK

* Make func_80B0B7A0 take this instead of thisx like other SetupActions

* func_80B0BAC8 OK

* func_80B0B934 OK

* func_80B0B81C not OK, but very close and I give up

* EnStream_Draw OK

* Delete unused ASM and do a little cleanup

* Provide better names for functions

* Make the file buildable when NONMATCHING is used

* Flip comparisons in EnStream_SuckPlayer as per review

* NONMATCHING -> NON_MATCHING

* Remove & for function pointers

* Type D_06000950 and remove the & in Draw

* Remove unnecessary "struct"

* Remove unnecessary forward declaration

* Make func_80B0B81C take Vec3f*, not PosRot*

* Use the generated reloc when NON_MATCHING

* Move func_80B0B81C forward declare to the else block
2020-12-12 01:14:26 -05:00
petrie911
f05a584dea
G_Switch, Syateki_Itm, and Syateki_Man (Shooting gallery and related actors) (#523)
* 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

* rupees and, for some reason, pots

* and now an even larger man

* now for the gallery

* more progress

* naming continues

* even more docs

* another match

* match, fix, a new enum

* Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c

* fixes except globalctx

* well one more

* and now globalCtx
2020-12-11 17:38:23 -05:00
engineer124
bc8e3745c7
moved rodata for Iceblock (#525) 2020-12-11 11:55:41 -05:00
petrie911
d4e16bbacf
En_GeldB (#516)
* 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

* woo watch out

* data and such

* stuff

* more decomp

* another match

* match and docs

* more docs

* little more cleanup

* SFX macros

* little more

* more attempts to match

* naming things

* I give up on the match

* also spec

* changes

* hex

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-10 15:00:17 -05:00
Ethan Roseman
96512ee3ab
Decompiled ovl_En_Ta (#518)
* First steps

* more

* done

* format

* PR comments

* PR comments
2020-12-08 16:39:41 -05:00
Kenix3
353684c638
ovl_demo_effect 100% OK (#466)
* Fully decompiles demo_effect actor.

* Formats z_demo_effect.c

* GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE

* Implements OPEN_DISPS macros for all draw functions.

* Fixes ugly float values

* Removes unnecessary union structs in the DemoEffect actor struct

* Renames DemoEffect SkelAnimeCurve member to skelCurve

* Names initObjectBankIndex DemoEffect struct member

* Renames jewel display list holders

* Renames initialization function pointers to initUpdateFunc and initDrawFunc

* Renames primitive and environment color DemoEffect struct members.

* Fixes a couple missed floats.

* Renames most draw and update functions.

* Finishes naming all update functions.

* Adds additional SFX defines.

* Renames the rest of the functions

* Renames all external object display lists and vertex references

* Renames DemoEffect global data variables

* Renames DemoEffect Medal function to GetItem because it's used by LightArrows too

* Fixes DemoEffect Timewarp_Timeblock documentation.

* DemoEffect_TimewarpTimeblock updates shrink functions to use decimal

* Converts DemoEffect hex to decimal where appopriate

* Names the rest of DemoEffect struct members.

* Names DemoEffect triforceSpot crystalLightOpacity

* Adds DemoEffect enums for light effect color and god lgt types.

* Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow

* Fixes compiler warning in DemoEffect_JewelSparkle

* Renames DemoEffect_MedalSparkle argument

* Reformatting DemoEffect struct offset comments.

* Formats z_demo_effect

* Updates DemoEffect oGfxCtx to use the new macros.

* Adds comments detailing what each function in the DemoEffect system does.

* Removes z_demo_effect.data.s

* Renames DemoEffect global variables and sets them to static

* Removes pointer from DemoEffect function references

* Removes unncecessary default: break; statements in DemoEffect

* Converts rotation values to hex in DemoEffect

* DemoEffect effectFlags now uses ~1 rather than 65534

* DemoEffect_DrawGodLgt now uses a cleaner conditional statement

* eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11

* DemoEffect now uses VT macros.

* Converts DemoEffect colors to hex.

* Changes M_PI / 32768.0f to M_PI / 0x8000

* Updates demo_effect enums to be all caps

* ovl_demo_effect reloc info is now included via build process rather than included from original asm

* Adds param packing macro

* DemoEffect struct unions are now typedef'd outside of the main struct

* Reformats DemoEffect sJewelSparkleColors

* Removes an if(globalCtx){} in DemoEffect_Init

* Removes ActorFunc cast in DemoEffect_Wait

* Removes unncessary comment in DemoEffect_MedalSparkle

* Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256

* Removes unnecessary comment in DemoEffect_SetJewelColor

* Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime

* Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime

* Converts a while to for loop in DemoEffect_JewelSparkle

* Moves stack variables in DemoEffect_UpdateDust to a new line for each one

* Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel

* Removes unnecessary comment in DemoEffect_DrawCrystalLight

* No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt

* Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked.

* DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc

* review 2

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-07 12:48:29 -05:00
krimtonz
321388673b
decompile z_camera (#398)
* cleanup

* name camera action functions

* decompile a few small functions, name a few Camera struct members

* decompile camera data, decompile a few camera functions

* Split ASM for code_800BB0A0

* removing code_800BB0A0.s

* PR Requests, Camera WIP

* remove #define NON_MATCHING from db_camera

* rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c

* camera wip

* rename some struct memebers, some decomp wip

* pr updates

* camera wip

* name some fields in Camera Struct, being making sense of Camera_Update

* Camera WIP

* wip

* wip

* add z64camera.h header, begin creating CameraSetting macros

* wip

* wip

* wip

* wip

* migrate camera bss to c

* match a couple functions in db_camera

* match some small db_camera functions

* wip

* migrate db_camera rodata, match a few functions

* remote db_camera.rodata.s

* match some of db_camera

* identify types of some unknown data pieces

* some small wip

* Match Camera_Init, some function changes, some struct name changes.  Change unk_C0 and unk_CC to floats from Vec3fs

* add naming for a few more Camera struct members

* wip

* match func_80043F94

* Match Camera_Jump1

* document some of Camera_Jump1

* wip

* match Camera_Jump3

* Match Camera_Update, FeelsAmazing

* wip

* wip

* match Camera_SetParam

* minor cleanup

* wip

* wip

* match Camera_KeepOn0

* some documentation, modify some matching functions to match style of others.

* match Camera_Demo1

* match camera_demo9

* document Camera_Demo1 and Camera_Demo9

* wip

* Match camera_battle4

* match camera_unique2

* Match Camera_Unique3

* match camera_special6

* match Camera_Special5

* wip

* document camera_special6

* naming updates

* match camera_Unique1

* match Camera_Unique0

* wip

* Match Camera_CalcUpFromPitchYawRoll

* match func_80045508

* document Camera_Battle4

* document several camera functions, move camera data to separate file

* rename phi/theta to pitch/yaw

* wip

* uniq9 wip

* Camera_Unqiue9 OK

* document Camera_Unique9

* name unk_160 in camera struct

* wip

* wip

* minor updates

* fix conflicts

* wip

* wip

* Olib updates

* wip

* wip

* rename most Math3D functions, few matches, documentation

* wip

* document most of math3d

* wip

* wip

* wip

* pr updates

* Match Camera_Fixed4

* match func_80058E8C

* pr updates

* add missing comment block finalizer

* Merge math3dupdates

* match Camera_ChangeSetting

* Match Camera_ChangeMode

* match func_80058148

* Match Camera_Special9

* decompile the rest of camera data

* match Camera_Demo5

* name a few camera functions in z_play

* match func_80046CB4, some work on other fucntions

* wip

* impove some non matchings

* fix function rename

* match func_800588B4

* match Camera_Subj4

* wip

* Camera_Demo3 matching, Camera_Battle1 big progress

* Camera_Normal2 OK

* wip

* match Camera_Parallel1

* normalize some things across functions

* match Camera_Normal1

* Match Camera_Normal3

* some cleanup

* more cleanup

* more cleanup , match Camera_CalcDefaultPitch

* data formatting

* Match Camera_Jump2

* document Camera_Jump2

* Match Camera_KeepOn3

* document some of Camera_KeepOn3

* improve some non_matchings

* match func_80045C74 and func_800460A8

* code cleanup, documentation

* match Camera_KeepOn1

* Match Camera_Subj3

* Match Camera_Battle1

* remove non_matching from func_80044adc and func_80046e20

* name several members of Battle1

* more documentation on Battle1

* cleanup

* renaming Camera_Vec3fScaleXYZFactor to Camera_Vec3fTranslateByUnitVector

* reorganize update structs, remove final references to params, remove CameraParams union

* implement camera enums into player

* Renaming Camera_GetDir to Camera_GetInputDir, Camera_GetRealDir to Camera_GetCamDir, etc, implement camera enum's into player

* remove non-global camera variables from variables.h

* clean up some variable declarations

* finish pr comment updates

* fix some warnings

* data formatting

* finish commenting on data

* delete unused asm

* remove asm

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-06 17:39:47 -05:00