diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c
index 526f2388b..937a61b5e 100644
--- a/src/files/setup/setupame.c
+++ b/src/files/setup/setupame.c
@@ -3136,7 +3136,7 @@ u8 func0422_intro_042d[] = {
 	label(0x06)
 	restart_default_music
 	reset_ambience
-	set_eeprom_flag(EEPROMFLAG_CI_TOUR_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_TOUR_DONE)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 	endlist
 };
diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c
index 9d2405b02..6e375e3b9 100644
--- a/src/files/setup/setupazt.c
+++ b/src/files/setup/setupazt.c
@@ -1923,7 +1923,7 @@ u8 func1013_setup_rtracker[] = {
 
 u8 func1016_hide_hoverbike[] = {
 	yield
-	if_eeprom_flag_is_set(EEPROMFLAG_CRASHSITE_BIKE, /*goto*/ 0x08)
+	if_savefile_flag_is_set(SAVEFILEFLAG_CRASHSITE_BIKE, /*goto*/ 0x08)
 	hide_object(OBJ_HOVERBIKE)
 	label(0x08)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c
index 7fbef288d..4b4b77f36 100644
--- a/src/files/setup/setupcave.c
+++ b/src/files/setup/setupcave.c
@@ -2296,7 +2296,7 @@ u8 func100c_check_end_level[] = {
 	// Pad 0x00e9
 	label(0x04)
 	set_stage_flag(STAGEFLAG_BOARDED_PLANE)
-	unset_eeprom_flag(EEPROMFLAG_AF1_ENTRY)
+	unset_savefile_flag(SAVEFILEFLAG_AF1_ENTRY)
 	if_chr_death_animation_finished(CHR_BOND, /*goto*/ 0x31)
 	if_chr_dying(CHR_BOND, /*goto*/ 0x31)
 	if_chr_unloaded(CHR_BOND, /*goto*/ 0x31)
@@ -2321,7 +2321,7 @@ u8 func100c_check_end_level[] = {
 	// Pad 0x00d5
 	label(0x05)
 	set_stage_flag(STAGEFLAG_BOARDED_PLANE)
-	set_eeprom_flag(EEPROMFLAG_AF1_ENTRY)
+	set_savefile_flag(SAVEFILEFLAG_AF1_ENTRY)
 	if_chr_death_animation_finished(CHR_BOND, /*goto*/ 0x31)
 	if_chr_dying(CHR_BOND, /*goto*/ 0x31)
 	if_chr_unloaded(CHR_BOND, /*goto*/ 0x31)
diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c
index 531e24086..58d3b50ba 100644
--- a/src/files/setup/setupdepo.c
+++ b/src/files/setup/setupdepo.c
@@ -2545,7 +2545,7 @@ u8 func101d_init_mines[] = {
 	set_chr_team(CHR_ANTI, TEAM_ENEMY)
 
 	label(0x06)
-	if_eeprom_flag_is_unset(EEPROMFLAG_G5_MINE, /*goto*/ 0x06)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_G5_MINE, /*goto*/ 0x06)
 
 	hide_object(OBJ_MINE1)
 	dprint 'E','P','R','O','M','F','L','A','G',' ','N','O','T','S','E','T',0,
@@ -2829,7 +2829,7 @@ u8 func1022_light_switch[] = {
 };
 
 u8 func1023_hide_nbomb_crate[] = {
-	if_eeprom_flag_is_unset(EEPROMFLAG_G5_MINE, /*goto*/ 0x06)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_G5_MINE, /*goto*/ 0x06)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
 	label(0x06)
diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c
index 89476d237..0f9528f75 100644
--- a/src/files/setup/setupdish.c
+++ b/src/files/setup/setupdish.c
@@ -886,7 +886,7 @@ u8 func1002_devicetraining_camspy[] = {
 	dprint 'd','o','n','e',0,
 	yield
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
-	set_eeprom_flag(EEPROMFLAG_CI_CAMSPY_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_CAMSPY_DONE)
 	label(0x84)
 	if_chr_in_room(CHR_BOND, 0x00, 0x001e, /*goto*/ 0x90)
 	label(0x90)
@@ -1010,7 +1010,7 @@ u8 func1003_devicetraining_nightvision[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_NIGHTVISION_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_NIGHTVISION_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
 	set_lights_state(0x0030, 0x01, 0xff, 0x00, 0x00)
@@ -1187,7 +1187,7 @@ u8 func1004_devicetraining_doordecoder[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_DOORDECODER_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_DOORDECODER_DONE)
 	dprint 'd','o','n','e',0,
 	yield
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
@@ -1398,7 +1398,7 @@ u8 func1005_devicetraining_xray[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_XRAY_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_XRAY_DONE)
 	dprint 'd','o','n','e',0,
 	yield
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
@@ -1535,7 +1535,7 @@ u8 func1006_devicetraining_disguise[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_DISGUISE_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_DISGUISE_DONE)
 	dprint 'd','o','n','e',0,
 	yield
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
@@ -1682,7 +1682,7 @@ u8 func1007_devicetrainign_ir[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_IR_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_IR_DONE)
 	dprint 'd','o','n','e',0,
 	yield
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
@@ -1807,7 +1807,7 @@ u8 func1008_devicetraining_rtracker[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_RTRACKER_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_RTRACKER_DONE)
 	dprint 'd','o','n','e',0,
 	yield
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
@@ -1956,7 +1956,7 @@ u8 func1009_devicetraining_cloak[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_CLOAK_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_CLOAK_DONE)
 	dprint 'd','o','n','e',0,
 	yield
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
@@ -2107,7 +2107,7 @@ u8 func100a_devicetraining_ecmmine[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_ECMMINE_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_ECMMINE_DONE)
 	dprint 'd','o','n','e',0,
 	yield
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
@@ -2313,7 +2313,7 @@ u8 func100b_devicetraining_uplink[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_UPLINK_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_UPLINK_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
 	yield
@@ -2705,14 +2705,14 @@ u8 func042a_carrington_cloak[] = {
 
 u8 func100e_training_unlockables[] = {
 	beginloop(0x04)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_UPLINK_DONE, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_UPLINK_DONE, /*goto*/ 0x2f)
 	endloop(0x04)
 
 	label(0x2f)
 	unlock_door(0x3e, 0x40)
 
 	beginloop(0x08)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_ECMMINE_DONE, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_ECMMINE_DONE, /*goto*/ 0x2f)
 	endloop(0x08)
 
 	label(0x2f)
@@ -2721,14 +2721,14 @@ u8 func100e_training_unlockables[] = {
 	goto_next(0x2f)
 
 	beginloop(0x09)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_CAMSPY_DONE, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_CAMSPY_DONE, /*goto*/ 0x2f)
 	endloop(0x09)
 
 	label(0x2f)
 	unset_object_flag_bank1(OBJ_LIGHTSWITCH, OBJECTFLAG1_INVISIBLE)
 
 	beginloop(0x0a)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_NIGHTVISION_DONE, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_NIGHTVISION_DONE, /*goto*/ 0x2f)
 	endloop(0x0a)
 
 	label(0x2f)
@@ -2742,21 +2742,21 @@ u8 func100e_training_unlockables[] = {
 	set_lights_state(0x0022, 0x01, 0xff, 0x00, 0x00)
 
 	beginloop(0x0b)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_DOORDECODER_DONE, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_DOORDECODER_DONE, /*goto*/ 0x2f)
 	endloop(0x0b)
 
 	label(0x2f)
 	unlock_door(0x41, 0x40)
 
 	beginloop(0x0e)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_IR_DONE, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_IR_DONE, /*goto*/ 0x2f)
 	endloop(0x0e)
 
 	label(0x2f)
 	unlock_door(0x37, 0x40)
 
 	beginloop(0x0f)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_XRAY_DONE, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_XRAY_DONE, /*goto*/ 0x2f)
 	endloop(0x0f)
 
 	label(0x2f)
@@ -2769,7 +2769,7 @@ u8 func100e_training_unlockables[] = {
 #define do_door_proxy(eepromflag, pad, door) \
 	/* If training flag is done, open/close a door automatically as Jo nears it */ \
 	beginloop(0x04) \
-		if_eeprom_flag_is_set(eepromflag, /*goto*/ 0x2f) \
+		if_savefile_flag_is_set(eepromflag, /*goto*/ 0x2f) \
 		reloop(0x04) \
  \
 		label(0x2f) \
@@ -2796,12 +2796,12 @@ u8 func100f_doorproxy_unused1[] = {
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
 	// Unreachable
-	do_door_proxy(EEPROMFLAG_CI_ECMMINE_DONE, 0x0185, 0x3d)
+	do_door_proxy(SAVEFILEFLAG_CI_ECMMINE_DONE, 0x0185, 0x3d)
 	endlist
 };
 
 u8 func1010_doorproxy[] = {
-	do_door_proxy(EEPROMFLAG_CI_UPLINK_DONE, 0x0186, 0x3e)
+	do_door_proxy(SAVEFILEFLAG_CI_UPLINK_DONE, 0x0186, 0x3e)
 	endlist
 };
 
@@ -2809,7 +2809,7 @@ u8 func1010_doorproxy_unused2[] = {
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
 	// Unreachable
-	do_door_proxy(EEPROMFLAG_CI_ECMMINE_DONE, 0x0187, 0x3f)
+	do_door_proxy(SAVEFILEFLAG_CI_ECMMINE_DONE, 0x0187, 0x3f)
 	endlist
 };
 
@@ -2848,7 +2848,7 @@ u8 func1012_cloak_doorproxy[] = {
 u8 func101b_ir_door[] = {
 	beginloop(0x04)
 		if_stage_flag_eq(STAGEFLAG_TRIGGER_IR, TRUE, /*goto*/ 0x06)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_IR_DONE, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_IR_DONE, /*goto*/ 0x2f)
 		label(0x06)
 		reloop(0x04)
 
@@ -2878,8 +2878,8 @@ u8 func042b_init_carrington[] = {
 	set_self_chrflag(CHRCFLAG_UNEXPLODABLE)
 	yield
 	set_morale(0)
-	if_eeprom_flag_is_unset(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
-	set_eeprom_flag(EEPROMFLAG_CI_TOUR_DONE)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
+	set_savefile_flag(SAVEFILEFLAG_CI_TOUR_DONE)
 	dprint 'E','E','P','R','O','M',' ','S','E','T',0,
 
 	beginloop(0x08)
@@ -2891,7 +2891,7 @@ u8 func042b_init_carrington[] = {
 
 	label(0x06)
 	dprint 'E','E','P','R','O','M',' ','N','O','T','S','E','T',0,
-	if_eeprom_flag_is_unset(EEPROMFLAG_CI_TOUR_DONE, /*goto*/ 0x8f)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_CI_TOUR_DONE, /*goto*/ 0x8f)
 	goto_first(0x08)
 
 	beginloop(0x8f)
@@ -2907,7 +2907,7 @@ u8 func042b_init_carrington[] = {
 u8 func1019_setup_carrington[] = {
 	beginloop(0x04)
 		if_chr_has_hiddenflag(CHR_CARRINGTON, CHRHFLAG_10000000, /*goto*/ 0x06)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x2f)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x2f)
 	endloop(0x04)
 
 	label(0x06)
@@ -2948,7 +2948,7 @@ u8 func042c_carrington_tour[] = {
 
 	label(0x06)
 	set_chr_hiddenflag(CHR_SELF, CHRHFLAG_10000000)
-	set_eeprom_flag(EEPROMFLAG_CI_TOUR_STARTED)
+	set_savefile_flag(SAVEFILEFLAG_CI_TOUR_STARTED)
 	do_special_animation(-1)
 	remove_displayed_text
 	speak(CHR_TARGET, 0x1c42, 0x8029, CHANNEL_6, COLOR_06_WHITE) // "Joanna, it's good to see you."
@@ -3189,7 +3189,7 @@ u8 func042c_carrington_tour[] = {
 	endloop(0x7a)
 
 	label(0x2f)
-	set_eeprom_flag(EEPROMFLAG_CI_TOUR_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_TOUR_DONE)
 	walk_to_pad(PAD_CARRINGTON_OFFICE)
 
 	beginloop(0x76)
@@ -3264,11 +3264,11 @@ u8 func042e_devicegirl_reply_to_carrington[] = {
 };
 
 u8 func1013_msg_hovercrate[] = {
-	if_eeprom_flag_is_unset(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
 	beginloop(0x04)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
 		if_chr_distance_to_pad_lt(CHR_BOND, 250, 0x0141, /*goto*/ 0x2f)
 	endloop(0x04)
 
@@ -3292,11 +3292,11 @@ u8 func1013_msg_hovercrate[] = {
 };
 
 u8 func1014_msg_hoverbike[] = {
-	if_eeprom_flag_is_unset(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
 	beginloop(0x04)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
 		if_chr_distance_to_pad_lt(CHR_BOND, 250, 0x01f9, /*goto*/ 0x2f)
 	endloop(0x04)
 
@@ -3320,11 +3320,11 @@ u8 func1014_msg_hoverbike[] = {
 };
 
 u8 func1015_msg_doors[] = {
-	if_eeprom_flag_is_unset(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
 	beginloop(0x04)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
 	endloop(0x04)
 
 	label(0x06)
@@ -3347,11 +3347,11 @@ u8 func1015_msg_doors[] = {
 };
 
 u8 func1016_msg_elevators[] = {
-	if_eeprom_flag_is_unset(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
 	beginloop(0x04)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
 		if_chr_distance_to_pad_lt(CHR_BOND, 250, 0x0160, /*goto*/ 0x2f)
 		if_chr_distance_to_pad_lt(CHR_BOND, 250, 0x0162, /*goto*/ 0x2f)
 	endloop(0x04)
@@ -3365,11 +3365,11 @@ u8 func1016_msg_elevators[] = {
 };
 
 u8 func1017_msg_terminals[] = {
-	if_eeprom_flag_is_unset(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
+	if_savefile_flag_is_unset(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x04)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
 	beginloop(0x04)
-		if_eeprom_flag_is_set(EEPROMFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
+		if_savefile_flag_is_set(SAVEFILEFLAG_CI_TOUR_STARTED, /*goto*/ 0x06)
 		if_chr_distance_to_pad_lt(CHR_BOND, 250, 0x0227, /*goto*/ 0x2f)
 		if_chr_distance_to_pad_lt(CHR_BOND, 250, 0x022a, /*goto*/ 0x2f)
 		if_chr_distance_to_pad_lt(CHR_BOND, 250, 0x021c, /*goto*/ 0x2f)
@@ -3504,7 +3504,7 @@ u8 func101c_holo1_main[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_HOLO1_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_HOLO1_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
 	yield
@@ -3850,7 +3850,7 @@ u8 func1022_holo2_main[] = {
 	goto_next(0x90)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_HOLO2_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_HOLO2_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
 	yield
@@ -4158,7 +4158,7 @@ u8 func1027_holo3_main[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_HOLO3_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_HOLO3_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
 	yield
@@ -4398,7 +4398,7 @@ u8 func1028_holo4_main[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_HOLO4_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_HOLO4_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
 	yield
@@ -4641,7 +4641,7 @@ u8 func1029_holo5_main[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_HOLO5_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_HOLO5_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
 	yield
@@ -4999,7 +4999,7 @@ u8 func102e_holo6_main[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_HOLO6_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_HOLO6_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
 	yield
@@ -5414,7 +5414,7 @@ u8 func1030_holo7_main[] = {
 	goto_next(0x84)
 
 	label(0x83)
-	set_eeprom_flag(EEPROMFLAG_CI_HOLO7_DONE)
+	set_savefile_flag(SAVEFILEFLAG_CI_HOLO7_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
 	yield
diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c
index 1d97db81c..e989ae8a3 100644
--- a/src/files/setup/setupimp.c
+++ b/src/files/setup/setupimp.c
@@ -3575,7 +3575,7 @@ u8 func042a_init_jonathan[] = {
 
 u8 func1021_setup_jonathan[] = {
 	yield
-	if_eeprom_flag_is_set(EEPROMFLAG_DEFENSE_JON, /*goto*/ 0x08)
+	if_savefile_flag_is_set(SAVEFILEFLAG_DEFENSE_JON, /*goto*/ 0x08)
 	remove_chr(CHR_JONATHAN)
 	label(0x08)
 	set_ailist(CHR_SELF, GFUNC_IDLE)
diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c
index 4e5556a55..7dea4cc14 100644
--- a/src/files/setup/setuplip.c
+++ b/src/files/setup/setuplip.c
@@ -4231,7 +4231,7 @@ u8 func1027_check_disguise_worn[] = {
 };
 
 u8 func1028_toggle_mechanic[] = {
-	if_eeprom_flag_is_set(EEPROMFLAG_RESCUE_MECHANIC_DEAD, /*goto*/ 0x06)
+	if_savefile_flag_is_set(SAVEFILEFLAG_RESCUE_MECHANIC_DEAD, /*goto*/ 0x06)
 	dprint 'K','E','E','P',' ','M','E','C','H','\n',0,
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 
diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c
index dda179d5a..28519d285 100644
--- a/src/files/setup/setuplue.c
+++ b/src/files/setup/setuplue.c
@@ -2804,14 +2804,14 @@ u8 func141f_start_lifts[] = {
 
 u8 func101a_check_mechanic_dead[] = {
 	yield
-	unset_eeprom_flag(EEPROMFLAG_RESCUE_MECHANIC_DEAD)
+	unset_savefile_flag(SAVEFILEFLAG_RESCUE_MECHANIC_DEAD)
 
 	beginloop(0x04)
 		if_chr_dying(CHR_MECHANIC, /*goto*/ 0x2e)
 	endloop(0x04)
 
 	label(0x2e)
-	set_eeprom_flag(EEPROMFLAG_RESCUE_MECHANIC_DEAD)
+	set_savefile_flag(SAVEFILEFLAG_RESCUE_MECHANIC_DEAD)
 	dprint 'D','E','L','E','T','E',' ','M','E','C','H','\n',0,
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 	endlist
diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c
index 5f213075f..b59a86d61 100644
--- a/src/files/setup/setuppete.c
+++ b/src/files/setup/setuppete.c
@@ -767,10 +767,10 @@ u8 func100f_check_mine[] = {
 	endloop(0x05)
 
 	label(0x08)
-	unset_eeprom_flag(EEPROMFLAG_G5_MINE)
+	unset_savefile_flag(SAVEFILEFLAG_G5_MINE)
 	goto_next(0x03)
 	label(0x06)
-	set_eeprom_flag(EEPROMFLAG_G5_MINE)
+	set_savefile_flag(SAVEFILEFLAG_G5_MINE)
 
 	label(0x03)
 	set_stage_flag(STAGEFLAG_MINE_PLACED)
diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c
index bf8a1cd47..b9b7b2151 100644
--- a/src/files/setup/setuprit.c
+++ b/src/files/setup/setuprit.c
@@ -2117,7 +2117,7 @@ u8 func1002_intro[] = {
 	if_chr_death_animation_finished(CHR_COOP, /*goto*/ 0x2d)
 	set_chr_hiddenflag(CHR_COOP, CHRHFLAG_DISGUISED)
 	label(0x2d)
-	if_eeprom_flag_is_set(EEPROMFLAG_AF1_ENTRY, /*goto*/ 0x06)
+	if_savefile_flag_is_set(SAVEFILEFLAG_AF1_ENTRY, /*goto*/ 0x06)
 	goto_next(0x7e)
 	label(0x06)
 	camera_movement(0x01d0)
@@ -2168,7 +2168,7 @@ u8 func1002_intro[] = {
 	unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
 	unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
 	set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000)
-	if_eeprom_flag_is_set(EEPROMFLAG_AF1_ENTRY, /*goto*/ 0x06)
+	if_savefile_flag_is_set(SAVEFILEFLAG_AF1_ENTRY, /*goto*/ 0x06)
 	set_chr_hiddenflag(CHR_BOND, CHRHFLAG_TRIGGER_BUDDY_WARP)
 	chr_do_animation(0x01d3, -2, -1, 0x06, 0x00, CHR_BOND, 2)
 	goto_next(0x2d)
@@ -3671,7 +3671,7 @@ u8 func101a_equipment_switch[] = {
 };
 
 u8 func101b_hoverbike_switch[] = {
-	unset_eeprom_flag(EEPROMFLAG_CRASHSITE_BIKE)
+	unset_savefile_flag(SAVEFILEFLAG_CRASHSITE_BIKE)
 	set_object_flag_bank0(0x1f, OBJECTFLAG0_DEACTIVATED)
 	set_object_image(OBJ_HOVERBIKE_SWITCH, 0x00, 0x12)
 	label(0x08)
@@ -3703,7 +3703,7 @@ u8 func101b_hoverbike_switch[] = {
 	label(0x2d)
 	set_object_image(OBJ_HOVERBIKE_SWITCH, 0x00, 0x13)
 	message(CHR_P1P2, 0x363c) // "Cargo bay has been lowered."
-	set_eeprom_flag(EEPROMFLAG_CRASHSITE_BIKE)
+	set_savefile_flag(SAVEFILEFLAG_CRASHSITE_BIKE)
 	assign_sound(0x043a, CHANNEL_7)
 	control_sound_from_object(CHANNEL_7, OBJ_HOVERBIKE_SWITCH, TRUE)
 	unset_object_flag_bank0(0x1f, OBJECTFLAG0_DEACTIVATED)
diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c
index 105a38806..c162b2d66 100644
--- a/src/files/setup/setuptra.c
+++ b/src/files/setup/setuptra.c
@@ -3077,7 +3077,7 @@ u8 func0c02_outro[] = {
 	revoke_control(CHR_BOND, 4)
 	hide_countdown_timer
 	stop_countdown_timer
-	unset_eeprom_flag(EEPROMFLAG_DEFENSE_JON)
+	unset_savefile_flag(SAVEFILEFLAG_DEFENSE_JON)
 	end_level
 	set_ailist(CHR_SELF, GFUNC_IDLE)
 	endlist
@@ -3146,7 +3146,7 @@ u8 func1021_jo_escaping[] = {
 	hide_countdown_timer
 	stop_countdown_timer
 	label(0x62)
-	set_eeprom_flag(EEPROMFLAG_DEFENSE_JON)
+	set_savefile_flag(SAVEFILEFLAG_DEFENSE_JON)
 	set_music_track(MUSIC_ESCAPE_OUTRO_LONG)
 	camera_movement(0x02d4)
 	set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
diff --git a/src/game/cheats.c b/src/game/cheats.c
index b96aff038..93bfdc178 100644
--- a/src/game/cheats.c
+++ b/src/game/cheats.c
@@ -40,7 +40,7 @@ u32 cheatIsUnlocked(s32 cheat_id)
 		}
 	}
 
-	if ((cheat->flags & CHEATFLAG_TRANSFERPAK) && eepromGet(EEPROMFLAG_USED_TRANSFERPAK)) {
+	if ((cheat->flags & CHEATFLAG_TRANSFERPAK) && savefileHasFlag(SAVEFILEFLAG_USED_TRANSFERPAK)) {
 		unlocked++;
 	}
 
@@ -425,7 +425,7 @@ glabel cheatMenuHandleDialog
 /*  f1079b8:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f1079bc:	10400003 */ 	beqz	$v0,.L0f1079cc
 /*  f1079c0:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f1079c4:	0fc43c4f */ 	jal	eepromSet
+/*  f1079c4:	0fc43c4f */ 	jal	savefileSetFlag
 /*  f1079c8:	24040023 */ 	addiu	$a0,$zero,0x23
 .L0f1079cc:
 /*  f1079cc:	3c067000 */ 	lui	$a2,0x7000
@@ -466,7 +466,7 @@ glabel cheatMenuHandleDialog
 /*  f107a48:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f107a4c:	10400003 */ 	beqz	$v0,.L0f107a5c
 /*  f107a50:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f107a54:	0fc43c4f */ 	jal	eepromSet
+/*  f107a54:	0fc43c4f */ 	jal	savefileSetFlag
 /*  f107a58:	24040023 */ 	addiu	$a0,$zero,0x23
 .L0f107a5c:
 /*  f107a5c:	0fc52958 */ 	jal	func0f14a560
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 8df7d5edf..2a71333dd 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -12560,10 +12560,10 @@ glabel aiIfObjectDistanceToPadLessThan
 /**
  * @cmd 0190
  */
-bool aiEepromSet(void)
+bool aiSetSavefileFlag(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
-	eepromSet(cmd[2]);
+	savefileSetFlag(cmd[2]);
 	g_Vars.aioffset += 3;
 
 	return false;
@@ -12572,10 +12572,10 @@ bool aiEepromSet(void)
 /**
  * @cmd 0191
  */
-bool aiEepromUnset(void)
+bool aiUnsetSavefileFlag(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
-	eepromUnset(cmd[2]);
+	savefileUnsetFlag(cmd[2]);
 	g_Vars.aioffset += 3;
 
 	return false;
@@ -12584,11 +12584,11 @@ bool aiEepromUnset(void)
 /**
  * @cmd 0192
  */
-bool aiIfEepromSet(void)
+bool aiIfSavefileFlagIsSet(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 
-	if (eepromGet(cmd[2])) {
+	if (savefileHasFlag(cmd[2])) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
 	} else {
 		g_Vars.aioffset += 4;
@@ -12600,11 +12600,11 @@ bool aiIfEepromSet(void)
 /**
  * @cmd 0193
  */
-bool aiIfEepromUnset(void)
+bool aiIfSavefileFlagIsUnset(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 
-	if (!eepromGet(cmd[2])) {
+	if (!savefileHasFlag(cmd[2])) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
 	} else {
 		g_Vars.aioffset += 4;
diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c
index 4e461f804..b489a3cbf 100644
--- a/src/game/game_10ccd0.c
+++ b/src/game/game_10ccd0.c
@@ -2707,19 +2707,19 @@ glabel func0f10ef10
 /*  f10f138:	24422214 */ 	addiu	$v0,$v0,0x2214
 );
 
-void eepromSet(u32 value)
+void savefileSetFlag(u32 value)
 {
-	func0f11e530(value, &g_SoloSaveFile.eepromflags, true);
+	func0f11e530(value, &g_SoloSaveFile.flags, true);
 }
 
-void eepromUnset(u32 value)
+void savefileUnsetFlag(u32 value)
 {
-	func0f11e530(value, &g_SoloSaveFile.eepromflags, false);
+	func0f11e530(value, &g_SoloSaveFile.flags, false);
 }
 
-u32 eepromGet(u32 value)
+u32 savefileHasFlag(u32 value)
 {
-	return func0f11e584(value, &g_SoloSaveFile.eepromflags);
+	return func0f11e584(value, &g_SoloSaveFile.flags);
 }
 
 GLOBAL_ASM(
diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c
index e1fed8b34..587d1203a 100644
--- a/src/game/game_19c990.c
+++ b/src/game/game_19c990.c
@@ -400,7 +400,7 @@ const u32 var7f1b97cc[] = {0x4019999a};
 
 bool ciIsTourDone(void)
 {
-	return eepromGet(EEPROMFLAG_CI_TOUR_DONE);
+	return savefileHasFlag(SAVEFILEFLAG_CI_TOUR_DONE);
 }
 
 u8 ciGetFiringRangeScore(s32 weapon_id)
@@ -6398,7 +6398,7 @@ glabel func0f1a1c98
 .L0f1a1cdc:
 /*  f1a1cdc:	04a00005 */ 	bltz	$a1,.L0f1a1cf4
 /*  f1a1ce0:	00454021 */ 	addu	$t0,$v0,$a1
-/*  f1a1ce4:	0fc43c63 */ 	jal	eepromGet
+/*  f1a1ce4:	0fc43c63 */ 	jal	savefileHasFlag
 /*  f1a1ce8:	91040000 */ 	lbu	$a0,0x0($t0)
 /*  f1a1cec:	50400004 */ 	beqzl	$v0,.L0f1a1d00
 /*  f1a1cf0:	00001025 */ 	or	$v0,$zero,$zero
diff --git a/src/include/commands.h b/src/include/commands.h
index 765643d65..90bed1379 100644
--- a/src/include/commands.h
+++ b/src/include/commands.h
@@ -2022,22 +2022,22 @@
 	mkshort(pad), \
 	label,
 
-#define set_eeprom_flag(eeprom_flag) \
+#define set_savefile_flag(flag) \
 	mkshort(0x0190), \
-	eeprom_flag,
+	flag,
 
-#define unset_eeprom_flag(eeprom_flag) \
+#define unset_savefile_flag(flag) \
 	mkshort(0x0191), \
-	eeprom_flag,
+	flag,
 
-#define if_eeprom_flag_is_set(eeprom_flag, label) \
+#define if_savefile_flag_is_set(flag, label) \
 	mkshort(0x0192), \
-	eeprom_flag, \
+	flag, \
 	label,
 
-#define if_eeprom_flag_is_unset(eeprom_flag, label) \
+#define if_savefile_flag_is_unset(flag, label) \
 	mkshort(0x0193), \
-	eeprom_flag, \
+	flag, \
 	label,
 
 #define if_object_health_lt(object, value, label) \
diff --git a/src/include/constants.h b/src/include/constants.h
index b7c4dae85..01859f413 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -342,32 +342,6 @@
 
 #define DRCAROLLIMAGE_DEAD 4
 
-#define EEPROMFLAG_USED_TRANSFERPAK     0x23
-#define EEPROMFLAG_CI_TOUR_DONE         0x24
-#define EEPROMFLAG_CI_HOLO7_DONE        0x29
-#define EEPROMFLAG_CI_HOLO6_DONE        0x2a
-#define EEPROMFLAG_CI_HOLO5_DONE        0x2b
-#define EEPROMFLAG_CI_HOLO4_DONE        0x2c
-#define EEPROMFLAG_CI_HOLO3_DONE        0x2d
-#define EEPROMFLAG_CI_HOLO2_DONE        0x2e
-#define EEPROMFLAG_CI_HOLO1_DONE        0x2f
-#define EEPROMFLAG_CI_CLOAK_DONE        0x30
-#define EEPROMFLAG_CI_DISGUISE_DONE     0x31
-#define EEPROMFLAG_CI_XRAY_DONE         0x32
-#define EEPROMFLAG_CI_IR_DONE           0x33
-#define EEPROMFLAG_CI_RTRACKER_DONE     0x34
-#define EEPROMFLAG_CI_DOORDECODER_DONE  0x35
-#define EEPROMFLAG_CI_NIGHTVISION_DONE  0x36
-#define EEPROMFLAG_CI_CAMSPY_DONE       0x37
-#define EEPROMFLAG_CI_ECMMINE_DONE      0x38
-#define EEPROMFLAG_CI_UPLINK_DONE       0x39
-#define EEPROMFLAG_CI_TOUR_STARTED      0x3a
-#define EEPROMFLAG_CRASHSITE_BIKE       0x3b
-#define EEPROMFLAG_DEFENSE_JON          0x3c
-#define EEPROMFLAG_AF1_ENTRY            0x3d
-#define EEPROMFLAG_RESCUE_MECHANIC_DEAD 0x3e
-#define EEPROMFLAG_G5_MINE              0x3f // true if thrown on top door
-
 #define ENTITYTYPE_CHR       0x0004
 #define ENTITYTYPE_PAD       0x0008
 #define ENTITYTYPE_DIRECTION 0x0010
@@ -720,6 +694,32 @@
 #define RACE_ROBOT    3
 #define RACE_4        4
 
+#define SAVEFILEFLAG_USED_TRANSFERPAK     0x23
+#define SAVEFILEFLAG_CI_TOUR_DONE         0x24
+#define SAVEFILEFLAG_CI_HOLO7_DONE        0x29
+#define SAVEFILEFLAG_CI_HOLO6_DONE        0x2a
+#define SAVEFILEFLAG_CI_HOLO5_DONE        0x2b
+#define SAVEFILEFLAG_CI_HOLO4_DONE        0x2c
+#define SAVEFILEFLAG_CI_HOLO3_DONE        0x2d
+#define SAVEFILEFLAG_CI_HOLO2_DONE        0x2e
+#define SAVEFILEFLAG_CI_HOLO1_DONE        0x2f
+#define SAVEFILEFLAG_CI_CLOAK_DONE        0x30
+#define SAVEFILEFLAG_CI_DISGUISE_DONE     0x31
+#define SAVEFILEFLAG_CI_XRAY_DONE         0x32
+#define SAVEFILEFLAG_CI_IR_DONE           0x33
+#define SAVEFILEFLAG_CI_RTRACKER_DONE     0x34
+#define SAVEFILEFLAG_CI_DOORDECODER_DONE  0x35
+#define SAVEFILEFLAG_CI_NIGHTVISION_DONE  0x36
+#define SAVEFILEFLAG_CI_CAMSPY_DONE       0x37
+#define SAVEFILEFLAG_CI_ECMMINE_DONE      0x38
+#define SAVEFILEFLAG_CI_UPLINK_DONE       0x39
+#define SAVEFILEFLAG_CI_TOUR_STARTED      0x3a
+#define SAVEFILEFLAG_CRASHSITE_BIKE       0x3b
+#define SAVEFILEFLAG_DEFENSE_JON          0x3c
+#define SAVEFILEFLAG_AF1_ENTRY            0x3d
+#define SAVEFILEFLAG_RESCUE_MECHANIC_DEAD 0x3e
+#define SAVEFILEFLAG_G5_MINE              0x3f // true if thrown on top door
+
 #define SPEED_WALK 0
 #define SPEED_JOG  1
 #define SPEED_RUN  2
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index 24e787004..29ba6b67d 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -377,10 +377,10 @@
 /*0x018d*/ bool aiActivateLift(void);
 /*0x018e*/ bool aiMiniSkedarTryPounce(void);
 /*0x018f*/ bool aiIfObjectDistanceToPadLessThan(void);
-/*0x0190*/ bool aiEepromSet(void);
-/*0x0191*/ bool aiEepromUnset(void);
-/*0x0192*/ bool aiIfEepromSet(void);
-/*0x0193*/ bool aiIfEepromUnset(void);
+/*0x0190*/ bool aiSetSavefileFlag(void);
+/*0x0191*/ bool aiUnsetSavefileFlag(void);
+/*0x0192*/ bool aiIfSavefileFlagIsSet(void);
+/*0x0193*/ bool aiIfSavefileFlagIsUnset(void);
 /*0x019e*/ bool aiIfObjHealthLessThan(void);
 /*0x019f*/ bool aiSetObjHealth(void);
 /*0x01a0*/ bool aiSetChrSpecialDeathAnimation(void);
diff --git a/src/include/game/game_10ccd0.h b/src/include/game/game_10ccd0.h
index 8e56c271f..45bbb4fc0 100644
--- a/src/include/game/game_10ccd0.h
+++ b/src/include/game/game_10ccd0.h
@@ -3,9 +3,9 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 eepromGet(u32 value);
-void eepromSet(u32 value);
-void eepromUnset(u32 value);
+u32 savefileHasFlag(u32 value);
+void savefileSetFlag(u32 value);
+void savefileUnsetFlag(u32 value);
 u32 func0f10ce74(void);
 u32 func0f10cf2c(void);
 u32 func0f10d044(void);
diff --git a/src/include/types.h b/src/include/types.h
index e839d9604..2912c39fe 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -3913,7 +3913,7 @@ struct savefile_solo {
 	/*0x08*/ u32 unk08;
 	/*0x0c*/ u32 unk0c;
 	/*0x10*/ u32 unk10;
-	/*0x14*/ u32 eepromflags;
+	/*0x14*/ u32 flags;
 	/*0x18*/ u32 unk18;
 	/*0x1c*/ u32 unk1c;
 	/*0x20*/ u16 besttimes[21][3];
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index 64db3ad61..1816f01f3 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -14533,10 +14533,10 @@ bool (*g_CommandPointers[])(void) = {
 	/*0x018d*/ aiActivateLift,
 	/*0x018e*/ aiMiniSkedarTryPounce,
 	/*0x018f*/ aiIfObjectDistanceToPadLessThan,
-	/*0x0190*/ aiEepromSet,
-	/*0x0191*/ aiEepromUnset,
-	/*0x0192*/ aiIfEepromSet,
-	/*0x0193*/ aiIfEepromUnset,
+	/*0x0190*/ aiSetSavefileFlag,
+	/*0x0191*/ aiUnsetSavefileFlag,
+	/*0x0192*/ aiIfSavefileFlagIsSet,
+	/*0x0193*/ aiIfSavefileFlagIsUnset,
 	/*0x0194*/ NULL,
 	/*0x0195*/ NULL,
 	/*0x0196*/ NULL,