Commit Graph
131 Commits
Author SHA1 Message Date
RozeletteandGitHub 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
204790ea8b En_Tubo_Trap (Flying Pot Enemy) (#62)
* EnTuboTrap: All but one, non-matching: minor regalloc

* EnTuboTrap: updates to zel's actor struct changes and cleaning

* EnTuboTrap: fullgrowngaming's requested changes

* EnTuboTrap: changed non-matching asm to new location

* Update src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

* EnTuboTrap: moved dlist externs to segment, and objects up to top of object_script.txt

* EnTuboTrap: requested changes

* EnTuboTrap: Fix GLOBAL_ASM, updated to Tharo's collision

* EnTuboTrap: collision enum was added

* EnTuboTrap: Update sfx function name

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
2021-03-27 14:23:35 -04:00
RozeletteandGitHub 6536afc6d3 Restructure how buffers are set up (#77) 2021-03-27 12:44:39 -05:00
RozeletteandGitHub d0af9587ba Bg_Lotus OK (#86) 2021-03-27 12:29:06 -05:00
kyleburnetteandGitHub 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
RozeletteandGitHub 6e4d156ad7 Door_Spiral OK (from zel) (#87)
* Door_Spiral OK

* Cleanup
2021-03-27 12:17:42 -04:00
e64d4d8bf2 EnPoFusen: OK (#69)
* EnPoFusen: OK

EnPoFusen: WIP

EnPoFusen: init is matched

* EnPoFusen: requested changes

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

* EnPoFusen: forgot I renamed a function to check diff, changed back

* EnPoFusen: Bad search and replace

* EnPoFusen: really bad search replace

* EnPoFusen: ColliderInit and requested changes

* Functions: renamed func_800B8EC8 to Audio_PlayActorSound2

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
2021-03-24 03:58:25 -05:00
TharoandGitHub 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
RozeletteandGitHub 32d0e622fd padutils OK (#72)
* padutils OK

* Update to latest OOT
2021-03-22 11:03:33 -05:00
kyleburnetteandGitHub 61fd3e0282 en_scopecoin OK (#67)
* Initial scopecoin work

* Scopecoin OK

* Updated submodules

* Fixed newline on macros.h, fixed a few minor details in scopecoin.c

* Made requested minor adjustments

* merge
2021-03-17 00:22:23 -04:00
RozeletteandGitHub 8342329538 yaz0.c OK (#71) 2021-03-16 21:49:27 -04:00
Kenix3andGitHub a53626049f Decompiles z_vr_box (from zel) (#73) 2021-03-16 21:27:14 -04:00
TharoandGitHub a983d14081 functions and variables headers cleanup (#63) 2021-03-11 20:27:39 -05:00
ZelllllandGitHub fb1ed529ad Add OoT actor structs and enums (#55)
* add oot structs

* revert formatting

* fix comment thing

* fix accidental renames

* slight fix

* naviEnemyId -> hintId

* fix headers
2021-02-28 22:52:12 -05:00
kyleburnetteandGitHub e0164dba14 Fixed ultratypes.h (#48)
* fixed ultratypes.h

* fixed ultratypes.h
2021-02-23 23:08:16 -05:00
kyleburnetteandGitHub 0481c23e75 en_okarina_effect OK (#47)
* en_okarina_effect OK

* Changed setupaction name
2021-02-23 22:46:35 -05:00
55c558852f en_rsn OK (#41)
* en_rsn OK

* Fixed build error caused by collisioncheck

Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
2021-02-12 18:26:05 -05:00
08e964972f en_nnh OK (#42)
* Matching (last thing to figure out is ColliderInit)

* nnh work

* Working on collider

* formatting

* Fixing en_nnh

* Fixed build error. The issue was a collider init, not sure what made me think it was OK before

* Removed overlay helper stuff

* Removed weird qemu file

* Fixed collider once and for all.

Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
2021-02-12 18:25:48 -05:00
ee0ab1cbc9 en_hs2 OK (#46)
* en_hs2 OK

* Formatted files

* Renamed the DoNothing func.

Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
2021-02-11 22:12:54 -05:00
6ac8ea373c Decompile ovl_TG_Sw (#44)
Co-authored-by: MMDecomp <MMDecomp@anon.tld>
2020-12-09 19:35:40 -05:00
fullgrowngamingandGitHub a9138a7c0f ending_hero5 OK (#40)
* ending_hero5 OK

* Formatting

* Fixed formatting and changed colors to decimal
2020-10-26 19:00:02 -04:00
fullgrowngamingandGitHub e997a0b67f en_dy_extra OK (#35)
* dy_extra decomped, but not ok

* Formatting

* Fixed data, en_dy_extra now OK

* Formatting

* Removed unnecessary color struct

* added newlines
2020-10-12 22:30:22 -05:00
fullgrowngamingandGitHub 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
fullgrowngamingandGitHub 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
fullgrowngamingandGitHub 96d05d4e7d en_tanron6 OK (#27)
* en_tanron6 OK

* Fixed name of SetupDoNothing

* Fixed initvars name

* Fixed initvars name

* Fixed initvars name
2020-09-28 19:27:21 -04:00