Merge branch 'master' of https://github.com/pret/pokeemerald

asm/battle_frontier_1.s

@@ -6481,7 +6481,7 @@ _0819218E:
 	mov r0, r9
 	cmp r0, 0
 	bne _081921C4
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	b _081921FC
 	.pool
@@ -9539,7 +9539,7 @@ _08193B84:
 	ldr r0, [r4]
 	bl Free
 	str r6, [r4]
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	ldr r1, =gTasks
 	lsls r0, r5, 2
@@ -11320,7 +11320,7 @@ _08194B24:
 	ands r0, r1
 	cmp r0, 0
 	bne _08194B3C
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask
@@ -14665,7 +14665,7 @@ sub_819672C: @ 819672C
 	ldrh r2, [r0, 0xA]
 	ldrh r1, [r0, 0xC]
 	adds r0, r2, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	pop {r1}
 	bx r1

asm/battle_frontier_2.s

@@ -18683,7 +18683,7 @@ _081A4294:
 	adds r0, r3, r4
 	ldrh r1, [r0]
 	movs r0, 0x20
-	bl sav12_xor_set
+	bl SetGameStat
 	ldr r1, [r7]
 	adds r0, r1, r6
 	adds r0, r4
@@ -31002,7 +31002,7 @@ sub_81AA810: @ 81AA810
 	ldrb r1, [r3]
 	adds r1, 0x2C
 	movs r0, 0x19
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r5, r0, 0
 	movs r7, 0
 	ldr r1, [r5, 0x4]

asm/battle_records.s

@@ -45,13 +45,13 @@ _0813BFCA:
 	bge _0813BFCA
 	movs r0, 0x17
 	movs r1, 0
-	bl sav12_xor_set
+	bl SetGameStat
 	movs r0, 0x18
 	movs r1, 0
-	bl sav12_xor_set
+	bl SetGameStat
 	movs r0, 0x19
 	movs r1, 0
-	bl sav12_xor_set
+	bl SetGameStat
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -855,7 +855,7 @@ sub_813C664: @ 813C664
 	ands r0, r1
 	cmp r0, 0
 	bne _0813C694
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	ldr r0, =gUnknown_0203AB78
 	ldr r0, [r0]

asm/battle_tower.s

@@ -3172,7 +3172,7 @@ _08163A3C:
 _08163A74:
 	bl sub_816537C
 _08163A78:
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	add sp, 0x4
 	pop {r4-r6}

asm/cable_car.s

@@ -777,7 +777,7 @@ _08150340:
 	bl warp_in
 	ldr r0, =gFieldCallback
 	str r4, [r0]
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	add sp, 0x8
 	pop {r3}

asm/cable_club.s

@@ -736,7 +736,7 @@ _080B2984:
 	.pool
 _080B2994:
 	bl GetLinkPlayerCount_2
-	ldr r4, =gUnknown_03005DB8
+	ldr r4, =gFieldLinkPlayerCount
 	strb r0, [r4]
 	bl GetMultiplayerId
 	ldr r1, =gUnknown_03005DB4
@@ -826,7 +826,7 @@ _080B2A4E:
 	.pool
 _080B2A6C:
 	bl GetLinkPlayerCount_2
-	ldr r4, =gUnknown_03005DB8
+	ldr r4, =gFieldLinkPlayerCount
 	strb r0, [r4]
 	bl GetMultiplayerId
 	ldr r1, =gUnknown_03005DB4
@@ -2132,12 +2132,12 @@ _080B35E0:
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B35FE
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	b _080B35FE
 	.pool
 _080B35F8:
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 _080B35FE:
 	bl RunTasks
@@ -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
@@ -2586,7 +2586,7 @@ sp02A_crash_sound: @ 80B39BC
 	push {lr}
 	ldr r0, =gSpecialVar_0x8006
 	ldrb r0, [r0]
-	ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r1, =CB2_ReturnToFieldContinueScript
 	bl sub_80C4E74
 	pop {r0}
 	bx r0

asm/contest.s

@@ -5588,7 +5588,7 @@ sub_80DA830: @ 80DA830
 	bl FreeAllWindowBuffers
 	bl sub_80D7A5C
 	bl FreeMonSpritesGfx
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 _080DA860:
 	pop {r0}

