event_data.c

45 files changed, 296 insertions, 454 deletions

diff --git a/asm/clock.s b/asm/clock.s
index 5cf6f537e..bf8021dad 100644
--- a/asm/clock.s
+++ b/asm/clock.s
@@ -72,7 +72,7 @@ sub_806A390: @ 806A390
 	subs r4, r0
 	lsls r4, 16
 	lsrs r4, 16
-	bl sub_80690B4
+	bl ClearUpperFlags
 	adds r0, r4, 0
 	bl sub_80FA220
 	adds r0, r4, 0
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index e98a76c8c..a0e80e057 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -11563,7 +11563,7 @@ _080EB9C4: .4byte 0x0000ffff
 	thumb_func_start sub_80EB9C8
 sub_80EB9C8: @ 80EB9C8
 	push {lr}
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
diff --git a/asm/rom_8065394.s b/asm/field_control_avatar.s
index 121592be8..45cb6b521 100644
--- a/asm/rom_8065394.s
+++ b/asm/field_control_avatar.s
@@ -2270,248 +2270,4 @@ sub_8068FEC: @ 8068FEC
 _0806902C: .4byte gMapHeader
 	thumb_func_end sub_8068FEC
 
-	thumb_func_start sub_8069030
-sub_8069030: @ 8069030
-	push {r4,lr}
-	ldr r4, _08069064 @ =gSaveBlock1 + 0x1220
-	movs r2, 0x90
-	lsls r2, 1
-	adds r0, r4, 0
-	movs r1, 0
-	bl memset
-	movs r0, 0x90
-	lsls r0, 1
-	adds r4, r0
-	movs r2, 0x80
-	lsls r2, 2
-	adds r0, r4, 0
-	movs r1, 0
-	bl memset
-	ldr r0, _08069068 @ =gUnknown_0202E8E2
-	movs r1, 0
-	movs r2, 0x10
-	bl memset
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069064: .4byte gSaveBlock1 + 0x1220
-_08069068: .4byte gUnknown_0202E8E2
-	thumb_func_end sub_8069030
-
-	thumb_func_start sub_806906C
-sub_806906C: @ 806906C
-	push {lr}
-	ldr r0, _080690A0 @ =gSaveBlock1 + 0x1220
-	movs r1, 0
-	str r1, [r0]
-	movs r1, 0x90
-	lsls r1, 1
-	adds r0, r1
-	movs r1, 0
-	movs r2, 0x20
-	bl memset
-	ldr r0, _080690A4 @ =0x0000084d
-	bl FlagReset
-	ldr r0, _080690A8 @ =0x0000084e
-	bl FlagReset
-	ldr r0, _080690AC @ =0x00000829
-	bl FlagReset
-	ldr r0, _080690B0 @ =0x00000861
-	bl FlagReset
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080690A0: .4byte gSaveBlock1 + 0x1220
-_080690A4: .4byte 0x0000084d
-_080690A8: .4byte 0x0000084e
-_080690AC: .4byte 0x00000829
-_080690B0: .4byte 0x00000861
-	thumb_func_end sub_806906C
-
-	thumb_func_start sub_80690B4
-sub_80690B4: @ 80690B4
-	push {lr}
-	ldr r0, _080690C4 @ =gSaveBlock1 + 0x1338
-	movs r1, 0
-	movs r2, 0x8
-	bl memset
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080690C4: .4byte gSaveBlock1 + 0x1338
-	thumb_func_end sub_80690B4
-
-	thumb_func_start LockNationalPokedex
-LockNationalPokedex: @ 80690C8
-	push {lr}
-	ldr r0, _080690E4 @ =0x00004046
-	bl GetVarPointer
-	ldr r2, _080690E8 @ =gSaveBlock2
-	movs r1, 0
-	strb r1, [r2, 0x1A]
-	strh r1, [r0]
-	ldr r0, _080690EC @ =0x00000836
-	bl FlagReset
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080690E4: .4byte 0x00004046
-_080690E8: .4byte gSaveBlock2
-_080690EC: .4byte 0x00000836
-	thumb_func_end LockNationalPokedex
-
-	thumb_func_start UnlockNationalPokedex
-UnlockNationalPokedex: @ 80690F0
-	push {r4,r5,lr}
-	ldr r0, _0806911C @ =0x00004046
-	bl GetVarPointer
-	ldr r4, _08069120 @ =gSaveBlock2
-	movs r5, 0
-	movs r1, 0xDA
-	strb r1, [r4, 0x1A]
-	ldr r2, _08069124 @ =0x00000302
-	adds r1, r2, 0
-	strh r1, [r0]
-	ldr r0, _08069128 @ =0x00000836
-	bl FlagSet
-	movs r0, 0x1
-	strb r0, [r4, 0x19]
-	strb r5, [r4, 0x18]
-	bl sub_808C0A0
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806911C: .4byte 0x00004046
-_08069120: .4byte gSaveBlock2
-_08069124: .4byte 0x00000302
-_08069128: .4byte 0x00000836
-	thumb_func_end UnlockNationalPokedex
-
-	thumb_func_start IsNationalPokedex
-IsNationalPokedex: @ 806912C
-	push {lr}
-	ldr r0, _08069154 @ =gSaveBlock2
-	ldrb r0, [r0, 0x1A]
-	cmp r0, 0xDA
-	bne _08069164
-	ldr r0, _08069158 @ =0x00004046
-	bl VarGet
-	lsls r0, 16
-	ldr r1, _0806915C @ =0x03020000
-	cmp r0, r1
-	bne _08069164
-	ldr r0, _08069160 @ =0x00000836
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _08069164
-	movs r0, 0x1
-	b _08069166
-	.align 2, 0
-_08069154: .4byte gSaveBlock2
-_08069158: .4byte 0x00004046
-_0806915C: .4byte 0x03020000
-_08069160: .4byte 0x00000836
-_08069164:
-	movs r0, 0
-_08069166:
-	pop {r1}
-	bx r1
-	thumb_func_end IsNationalPokedex
-
-	thumb_func_start unref_sub_806916C
-unref_sub_806916C: @ 806916C
-	push {lr}
-	ldr r0, _08069178 @ =0x0000084c
-	bl FlagReset
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069178: .4byte 0x0000084c
-	thumb_func_end unref_sub_806916C
-
-	thumb_func_start unref_sub_806917C
-unref_sub_806917C: @ 806917C
-	push {lr}
-	ldr r0, _08069188 @ =0x0000084c
-	bl FlagSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069188: .4byte 0x0000084c
-	thumb_func_end unref_sub_806917C
-
-	thumb_func_start IsMysteryGiftAvailable
-IsMysteryGiftAvailable: @ 806918C
-	push {lr}
-	ldr r0, _0806919C @ =0x0000084c
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0806919C: .4byte 0x0000084c
-	thumb_func_end IsMysteryGiftAvailable
-
-	thumb_func_start sub_80691A0
-sub_80691A0: @ 80691A0
-	push {lr}
-	ldr r0, _080691B4 @ =0x0000402c
-	movs r1, 0
-	bl VarSet
-	ldr r0, _080691B8 @ =0x00000862
-	bl FlagReset
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080691B4: .4byte 0x0000402c
-_080691B8: .4byte 0x00000862
-	thumb_func_end sub_80691A0
-
-	thumb_func_start sub_80691BC
-sub_80691BC: @ 80691BC
-	push {lr}
-	ldr r0, _080691D4 @ =0x0000402c
-	movs r1, 0x92
-	lsls r1, 4
-	bl VarSet
-	ldr r0, _080691D8 @ =0x00000862
-	bl FlagSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080691D4: .4byte 0x0000402c
-_080691D8: .4byte 0x00000862
-	thumb_func_end sub_80691BC
-
-	thumb_func_start sub_80691DC
-sub_80691DC: @ 80691DC
-	push {lr}
-	ldr r0, _08069200 @ =0x00000862
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _08069208
-	ldr r0, _08069204 @ =0x0000402c
-	bl VarGet
-	lsls r0, 16
-	movs r1, 0x92
-	lsls r1, 20
-	cmp r0, r1
-	bne _08069208
-	movs r0, 0x1
-	b _0806920A
-	.align 2, 0
-_08069200: .4byte 0x00000862
-_08069204: .4byte 0x0000402c
-_08069208:
-	movs r0, 0
-_0806920A:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80691DC
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index 035f65d78..f3ba5c831 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -527,7 +527,7 @@ sub_8126524: @ 8126524
 sub_812658C: @ 812658C
 	push {r4,lr}
 	adds r4, r0, 0
