maps: EventFlags fixups, support set/clear/multiple bits in flags_fp_conv

emoose · emoose · commit 953010c05392 · 2025-09-23T13:19:17.000+01:00
diff --git a/include/event_flags.h b/include/event_flags.h
@@ -5,18 +5,21 @@ typedef enum _EventFlag
 {
     EventFlag_0 = 0, // M0S01 FirstAidKit? Also used in M0S02, might just be a default.
 
-    EventFlag_4 = 4,
-
-    EventFlag_6 = 6,
-
-    EventFlag_9 = 9,
-
+    EventFlag_4  = 4,
+    EventFlag_5  = 5,
+    EventFlag_6  = 6,
+    EventFlag_7  = 7,
+    EventFlag_8  = 8,
+    EventFlag_9  = 9,
+    EventFlag_10 = 10,
     EventFlag_11 = 11,
 
     EventFlag_13 = 13,
-
+    EventFlag_14 = 14,
+    EventFlag_15 = 15,
     EventFlag_16 = 16,
     EventFlag_17 = 17,
+    EventFlag_18 = 18,
 
     EventFlag_24 = 24,
     EventFlag_25 = 25,
@@ -85,6 +88,8 @@ typedef enum _EventFlag
 
     EventFlag_SeenSaveScreen = 186,
 
+    EventFlag_188 = 188,
+
     EventFlag_197 = 197,
 
     EventFlag_M3S00_FirstAidKit = 199, // Odd numbering not with other common items, possibly some default that goes unused, shared with M3S01 and M3S06.
diff --git a/src/maps/map0_s00/map0_s00.c b/src/maps/map0_s00/map0_s00.c
@@ -612,15 +612,8 @@ void func_800DA454(void) // 0x800DA454
 
 void func_800DA5A0(void) // 0x800DA5A0
 {
-    s32 temp_s0;
-    s32 temp_s1;
     s32 temp_s1_2;
     s32 temp_s2;
-    s32 temp_v1;
-    s32 var_a0;
-    s32 var_a1;
-    s32 temp;
-    s32 temp2;
 
     switch (g_SysWork.sysStateStep_C[0])
     {
@@ -744,7 +737,7 @@ void func_800DA5A0(void) // 0x800DA5A0
         default:
             func_8008616C(0, false, 2, 0, false);
 
-            g_SavegamePtr->eventFlags_168[0] |= 0x10;
+            Savegame_EventFlagSet(EventFlag_4);
 
             sharedFunc_800D2244_0_s00(0);
             SysWork_StateSetNext(SysState_Gameplay);
@@ -930,7 +923,9 @@ void func_800DAEFC(void) // 0x800DAEFC
             SysWork_StateSetNext(SysState_Gameplay);
             func_8008616C(0, false, 2, 0, false);
 
-            g_SavegamePtr->eventFlags_168[0] |= 0x180;
+            Savegame_EventFlagSet(EventFlag_7);
+            Savegame_EventFlagSet(EventFlag_8);
+
             func_800865FC(true, 1, 0, FP_ANGLE(180.0f), Q12(-62.0f), Q12(49.0f));
     }
 }
@@ -991,7 +986,7 @@ void Map_WorldObjectsInit(void) // 0x800DBE68
     rotXY = 0xFAE4FE17; // @hack `vx` and `vy` combined into `s32`.
     D_800E3AAC.vz = 0;
 
-    g_SavegamePtr->eventFlags_168[5] &= 0xEFFFFFFF;
+    Savegame_EventFlagClear(EventFlag_188);
     *(s32*)&D_800E3AAC.vx = rotXY;
 }
 
@@ -1041,17 +1036,17 @@ void Map_WorldObjectsUpdate(void) // 0x800DBF08
         
             if (g_SysWork.field_22A0 & 0x40)
             {
-                g_SavegamePtr->eventFlags_168[5] &= 0xEFFFFFFF;
+                Savegame_EventFlagClear(EventFlag_188);
             }
-        
-            if (!(g_SavegamePtr->eventFlags_168[5] & 0x10000000))
+
+            if (!Savegame_EventFlagGet(EventFlag_188))
             {
                 func_8004690C(Sfx_Unk1361);
                 Sd_EngineCmd(Sfx_Unk1358);
-                g_SavegamePtr->eventFlags_168[5] |= 0x10000000;
+                Savegame_EventFlagSet(EventFlag_188);
             }
