diff --git a/include/m_actor.h b/include/m_actor.h
index 0877f2a0..5259ae33 100644
--- a/include/m_actor.h
+++ b/include/m_actor.h
@@ -289,7 +289,9 @@ enum actor_profile_table {
   mAc_PROFILE_NPC_HEM,
   mAc_PROFILE_TENT,
   mAc_PROFILE_PTERMINAL,
-  mAc_PROFILE_MSCORE_CONTROL
+  mAc_PROFILE_MSCORE_CONTROL,
+
+  mAc_PROFILE_NUM
 };
 
 /* sizeof(ACTOR_PROFILE) == 0x24 */
diff --git a/rel/m_common_data.c b/rel/m_common_data.c
index b80ab4fc..e1ab6590 100644
--- a/rel/m_common_data.c
+++ b/rel/m_common_data.c
@@ -10,11 +10,11 @@ extern void common_data_reinit(){
     state = Common_Get(pad_connected);
 
     bzero(&common_data, sizeof(common_data));
-    Common_Set(wipeType, 255);
+    Common_Set(wipeType, -1);
     Common_Set(game_started,1);
     Common_Set(last_scene_no, -1);
-    Common_Set(demo_profiles[0], 246);
-    Common_Set(demo_profiles[1], 246);
+    Common_Set(demo_profiles[0], mAc_PROFILE_NUM); /* cleared state */
+    Common_Set(demo_profiles[1], mAc_PROFILE_NUM); /* cleared state */
     Common_Set(pad_connected, state);
 
     mFRm_ClearSaveCheckData(Save_GetPointer(save_check));