2ship2harkinian-Android

izzy/2ship2harkinian-Android

Fork 0

mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00

Commit Graph

Select branches

Hide Pull Requests

android

develop

android

v1.0.0

v1.0.0.0

v1.0.0.1

v1.0.1

v1.0.2

v1.1.1

v1.1.1P1

v1.1.1P2

v1.1.1P3

v1.1.1P4

3162b3e215 whoops Angie 2023-10-29 13:12:00 -03:00
729aa256d1 WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL angie 2023-10-29 12:58:31 -03:00
d99166705d clean angie 2023-10-29 09:42:28 -03:00
6f2a315795 remove debug stuff angie 2023-10-29 09:37:33 -03:00
23beee0717 ObjTakarayaWall OK (#1448) Derek HensleyandGitHub 2023-10-29 05:33:07 -07:00
df1b5e66a6 cleanup angie 2023-10-29 09:01:21 -03:00
9115084923 Merge remote-tracking branch 'upstream/main' into ovl_En_An angie 2023-10-29 08:15:12 -03:00
2859cbbf5e Boss01 (Odolwa) OK and documented (#1452) Tom OvertonandGitHub 2023-10-28 14:29:43 -07:00
0350836d94 fix merge engineer124 2023-10-28 08:11:01 +11:00
cbbd7ce4fe Merge branch 'main' into sys_math3d_bss engineer124 2023-10-28 08:06:27 +11:00
e634be7cd4 Fix /* */ to /**/ (#1455) Anghelo CarvajalandGitHub 2023-10-27 17:55:14 -03:00
4422df3ef6 player unions (#1453) engineer124andGitHub 2023-10-28 00:13:44 +11:00
cf41eeb3ac Remove (ActorFunc) cast on InitVars (#1148) Anghelo CarvajalandGitHub 2023-10-27 10:03:02 -03:00
57bd950be3 Merge remote-tracking branch 'upstream/main' into voice Derek Hensley 2023-10-26 18:18:39 -07:00
72f5d638d7 fix merge angie 2023-10-26 13:19:37 -03:00
c062377f5b Merge remote-tracking branch 'upstream/main' into ovl_En_An angie 2023-10-26 13:12:35 -03:00
6475196f0f Yet another libultra cleanup (#1384) Anghelo CarvajalandGitHub 2023-10-26 10:44:27 -03:00
6aaeb80f99 Decompile Remaining code_8019AF00.c Functions (1 non-matching) (#1442) engineer124andGitHub 2023-10-27 00:09:08 +11:00
e46a451ace merge main engineer124 2023-10-26 21:19:22 +11:00
c3b19739c6 map_grand_static and map_i_static (#1443) Anghelo CarvajalandGitHub 2023-10-26 07:07:13 -03:00
6bdb7c31ea code_80140E80 OK and preliminary documentation, Fbdemo_Wipe4 OK and documented (#1106)
EllipticEllipsis GitHub Tharo angie
2023-10-26 07:42:24 +01:00
7176ed4299 Player Docs: csMode -> csAction (#1433) engineer124andGitHub 2023-10-26 17:12:04 +11:00
87d182defb u substitution mzxrules 2023-10-25 17:12:05 -04:00
04010f8903 implement alf suggestions mzxrules 2023-10-25 13:41:58 -04:00
6e37057cbd implement suggestions mzxrules 2023-10-25 05:27:36 -04:00
b89b64d1f5 Major documentation pass mzxrules 2023-10-24 22:33:44 -04:00
986e34c036 cleanup engineer124 2023-10-25 12:50:39 +11:00
6d30630d73 Merge branch 'main' into sys_math3d_bss engineer124 2023-10-25 12:48:11 +11:00
71fae65062 object_test3 (kafei) (#1431) NussandGitHub 2023-10-23 23:32:07 +02:00
13ae145ce7 format angie 2023-10-23 10:04:19 -03:00
5902d976dd Merge remote-tracking branch 'upstream/main' into ovl_En_An angie 2023-10-23 09:46:12 -03:00
1aba20892b Incorporate SCHEDULE_TIME angie 2023-10-22 08:55:40 -03:00
466b4d6f26 Merge remote-tracking branch 'upstream/main' into ovl_En_An angie 2023-10-22 08:50:30 -03:00
08035011c8 PR Review engineer124 2023-10-22 17:27:35 +11:00
9d8554e05a Merge branch 'main' into sys_math3d_bss engineer124 2023-10-22 17:19:13 +11:00
1e19cfe869 Anju objects (#1444)
Anghelo Carvajal GitHub Derek Hensley
2023-10-23 02:03:16 -03:00
a468be77d5 object_owl (#1430) NussandGitHub 2023-10-23 01:31:55 +02:00
002f5ba6de obj_oyu (#1436) WimmerandGitHub 2023-10-23 00:43:57 +02:00
3569ef97ad progress ld fix (#1449) Derek HensleyandGitHub 2023-10-22 04:51:58 -07:00
ec86f10b0f SCHEDULE_TIME (#1438) Anghelo CarvajalandGitHub 2023-10-22 02:52:40 -03:00
e0fc8a614f Bodyparts + other clean up Derek Hensley 2023-10-21 13:58:39 -07:00
9c2c3f1bb8 cleanup engineer124 2023-10-22 03:35:44 +11:00
b4626812f6 cleanup and docs engineer124 2023-10-22 03:30:02 +11:00
fd7a96b9a1 Merge branch 'main' into sys_math3d_bss engineer124 2023-10-22 01:42:17 +11:00
425238fd5d Match Camera_Battle1 (#1445) engineer124andGitHub 2023-10-22 03:17:47 +11:00
cbca59d49e Match Camera_KeepOn1 (#1447) engineer124andGitHub 2023-10-22 02:35:23 +11:00
2dc405b6af Match Camera_Normal1 (#1446) engineer124andGitHub 2023-10-21 06:30:18 +11:00
d209673b1b Some more small clean up Derek Hensley 2023-10-20 08:08:24 -07:00
69e7c10fd6 Small cleanup Derek Hensley 2023-10-20 07:41:56 -07:00
55c8ec6b40 Merge remote-tracking branch 'upstream/main' into sys_math3d_bss Derek Hensley 2023-10-20 07:35:40 -07:00
747661a4fc Use generated reloc for Goht + remove Goht's undefined_syms Tom Overton 2023-10-19 12:46:49 -07:00
fdbbbf98a8 func_80B0D9CC OK Derek Hensley 2023-10-19 12:09:01 -07:00
92dd07e19b func_80B0A8C4 OK Derek Hensley 2023-10-19 07:03:35 -07:00
784532df05 a Angie 2023-10-19 09:52:43 -03:00
9c09615203 whoops angie 2023-10-18 09:35:40 -03:00
fa5fe82983 Merge remote-tracking branch 'upstream/main' into ovl_En_An angie 2023-10-18 09:29:12 -03:00
49c2c608ea name more flags angie 2023-10-17 14:26:55 -03:00
79fdae13c8 Name the remaining weekeventregs from anju Angie 2023-10-16 23:41:47 -03:00
2e05d770c8 format Angie 2023-10-16 23:16:49 -03:00
846acf57f4 whoops Angie 2023-10-16 23:05:20 -03:00
60d953cac4 more improvements mzxrules 2023-10-16 21:50:02 -04:00
006002a33d idk Angie 2023-10-16 21:06:14 -03:00
396379a4ef TransiActor ->TransitionActor mzxrules 2023-10-16 16:44:21 -04:00
9d3a447f27 migrate data mzxrules 2023-10-16 16:01:25 -04:00
246519f7b4 name the mouths angie 2023-10-16 11:32:22 -03:00
6c438d07f6 delete utility program mzxrules 2023-10-16 05:12:34 -04:00
0e374ca1a0 z_map_disp OK, implement more suggestions mzxrules 2023-10-16 05:07:21 -04:00
1d3f38dcaa object_zoraegg (#1439) NussandGitHub 2023-10-16 00:01:04 +02:00
7db0614e8f WEEKEVENTREG_COUPLES_MASK_CUTSCENE_* angie 2023-10-15 16:50:58 -03:00
ced25d09aa printing code angie 2023-10-15 15:37:05 -03:00
825c400491 more asset naming angie 2023-10-15 11:56:26 -03:00
9e5777e473 object_po (#1426) NussandGitHub 2023-10-15 12:02:31 +02:00
f545f164b4 Switch Flag "None" macro (#1412) engineer124andGitHub 2023-10-15 19:59:25 +11:00
a1bdc6c382 EnJso (Garo) OK and documented (#1440) Tom OvertonandGitHub 2023-10-14 23:39:47 -07:00
bd6cf31d18 asset naming Angie 2023-10-14 18:52:26 -03:00
1adc01370f some typos Angie 2023-10-14 12:44:28 -03:00
e16092df5e a bit of asset naming angie 2023-10-14 12:10:08 -03:00
bcb3012042 merge main petrie911 2023-10-14 09:03:14 -05:00
f605759ae5 more fixes mzxrules 2023-10-13 21:25:54 -04:00
3444cdbfc9 implement easy fixes mzxrules 2023-10-13 18:14:53 -04:00
2e7a22cced and more naming Angie 2023-10-13 17:51:28 -03:00
9282fedbc6 Merge remote-tracking branch 'origin/main' into z_map_ mzxrules 2023-10-13 16:51:15 -04:00
93713a1da0 Audio Sequences Decompiled & Documented (z_obj_sound OK, more code_8019AF00.c) (#1407) engineer124andGitHub 2023-10-14 07:39:10 +11:00
576cf6964c Obj_visiblock (#1422)
Wimmer GitHub engineer124
2023-10-13 19:23:09 +02:00
a03335d325 ovl_Door_Spiral decompiled (#1432) NussandGitHub 2023-10-13 19:04:36 +02:00
26f748680a name some of the ProcessSchedule functions angie 2023-10-13 11:14:03 -03:00
01d5816417 obj_big_fwall (#1435) WimmerandGitHub 2023-10-13 13:50:00 +02:00
2e344b8d15 Boyo (#1341) CodeOverFLowandGitHub 2023-10-13 09:59:49 +02:00
efc9ad4f3d space out OPEN/CLOSE_DISP mzxrules 2023-10-12 22:07:44 -04:00
b52efe253c name flags Angie 2023-10-12 22:50:28 -03:00
fffc9d0bbb minor tweaks mzxrules 2023-10-12 21:44:01 -04:00
413d77894d Merge remote-tracking branch 'origin/main' into z_map_ mzxrules 2023-10-12 21:16:00 -04:00
3ce8e6f6b3 more naming Angie 2023-10-12 21:03:53 -03:00
81e6058268 HandleSchedule angie 2023-10-12 17:47:28 -03:00
1e7db6119d dec angie 2023-10-12 17:33:28 -03:00
b148f50c36 implement most suggestions mzxrules 2023-10-12 15:37:12 -04:00
6b0ffd76f1 Add notes to every reamining schedule enum value angie 2023-10-12 15:55:07 -03:00
87bf041c78 name most of the important schedule values Angie 2023-10-11 23:45:59 -03:00
327c3040cd many placeholder names angie 2023-10-11 13:22:30 -03:00
a8b877c7f0 Merge remote-tracking branch 'upstream/main' into ovl_En_An angie 2023-10-11 11:42:39 -03:00