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,144 Commits 2 Branches 11 Tags
0f130c173d5ceca2cca723178c19556bcdc00988
Commit Graph
518 Commits
Author SHA1 Message Date
petrie911GitHubpetrie911
 		c5254084c2 Matched several functions (#1020) 
* matchmaker, matchmaker

* more matches

* one fix

* I'll format you good

* cleanup

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
 2022-08-15 14:55:42 -04:00
Tom OvertonandGitHub 78684187fe Make names related to animations more consistent (#998) 
* Make names related to animations more consistent

* Standardize on sAnimationInfo

* Respond to hensldm's review

* Standardize on ChangeAnim

* Respond to hensldm's review

* Small formatting thing

* Consistency after merging master

* A few more things I missed

* Respond to Elliptic's review

* Some more stuff that was requested
 2022-08-15 14:51:38 -04:00
Derek HensleyandGitHub 132dd6a373 Entrance Macro (#987) 
* POC

* fix

* Fix typo

* token POC

* The rest

* small cleanup

* More small cleanup

* ENTRANCE

* arg renames

* EntranceIndex -> Entrance

* format

* PR

* PR2

* Remove layer from entrance macro

* namefixer plus comments

* format
 2022-08-15 14:45:28 -04:00
engineer124andGitHub 82fe521721 Audio Sfx (code_801A5BD0 and selected sfx functions in code_8019AF00.c) OK and Documented (#798) 
* Rename functions

* code_801A5BD0 OK

* PR 1, improve spacing

* Rename unused struct

* Rename Sfx Variables

* PR Feedback, update names

* Add comment

* cleanup vars

* Fix merge

* Rework documentation, include more functions in sfx system

* PR suggestions

* fix AudioSfx_MuteBanks

* missed enum

* more cleanup

* more suggestions
 2022-08-15 14:39:57 -04:00
engineer124andGitHub 0082c299c6 Decompile Camera Helper Functions (#1023) 
* helper functions

* more pr suggestions
 2022-08-15 14:36:33 -04:00
engineer124andGitHub d9a10948d3 aisetnextbuf.c OK (code_80194790.c) (#982) 
* aisetnextbuf OK

* format

* Function headers

* Add comment
 2022-08-09 20:49:20 -04:00
engineer124GitHubangie
 		a80637fd59 Decompile and Document Camera z_play functions (#933) 
* Document z_play camera functions

* cleanup function names

* PR Suggestion

* Fix master merge, add comments

* fix merge

* small fix

Co-authored-by: angie <angheloalf95@gmail.com>
 2022-08-09 20:01:55 -04:00
Derek HensleyandGitHub b716e76d3e Effect EnFire OK (#977) 
* OK

* Gameplay keep fire

* &

* &2

* PR

* Fire textures

* Second mask
 2022-08-07 19:59:23 -04:00
Derek HensleyandGitHub 9a4319827b General Cleanup 9 (#961) 
* small z64animation cleanup

* z64

* actor

* bgcheck

* collisioncheck

* curve

* cutscene

* effect

* item

* light

* math

* player

* save

* save

* schedule

* skin

* transition

* Remove leading 0s from size = 0x10

* z64schedule enum

* PR

* enums
 2022-08-07 19:43:58 -04:00
Derek HensleyandGitHub d0313fa766 Effect EnIce OK (#976) 
* Ok

* Material/Model

* Cleanup

* format

* IceFragment Assets

* PR
 2022-08-07 19:29:03 -04:00
Derek HensleyandGitHub bc3883d098 Effect Fhgflash OK (#975) 
* OK

* format

* extract tex explicitly

* FHGFLASH_SHOCK_NO_ACTOR

* typo

* Hitmark

* sZeroVec

* eff
 2022-08-07 19:24:05 -04:00
MaideandGitHub d88aa7ebbe En_Paper (#923) 
* En_Paper

* PR
 2022-08-07 18:47:00 -04:00
engineer124andGitHub 29bf8142b9 Introduce Sfx Tables (#927) 
* SfxTables

* Fix indexing

* fix voice text

* Rename with ordering

* Restore defines
 2022-08-04 06:04:13 +01:00
EllipticEllipsisandGitHub 91b2bc3a88 EnGe1 OK and documented, document z_snap (#952) 
* Move PictoActor typedefs to z64actor.h

* OK, data imported

* Minor snap stuff

* Name most functions and variables

* Name most of object, apart from animations

* Document snap

* Fix actors to use the PictoActor struct

* Format

* Finish documenting EnGe1

* Finish documenting z_snap and related actors

* Format

* Review, format

* Name last couple of things

* bss

* Review

* Review

* bss

* Introduce z64snap.h, add SCREEN_TO_DEVICE macros

* Back to PROJECTED_TO_SCREEN
 2022-08-04 05:53:53 +01:00
engineer124andGitHub e75d7020a9 AudioOcarina (1 NonMatching) (#911) 
* AudioOcarina OK

* rm some comments

* PR Suggestions

* Add define

* cleanup
 2022-08-04 05:21:50 +01:00
Alejandro AsenjoandGitHub 4693978015 ovl_Shot_Sun Decompiled (#905) 
* matching functions, warnings and data pending.

* ovl_Shot_Sun Decompiled

* space

* pr review

* unk1202E -> lastPlayedSong Rename

* defines

* OCARINA_SONG enums

* format

* OCARINA_SONG Enums

* pr review

* pr review
 2022-07-24 10:15:16 -04:00
engineer124andGitHub 04dd8d7b62 Decompile/Document bgCam and actorCsCam (combination of Camera/BgCheck/Play) (#932) 
* Document bgCam and actorCsCam

* index

* Small PR suggestions

* small suggestions

* player stateflags

* Fix bss

* Fix BSS

* Fix bss

* Fix bss
 2022-07-23 15:51:14 -04:00
engineer124andGitHub 6fc12c3a70 Inventory Editor Ok and Documented (z_kaleido_debug.c) (#954) 
* Match Debug Menu

* Many docs and discussions

* Missed one

* A bit more

* More PR Suggestions

* phrasing

* hex health

* Fix
 2022-07-23 15:44:49 -04:00
engineer124andGitHub 6472f68323 Map Select: Docs and Cleanup (#962) 
* Add Map Select Docs

* cleanup

* brackets

* Another typo
 2022-07-23 15:30:19 -04:00
engineer124andGitHub f3f147cc3d z_draw OK and Documented (#900) 
* Import data for z_draw

* Match z_draw

* cleanup

* rupees

* Some object gi docs

* More documents

* Add explanation on function names

* more cleanup

* Fixed some things

* More docs

* Object docs WIP, still not done. I'll continue tomorrow

* More WIP, should just be mask gi objects left now

* Some masks done, many more to go

* cleanup

* Last masks finish

* Shield Stolen

* cleanup

* Apply various dicussions

* remove casts

* PR Suggestions

* Sync PowderKeg
 2022-07-23 15:25:20 -04:00
engineer124andGitHub dfd00a8c1f Match 3 functions (#964) 2022-07-23 15:09:55 -04:00
ChloeandGitHub cde8874bb1 ovl_Dm_Char03 OK (#963) 
* Decompile ovl_Dm_Char03

* review fixes

* more review fixes

* remove leading zeroes
 2022-07-23 15:05:04 -04:00
engineer124andGitHub 260be2c36b Hex Cleanup (#960) 
* Hex Cleanup

* PR Suggestions
 2022-07-23 14:57:47 -04:00
Tom OvertonandGitHub 9449ced63f En_Syateki_Man (Shooting Gallery Man) documented (#894) 
* Document a ton of syateki_man

* Document swamp actor lists

* Document animations

* Document player positions

* Document talk flags

* Name wave and spawn index

* Name everything involved in the swamp game

* A hex score I missed

* Some slight town game doc

* Document octorok flags

* Better way of doing octorok flags

* Macros for getting/setting high scores

* Update a variable I missed

* Name remaining struct vars

* Create enum for shootingGameState

* Remove anonymous unions

* hitState -> hitType

* Comment for values next to enums

* Name some more stuff

* Name stuff in Town-RunGame

* Name sGameStartTimer

* Name some more stuff

* Name all static variables

* One more round of comments and such

* Respond to hensldm's review

* GET_INDEX -> GET_ID

* Respond to Elliptic's review (or at least the parts I can respond to right now)

* More review responses

* Add some stuff to z64saves.h I missed
 2022-07-23 14:06:11 -04:00
Anghelo CarvajalGitHubDerek HensleyTom OvertonEllipticEllipsisengineer124
 		3f49adb91d ovl_Obj_Um OK (#887) 
* Pass the whole actor in mips2c

* hacky way to fix some types

* decomp a few functions and second mips2c pass

* draw

* another mips2c pass

* some functions

* Init almost matching

* mips2c pass

* Match update and a few more

* A bunch of functions

* horses gonna horse

* func_80B7A860

* mips2c pass

* func_80B7984C

* func_80B795A0

* func_80B783E0

* func_80B78764

* Tried func_80B7BEA4

* func_80B79BA0

* func_80B7A494

* func_80B7A614

* lots of non equivalents

* fix

* Match func_80B77770

* func_80B7BEA4

* import data

* func_80B7B93C

* minor fixes

* ObjUm_Init

* func_80B7AF30

* func_80B7B18C

* func_80B7BABC

* func_80B77FA4

* func_80B7B598

* func_80B781DC is equivalent

* func_80B781DC

* func_80B7BABC

* Cleanup

* limbs

* minor members renames

* First docs pass

* small pass

* yes

* another pass

* more renames

* flags defines

* arePotsBroken

* some flags

* yet another docs pass

* Some members named

* Add weekEventReg docs

* small rename

* And more

* Another 2

* actorfixer and other fixes

* format

* Use extracted object symbols

* fixes

* Some stuff improved

* very minor naming

* format

* remove debugging stuff

* cleanup

* Some EnHorse stuff

* horse params

* ! FAKE

* Update include/functions.h

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

* review

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

* review

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update assets/xml/objects/object_um.xml

* IS_BANDIT_TYPE

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

* review

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* remove a fake match

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse/z_en_horse.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* anim enum

* name anim enum

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* remove repeated forward declarations

* fixes

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* comment

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* areAllPotsBroken

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* fix merge

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2022-07-23 14:00:32 -04:00