start working on battle setup

asm/battle_frontier_1.s

@@ -13887,7 +13887,7 @@ task_prev_quest: @ 81960A8
 	cmp r0, 0
 	bne _081960C2
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl sub_808B864
 	bl sub_808BCF4
 _081960C2:

asm/battle_frontier_2.s

@@ -12380,7 +12380,7 @@ _081A0C8E:
 sub_81A0C9C: @ 81A0C9C
 	push {lr}
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl sub_808B864
 	bl sub_808BCF4
 	movs r0, 0

asm/battle_tower.s

@@ -3534,7 +3534,7 @@ _08163E10:
 	bl sub_80B100C
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8145EF4
+	bl BattleTransition_StartOnField
 	b _08163E68
 	.pool
 _08163E2C:
@@ -3561,7 +3561,7 @@ _08163E2C:
 	movs r0, 0
 	bl PlayMapChosenOrBattleBGM
 	movs r0, 0x12
-	bl sub_8145EF4
+	bl BattleTransition_StartOnField
 _08163E68:
 	add sp, 0x4
 	pop {r4-r6}

asm/battle_transition.s

@@ -57,8 +57,8 @@ TestBattleTransition: @ 8145EDC
 	.pool
 	thumb_func_end TestBattleTransition
 
-	thumb_func_start sub_8145EF4
-sub_8145EF4: @ 8145EF4
+	thumb_func_start BattleTransition_StartOnField
+BattleTransition_StartOnField: @ 8145EF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -69,7 +69,7 @@ sub_8145EF4: @ 8145EF4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8145EF4
+	thumb_func_end BattleTransition_StartOnField
 
 	thumb_func_start sub_8145F10
 sub_8145F10: @ 8145F10

asm/field_control_avatar.s

@@ -1531,8 +1531,8 @@ _0809CB72:
 	.pool
 	thumb_func_end AdjustFriendship_step
 
-	thumb_func_start overworld_poison_timer_set
-overworld_poison_timer_set: @ 809CB80
+	thumb_func_start ResetPoisonStepCounter
+ResetPoisonStepCounter: @ 809CB80
 	push {lr}
 	ldr r0, =0x0000402b
 	movs r1, 0
@@ -1540,7 +1540,7 @@ overworld_poison_timer_set: @ 809CB80
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end overworld_poison_timer_set
+	thumb_func_end ResetPoisonStepCounter
 
 	thumb_func_start overworld_poison_step
 overworld_poison_step: @ 809CB94

asm/field_effect.s

@@ -1961,7 +1961,7 @@ mapldr_080842E8: @ 80B69FC
 	movs r1, 0
 	bl CreateTask
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
@@ -2057,7 +2057,7 @@ mapldr_08084390: @ 80B6AA4
 	bl FieldObjectTurn
 _080B6AE6:
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
@@ -2116,7 +2116,7 @@ sub_80B6B68: @ 80B6B68
 	bl sub_8085784
 	bl pal_fill_for_maplights
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r0, =sub_80B6B94
 	movs r1, 0
 	bl CreateTask
@@ -2534,7 +2534,7 @@ _080B6E9A:
 sub_80B6EC0: @ 80B6EC0
 	push {r4,lr}
 	adds r4, r0, 0
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl CameraObjectReset2
 	ldrb r0, [r4, 0xA]
 	bl sub_80E1558
@@ -3476,7 +3476,7 @@ sub_80B764C: @ 80B764C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl CameraObjectReset2
 	movs r0, 0
 	bl SetCameraPanningCallback
@@ -3807,7 +3807,7 @@ sub_80B78EC: @ 80B78EC
 	adds r5, r0, 0
 	adds r4, r1, 0
 	bl CameraObjectReset2
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gPlayerAvatar
 	movs r0, 0x1
 	strb r0, [r1, 0x6]
@@ -4055,7 +4055,7 @@ sub_80B7AE8: @ 80B7AE8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl CameraObjectReset2
 	ldr r1, =gPlayerAvatar
 	movs r0, 0x1
@@ -4287,7 +4287,7 @@ _080B7CC4:
 sub_80B7CC8: @ 80B7CC8
 	push {lr}
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r0, =sub_80B7CE4
 	movs r1, 0x50
 	bl CreateTask
