mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-30 17:05:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Create an enum for the various face_reaction reaction sets (#1299)

Browse Source 
* Create an enum for the various `face_reaction` reaction sets

* Respond to reviews

* Add blank line
This commit is contained in:
Tom Overton
2023-06-20 00:50:15 -07:00
committed by GitHub
parent a5cc630cef
commit bea420f8a1
8 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
-2
View File
@@ -802,8 +802,6 @@ void GetItem_Draw(PlayState* play, s16 drawId);
u16 QuestHint_GetTatlTextId(PlayState* play);
u16 Text_GetFaceReaction(PlayState* play, u32 reactionSet);
void func_800F4A10(PlayState* play);
void KaleidoSetup_Update(PlayState* play);
void KaleidoSetup_Init(PlayState* play);
include/z64message.h
+14
View File
@@ -8,10 +8,24 @@
struct Actor;
struct MessageTableEntry;
struct OcarinaStaff;
struct PlayState;
extern u16 sBombersNotebookEventMessages[BOMBERS_NOTEBOOK_EVENT_MAX];
extern u16 gBombersNotebookWeekEventFlags[BOMBERS_NOTEBOOK_EVENT_MAX];
typedef enum FaceReactionSet {
/* 0x11 */ FACE_REACTION_SET_JIM = 0x11,
/* 0x12 */ FACE_REACTION_SET_BOMBERS,
/* 0x15 */ FACE_REACTION_SET_BOMBERS_HIDEOUT_GUARD = 0x15,
/* 0x2D */ FACE_REACTION_SET_TREASURE_CHEST_SHOP_GAL = 0x2D,
/* 0x2F */ FACE_REACTION_SET_CURIOSITY_SHOP_MAN = 0x2F,
/* 0x30 */ FACE_REACTION_SET_TOWN_SHOOTING_GALLERY_MAN,
/* 0x31 */ FACE_REACTION_SET_SWAMP_SHOOTING_GALLERY_MAN,
/* 0x36 */ FACE_REACTION_SET_PART_TIMER = 0x36
} FaceReactionSet;
u16 Text_GetFaceReaction(struct PlayState* play, FaceReactionSet reactionSet);
typedef enum TextState {
/* 0 */ TEXT_STATE_NONE,
/* 1 */ TEXT_STATE_1,