asm/contest_link_80F57C4.s

@@ -1825,7 +1825,7 @@ _080F6884:
 	adds r0, r5, 0
 	bl DestroyTask
 	bl FreeAllWindowBuffers
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	bl sub_80F7E64
 _080F68A8:

asm/field_control_avatar.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_809BEDC
-sub_809BEDC: @ 809BEDC
+	thumb_func_start FieldClearPlayerInput
+FieldClearPlayerInput: @ 809BEDC
 	push {r4,r5,lr}
 	movs r1, 0x2
 	negs r1, r1
@@ -29,11 +29,11 @@ sub_809BEDC: @ 809BEDC
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_809BEDC
+	thumb_func_end FieldClearPlayerInput
 
-	thumb_func_start process_overworld_input
-@ void process_overworld_input(overworld_input_data *input_data, char buttons_new, char buttons_held)
-process_overworld_input: @ 809BF08
+	thumb_func_start FieldGetPlayerInput
+@ void FieldGetPlayerInput(overworld_input_data *input_data, char buttons_new, char buttons_held)
+FieldGetPlayerInput: @ 809BF08
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -176,7 +176,7 @@ _0809C006:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end process_overworld_input
+	thumb_func_end FieldGetPlayerInput
 
 	thumb_func_start sub_809C014
 @ int sub_809C014(overworld_input_data *input_data)
@@ -2006,7 +2006,7 @@ _0809CF20:
 	bl sub_8084D5C
 	ldrb r0, [r5, 0x7]
 	ldrb r1, [r5, 0x6]
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldr r1, [r0, 0x4]
 	ldrb r0, [r5, 0x5]
 	ldr r1, [r1, 0x8]

asm/field_effect.s

@@ -1943,7 +1943,7 @@ _080B69D4:
 	thumb_func_start sub_80B69DC
 sub_80B69DC: @ 80B69DC
 	push {lr}
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	ldr r1, =gFieldCallback
 	ldr r0, =mapldr_080842E8
@@ -2008,9 +2008,9 @@ _080B6A64:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080B6A8A
-	bl flag_var_implications_of_teleport_
+	bl Overworld_ResetStateAfterFly
 	bl warp_in
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r1, =gFieldCallback
 	ldr r0, =mapldr_08084390
@@ -2764,7 +2764,7 @@ sub_80B7060: @ 80B7060
 	ldr r1, =gFieldCallback
 	ldr r0, =sub_80B70B4
 	str r0, [r1]
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r0, =sub_80B6E88
 	bl FindTaskIdByFunc
@@ -3730,7 +3730,7 @@ sub_80B7814: @ 80B7814
 	ldr r1, =gFieldCallback
 	ldr r0, =mapldr_080851BC
 	str r0, [r1]
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r0, =sub_80B75F0
 	bl FindTaskIdByFunc
@@ -4205,7 +4205,7 @@ sub_80B7BF4: @ 80B7BF4
 	ldr r1, =gFieldCallback
 	ldr r0, =sub_80B6B68
 	str r0, [r1]
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r0, =sub_80B7A8C
 	bl FindTaskIdByFunc
@@ -4402,7 +4402,7 @@ _080B7D86:
 	ldr r1, =gFieldCallback
 	ldr r0, =mapldr_080859D4
 	str r0, [r1]
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r0, =sub_80B7CE4
 	bl FindTaskIdByFunc
@@ -4881,9 +4881,9 @@ _080B81B8:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _080B81E6
-	bl copy_saved_warp3_bank_and_enter_x_to_warp1
+	bl Overworld_SetWarpDestToLastHealLoc
 	bl warp_in
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r1, =gFieldCallback
 	ldr r0, =mapldr_08085D88
@@ -5211,7 +5211,7 @@ _080B8484:
 	thumb_func_start sub_80B849C
 sub_80B849C: @ 80B849C
 	push {r4,lr}