-	bl UnlockNationalPokedex
+	bl EnableNationalPokedex
 	ldr r0, _081265A8 @ =gStringVar4
 	ldr r1, _081265AC @ =gOtherText_DexUpgraded
 	bl StringExpandPlaceholders
@@ -739,7 +739,7 @@ _08126750: .4byte gOtherText_NewTrainerInHoenn
 sub_8126754: @ 8126754
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80691BC
+	bl EnableResetRTC
 	ldr r0, _08126770 @ =gStringVar4
 	ldr r1, _08126774 @ =gSystemText_ClockAdjustmentUsable
 	bl StringExpandPlaceholders
diff --git a/asm/pokedex.s b/asm/pokedex.s
index fe069bcf8..7d1056231 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -158,7 +158,7 @@ _080908A0:
 	movs r2, 0
 	movs r3, 0xD0
 	bl sub_8072BD8
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	cmp r0, 0
 	bne _080908CC
 	adds r0, r6, 0
@@ -3018,7 +3018,7 @@ _08091EA6:
 	movs r1, 0x1
 	movs r2, 0x7E
 	bl LoadPalette
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	cmp r0, 0
 	bne _08091F10
 	movs r4, 0
@@ -3377,7 +3377,7 @@ sub_80921B0: @ 80921B0
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	beq _080921E4
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	ldr r6, _080921DC @ =gUnknown_083B586C
 	cmp r0, 0
 	bne _080921F0
@@ -3388,7 +3388,7 @@ _080921D8: .4byte gTasks
 _080921DC: .4byte gUnknown_083B586C
 _080921E0: .4byte gUnknown_083B58A4
 _080921E4:
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	ldr r6, _0809221C @ =gUnknown_083B5850
 	cmp r0, 0
 	bne _080921F0
@@ -3458,7 +3458,7 @@ _08092230:
 	bl sub_8092E10
 	ldr r4, _080922C8 @ =gSaveBlock2
 	strb r0, [r4, 0x19]
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	cmp r0, 0
 	bne _08092288
 	movs r0, 0
@@ -4269,7 +4269,7 @@ _08092904:
 	.align 2, 0
 _08092910: .4byte gUnknown_083B57FC
 _08092914:
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	cmp r0, 0
 	bne _08092940
 	ldr r2, _0809293C @ =gUnknown_083B57FC
@@ -4647,7 +4647,7 @@ sub_8092B68: @ 8092B68
 	movs r2, 0x40
 	movs r3, 0x1
 	bl MenuPrint_PixelCoords
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	cmp r0, 0
 	beq _08092C5E
 	ldrh r0, [r6, 0xE]
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index d647a7fc6..45652a840 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -1914,7 +1914,7 @@ SpeciesToPokedexNum: @ 80406D8
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	cmp r0, 0
 	beq _080406F2
 	adds r0, r4, 0
diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s
index 082ebf465..d80d374f1 100644
--- a/asm/reset_rtc_screen.s
+++ b/asm/reset_rtc_screen.s
@@ -1225,7 +1225,7 @@ _0806AE08:
 	ldr r0, _0806AE54 @ =0x00004040
 	ldrh r1, [r4]
 	bl VarSet
-	bl sub_80691A0
+	bl DisableResetRTC
 	ldr r0, _0806AE58 @ =gSystemText_ClockResetDataSave
 	bl ResetRtcScreen_ShowMessage
 	movs r0, 0x4
