Commit Graph

36 Commits

Author SHA1 Message Date
kyleburnette a91eaad34c
obj_visiblock OK (#93)
* obj_visiblock OK

* re-oked obj_visiblock

* removed unnecessary pad
2021-05-03 18:07:08 -04:00
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 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
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 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 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
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
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
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
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
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 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
Rozelette c725249389 Fix removal of bg_mbar object symbols 2020-09-23 20:28:05 -05: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 d1d578043b
obj_dinner OK (#26)
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2020-09-23 20:44:17 -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
rozlette c1bb5f00d6 Decompile z_rpc.c 2020-04-22 15:38:09 -05:00
rozlette 7692d06fcd Decompile Bg_Ikana_Ray 2019-12-28 02:23:17 -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 d605458fa5 Redo z_lights.c for new code base 2019-12-20 21:57:05 -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