diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2023-06-20 00:50:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-20 17:50:15 +1000 |
| commit | bea420f8a11ca7dbb7f5ea2664ea2ce41fc61b84 (patch) | |
| tree | 5147be658d15195dcb5dac681d1ea5c2d946822f /include | |
| parent | a5cc630cef67a9a2e136aaf1c6b8150f812d54eb (diff) | |
Create an enum for the various `face_reaction` reaction sets (#1299)
* Create an enum for the various `face_reaction` reaction sets
* Respond to reviews
* Add blank line
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/z64message.h | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/functions.h b/include/functions.h index 36459ecbd..b6d6964bc 100644 --- a/include/functions.h +++ b/include/functions.h @@ -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); diff --git a/include/z64message.h b/include/z64message.h index 09c9c4e04..2a3810ff1 100644 --- a/include/z64message.h +++ b/include/z64message.h @@ -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, |