more overworld work

5 files changed, 23 insertions, 1497 deletions

diff --git a/asm/cable_club.s b/asm/cable_club.s
index 3b5c392fc..885689e85 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -2156,7 +2156,7 @@ sub_80B360C: @ 80B360C
 	negs r1, r1
 	ands r0, r1
 	str r0, [r2]
-	bl call_ResetMapMusic
+	bl Overworld_ResetMapMusic
 	bl copy_player_party_from_sav1
 	bl copy_bags_and_unk_data_to_save_blocks
 	bl sub_813BF10
diff --git a/asm/field_screen.s b/asm/field_screen.s
index 0839e4bac..0caa07a1b 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -1884,8 +1884,8 @@ _080ABEF4:
 	.pool
 	thumb_func_end sub_80ABE18
 
-	thumb_func_start sub_80ABF00
-sub_80ABF00: @ 80ABF00
+	thumb_func_start ApplyWeatherGammaShiftToPal
+ApplyWeatherGammaShiftToPal: @ 80ABF00
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1900,7 +1900,7 @@ sub_80ABF00: @ 80ABF00
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80ABF00
+	thumb_func_end ApplyWeatherGammaShiftToPal
 
 	thumb_func_start sub_80ABF20
 sub_80ABF20: @ 80ABF20
@@ -10478,7 +10478,7 @@ sub_80B058C: @ 80B058C
 	thumb_func_start sub_80B05B4
 sub_80B05B4: @ 80B05B4
 	push {lr}
-	bl sub_80859B0
+	bl Overworld_FadeOutMapMusic
 	ldr r0, =task50_0807F0C8
 	movs r1, 0x50
 	bl CreateTask
diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 4befe0ca7..79980ec46 100644
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -182,8 +182,8 @@ _0809D9EA:
 	bx r0
 	thumb_func_end ActivatePerStepCallback
 
-	thumb_func_start wild_encounter_reset_coro_args
-wild_encounter_reset_coro_args: @ 809D9F0
+	thumb_func_start ResetFieldTasksArgs
+ResetFieldTasksArgs: @ 809D9F0
 	push {lr}
 	ldr r0, =task_per_step_callback_manager
 	bl FindTaskIdByFunc
@@ -207,7 +207,7 @@ _0809DA1A:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end wild_encounter_reset_coro_args
+	thumb_func_end ResetFieldTasksArgs
 
 	thumb_func_start nullsub_34
 nullsub_34: @ 809DA2C
diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s
index 9802c3151..76edd1f1f 100644
--- a/asm/map_name_popup.s
+++ b/asm/map_name_popup.s
@@ -9,14 +9,14 @@
 sub_80D47D4: @ 80D47D4
 	push {lr}
 	bl sub_80A0934
-	bl AddMapNamePopUpWindowTask
+	bl ShowMapNamePopup
 	movs r0, 0x1
 	pop {r1}
 	bx r1
 	thumb_func_end sub_80D47D4
 
-	thumb_func_start AddMapNamePopUpWindowTask
-AddMapNamePopUpWindowTask: @ 80D47E4
+	thumb_func_start ShowMapNamePopup
+ShowMapNamePopup: @ 80D47E4
 	push {r4,lr}
 	movs r0, 0x80
 	lsls r0, 7
@@ -83,7 +83,7 @@ _080D486C:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end AddMapNamePopUpWindowTask
+	thumb_func_end ShowMapNamePopup
 
 	thumb_func_start Task_MapNamePopUpWindow
 Task_MapNamePopUpWindow: @ 80D487C
