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
Derek Hensley a141c9bc8e externs 2022-09-15 16:33:30 -07:00
Derek Hensley 6c35387e82 Small cleanup 2022-09-15 16:29:24 -07:00
petrie911 a7bd2d48a8 macro stuff. clean up later 2022-09-15 07:56:18 -05:00
engineer124 29693f68a1 more cleanup and sync 2022-09-14 18:55:27 -04:00
engineer124 35c4f2ee65 cleanup 2022-09-14 18:45:43 -04:00
engineer124 00766775ed fix some merge, still bss issues 2022-09-14 17:13:53 -04:00
engineer124 2acf4283b8 Merge branch 'master' into parameter 2022-09-14 14:42:54 -04: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
petrie911GitHubengineer124petrie911petrie911petrie911
 		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
mzxrules 49492b6224 Merge remote-tracking branch 'origin/master' into z_map_ 2022-09-10 12:39:25 -04:00
mzxrules b78ac55648 more function names 2022-09-08 14:00:25 -04:00
petrie911 9e9f497975 signs 2022-09-06 09:38:24 -05:00
petrie911 bd5c225fa8 stuff 2022-09-06 08:45:17 -05:00
engineer124 0ed70ec465 restrictions 2022-08-31 12:18:14 -04:00
engineer124 c330a7e015 sync with timers PR 2022-08-26 13:04:45 -04:00
petrie911 b208ed5e7a if? 2022-08-25 10:25:54 -05:00