diff --git a/asm/rom_8080874.s b/asm/rom_8080874.s
index d4a6414fb..ac50b3fc5 100644
--- a/asm/rom_8080874.s
+++ b/asm/rom_8080874.s
@@ -6,8 +6,8 @@
 
 	.text
 
-	thumb_func_start palette_bg_faded_fill_black
-palette_bg_faded_fill_black: @ 8080874
+	thumb_func_start palette_bg_fill_white
+palette_bg_fill_white: @ 8080874
 	push {lr}
 	sub sp, 0x4
 	ldr r0, _0808088C @ =0x7fff7fff
@@ -23,10 +23,10 @@ palette_bg_faded_fill_black: @ 8080874
 _0808088C: .4byte 0x7fff7fff
 _08080890: .4byte gPlttBufferFaded
 _08080894: .4byte 0x01000100
-	thumb_func_end palette_bg_faded_fill_black
+	thumb_func_end palette_bg_fill_white
 
-	thumb_func_start palette_bg_faded_fill_white
-palette_bg_faded_fill_white: @ 8080898
+	thumb_func_start palette_bg_fill_black
+palette_bg_fill_black: @ 8080898
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -41,10 +41,10 @@ palette_bg_faded_fill_white: @ 8080898
 	.align 2, 0
 _080808B0: .4byte gPlttBufferFaded
 _080808B4: .4byte 0x01000100
-	thumb_func_end palette_bg_faded_fill_white
+	thumb_func_end palette_bg_fill_black
 
-	thumb_func_start pal_fill_for_maplights
-pal_fill_for_maplights: @ 80808B8
+	thumb_func_start pal_fill_for_map_transition
+pal_fill_for_map_transition: @ 80808B8
 	push {r4,lr}
 	bl get_map_light_from_warp0
 	adds r4, r0, 0
@@ -67,18 +67,18 @@ _080808E2:
 	movs r0, 0
 	movs r1, 0
 	bl fade_screen
-	bl palette_bg_faded_fill_white
+	bl palette_bg_fill_black
 	b _080808FC
 _080808F0:
 	movs r0, 0x2
 	movs r1, 0
 	bl fade_screen
-	bl palette_bg_faded_fill_black
+	bl palette_bg_fill_white
 _080808FC:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end pal_fill_for_maplights
+	thumb_func_end pal_fill_for_map_transition
 
 	thumb_func_start pal_fill_black
 pal_fill_black: @ 8080904
@@ -86,13 +86,13 @@ pal_fill_black: @ 8080904
 	movs r0, 0
 	movs r1, 0
 	bl fade_screen
-	bl palette_bg_faded_fill_white
+	bl palette_bg_fill_black
 	pop {r0}
 	bx r0
 	thumb_func_end pal_fill_black
 
-	thumb_func_start sub_8080918
-sub_8080918: @ 8080918
+	thumb_func_start fade_8080918
+fade_8080918: @ 8080918
 	push {r4,lr}
 	bl sav1_map_get_light_level
 	adds r4, r0, 0
@@ -122,7 +122,7 @@ _08080950:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8080918
+	thumb_func_end fade_8080918
 
 	thumb_func_start sub_8080958
 sub_8080958: @ 8080958
@@ -226,7 +226,7 @@ _08080A06:
 	ldrb r0, [r1, 0x4]
 	cmp r0, 0x1
 	beq _08080A36
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 _08080A1C:
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
@@ -250,7 +250,7 @@ sub_8080A3C: @ 8080A3C
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8053E90
-	bl palette_bg_faded_fill_white
+	bl palette_bg_fill_black
 	ldr r0, _08080A58 @ =task_mpl_807DD60
 	movs r1, 0xA
 	bl CreateTask
@@ -293,7 +293,7 @@ _08080A90:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08080ABC
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 _08080A9E:
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
@@ -318,7 +318,7 @@ sub_8080AC4: @ 8080AC4
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8053E90
-	bl palette_bg_faded_fill_white
+	bl palette_bg_fill_black
 	ldr r0, _08080AE0 @ =sub_8080A5C
 	movs r1, 0xA
 	bl CreateTask
@@ -381,7 +381,7 @@ _08080B44: .4byte task_map_chg_seq_0807E20C
 mapldr_default: @ 8080B48
 	push {lr}
 	bl sub_8053E90
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 	bl sub_8080AE4
 	bl ScriptContext2_Enable
 	pop {r0}
@@ -403,7 +403,7 @@ sub_8080B60: @ 8080B60
 sub_8080B78: @ 8080B78
 	push {lr}
 	bl sub_8053E90
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 	movs r0, 0x2E
 	bl PlaySE
 	ldr r0, _08080B98 @ =task_map_chg_seq_0807E2CC
@@ -792,7 +792,7 @@ sub_8080E88: @ 8080E88
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	bl PlayRainSoundEffect
 	movs r0, 0x9
 	bl PlaySE
@@ -815,7 +815,7 @@ sp13E_warp_to_last_warp: @ 8080EC0
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	bl PlayRainSoundEffect
 	ldr r0, _08080EE4 @ =gUnknown_0300485C
 	ldr r1, _08080EE8 @ =mapldr_default
@@ -903,7 +903,7 @@ sub_8080F68: @ 8080F68
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	movs r0, 0x2D
 	bl PlaySE
 	ldr r0, _08080F90 @ =task0A_fade_n_map_maybe
@@ -924,7 +924,7 @@ _08080F98: .4byte sub_8080B78
 sub_8080F9C: @ 8080F9C
 	push {lr}
 	bl ScriptContext2_Enable
-	bl sub_8080918
+	bl fade_8080918
 	ldr r0, _08080FB8 @ =task0A_fade_n_map_maybe
 	movs r1, 0xA
 	bl CreateTask
@@ -999,7 +999,7 @@ sub_808102C: @ 808102C
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	movs r0, 0x9
 	bl PlaySE
 	ldr r0, _0808104C @ =sub_8080FC4
@@ -1304,7 +1304,7 @@ _080812A2:
 	b _080812BC
 _080812A8:
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	bl PlayRainSoundEffect
 	movs r0, 0
 	strh r0, [r5, 0x8]
