From 5b5310ea92e2fafa38a2fcb228b67a59ffa75b0d Mon Sep 17 00:00:00 2001 From: aMannus Date: Mon, 5 Dec 2022 01:03:04 +0100 Subject: Disable bunny hood NPC interactions with MM bunny hood on (#2058) * Disable bunny hood NPC interactions * Enum --- soh/src/code/z_face_reaction.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'soh/src/code') 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]; + } + } -- cgit v1.2.3