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
2,954 Commits 2 Branches 11 Tags
develop
Commit Graph
2954 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom OvertonandGitHub be121f7dd7 Document Song of Time Clock assets in gameplay_keep (#1068) 2022-09-24 15:34:59 -03:00
Tom OvertonandGitHub 4088aea3f7 Document object_lotus (lily pad) (#1067) 2022-09-24 15:28:49 -03:00
Tom OvertonandGitHub 62502ac22f Document object_mtoride (Woodfall scene objects) (#1062) 
* Name everything in object_mtoride

* Get ready for PR

* Update some of the names
 2022-09-24 15:21:01 -03:00
Tom OvertonandGitHub fd5ff73a35 Extract assets from link_animetion (#1056) 
* Extract assets from link_animetion

* Add empty last line
 2022-09-24 15:14:59 -03:00
SonicDcerGitHubDerek HensleyAnghelo Carvajal
 		c23112c855 ovl_En_Bee OK (#1086) 
* all functions matching

* initial cleanup

* tatl hint

* clean up + SFX

* SFX

* more SFX

* func_800B3030

* SFX FIX

* castings

* clean up

* array of Vec3f

* for loop fix (Thanks @Maide)

* ACTORCAT_ITEMACTION

* a few nits

* ACTORCAT_ENEMY

* actor struct size restored

* ACTORCAT_ENEMY

* Update src/overlays/actors/ovl_En_Bee/z_en_bee.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* parenthesis

* parenthesis

* merge fail

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2022-09-24 15:07:11 -03:00
StickyThwompandGitHub d968e58f9c Obj_Kendo_Kanban OK and Documented (Decomp was mostly done already) (#1057) 
* stuff

* Renaming in-process

- Changed action names and setup names based on examples.
- Undid some ill-advised changes that broke matching.
- Misc variable naming. Need verification and not all complete.

* wip renaming

* A bit more progress on determining names for everything.

* Done with naming.

* Touchup before review

* Updates from review:

- Leave displacementY/unk_AC0 naming to z_actor work.
- Remove unnecessary include of z64math.h, indirect inclusion preferred
- Add trailing comma for better formatting of sDisplayLists
- Rename of static vectors sNullVec3f->sZeroVec, sUnitVectorX->sUnitVecX
- Restore pad instead of using local const. Change const to #define
- Prefer index over idx
- Remove 'b' prefix from bHasNewRootCornerPos
- Const -> Enum and formatting in ObjKendoKanban_IsPlayerOnTop
- Rename 'Aerial' to 'Tumble'

* Missed items in review:
- Missed an instance of displacementY->unk_AC0 renaming (Cause of build failure)
- Whitespace formatting
- UNK_TYPE2 undo

* More adjustments from review:
- Undo accidental formatting changes to z64player.h, restoring to master.
- Naming and Formatting changes.
- Removing some comments.

* From review, qualify enum and #define with obj name, whitespace cleanup.
 2022-09-24 15:00:53 -03:00
Tom OvertonandGitHub 0aede274ae Document BgInibsMoveBg (Twinmold's Arena) and object_inibs_object (#1055) 
* Document BgInibsMoveBg (Twinmold's Arena) and object_inibs_object

* Respond to hensldm's review
 2022-09-24 14:54:40 -03:00
Parker BurnettandGitHub b4adfb0a22 Fbdemo_triforce OK with documentation (#1053) 
* close to done

* OK and doc'd

* PR feedback

* 4mat

* PR feedback round 2

* fixed engineers comment
 2022-09-24 14:49:07 -03:00
engineer124andGitHub cdee1fc45b z_kaleido_prompt.c Ok and Documented (Pause Menu Save/Continue Prompt. Unused) (#1045) 
* kaleido prompt ok

* fix pauseCtx
 2022-09-24 14:43:21 -03:00
Derek HensleyandGitHub 71a18d70cf OK (#1040) 2022-09-24 14:36:55 -03:00
Derek HensleyandGitHub 77be902c25 Effect Bomb2 Ok (#1039) 
* OK

* PR
 2022-09-24 14:31:20 -03:00
Derek HensleyandGitHub 1402db4008 Effect Dfire OK (#1038) 
* OK

* rename function

* MTXMODE enum

* PR

* Format

* % -> &

* note
 2022-09-24 14:26:08 -03:00
Derek HensleyandGitHub b5a9189cef Effect Deaddb OK (#1037) 
* OK

* Add description

* format

* Fix EffectSsDeadDbInitParams size comment
 2022-09-24 14:21:08 -03:00
Derek HensleyandGitHub 71e4046415 Effect Deadds OK (#1018) 
* OK

* cleanup

* Fix merge

* Small cleanups
 2022-09-24 14:15:48 -03:00
Derek HensleyandGitHub fb4ca3fb17 Effect DtBubble OK (#1017) 
* OK

* Some cleanup

* Format

* Name enum
 2022-09-24 14:09:46 -03:00
Derek HensleyandGitHub f31056ef8a Effect Dust OK (#1016) 
* OK

* Some cleanup

* Description

* format

* Better name

* whoops

* Array count

* Name dust texture arrays

* Fix

* static

* Update dust tex outnames
 2022-09-24 14:04:03 -03:00
petrie911 5f69757883 Merge remote-tracking branch 'upstream/master' into Mine 2022-09-21 07:37:07 -05:00
Elliptic Ellipsis 18021eef87 Sfx 2022-09-21 05:17:30 +01:00
Elliptic Ellipsis 592e8d4d6d Better match for func_809EECBC 2022-09-21 05:03:28 +01:00
Elliptic Ellipsis 03b849214c Clean up externs 2022-09-20 21:17:35 +01:00
Elliptic Ellipsis 41841abc9a Data/bss in, extract colheader 2022-09-20 20:55:56 +01:00
Elliptic Ellipsisandpetrie911 d2c4862844 OK 
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
 2022-09-20 18:16:37 +01:00
Elliptic Ellipsis 4a6a66ce62 One left 2022-09-20 16:24:55 +01:00
Elliptic Ellipsis d823ec3254 Just the hard 3 + 1 left 2022-09-19 01:38:09 +01:00
Elliptic Ellipsis 9a371e8426 Init, Destroy, Update, easy actions 2022-09-18 22:51:19 +01:00