@@ -4461,7 +4461,7 @@ mapldr_080859D4: @ 80B7E48
 	bl sub_8085784
 	bl pal_fill_for_maplights
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
@@ -4672,7 +4672,7 @@ sub_80B800C: @ 80B800C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl CameraObjectReset2
 	bl player_get_direction_lower_nybble
 	lsls r0, 24
@@ -4906,7 +4906,7 @@ mapldr_08085D88: @ 80B8200
 	bl sub_8085784
 	bl pal_fill_for_maplights
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
@@ -6334,7 +6334,7 @@ sub_80B8DB4: @ 80B8DB4
 	push {r6}
 	adds r4, r0, 0
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r5, =gPlayerAvatar
 	movs r0, 0x1
 	strb r0, [r5, 0x6]

asm/field_screen.s

@@ -7527,15 +7527,15 @@ SetSav1Weather: @ 80AED7C
 	.pool
 	thumb_func_end SetSav1Weather
 
-	thumb_func_start sav1_get_weather_probably
-sav1_get_weather_probably: @ 80AEDAC
+	thumb_func_start GetSav1Weather
+GetSav1Weather: @ 80AEDAC
 	ldr r0, =gSaveBlock1Ptr
 	ldr r0, [r0]
 	adds r0, 0x2E
 	ldrb r0, [r0]
 	bx lr
 	.pool
-	thumb_func_end sav1_get_weather_probably
+	thumb_func_end GetSav1Weather
 
 	thumb_func_start sub_80AEDBC
 sub_80AEDBC: @ 80AEDBC
@@ -7565,7 +7565,7 @@ sub_80AEDBC: @ 80AEDBC
 sub_80AEDF0: @ 80AEDF0
 	push {lr}
 	bl SetSav1Weather
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r0, 24
 	bl weather_set
@@ -7577,7 +7577,7 @@ sub_80AEDF0: @ 80AEDF0
 sub_80AEE08: @ 80AEE08
 	push {lr}
 	bl SetSav1Weather
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_80AB104
@@ -7588,7 +7588,7 @@ sub_80AEE08: @ 80AEE08
 	thumb_func_start DoCurrentWeather
 DoCurrentWeather: @ 80AEE20
 	push {r4,r5,lr}
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0xF
@@ -7632,7 +7632,7 @@ _080AEE6E:
 	thumb_func_start sub_80AEE84
 sub_80AEE84: @ 80AEE84
 	push {r4,r5,lr}
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0xF
@@ -8382,7 +8382,7 @@ _080AF46C:
 _080AF480:
 	movs r0, 0
 	bl sub_80AF0F4
-	bl player_bitmagic
+	bl FreezeMapObjects
 	adds r0, r6, 0
 	adds r1, r7, 0
 	bl PlayerGetDestCoords
@@ -8508,7 +8508,7 @@ _080AF580:
 _080AF58A:
 	movs r0, 0
 	bl sub_80AF0F4
-	bl player_bitmagic
+	bl FreezeMapObjects
 	adds r0, r6, 0
 	adds r1, r7, 0
 	bl PlayerGetDestCoords
@@ -8583,7 +8583,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610
 	b _080AF65A
 	.pool
 _080AF634:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
@@ -9062,7 +9062,7 @@ _080AFA34:
 	beq _080AFA6C
 	b _080AFA7C
 _080AFA3A:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	b _080AFA64
 _080AFA44:
@@ -9133,7 +9133,7 @@ _080AFAC0:
 	.4byte _080AFBB8
 	.4byte _080AFBD4
 _080AFAD4:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	adds r0, r4, 0
 	adds r1, r6, 0
 	bl PlayerGetDestCoords
@@ -9290,7 +9290,7 @@ _080AFC1C:
 	beq _080AFC46
 	b _080AFC56
 _080AFC22:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	b _080AFC3E
 _080AFC2C:
@@ -9877,7 +9877,7 @@ sub_80B009C: @ 80B009C
 	lsls r0, 24
 	lsrs r0, 24
 	adds r4, r0, 0
-	bl sav1_get_flash_used_on_map
+	bl Overworld_GetFlashLevel
 	lsls r0, 24
 	lsrs r0, 24
 	movs r5, 0
@@ -9982,7 +9982,7 @@ task0A_mpl_807E31C: @ 80B0160
 	b _080B01B6
 	.pool
 _080B0184:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	bl sub_808D194
 	ldrh r0, [r4, 0x8]
