mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-20 05:36:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,060 Commits 1 Branch 0 Tags
aebbebd6cf5af6fa00fa034e2a4607b5a63bbb8c
Commit Graph

846 Commits

Author SHA1 Message Date
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
Isghj 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
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
kyleburnette 0e2738b81a bg_ikana_shutter OK (#56) 
* Initial shutter work

* Fixed types.h

* bg_ikana_shutter OK

* Reverted errant change to ultratypes

* Adjusted to use new actor field names

* fixed submodules

* Cleaned up a comment I left by accident

Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
 2021-03-20 22:45:22 -04:00
kyleburnette 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
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 8b812cdf8e Fixed incorrect actionfunc declarations caused by bad copy/paste (#61) 
* Fixed incorrect actionfunc declarations caused by bad copy/paste

* Fixed accidental submodule changes
 2021-03-11 20:39:08 -05:00
Tharo a983d14081 functions and variables headers cleanup (#63) 2021-03-11 20:27:39 -05:00
Rozelette 72f2b6aa4d Fix incorrect .data start for En_Door (#68) 2021-03-11 20:04:59 -05:00
Kenix3 037ba9a22e Initial support of tracking progress per code/boot/overlay, and outputs the stats to csv. 2021-03-10 22:28:06 -05:00
Zelllll 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
Tharo c55e9eeee5 pragma variant for GLOBAL_ASM (#49) 
* pragma GLOBAL_ASM

* Revert split_asm.py arg description change
 2021-02-23 23:15:58 -05:00
kyleburnette 0481c23e75 en_okarina_effect OK (#47) 
* en_okarina_effect OK

* Changed setupaction name
 2021-02-23 22:46:35 -05:00
kyleburnette 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
kyleburnette 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
kyleburnette 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
Kenix3 6ac8ea373c Decompile ovl_TG_Sw (#44) 
Co-authored-by: MMDecomp <MMDecomp@anon.tld>
 2020-12-09 19:35:40 -05:00
fullgrowngaming 96f680d1d1 en_ending_hero OK (#36) 
* Initial work

* en_ending_hero OK

* Converted array of UNKPTRs to symbols

* Moved texture arrays back outside function
 2020-10-26 19:01:01 -04:00
fullgrowngaming a9138a7c0f ending_hero5 OK (#40) 
* ending_hero5 OK

* Formatting

* Fixed formatting and changed colors to decimal
 2020-10-26 19:00:02 -04:00
fullgrowngaming c4f4dcebc7 en_ending_hero4 OK (#39) 
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
 2020-10-12 22:33:42 -05:00
fullgrowngaming 98992c25b4 ending_hero3 OK (#38) 
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
 2020-10-12 22:33:02 -05:00
fullgrowngaming f3fbb6474c ending_hero2 OK (#37) 
* ending_hero2 OK

* Formatting

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
 2020-10-12 22:32:19 -05:00
fullgrowngaming 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
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
fullgrowngaming 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
fullgrowngaming 378684152c bg_market_step OK (#21) 
* bg_market_step OK

* Ran formatting script

* Converted arrays to Gfx* arrays and formatted init vars properly

* Propery formed display lists and arrays
 2020-09-28 19:26:33 -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
Rozelette 07efebe2ff z_actor_dlftbls.c OK. Rework a bunch of segment address organization. (#29) 2020-09-27 20:19:06 -04:00
fullgrowngaming a051672fd6 bg_haka_curtain OK (#25) 
* bg_haka_curtain OK

* Renamed InitVars back to its symbol name, plus converted the actor to a dynaActor like it should be

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
 2020-09-23 21:04:29 -04:00
fullgrowngaming d612cc7196 Empty actors (Demo_Shd, en_firefly, en_fire_rock, and en_boj_01-05) OK (#24) 
* Finished two empty actors

* Demo_Shd, en_firefly, en_fire_rock, and en_boj_01-05 OK and formatted

* en_zl1 OK (also an empty actor)
 2020-09-23 20:56:23 -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
fullgrowngaming 79544c9093 bg_mbar_chair OK (#28) 2020-09-23 20:02:50 -04:00
fullgrowngaming a241f57e60 obj_hana OK (#20) 2020-09-19 21:55:06 -05: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
Rozelette de7a521857 Decompile z_snap (#11) 2020-08-29 01:10:24 -04:00
Rozelette 125b16cb17 Add object enum (#9) 2020-08-07 18:12:03 -04:00
Rozelette 12e258561e Cleanup some function identifications. (#7) 
* Add missed functions, remove not functions

* Fix typo
 2020-08-06 18:11:32 -04:00
Rozelette f37da749f6 Add actor and scene enums (#8) 2020-08-06 18:06:38 -04:00
Kenix3 e80336d4a8 Initial code format 2020-07-24 20:00:52 -04:00
mmb70 ae6b5c6aa1 fix local var names 2020-07-24 19:26:37 -04:00
mmb70 b93b6f0389 fix improper spacing 2020-07-24 19:26:37 -04:00
mmb70 522ccdbb95 func_0x800968B0 PR review 2020-07-24 19:26:37 -04:00
mmb70 7b45043c97 Matched boot_0x800968B0.c 
Matched func_800968B1
 2020-07-24 19:26:37 -04:00
Kenix3 07cfe5b43f Merge branch 'master' of https://github.com/zeldaret/mm 2020-06-23 17:38:34 -04:00