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
engineer124 fe83c939fa Interface_DrawMagicBar OK 2021-12-28 00:43:21 +11:00
engineer124 f956c25aa9 Update Parameter_Static 2021-12-27 23:52:50 +11:00
engineer124 91b27a606c more docs 2021-12-27 23:41:22 +11:00
engineer124 b747a58084 Better score, better docs for DrawClock 2021-12-27 23:21:52 +11:00
engineer124 9fc3463870 Extra spaces looks bad 2021-12-27 22:03:55 +11:00
engineer124 3087dd982d Improve docs and score of Interface_DrawClock 2021-12-27 22:02:11 +11:00
engineer124 2cb91ef993 Merge branch 'master' into parameter 2021-12-27 20:12:15 +11:00
engineer124 97baf4b38a Fix split data 2021-12-27 19:55:21 +11:00
engineer124GitHubAngie
 		f19571dfcd Bigslime OK and Documented (#361) 
* git subrepo pull tools/asm-differ --force

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "d218cdf0"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "d218cdf0"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "f5fe93d7"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "f5fe93d7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e7a8a48c"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e7a8a48c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Bring Bigslime over from old branch

* Format

* Improve docs

* format

* More cleanup

* Fix Zero Vectors Name

* Improve docs

* Spelling/Grammar

* Small typo

* Extra space

* Fix zapd merge conflict

* tab

* Fix remaining names

* format

* Better documentation

* format

* fix

* Add names to identity matrices

* Minor Cleanup

* easier to read comments

* Another touch-up

* Missed a spot

* one more...

* typo

* Another typo

* Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime

* PR Feedback

* Fix variable

* Add in gZeroVec3f in new prs

* Fix gZeroVec3f

* gZeroVec3f

* PR Feedback, move lots of static data inside functions

* Use z_actor decomp of `func_800BE680` for better macro name

* Naming gone wrong, but fixed now

* Fix dList

* Add an extra line of docs about shadows for a function

* dList -> shadowDList

* Next round of PR feedback

* Document object file, still need to double check some

* Small cleanup

* Improve and fix many docs, unname unknown material texture

* format

* Oops

* Clean up blobs from object file

* Aha! I finally get what's going on

* Remove Bigslime undefined_syms

* Remove more undefined symbols

Co-authored-by: Angie <angheloalf95@gmail.com>
 2021-12-27 04:24:45 +00:00
Lucas ShawandGitHub 5455cbc0c8 z_kaleido_manager and z_kaleido_scope_call OK (#489) 
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data

* z_kaleido_manager OK

* add to functions.h variables.h and variables.txt

* init

* rename parameters in func_80163700

* rename func_80163700 to KaleidoManager_FaultAddrConvFunc

* change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match

* ran format, uintptr_t

* made suggested changes
 2021-12-27 03:59:50 +00:00
engineer124andGitHub 27903c6286 code_80194710 OK (Audio libultra_code_O2) (#474) 
* code_80194710.c OK

* Add new line after variable declaration

* format

* Function declarations

* Name changes to match OoT

* Rename file

* s32 -> size_t
 2021-12-27 03:51:37 +00:00
engineer124 2e95117454 Small cleanup 2021-12-27 14:44:27 +11:00
EllipticEllipsisandGitHub 76c39482bc contchannelreset OK (#428) 
* contchannelreset OK

* Add to functions.h

* Rename argument
 2021-12-27 03:42:31 +00:00
EllipticEllipsisGitHubTharo
 		8ebdb50470 pfsfreeblocks OK (#423) 
* pfsfreeblocks OK

* Update src/libultra/io/pfsfreeblocks.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
 2021-12-27 03:36:06 +00:00
engineer124GitHubmzxrules
 		2664f75ac2 Match 8 BgCheck functions (7 remaining) (#496) 
* Match CollisionPoly_CheckYIntersect

* Match CollisionPoly_SphVsPoly

* Match StaticLookup_AddPolyToSSList

* Match BgCheck_CheckStaticCeiling

* Match BgCheck_SphVsFirstStaticPolyList

* Match BgCheck_Allocate

* Match BgCheck_CheckLineImpl

* Match BgCheck_SphVsDynaWallInBgActor

* Update src/code/z_bgcheck.c

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Add comment about in-function static bss

Co-authored-by: mzxrules <mzxrules@gmail.com>
 2021-12-27 03:29:50 +00:00
Tom OvertonandGitHub 8f11e841a7 Document object_gmo (#517) 
* Update XML for gmo

* Update object references in Baguo

* Add comment to indicate potential original name

* Update unused idle animation
 2021-12-27 03:23:04 +00:00
Derek HensleyandGitHub d2c411e132 Document Object Tokei Step (#523) 
* Cleanup and doc object

* Rename actor stack variable

* Revert actor change and fix ARRY_COUNT typo

* More actor cleanup from review

* Format

* didPrevBounce to hasPrevBounced
 2021-12-27 03:15:12 +00:00
IsghjGitHubIsghj8Anghelo Carvajal
 		af7525e2d3 [Object] Bigpo object documentation (+ some gameplay_keep) (#525) 
* Bigpo: object documentation starts and already issues

* Bigpo: almost all named

* Bigpo: done with object except ubused blobs

* Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass

* Bigpo: forgot to remove sym and replace everywhere, with formater pass

* Bigpo: forgot about actorfixer

* Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now

* Bigpo: warnings

* Bigpo: remove extern for gameplay_keep display list reference from aqua

* EnBigpo: suggested fixes to header calls and function name

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2021-12-27 03:08:36 +00:00
EllipticEllipsisandGitHub fdcf1d3fd3 Name textures in object_mag (#524) 
* Name textures in object_mag

* Corrections

* tabs -> spaces
 2021-12-27 03:01:06 +00:00
Roman971andGitHub 6c2f521373 Decompile and clean up some effect files (#342) 
* Decompile various effect files and cleanup z_effect.c

* Decompile z_eff_tire_mark.c and cleanup structs

* Small cleanups

* Apply most review suggestions

* Apply more review suggestions

* Change eff_shield_particle vertices to be extracted as an asset

* Add relevant effect functions to actorfixer.py
 2021-12-27 02:51:16 +00:00
MaideandGitHub 6fba9aa388 En_Fz (#528) 
* En_Fz

* UNK_TYPE1

* AC WHY

* gameplay_keep

* a
 2021-12-27 02:42:56 +00:00
retroandGitHub 5e72c01ff4 BgInibsMovebg OK (#485) 
* init messy but matching and data imported

* destroy matched

* all matching

* add param macro

* use generated reloc

* remove unneccessary comment

* add comment

* cleanup

* feedback

* use NULL

* sort variables by address
 2021-12-27 02:29:48 +00:00
Nick SturgeonGitHubParker BurnettAnghelo Carvajal
 		2d15fd4a41 ovl_En_Talk OK (#484) 
* Implement EnTalk_Init

* Implement EnTalk_Destroy

* Implement func_80BDE058

* Implement func_80BDE090

* Clean up code

* Apply suggestions from code review

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

* Remove whitespace

* Update src/overlays/actors/ovl_En_Talk/z_en_talk.h

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Use renamed macro

* Apply feedback

Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2021-12-27 02:21:01 +00:00
MaideandGitHub 5b7fb5bfde En_Bomjimb (#461) 
* En_Bomjimb

* PR

* PR
 2021-12-27 02:14:19 +00:00
MaideandGitHub e7b326f5e4 En_Zog (#441) 
* En_Zog

* Removing padding

* PR

* PR

* undef

* fmt
 2021-12-27 02:08:35 +00:00