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
1,171 Commits 2 Branches 11 Tags
fd5ff73a356e4aa9669c16922df86b7efd0dabe7
Commit Graph
1171 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
SonicDcerGitHubAnghelo CarvajalDerek Hensley
 		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
Parker BurnettandGitHub 2c6816ba77 Add enum for tatl hint id (#993) 
* first round, need to investigate the others

* naming the remainder

* changed my mind on the name

* foooooormat

* fixing a number

* ...another one...

* names galore

* PR feedback

* fixing

* fixes

* 4mat

* adding "POE_SISTER"

* forgot a rename
 2022-09-14 14:01:06 -03:00
engineer124andGitHub 6451bcf158 z_parameter: Magic (#934) 
* Document magic

* Cleanup

* Few fixes

* PR Suggestions, More Lens Docs

* Few comments

* missed a spot

* Better macros/names

* Deactivate Lens

* more PR suggestions

* fix names
 2022-09-14 13:49:17 -03:00
LoïsGitHubLoïs
 		85e141128b set LANG variable to C (#888) 
Co-authored-by: Loïs <loislag@outlook.fr>
 2022-09-14 13:39:55 -03:00
Alejandro AsenjoandGitHub aa6841a33b ovl_Oceff_Wipe2 OK (#1006) 
* ovl_Oceff_Wipe2 Decompiled

* pr review

* renamings

* renamings
 2022-09-14 13:21:02 -03:00
Alejandro AsenjoandGitHub 420403a09a ovl_En_Encount1 OK (#1005) 
* 1 Non matching

* all functions matching

* new reloc problems

* Documenting

* ovl_En_Encount1 decompiled

* Co-authored-by: Synray synray@users.noreply.github.com

* Co-authored-by: petrie911 petrie911@users.noreply.github.com

* Co-authored-by: Fig02 fig02srl@gmail.com

* Co-authored-by: Maide eeeedddccc@hotmail.co.uk

* Co-authored-by: EllipticEllipsis EllipticEllipsis@users.noreply.github.com

* uncomment old reloc

* pr review
 2022-09-14 13:12:31 -03:00
Alejandro AsenjoandGitHub 33f7ede84f ovl_Oceff_Spot OK (#1004) 
* ovl_Oceff_Spot decompiled

* format

* renamings and pr review

* pr review

* pr review
 2022-09-14 13:07:46 -03:00
Alejandro AsenjoandGitHub e47dc7da25 ovl_Oceff_Wipe3 OK (#1001) 
* all functions matching

* ovl_Oceff_Wipe3 decompiled

* bss

* pr review

* pr review

* renamings

* pr review
 2022-09-14 12:57:47 -03:00
petrie911GitHubpetrie911petrie911petrie911engineer124
 		bf26065867 EnAz and EnTwig (Beaver bros and the minigame rings) (#999) 
* leave it to beavers

* match

* merge

* catchup part 2

* fix warnings

* I accidentally the xml

* hopefully that's all of them

* lol merge

* linked object

* now with more enums

* Update src/overlays/actors/ovl_En_Az/z_en_az.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* more fixes

* limbs and maths

* stuff

* more macro management

* last enum?

* more fixes

* fixed

* entrances

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2022-09-14 12:51:10 -03:00
Parker BurnettandGitHub 3d430a5733 En_bubble OK (#995) 
* bubble OK

* fixing elfbulb

* flag fix

* PR comments

* PR comments

* missed a fix

* PR fixes

* don't know how this got in there

* u to s

* small fix
 2022-09-14 12:46:16 -03:00
Alejandro AsenjoandGitHub 90ade1be9f ovl_En_Js Decompiled (#991) 
* progress

* progress

* func_80968E38 (thanks @engineer124)

* progress

* remove comments

* general cleanup

* warnings

* all functions matching

* macros

* final details

* format

* ovl_En_Js Decompiled

* PLAYER_AO enums

* fix

* pr review

* re preview

* pr review

* pr review

* pr review

* resolving after merge

* conflict resolution

* pr review

* pr review

* pr review
 2022-09-14 12:37:21 -03:00
MaideandGitHub 98501be8df Obj_Usiyane (#902) 
* Obj_Usiyane

* PR

* RP

* PR
 2022-09-14 12:32:22 -03:00
Derek HensleyandGitHub bb96e47f8d General Cleanup 11 (#992) 
* char -> UNK_TYPE1

* SubS fixes

* func_800B8500

* macros

* misc

* A few more GET_{ACTOR} vs {ACTOR}_GETw

* More Macros

* fix

* PARSE_TYPE -> GET_TYPE

* 1 more
 2022-08-15 21:42:21 -04:00