event_data.c

11 files changed, 54 insertions, 298 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