izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
311 Commits 2 Branches 11 Tags
e39141fb3df04cfd7c0df63e4570340db5df9e1a
Commit Graph
112 Commits
Author SHA1 Message Date
Derek HensleyandGitHub e39141fb3d Ovl en nutsball OK (#115) 
* EnNutsball Match but one function with sp issues

* Updated ActorPlayer

* Renamed unk144 to timer and added data as comment

* Got update matched but stack issues with two vars

* add back new line

* Fixed stack issue based on PR comments. Added data

* more descriptive variable names

* Use OPEN_DISPS/CLOSE_DISPS macros in draw

* Address PR comments
 2021-05-04 23:10:59 -04:00
Zach BanksandGitHub fcc87b3ae2 ovl_Dm_Ravine (Link Riding Through Lost Woods Cutscene - Tree Trunk) (#120) 
* ovl_Dm_Ravine OK (Link Riding Through Lost Woods Cutscene - Tree Trunk)

* ovl_Dm_Ravine: respond to PR comments

* Rename/retype DmRavine_Action -> DmRavine_DoNothing

* ovl_Dm_Ravine: incorporate PR feedback from kyleburnette

* ovl_Dm_Ravine: rename fields; use enum for state
 2021-05-04 22:58:47 -04:00
Parker BurnettandGitHub d61d236a04 En_jc_mato matching (#119) 
* starting actor

* close to being done

* updating txt files

* z_en_jc_mato OK

* Merge branch 'master' into en_jc_mato

* fixing some suggestions

* adding names

* changing name to movement
 2021-05-04 22:03:41 -04:00
Parker BurnettandGitHub d44d842192 z_en_warp_uzu OK (#113) 
* matched all functions

* Jk I figured it out....forgot to add static...

* Fixing name suggestion
 2021-05-04 21:16:05 -04:00
Derek HensleyandGitHub 7605041f0a Ovl_En_Cha OK (#116) 
* EnCha OK

* pr comments, else if branches, file header comment

* Better function names
 2021-05-04 20:10:30 -04:00
kyleburnetteandGitHub 751c5e1049 obj_funen OK (#91) 
* initial funen work

* obj_funen OK

* ran format script
 2021-05-04 19:51:42 -04:00
kyleburnetteandGitHub 94ef01b42f kepn_koya OK (#97) 
* kepn_koya OK

* actually commited change to header
 2021-05-04 19:08:19 -04:00
kyleburnetteandGitHub 0beaddd30b bg_lbfshot OK (#92) 
* bg_lbfshot OK

* formatted source files

* Update z_bg_lbfshot.c

* Update z_bg_lbfshot.h
 2021-05-04 18:59:45 -04:00
kyleburnetteandGitHub a91eaad34c obj_visiblock OK (#93) 
* obj_visiblock OK

* re-oked obj_visiblock

* removed unnecessary pad
 2021-05-03 18:07:08 -04:00
kyleburnetteandGitHub 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
Derek HensleyGitHubParker Burnett
 		c7a1fb739f En_M_Fire1 OK (#106) 
* En_M_Fire1 OK

* Removed Null cast

* Added newline

* Address PR Review Comments

* Update src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Renamed unk190 to timer

Co-authored-by: Parker Burnett <burnettparker@gmail.com>
 2021-05-01 12:33:57 -04:00
ZelllllandGitHub 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
kyleburnetteandGitHub 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
kyleburnetteandGitHub 441f33968c item_inbox OK (#95) 
* item_inbox OK

* renamed func_80945534 to suggested name
 2021-04-30 23:36:55 -04:00
ZelllllandGitHub 536a484f73 ovl_Obj_Boyo OK (#112) 
* start

* more functions

* fix bg thingy

* finish boyo

* conflict fix1
 2021-04-30 23:04:05 -04:00
ZelllllandGitHub f0cd2db055 ovl_Item_B_Heart OK (#110) 
* finish heart

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

* fix linker
 2021-04-29 20:46:01 -04:00
kyleburnetteandGitHub 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
Kenix3GitHubRozelette
 		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
RozeletteandGitHub e97f10a6fa sys_slowly OK (#101) 
* sys_slowly OK

* Feedback

* rename type member
 2021-04-19 17:44:12 -04:00
IsghjGitHubisghj8
 		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
RozeletteandGitHub 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
kyleburnetteandGitHub 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
RozeletteandGitHub 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
RozeletteandGitHub 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