-        
-            if (!(g_SavegamePtr->eventFlags_168[0] & 0x01000000))
+
+            if (!Savegame_EventFlagGet(EventFlag_24))
             {
                 func_8005DE0C(Sfx_Unk1358, &D_800E3A9C, 0x40, 0x8000, 0);
             }
@@ -1063,7 +1058,7 @@ void Event_GreyChildrenSpawn(void) // 0x800DC1E8
 {
     MAP_CHUNK_CHECK_VARIABLE_DECL();
 
-    if ((g_SavegamePtr->eventFlags_168[0] & 0x20000) && g_SysWork.npcs_1A0[0].model_0.charaId_0 == Chara_None)
+    if (Savegame_EventFlagGet(EventFlag_17) && g_SysWork.npcs_1A0[0].model_0.charaId_0 == Chara_None)
     {
         if (PLAYER_IN_MAP_CHUNK(vx, 1, -7, -1, -7) && PLAYER_IN_MAP_CHUNK(vz, 1, 7, -1, 7))
         {
@@ -1079,24 +1074,18 @@ void func_800DC33C(void) // 0x800DC33C
     VECTOR3     camPos;
     s16         temp_a0;
     s16         var_s1;
-    s32         var_v1;
     q19_12      temp_a0_2;
     s32         temp_v1;
     s32         var_a0;
     s32         var_a2;
     s32         var_v1_2;
-    s_Savegame* save;
-
-    save = g_SavegamePtr;
 
-    // TODO: Use `Savegame_EventFlagGet`.
-
-    if (!(save->eventFlags_168[0] & 0x20))
+    if (!Savegame_EventFlagGet(EventFlag_5))
     {
         func_800865FC(true, 1, 0, FP_ANGLE(180.0f), Q12(-62.0f), Q12(108.0f));
         sharedFunc_800D88AC_0_s00(g_SysWork.npcs_1A0);
 
-        save->eventFlags_168[0] |= 0x20;
+        Savegame_EventFlagSet(EventFlag_5);
     }
 
     vwGetViewPosition(&camPos);
@@ -1120,7 +1109,7 @@ void func_800DC33C(void) // 0x800DC33C
 
                 sharedFunc_800D88C0_0_s00(g_SysWork.npcs_1A0, 0);
 
-                g_SavegamePtr->eventFlags_168[0] |= 0x40;
+                Savegame_EventFlagSet(EventFlag_6);
                 return;
             }
         }
@@ -1185,8 +1174,7 @@ void func_800DC694(void) // 0x800DC694
     mag = Math_Vector2MagCalc(g_SysWork.npcs_1A0[0].position_18.vx - g_SysWork.player_4C.chara_0.position_18.vx,
                               (g_SysWork.npcs_1A0[0].position_18.vz - g_SysWork.player_4C.chara_0.position_18.vz) - Q12(2.0f));
 
-    // TODO: Use `Savegame_EventFlagGet`.
-    if (!(g_SavegamePtr->eventFlags_168[0] & 0x80))
+    if (!Savegame_EventFlagGet(EventFlag_7))
     {
         sharedFunc_800D88AC_0_s00(g_SysWork.npcs_1A0);
         return;
@@ -1209,7 +1197,7 @@ void func_800DC694(void) // 0x800DC694
 
                 sharedFunc_800D88C0_0_s00(g_SysWork.npcs_1A0, 0);
 
-                g_SavegamePtr->eventFlags_168[0] |= 0x200;
+                Savegame_EventFlagSet(EventFlag_9);
                 return;
             }
         }
@@ -1257,8 +1245,7 @@ void func_800DC8D8(void) // 0x800DC8D8
     mag = Math_Vector2MagCalc(g_SysWork.npcs_1A0[0].position_18.vx - g_SysWork.player_4C.chara_0.position_18.vx,
                               (g_SysWork.npcs_1A0[0].position_18.vz - g_SysWork.player_4C.chara_0.position_18.vz) - Q12(2.0f));
 