-	bl sav1_map_get_light_level
+	bl Overworld_GetMapTypeOfSaveblockLocation
 	lsls r0, 24
 	lsrs r0, 24
 	bl is_light_level_1_2_3_5_or_6

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
@@ -7855,7 +7855,7 @@ pal_fill_for_maplights: @ 80AF040
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sav1_map_get_light_level
+	bl Overworld_GetMapTypeOfSaveblockLocation
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -7910,7 +7910,7 @@ pal_fill_black: @ 80AF0A0
 	thumb_func_start sub_80AF0B4
 sub_80AF0B4: @ 80AF0B4
 	push {r4,lr}
-	bl sav1_map_get_light_level
+	bl Overworld_GetMapTypeOfSaveblockLocation
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -9015,7 +9015,7 @@ _080AF9D0:
 	cmp r0, 0
 	bne _080AF9E8
 	bl warp_in
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r5, 0
 	bl DestroyTask
@@ -9087,7 +9087,7 @@ _080AFA64:
 	b _080AFA7C
 _080AFA6C:
 	bl warp_in
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r6, 0
 	bl DestroyTask
@@ -10060,7 +10060,7 @@ _080B0222:
 	b _080B023A
 _080B022A:
 	bl warp_in
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r5, 0
 	bl DestroyTask
@@ -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

asm/field_specials.s

@@ -20,7 +20,7 @@ Special_ShowDiploma: @ 8137CB4
 Special_ViewWallClock: @ 8137CC8
 	push {lr}
 	ldr r0, =gMain
-	ldr r1, =c2_exit_to_overworld_2_switch
+	ldr r1, =CB2_ReturnToField
 	str r1, [r0, 0x8]
 	ldr r0, =Cb2_ViewWallClock
 	bl SetMainCallback2
@@ -1906,7 +1906,7 @@ _08138C7E:
 	thumb_func_start CB2_FieldShowRegionMap
 CB2_FieldShowRegionMap: @ 8138C84
 	push {lr}
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl sub_817018C
 	pop {r0}
 	bx r0
@@ -7153,14 +7153,14 @@ sub_813B7D8: @ 813B7D8
 	ldrh r0, [r0]
 	cmp r0, 0
 	bne _0813B7F8
-	ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r2, =CB2_ReturnToFieldContinueScript
 	movs r0, 0
 	movs r1, 0x1
 	bl DoRayquazaScene
 	b _0813B802
 	.pool
 _0813B7F8:
-	ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r2, =CB2_ReturnToFieldContinueScript
 	movs r0, 0x1
 	movs r1, 0
 	bl DoRayquazaScene

asm/field_tasks.s

@@ -88,7 +88,7 @@ sub_809D908: @ 809D908
 	bl sub_809D8B8
 	adds r0, r4, 0x2
 	adds r1, r4, 0x4
-	bl wild_encounter_related
+	bl UpdateAmbientCry
 _0809D930:
 	pop {r4}
 	pop {r0}
@@ -96,8 +96,8 @@ _0809D930:
 	.pool
 	thumb_func_end sub_809D908
 
-	thumb_func_start overworld_ensure_per_step_coros_running
-overworld_ensure_per_step_coros_running: @ 809D93C
+	thumb_func_start SetUpFieldTasks
+SetUpFieldTasks: @ 809D93C
 	push {r4,r5,lr}
 	ldr r5, =task_per_step_callback_manager
 	adds r0, r5, 0
@@ -142,7 +142,7 @@ _0809D992:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end overworld_ensure_per_step_coros_running
+	thumb_func_end SetUpFieldTasks
 
 	thumb_func_start ActivatePerStepCallback
 ActivatePerStepCallback: @ 809D9A8
@@ -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

asm/fieldmap.s

@@ -11,7 +11,7 @@ mapconnection_get_mapheader: @ 8087D44
 	ldrb r2, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
 	adds r0, r2, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	pop {r1}
 	bx r1
 	thumb_func_end mapconnection_get_mapheader

asm/fldeff_flash.s

@@ -217,7 +217,7 @@ sub_8137304: @ 8137304
 	bl get_map_light_from_warp0
 	lsls r0, 24
 	lsrs r6, r0, 24
-	bl sav1_map_get_light_level
+	bl Overworld_GetMapTypeOfSaveblockLocation
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r3, 0

asm/learn_move.s

@@ -713,7 +713,7 @@ _08160CD8:
 	b _08160E8A
 _08160CE6:
 	bl sub_8160EA0
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	b _08160E8A
 	.pool

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

asm/party_menu.s

@@ -10032,7 +10032,7 @@ _081B557C:
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r1, r0, 0
 	ldr r0, =gStringVar1
 	ldrb r1, [r1, 0x14]
@@ -10057,7 +10057,7 @@ _081B55B8:
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r1, r0, 0
 	ldr r0, =gStringVar1
 	ldrb r1, [r1, 0x14]
@@ -10083,7 +10083,7 @@ _081B5614:
 	.pool
 _081B5624:
 	ldr r1, =gUnknown_0203CEC8
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 _081B5628:
 	str r0, [r1]
 	adds r0, r6, 0
@@ -10189,7 +10189,7 @@ _081B56F8:
 	b _081B572A
 _081B56FE:
 	ldr r1, =gUnknown_0203CEC8
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	str r0, [r1]
 	adds r0, r4, 0
 	bl sub_81B12C0
@@ -10408,7 +10408,7 @@ sub_81B58A8: @ 81B58A8
 	str r0, [sp]
 	ldr r0, =sub_81B1370
 	str r0, [sp, 0x4]
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -14836,7 +14836,7 @@ CB2_PartyMenuFromStartMenu: @ 81B7F34
 	str r0, [sp]
 	ldr r0, =sub_81B1370
 	str r0, [sp, 0x4]
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -16021,7 +16021,7 @@ sub_81B892C: @ 81B892C
 	str r0, [sp]
 	ldr r0, =sub_81B1370
 	str r0, [sp, 0x4]
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -16042,7 +16042,7 @@ sub_81B8958: @ 81B8958
 	str r0, [sp]
 	ldr r0, =sub_81B1370
 	str r0, [sp, 0x4]
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	str r0, [sp, 0x8]
 	movs r0, 0xB
 	movs r1, 0
@@ -17283,7 +17283,7 @@ sub_81B9354: @ 81B9354
 	str r1, [sp]
 	ldr r1, =sub_81B1370
 	str r1, [sp, 0x4]
-	ldr r1, =c2_exit_to_overworld_2_switch
+	ldr r1, =CB2_ReturnToField
 	str r1, [sp, 0x8]
 	movs r1, 0
 	movs r2, 0xB
@@ -17311,7 +17311,7 @@ _081B93A6:
 	ldr r0, =gUnknown_03005DB0
 	ldr r1, =hm_add_c3_without_phase_2
 	str r1, [r0]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	pop {r4}
 	pop {r0}
@@ -17420,7 +17420,7 @@ _081B9486:
 	ldr r1, =gUnknown_03005DB0
 	ldr r0, =hm_add_c3_without_phase_2
 	str r0, [r1]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -17556,7 +17556,7 @@ _081B95BA:
 	ldr r0, =gUnknown_03005DB0
 	ldr r1, =hm_add_c3_without_phase_2
 	str r1, [r0]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	pop {r4,r5}
 	pop {r0}
@@ -17660,7 +17660,7 @@ sub_81B968C: @ 81B968C
 	subs r3, 0x1
 	lsls r3, 24
 	lsrs r3, 24
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	str r0, [sp]
 	movs r0, 0x3
 	bl sub_81BF8EC

asm/player_pc.s

@@ -586,7 +586,7 @@ sub_816B31C: @ 816B31C
 	ldr r0, =gFieldCallback
 	ldr r1, =mapldr_080EBC0C
 	str r1, [r0]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -1279,7 +1279,7 @@ sub_816B900: @ 816B900
 	ldr r0, =gFieldCallback
 	ldr r1, =pal_fill_for_maplights_or_black
 	str r1, [r0]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -1538,7 +1538,7 @@ sub_816BB28: @ 816BB28
 	ldr r0, =gFieldCallback
 	ldr r1, =sub_816BB48
 	str r1, [r0]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	pop {r0}
 	bx r0

asm/pokedex.s

@@ -1244,7 +1244,7 @@ _080BBE18:
 	bl sub_80BC890
 	adds r0, r6, 0
 	bl DestroyTask
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	bl SetMainCallback2
 	ldr r0, =gMPlayInfo_BGM
 	ldr r1, =0x0000ffff

asm/pokedex_area_screen.s