diff --git a/asm/overworld.s b/asm/overworld.s
index 25c479c10..d74a2674b 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -5,1482 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8084E14
-sub_8084E14: @ 8084E14
-	ldr r2, =gWarpDestination
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, [r0, 0x28]
-	ldr r0, [r0, 0x24]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	bx lr
-	.pool
-	thumb_func_end sub_8084E14
-
-	thumb_func_start sub_8084E2C
-sub_8084E2C: @ 8084E2C
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	ldr r1, [sp, 0x18]
-	ldr r0, =gUnknown_020322EC
-	lsls r4, 24
-	asrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	lsls r6, 24
-	asrs r6, 24
-	lsls r3, 24
-	asrs r3, 24
-	str r3, [sp]
-	lsls r1, 24
-	asrs r1, 24
-	str r1, [sp, 0x4]
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl SetWarpData
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8084E2C
-
-	thumb_func_start warp1_set_to_warp2
-warp1_set_to_warp2: @ 8084E68
-	ldr r2, =gWarpDestination
-	ldr r0, =gUnknown_020322EC
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	bx lr
-	.pool
-	thumb_func_end warp1_set_to_warp2
-
-	thumb_func_start sub_8084E80
-sub_8084E80: @ 8084E80
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	ldr r1, [sp, 0x18]
-	ldr r0, =gUnknown_020322F4
-	lsls r4, 24
-	asrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	lsls r6, 24
-	asrs r6, 24
-	lsls r3, 24
-	asrs r3, 24
-	str r3, [sp]
-	lsls r1, 24
-	asrs r1, 24
-	str r1, [sp, 0x4]
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl SetWarpData
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8084E80
-
-	thumb_func_start sub_8084EBC
-sub_8084EBC: @ 8084EBC
-	push {r4-r6,lr}
-	sub sp, 0x4
-	lsls r0, 16
-	lsrs r5, r0, 16
-	lsls r1, 16
-	lsrs r6, r1, 16
-	ldr r4, =gUnknown_020322F4
-	adds r0, r4, 0
-	bl warp_data_is_not_neg_1
-	cmp r0, 0x1
-	bne _08084EF0
-	ldr r2, =gWarpDestination
-	ldr r0, =gUnknown_020322DC
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	b _08084F0A
-	.pool
-_08084EF0:
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	movs r1, 0x1
-	ldrsb r1, [r4, r1]
-	movs r2, 0x1
-	negs r2, r2
-	lsls r3, r5, 24
-	asrs r3, 24
-	lsls r4, r6, 24
-	asrs r4, 24
-	str r4, [sp]
-	bl Overworld_SetWarpDestination
-_08084F0A:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8084EBC
-
-	thumb_func_start warp1_set_to_sav1w
-warp1_set_to_sav1w: @ 8084F14
-	ldr r2, =gWarpDestination
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, [r0, 0x10]
-	ldr r0, [r0, 0xC]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	bx lr
-	.pool
-	thumb_func_end warp1_set_to_sav1w
-
-	thumb_func_start sub_8084F2C
-sub_8084F2C: @ 8084F2C
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	ldr r1, [sp, 0x18]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	adds r0, 0xC
-	lsls r4, 24
-	asrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	lsls r6, 24
-	asrs r6, 24
-	lsls r3, 24
-	asrs r3, 24
-	str r3, [sp]
-	lsls r1, 24
-	asrs r1, 24
-	str r1, [sp, 0x4]
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl SetWarpData
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8084F2C
-
-	thumb_func_start sub_8084F6C
-sub_8084F6C: @ 8084F6C
-	push {r4,r5,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetHealLocationPointer
-	adds r5, r0, 0
-	cmp r5, 0
-	beq _08084FA0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	adds r0, 0xC
-	movs r1, 0
-	ldrsb r1, [r5, r1]
-	movs r2, 0x1
-	ldrsb r2, [r5, r2]
-	movs r3, 0x1
-	negs r3, r3
-	movs r4, 0x2
-	ldrsb r4, [r5, r4]
-	str r4, [sp]
-	movs r4, 0x4
-	ldrsb r4, [r5, r4]
-	str r4, [sp, 0x4]
-	bl SetWarpData
-_08084FA0:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8084F6C
-
-	thumb_func_start sub_8084FAC
-sub_8084FAC: @ 8084FAC
-	ldr r0, =gSaveBlock1Ptr
-	ldr r2, [r0]
-	ldr r0, [r2, 0x14]
-	ldr r1, [r2, 0x18]
-	str r0, [r2, 0xC]
-	str r1, [r2, 0x10]
-	bx lr
-	.pool
-	thumb_func_end sub_8084FAC
-
-	thumb_func_start sub_8084FC0
-sub_8084FC0: @ 8084FC0
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gMapHeader
-	ldr r0, [r0, 0xC]
-	ldr r3, [r0]
-	ldr r1, [r0, 0x4]
-	cmp r1, 0
-	bne _08084FDC
-	b _08084FF0
-	.pool
-_08084FD8:
-	adds r0, r1, 0
-	b _08084FF2
-_08084FDC:
-	movs r2, 0
-	cmp r2, r3
-	bge _08084FF0
-_08084FE2:
-	ldrb r0, [r1]
-	cmp r0, r4
-	beq _08084FD8
-	adds r2, 0x1
-	adds r1, 0xC
-	cmp r2, r3
-	blt _08084FE2
-_08084FF0:
-	movs r0, 0
-_08084FF2:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8084FC0
-
-	thumb_func_start sub_8084FF8
-sub_8084FF8: @ 8084FF8
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 16
-	lsrs r4, r1, 16
-	lsls r2, 16
-	lsrs r5, r2, 16
-	bl sub_8084FC0
-	adds r1, r0, 0
-	cmp r1, 0
-	beq _08085030
-	movs r0, 0x8
-	ldrsb r0, [r1, r0]
-	ldrb r1, [r1, 0x9]
-	lsls r1, 24
-	asrs r1, 24
-	movs r2, 0x1
-	negs r2, r2
-	lsls r3, r4, 24
-	asrs r3, 24
-	lsls r4, r5, 24
-	asrs r4, 24
-	str r4, [sp]
-	bl Overworld_SetWarpDestination
-	b _0808504C
-_08085030:
-	bl mapheader_run_script_with_tag_x6
-	ldr r0, =gUnknown_020322EC
-	bl warp_data_is_not_neg_1
-	cmp r0, 0
-	beq _08085048
-	movs r0, 0
-	b _0808504E
-	.pool
-_08085048:
-	bl warp1_set_to_warp2
-_0808504C:
-	movs r0, 0x1
-_0808504E:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8084FF8
-
-	thumb_func_start sub_8085058
-sub_8085058: @ 8085058
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	lsls r3, 16
-	lsrs r3, 16
-	lsls r2, 16
-	lsrs r2, 16
-	movs r0, 0x6
-	adds r1, r3, 0
-	bl sub_8084FF8
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8085058
-
-	thumb_func_start sub_8085078
-sub_8085078: @ 8085078
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	lsls r3, 16
-	lsrs r3, 16
-	lsls r2, 16
-	lsrs r2, 16
-	movs r0, 0x5
-	adds r1, r3, 0
-	bl sub_8084FF8
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8085078
-
-	thumb_func_start mliX_load_map
-mliX_load_map: @ 8085098
-	push {r4-r6,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r5, r1, 0
-	lsls r0, r6, 24
-	asrs r0, 24
-	lsls r1, r5, 24
-	asrs r1, 24
-	movs r3, 0x1
-	negs r3, r3
-	str r3, [sp]
-	adds r2, r3, 0
-	bl Overworld_SetWarpDestination
-	ldr r4, =gMapHeader
-	ldrb r0, [r4, 0x14]
-	cmp r0, 0x3A
-	beq _080850C8
-	bl sub_8085810
-_080850C8:
-	bl ApplyCurrentWarp
-	bl set_current_map_header_from_sav1_save_old_name
-	bl LoadMapObjTemplatesFromHeader
-	bl TrySetMapSaveWarpStatus
-	bl ClearTempFieldEventData
-	bl ResetCyclingRoadChallengeData
-	bl prev_quest_postbuffer_cursor_backup_reset
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl TryUpdateRandomTrainerRematches
-	bl DoTimeBasedEvents
-	bl SetSav1WeatherFromCurrMapHeader
-	bl ChooseAmbientCrySpecies
-	bl update_sav1_flash_used_on_map
-	bl Overworld_ClearSavedMusic
-	bl mapheader_run_script_with_tag_x3
-	bl not_trainer_hill_battle_pyramid
-	ldr r0, [r4]
-	bl copy_map_tileset2_to_vram_2
-	ldr r0, [r4]
-	bl apply_map_tileset2_palette
-	movs r4, 0x6
-_08085116:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80ABF00
-	adds r4, 0x1
-	cmp r4, 0xC
-	ble _08085116
-	bl sub_80A0A2C
-	bl UpdateLocationHistoryForRoamer
-	bl RoamerMove
-	bl DoCurrentWeather
-	bl wild_encounter_reset_coro_args
-	bl mapheader_run_script_with_tag_x5
-	ldr r2, =gMapHeader
-	ldrb r0, [r2, 0x14]
-	cmp r0, 0x3A
-	bne _0808514C
-	ldr r1, =gLastMapSectionId
-	ldrh r1, [r1]
-	cmp r0, r1
-	beq _08085150
-_0808514C:
-	bl AddMapNamePopUpWindowTask
-_08085150:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end mliX_load_map
-
-	thumb_func_start mli0_load_map
-mli0_load_map: @ 8085160
-	push {r4-r7,lr}
-	adds r7, r0, 0
-	bl set_current_map_header_from_sav1_save_old_name
-	ldr r0, =gUnknown_020322D8
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _080851A2
-	ldr r0, =gMapHeader
-	ldrh r1, [r0, 0x12]
-	ldr r0, =0x00000169
-	cmp r1, r0
-	bne _08085190
-	bl sub_81AA1D8
-	b _080851A2
-	.pool
-_08085190:
-	bl InTrainerHill
-	cmp r0, 0
-	beq _0808519E
-	bl sub_81D5DF8
-	b _080851A2
-_0808519E:
-	bl LoadMapObjTemplatesFromHeader
-_080851A2:
-	ldr r4, =gMapHeader
-	ldrb r0, [r4, 0x17]
-	bl is_light_level_1_2_3_5_or_6
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldrb r0, [r4, 0x17]
-	bl is_light_level_8_or_9
-	lsls r0, 24
-	lsrs r6, r0, 24
-	bl sub_80EB218
-	bl TrySetMapSaveWarpStatus
-	bl ClearTempFieldEventData
-	bl ResetCyclingRoadChallengeData
-	bl prev_quest_postbuffer_cursor_backup_reset
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	movs r0, 0x4
-	ldrsb r0, [r1, r0]
-	lsls r0, 16
-	lsrs r0, 16
-	ldrb r1, [r1, 0x5]
-	lsls r1, 24
-	asrs r1, 24
-	lsls r1, 16
-	lsrs r1, 16
-	bl TryUpdateRandomTrainerRematches
-	cmp r7, 0x1
-	beq _080851EE
-	bl DoTimeBasedEvents
-_080851EE:
-	bl SetSav1WeatherFromCurrMapHeader
-	bl ChooseAmbientCrySpecies
-	cmp r5, 0
-	beq _08085200
-	ldr r0, =0x00000888
-	bl FlagClear
-_08085200:
-	bl update_sav1_flash_used_on_map
-	bl Overworld_ClearSavedMusic
-	bl mapheader_run_script_with_tag_x3
-	bl UpdateLocationHistoryForRoamer
-	bl RoamerMoveToOtherLocationSet
-	ldrh r1, [r4, 0x12]
-	ldr r0, =0x00000169
-	cmp r1, r0
-	bne _08085234
-	movs r0, 0
-	bl battle_pyramid_map_load_related
-	b _08085246
-	.pool
-_08085234:
-	bl InTrainerHill
-	cmp r0, 0
-	beq _08085242
-	bl trainer_hill_map_load_related
-	b _08085246
-_08085242:
-	bl not_trainer_hill_battle_pyramid
-_08085246:
-	cmp r7, 0x1
-	beq _0808525E
-	cmp r6, 0
-	beq _0808525E
-	ldr r1, =gUnknown_03005DC0
-	ldr r0, [r1]
-	ldr r1, [r1, 0x4]
-	bl UpdateTVScreensOnMap
-	movs r0, 0x1
-	bl sub_80E9238
-_0808525E:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end mli0_load_map
-
-	thumb_func_start player_avatar_init_params_reset
-player_avatar_init_params_reset: @ 8085268
-	ldr r1, =gUnknown_02032300
-	movs r0, 0x1
-	strb r0, [r1, 0x1]
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end player_avatar_init_params_reset
-
-	thumb_func_start walkrun_find_lowest_active_bit_in_bitfield
-walkrun_find_lowest_active_bit_in_bitfield: @ 8085278
-	push {r4,lr}
-	bl player_get_direction_lower_nybble
-	ldr r4, =gUnknown_02032300
-	strb r0, [r4, 0x1]
-	movs r0, 0x2
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _08085298
-	movs r0, 0x2
-	b _080852CA
-	.pool
-_08085298:
-	movs r0, 0x4
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _080852A8
-	movs r0, 0x4
-	b _080852CA
-_080852A8:
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _080852B8
-	movs r0, 0x8
-	b _080852CA
-_080852B8:
-	movs r0, 0x10
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _080852C8
-	movs r0, 0x10
-	b _080852CA
-_080852C8:
-	movs r0, 0x1
-_080852CA:
-	strb r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end walkrun_find_lowest_active_bit_in_bitfield
-
-	thumb_func_start sub_80852D4
-sub_80852D4: @ 80852D4
-	push {r4-r7,lr}
-	bl Overworld_GetMapTypeOfSaveblockLocation
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	bl cur_mapdata_block_role_at_screen_center_acc_to_sav1
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	ldr r6, =gUnknown_02032300
-	adds r0, r6, 0
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_808532C
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, =0xffffff00
-	ands r7, r0
-	orrs r7, r1
-	adds r0, r6, 0
-	adds r2, r4, 0
-	adds r3, r5, 0
-	bl sub_808538C
-	lsls r0, 24
-	lsrs r0, 16
-	ldr r1, =0xffff00ff
-	ands r7, r1
-	orrs r7, r0
-	str r7, [r6]
-	adds r0, r6, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80852D4
-
-	thumb_func_start sub_808532C
-sub_808532C: @ 808532C
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	lsls r1, 16
-	lsrs r5, r1, 16
-	lsls r2, 24
-	lsrs r4, r2, 24
-	cmp r4, 0x8
-	beq _08085348
-	ldr r0, =0x0000088d
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _08085382
-_08085348:
-	cmp r4, 0x5
-	bne _08085354
-	movs r0, 0x10
-	b _08085384
-	.pool
-_08085354:
-	lsls r0, r5, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsSurfableWaterOrUnderwater
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08085368
-	movs r0, 0x8
-	b _08085384
-_08085368:
-	bl sav1_map_is_biking_allowed
-	cmp r0, 0x1
-	bne _08085382
-	ldrb r0, [r6]
-	cmp r0, 0x2
-	bne _0808537A
-	movs r0, 0x2
-	b _08085384
-_0808537A:
-	cmp r0, 0x4
-	bne _08085382
-	movs r0, 0x4
-	b _08085384
-_08085382:
-	movs r0, 0x1
-_08085384:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808532C
-
-	thumb_func_start sub_808538C
-sub_808538C: @ 808538C
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r7, r1, 24
-	lsls r2, 16
-	lsrs r4, r2, 16
-	lsls r3, 24
-	lsrs r5, r3, 24
-	ldr r0, =0x0000088d
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _080853AC
-	cmp r5, 0x6
-	beq _0808540C
-_080853AC:
-	lsls r4, 24
-	lsrs r5, r4, 24
-	adds r0, r5, 0
-	bl MetatileBehavior_IsDeepSouthWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _080853E8
-	adds r0, r5, 0
-	bl MetatileBehavior_IsNonAnimDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08085442
-	adds r0, r5, 0
-	bl MetatileBehavior_IsDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08085442
-	adds r0, r5, 0
-	bl MetatileBehavior_IsSouthArrowWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080853F0
-_080853E8:
-	movs r0, 0x2
-	b _08085448
-	.pool
-_080853F0:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsNorthArrowWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08085442
-	adds r0, r5, 0
-	bl MetatileBehavior_IsWestArrowWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08085410
-_0808540C:
-	movs r0, 0x4
-	b _08085448
-_08085410:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsEastArrowWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08085422
-	movs r0, 0x3
-	b _08085448
-_08085422:
-	ldrb r0, [r6]
-	cmp r0, 0x10
-	bne _0808542C
-	cmp r7, 0x8
-	beq _08085446
-_0808542C:
-	cmp r0, 0x8
-	bne _08085434
-	cmp r7, 0x10
-	beq _08085446
-_08085434:
-	lsrs r0, r4, 24
-	bl MetatileBehavior_IsLadder
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08085446
-_08085442:
-	movs r0, 0x1
-	b _08085448
-_08085446:
-	ldrb r0, [r6, 0x1]
-_08085448:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808538C
-
-	thumb_func_start cur_mapdata_block_role_at_screen_center_acc_to_sav1
-cur_mapdata_block_role_at_screen_center_acc_to_sav1: @ 8085450
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	adds r0, 0x7
-	movs r2, 0x2
-	ldrsh r1, [r1, r2]
-	adds r1, 0x7
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 16
-	lsrs r0, 16
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end cur_mapdata_block_role_at_screen_center_acc_to_sav1
-
-	thumb_func_start sav1_map_is_biking_allowed
-sav1_map_is_biking_allowed: @ 8085474
-	push {lr}
-	ldr r0, =gMapHeader
-	ldrb r1, [r0, 0x1A]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0808548C
-	movs r0, 0x1
-	b _0808548E
-	.pool
-_0808548C:
-	movs r0, 0
-_0808548E:
-	pop {r1}
-	bx r1
-	thumb_func_end sav1_map_is_biking_allowed
-
-	thumb_func_start update_sav1_flash_used_on_map
-update_sav1_flash_used_on_map: @ 8085494
-	push {lr}
-	ldr r0, =gMapHeader
-	ldrb r1, [r0, 0x15]
-	cmp r1, 0
-	bne _080854B0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	adds r0, 0x30
-	strb r1, [r0]
-	b _080854DE
-	.pool
-_080854B0:
-	ldr r0, =0x00000888
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _080854D0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	adds r0, 0x30
-	movs r1, 0x1
-	strb r1, [r0]
-	b _080854DE
-	.pool
-_080854D0:
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =gUnknown_0854FE78
-	ldr r0, [r0]
-	subs r0, 0x1
-	adds r1, 0x30
-	strb r0, [r1]
-_080854DE:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end update_sav1_flash_used_on_map
-
-	thumb_func_start Overworld_SetFlashLevel
-Overworld_SetFlashLevel: @ 80854EC
-	push {lr}
-	adds r1, r0, 0
-	cmp r1, 0
-	blt _080854FC
-	ldr r0, =gUnknown_0854FE78
-	ldr r0, [r0]
-	cmp r1, r0
-	ble _080854FE
-_080854FC:
-	movs r1, 0
-_080854FE:
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	adds r0, 0x30
-	strb r1, [r0]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Overworld_SetFlashLevel
-
-	thumb_func_start Overworld_GetFlashLevel
-Overworld_GetFlashLevel: @ 8085514
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	adds r0, 0x30
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end Overworld_GetFlashLevel
-
-	thumb_func_start sub_8085524
-sub_8085524: @ 8085524
-	push {lr}
-	ldr r1, =gSaveBlock1Ptr
-	ldr r1, [r1]
-	strh r0, [r1, 0x32]
-	bl get_mapdata_header
-	ldr r1, =gMapHeader
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8085524
-
-	thumb_func_start sub_8085540
-sub_8085540: @ 8085540
-	ldr r1, =gUnknown_020322D8
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_8085540
-
-	thumb_func_start sub_808554C
-sub_808554C: @ 808554C
-	ldr r0, =gUnknown_020322D8
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_808554C
-
-	thumb_func_start sub_8085558
-sub_8085558: @ 8085558
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, =0x0000088a
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _080855AC
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	cmp r0, 0
-	bne _080855AC
-	movs r0, 0x1
-	ldrsb r0, [r4, r0]
-	cmp r0, 0x5
-	blt _08085584
-	cmp r0, 0x8
-	ble _0808559E
-	cmp r0, 0x2B
-	bgt _08085584
-	cmp r0, 0x27
-	bge _0808559E
-_08085584:
-	ldr r0, =0x0000405e
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x3
-	bls _080855AC
-	movs r0, 0x1
-	ldrsb r0, [r4, r0]
-	cmp r0, 0x2E
-	bgt _080855AC
-	cmp r0, 0x2C
-	blt _080855AC
-_0808559E:
-	movs r0, 0x1
-	b _080855AE
-	.pool
-_080855AC:
-	movs r0, 0
-_080855AE:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8085558
-
-	thumb_func_start sub_80855B4
-sub_80855B4: @ 80855B4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, =0x000040ca
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bne _080855D6
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	cmp r0, 0
-	bne _080855D6
-	movs r0, 0x1
-	ldrsb r0, [r4, r0]
-	cmp r0, 0x7
-	beq _080855E0
-_080855D6:
-	movs r0, 0
-	b _080855E2
-	.pool
-_080855E0:
-	movs r0, 0x1
-_080855E2:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80855B4
-
-	thumb_func_start sub_80855E8
-sub_80855E8: @ 80855E8
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, =0x000040b3
-	bl VarGet
-	lsls r0, 16
-	cmp r0, 0
-	bne _08085606
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	cmp r0, 0x20
-	bne _08085606
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0x1
-	bls _08085610
-_08085606:
-	movs r0, 0
-	b _08085612
-	.pool
-_08085610:
-	movs r0, 0x1
-_08085612:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80855E8
-
-	thumb_func_start sub_8085618
-sub_8085618: @ 8085618
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, =0x0000405d
-	adds r0, r4, 0
-	bl VarGet
-	lsls r0, 16
-	cmp r0, 0
-	beq _0808564C
-	adds r0, r4, 0
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x2
-	bhi _0808564C
-	movs r0, 0
-	ldrsb r0, [r5, r0]
-	cmp r0, 0xE
-	bne _0808564C
-	ldrb r0, [r5, 0x1]
-	subs r0, 0x9
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _08085654
-_0808564C:
-	movs r0, 0
-	b _08085656
-	.pool
-_08085654:
-	movs r0, 0x1
-_08085656:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8085618
-
-	thumb_func_start warp_target_get_music
-warp_target_get_music: @ 808565C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80855B4
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bne _08085674
-	ldr r0, =0x0000ffff
-	b _080856CE
-	.pool
-_08085674:
-	adds r0, r4, 0
-	bl sub_8085558
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bne _0808568C
-	ldr r0, =0x000001bb
-	b _080856CE
-	.pool
-_0808568C:
-	adds r0, r4, 0
-	bl sub_8085618
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bne _080856A4
-	ldr r0, =0x000001b9
-	b _080856CE
-	.pool
-_080856A4:
-	adds r0, r4, 0
-	bl sub_80855E8
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	beq _080856CA
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	ldrsb r1, [r4, r1]
-	lsls r1, 16
-	lsrs r1, 16
-	bl Overworld_GetMapHeaderByGroupAndId
-	ldrh r0, [r0, 0x10]
-	b _080856CE
-_080856CA:
-	movs r0, 0xCB
-	lsls r0, 1
-_080856CE:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end warp_target_get_music
-
-	thumb_func_start sav1_map_get_music
-sav1_map_get_music: @ 80856D4
-	push {r4,lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xD0
-	lsls r0, 5
-	cmp r1, r0
-	bne _080856FC
-	bl GetSav1Weather
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x8
-	bne _080856FC
-	ldr r0, =0x00000199
-	b _08085730
-	.pool
-_080856FC:
-	ldr r4, =gSaveBlock1Ptr
-	ldr r0, [r4]
-	adds r0, 0x4
-	bl warp_target_get_music
-	lsls r0, 16
-	lsrs r1, r0, 16
-	ldr r0, =0x00007fff
-	cmp r1, r0
-	beq _0808571C
-	adds r0, r1, 0
-	b _08085730
-	.pool
-_0808571C:
-	ldr r0, [r4]
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x17
-	ble _0808572C
-	movs r0, 0xC9
-	lsls r0, 1
-	b _08085730
-_0808572C:
-	movs r0, 0xB4
-	lsls r0, 1
-_08085730:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sav1_map_get_music
-
-	thumb_func_start warp1_target_get_music
-warp1_target_get_music: @ 8085738
-	push {lr}
-	ldr r0, =gWarpDestination
-	bl warp_target_get_music
-	lsls r0, 16
-	lsrs r1, r0, 16
-	ldr r0, =0x00007fff
-	cmp r1, r0
-	beq _08085758
-	adds r0, r1, 0
-	b _08085774
-	.pool
-_08085758:
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldrh r1, [r0, 0x4]
-	movs r0, 0x80
-	lsls r0, 2
-	cmp r1, r0
-	beq _08085770
-	subs r0, 0x6E
-	b _08085774
-	.pool
-_08085770:
-	movs r0, 0xB4
-	lsls r0, 1
-_08085774:
-	pop {r1}
-	bx r1
-	thumb_func_end warp1_target_get_music
-
-	thumb_func_start call_ResetMapMusic
-call_ResetMapMusic: @ 8085778
-	push {lr}
-	bl ResetMapMusic
-	pop {r0}
-	bx r0
-	thumb_func_end call_ResetMapMusic
-
-	thumb_func_start Overworld_PlaySpecialMapMusic
-Overworld_PlaySpecialMapMusic: @ 8085784
-	push {r4,lr}
-	bl sav1_map_get_music
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, =0x000001bb
-	cmp r4, r0
-	beq _080857D6
-	ldr r0, =0x0000ffff
-	cmp r4, r0
-	beq _080857D6
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldrh r0, [r1, 0x2C]
-	cmp r0, 0
-	beq _080857B4
-	adds r4, r0, 0
-	b _080857D6
-	.pool
-_080857B4:
-	bl Overworld_GetMapTypeOfSaveblockLocation
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x5
-	bne _080857C8
-	ldr r4, =0x0000019b
-	b _080857D6
-	.pool
-_080857C8:
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _080857D6
-	ldr r4, =0x0000016d
-_080857D6:
-	bl GetCurrentMapMusic
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r4, r0
-	beq _080857E8
-	adds r0, r4, 0
-	bl PlayNewMapMusic
-_080857E8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Overworld_PlaySpecialMapMusic
-
-	thumb_func_start Overworld_SetSavedMusic
-Overworld_SetSavedMusic: @ 80857F4
-	ldr r1, =gSaveBlock1Ptr
-	ldr r1, [r1]
-	strh r0, [r1, 0x2C]
-	bx lr
-	.pool
-	thumb_func_end Overworld_SetSavedMusic
-
-	thumb_func_start Overworld_ClearSavedMusic
-Overworld_ClearSavedMusic: @ 8085800
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	movs r0, 0
-	strh r0, [r1, 0x2C]
-	bx lr
-	.pool
-	thumb_func_end Overworld_ClearSavedMusic
-
-	thumb_func_start sub_8085810
-sub_8085810: @ 8085810
-	push {r4-r6,lr}
-	ldr r0, =0x00004001
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08085890
-	bl warp1_target_get_music
-	lsls r0, 16
-	lsrs r4, r0, 16
-	bl GetCurrentMapMusic
-	lsls r0, 16
-	lsrs r5, r0, 16
-	ldr r0, =0x000001bb
-	cmp r4, r0
-	beq _08085856
-	ldr r0, =0x0000ffff
-	cmp r4, r0
-	beq _08085856
-	ldr r0, =0x0000019b
-	cmp r5, r0
-	beq _08085890
-	ldr r6, =0x0000016d
-	cmp r5, r6
-	beq _08085890
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _08085856
-	adds r4, r6, 0
-_08085856:
-	cmp r4, r5
-	beq _08085890
-	movs r0, 0x6
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _08085888
-	adds r0, r4, 0
-	movs r1, 0x4
-	movs r2, 0x4
-	bl FadeOutAndFadeInNewMapMusic
-	b _08085890
-	.pool
-_08085888:
-	adds r0, r4, 0
-	movs r1, 0x8
-	bl FadeOutAndPlayNewMapMusic
-_08085890:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8085810
-
-	thumb_func_start Overworld_ChangeMusicToDefault
-Overworld_ChangeMusicToDefault: @ 8085898
-	push {r4,lr}
-	bl GetCurrentMapMusic
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	bl sav1_map_get_music
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r4, r0
-	beq _080858BE
-	bl sav1_map_get_music
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x8
-	bl FadeOutAndPlayNewMapMusic
-_080858BE:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end Overworld_ChangeMusicToDefault
-
-	thumb_func_start Overworld_ChangeMusicTo
-Overworld_ChangeMusicTo: @ 80858C4
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	bl GetCurrentMapMusic
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, r4
-	beq _080858E4
-	ldr r0, =0x000001bb
-	cmp r1, r0
-	beq _080858E4
-	adds r0, r4, 0
-	movs r1, 0x8
-	bl FadeOutAndPlayNewMapMusic
-_080858E4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Overworld_ChangeMusicTo
-
-	thumb_func_start is_warp1_light_level_8_or_9
-is_warp1_light_level_8_or_9: @ 80858F0
-	push {lr}
-	bl warp1_get_mapheader
-	ldrb r0, [r0, 0x17]
-	bl is_light_level_8_or_9
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08085908
-	movs r0, 0x4
-	b _0808590A
-_08085908:
-	movs r0, 0x2
-_0808590A:
-	pop {r1}
-	bx r1
-	thumb_func_end is_warp1_light_level_8_or_9
 
-	thumb_func_start music_something
-music_something: @ 8085910
-	push {r4,r5,lr}
-	bl GetCurrentMapMusic
-	lsls r0, 16
-	lsrs r5, r0, 16
-	bl warp1_target_get_music
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, =0x00004001
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808597E
-	bl GetCurrentMapMusic
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r4, r0
-	beq _0808597E
-	ldr r0, =0x0000016d
-	cmp r5, r0
-	bne _08085972
-	ldr r0, =0x000040ca
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x2
-	bne _08085972
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x0000ffff
-	ldrh r2, [r0, 0x4]
-	movs r0, 0xE0
-	lsls r0, 3
-	cmp r2, r0
-	bne _08085972
-	ldr r3, =gWarpDestination
-	ldrh r0, [r3]
-	ands r1, r0
-	cmp r1, r2
-	bne _08085972
-	ldr r1, [r3, 0x4]
-	ldr r0, =0x0035001d
-	cmp r1, r0
-	beq _0808597E
-_08085972:
-	bl is_warp1_light_level_8_or_9
-	lsls r0, 24
-	lsrs r0, 24
-	bl FadeOutMapMusic
-_0808597E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end music_something
 
-	thumb_func_start sub_80859A0
-sub_80859A0: @ 80859A0
-	push {lr}
-	bl IsNotWaitingForBGMStop
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80859A0
-
-	thumb_func_start sub_80859B0
-sub_80859B0: @ 80859B0
-	push {lr}
-	movs r0, 0x4
-	bl FadeOutMapMusic
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80859B0
 
 	thumb_func_start sub_80859BC
 sub_80859BC: @ 80859BC
@@ -1491,7 +17,7 @@ sub_80859BC: @ 80859BC
 	mov r0, sp
 	adds r1, r4, 0
 	bl PlayerGetDestCoords
-	ldr r0, =gUnknown_02032306
+	ldr r0, =sIsAmbientCryWaterMon
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080859F0
@@ -1524,7 +50,7 @@ _080859F0:
 	bl __umodsi3
 	adds r2, r0, 0
 	adds r2, 0x32
-	ldr r0, =gUnknown_02032304
+	ldr r0, =sAmbientCrySpecies
 	ldrh r0, [r0]
 	lsls r4, 24
 	asrs r4, 24
@@ -1567,7 +93,7 @@ _08085A60:
 	.4byte _08085B0C
 	.4byte _08085B20
 _08085A74:
-	ldr r0, =gUnknown_02032304
+	ldr r0, =sAmbientCrySpecies
 	ldrh r0, [r0]
 	cmp r0, 0
 	bne _08085A84
@@ -1673,17 +199,17 @@ ChooseAmbientCrySpecies: @ 8085B2C
 	lsls r0, 24
 	cmp r0, 0
 	bne _08085B5C
-	ldr r1, =gUnknown_02032306
+	ldr r1, =sIsAmbientCryWaterMon
 	movs r0, 0x1
 	strb r0, [r1]
 	bl GetLocalWaterMon
 	b _08085B62
 	.pool
 _08085B5C:
-	ldr r0, =gUnknown_02032306
+	ldr r0, =sIsAmbientCryWaterMon
 	bl GetLocalWildMon
 _08085B62:
-	ldr r1, =gUnknown_02032304
+	ldr r1, =sAmbientCrySpecies
 	strh r0, [r1]
 	pop {r0}
 	bx r0
@@ -1796,8 +322,8 @@ _08085C10:
 	bx r1
 	thumb_func_end Overworld_MapTypeAllowsTeleportAndFly
 
-	thumb_func_start is_light_level_8_or_9
-is_light_level_8_or_9: @ 8085C14
+	thumb_func_start Overworld_MapTypeIsIndoors
+Overworld_MapTypeIsIndoors: @ 8085C14
 	push {lr}
 	lsls r0, 24
 	movs r1, 0xF8
@@ -1813,7 +339,7 @@ _08085C28:
 _08085C2A:
 	pop {r1}
 	bx r1
-	thumb_func_end is_light_level_8_or_9
+	thumb_func_end Overworld_MapTypeIsIndoors
 
 	thumb_func_start sav1_saved_warp2_map_get_name
 sav1_saved_warp2_map_get_name: @ 8085C30
@@ -2483,7 +1009,7 @@ sub_8086204: @ 8086204
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _08086222
-	bl AddMapNamePopUpWindowTask
+	bl ShowMapNamePopup
 _08086222:
 	bl sub_80AF3C8
 	pop {r0}
@@ -2899,7 +1425,7 @@ _080865F4:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _08086622
-	bl AddMapNamePopUpWindowTask
+	bl ShowMapNamePopup
 	b _08086622
 	.pool
 _08086618: