2ship2harkinian/mm/src/code/z_eventmgr.c, branch develop-keiichi 2Ship2Harkinian: Majora’s Mask PC port Fix errant merge conflict resolution (#1306) 2025-10-26T15:34:37+00:00 Eblo 7004497+Eblo@users.noreply.github.com 2025-10-26T15:34:37+00:00 40849f082f6e7fcec997d07d05b45fd6f91e0f23 






Misc FAKE fixes (#1783)
2025-09-17T00:10:33+00:00

Derek Hensley
hensley.derek58@gmail.com

2025-02-16T17:30:27+00:00

a985ca5b76c09d4bcb195d37a03861b104b712c9

* CutsceneCamera_UpdateSplines fake match

* CutsceneCamera_Init -1 splineIndex

* Eye Point comment

* func_80B781DC better fake

* func_80B32F04

* ObjSwitch_Update

* ObjSwitch_InitTrisCollider

* ObjAqua_Init

* EnTrt_ItemGiven

* func_80C10E98 partly

* EnTest7_WarpCsWarp this to 1

* EnTest6_InvertedSoTCutscene better fake

* EnTest6_DrawAmmoDropRupee

* EnPoSisters_MatchPlayerY

* func_8095B76C

* EnMinifrog_Init

* func_80A5C0B8

* EnKnight_UpdateEffects

* EnKnight_FlyingHeadAttack

* EnKakasi_Init

* EnInvadepoh_ModelInfo_GetNextFaceAnim

* BgAstrBombwall_InitCollider like func_809CE068

* Player_UpdateInterface

* Player_CsAction_TranslateReverse

* DynaPoly_AddBgActorToLookup better fake

* CutsceneManager_FindEntranceCsId

* func_800AE930 better fake

* Math3D_CylVsLineSeg better fake

* MapDisp_InitBossRoomStorey

* Play_Init

* EnTimeTag_Diary_Wait better fake

* Remove fake label from Player_SwordFromIA

* Player_PostLimbDrawGameplay partly

* EffectBlure_AddVertex prev temp

* Player_PostLimbDrawGameplay attempt 2

* AudioMgr_StopAllSfxExceptSystem

* Camera_Normal0

* Camera_Jump2

* Camera_Normal3

* PR review





* CutsceneCamera_UpdateSplines fake match

* CutsceneCamera_Init -1 splineIndex

* Eye Point comment

* func_80B781DC better fake

* func_80B32F04

* ObjSwitch_Update

* ObjSwitch_InitTrisCollider

* ObjAqua_Init

* EnTrt_ItemGiven

* func_80C10E98 partly

* EnTest7_WarpCsWarp this to 1

* EnTest6_InvertedSoTCutscene better fake

* EnTest6_DrawAmmoDropRupee

* EnPoSisters_MatchPlayerY

* func_8095B76C

* EnMinifrog_Init

* func_80A5C0B8

* EnKnight_UpdateEffects

* EnKnight_FlyingHeadAttack

* EnKakasi_Init

* EnInvadepoh_ModelInfo_GetNextFaceAnim

* BgAstrBombwall_InitCollider like func_809CE068

* Player_UpdateInterface

* Player_CsAction_TranslateReverse

* DynaPoly_AddBgActorToLookup better fake

* CutsceneManager_FindEntranceCsId

* func_800AE930 better fake

* Math3D_CylVsLineSeg better fake

* MapDisp_InitBossRoomStorey

* Play_Init

* EnTimeTag_Diary_Wait better fake

* Remove fake label from Player_SwordFromIA

* Player_PostLimbDrawGameplay partly

* EffectBlure_AddVertex prev temp

* Player_PostLimbDrawGameplay attempt 2

* AudioMgr_StopAllSfxExceptSystem

* Camera_Normal0

* Camera_Jump2

* Camera_Normal3

* PR review







Document Update Actor Flags (#1762)
2025-09-16T18:37:07+00:00

engineer124
47598039+engineer124@users.noreply.github.com

2024-12-17T21:18:56+00:00

56e0cde29f2bfe87d164022ed9997ba10fabaf01

* name flags, TODO: comments

* comments

* improve comments

* small cleanup

* cleanup comment





* name flags, TODO: comments

* comments

* improve comments

* small cleanup

* cleanup comment







Animation Cleanup: En_T* (#1522)
2025-09-14T19:55:35+00:00

engineer124
47598039+engineer124@users.noreply.github.com

2024-06-25T00:54:14+00:00

b627ff5423d0bd563b602f4611fb4bdcd5b866b4

* anim T cleanup

* more cleanup

* brackets and floats

* small thing

* more floats

* fix name

* fix

* format

---------

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





* anim T cleanup

* more cleanup

* brackets and floats

* small thing

* more floats

* fix name

* fix

* format

---------

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







Add cutscene hooks, RC_CLOCK_TOWN_WEST_SISTERS_HP (#29)
2024-11-04T03:21:21+00:00

Eblo
7004497+Eblo@users.noreply.github.com

2024-11-04T03:21:21+00:00

e908ee86e6005d3255d3d3ae1cbf75c5a8fe1366












Move source into subdirectory
2024-01-05T23:00:59+00:00

Garrett Cox
garrettjcox@gmail.com

2024-01-05T15:58:59+00:00

9be74e0026b563ba680e1dc157521eccc89fc03f