@@ -1379,7 +1379,7 @@ sub_8081334: @ 8081334
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	bl PlayRainSoundEffect
 	movs r0, 0x9
 	bl PlaySE
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index c0c179a7c..56d991122 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -1756,7 +1756,7 @@ _08086744: .4byte gPaletteFade
 sub_8086748: @ 8086748
 	push {lr}
 	bl sub_8053E90
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r0, _0808676C @ =sub_8086774
@@ -2408,7 +2408,7 @@ _08086C2C: .4byte gSprites
 sub_8086C30: @ 8086C30
 	push {lr}
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8086C30
@@ -2454,7 +2454,7 @@ _08086C90: .4byte sub_8086A68
 sub_8086C94: @ 8086C94
 	push {lr}
 	bl sub_8053E90
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 	bl ScriptContext2_Enable
 	ldr r0, _08086CB4 @ =sub_8086CBC
 	movs r1, 0
@@ -3422,7 +3422,7 @@ sub_80873D8: @ 80873D8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -3473,7 +3473,7 @@ _08087444: .4byte sub_80871D0
 mapldr_080851BC: @ 8087448
 	push {lr}
 	bl sub_8053E90
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 	bl ScriptContext2_Enable
 	ldr r0, _08087468 @ =gUnknown_0300485C
 	movs r1, 0
@@ -3925,7 +3925,7 @@ sub_80877AC: @ 80877AC
 	cmp r0, 0
 	bne _080877CA
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -4117,7 +4117,7 @@ sub_8087914: @ 8087914
 	cmp r0, 0
 	bne _08087940
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 _08087940:
 	ldr r0, _080879BC @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
@@ -4227,7 +4227,7 @@ _08087A20:
 mapldr_080859D4: @ 8087A28
 	push {lr}
 	bl sub_8053E90
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r1, _08087A64 @ =gUnknown_0300485C
@@ -4633,7 +4633,7 @@ _08087D48:
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
 	bl sub_8053FF8
-	bl sub_8080918
+	bl fade_8080918
 _08087D5E:
 	add sp, 0x8
 	pop {r4,r5}
@@ -4687,7 +4687,7 @@ _08087DC8: .4byte sub_8087BBC
 mapldr_08085D88: @ 8087DCC
 	push {lr}
 	bl sub_8053E90
-	bl pal_fill_for_maplights
+	bl pal_fill_for_map_transition
 	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r1, _08087E0C @ =gUnknown_0300485C
@@ -6908,7 +6908,7 @@ sub_8088F10: @ 8088F10
 	lsls r0, 24
 	cmp r0, 0
 	beq _08088F2A
-	bl sub_8080918
+	bl fade_8080918
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
diff --git a/asm/rom_810CBB4.s b/asm/rom_810CBB4.s
index fee17ab5b..986b6ce79 100644
--- a/asm/rom_810CBB4.s
+++ b/asm/rom_810CBB4.s
@@ -1133,7 +1133,7 @@ _0810D460:
 _0810D470:
 	ldr r1, _0810D484 @ =gSpecialVar_0x8006
 	strh r0, [r1]
-	bl IsNationalPokedex
+	bl IsNationalPokedexEnabled
 	lsls r0, 16
 	lsrs r0, 16
 	pop {r1}
diff --git a/asm/trade.s b/asm/trade.s
index a23768c05..d49f81a62 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -7591,7 +7591,7 @@ sub_804BA64: @ 804BA64
 	lsls r0, 8
 	cmp r1, r0
 	bne _0804BA8C
-	bl UnlockNationalPokedex
+	bl EnableNationalPokedex
 _0804BA8C:
 	pop {r0}
 	bx r0
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 76cf9e837..290e753f3 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -151,11 +151,6 @@ void overworld_poison_timer_set(void);
 void prev_quest_postbuffer_cursor_backup_reset(void);
 u8 *sub_8068E24(struct UnkStruct_8054FF8_Substruct *);
 u8 *GetFieldObjectScriptPointerForComparison();
-void sub_8069030(void);
-void sub_806906C(void);
-bool32 IsNationalPokedex(void);
-bool32 IsMysteryGiftAvailable(void);
-int sub_80691DC(void);
 
 // asm/rom_806936C.o
 void SetUpFieldTasks();
diff --git a/include/event_data.h b/include/event_data.h
new file mode 100644
index 000000000..5cac27cc8
--- /dev/null
+++ b/include/event_data.h
@@ -0,0 +1,28 @@
+#ifndef GUARD_EVENT_DATA_H
+#define GUARD_EVENT_DATA_H
+
+#include "flags.h"
+#include "vars.h"
+
+void InitEventData(void);
+void ClearTempFieldEventData(void);
+void ClearUpperFlags(void);
+void DisableNationalPokedex(void);
+void EnableNationalPokedex(void);
+bool32 IsNationalPokedexEnabled(void);
+void DisableMysteryGift(void);
+void EnableMysteryGift(void);
+bool32 IsMysteryGiftEnabled(void);
+void DisableResetRTC(void);
+void EnableResetRTC(void);
+bool32 CanResetRTC(void);
+u16 *GetVarPointer(u16 id);
+u16 VarGet(u16 id);
+bool8 VarSet(u16 id, u16 value);
+u8 VarGetFieldObjectGraphicsId(u8 id);
+u8 *GetFlagPointer(u16 id);
+u8 FlagSet(u16 id);
+u8 FlagReset(u16 id);
+bool8 FlagGet(u16 id);
+
+#endif // GUARD_EVENT_DATA_H
diff --git a/include/flag.h b/include/flag.h
deleted file mode 100644
index 8f4c01b02..000000000
--- a/include/flag.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef GUARD_FLAG_H
-#define GUARD_FLAG_H
-
-#include "flags.h"
-
-u8 *GetFlagPointer(u16 id);
-u8 FlagSet(u16 id);
-u8 FlagReset(u16 id);
-bool8 FlagGet(u16 id);
-
-#endif // GUARD_FLAG_H
diff --git a/include/flags.h b/include/flags.h
index 8d3885fe1..0c0cebc5f 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -51,7 +51,9 @@
 #define SYS_BRAILLE_WAIT     0x851
 #define SYS_BRAILLE_FLY      0x852
 