@@ -10033,7 +10033,7 @@ _080B01E4:
 	beq _080B022A
 	b _080B023A
 _080B01EE:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	movs r0, 0x2D
 	bl PlaySE

asm/fldeff_80F9BCC.s

@@ -2275,8 +2275,8 @@ overworld_posion_effect: @ 80FAEA8
 	.pool
 	thumb_func_end overworld_posion_effect
 
-	thumb_func_start c3_80A0DD8_is_running
-c3_80A0DD8_is_running: @ 80FAEC0
+	thumb_func_start FieldPoisonEffectIsRunning
+FieldPoisonEffectIsRunning: @ 80FAEC0
 	push {lr}
 	ldr r0, =task50_overworld_posion_effect
 	bl FuncIsActiveTask
@@ -2285,7 +2285,7 @@ c3_80A0DD8_is_running: @ 80FAEC0
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end c3_80A0DD8_is_running
+	thumb_func_end FieldPoisonEffectIsRunning
 
 	thumb_func_start sub_80FAED4
 sub_80FAED4: @ 80FAED4

asm/item_menu.s

@@ -4748,7 +4748,7 @@ _081AD550:
 	cmp r6, 0x1
 	bne _081AD5C4
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl sub_808B864
 	bl sub_808BCF4
 	ldr r2, =gSpecialVar_ItemId

asm/map_obj_8097404.s

@@ -82,9 +82,9 @@ _0809748E:
 	bx r1
 	thumb_func_end sub_8097404
 
-	thumb_func_start player_bitmagic
-@ void player_bitmagic()
-player_bitmagic: @ 8097494
+	thumb_func_start FreezeMapObjects
+@ void FreezeMapObjects()
+FreezeMapObjects: @ 8097494
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =gMapObjects
@@ -113,7 +113,7 @@ _080974B8:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end player_bitmagic
+	thumb_func_end FreezeMapObjects
 
 	thumb_func_start sub_80974D0
 sub_80974D0: @ 80974D0

asm/map_obj_lock.s

@@ -62,7 +62,7 @@ _080983E2:
 	thumb_func_start ScriptFreezeMapObjects
 ScriptFreezeMapObjects: @ 80983E8
 	push {lr}
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r0, =sub_80983A4
 	movs r1, 0x50
 	bl CreateTask

asm/rom4.s

@@ -1880,15 +1880,15 @@ _080854FE:
 	.pool
 	thumb_func_end Overworld_SetFlashLevel
 
-	thumb_func_start sav1_get_flash_used_on_map
-sav1_get_flash_used_on_map: @ 8085514
+	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 sav1_get_flash_used_on_map
+	thumb_func_end Overworld_GetFlashLevel
 
 	thumb_func_start sub_8085524
 sub_8085524: @ 8085524
@@ -2133,7 +2133,7 @@ sav1_map_get_music: @ 80856D4
 	lsls r0, 5
 	cmp r1, r0
 	bne _080856FC
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x8
@@ -3192,8 +3192,8 @@ CB2_NewGame: @ 8085EF8
 	.pool
 	thumb_func_end CB2_NewGame
 
-	thumb_func_start c2_whiteout
-c2_whiteout: @ 8085F58
+	thumb_func_start CB2_WhiteOut
+CB2_WhiteOut: @ 8085F58
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =gMain
@@ -3232,7 +3232,7 @@ _08085FB0:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end c2_whiteout
+	thumb_func_end CB2_WhiteOut
 
 	thumb_func_start c2_load_new_map
 c2_load_new_map: @ 8085FCC
@@ -3661,7 +3661,7 @@ sub_80863B0: @ 80863B0
 	b _080863F0
 	.pool
 _080863D4:
-	bl sav1_get_flash_used_on_map
+	bl Overworld_GetFlashLevel
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0

asm/rom6.s

@@ -4180,7 +4180,7 @@ _0813785A:
 	thumb_func_start sp0C8_whiteout_maybe
 sp0C8_whiteout_maybe: @ 813787C
 	push {lr}
-	ldr r0, =c2_whiteout
+	ldr r0, =CB2_WhiteOut
 	bl SetMainCallback2
 	movs r0, 0
 	pop {r1}

asm/start_menu.s

@@ -356,7 +356,7 @@ sub_809FA9C: @ 809FA9C
 	bl is_c1_link_related_active
 	cmp r0, 0
 	bne _0809FAB2
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl sub_808B864
 	bl sub_808BCF4
 _0809FAB2: