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
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 HensleyGitHubAnghelo Carvajal
 		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
petrie911 b2b18bed98 removed some extraneous macros I didn't end up using 2023-04-14 15:07:39 -05:00
petrie911 144281a934 Merge branch 'Mine' of github.com:petrie911/mm into Mine 2023-04-14 14:15:17 -05:00
petrie911 9e3cd50544 now with decomp.me 2023-04-14 14:14:57 -05:00
petrie911GitHubAnghelo Carvajal
 		5d9d496f02 Update src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c 
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2023-04-14 12:50:31 -05:00
petrie911 60c1b09fbc back port cleanup changes 2023-04-14 12:28:09 -05:00
petrie911 fe77339adb names 2023-04-14 11:58:24 -05:00
petrie911 e74f9e0782 asm stuff 2023-04-14 11:39:02 -05:00
petrie911 a635b540ee more format and cleanup 2023-04-14 11:35:58 -05:00
petrie911 279e3049e5 format 2023-04-14 08:48:19 -05:00
petrie911 c90c60e7b7 merge and warning fix 2023-04-14 08:45:33 -05:00
petrie911 1789fe5a85 merge and such 2023-04-13 17:41:26 -05:00
petrie911 93dd370cbe Merge remote-tracking branch 'upstream/master' into Mine 2023-04-13 08:51:11 -05:00
petrie911 6d047a7b7d more cleanup 2023-04-13 08:50:46 -05: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