Commit Graph

299 Commits

Author SHA1 Message Date
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
Zelllll
f0cd2db055
ovl_Item_B_Heart OK (#110)
* finish heart

* fix linker
2021-04-29 21:54:53 -04:00
Zelllll
fed1b37da1
ovl_Bg_Keikoku_Spr OK (#111)
* finish actor

* fix linker
2021-04-29 20:46:01 -04:00
kyleburnette
69d9f32ef3
dm_statue OK (#94)
* dm_statue OK

* dm_statue OK

* Reworked types of segmented addresses

* ran format script
2021-04-29 19:17:53 -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
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
kyleburnette
d327f3e6c3
Changed ichaindis to output actual names by default and added an --offset arg to output offset names if needed. Also changed permission on all the overlayhelper scripts (#102) 2021-04-12 21:47:36 -05: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
75f1d51940
Optimization when building all to let compression happen as early as possible (#98) 2021-04-07 18:38:23 -04: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
kyleburnette
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
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
6536afc6d3
Restructure how buffers are set up (#77) 2021-03-27 12:44:39 -05:00
Rozelette
807db1ca54
Improve the robustness of depend.py (#76) 2021-03-27 12:44:31 -05: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
Ethan Roseman
d61a7a9ef2
Jenkins update (#79)
* Jenkins update

* reorder
2021-03-22 06:14:27 -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
Kenix3
22cb3c4b27
Fixes -include in makefile. (#74) 2021-03-16 22:48:54 -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
Rozelette
3a91922e89
Generate dependencies for C files with GLOBAL_ASM (#70) 2021-03-14 22:12: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
e788bfecbf
Jenkinsfile no longer builds master with qemu (#66) 2021-03-10 23:03:58 -05:00
Kenix3
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
Kenix3
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
Kenix3
fcdfa28d66 Uses new articulated name for baserom 2021-03-10 22:28:06 -05:00
Kenix3
b942b4ba9a Updates file setup script to place the non_matchings in the new location 2021-03-10 22:28:06 -05:00
Kenix3
daca195583 Comments out debugging print statements 2021-03-10 22:28:06 -05:00
Kenix3
1f7ad229c5 Updates progress.py to use the git module for outputting commit hash 2021-03-10 22:28:06 -05:00
Kenix3
375f99f2b4 Fixes matching and non-matching counts in progress.py 2021-03-10 22:28:06 -05:00
Kenix3
710c3d17b0 Fixes path to progress.py in Jenkinsfile 2021-03-10 22:28:06 -05:00
Kenix3
a23213c08c Jenkinsfile now builds master with qemu IDO 2021-03-10 22:28:06 -05:00
Kenix3
c8e9e78e78 Fixes issue that causes split rodata to be read as code decomp progress 2021-03-10 22:28:06 -05:00