[JP] Naming flag GF_MAC00_TranslatedSuspiciousNote

pmret · Sep 12, 2024 · f54baa8 · f54baa8
1 parent d26ea9a
commit f54baa8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/saved_flag_names.h b/include/saved_flag_names.h
@@ -247,7 +247,7 @@ enum GameFlags {
     GF_MAC00_DictionaryStolen                   = GameFlag(0x0F3),
     GF_MAC00_DictionaryReturned                 = GameFlag(0x0F4),
     GF_MAC00_TranslatedMysteryNote              = GameFlag(0x0F5),
-    GF_Unused_MAC_74                            = GameFlag(0x0F6), ///< presumably for translating the unused SuspiciousNote
+    GF_MAC00_TranslatedSuspiciousNote           = GameFlag(0x0F6),
     GF_MAC01_ShyGuyTookOverShop                 = GameFlag(0x0F7),
     GF_MAC00_ShyGuyChasedFromShop               = GameFlag(0x0F8),
     GF_MAC01_Merlon_Shoo1                       = GameFlag(0x0F9),

diff --git a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c
@@ -305,7 +305,7 @@ EvtScript N(EVS_ItemPrompt_Dictionary) = {
                 Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_0010)
             EndIf
 #if VERSION_JP
-            IfEq(GF_Unused_MAC_74, TRUE)
+            IfEq(GF_MAC00_TranslatedSuspiciousNote, TRUE)
                 Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_JP_0011)
             EndIf
 #endif
@@ -315,7 +315,7 @@ EvtScript N(EVS_ItemPrompt_Dictionary) = {
 #if VERSION_JP
         CaseEq(ITEM_SUSPICIOUS_NOTE)
             Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_0122)
-            Set(GF_Unused_MAC_74, TRUE)
+            Set(GF_MAC00_TranslatedSuspiciousNote, TRUE)
 #endif
         CaseEq(-1)
             Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_000C)
@@ -338,7 +338,7 @@ EvtScript N(EVS_ItemPrompt_Documents) = {
                 EndIf
             Else
 #if VERSION_JP
-                IfEq(GF_Unused_MAC_74, TRUE)
+                IfEq(GF_MAC00_TranslatedSuspiciousNote, TRUE)
                     Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_JP_0011)
                     Set(LVarA, 1)
                     Return
@@ -354,7 +354,7 @@ EvtScript N(EVS_ItemPrompt_Documents) = {
 #if VERSION_JP
             Else
                 Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_0121)
-                Set(GF_Unused_MAC_74, TRUE)
+                Set(GF_MAC00_TranslatedSuspiciousNote, TRUE)
                 Set(LVarA, 1)
 #endif
             EndIf

diff --git a/tools/old/saved_flag_renames.txt b/tools/old/saved_flag_renames.txt
@@ -244,7 +244,7 @@ GameFlag(242) GF_MAC00_Met_TheMaster
 GameFlag(243) GF_MAC00_DictionaryStolen
 GameFlag(244) GF_MAC00_DictionaryReturned
 GameFlag(245) GF_MAC00_TranslatedMysteryNote
-GameFlag(246) GF_Unused_MAC_74
+GameFlag(246) GF_MAC00_TranslatedSuspiciousNote
 GameFlag(247) GF_MAC01_ShyGuyTookOverShop
 GameFlag(248) GF_MAC00_ShyGuyChasedFromShop
 GameFlag(249) GF_MAC01_Merlon_Shoo1