@@ -308,7 +308,7 @@ _0813CCB8:
 	ldr r1, [r5]
 	ldrb r0, [r1, 0x10]
 	ldrb r1, [r1, 0x11]
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldr r1, [r5]
 	ldrb r0, [r0, 0x14]
 	strh r0, [r1, 0x12]
@@ -360,7 +360,7 @@ sub_813CD04: @ 813CD04
 	strb r3, [r1, 0x11]
 	adds r0, r5, 0
 	adds r1, r3, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	bl CorrectSpecialMapSecId
 	ldr r2, [r4]
@@ -496,7 +496,7 @@ sub_813CE34: @ 813CE34
 	lsrs r0, 24
 	lsls r1, 24
 	lsrs r1, 24
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	pop {r1}
 	bx r1

asm/pokemon_storage_system.s

@@ -657,7 +657,7 @@ sub_80C7678: @ 80C7678
 	ldr r1, =gFieldCallback
 	ldr r0, =mapldr_0808C6D8
 	str r0, [r1]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	pop {r0}
 	bx r0

asm/pokemon_summary_screen.s

@@ -2024,7 +2024,7 @@ sub_81C4EEC: @ 81C4EEC
 	thumb_func_start sub_81C4EFC
 sub_81C4EFC: @ 81C4EFC
 	push {lr}
-	ldr r1, =sub_8086194
+	ldr r1, =CB2_ReturnToFieldWithOpenMenu
 	movs r0, 0
 	bl sub_81C4F98
 	pop {r0}
@@ -2073,7 +2073,7 @@ sub_81C4F44: @ 81C4F44
 	ldr r0, =gUnknown_03005DB0
 	ldr r1, =hm_add_c3_without_phase_2
 	str r1, [r0]
-	ldr r1, =c2_exit_to_overworld_2_switch
+	ldr r1, =CB2_ReturnToField
 	movs r0, 0x3
 	bl sub_81C4F98
 	adds r0, r4, 0

asm/pokenav.s

@@ -14,7 +14,7 @@ CB2_PokeNav: @ 81C7250
 	str r0, [r4]
 	cmp r0, 0
 	bne _081C7270
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	bl SetMainCallback2
 	b _081C7292
 	.pool
@@ -66,7 +66,7 @@ sub_81C72BC: @ 81C72BC
 	str r0, [r4]
 	cmp r0, 0
 	bne _081C72F0
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	b _081C7320
 	.pool
@@ -351,12 +351,12 @@ _081C752C:
 	bl sub_81C7334
 	cmp r4, 0
 	beq _081C755C
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	b _081C7562
 	.pool
 _081C755C:
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	bl SetMainCallback2
 _081C7562:
 	pop {r4-r7}
@@ -8095,7 +8095,7 @@ sub_81CB0C8: @ 81CB0C8
 	ldrh r2, [r0, 0xA]
 	ldrh r1, [r0, 0xC]
 	adds r0, r2, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	pop {r1}
 	bx r1
@@ -30295,7 +30295,7 @@ sub_81D6120: @ 81D6120
 	push {lr}
 	movs r0, 0x1A
 	movs r1, 0x40
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldr r0, [r0, 0x4]
 	ldr r0, [r0, 0x8]
 	adds r0, 0x8
@@ -30334,7 +30334,7 @@ _081D6162:
 	adds r0, r1
 	ldrh r1, [r0]
 	movs r0, 0x1A
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldr r0, [r0, 0x4]
 	ldr r0, [r0, 0x8]
 _081D6176:

asm/post_battle_event_funcs.s

@@ -44,7 +44,7 @@ _0813776C:
 	ldrb r0, [r2, 0x11]
 	orrs r1, r0
 	movs r0, 0x1
-	bl sav12_xor_set
+	bl SetGameStat
 _0813778E:
 	bl sub_8076D48
 	ldr r0, =gSaveBlock2Ptr

asm/rom6.s

@@ -376,7 +376,7 @@ _0813574C:
 	thumb_func_start hm2_dig
 hm2_dig: @ 8135760
 	push {lr}
-	bl flagmods_08054D70
+	bl Overworld_ResetStateAfterDigEscRope
 	movs r0, 0x26
 	bl FieldEffectStart
 	bl GetCursorSelectionMonId

