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,350 Commits 2 Branches 11 Tags
3c107cb148d784e2af4a347dc78f25b1697410be
Commit Graph
1350 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anghelo CarvajalandGitHub 3c107cb148 Add SaveInfo substruct to SaveContext (#1191) 
* SaveInfo

* fix accesses in sram_NES.c

* some more fixing

* more fixes

* format

* fix unk

* namefixer

* format

* bss

* review

* weekeventregconvert

* namefixer

* bss
 2023-04-18 18:54:32 -04:00
engineer124andGitHub b8af819165 DynaPoly Docs Pass (#1194) 
* dyna docs

* init flags

* more docs

* cleanup

* partial PR review

* another bracket

* hold to press

* PR cleanup
 2023-04-18 18:36:53 -04:00
Anghelo CarvajalGitHubengineer124engineer124Dragorn421
 		38d21bbe97 Name some SurfaceType_ functions (#1155) 
* enums

* renaming functions

* fixes

* SurfaceType_IsSoft

* type fixing

* format

* Update src/code/z_bgcheck.c

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

* Update src/code/z_bgcheck.c

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

* Update src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c

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

* review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* SurfaceType_GetFloorEffect

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* format

* bss

* cleanups

* extra material docs

* cleanup

* cleanups

* Remove Bg prefix

* minor fixes

* Remove BG_

* SURFACE_MATERIAL_DIRT_SHALLOW

* format

* bss

* bss

* review

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

* format

* format again

* bug

* format

* namefixer

* bss

* bss

* bss

* review

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2023-04-18 18:14:36 -04:00
Anghelo CarvajalGitHubengineer124
 		4647ebb91b stackcheck.h (#1204) 
* stackcheck.h

* warning

* Update src/boot_O2/stackcheck.c

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

* Update src/boot_O2/stackcheck.c

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

* Update src/boot_O2/stackcheck.c

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

* stack

* format

* bss

* review

* review

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-04-18 17:50:34 -04:00
Derek HensleyGitHubengineer124
 		823746d495 Angle Conversions (#1216) 
* Angle Conversions

* Format

* namefixer

* Renames in ObjHsStump_Appear

* Format

* once more

* Explicit cast in EnSsh

* Update src/overlays/actors/ovl_En_Fishing/z_en_fishing.c

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-04-18 16:34:58 -04:00
engineer124GitHubangie
 		a67d086add Defines for flags passed to Actor_UpdateBgCheckInfo (#1197) 
* add flags

* add comment

* small fix

---------

Co-authored-by: angie <angheloalf95@gmail.com>
 2023-04-18 16:02:56 -04:00
engineer124andGitHub 44b04292cd Match DynaPoly_ExpandSRT (#1203) 
* match DynaPoly_ExpandSRT

* name variables

* oops
 2023-04-18 14:49:36 -04:00
Anghelo CarvajalandGitHub 3dd7a5a399 Add --convert-statics=global-with-filename (#1217) 2023-04-18 14:21:01 -04:00
Derek HensleyGitHubangie
 		8efba39749 z_viszbuf (code_801420C0) OK (#1211) 
* first pass

* Match

* variables.txt

* Update include/functions.h

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

---------

Co-authored-by: angie <angheloalf95@gmail.com>
 2023-04-18 12:42:08 -04:00
BlytheGitHubBlythe Hospelhorn
 		255c4599bf ovl_En_Slime & object_slime OK and documented (#1175) 
* decomped init, draw

* started slime

* finished func decomp en_slime

* object_slime and en_slime updates

* updated a few names

* finished up some naming

* en_slime and object_slime OK and documented

* slime xml cleanup

* Code cleanup round 1

* Cleanup 1 - missed a note

* Fixed improper use of bgcheck flags

* Some cleanup

* Namefix, name cleanup

* Function name cleanup, misc cleanup

* More name cleanup (pre-merge)

* Update color filter flag constants

* Tidying

---------

Co-authored-by: Blythe Hospelhorn <35576053+bhospelhorn@users.noreply.github.com>
 2023-04-15 14:56:23 +10:00
engineer124andGitHub 4faad208c6 Introduce SaveContext.gameMode enum (#1198) 
* gamemode enum

* owl save

* trailing enum comma
 2023-04-07 13:09:00 +10:00
Anghelo CarvajalandGitHub f39d412bfe Actors revert cleanup (#1221) 
* Revert "ovl_Bg_Keikoku_Spr OK (#111)"

This reverts commit fed1b37da1.

* Revert "z_bg_tobira01 OK (#168)"

This reverts commit 54aef44a9e.

* Revert "Bg_Lotus OK (#86)"

This reverts commit d0af9587ba.

* Revert "Door_Spiral OK (from zel) (#87)"

This reverts commit 6e4d156ad7.

* Revert "en_invadepoh OK (#200)"

This reverts commit e1219e7351.

* Revert "ovl_Item_B_Heart OK (#110)"

This reverts commit f0cd2db055.

* Revert "ovl_Obj_Boyo OK (#112)"

This reverts commit 536a484f73.

* more reverts and fix building

* restore timeconv.py

* restore func_800BFD84
 2023-04-01 21:10:00 -03:00
Tom OvertonandGitHub d9493a5b99 Update documentation to use updated Z64Utils release + updated directions (#1223) 2023-03-31 05:11:57 +01:00
Anghelo CarvajalandGitHub d8064bb070 Effect table (#1209) 
* effect_ss_table.h

* monkaBSS

* format

* Remove InitVars extern headers

* Remove `const` from InitVars

* cleanup

* cleanup

* format

* bss

* bss

* bss
 2023-03-30 13:17:55 -03:00
krm01andGitHub 34f9fb9886 [Doc] small, names for mayor dotour's eye and eyebrow textures (#1220) 
* some naming and tlut assignments to dt eye textures

* update dotour overlays with new texture names

* critical formatting fix
 2023-03-30 20:57:26 +11:00
engineer124GitHubDerek Hensley
 		f3c811d298 z_parameter: Buttons (part 9) (#1192) 
* import button docs

* cleanup

* sync timer val

* add flag comments

* Update src/code/z_parameter.c

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

* Update src/code/z_parameter.c

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

* Update src/code/z_parameter.c

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

* fix merge master

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2023-03-30 20:26:35 +11:00
engineer124andGitHub 6685a4775e Audio sequence.c OK and documented (#1201) 
* import sequence docs

* cleanup

* do not need raw hex
 2023-03-30 19:53:47 +11:00
Anghelo CarvajalGitHubengineer124
 		045c3537a9 z64game_over.h (#1183) 
* z64game_over.h

* format

* Update include/z64game_over.h

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-03-24 15:29:54 -03:00
Anghelo CarvajalGitHubTharoengineer124
 		147e4fcedc THA docs (#1177) 
* THA docs

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

* format

* namefixer

* yada

* remove zero pad comment

* Update include/z64.h

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

* Update include/thga.h

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

* namefixer

* bss

* namefixer

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-03-24 14:38:04 -03:00
haydenGitHubswinginman
 		f3d2c56d1d Updated function names in ovl_En_Bom & added documentation from OoT (#1219) 
* Updated function names in ovl_En_Bom & added documentation from OoT

* Renamed BombType struct members

* Updated instances of BOMB_BODY

* Updated more instances of BombType

---------

Co-authored-by: swinginman <swinginman@DESKTOP-V7R1DTC.localdomain>
 2023-03-23 17:25:54 -03:00
engineer124andGitHub 2cb01b5b6a z_room (1 non-matching) (#1143) 
* begin room docs and decomp

* match Room_DrawImageSingle

* match Room_DrawImageMulti

* Room_AllocateAndLoad non-matching

* big improvements on Room_DrawCullable

* match Room_AllocateAndLoad

* improvement?

* cleanup

* comments

* cleanup

* small pr suggestions

* PR Suggestions

* cleanup sceneCmds

* some PR

* PR Suggestions

* more PR Suggestions

* col to collision
 2023-03-23 09:36:09 +11:00
Derek HensleyandGitHub 9bb978527f Misc Cleanup 14 (#1214) 
* bgId

* z64scene.h whitespace

* SubS_ComputeTrackPointRot casts

* Macros cleanup

* ifs

* Empty Loops

* Lights_FindBufSlot void

* SkelAnime_GetFrameData

* };

* Struct inits

* fs

* @todo

* Bug comments

* EnPofusen and ObjUm

* Trailing comma

* Revert "bgId"

This reverts commit eea073c5ac30fd41f50436eeade43a811d0f0981.

* Revert "z64scene.h whitespace"

This reverts commit 399fd57550b7536b357ab6283360042f2e3e1467.

* Revert "SubS_ComputeTrackPointRot casts"

This reverts commit dea896c8743475508a3c7391e9d19cdb6b63f6a7.

* FAKE

* Review

* Format
 2023-03-21 11:12:22 -03:00
EllipticEllipsisandGitHub 6d1bc6e34b Ignore other rom extensions (#1218) 2023-03-21 10:28:24 -03:00
Derek HensleyandGitHub 03c8d46ed2 Slowly Cleanup (#1213) 
* Add slowly.h

* Init and destroy

* File header
 2023-03-20 00:48:49 +11:00
Derek HensleyandGitHub 6ff77ab092 Recomp v0.6 (#1215) 2023-03-18 08:03:17 -03:00