summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
authoraMannus <mannusmenting@gmail.com>2022-12-05 01:03:04 +0100
committerGitHub <noreply@github.com>2022-12-04 19:03:04 -0500
commit5b5310ea92e2fafa38a2fcb228b67a59ffa75b0d (patch)
tree7c3eb7994c829f1a843fc1213159fa0658f39e3d /soh/src/code
parent8d398f71305c94acc9c231d239279a9a45918fa3 (diff)
Disable bunny hood NPC interactions with MM bunny hood on (#2058)
* Disable bunny hood NPC interactions * Enum
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/z_face_reaction.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/soh/src/code/z_face_reaction.c b/soh/src/code/z_face_reaction.c
index 2dbd56df2..b4dfa50db 100644
--- a/soh/src/code/z_face_reaction.c
+++ b/soh/src/code/z_face_reaction.c
@@ -66,5 +66,10 @@ u16 sReactionTextIds[][PLAYER_MASK_MAX] = {
u16 Text_GetFaceReaction(PlayState* play, u32 reactionSet) {
u8 currentMask = Player_GetMask(play);
- return sReactionTextIds[reactionSet][currentMask];
+ if (CVar_GetS32("gMMBunnyHood", 0) && currentMask == PLAYER_MASK_BUNNY) {
+ return 0;
+ } else {
+ return sReactionTextIds[reactionSet][currentMask];
+ }
+
}