Commit Graph

150 Commits

Author SHA1 Message Date
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
Isghj 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
Rozelette d0af9587ba
Bg_Lotus OK (#86) 2021-03-27 12:29:06 -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
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
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
Tharo a983d14081
functions and variables headers cleanup (#63) 2021-03-11 20:27:39 -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
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
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
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
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
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
Rafael Moura c9dc82cbe5 func_800B72F8 decompiled 2020-06-23 17:35:29 -04:00
MMDecomp 7d61d4e6ff Decompile `game.c` 2020-06-23 10:55:11 -04:00
Kenix3 664182c289 Fixes known undefined behaviour from DmaMgr and Lib_Ptr taking u32 rather than void* 2020-06-04 21:41:44 -04:00
Kenix3 dfbcac539e All z_scene functions now OK 2020-06-04 20:41:16 -04:00
Kenix3 f230898dfe
z_scene functions now use the same structs as OOT (#3)
* z_scene now uses OOT structs where available

Additionally commits a decompiled z_actor function.

* Fixes audio_setBGM function call in Scene_HeaderCommand15

* Update structs.h

Co-authored-by: rozlette <uberpanzermensch@gmail.com>
Co-authored-by: Egor Ananyin <ananinegor@gmail.com>
2020-04-29 22:14:29 -05:00
rozlette 01c86ec621 Decompile z_prenmi.c 2020-04-23 01:11:25 -05:00
rozlette c1bb5f00d6 Decompile z_rpc.c 2020-04-22 15:38:09 -05:00
rozlette 639df45a03 Some work on z_view 2020-04-21 11:49:16 -05:00
rozlette 2b50a1eab8 Update to latest ghidra project 2020-04-19 13:15:10 -05:00
Kenix3 4e63d23cf4
Merge pull request #2 from Kenix3/master
Decompile functions in z_scene
2020-04-08 17:52:03 -04:00
Kenix f8713ceb46 Decompile functions in z_scene 2020-04-08 17:49:40 -04:00
rozlette b1dda27053 Decompile code_0x800AF710.c 2020-03-19 22:59:03 -05:00
rozlette adc18f10e2 Port over some cutscene documentation from oot 2020-03-18 21:03:18 -05:00
rozlette b4aad9b857 Document some z_eff_* files 2020-03-18 02:32:11 -05:00
rozlette ff958ad932 Rename many functions, structs, and variables to match the oot decomp. Some things have not been renamed as their respective files have not been decompiled yet. 2020-03-15 01:13:53 -05:00
Cleverking2003 0c35be2381
More functions from z_actor.c (#6)
* More functions from z_actor.c

* Apply suggestions from code review

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
2020-03-10 12:24:59 -05:00
Cleverking2003 da9aaf43c1
Some functions from z_actor.c (#5)
* Decompiled some functions from z_actor.c

* More functions

* Coding style

* Minor fixes
2020-03-04 11:44:43 -06:00
rozlette d4d8f58636 Start on z_bgcheck.c 2020-03-01 19:17:22 -06:00
rozlette 74c1dc2145 Decompile code_0x800CAE10.c 2020-03-01 16:49:45 -06:00
rozlette 759fef3928 Some loadfragment2.c progress 2020-03-01 14:57:16 -06:00
rozlette 8bac7d120c Split boot .bss 2020-02-26 18:11:32 -06:00
rozlette 81c4300015 Update to latest ghidra project 2020-02-24 23:55:51 -06:00
Kenix3 bfcc1d6a9a
Decompiling functions in z_scene (#4)
* Decompiling functions in z_scene

* Bringing decompiled functions in line with project style
2020-02-17 23:17:07 -06:00
rozlette bb4123c073 Decompile irqmgr 2020-01-22 21:47:05 -06:00
rozlette 930b8bc242 Port a bunch of libultra files from sm64 2020-01-20 23:27:02 -06:00
rozlette 7f4a682072 Port perspective.c from sm64 2020-01-17 01:04:40 -06:00
rozlette e74e227113 Decomp idle.c 2020-01-16 21:35:54 -06:00
rozlette 50019e85ad Greatly improve automatic symbol finding in the disassembler. Code still needs to be cleaned up a bit 2020-01-16 13:06:32 -06:00
rozlette 30daa16255 Port stackcheck.c from oot decomp 2020-01-12 20:18:31 -06:00
rozlette 36f623023d Port over fault.c from oot decomp 2020-01-12 16:52:32 -06:00
rozlette 0d4cadc3d1 Decomp boot_0x80081920 2020-01-11 10:02:43 -06:00
rozlette bb9de27a16 Decomp controller.c 2020-01-11 08:54:07 -06:00
rozlette 727a546fcf Update to latest ghidra project 2020-01-08 08:32:20 -06:00
rozlette 8d8df1848e More work on z_scene_proc.c 31/36 matching, 3 non-matching, 2 not attempted 2019-12-29 21:34:58 -06:00
rozlette 6a74885a38 Little bit of work on z_scene_proc 2019-12-28 00:24:30 -06:00
rozlette 37969fbe50 Decompile Bg_Fu_Kaiten. Add some method to generate overlays, refinement needed 2019-12-27 20:55:40 -06:00
rozlette 664bb49a5d Decompile z_kanfont 2019-12-24 03:52:37 -06:00
rozlette d6faee7318 Port some of z_room from the oot decomp 2019-12-24 01:46:19 -06:00
rozlette 962a957166 Decompile code_0x800E8EA0.c 2019-12-18 01:31:47 -06:00
rozlette 82ad58e489 Cleanup files in code. Decompile code_800CAAD0.c 2019-12-17 18:47:52 -06:00
rozlette bdf36b85d3 Decompile z_eff_footmark.c 2019-12-15 03:31:57 -06:00
rozlette 9bc4990814 Update to latest from ghidra project 2019-12-14 23:38:35 -06:00
rozlette d6f9c091cc Include all unnamed files in objects.py 2019-12-14 03:30:11 -06:00
rozlette 60eaf159b4 Generate all major headers from ghidra project 2019-12-07 18:21:34 -06:00
rozlette 86ab9c2067 Use variable names from ghidra project. Reorganize some data tables and header files to work easier with it. 2019-11-28 00:26:09 -06:00
rozlette a09a799eef Rename tons of structs because we aren't using the z_ prefix anymore ;_; 2019-11-14 00:52:31 -06:00
rozlette b1938991fa Update structs.h because Ghidra can handle bitfields now 2019-11-13 22:14:03 -06:00
rozlette a8060ddcff Use structs.h generated from Ghidra project 2019-09-29 01:37:21 -05:00
rozlette 0ecea6b626 Add ovl_En_Fishing. Get rid of most hard-coded offsets in linker script. 2019-09-27 00:09:51 -05:00
rozlette dbb90b579e Adjust disasm automatic behavior. Print out symbol names for function and data pointers 2019-09-26 00:18:22 -05:00
rozlette 4c11f2f364 Add tons of function names. Datatypes TODO 2019-09-20 01:43:40 -05:00
rozlette 35eb22813a Add a couple of symbols 2019-09-19 22:25:57 -05:00
rozlette 15d44ed724 Add z_effect_soft_sprite 2019-04-15 21:01:57 -05:00
rozlette 2b7d9ed708 Do most of code_0x800FEC90 2019-03-06 21:48:32 -06:00
rozlette 79c2ce743d Add most of ovl_Bg_Fu_Kaiten_0x80ACB400 2019-02-26 00:31:51 -06:00
rozlette a309571228 Updata current progress 2018-12-06 13:47:07 -06:00
rozlette 55bece5060 Decompile sinf.c 2018-11-17 02:16:20 -06:00
rozlette dffd187304 Use hex instead of decimal 2018-11-16 22:14:07 -06:00
rozlette 53b1539754 Add more function and variable documentation 2018-11-13 22:13:33 -06:00
rozlette d1d248f2a6 boot_0x80081920 can't seem to match... 2018-11-08 21:39:28 -06:00
rozlette 00e3a8fcb7 Get boot_0x80080790 somewhat close to matching 2018-11-08 21:02:45 -06:00
rozlette 53ebb015f3 Fix misidentified function 2018-10-31 20:09:24 -05:00
rozlette da6f7fcbe2 Add object sirawread 2018-10-30 00:45:47 -05:00
rozlette 6e239df2a8 Pull a few symbols from parameters.o 2018-10-30 00:19:38 -05:00
rozlette 563866f074 Fix misnamed function 2018-10-29 23:52:02 -05:00
rozlette e5737d1688 Decompile code_0x80183070 2018-10-28 03:32:16 -05:00
rozlette 0418ad11d3 Cleanup and fixed build 2018-10-28 01:43:30 -05:00
rozlette c47dba1a0d Decompile code_0x800E03A0 2018-10-28 00:52:59 -05:00
rozlette c15ac4a925 code_0x800A5AC0 almost matches 2018-10-27 22:59:47 -05:00
rozlette 4edcdeb811 Fix tabs 2018-10-25 22:22:38 -05:00
rozlette cc9baa93a8 Dump current status 2018-10-25 22:09:52 -05:00