asm/rom_8011DC0.s

@@ -3116,7 +3116,7 @@ _08014070:
 	movs r0, 0x6
 	strb r0, [r1, 0x1]
 	ldr r1, =gMain
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	str r0, [r1, 0x8]
 	ldr r0, =sub_807AE50
 	bl SetMainCallback2
@@ -3258,7 +3258,7 @@ _080141D4:
 	eors r0, r1
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, =c2_exit_to_overworld_2_switch
+	ldr r1, =CB2_ReturnToField
 	bl sub_80C4E74
 _080141F2:
 	bl RunTasks
@@ -3399,7 +3399,7 @@ sub_8014304: @ 8014304
 	ldr r0, =0x00004087
 	bl VarSet
 	bl GetLinkPlayerCount
-	ldr r1, =gUnknown_03005DB8
+	ldr r1, =gFieldLinkPlayerCount
 	strb r0, [r1]
 	bl GetMultiplayerId
 	ldr r1, =gUnknown_03005DB4
@@ -3757,7 +3757,7 @@ _08014714:
 	bl GetCursorSelectionMonId
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, =c2_load_new_map
+	ldr r1, =CB2_LoadMap
 	bl sub_802A9A8
 	b _08014764
 	.pool
@@ -3766,7 +3766,7 @@ _08014734:
 	movs r1, 0x9
 	movs r2, 0x1
 	bl sub_8014290
-	ldr r0, =c2_load_new_map
+	ldr r0, =CB2_LoadMap
 	bl sub_8020C70
 	b _08014764
 	.pool
@@ -3778,7 +3778,7 @@ _0801474C:
 	bl GetCursorSelectionMonId
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, =c2_load_new_map
+	ldr r1, =CB2_LoadMap
 	bl sub_802493C
 _08014764:
 	adds r0, r4, 0
@@ -6931,7 +6931,7 @@ _08016502:
 	ldr r1, =gFieldCallback
 	ldr r0, =sub_80AF128
 	str r0, [r1]
-	ldr r1, =c2_exit_to_overworld_2_switch
+	ldr r1, =CB2_ReturnToField
 	movs r0, 0x8
 	bl sub_81B8904
 	b _08016878
@@ -7229,7 +7229,7 @@ _0801677E:
 	ldr r1, =gFieldCallback
 	ldr r0, =sub_80AF128
 	str r0, [r1]
-	ldr r1, =c2_exit_to_overworld_2_switch
+	ldr r1, =CB2_ReturnToField
 	movs r0, 0x9
 	bl sub_81B8904
 	adds r0, r6, 0
@@ -14941,7 +14941,7 @@ _0801A58C:
 	ldr r0, =gUnknown_03000DAC
 	ldr r0, [r0]
 	bl Free
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	pop {r4}
 	pop {r0}
@@ -16076,7 +16076,7 @@ _0801AF58:
 	bl sub_801ABDC
 	cmp r0, 0
 	beq _0801AFAE
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	b _0801AFAE
 	.pool
@@ -16102,7 +16102,7 @@ _0801AF98:
 	bl sub_801ABDC
 	cmp r0, 0
 	beq _0801AFAE
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 _0801AFAE:
 	bl RunTasks
@@ -23568,7 +23568,7 @@ _0801EBA8:
 	bne _0801EBC2
 	bl sub_801F544
 	bl sub_801DE30
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 _0801EBC2:
 	add sp, 0x4
@@ -27694,7 +27694,7 @@ _08020C26:
 	str r0, [r5]
 	adds r0, r4, 0
 	bl SetMainCallback2
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	cmp r4, r0
 	bne _08020C5A
 	ldr r2, =gTextFlags
@@ -27705,8 +27705,8 @@ _08020C26:
 	movs r0, 0xC8
 	lsls r0, 1
 	bl PlayNewMapMusic
-	ldr r0, =c1_overworld
-	bl set_callback1
+	ldr r0, =CB1_Overworld
+	bl SetMainCallback1
 _08020C5A:
 	movs r0, 0
 _08020C5C:

asm/rotating_gate.s

@@ -915,8 +915,8 @@ _080FBECA:
 	bx r0
 	thumb_func_end RotatingGatePuzzleCameraUpdate
 
