Commit Graph
117 Commits
Author SHA1 Message Date
Anghelo CarvajalandGitHub 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
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
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
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
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 HensleyandGitHub 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 BanksandGitHub 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 BurnettandGitHub 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 BurnettandGitHub 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 HensleyandGitHub 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
kyleburnetteandGitHub 751c5e1049 obj_funen OK (#91)
* initial funen work

* obj_funen OK

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

* actually commited change to header
2021-05-04 19:08:19 -04:00
kyleburnetteandGitHub 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
kyleburnetteandGitHub a91eaad34c obj_visiblock OK (#93)
* obj_visiblock OK

* re-oked obj_visiblock

* removed unnecessary pad
2021-05-03 18:07:08 -04:00
kyleburnetteandGitHub 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
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
ZelllllandGitHub 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
kyleburnetteandGitHub 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
kyleburnetteandGitHub 441f33968c item_inbox OK (#95)
* item_inbox OK

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

* more functions

* fix bg thingy

* finish boyo

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

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

* fix linker
2021-04-29 20:46:01 -04:00
kyleburnetteandGitHub 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
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
RozeletteandGitHub e97f10a6fa sys_slowly OK (#101)
* sys_slowly OK

* Feedback

* rename type member
2021-04-19 17:44:12 -04:00