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
292 Commits 2 Branches 11 Tags
c40bb119e1f64972e6a0879110826c455a28437b
Commit Graph
139 Commits
Author SHA1 Message Date
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
Lucas ShawGitHubLucas ShawRozelette
 		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
RozeletteandGitHub 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
IsghjGitHubisghj8Rozelette
 		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
RozeletteandGitHub 6536afc6d3 Restructure how buffers are set up (#77) 2021-03-27 12:44:39 -05:00
RozeletteandGitHub d0af9587ba Bg_Lotus OK (#86) 2021-03-27 12:29:06 -05:00
kyleburnetteandGitHub 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
RozeletteandGitHub 6e4d156ad7 Door_Spiral OK (from zel) (#87) 
* Door_Spiral OK

* Cleanup
 2021-03-27 12:17:42 -04:00
IsghjGitHubisghj8Rozelette
 		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
TharoandGitHub 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
RozeletteandGitHub 32d0e622fd padutils OK (#72) 
* padutils OK

* Update to latest OOT
 2021-03-22 11:03:33 -05:00
kyleburnetteandGitHub 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
RozeletteandGitHub 8342329538 yaz0.c OK (#71) 2021-03-16 21:49:27 -04:00
Kenix3andGitHub a53626049f Decompiles z_vr_box (from zel) (#73) 2021-03-16 21:27:14 -04:00
TharoandGitHub a983d14081 functions and variables headers cleanup (#63) 2021-03-11 20:27:39 -05:00
ZelllllandGitHub 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
kyleburnetteandGitHub e0164dba14 Fixed ultratypes.h (#48) 
* fixed ultratypes.h

* fixed ultratypes.h
 2021-02-23 23:08:16 -05:00
kyleburnetteandGitHub 0481c23e75 en_okarina_effect OK (#47) 
* en_okarina_effect OK

* Changed setupaction name
 2021-02-23 22:46:35 -05:00
kyleburnetteGitHubfullgrowngaming
 		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