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
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
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
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
012e3c21ae
Floats and Strings in asm ( #82 )
2021-03-27 14:10:09 -05:00
a5c039f2ee
en_tag_obj OK ( #84 )
...
* en_tag_obj OK
* Changed collider formatting at m4's request
* Removed use of macro and changed name of collider to reflect that it is unused
2021-03-27 13:55:09 -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
6536afc6d3
Restructure how buffers are set up ( #77 )
2021-03-27 12:44:39 -05:00
807db1ca54
Improve the robustness of depend.py ( #76 )
2021-03-27 12:44:31 -05:00
d0af9587ba
Bg_Lotus OK ( #86 )
2021-03-27 12:29:06 -05:00
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
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
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
32d0e622fd
padutils OK ( #72 )
...
* padutils OK
* Update to latest OOT
2021-03-22 11:03:33 -05:00
d61a7a9ef2
Jenkins update ( #79 )
...
* Jenkins update
* reorder
2021-03-22 06:14:27 -05:00
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
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
22cb3c4b27
Fixes -include in makefile. ( #74 )
2021-03-16 22:48:54 -05:00
8342329538
yaz0.c OK ( #71 )
2021-03-16 21:49:27 -04:00
a53626049f
Decompiles z_vr_box (from zel) ( #73 )
2021-03-16 21:27:14 -04:00
3a91922e89
Generate dependencies for C files with GLOBAL_ASM ( #70 )
2021-03-14 22:12:14 -04:00
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
a983d14081
functions and variables headers cleanup ( #63 )
2021-03-11 20:27:39 -05:00
72f2b6aa4d
Fix incorrect .data start for En_Door ( #68 )
2021-03-11 20:04:59 -05:00
e788bfecbf
Jenkinsfile no longer builds master with qemu ( #66 )
2021-03-10 23:03:58 -05:00
a858d26e10
Updates jenkinsfile to give the name of the progress.csv files based on the MM version ( #65 )
2021-03-10 22:38:56 -05:00
8468e83786
Updates file_setup.sh script to split based on the asm files being in different sub directories
2021-03-10 22:28:06 -05:00
fcdfa28d66
Uses new articulated name for baserom
2021-03-10 22:28:06 -05:00
b942b4ba9a
Updates file setup script to place the non_matchings in the new location
2021-03-10 22:28:06 -05:00
daca195583
Comments out debugging print statements
2021-03-10 22:28:06 -05:00
1f7ad229c5
Updates progress.py to use the git module for outputting commit hash
2021-03-10 22:28:06 -05:00
375f99f2b4
Fixes matching and non-matching counts in progress.py
2021-03-10 22:28:06 -05:00
710c3d17b0
Fixes path to progress.py in Jenkinsfile
2021-03-10 22:28:06 -05:00
a23213c08c
Jenkinsfile now builds master with qemu IDO
2021-03-10 22:28:06 -05:00
c8e9e78e78
Fixes issue that causes split rodata to be read as code decomp progress
2021-03-10 22:28:06 -05:00
037ba9a22e
Initial support of tracking progress per code/boot/overlay, and outputs the stats to csv.
2021-03-10 22:28:06 -05:00
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
5c761c33f0
Updates asm-differ ( #53 )
2021-02-25 19:36:55 -05:00
7ef48e193b
Make defaults to uncompressed ( #52 )
...
* 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:
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
* Make now defaults to only build the uncompressed rom. This fixes permuter import errors, and makes building quicker since most of the time people only need to test one rom. Uncompressed was chosen because it's easier to debug with the first_diff script.
Co-authored-by: MMDecomp <MMDecomp@anon.tld>
2021-02-25 19:12:48 -05:00
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
73eed5a0b3
Fixes IDO recomp and allows git to detect binary files. ( #50 )
2021-02-25 18:21:51 -05:00
48aa632eb6
Flags ido_recomp as binary.
2021-02-24 01:06:20 -05:00
36557611ce
Added IDO recomp support ( #45 )
...
* Added recomp
* Fix .exes not being included maybe
* Fixed now?
* OK this should add IDO
* Re recompile in -O2
* Updates asm-processor to point to current HEAD.
* Uses the exact same ido_recomp binaries as OOT.
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-02-24 00:50:57 -05:00
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
e0164dba14
Fixed ultratypes.h ( #48 )
...
* fixed ultratypes.h
* fixed ultratypes.h
2021-02-23 23:08:16 -05:00
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
Rozelette