Commit Graph

126 Commits

Author SHA1 Message Date
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
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
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
Rozelette d2c181a0a9
z_lib fully matched (#85)
* z_lib OK

* Documentation

* Added stdbool and stdint

* Fixup for new names

* Fixup bad merge

* Feedback

* Use u/s32 for intptr_t
2021-04-07 17:16:16 -04:00
Rozelette b22e26dbd8
z_en_item00 (#78)
* z_en_item00 WIP 17/21 match, rest close to matching

* Split .rodata for z_en_item00

* Item00 documentation, some misc cleanup

* Minor cleanup

* Fixup for z_collision_check

* Address feedback

* Delete old file

* Fix bad merge
2021-03-27 19:55:42 -05:00
Lucas Shaw 623b6d5318
Some OOT transfers, some renaming, etc (#75)
* Progress on various files

* gfxprint stuff

* split some rodata, add iconv for rodata string parsing

* z_std_dma rodata

* 2 nonmatchings in gfxprint

* mtxuty-cvt ok

* more

* match a function in idle.c

* progress

* Cleanup

* Rename BgPolygon to CollisionPoly

* progress

* some effect stuff

* more effect progress

* updates

* made suggested changes

* z_effect_soft_sprite_old_init mostly ok

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
2021-03-27 16:17:41 -05:00
Rozelette fee7a49abc
z_lights fully matched (#80)
* z_lights OK

* Documentation

* Fixup for z_collision_check

* Improve function types of bind functions

* Fixup for types
2021-03-27 14:29:30 -05:00
Rozelette 6536afc6d3
Restructure how buffers are set up (#77) 2021-03-27 12:44:39 -05:00
kyleburnette a0b8a7c718
TwoHeadArena and TwoHeadGfxArena OK (#83)
* TwoHeadArena and TwoHeadGfxArena OK

* Changed negatives to ~ in TwoHeadArena.c

* Renamed functions to match OoT

* Formatted code files

* Removed dispbuf
2021-03-27 12:13:56 -05:00
Rozelette 6e4d156ad7
Door_Spiral OK (from zel) (#87)
* Door_Spiral OK

* Cleanup
2021-03-27 12:17:42 -04:00
Tharo 1a2e6d7ffe
z_collision_check.c (#58)
* setup

* Progress on z_collision_check.c

* Further progress on z_collision_check.c

* renamed code_0x800E03A0 to z_collision_btltbls, z_collision_check.c decompiled besides bss

* Structs changes

* Document functions

* overlayhelpers folder, colliderinit.py and ichaindis.py

* Flags, format existing ColliderInits

* Fix merge

* Few more small improvements

* Review suggestions
2021-03-22 17:48:15 -04:00
Rozelette 32d0e622fd
padutils OK (#72)
* padutils OK

* Update to latest OOT
2021-03-22 11:03:33 -05:00
Rozelette 8342329538
yaz0.c OK (#71) 2021-03-16 21:49:27 -04:00
Kenix3 a53626049f
Decompiles z_vr_box (from zel) (#73) 2021-03-16 21:27:14 -04:00
kyleburnette 0481c23e75
en_okarina_effect OK (#47)
* en_okarina_effect OK

* Changed setupaction name
2021-02-23 22:46:35 -05:00
fullgrowngaming f927730418
Arms_Hook OK (#33)
* All but 2 functions matched

* More work on hookshot

* hookshot work

* 2 functions left (and one is almost done)

* sp issues with draw, but matching otherwise

* hookshot matching

* Changed rodata inclusion for armshook

* Hookshot OK

* Resolve script conflicts

* Rename unk variables to match MM standard

* Made requested changes
2020-10-11 18:30:22 -05:00
fullgrowngaming 1c4a3047de
z_skelanime OK (#34)
* initial skelanime commit

* Skelanime OK

* Forgot to add z64animation.h and skelanime.c
2020-10-11 13:31:06 -04:00
Bonfam 280d7b7eea
GlobalContext: unwrap CameraContext (#31)
* GlobalContext: unwrap CameraContext

Makes ACTIVE_CAM macro usable.
func_8013A530 changes to use new GlobalContext struct.

* z64.h: remove CameraContext
2020-09-27 20:38:43 -04:00
fullgrowngaming d1d578043b
obj_dinner OK (#26)
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2020-09-23 20:44:17 -04:00
fullgrowngaming a45af872a2
en_torch OK (#22)
* en_torch OK

* Ran format script

* Fixed init vars formatting

* Fixed spaces at end of lines in InitVars
2020-09-23 20:16:09 -04:00
Rozelette 189d0d6c30
Bootstrap actors (#14)
* Bootstrap actors

* Address feedback. Improve header guard. Remove ovl_Player_Actor, it will need to be handled seperately.
2020-09-13 14:21:43 -04:00
Rozelette 0844c24773
Split headers to be more similar to OOT (#13) 2020-08-31 19:02:37 -04:00