-#define SYS_B_DASH        0x860 // got Running Shoes
+#define SYS_B_DASH           0x860 // got Running Shoes
+#define SYS_CTRL_OBJ_DELETE  0x861
+#define SYS_RESET_RTC_ENABLE 0x862
 
 // SPECIAL FLAGS (unknown purpose)
 
diff --git a/include/var.h b/include/var.h
deleted file mode 100644
index ada8caf24..000000000
--- a/include/var.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GUARD_VAR_H
-#define GUARD_VAR_H
-
-u16 *GetVarPointer(u16 id);
-u16 VarGet(u16 id);
-bool8 VarSet(u16 id, u16 value);
-u8 VarGetFieldObjectGraphicsId(u8 id);
-
-#endif // GUARD_VAR_H
diff --git a/include/vars.h b/include/vars.h
index db6f097b7..69939804a 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -3,4 +3,8 @@
 
 #define VAR_REPEL_STEP_COUNT    0x4021
 
+#define VAR_RESET_RTC_ENABLE    0x402C
+
+#define VAR_NATIONAL_DEX        0x4046
+
 #endif // GUARD_VARS_H
diff --git a/ld_script.txt b/ld_script.txt
index efe3235e3..b4b5b4b98 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -84,9 +84,8 @@ SECTIONS {
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
-        asm/rom_8065394.o(.text);
-        src/var.o(.text);
-        src/flag.o(.text);
+        asm/field_control_avatar.o(.text);
+        src/event_data.o(.text);
         asm/coord_event_weather.o(.text);
         asm/field_tasks.o(.text);
         asm/clock.o(.text);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 68690bf1d..ee304c21f 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -14,8 +14,7 @@
 #include "task.h"
 #include "string_util.h"
 #include "rng.h"
-#include "flag.h"
-#include "var.h"
+#include "event_data.h"
 #include "script.h"
 #include "field_message_box.h"
 #include "trainer.h"
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index 186fa062c..f69e68cc1 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -9,7 +9,7 @@
 #include "item.h"
 #include "abilities.h"
 #include "hold_effects.h"
-#include "flag.h"
+#include "event_data.h"
 
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[6];
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index ae1397852..d534a9990 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -2,7 +2,7 @@
 #include "asm.h"
 #include "link.h"
 #include "rng.h"
-#include "flag.h"
+#include "event_data.h"
 
 extern struct EasyChatPair unk_2007800[5];
 extern struct EasyChatPair unk_2007900[5];
diff --git a/src/event_data.c b/src/event_data.c
new file mode 100644
index 000000000..b1c0632ec
--- /dev/null
+++ b/src/event_data.c
@@ -0,0 +1,163 @@
+#include "global.h"
+#include "event_data.h"
+#include "pokedex.h"
+
+extern u8 gUnknown_0202E8E2[];
+extern u16 *gSpecialVars[];
+
+void InitEventData(void)
+{
+    memset(gSaveBlock1.flags, 0, sizeof(gSaveBlock1.flags));
+    memset(gSaveBlock1.vars, 0, sizeof(gSaveBlock1.vars));
+    memset(gUnknown_0202E8E2, 0, 16);
+}
+
+void ClearTempFieldEventData(void)
+{
+    memset(gSaveBlock1.flags, 0, 4);
+    memset(gSaveBlock1.vars, 0, 32);
+    FlagReset(SYS_ENC_UP_ITEM);
+    FlagReset(SYS_ENC_DOWN_ITEM);
+    FlagReset(SYS_USE_STRENGTH);
+    FlagReset(SYS_CTRL_OBJ_DELETE);
+}
+
+void ClearUpperFlags(void)
+{
+    memset(gSaveBlock1.flags + 0x118, 0, 8);
+}
+
+void DisableNationalPokedex(void)
+{
+    u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
+    gSaveBlock2.pokedex.nationalMagic = 0;
+    *nationalDexVar = 0;
+    FlagReset(SYS_NATIONAL_DEX);
+}
+
+void EnableNationalPokedex(void)
+{
+    u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
+    gSaveBlock2.pokedex.nationalMagic = 0xDA;
+    *nationalDexVar = 0x302;
+    FlagSet(SYS_NATIONAL_DEX);
+    gSaveBlock2.pokedex.unknown1 = 1;
+    gSaveBlock2.pokedex.order = 0;
+    sub_808C0A0();
+}
+
+bool32 IsNationalPokedexEnabled(void)
+{
+    if (gSaveBlock2.pokedex.nationalMagic == 0xDA && VarGet(VAR_NATIONAL_DEX) == 0x302 && FlagGet(SYS_NATIONAL_DEX))
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void DisableMysteryGift(void)
+{
+    FlagReset(SYS_EXDATA_ENABLE);
+}
+
+void EnableMysteryGift(void)
+{
+    FlagSet(SYS_EXDATA_ENABLE);
+}
+
+bool32 IsMysteryGiftEnabled(void)
+{
+    return FlagGet(SYS_EXDATA_ENABLE);
+}
+
+void DisableResetRTC(void)
+{
+    VarSet(VAR_RESET_RTC_ENABLE, 0);
+    FlagReset(SYS_RESET_RTC_ENABLE);
+}
+
+void EnableResetRTC(void)
+{
+    VarSet(VAR_RESET_RTC_ENABLE, 0x920);
+    FlagSet(SYS_RESET_RTC_ENABLE);
+}
+
+bool32 CanResetRTC(void)
+{
+    if (FlagGet(SYS_RESET_RTC_ENABLE) && VarGet(VAR_RESET_RTC_ENABLE) == 0x920)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+u16 *GetVarPointer(u16 id)
+{
+    if (id < 0x4000)
+        return NULL;
+
+    if ((s16)id >= 0)
+        return &gSaveBlock1.vars[id - 0x4000];
+
+    return gSpecialVars[id - 0x8000];
+}
+
+u16 VarGet(u16 id)
+{
+    u16 *ptr = GetVarPointer(id);
+    if (!ptr)
+        return id;
+    return *ptr;
+}
+
+bool8 VarSet(u16 id, u16 value)
+{
+    u16 *ptr = GetVarPointer(id);
+    if (!ptr)
+        return FALSE;
+    *ptr = value;
+    return TRUE;
+}
+
+u8 VarGetFieldObjectGraphicsId(u8 id)
+{
+    return VarGet(0x4010 + id);
+}
+
+u8 *GetFlagPointer(u16 id)
+{
+    if (id == 0)
+        return 0;
+
+    if (id < 0x4000)
+        return &gSaveBlock1.flags[id / 8];
+
+    return &gUnknown_0202E8E2[(id - 0x4000) / 8];
+}
+
+u8 FlagSet(u16 id)
+{
+    u8 *ptr = GetFlagPointer(id);
+    if (ptr)
+        *ptr |= 1 << (id & 7);
+    return 0;
+}
+
+u8 FlagReset(u16 id)
+{
+    u8 *ptr = GetFlagPointer(id);
+    if (ptr)
+        *ptr &= ~(1 << (id & 7));
+    return 0;
+}
+
+bool8 FlagGet(u16 id)
+{
+    u8 *ptr = GetFlagPointer(id);
+
+    if (!ptr)
+        return FALSE;
+
+    if (!(((*ptr) >> (id & 7)) & 1))
+        return FALSE;
+
+    return TRUE;
+}
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 5fffa785f..cfb16bf28 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -3,7 +3,7 @@
 #include "asm.h"
 #include "field_map_obj.h"
 #include "rom4.h"
-#include "flag.h"
+#include "event_data.h"
 #include "main.h"
 #include "menu.h"
 #include "rng.h"
diff --git a/src/flag.c b/src/flag.c
deleted file mode 100644
index e7347ad0d..000000000
--- a/src/flag.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "global.h"
-#include "flag.h"
-
-extern u8 gUnknown_0202E8E2[];
-
-u8 *GetFlagPointer(u16 id)
-{
-    if (id == 0)
-        return 0;
-
-    if (id < 0x4000)
-        return &gSaveBlock1.flags[id / 8];
-
-    return &gUnknown_0202E8E2[(id - 0x4000) / 8];
-}
-
-u8 FlagSet(u16 id)
-{
-    u8 *ptr = GetFlagPointer(id);
-    if (ptr)
-        *ptr |= 1 << (id & 7);
-    return 0;
-}
-
-u8 FlagReset(u16 id)
-{
-    u8 *ptr = GetFlagPointer(id);
-    if (ptr)
-        *ptr &= ~(1 << (id & 7));
-    return 0;
-}
-
-bool8 FlagGet(u16 id)
-{
-    u8 *ptr = GetFlagPointer(id);
-
-    if (!ptr)
-        return FALSE;
-
-    if (!(((*ptr) >> (id & 7)) & 1))
-        return FALSE;
-
-    return TRUE;
-}
diff --git a/src/item_use.c b/src/item_use.c
index 21ce9acd3..fb5f3e8b8 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -10,7 +10,7 @@
 #include "rom4.h"
 #include "metatile_behavior.h"
 #include "field_player_avatar.h"
-#include "flag.h"
+#include "event_data.h"
 #include "map_obj_lock.h"
 #include "script.h"
 #include "field_player_avatar.h"
diff --git a/src/landmark.c b/src/landmark.c
index 4657a0083..6a53716bb 100644
--- a/src/landmark.c
+++ b/src/landmark.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "landmark.h"
-#include "flag.h"
+#include "event_data.h"
 
 #define MAPSEC_NONE 0x58
 
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index f073688e0..2330d20ff 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -2,7 +2,7 @@
 #include "lottery_corner.h"
 #include "rng.h"
 #include "string_util.h"
-#include "var.h"
+#include "event_data.h"
 
 extern u16 gScriptResult;
 extern u16 gSpecialVar_0x8004;
diff --git a/src/main_menu.c b/src/main_menu.c
index 9842d6f39..f036a705c 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -16,6 +16,7 @@
 #include "task.h"
 #include "text.h"
 #include "title_screen.h"
+#include "event_data.h"
 
 #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24))
 
@@ -277,7 +278,7 @@ void Task_MainMenuCheckSave(u8 taskId)
     switch (gSaveFileStatus)
     {
     case 1:
-        if (IsMysteryGiftAvailable() == TRUE)
+        if (IsMysteryGiftEnabled() == TRUE)
             gTasks[taskId].data[TD_MENULAYOUT] = HAS_MYSTERY_GIFT;
         else
             gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
@@ -300,7 +301,7 @@ void Task_MainMenuCheckSave(u8 taskId)
         gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck;
 
-        if (IsMysteryGiftAvailable() == TRUE)
+        if (IsMysteryGiftEnabled() == TRUE)
             gTasks[taskId].data[TD_MENULAYOUT] = HAS_MYSTERY_GIFT;
         else
             gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
diff --git a/src/new_game.c b/src/new_game.c
index fa1894086..00797806e 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -10,6 +10,7 @@
 #include "lottery_corner.h"
 #include "rng.h"
 #include "rtc.h"
+#include "event_data.h"
 
 extern u8 gUnknown_020297EC;
 
@@ -114,7 +115,7 @@ void NewGameInitData(void)
     set_player_trainer_id();
     PlayTimeCounter_Reset();
     sub_8052D78();
-    sub_8069030();
+    InitEventData();
     sub_80BD7A8();
     sub_80BDAB4();
     sub_80BB5B4();
diff --git a/src/pokedex.c b/src/pokedex.c
index a37bed24e..48e3a57aa 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -12,6 +12,7 @@
 #include "songs.h"
 #include "sound.h"
 #include "task.h"
+#include "event_data.h"
 
 // I'm #define-ing these just for now so I can keep using the old unkXXX member names
 #define unk60E selectedPokemon
@@ -109,7 +110,7 @@ extern void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBi
 extern bool8 BeginNormalPaletteFade(u32, s8, u8, u8, u16);
 extern void remove_some_task(void);
 extern u8 sub_8091E3C(void);
-extern void LockNationalPokedex(void);
+extern void DisableNationalPokedex(void);
 extern void sub_805469C(void);
 extern u16 HoennToNationalOrder(u16);
 extern u16 NationalToHoennOrder(u16);
@@ -144,7 +145,7 @@ void sub_808C02C(void)
     gSaveBlock2.pokedex.unownPersonality = 0;
     gSaveBlock2.pokedex.spindaPersonality = 0;
     gSaveBlock2.pokedex.unknown3 = 0;
-    LockNationalPokedex();
+    DisableNationalPokedex();
     for(i = 0; i <= 51; i++)
     {
         gSaveBlock2.pokedex.owned[i] = 0;
@@ -279,14 +280,14 @@ void CB2_InitPokedex(void)
             ClearPokedexView(gPokedexView);
             CreateTask(Task_PokedexShowMainScreen, 0);
             gPokedexView->dexMode = gSaveBlock2.pokedex.unknown1;
-            if(!IsNationalPokedex())
+            if(!IsNationalPokedexEnabled())
                 gPokedexView->dexMode = DEX_MODE_HOENN;
             gPokedexView->dexOrder = gSaveBlock2.pokedex.order;
             gPokedexView->selectedPokemon = gUnknown_0202FFB8;
             gPokedexView->unk62C = gUnknown_0202FFBA;
             gPokedexView->selectedScreen = PAGE_SCREEN;
             gPokedexView->unk64E = 0;
-            if(!IsNationalPokedex())
+            if(!IsNationalPokedexEnabled())
             {
                 gPokedexView->unk61A = GetHoennPokedexCount(0);
                 gPokedexView->unk61C = GetHoennPokedexCount(1);
@@ -531,7 +532,7 @@ void sub_808CB8C(u8 taskId)
             gPokedexView->unk62C = gPokedexView->unk62A;
             gPokedexView->selectedPokemon = gPokedexView->unk610;
             gPokedexView->dexMode = gPokedexView->unk614;
-            if(!IsNationalPokedex())
+            if(!IsNationalPokedexEnabled())
                 gPokedexView->dexMode = DEX_MODE_HOENN;
             gPokedexView->dexOrder = gPokedexView->unk618;
             gTasks[taskId].func = Task_PokedexShowMainScreen;
@@ -544,7 +545,7 @@ void Task_ClosePokedex(u8 taskId)
     if(!gPaletteFade.active)
     {
         gSaveBlock2.pokedex.unknown1 = gPokedexView->dexMode;
-        if(!IsNationalPokedex())
+        if(!IsNationalPokedexEnabled())
             gSaveBlock2.pokedex.unknown1 = 0;
         gSaveBlock2.pokedex.order = gPokedexView->dexOrder;
         DestroyTask(taskId);
@@ -715,7 +716,7 @@ void Task_PokedexResultsScreenReturnToMainScreen(u8 taskId)
         gPokedexView->unk62C = gPokedexView->unk62A;
         gPokedexView->selectedPokemon = gPokedexView->unk610;
         gPokedexView->dexMode = gPokedexView->unk614;
-        if(!IsNationalPokedex())
+        if(!IsNationalPokedexEnabled())
             gPokedexView->dexMode = DEX_MODE_HOENN;
         gPokedexView->dexOrder = gPokedexView->unk618;
         gTasks[taskId].func = Task_PokedexShowMainScreen;
@@ -729,7 +730,7 @@ void Task_PokedexResultsScreenExitPokedex(u8 taskId)
         gPokedexView->unk62C = gPokedexView->unk62A;
         gPokedexView->selectedPokemon = gPokedexView->unk610;
         gPokedexView->dexMode = gPokedexView->unk614;
-        if(!IsNationalPokedex())
+        if(!IsNationalPokedexEnabled())
             gPokedexView->dexMode = DEX_MODE_HOENN;
         gPokedexView->dexOrder = gPokedexView->unk618;
         gTasks[taskId].func = Task_ClosePokedex;
@@ -826,7 +827,7 @@ void sub_808D640(void)
 {
     if(gPokedexView->unk64C_1)
         LoadPalette(gUnknown_0839F67C + 0x2, 1, 0xBE);
-    else if(!IsNationalPokedex())
+    else if(!IsNationalPokedexEnabled())
         LoadPalette(gPokedexMenu_Pal + 0x2, 1, 0xBE);
     else
         LoadPalette(gUnknown_0839F73C + 0x2, 1, 0xBE);
@@ -847,7 +848,7 @@ void SortPokedex(u8 dexMode, u8 sortMode)
             vars[1] = 1;
             break;
         case DEX_MODE_NATIONAL:
-            if(IsNationalPokedex())
+            if(IsNationalPokedexEnabled())
             {
                 vars[0] = 386;
                 vars[1] = 0;
@@ -3141,7 +3142,7 @@ void sub_8090750(u8 taskId)
             break;
         case 3:
             sub_8072BD8(gDexText_RegisterComplete, 2, 0, 0xD0);
-            if(!IsNationalPokedex())
+            if(!IsNationalPokedexEnabled())
                 sub_8091154(NationalToHoennOrder(dexNum), 13, 3);
             else
                 sub_8091154(dexNum, 13, 3);
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 2baf1155e..28d1cd2bb 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -7,7 +7,7 @@
 #include "species.h"
 #include "main.h"
 #include "sprite.h"
-#include "flag.h"
+#include "event_data.h"
 
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[6];
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index f69ffcfef..fe64a6cf4 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -7,7 +7,7 @@
 #include "species.h"
 #include "main.h"
 #include "sprite.h"
-#include "flag.h"
+#include "event_data.h"
 #include "rtc.h"
 #include "item.h"
 
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 21f386f2d..51d24b71b 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -2,8 +2,7 @@
 #include "pokemon_size_record.h"
 #include "string_util.h"
 #include "species.h"
-#include "flag.h"
-#include "var.h"
+#include "event_data.h"
 
 extern u16 SpeciesToNationalPokedexNum(u16);
 extern u16 sub_8090D54(u16, u8);
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 281ab2803..12b87b2b1 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -9,8 +9,7 @@
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
-#include "flag.h"
-#include "var.h"
+#include "event_data.h"
 
 extern void *recordMixingSecretBases;
 extern void *recordMixingTvShows;
diff --git a/src/rom4.c b/src/rom4.c
index 2f7d1fc5c..63f42161d 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -9,7 +9,7 @@
 #include "field_map_obj.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "flag.h"
+#include "event_data.h"
 #include "heal_location.h"
 #include "link.h"
 #include "load_save.h"
@@ -27,7 +27,6 @@
 #include "task.h"
 #include "tileset_anim.h"
 #include "truck_scene.h"
-#include "var.h"
 #include "weather.h"
 #include "wild_encounter.h"
 #include "metatile_behavior.h"
@@ -518,7 +517,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     warp_shift();
     set_current_map_header_from_sav1_save_old_name();
     sub_8053154();
-    sub_806906C();
+    ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
     sub_8082BD0(mapGroup, mapNum);
@@ -551,7 +550,7 @@ void sub_8053994(u32 a1)
     sub_8053154();
     v2 = is_light_level_1_2_3_5_or_6(gMapHeader.light);
     v3 = is_light_level_8_or_9(gMapHeader.light);
-    sub_806906C();
+    ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
     sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 118797136..6ecb5cc44 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -2,7 +2,7 @@
 #include "safari_zone.h"
 #include "asm.h"
 #include "field_player_avatar.h"
-#include "flag.h"
+#include "event_data.h"
 #include "main.h"
 #include "script.h"
 #include "string_util.h"
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index ff42d66ea..d2fda59d6 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -2,7 +2,7 @@
 #include "save_menu_util.h"
 #include "asm.h"
 #include "menu.h"
-#include "flag.h"
+#include "event_data.h"
 #include "string_util.h"
 #include "pokedex.h"
 
@@ -118,7 +118,7 @@ u16 GetPokedexSeenCount()
 {
     u16 pokedexSeenCount;
 
-    if (IsNationalPokedex())
+    if (IsNationalPokedexEnabled())
         pokedexSeenCount = GetNationalPokedexCount(1);
     else
         pokedexSeenCount = GetHoennPokedexCount(1);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index e34ba0b7f..66c68be07 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -17,8 +17,7 @@
 #include "field_message_box.h"
 #include "sound.h"
 #include "string_util.h"
-#include "flag.h"
-#include "var.h"
+#include "event_data.h"
 #include "rom4.h"
 #include "weather.h"
 #include "map_obj_lock.h"
diff --git a/src/script.c b/src/script.c
index a7aa9c809..8ce889930 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "script.h"
 #include "asm_fieldmap.h"
-#include "var.h"
+#include "event_data.h"
 
 #define RAM_SCRIPT_MAGIC 51
 
diff --git a/src/script_menu.c b/src/script_menu.c
index 5c844a6fb..c4f0b5292 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -4,7 +4,7 @@
 #include "palette.h"
 #include "script.h"
 #include "sound.h"
-#include "flag.h"
+#include "event_data.h"
 #include "sprite.h"
 
 struct MultichoiceListStruct
diff --git a/src/start_menu.c b/src/start_menu.c
index 850f610e3..eebdd27fc 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -2,7 +2,7 @@
 #include "start_menu.h"
 #include "asm.h"
 #include "field_player_avatar.h"
-#include "flag.h"
+#include "event_data.h"
 #include "load_save.h"
 #include "main.h"
 #include "map_obj_lock.h"
diff --git a/src/title_screen.c b/src/title_screen.c
index 9282978de..ffa803d2e 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -12,6 +12,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "decompress.h"
+#include "event_data.h"
 
 extern u8 gReservedSpritePaletteCount;
 extern struct MusicPlayerInfo gMPlay_BGM;
@@ -427,7 +428,7 @@ static void Task_TitleScreenPhase3(u8 taskId)
         if ((gMain.heldKeys & CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO)
             SetMainCallback2(CB2_GoToClearSaveDataScreen);
         if ((gMain.heldKeys & RESET_RTC_BUTTON_COMBO) == RESET_RTC_BUTTON_COMBO
-          && sub_80691DC() == 1)
+          && CanResetRTC() == 1)
         {
             FadeOutBGM(4);
             BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 453cec76d..d2d6b922d 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -1,8 +1,7 @@
 #include "global.h"
 #include "trainer_card.h"
 #include "asm.h"
-#include "flag.h"
-#include "flags.h"
+#include "event_data.h"
 #include "link.h"
 #include "main.h"
 #include "menu.h"
diff --git a/src/var.c b/src/var.c
deleted file mode 100644
index 08b109e6f..000000000
--- a/src/var.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "global.h"
-#include "var.h"
-
-extern u16 *gSpecialVars[];
-
-u16 *GetVarPointer(u16 id)
-{
-    if (id < 0x4000)
-        return NULL;
-
-    if ((s16)id >= 0)
-        return &gSaveBlock1.vars[id - 0x4000];
-
-    return gSpecialVars[id - 0x8000];
-}
-
-u16 VarGet(u16 id)
-{
-    u16 *ptr = GetVarPointer(id);
-    if (!ptr)
-        return id;
-    return *ptr;
-}
-
-bool8 VarSet(u16 id, u16 value)
-{
-    u16 *ptr = GetVarPointer(id);
-    if (!ptr)
-        return FALSE;
-    *ptr = value;
-    return TRUE;
-}
-
-u8 VarGetFieldObjectGraphicsId(u8 id)
-{
-    return VarGet(0x4010 + id);
-}
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 1291242a7..9336e6c18 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -7,10 +7,8 @@
 #include "abilities.h"
 #include "rng.h"
 #include "script.h"
-#include "flag.h"
-#include "var.h"
+#include "event_data.h"
 #include "rom4.h"
-#include "vars.h"
 #include "metatile_behavior.h"
 
 struct WildPokemon