-    // TODO: Use `Savegame_EventFlagGet`.
-    if (!(g_SavegamePtr->eventFlags_168[0] & 0x400))
+    if (!Savegame_EventFlagGet(EventFlag_10))
     {
         g_SysWork.npcs_1A0[0].position_18.vx = Q12(-61.0f);
         g_SysWork.npcs_1A0[0].position_18.vz = Q12(48.0f);
@@ -1268,7 +1255,7 @@ void func_800DC8D8(void) // 0x800DC8D8
         {
             sharedFunc_800D88AC_0_s00(g_SysWork.npcs_1A0);
 
-            g_SavegamePtr->eventFlags_168[0] |= 0x400;
+            Savegame_EventFlagSet(EventFlag_10);
 
             func_800865FC(true, 1, 0, FP_ANGLE(90.0f), Q12(-57.0f), Q12(47.0f));
         }
@@ -1281,7 +1268,7 @@ void func_800DC8D8(void) // 0x800DC8D8
 
         if (g_SysWork.npcs_1A0[0].position_18.vx > Q12(-58.0f))
         {
-            g_SavegamePtr->eventFlags_168[0] |= 0x800;
+            Savegame_EventFlagSet(EventFlag_11);
             g_SysWork.npcs_1A0[0].model_0.charaId_0 = Chara_None;
 
             func_8005DC1C(Sfx_Unk1354, &D_800CB6A4, 0x80, 0);
@@ -1293,9 +1280,6 @@ INCLUDE_ASM("asm/maps/map0_s00/nonmatchings/map0_s00", func_800DCA30);
 
 void func_800DCC54(void) // 0x800DCC54
 {
-    s_Savegame* save;
-    u32         temp_v1;
-
     if (D_800DFADC == NO_VALUE)
     {
         func_8003EF10(6, 6, 5, (s32)&D_800DFADC, 0, 0x64000);
@@ -1304,16 +1288,13 @@ void func_800DCC54(void) // 0x800DCC54
         Sd_PlaySfx(0x54Fu, 0, 0xE0u);
     }
 
-    save = g_SavegamePtr;
-
-    temp_v1 = save->eventFlags_168[0];
-    if (temp_v1 & 0x4000)
+    if (Savegame_EventFlagGet(EventFlag_14))
     {
-        if (!(temp_v1 & 0x40000))
+        if (!Savegame_EventFlagGet(EventFlag_18))
         {
             sharedFunc_800D0B18_0_s00(6);
 
-            save->eventFlags_168[0] |= 0x40000;
+            Savegame_EventFlagSet(EventFlag_18);
 
             Sd_PlaySfx(0x54FU, 0, 0xC0u);
 
@@ -1329,12 +1310,12 @@ void func_800DCC54(void) // 0x800DCC54
 
     if (D_800DFADC > 0x4FFFF)
     {
-        g_SavegamePtr->eventFlags_168[0] |= 0x8000;
+        Savegame_EventFlagSet(EventFlag_15);
     }
 
     if (D_800DFADC > 0x63FFF)
     {
-        g_SavegamePtr->eventFlags_168[0] |= 0x10000;
+        Savegame_EventFlagSet(EventFlag_16);
     }
 }
 
@@ -1378,22 +1359,21 @@ s32 func_800DCDA8(void) // 0x800DCDA8
 s32 func_800DCF38(s32 arg0) // 0x800DCF38
 {
     s16 sp20;
-    s32 temp_v0;
     s32 var_t0;
     s32 var_v0;
 
     var_t0 = 0;
 
     if (g_SysWork.sysState_8 == SysState_EventCallFunc)
     {
-        if (!(g_SavegamePtr->eventFlags_168[0] & 0x8000))
+        if (!Savegame_EventFlagGet(EventFlag_15))
         {
             return arg0;
         }
     }
     else
     {
-        if (!(g_SavegamePtr->eventFlags_168[0] & 0x8000))
+        if (!Savegame_EventFlagGet(EventFlag_15))
         {
             if (g_SysWork.player_4C.chara_0.position_18.vx < Q12(-200.0f))
             {
diff --git a/tools/flags_fp_conv.py b/tools/flags_fp_conv.py
@@ -6,45 +6,94 @@
 import re
 
 # ---------- EventFlags converter ----------
-def bit_index(mask):
-    """Convert a mask like 8 (0b1000) to its bit index (3)."""
-    if mask == 0:
-        raise ValueError("Mask cannot be zero")
-    index = 0
-    while mask > 1:
-        mask >>= 1
-        index += 1
-    return index
+def _parse_mask(mask_str):
+    """Strip integer suffixes (U/L) and parse mask as int."""
+    mask_clean = re.sub(r'[uUlL]+$', '', mask_str)
+    return int(mask_clean, 0)
+
+def _bit_indices(mask, width=32):
+    """Return list of bit indices (0..width-1) that are set in mask."""
+    return [i for i in range(width) if (mask >> i) & 1]
 
 def convert_flag_expression(expr):
     """
-    Converts:
-        g_SavegamePtr->eventFlags_168[2] & 8
-        g_SavegamePtr->eventFlags_168[2] & 0x8
-        g_SavegamePtr->eventFlags_168[2] & (1 << 3)
-        temp_a0->eventFlags_168[2] & [...]
-    into Savegame_EventFlagGet(final_index)
+    Convert eventFlags_168 bit ops into Savegame_EventFlag* calls.
+    Rules:
+      - '|='  -> Savegame_EventFlagSet(...)
+      - '&'   -> Savegame_EventFlagGet(...) (if mask has multiple bits -> OR-combined gets)
+      - '&='  -> Savegame_EventFlagClear(...) 
+                * if written as '&= ~mask' -> mask gives bits to clear
+                * if written as '&= mask'  -> mask is already negated: bits to clear = ~mask & 0xFFFFFFFF
+    Returns a string (single call or multiple calls joined).
     """
-    # Pattern for decimal or hex mask
-    pattern_literal = r'.*?eventFlags_168\[(\d+)\]\s*&\s*(0x[0-9a-fA-F]+|\d+)'
-    # Pattern for bit shift
-    pattern_shift = r'.*?eventFlags_168\[(\d+)\]\s*&\s*\(\s*1\s*<<\s*(\d+)\s*\)'
-
-    match_shift = re.search(pattern_shift, expr)
-    if match_shift:
-        array_idx = int(match_shift.group(1))
-        bit_idx = int(match_shift.group(2))
-    else:
-        match_literal = re.search(pattern_literal, expr)
-        if not match_literal:
-            return None  # not an eventFlags expression
-        array_idx = int(match_literal.group(1))
-        mask_str = match_literal.group(2)
-        mask = int(mask_str, 0)  # handles decimal and hex
-        bit_idx = bit_index(mask)
-    
-    final_idx = array_idx * 32 + bit_idx
-    return f"Savegame_EventFlagGet({final_idx})"
+    arr_pat   = r'.*?eventFlags_168\[(\d+)\]'
+    mask_pat  = r'(0x[0-9a-fA-F]+(?:[uUlL]*)|\d+)'
+    shift_pat = r'\(\s*1\s*<<\s*(\d+)\s*\)'
+
+    # |= (shift)
+    m = re.search(arr_pat + r'\s*\|\=\s*' + shift_pat, expr)
+    if m:
+        array_idx, bit_idx = int(m.group(1)), int(m.group(2))
+        return f"Savegame_EventFlagSet(EventFlag_{array_idx * 32 + bit_idx})"
+
+    # |= (literal)
+    m = re.search(arr_pat + r'\s*\|\=\s*' + mask_pat, expr)
+    if m:
+        array_idx = int(m.group(1))
+        mask = _parse_mask(m.group(2))
+        indices = _bit_indices(mask)
+        return '; '.join(f"Savegame_EventFlagSet(EventFlag_{array_idx * 32 + i})" for i in indices) if indices else None
+
+    # &= ~(shift)
+    m = re.search(arr_pat + r'\s*\&\=\s*~' + shift_pat, expr)
+    if m:
+        array_idx, bit_idx = int(m.group(1)), int(m.group(2))
+        return f"Savegame_EventFlagClear(EventFlag_{array_idx * 32 + bit_idx})"
+
+    # &= ~(literal)
+    m = re.search(arr_pat + r'\s*\&\=\s*~' + mask_pat, expr)
+    if m:
+        array_idx = int(m.group(1))
+        mask = _parse_mask(m.group(2))
+        indices = _bit_indices(mask)
+        return '; '.join(f"Savegame_EventFlagClear(EventFlag_{array_idx * 32 + i})" for i in indices) if indices else None
+
+    # &= (literal WITHOUT ~) -> mask is the negated form; bits to clear are zeros in mask
+    m = re.search(arr_pat + r'\s*\&\=\s*' + mask_pat, expr)
+    if m:
+        array_idx = int(m.group(1))
+        mask = _parse_mask(m.group(2))
+        inverted = (~mask) & 0xFFFFFFFF
+        indices = _bit_indices(inverted)
+        return '; '.join(f"Savegame_EventFlagClear(EventFlag_{array_idx * 32 + i})" for i in indices) if indices else None
+
+    # &= (shift WITHOUT ~) -> uncommon, but handle by inverting the single-bit mask
+    m = re.search(arr_pat + r'\s*\&\=\s*' + shift_pat, expr)
+    if m:
+        array_idx, bit_idx = int(m.group(1)), int(m.group(2))
+        inverted = (~(1 << bit_idx)) & 0xFFFFFFFF
+        indices = _bit_indices(inverted)
+        return '; '.join(f"Savegame_EventFlagClear(EventFlag_{array_idx * 32 + i})" for i in indices) if indices else None
+
+    # & (shift) -> Get
+    m = re.search(arr_pat + r'\s*\&\s*' + shift_pat, expr)
+    if m:
+        array_idx, bit_idx = int(m.group(1)), int(m.group(2))
+        return f"Savegame_EventFlagGet(EventFlag_{array_idx * 32 + bit_idx})"
+
+    # & (literal) -> Get (if multiple bits -> OR them)
+    m = re.search(arr_pat + r'\s*\&\s*' + mask_pat, expr)
+    if m:
+        array_idx = int(m.group(1))
+        mask = _parse_mask(m.group(2))
+        indices = _bit_indices(mask)
+        if not indices:
+            return None
+        if len(indices) == 1:
+            return f"Savegame_EventFlagGet(EventFlag_{array_idx * 32 + indices[0]})"
+        return ' || '.join(f"Savegame_EventFlagGet(EventFlag_{array_idx * 32 + i})" for i in indices)
+
+    return None
 
 # ---------- FP converter ----------
 def to_signed(val, bits=32):

Original file line number	Diff line number	Diff line change
`@@ -612,15 +612,8 @@ void func_800DA454(void) // 0x800DA454`
`612`	`612`
`613`	`613`	`void func_800DA5A0(void) // 0x800DA5A0`
`614`	`614`	`{`
`615`		`- s32 temp_s0;`
`616`		`- s32 temp_s1;`
`617`	`615`	`s32 temp_s1_2;`
`618`	`616`	`s32 temp_s2;`
`619`		`- s32 temp_v1;`
`620`		`- s32 var_a0;`
`621`		`- s32 var_a1;`
`622`		`- s32 temp;`
`623`		`- s32 temp2;`
`624`	`617`
`625`	`618`	`switch (g_SysWork.sysStateStep_C[0])`
`626`	`619`	`{`
`@@ -744,7 +737,7 @@ void func_800DA5A0(void) // 0x800DA5A0`
`744`	`737`	`default:`
`745`	`738`	`func_8008616C(0, false, 2, 0, false);`
`746`	`739`
`747`		`- g_SavegamePtr->eventFlags_168[0] \|= 0x10;`
	`740`	`+ Savegame_EventFlagSet(EventFlag_4);`
`748`	`741`
`749`	`742`	`sharedFunc_800D2244_0_s00(0);`
`750`	`743`	`SysWork_StateSetNext(SysState_Gameplay);`
`@@ -930,7 +923,9 @@ void func_800DAEFC(void) // 0x800DAEFC`
`930`	`923`	`SysWork_StateSetNext(SysState_Gameplay);`
`931`	`924`	`func_8008616C(0, false, 2, 0, false);`
`932`	`925`
`933`		`- g_SavegamePtr->eventFlags_168[0] \|= 0x180;`
	`926`	`+ Savegame_EventFlagSet(EventFlag_7);`
	`927`	`+ Savegame_EventFlagSet(EventFlag_8);`
	`928`	`+`
`934`	`929`	`func_800865FC(true, 1, 0, FP_ANGLE(180.0f), Q12(-62.0f), Q12(49.0f));`
`935`	`930`	`}`
`936`	`931`	`}`
`@@ -991,7 +986,7 @@ void Map_WorldObjectsInit(void) // 0x800DBE68`
`991`	`986`	rotXY = 0xFAE4FE17; // @hack `vx` and `vy` combined into `s32`.
`992`	`987`	`D_800E3AAC.vz = 0;`
`993`	`988`
`994`		`- g_SavegamePtr->eventFlags_168[5] &= 0xEFFFFFFF;`
	`989`	`+ Savegame_EventFlagClear(EventFlag_188);`
`995`	`990`	`(s32)&D_800E3AAC.vx = rotXY;`
`996`	`991`	`}`
`997`	`992`
`@@ -1041,17 +1036,17 @@ void Map_WorldObjectsUpdate(void) // 0x800DBF08`
`1041`	`1036`
`1042`	`1037`	`if (g_SysWork.field_22A0 & 0x40)`
`1043`	`1038`	`{`
`1044`		`- g_SavegamePtr->eventFlags_168[5] &= 0xEFFFFFFF;`
	`1039`	`+ Savegame_EventFlagClear(EventFlag_188);`
`1045`	`1040`	`}`
`1046`		`-`
`1047`		`- if (!(g_SavegamePtr->eventFlags_168[5] & 0x10000000))`
	`1041`	`+`
	`1042`	`+ if (!Savegame_EventFlagGet(EventFlag_188))`
`1048`	`1043`	`{`
`1049`	`1044`	`func_8004690C(Sfx_Unk1361);`
`1050`	`1045`	`Sd_EngineCmd(Sfx_Unk1358);`
`1051`		`- g_SavegamePtr->eventFlags_168[5] \|= 0x10000000;`
	`1046`	`+ Savegame_EventFlagSet(EventFlag_188);`
`1052`	`1047`	`}`
`1053`		`-`
`1054`		`- if (!(g_SavegamePtr->eventFlags_168[0] & 0x01000000))`
	`1048`	`+`
	`1049`	`+ if (!Savegame_EventFlagGet(EventFlag_24))`
`1055`	`1050`	`{`
`1056`	`1051`	`func_8005DE0C(Sfx_Unk1358, &D_800E3A9C, 0x40, 0x8000, 0);`
`1057`	`1052`	`}`
`@@ -1063,7 +1058,7 @@ void Event_GreyChildrenSpawn(void) // 0x800DC1E8`
`1063`	`1058`	`{`
`1064`	`1059`	`MAP_CHUNK_CHECK_VARIABLE_DECL();`
`1065`	`1060`
`1066`		`- if ((g_SavegamePtr->eventFlags_168[0] & 0x20000) && g_SysWork.npcs_1A0[0].model_0.charaId_0 == Chara_None)`
	`1061`	`+ if (Savegame_EventFlagGet(EventFlag_17) && g_SysWork.npcs_1A0[0].model_0.charaId_0 == Chara_None)`
`1067`	`1062`	`{`
`1068`	`1063`	`if (PLAYER_IN_MAP_CHUNK(vx, 1, -7, -1, -7) && PLAYER_IN_MAP_CHUNK(vz, 1, 7, -1, 7))`
`1069`	`1064`	`{`
`@@ -1079,24 +1074,18 @@ void func_800DC33C(void) // 0x800DC33C`
`1079`	`1074`	`VECTOR3 camPos;`
`1080`	`1075`	`s16 temp_a0;`
`1081`	`1076`	`s16 var_s1;`
`1082`		`- s32 var_v1;`
`1083`	`1077`	`q19_12 temp_a0_2;`
`1084`	`1078`	`s32 temp_v1;`
`1085`	`1079`	`s32 var_a0;`
`1086`	`1080`	`s32 var_a2;`
`1087`	`1081`	`s32 var_v1_2;`
`1088`		`- s_Savegame* save;`
`1089`		`-`
`1090`		`- save = g_SavegamePtr;`
`1091`	`1082`
`1092`		- // TODO: Use `Savegame_EventFlagGet`.
`1093`		`-`
`1094`		`- if (!(save->eventFlags_168[0] & 0x20))`
	`1083`	`+ if (!Savegame_EventFlagGet(EventFlag_5))`
`1095`	`1084`	`{`
`1096`	`1085`	`func_800865FC(true, 1, 0, FP_ANGLE(180.0f), Q12(-62.0f), Q12(108.0f));`
`1097`	`1086`	`sharedFunc_800D88AC_0_s00(g_SysWork.npcs_1A0);`
`1098`	`1087`
`1099`		`- save->eventFlags_168[0] \|= 0x20;`
	`1088`	`+ Savegame_EventFlagSet(EventFlag_5);`
`1100`	`1089`	`}`
`1101`	`1090`
`1102`	`1091`	`vwGetViewPosition(&camPos);`
`@@ -1120,7 +1109,7 @@ void func_800DC33C(void) // 0x800DC33C`
`1120`	`1109`
`1121`	`1110`	`sharedFunc_800D88C0_0_s00(g_SysWork.npcs_1A0, 0);`
`1122`	`1111`
`1123`		`- g_SavegamePtr->eventFlags_168[0] \|= 0x40;`
	`1112`	`+ Savegame_EventFlagSet(EventFlag_6);`
`1124`	`1113`	`return;`
`1125`	`1114`	`}`
`1126`	`1115`	`}`
`@@ -1185,8 +1174,7 @@ void func_800DC694(void) // 0x800DC694`
`1185`	`1174`	`mag = Math_Vector2MagCalc(g_SysWork.npcs_1A0[0].position_18.vx - g_SysWork.player_4C.chara_0.position_18.vx,`
`1186`	`1175`	`(g_SysWork.npcs_1A0[0].position_18.vz - g_SysWork.player_4C.chara_0.position_18.vz) - Q12(2.0f));`
`1187`	`1176`
`1188`		- // TODO: Use `Savegame_EventFlagGet`.
`1189`		`- if (!(g_SavegamePtr->eventFlags_168[0] & 0x80))`
	`1177`	`+ if (!Savegame_EventFlagGet(EventFlag_7))`
`1190`	`1178`	`{`
`1191`	`1179`	`sharedFunc_800D88AC_0_s00(g_SysWork.npcs_1A0);`
`1192`	`1180`	`return;`
`@@ -1209,7 +1197,7 @@ void func_800DC694(void) // 0x800DC694`
`1209`	`1197`
`1210`	`1198`	`sharedFunc_800D88C0_0_s00(g_SysWork.npcs_1A0, 0);`
`1211`	`1199`
`1212`		`- g_SavegamePtr->eventFlags_168[0] \|= 0x200;`
	`1200`	`+ Savegame_EventFlagSet(EventFlag_9);`
`1213`	`1201`	`return;`
`1214`	`1202`	`}`
`1215`	`1203`	`}`
`@@ -1257,8 +1245,7 @@ void func_800DC8D8(void) // 0x800DC8D8`
`1257`	`1245`	`mag = Math_Vector2MagCalc(g_SysWork.npcs_1A0[0].position_18.vx - g_SysWork.player_4C.chara_0.position_18.vx,`
`1258`	`1246`	`(g_SysWork.npcs_1A0[0].position_18.vz - g_SysWork.player_4C.chara_0.position_18.vz) - Q12(2.0f));`
`1259`	`1247`
`1260`		- // TODO: Use `Savegame_EventFlagGet`.
`1261`		`- if (!(g_SavegamePtr->eventFlags_168[0] & 0x400))`
	`1248`	`+ if (!Savegame_EventFlagGet(EventFlag_10))`
`1262`	`1249`	`{`
`1263`	`1250`	`g_SysWork.npcs_1A0[0].position_18.vx = Q12(-61.0f);`
`1264`	`1251`	`g_SysWork.npcs_1A0[0].position_18.vz = Q12(48.0f);`
`@@ -1268,7 +1255,7 @@ void func_800DC8D8(void) // 0x800DC8D8`
`1268`	`1255`	`{`
`1269`	`1256`	`sharedFunc_800D88AC_0_s00(g_SysWork.npcs_1A0);`
`1270`	`1257`
`1271`		`- g_SavegamePtr->eventFlags_168[0] \|= 0x400;`
	`1258`	`+ Savegame_EventFlagSet(EventFlag_10);`
`1272`	`1259`
`1273`	`1260`	`func_800865FC(true, 1, 0, FP_ANGLE(90.0f), Q12(-57.0f), Q12(47.0f));`
`1274`	`1261`	`}`
`@@ -1281,7 +1268,7 @@ void func_800DC8D8(void) // 0x800DC8D8`
`1281`	`1268`
`1282`	`1269`	`if (g_SysWork.npcs_1A0[0].position_18.vx > Q12(-58.0f))`
`1283`	`1270`	`{`
`1284`		`- g_SavegamePtr->eventFlags_168[0] \|= 0x800;`
	`1271`	`+ Savegame_EventFlagSet(EventFlag_11);`
`1285`	`1272`	`g_SysWork.npcs_1A0[0].model_0.charaId_0 = Chara_None;`
`1286`	`1273`
`1287`	`1274`	`func_8005DC1C(Sfx_Unk1354, &D_800CB6A4, 0x80, 0);`
`@@ -1293,9 +1280,6 @@ INCLUDE_ASM("asm/maps/map0_s00/nonmatchings/map0_s00", func_800DCA30);`
`1293`	`1280`
`1294`	`1281`	`void func_800DCC54(void) // 0x800DCC54`
`1295`	`1282`	`{`
`1296`		`- s_Savegame* save;`
`1297`		`- u32 temp_v1;`
`1298`		`-`
`1299`	`1283`	`if (D_800DFADC == NO_VALUE)`
`1300`	`1284`	`{`
`1301`	`1285`	`func_8003EF10(6, 6, 5, (s32)&D_800DFADC, 0, 0x64000);`
`@@ -1304,16 +1288,13 @@ void func_800DCC54(void) // 0x800DCC54`
`1304`	`1288`	`Sd_PlaySfx(0x54Fu, 0, 0xE0u);`
`1305`	`1289`	`}`
`1306`	`1290`
`1307`		`- save = g_SavegamePtr;`
`1308`		`-`
`1309`		`- temp_v1 = save->eventFlags_168[0];`
`1310`		`- if (temp_v1 & 0x4000)`
	`1291`	`+ if (Savegame_EventFlagGet(EventFlag_14))`
`1311`	`1292`	`{`
`1312`		`- if (!(temp_v1 & 0x40000))`
	`1293`	`+ if (!Savegame_EventFlagGet(EventFlag_18))`
`1313`	`1294`	`{`
`1314`	`1295`	`sharedFunc_800D0B18_0_s00(6);`
`1315`	`1296`
`1316`		`- save->eventFlags_168[0] \|= 0x40000;`
	`1297`	`+ Savegame_EventFlagSet(EventFlag_18);`
`1317`	`1298`
`1318`	`1299`	`Sd_PlaySfx(0x54FU, 0, 0xC0u);`
`1319`	`1300`
`@@ -1329,12 +1310,12 @@ void func_800DCC54(void) // 0x800DCC54`
`1329`	`1310`
`1330`	`1311`	`if (D_800DFADC > 0x4FFFF)`
`1331`	`1312`	`{`
`1332`		`- g_SavegamePtr->eventFlags_168[0] \|= 0x8000;`
	`1313`	`+ Savegame_EventFlagSet(EventFlag_15);`
`1333`	`1314`	`}`
`1334`	`1315`
`1335`	`1316`	`if (D_800DFADC > 0x63FFF)`
`1336`	`1317`	`{`
`1337`		`- g_SavegamePtr->eventFlags_168[0] \|= 0x10000;`
	`1318`	`+ Savegame_EventFlagSet(EventFlag_16);`
`1338`	`1319`	`}`
`1339`	`1320`	`}`
`1340`	`1321`
`@@ -1378,22 +1359,21 @@ s32 func_800DCDA8(void) // 0x800DCDA8`
`1378`	`1359`	`s32 func_800DCF38(s32 arg0) // 0x800DCF38`
`1379`	`1360`	`{`
`1380`	`1361`	`s16 sp20;`
`1381`		`- s32 temp_v0;`
`1382`	`1362`	`s32 var_t0;`
`1383`	`1363`	`s32 var_v0;`
`1384`	`1364`
`1385`	`1365`	`var_t0 = 0;`
`1386`	`1366`
`1387`	`1367`	`if (g_SysWork.sysState_8 == SysState_EventCallFunc)`
`1388`	`1368`	`{`
`1389`		`- if (!(g_SavegamePtr->eventFlags_168[0] & 0x8000))`
	`1369`	`+ if (!Savegame_EventFlagGet(EventFlag_15))`
`1390`	`1370`	`{`
`1391`	`1371`	`return arg0;`
`1392`	`1372`	`}`
`1393`	`1373`	`}`
`1394`	`1374`	`else`
`1395`	`1375`	`{`
`1396`		`- if (!(g_SavegamePtr->eventFlags_168[0] & 0x8000))`
	`1376`	`+ if (!Savegame_EventFlagGet(EventFlag_15))`
`1397`	`1377`	`{`
`1398`	`1378`	`if (g_SysWork.player_4C.chara_0.position_18.vx < Q12(-200.0f))`
`1399`	`1379`	`{`