-	thumb_func_start sub_80FBED0
-sub_80FBED0: @ 80FBED0
+	thumb_func_start RotatingGate_InitPuzzleAndGraphics
+RotatingGate_InitPuzzleAndGraphics: @ 80FBED0
 	push {lr}
 	bl GetCurrentMapRotatingGatePuzzleType
 	cmp r0, 0
@@ -929,7 +929,7 @@ sub_80FBED0: @ 80FBED0
 _080FBEEA:
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80FBED0
+	thumb_func_end RotatingGate_InitPuzzleAndGraphics
 
 	thumb_func_start CheckForRotatingGatePuzzleCollision
 CheckForRotatingGatePuzzleCollision: @ 80FBEF0

asm/roulette.s

@@ -2570,7 +2570,7 @@ sub_8141800: @ 8141800
 	movs r0, 0x1E
 	ldrsh r1, [r4, r0]
 	movs r0, 0x1D
-	bl sav12_xor_set
+	bl SetGameStat
 _08141848:
 	ldr r1, =sub_8141A18
 	ldr r2, =0x0000ffff
@@ -3276,7 +3276,7 @@ sub_8141E7C: @ 8141E7C
 	ldr r1, =gFieldCallback
 	ldr r0, =sub_80AF168
 	str r0, [r1]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	adds r0, r5, 0
 	bl DestroyTask

asm/script_pokemon_util_80F87D8.s

@@ -390,7 +390,7 @@ _080F8AB6:
 	thumb_func_start sub_80F8ACC
 sub_80F8ACC: @ 80F8ACC
 	push {lr}
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -1559,7 +1559,7 @@ _080F9478:
 	movs r0, 0x1
 	strh r0, [r1]
 _080F947E:
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -1599,7 +1599,7 @@ _080F94D0:
 	movs r0, 0x1
 	strh r0, [r1]
 _080F94D6:
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	pop {r0}
 	bx r0

asm/shop.s

@@ -230,7 +230,7 @@ CB2_ExitSellMenu: @ 80DFC48
 	ldr r0, =gFieldCallback
 	ldr r1, =MapPostLoadHook_ExitBuyOrSellMenu
 	str r1, [r0]
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -2706,7 +2706,7 @@ Task_ExitBuyMenu: @ 80E11B0
 	bne _080E11D6
 	bl RemoveMoneyLabelObject
 	bl BuyMenuFreeMemory
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask

asm/start_menu.s

@@ -591,7 +591,7 @@ StartMenu_PlayerName: @ 809FC8C
 	cmp r0, 0
 	beq _0809FCC8
 _0809FCB6:
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	bl sub_80C4DDC
 	b _0809FCEA
 	.pool
@@ -601,12 +601,12 @@ _0809FCC8:
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809FCE4
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	bl sub_80C51C4
 	b _0809FCEA
 	.pool
 _0809FCE4:
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	bl sub_80C4DDC
 _0809FCEA:
 	movs r0, 0x1
@@ -656,7 +656,7 @@ _0809FD38:
 	ldr r0, =CB2_InitOptionMenu
 	bl SetMainCallback2
 	ldr r1, =gMain
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	str r0, [r1, 0x8]
 	movs r0, 0x1
 _0809FD52:
@@ -703,7 +703,7 @@ _0809FDA0:
 	bl overworld_free_bg_tilemaps
 	ldr r0, =gUnknown_03005DB4
 	ldrb r0, [r0]
-	ldr r1, =sub_8086194
+	ldr r1, =CB2_ReturnToFieldWithOpenMenu
 	bl sub_80C4E74
 	movs r0, 0x1
 _0809FDB4:

asm/trade.s

@@ -10669,7 +10669,7 @@ _0807CF5C:
 	bl Free
 	str r4, [r7]
 _0807CFAA:
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	bl sub_807E784
 _0807CFB4:
@@ -12774,7 +12774,7 @@ _0807E3A8:
 	bl Free
 	str r4, [r7]
 _0807E3F6:
-	ldr r0, =c2_exit_to_overworld_2_switch
+	ldr r0, =CB2_ReturnToField
 	bl SetMainCallback2
 	bl sub_807E784
 _0807E400: