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
 		064a033756 Update src/overlays/actors/ovl_En_An/z_en_an.c 
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-10-30 09:24:44 -03:00
Anghelo CarvajalGitHubengineer124
 		4375e46d6c Update src/overlays/actors/ovl_En_An/z_en_an.c 
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-10-30 09:23:54 -03:00
Anghelo CarvajalGitHubengineer124
 		07eb70c71f Update src/overlays/actors/ovl_En_An/z_en_an.c 
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-10-30 09:23:28 -03:00
Anghelo CarvajalGitHubengineer124
 		79ee453641 Update src/overlays/actors/ovl_En_An/z_en_an.c 
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-10-30 09:23:06 -03:00
Anghelo CarvajalGitHubengineer124
 		fa3261877d Update src/overlays/actors/ovl_En_An/z_en_an.c 
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-10-30 09:22:48 -03:00
Anghelo CarvajalGitHubengineer124
 		d9aa4e7ce1 Update src/overlays/actors/ovl_En_An/z_en_an.c 
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-10-30 09:22:35 -03:00
Angie 34363aa629 whoops 2023-10-29 13:30:01 -03:00
Angie 9046bd6a85 remove some gotos 2023-10-29 13:13:48 -03:00
Angie 3162b3e215 whoops 2023-10-29 13:12:00 -03:00
angie 729aa256d1 WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL 2023-10-29 12:58:31 -03:00
angie d99166705d clean 2023-10-29 09:42:28 -03:00
angie 6f2a315795 remove debug stuff 2023-10-29 09:37:33 -03:00
Derek HensleyandGitHub 23beee0717 ObjTakarayaWall OK (#1448) 
* Takaraya Wall OK

* Docs

* Object docs

* Small cleanup

* undefined syms removal

* EnTakaraya_SpawnWalls docs

* PR

* Small cleanup

* Adjust comment

* PR

* More PR

* PR

* > 1

* ObjTakarayaWall_CanCarvePath
 2023-10-29 09:33:07 -03:00
angie df1b5e66a6 cleanup 2023-10-29 09:01:21 -03:00
angie 9115084923 Merge remote-tracking branch 'upstream/main' into ovl_En_An 2023-10-29 08:15:12 -03:00
Tom OvertonandGitHub 2859cbbf5e Boss01 (Odolwa) OK and documented (#1452) 
* Boss01 (Odolwa) OK and documented

* Unify existing InitRand implementations

* Remove newlines after `// fallthrough`

* Respond to the rest of engineer's review

* Respond to most of anon's review

* Try to comment the shadow thing correctly

* Fix boss_01 after merge

* SEGMENTED_TO_VIRTUAL -> SEGMENTED_TO_K0

* Review

* Use DMG_SWORD_BEAM and update the comment in z64collision_check.h

* Respond to engineer's review
 2023-10-29 08:29:43 +11:00
engineer124 0350836d94 fix merge 2023-10-28 08:11:01 +11:00
engineer124 cbbd7ce4fe Merge branch 'main' into sys_math3d_bss 2023-10-28 08:06:27 +11:00
Anghelo CarvajalandGitHub e634be7cd4 Fix /* */ to /**/ (#1455) 2023-10-28 07:55:14 +11:00
engineer124andGitHub 4422df3ef6 player unions (#1453) 2023-10-27 10:13:44 -03:00
Anghelo CarvajalandGitHub cf41eeb3ac Remove (ActorFunc) cast on InitVars (#1148) 
* Remove ActorFunc cast

* Format

* Revert "Format"

This reverts commit a6e89b39692c22cfae26c8aa3a8fe288ccd61c32.

* Messing with formatting

* format header a bit

* Revert "Messing with formatting"

This reverts commit c8db520278d7730a83e3fbc460ebe87929c16928.

* comment

* format

* more comments

* format

* format

* format

* properly format
 2023-10-27 10:03:02 -03:00
Derek Hensley 57bd950be3 Merge remote-tracking branch 'upstream/main' into voice 2023-10-26 18:18:39 -07:00
angie 72f5d638d7 fix merge 2023-10-26 13:19:37 -03:00
angie c062377f5b Merge remote-tracking branch 'upstream/main' into ovl_En_An 2023-10-26 13:12:35 -03:00
Anghelo CarvajalandGitHub 6475196f0f Yet another libultra cleanup (#1384) 
* os symbols

* various variables

* more variables

* more cleanup

* yeet HW_REG

* OS_PHYSICAL_TO_K0 and other cleanups

* Rename r4300.h

* migrate pimgr data and cleanup on initialize.c

* rename osFlash symbols

* cleanup gu

* vimodes

* yeet rmon, do libc files

* some os files

* hardwareinterrupt

* cleanup a lot of os files

* cleanup osVirtualToPhysical

* various io files

* another io chunk

* final io chunk

* yeet hardware.h

* yeet PHYSICAL_TO_VIRTUAL and VIRTUAL_TO_PHYSICAL

* fix typo

* fix merge

* remove global.h from libultra files

* fixes and format

* brief explanation

* review

* review

* review

* review

* SEGMENTED_TO_K0

* Revert "SEGMENTED_TO_K0"

This reverts commit f8d62d670f91af401feb56489e1cbc45a1260049.

* take two

* bss

* bss
 2023-10-26 10:44:27 -03:00