falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
303 Commits 1 Branch 0 Tags 296 MiB
Commit Graph

116 Commits

Author SHA1 Message Date
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
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
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
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
kyleburnette 50d0bbe087
dm_sa OK (#88) 
* initial dm_sa work

* more dmsa work

* dm_sa OK

* Changed char arrays in header to be UNK_TYPE1

* Made all of roz's suggested changes

* merge
 2021-04-07 18:08:19 -04: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
Tharo 012e3c21ae
Floats and Strings in asm (#82) 2021-03-27 14:10:09 -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
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
Rozelette 8342329538
yaz0.c OK (#71) 2021-03-16 21:49:27 -04:00
Rozelette 3a91922e89
Generate dependencies for C files with GLOBAL_ASM (#70) 2021-03-14 22:12:14 -04: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
Kenix3 7955a59194
PoC automatic rodata split Total split: 585 Failed / Troublesome: 61 (10,42735042735043%) Successfull rodata split: 524 (89,57264957264957%) Failed due to Script issues: 51 Failed due to object boundary issues or unreferenced .rodata: 10 Build OK?: :feelsokman: (#51) 
rom_uncompressed.z64: OK
2a0a8acb61538235bc1094d297fb6556  rom.z64
rom.z64: OK

List Of Troublesome (mostly simliar edge cases, some are strings that we dont catch right / data without references):
 -    ovl_Arrow_Ice
 -    ovl_Arrow_Light
 -    ovl_Bg_Dkjail_Ivy
 -    ovl_Bg_Ikana_Mirror
 -    ovl_Boss_02
 -    ovl_Boss_07
 -    ovl_Boss_Hakugin
 -    ovl_Elf_Msg
 -    ovl_Elf_Msg2
 -    ovl_Elf_Msg3
 -    ovl_Elf_Msg4
 -    ovl_Elf_Msg5
 -    ovl_En_Az
 -    ovl_En_Bigokuta
 -    ovl_En_Bigpamet
 -    ovl_En_Bigpo
 -    ovl_En_Bigslime
 -    ovl_En_Box
 -    ovl_En_Butte
 -    ovl_En_Col_Man
 -    ovl_En_Crow
 -    ovl_En_Death
 -    ovl_En_Elf
 -    ovl_En_Elforg
 -    ovl_En_Encount3
 -    ovl_En_Encount4
 -    ovl_En_Fish
 -    ovl_En_Fish2
 -    ovl_En_Fsn
 -    ovl_En_Honotrap
 -    ovl_En_Horse
 -    ovl_En_Horse_Game
 -    ovl_En_Invadepoh
 -    ovl_En_Ishi
 -    ovl_En_Kame
 -    ovl_En_Kanban
 -    ovl_En_Kusa2
 -    ovl_En_M_Thunder
 -    ovl_En_Maruta
 -    ovl_En_Mushi2
 -    ovl_En_Okuta
 -    ovl_En_Ossan
 -    ovl_En_Pametfrog
 -    ovl_En_Peehat
 -    ovl_En_Rg
 -    ovl_En_Ruppecrow
 -    ovl_En_Slime
 -    ovl_En_Sob1
 -    ovl_En_Syateki_Man
 -    ovl_En_Test7
 -    ovl_En_Trt
 -    ovl_En_Wiz_Fire
 -    ovl_Mir_Ray
 -    ovl_Obj_Bombiwa
 -    ovl_Obj_Driftice
 -    ovl_Obj_Hariko
 -    ovl_Obj_Iceblock
 -    ovl_Obj_Mure
 -    ovl_Obj_Snowball2
 -    ovl_Obj_Toudai
 -    ovl_select

Co-authored-by: MMDecomp <MMDecomp@anon.tld>
 2021-02-25 19:05:33 -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 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 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
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 88e5dbbb7a
Add .data and .rodata sections to generated assembly. Add Overlay .rodata splits. (#18) 2020-09-16 20:33:34 -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 b930732494
Makefile rework. Add init and uncompressed targets. (#15) 
* Makefile rework. Add init and uncompressed targets

* Update file_setup.sh for new makefile

* Change CFLAGS
 2020-09-11 19:00:17 -04:00
Rozelette de7a521857
Decompile z_snap (#11) 2020-08-29 01:10:24 -04:00
Rozelette f4936cc471
Delete function type information (#12) 
* Remove ability to generate headers when disassembling

* Remove type information from function table

Co-authored-by: Rozelette <users.noreply.github.com>
 2020-08-28 20:55:33 -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
mmb70 ac685a8161 updated functions.txt for func_800968B0 2020-07-24 19:26:37 -04:00
MMDecomp 7d61d4e6ff Decompile `game.c` 2020-06-23 10:55:11 -04:00
rozlette 01c86ec621 Decompile z_prenmi.c 2020-04-23 01:11:25 -05:00