Commit Graph

140 Commits

Author SHA1 Message Date
engineer124 e9eb4d4e0a
Match z_effect.c (#176) 2021-06-10 08:13:43 -04:00
Parker Burnett aae3c6f895
Obj_ghaka OK (#171)
* getting ghaka started

* two more matching funcs

* functions all match, but no OK...yet....

* some clean up stuff

* uhhh lets try this?

* fixing save context stuff

* z_obj_ghaka OK

* fixing small changes

* adding in new suggestions

* fixing error
2021-06-10 07:55:21 -04:00
engineer124 9102481fc2
Ovl_En_Minifrog OK with partial documentation (#166)
* En_Minifrog first few funcs decompiled

* more matching

* En_Minifrog 3 non_matching functions left

* two functions left

* Start Documentation

* Fully Matching!

* Documentation

* Fix merge with master

* minor pr changes

* Minor improvements

* PR Suggestions + Minor docs

* Fix bool

* PR suggestions

Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-06-09 21:03:42 -04:00
Nick 5110943377
Obj_Kibako OK (#169)
* Clean dist.

* ovl_Obj_Kibako OK

* Run clang-format

* Suggested changes.

* Suggested Changes

* Consistency change.

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* PLAYER macro

* Suggested Changes

* Suggested Changes

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-06-09 18:53:36 -04:00
Derek Hensley 3ac21daf26
ovl_dm_char07 OK (#172)
* Dm_Char07 Ok

* Cleanup

* Documented

* Add small documentation to en_toto and run format

* Better documenting of spotlight flags

* PR suggestions
2021-06-09 18:51:33 -04:00
engineer124 8b21da8c34
Match Remaining EnGinkoMan Functions (EnGinkoMan OK) (#175)
* EnGinkoMan OK

* Cleanup

* Minor PR suggestion
2021-06-09 18:49:20 -04:00
Anghelo Carvajal 83e263ab12
`ovl_En_Ma_Yts` OK and partially documented (#164)
* destroy

* moar

* limbdraw

* some setups identified

* func_80B8D6F8

* func_80B8E0BC

* fix unmatching

* func_80B8D12C

* func_80B8D1E8

* func_80B8DBB8

* some renaiming

* some renaimings

* symbols

* small renaming and a few functions

* Almost every function done

* lots of renames

* Fix merge conflicts

* misc notes

* struct_800BD888_arg1

* some renamings and enum

* func_80B8D2D8

* func_80B8DA28

* import data and cleanup

* format

* minor changes

* Documentation pass

* update enum name

* Remove object XML

* run format

* Move EN_MA_YTS_PARSE_TYPE to header

* fix conflicts

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* move struct to z64animation

* Change PARSE_TYPE macro to accept actor param

* format

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-06-09 18:38:35 -04:00
Parker Burnett 2bf68a5263
Z_obj_bell Matching (#167)
* ringing in the bell

* another matching func

* stuck on func_80A357A8, needs a z_actor func...

* no luck on a fix, but got further...

* matched func_80A357A8, one left

* might be on the right track? saving progress...

* getting closer

* pushing up matching, it has warnign regarding Vecs

* all functions matching

* obj_bell OK, time for bed

* prepping for PR

* fixing suggestions
2021-06-02 19:13:06 -04:00
Derek Hensley 631225a626
Ovl_Obj_HsStump Ok but one function does not match (#156)
* Everything matches but func_80BDABCC

* Better names, still stuck on func_80BDABCC

* Some cleanup

* Add param macros and document not matching

* format

* PR suggestions

* Bring over data to c file

* Retry Jenkins

* Retry Jenkins take 2

* PR suggestions for comments

* PR comments
2021-06-02 18:57:19 -04:00
Derek Hensley fb84cabd4a
Ovl_En_Toto OK (#163)
* Lots of progress

* OK

* Removed casts

* Run format.sh

* cleanup

* More cleanup

* Minor Doc

* More cleanup

* Format

* Add header description

* PR comments

* Convert raw pointers

* Update to new gSaveContext

* PR suggestions
2021-06-02 18:33:16 -04:00
Derek Hensley 7d476f7c71
Ovl_Dm_Nb OK (#162)
* match but func_80C1DF18

* Everything matches

* Add comment about unknown pointer

* Rename vars

* Update comment

* format

* Added header description

* Remove raw pointer

* Remove unnecessary foward declarations

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-06-02 17:04:04 -04:00
Anghelo Carvajal 2f239c939d
ovl_Obj_Milk_Bin OK (#161)
* First pass

* second pass

* Everything matches now

* Fix ori

* final pass

* Add description

* Fix warnings (I hope)

* move dlist to top of the file

* Fix conflicts
2021-05-25 21:15:41 -04:00
Zelllll 6c86016603
partially finish `code_0x8012EC80`, document all of gSaveContext (#138)
* not ok, why?

* OK!

* fix data

* finish data etc

* work on save context

* save finished

* first func done

* roomInf

* done for now

* add missing file

* add most og names for struct members

* fix accidental change

* Update z_en_ginko_man.c

* Update z_scene.c

* maybe fix stuff hopefully

* proto

* sasa

* Update include/z64save.h

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* Update z64save.h

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-25 18:49:11 -04:00
engineer124 cf3eb3b2e1
Ovl_En_Fg OK (#133)
* En_Fg Frogs 9/18 decompiled

* En_Fg Frogs One Non-Matching

* documentation and cleanup

* final matched function

* code_script

* whitespace

* Fixed some mistakes, EnFg_UpdateDust no longer matches?

* fixed nonmatching

* Minor fixes and documentation

* PR suggestions

* Fixed genericHeader rename to common

* Fix Warnings

* PR Good Documentation Suggestions

* update names

* more pr suggestions

Co-authored-by: Jared Collette <jcollette@4000v-udp25-l.eng.unimelb.edu.au>
Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-05-22 11:36:21 -04:00
Zach Banks 458dd13141
ovl_Bg_Ladder: OK (Wooden Ladder) (#135)
* ovl_Bg_Ladder: OK (Wooden Ladder)

* Change sLadderDLists type; add comment about thisx

* Add macros for BgLadder params; rename object symbols
2021-05-20 18:06:00 -04:00
Parker Burnett cb89346c28
Obj_moon_stone Matching (#154)
* most all matching, just one func left

* forgot about the object script

* Moon's Tear OK

* fixing suggestions

* fixing actor pointers
2021-05-20 17:43:27 -04:00
Derek Hensley e17b05b8fa
Ovl_Bg_Ctower_Rot Ok (#149)
* Ovl_Bg_Ctower_Rot Ok

* Move enum to h file

* Rename D_808E2564 to bgCtowerRotDlists

* Rename D_808E2564 to bgCtowerRotDlists take 2
2021-05-20 17:23:23 -04:00
Zach Banks 43ccf66c48
ovl_En_Torch2 OK (Elegy of Emptiness Shell) (#130)
* ovl_En_Torch2 OK (Elegy of Emptiness Statue)

* Identify dlists; address PR comments

* Rename object segment symbols
2021-05-19 20:58:32 -04:00
Derek Hensley 5e7e5a1d9f
Ovl_Obj_Tokei_Step OK (#122)
* Everything matches but func_80AD6508

* Changed func_80AD6508 to non_matching

* Some cleanup

* Everything matches

* Finished cleanup and documentation

* Updated BgMeshHeader to Collision Header

* Add newline

* Update functions.txt

* Better function names

* format

* Better naming
2021-05-19 20:24:33 -04:00
Anghelo Carvajal f3dc829456
`ovl_Eff_Dust` OK (#136)
* some easy functions

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

* init is cursed

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

* func_80919230 is weird

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

* I'm dumb

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

* func_80919768 nonmatching

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

* everything is wrong

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

* This thing still doesn't want to match

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

* improved a bit

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

* a bit of renaming, but it still doesn't work

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

* almost matching

* func_80919768 ok

* func_809199FC ok

* init was dumb

* add enum and other minor changes

* run format
2021-05-18 23:01:48 -04:00
Anghelo Carvajal 4d6d9c27a4
code_0x8017FEB0 OK (#137)
* almost every function

* atans ok

* import data and rodata

* format `atan_first_8th_array`

* fix signature and rodata

* rename to angle

* Rename the functions to match their OoT counterparts

* rename code_0x8017FEB0 to sys_math_atan
2021-05-18 22:58:30 -04:00
Zach Banks c6fb5665d4
Split code BSS segment by file (#140)
Discussed on Discord: https://discord.com/channels/688807550715560050/688851976746041391/843916746989633547
2021-05-18 17:35:22 -04:00
Derek Hensley 4279f12414
Ovl Bg_Ctower_Gear OK (#123)
* BgCtowerGear OK

* Added description header

* Updated functions.txt

* Added MACRO to get type

* Renamed init chains to match tyype

* Added one more use of Macro, and addressed PR comment

* Fixed data copy error and better naming
2021-05-13 22:15:06 -04:00
Anghelo Carvajal 86bdadf4da
Extract assets in `make setup`, don't extract them to `assets/src/` and build them in `make` (#132)
* extract assets in setup and build them in make

* Add assetclean
2021-05-13 21:00:38 -04:00
Isghj 024ba29706
EnEncount2 (Majora Baloon in Bomber's Hideout) (#108)
* EnEncount2: start

* EnEncount2: got some easy functions down, but now I have a really weird unk struct

* EnEncount2: draw function nowhere close

* EnEncount2: cleaning/docs

* EnEncount2: removed bad function attempt

* EnEncount2: function name change to match mster changes

* EnEncount2: corrected old BgMeshheader to CollisionHeader

* EnEncount2: requested changes

* EnEncount2: forgot to add these requested changes

* EnEncount2: requested changes

Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09 22:20:53 -04:00
Isghj fec0c38768
En_Ginko_Man (Bank Teller) (#118)
* EnGinkoMan: init

* EnGinkoMan: more matches

* EnGinkoMan: that's closer at least

* EnGinkoMan: better control flow at least...

* EnGinkoMan: docs

* EnGinkoMan: more docs

* EnGinkoMan: more docs 2

* EnGinkoMan: cleaning

* EnGinkoMan: missed something in savecontext

* EnGinko: requested changes and further docs

Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09 22:20:47 -04:00
Isghj d98e9dfb01
Obj_Lightswitch (Sunswitch and Stonetower Temple flip switch) (#107)
* ObjLightswitch: fast

* ObjLightswitch: data migrated, except collider init is broke

* ObjLightswitch: nvm, collider documented

* ObjLightswitch: OK with 3 non-equiv, docs starting

* ObjLightswitch: more docs

* ObjLightswitch: some requested changes

* ObjLightswitch: requested changes

Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09 22:18:57 -04:00
Zelllll 874a75f456
Scene Changes (#114)
* match function

* major cleanups

* rename switch functions

* use graph_alloc to fix fake matches

* more documentation

* more matches, lots of changes

* lots more work

* format

* Update z_scene_proc.c

* very hard lagrange interpolation function OK!

* remove any remaining

* documentation done, only two functions left

* a few more things

* one function left!

* document another oot leftover

* last function decompiled, not matched yet

* scene_proc complete

* start work on z_scene

* done with z_scene

* remove unessecary typedefs

* fix some things to remove warnings

* Add z_scene_table and decomp data

* Delete ctx.c

* add draw cfg enum

* cleanup

* most scene table functions done

* done for now

* all scene files done

* Update include/z64scene.h

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* add missing macros

* fix some renames

* scene texture file rename

* added temporary structs so it still builds

* more structs

* even more old structs

* fix boyo

* should fix compile error

* lets hope nothing broke

* ub comment back

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-09 22:12:42 -04:00
Derek Hensley e39141fb3d
Ovl en nutsball OK (#115)
* EnNutsball Match but one function with sp issues

* Updated ActorPlayer

* Renamed unk144 to timer and added data as comment

* Got update matched but stack issues with two vars

* add back new line

* Fixed stack issue based on PR comments. Added data

* more descriptive variable names

* Use OPEN_DISPS/CLOSE_DISPS macros in draw

* Address PR comments
2021-05-04 23:10:59 -04:00
Zach Banks fcc87b3ae2
ovl_Dm_Ravine (Link Riding Through Lost Woods Cutscene - Tree Trunk) (#120)
* ovl_Dm_Ravine OK (Link Riding Through Lost Woods Cutscene - Tree Trunk)

* ovl_Dm_Ravine: respond to PR comments

* Rename/retype DmRavine_Action -> DmRavine_DoNothing

* ovl_Dm_Ravine: incorporate PR feedback from kyleburnette

* ovl_Dm_Ravine: rename fields; use enum for state
2021-05-04 22:58:47 -04:00
Parker Burnett d61d236a04
En_jc_mato matching (#119)
* starting actor

* close to being done

* updating txt files

* z_en_jc_mato OK

* Merge branch 'master' into en_jc_mato

* fixing some suggestions

* adding names

* changing name to movement
2021-05-04 22:03:41 -04:00
Parker Burnett d44d842192
z_en_warp_uzu OK (#113)
* matched all functions

* Jk I figured it out....forgot to add static...

* Fixing name suggestion
2021-05-04 21:16:05 -04:00
Derek Hensley 7605041f0a
Ovl_En_Cha OK (#116)
* EnCha OK

* pr comments, else if branches, file header comment

* Better function names
2021-05-04 20:10:30 -04:00
kyleburnette 751c5e1049
obj_funen OK (#91)
* initial funen work

* obj_funen OK

* ran format script
2021-05-04 19:51:42 -04:00
kyleburnette 94ef01b42f
kepn_koya OK (#97)
* kepn_koya OK

* actually commited change to header
2021-05-04 19:08:19 -04:00
kyleburnette 0beaddd30b
bg_lbfshot OK (#92)
* bg_lbfshot OK

* formatted source files

* Update z_bg_lbfshot.c

* Update z_bg_lbfshot.h
2021-05-04 18:59:45 -04:00
kyleburnette a91eaad34c
obj_visiblock OK (#93)
* obj_visiblock OK

* re-oked obj_visiblock

* removed unnecessary pad
2021-05-03 18:07:08 -04:00
kyleburnette 0d4e4ffc38
bg_kin2_fence OK and documented (#103)
* initial fence work

* more fence work

* bg_kin2_fence OK and documented

* removed ctx file

* got rid of unk283 which didn't exist

* Renamed the array of eye sparkle particle spawns locations as suggested

* reok-ed kin2_fence
2021-05-03 17:18:59 -04:00
Derek Hensley c7a1fb739f
En_M_Fire1 OK (#106)
* En_M_Fire1 OK

* Removed Null cast

* Added newline

* Address PR Review Comments

* Update src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Renamed unk190 to timer

Co-authored-by: Parker Burnett <burnettparker@gmail.com>
2021-05-01 12:33:57 -04:00
Zelllll 1ca8a9c24d
(Mostly) Decompile PreRender.c (#105)
* start prerender

* match func_8016FDB8

* fix fake af match

* actually add prerender

* Delete ctx.c

* test

* lots of oot transfers

* lots of new functions done

* match even more functions

* slowly thread functions

* two prerender functions left

* some docs

* make names more consistent with oot

* ready for pr?

* Update PreRender.c
2021-05-01 02:44:29 -04:00
kyleburnette c377ffe4ac
en_bu OK (#96)
* en_bu OK

* renamed action func

* made the char array in the header of type UNK_TYPE1

* renamed display list pointer as suggested
2021-05-01 00:42:16 -04:00
kyleburnette 441f33968c
item_inbox OK (#95)
* item_inbox OK

* renamed func_80945534 to suggested name
2021-04-30 23:36:55 -04:00
Zelllll 536a484f73
ovl_Obj_Boyo OK (#112)
* start

* more functions

* fix bg thingy

* finish boyo

* conflict fix1
2021-04-30 23:04:05 -04:00
Zelllll f0cd2db055
ovl_Item_B_Heart OK (#110)
* finish heart

* fix linker
2021-04-29 21:54:53 -04:00
Zelllll fed1b37da1
ovl_Bg_Keikoku_Spr OK (#111)
* finish actor

* fix linker
2021-04-29 20:46:01 -04:00
kyleburnette 69d9f32ef3
dm_statue OK (#94)
* dm_statue OK

* dm_statue OK

* Reworked types of segmented addresses

* ran format script
2021-04-29 19:17:53 -04:00
Kenix3 c40bb119e1
Adds in scene support (#117)
* 1 scene done, Z2_SOUGEN OK

* All scenes OK

* Makefile improvements

* Use WIP ZAPD branch as submodule

* Add spawn rotation flag macro

* Fix bad merge

* Move scenes to be in their own subfolders

* Rename and restructure extracted baserom files

* Progress tracking for assets

* Add asset progress to csv

* Use master ZAPD

* Use distclean like in OOT

* Fix up a few things with the makefile

* Fix scenes not being dumped from ELF

Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
2021-04-29 18:56:18 -04:00
Rozelette e97f10a6fa
sys_slowly OK (#101)
* sys_slowly OK

* Feedback

* rename type member
2021-04-19 17:44:12 -04:00
Isghj 768ca0839b
DoorAna: OK (#90)
* DoorAna: OK

* DoorAna: changed z_lib functionname to match new master

* DoorAna: requested changes

* DoorAna: requested changes

* DoorAna: Renamed nextEntranceIndex

* DoorAna: some changes requested

Co-authored-by: isghj8 <isghj8@gmail.com>
2021-04-18 14:16:14 -04:00
Rozelette 84040f6ba6
z_skin_matrix OK (#81)
* Set up file

* Rename

* z_skin_matrix OK

* Cleanup

* /n nits
2021-04-12 00:41:35 -05:00