mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-11 03:25:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document ACTOR_FLAG_UPDATE_DURING_OCARINA and PLAYER_STATE2_USING_OCARINA (#1720)

Browse Source 
* ocarina flag

* oops

* PR
This commit is contained in:
engineer124
2024-10-21 11:05:45 +11:00
committed by GitHub
parent 83bbdf7583
commit a746164041
74 changed files with 134 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64actor.h
+4 -2
View File
@@ -507,8 +507,10 @@ typedef enum DoorLockType {
#define ACTOR_FLAG_800000 (1 << 23)
//
#define ACTOR_FLAG_1000000 (1 << 24)
//
#define ACTOR_FLAG_2000000 (1 << 25)
// Actor can update even if Player is currently using the ocarina.
// Typically an actor will halt while the ocarina is active (depending on category).
// This flag allows a given actor to be an exception.
#define ACTOR_FLAG_UPDATE_DURING_OCARINA (1 << 25)
// actor can press and hold down switches
#define ACTOR_FLAG_CAN_PRESS_SWITCH (1 << 26)
include/z64player.h
+2 -2
View File
@@ -988,8 +988,8 @@ typedef enum PlayerCueId {
#define PLAYER_STATE2_2000000 (1 << 25)
//
#define PLAYER_STATE2_4000000 (1 << 26)
//
#define PLAYER_STATE2_8000000 (1 << 27)
// Playing the ocarina
#define PLAYER_STATE2_USING_OCARINA (1 << 27)
// Playing a fidget idle animation (under typical circumstances, see `Player_ChooseNextIdleAnim` for more info)
#define PLAYER_STATE2_IDLE_FIDGET (1 << 28)
// Disable drawing player