fix pokeblock conflicts

asm/battle_frontier_1.s

@@ -13791,7 +13791,7 @@ sub_8195FF8: @ 8195FF8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
-	ldr r6, =gUnknown_085500A4
+	ldr r6, =gRematchTable
 _08196000:
 	movs r1, 0xAE
 	lsls r1, 1
@@ -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:
@@ -14659,7 +14659,7 @@ sub_8196710: @ 8196710
 	thumb_func_start sub_819672C
 sub_819672C: @ 819672C
 	push {lr}
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, 4
 	adds r0, r1
 	ldrh r2, [r0, 0xA]
@@ -14677,10 +14677,10 @@ sub_8196748: @ 8196748
 	push {r4-r6,lr}
 	movs r5, 0
 	movs r6, 0
-	ldr r4, =gUnknown_085500A4
+	ldr r4, =gRematchTable
 _08196750:
 	ldrh r0, [r4]
-	bl HasTrainerAlreadyBeenFought
+	bl HasTrainerBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _0819675E
@@ -14703,10 +14703,10 @@ sub_8196774: @ 8196774
 	adds r7, r0, 0
 	movs r4, 0
 	movs r6, 0
-	ldr r5, =gUnknown_085500A4
+	ldr r5, =gRematchTable
 _0819677E:
 	ldrh r0, [r5]
-	bl HasTrainerAlreadyBeenFought
+	bl HasTrainerBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _0819679A
@@ -14766,7 +14766,7 @@ _081967EC:
 	adds r4, r0, 0
 	movs r7, 0x1
 	adds r0, r5, 0
-	bl sub_80B1E94
+	bl UpdateRematchIfDefeated
 	b _08196832
 _0819680A:
 	bl Random
@@ -15270,7 +15270,7 @@ sub_8196B98: @ 8196B98
 	adds r7, r0, 0
 	cmp r1, 0xFF
 	beq _08196C5C
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, r2, 4
 	adds r2, r0, r1
 	ldrh r4, [r2, 0xA]
@@ -15373,7 +15373,7 @@ sub_8196C70: @ 8196C70
 	lsls r1, 2
 	adds r1, r2
 	ldrh r0, [r1]
-	bl sub_80B2250
+	bl GetLastBeatenRematchTrainerId
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r5, =gTrainers

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:
@@ -3544,7 +3544,7 @@ _08163E2C:
 	ldr r5, =0x00000c03
 	adds r0, r5, 0
 	bl sub_8165404
-	ldr r4, =gUnknown_02038BFC
+	ldr r4, =gApproachingTrainerId
 	movs r0, 0
 	strb r0, [r4]
 	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1
@@ -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
+	thumb_func_start BattleTransition_StartOnField
-sub_8145EF4: @ 8145EF4
+BattleTransition_StartOnField: @ 8145EF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -69,17 +69,17 @@ sub_8145EF4: @ 8145EF4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8145EF4
+	thumb_func_end BattleTransition_StartOnField
 
-	thumb_func_start sub_8145F10
+	thumb_func_start BattleTransition_Start
-sub_8145F10: @ 8145F10
+BattleTransition_Start: @ 8145F10
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
 	bl LaunchBattleTransitionTask
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8145F10
+	thumb_func_end BattleTransition_Start
 
 	thumb_func_start IsBattleTransitionDone
 IsBattleTransitionDone: @ 8145F20

asm/bike.s

@@ -2004,7 +2004,7 @@ GetOnOffBike: @ 811A080
 	beq _0811A0B0
 	movs r0, 0x1
 	bl SetPlayerAvatarTransitionFlags
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	bl sub_8085784
 	b _0811A0C4
 	.pool

asm/clock.s

@@ -1,175 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_809E778
-sub_809E778: @ 809E778
-	push {lr}
-	ldr r0, =0x00000895
-	bl FlagSet
-	bl RtcCalcLocalTime
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	adds r2, 0xA0
-	ldr r3, =gLocalTime
-	ldr r0, [r3]
-	ldr r1, [r3, 0x4]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	ldr r0, =0x00004040
-	ldrh r1, [r3]
-	bl VarSet
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809E778
-
-	thumb_func_start DoTimeBasedEvents
-DoTimeBasedEvents: @ 809E7B0
-	push {r4,lr}
-	ldr r0, =0x00000895
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809E7DA
-	bl sub_813B9C0
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809E7DA
-	bl RtcCalcLocalTime
-	ldr r4, =gLocalTime
-	adds r0, r4, 0
-	bl sub_809E7E8
-	adds r0, r4, 0
-	bl sub_809E858
-_0809E7DA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DoTimeBasedEvents
-
-	thumb_func_start sub_809E7E8
-sub_809E7E8: @ 809E7E8
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, =0x00004040
-	bl GetVarPointer
-	adds r6, r0, 0
-	ldrh r0, [r6]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	cmp r0, r1
-	beq _0809E84E
-	cmp r0, r1
-	bgt _0809E84E
-	ldrh r4, [r5]
-	subs r4, r0
-	lsls r4, 16
-	lsrs r4, 16
-	bl ClearUpperFlags
-	adds r0, r4, 0
-	bl sub_8122580
-	adds r0, r4, 0
-	bl sub_80ED888
-	adds r0, r4, 0
-	bl sub_80AEFBC
-	adds r0, r4, 0
-	bl UpdatePartyPokerusTime
-	adds r0, r4, 0
-	bl sub_8137904
-	adds r0, r4, 0
-	bl sub_8137A20
-	adds r0, r4, 0
-	bl sub_8139EF4
-	adds r0, r4, 0
-	bl sub_813A7F4
-	adds r0, r4, 0
-	bl sub_813945C
-	adds r0, r4, 0
-	bl SetRandomLotteryNumber
-	ldrh r0, [r5]
-	strh r0, [r6]
-_0809E84E:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809E7E8
-
-	thumb_func_start sub_809E858
-sub_809E858: @ 809E858
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r5, r0, 0
-	mov r4, sp
-	ldr r6, =gSaveBlock2Ptr
-	ldr r1, [r6]
-	adds r1, 0xA0
-	mov r0, sp
-	adds r2, r5, 0
-	bl CalcTimeDifference
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r1, r0, 4
-	subs r1, r0
-	lsls r1, 5
-	movs r2, 0x2
-	ldrsb r2, [r4, r2]
-	lsls r0, r2, 4
-	subs r0, r2
-	lsls r0, 2
-	adds r1, r0
-	movs r0, 0x3
-	ldrsb r0, [r4, r0]
-	adds r0, r1, r0
-	cmp r0, 0
-	beq _0809E8A8
-	cmp r0, 0
-	blt _0809E8A8
-	bl BerryTreeTimeUpdate
-	ldr r2, [r6]
-	adds r2, 0xA0
-	ldr r0, [r5]
-	ldr r1, [r5, 0x4]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-_0809E8A8:
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809E858
-
-	thumb_func_start sub_809E8B4
-sub_809E8B4: @ 809E8B4
-	push {lr}
-	bl sub_809E778
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809E8B4
-
-	thumb_func_start Special_StartWallClock
-Special_StartWallClock: @ 809E8C8
-	push {lr}
-	ldr r0, =Cb2_StartWallClock
-	bl SetMainCallback2
-	ldr r1, =gMain
-	ldr r0, =sub_809E8B4
-	str r0, [r1, 0x8]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Special_StartWallClock
-
-	.align 2, 0 @ Don't pad with nop.

asm/dewford_trend.s

@@ -79,8 +79,8 @@ _08122522:
 	.pool
 	thumb_func_end InitDewfordTrend
 
-	thumb_func_start sub_8122580
+	thumb_func_start UpdateDewfordTrendPerDay
-sub_8122580: @ 8122580
+UpdateDewfordTrendPerDay: @ 8122580
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -253,7 +253,7 @@ _081226BE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8122580
+	thumb_func_end UpdateDewfordTrendPerDay
 
 	thumb_func_start sub_81226D8
 sub_81226D8: @ 81226D8

asm/easy_chat.s

@@ -1635,7 +1635,7 @@ _0811AF86:
 	thumb_func_start sub_811AF8C
 sub_811AF8C: @ 811AF8C
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1684,7 +1684,7 @@ _0811AFE6:
 	thumb_func_start sub_811AFEC
 sub_811AFEC: @ 811AFEC
 	push {r4,lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1727,7 +1727,7 @@ _0811B03A:
 	thumb_func_start sub_811B040
 sub_811B040: @ 811B040
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1832,7 +1832,7 @@ sub_811B0E8: @ 811B0E8
 	thumb_func_start sub_811B0F8
 sub_811B0F8: @ 811B0F8
 	push {r4,lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/field_control_avatar.s

@@ -721,7 +721,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
 	ldr r2, [r0, 0x8]
 	cmp r2, 0
 	bne _0809C490
-	ldr r0, =EventScript_2C8436
+	ldr r0, =EventScript_TestSignpostMsg
 	b _0809C532
 	.pool
 _0809C490:
@@ -1365,7 +1365,7 @@ per_step_scripts: @ 809C9F4
 	bne _0809CA04
 	b _0809CB24
 _0809CA04:
-	bl sub_80B215C
+	bl IncrementRematchStepCounter
 	bl AdjustFriendship_step
 	bl sub_81D4998
 	ldr r0, =gPlayerAvatar
@@ -1531,8 +1531,8 @@ _0809CB72:
 	.pool
 	thumb_func_end AdjustFriendship_step
 
-	thumb_func_start overworld_poison_timer_set
+	thumb_func_start ResetPoisonStepCounter
-overworld_poison_timer_set: @ 809CB80
+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]
@@ -6295,7 +6295,7 @@ sub_80B8D44: @ 80B8D44
 	ldr r0, =gFieldEffectArguments
 	ldr r0, [r0]
 	strh r0, [r1, 0x26]
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	ldr r0, =0x0000016d
 	bl Overworld_ChangeMusicTo
 	movs r0, 0
@@ -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_player_avatar.s

@@ -3896,7 +3896,7 @@ sub_808C750: @ 808C750
 	lsls r4, 24
 	lsrs r4, 24
 	bl ScriptContext2_Enable
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	bl Overworld_ChangeMusicToDefault
 	ldr r2, =gPlayerAvatar
 	ldrb r1, [r2]

asm/field_screen.s

@@ -7527,15 +7527,15 @@ SetSav1Weather: @ 80AED7C
 	.pool
 	thumb_func_end SetSav1Weather
 
-	thumb_func_start sav1_get_weather_probably
+	thumb_func_start GetSav1Weather
-sav1_get_weather_probably: @ 80AEDAC
+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
@@ -7777,8 +7777,8 @@ _080AEFB6:
 	bx r1
 	thumb_func_end sub_80AEEE8
 
-	thumb_func_start sub_80AEFBC
+	thumb_func_start UpdateWeatherPerDay
-sub_80AEFBC: @ 80AEFBC
+UpdateWeatherPerDay: @ 80AEFBC
 	lsls r0, 16
 	ldr r1, =gSaveBlock1Ptr
 	ldr r2, [r1]
@@ -7794,7 +7794,7 @@ sub_80AEFBC: @ 80AEFBC
 	strb r1, [r2]
 	bx lr
 	.pool
-	thumb_func_end sub_80AEFBC
+	thumb_func_end UpdateWeatherPerDay
 
 	thumb_func_start sub_80AEFDC
 sub_80AEFDC: @ 80AEFDC
@@ -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_poison_effect: @ 80FAEA8
 	.pool
 	thumb_func_end overworld_poison_effect
 
-	thumb_func_start c3_80A0DD8_is_running
+	thumb_func_start FieldPoisonEffectIsRunning
-c3_80A0DD8_is_running: @ 80FAEC0
+FieldPoisonEffectIsRunning: @ 80FAEC0
 	push {lr}
 	ldr r0, =task50_overworld_poison_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/international_string_util.s

@@ -113,8 +113,8 @@ _081DB4D4:
 	bx r1
 	thumb_func_end sub_81DB494
 
-	thumb_func_start sub_81DB4DC
+	thumb_func_start PadNameString
-sub_81DB4DC: @ 81DB4DC
+PadNameString: @ 81DB4DC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -156,7 +156,7 @@ _081DB51E:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_81DB4DC
+	thumb_func_end PadNameString
 
 	thumb_func_start sub_81DB52C
 sub_81DB52C: @ 81DB52C

asm/item_menu.s

@@ -3360,7 +3360,7 @@ _081AC8D4:
 	bl memcpy
 	ldr r0, =gSpecialVar_ItemId
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4664,7 +4664,7 @@ item_menu_type_b: @ 81AD4B4
 	lsrs r4, r0, 24
 	ldr r5, =gSpecialVar_ItemId
 	ldrh r0, [r5]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -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/item_use.s

@@ -266,7 +266,7 @@ sub_80FD254: @ 80FD254
 	ldr r1, =bag_menu_mail_related
 	mov r0, sp
 	movs r2, 0
-	bl sub_8121478
+	bl ReadMail
 	add sp, 0x24
 	pop {r0}
 	bx r0

asm/learn_move.s

@@ -353,7 +353,7 @@ _08160994:
 	b _08160E88
 	.pool
 _081609A8:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -433,7 +433,7 @@ _08160A50:
 	b _08160E88
 	.pool
 _08160A64:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -493,7 +493,7 @@ _08160ADC:
 	b _08160E88
 	.pool
 _08160AEC:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -551,7 +551,7 @@ _08160B6C:
 	b _08160E88
 	.pool
 _08160B80:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/link.s

@@ -26142,7 +26142,7 @@ _080170E0:
 	negs r0, r0
 	b _08017110
 _080170F2:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	movs r2, 0x80
@@ -29500,7 +29500,7 @@ _08018BD6:
 	b _08018C3E
 	.pool
 _08018BE4:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r6, r0, 24
 	movs r1, 0x80
@@ -52112,7 +52112,7 @@ _0802426A:
 	bl sub_8197930
 	b _080242D0
 _08024270:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r4, r0, 24
 	movs r0, 0x2
@@ -71033,7 +71033,7 @@ _0802DA84:
 	thumb_func_start sub_802DA8C
 sub_802DA8C: @ 802DA8C
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r0, 24
 	pop {r1}

asm/macros/event.inc

@@ -663,11 +663,13 @@
 	.byte 0x5d
 	.endm
 
-	.macro ontrainerbattleend 
+	@ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) 
+	.macro gotopostbattlescript 
 	.byte 0x5e
 	.endm
 
-	.macro ontrainerbattleendgoto 
+	@ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c) 
+	.macro gotobeatenscript 
 	.byte 0x5f
 	.endm
 

asm/mail_data.s

@@ -1,589 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start ClearMailData
-ClearMailData: @ 80D436C
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, =gSaveBlock1Ptr
-_080D4372:
-	lsls r1, r4, 3
-	adds r1, r4
-	lsls r1, 2
-	ldr r0, =0x00002be0
-	adds r1, r0
-	ldr r0, [r5]
-	adds r0, r1
-	bl ClearMailStruct
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _080D4372
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearMailData
-
-	thumb_func_start ClearMailStruct
-ClearMailStruct: @ 80D439C
-	push {r4-r6,lr}
-	adds r3, r0, 0
-	ldr r0, =0x0000ffff
-	adds r4, r0, 0
-	adds r1, r3, 0
-	movs r2, 0x8
-_080D43A8:
-	ldrh r0, [r1]
-	orrs r0, r4
-	strh r0, [r1]
-	adds r1, 0x2
-	subs r2, 0x1
-	cmp r2, 0
-	bge _080D43A8
-	movs r2, 0
-	adds r6, r3, 0
-	adds r6, 0x1A
-	adds r4, r3, 0
-	adds r4, 0x12
-	movs r5, 0xFF
-_080D43C2:
-	adds r1, r4, r2
-	ldrb r0, [r1]
-	orrs r0, r5
-	strb r0, [r1]
-	adds r2, 0x1
-	cmp r2, 0x7
-	ble _080D43C2
-	adds r1, r6, 0
-	movs r2, 0
-	adds r0, r1, 0x3
-_080D43D6:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _080D43D6
-	movs r1, 0
-	movs r0, 0x1
-	strh r0, [r3, 0x1E]
-	strh r1, [r3, 0x20]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearMailStruct
-
-	thumb_func_start MonHasMail
-MonHasMail: @ 80D43F0
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	bl itemid_is_mail
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D4418
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl GetMonData
-	cmp r0, 0xFF
-	beq _080D4418
-	movs r0, 0x1
-	b _080D441A
-_080D4418:
-	movs r0, 0
-_080D441A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end MonHasMail
-
-	thumb_func_start sub_80D4420
-sub_80D4420: @ 80D4420
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	mov r8, r0
-	lsls r1, 16
-	lsrs r0, r1, 16
-	str r0, [sp, 0x8]
-	mov r0, sp
-	movs r2, 0
-	ldrb r3, [r0, 0x8]
-	strb r3, [r0]
-	lsrs r1, 24
-	strb r1, [r0, 0x1]
-	add r3, sp, 0x4
-	strb r2, [r3]
-	ldr r4, =gSaveBlock1Ptr
-	mov r10, r4
-	mov r9, r3
-	adds r4, r3, 0
-_080D444C:
-	mov r1, r10
-	ldr r0, [r1]
-	ldrb r2, [r4]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r0, r1
-	movs r1, 0xB0
-	lsls r1, 6
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _080D4468
-	b _080D45A8
-_080D4468:
-	movs r4, 0
-	ldr r2, =gSaveBlock2Ptr
-	mov r12, r2
-	ldr r7, =gSaveBlock1Ptr
-	add r5, sp, 0x4
-	ldr r3, =0x0000ffff
-	adds r6, r3, 0
-_080D4476:
-	ldr r2, [r7]
-	lsls r3, r4, 1
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	ldr r0, =0x00002be0
-	adds r2, r0
-	adds r2, r3
-	ldrh r0, [r2]
-	orrs r0, r6
-	strh r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x8
-	bls _080D4476
-	movs r4, 0
-	ldr r5, =gSaveBlock1Ptr
-	add r3, sp, 0x4
-_080D44A0:
-	ldr r2, [r5]
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, =0x00002bf2
-	adds r2, r1
-	adds r2, r0
-	mov r1, r12
-	ldr r0, [r1]
-	adds r0, r4
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x6
-	bls _080D44A0
-	mov r3, r10
-	ldr r2, [r3]
-	mov r0, r9
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, =0x00002bf2
-	adds r2, r1
-	adds r2, r0
-	movs r0, 0xFF
-	strb r0, [r2]
-	mov r2, r9
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, [r3]
-	adds r0, r1
-	ldr r3, =0x00002bf2
-	adds r0, r3
-	movs r1, 0
-	bl sub_81DB4DC
-	movs r4, 0
-	ldr r6, =gSaveBlock1Ptr
-	add r3, sp, 0x4
-	ldr r5, =gSaveBlock2Ptr
-_080D4500:
-	ldr r2, [r6]
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, =0x00002bfa
-	adds r2, r1
-	adds r2, r0
-	ldr r0, [r5]
-	adds r0, 0xA
-	adds r0, r4
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x3
-	bls _080D4500
-	mov r0, r8
-	movs r1, 0xB
-	bl GetBoxMonData
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	mov r0, r8
-	movs r1, 0
-	bl GetBoxMonData
-	adds r1, r0, 0
-	adds r0, r4, 0
-	bl sub_80D45C8
-	mov r2, r10
-	ldr r3, [r2]
-	mov r4, r9
-	ldrb r2, [r4]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r3, r1
-	ldr r2, =0x00002bfe
-	adds r1, r2
-	strh r0, [r1]
-	ldrb r1, [r4]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	movs r4, 0xB0
-	lsls r4, 6
-	adds r3, r4
-	mov r0, sp
-	ldrh r0, [r0, 0x8]
-	strh r0, [r3]
-	mov r0, r8
-	movs r1, 0x40
-	mov r2, r9
-	bl SetMonData
-	mov r0, r8
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	mov r1, r9
-	ldrb r0, [r1]
-	b _080D45B6
-	.pool
-_080D45A8:
-	adds r0, r2, 0x1
-	strb r0, [r3]
-	ldrb r0, [r4]
-	cmp r0, 0x5
-	bhi _080D45B4
-	b _080D444C
-_080D45B4:
-	movs r0, 0xFF
-_080D45B6:
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D4420
-
-	thumb_func_start sub_80D45C8
-sub_80D45C8: @ 80D45C8
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xC9
-	bne _080D45E0
-	adds r0, r1, 0
-	bl mon_icon_personality_to_unown_id
-	lsls r0, 16
-	ldr r1, =0x75300000
-	adds r0, r1
-	lsrs r0, 16
-_080D45E0:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80D45C8
-
-	thumb_func_start sub_80D45E8
-sub_80D45E8: @ 80D45E8
-	push {lr}
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldr r0, =0xffff8ad0
-	adds r2, r3, r0
-	lsls r0, r2, 16
-	lsrs r0, 16
-	cmp r0, 0x1B
-	bhi _080D4604
-	movs r0, 0xC9
-	strh r2, [r1]
-	b _080D4606
-	.pool
-_080D4604:
-	adds r0, r3, 0
-_080D4606:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D45E8
-
-	thumb_func_start GiveMailToMon2
-GiveMailToMon2: @ 80D460C
-	push {r4-r7,lr}
-	sub sp, 0x8
-	adds r6, r0, 0
-	adds r7, r1, 0
-	ldrh r5, [r7, 0x20]
-	adds r1, r5, 0
-	bl sub_80D4420
-	add r4, sp, 0x4
-	strb r0, [r4]
-	ldrb r2, [r4]
-	cmp r2, 0xFF
-	beq _080D4670
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, =0x00002be0
-	adds r1, r0
-	adds r0, r7, 0
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	adds r0, r6, 0
-	movs r1, 0x40
-	adds r2, r4, 0
-	bl SetMonData
-	mov r0, sp
-	strb r5, [r0]
-	mov r1, sp
-	lsrs r0, r5, 8
-	strb r0, [r1, 0x1]
-	adds r0, r6, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	ldrb r0, [r4]
-	b _080D4672
-	.pool
-_080D4670:
-	movs r0, 0xFF
-_080D4672:
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end GiveMailToMon2
-
-	thumb_func_start sub_80D467C
-sub_80D467C: @ 80D467C
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_80D467C
-
-	thumb_func_start TakeMailFromMon
-TakeMailFromMon: @ 80D4680
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	bl MonHasMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D46D2
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl GetMonData
-	add r2, sp, 0x4
-	strb r0, [r2]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r3, [r0]
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	movs r0, 0xB0
-	lsls r0, 6
-	adds r3, r0
-	movs r1, 0
-	movs r0, 0
-	strh r0, [r3]
-	movs r0, 0xFF
-	strb r0, [r2]
-	mov r0, sp
-	strb r1, [r0]
-	strb r1, [r0, 0x1]
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl SetMonData
-	adds r0, r4, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-_080D46D2:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end TakeMailFromMon
-
-	thumb_func_start sub_80D46E0
-sub_80D46E0: @ 80D46E0
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gSaveBlock1Ptr
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r2, r1
-	movs r0, 0xB0
-	lsls r0, 6
-	adds r2, r0
-	movs r0, 0
-	strh r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_80D46E0
-
-	thumb_func_start sub_80D4700
-sub_80D4700: @ 80D4700
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0xC
-	adds r5, r0, 0
-	mov r0, sp
-	movs r1, 0
-	strb r1, [r0]
-	strb r1, [r0, 0x1]
-	add r1, sp, 0x4
-	movs r0, 0xFF
-	strb r0, [r1]
-	movs r7, 0x6
-	mov r9, r1
-	ldr r0, =gSaveBlock1Ptr
-	mov r8, r0
-	ldr r3, =0x00002be0
-_080D4724:
-	mov r1, r8
-	ldr r0, [r1]
-	lsls r1, r7, 3
-	adds r1, r7
-	lsls r1, 2
-	adds r4, r0, r1
-	movs r2, 0xB0
-	lsls r2, 6
-	adds r0, r4, r2
-	ldrh r6, [r0]
-	cmp r6, 0
-	bne _080D47A0
-	adds r4, r3
-	adds r0, r5, 0
-	movs r1, 0x40
-	str r3, [sp, 0x8]
-	bl GetMonData
-	mov r1, r8
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldr r3, [sp, 0x8]
-	adds r1, r3
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	adds r0, r5, 0
-	movs r1, 0x40
-	bl GetMonData
-	mov r1, r8
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r2, r1
-	movs r3, 0xB0
-	lsls r3, 6
-	adds r2, r3
-	strh r6, [r2]
-	adds r0, r5, 0
-	movs r1, 0x40
-	mov r2, r9
-	bl SetMonData
-	adds r0, r5, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	adds r0, r7, 0
-	b _080D47AC
-	.pool
-_080D47A0:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0xF
-	bls _080D4724
-	movs r0, 0xFF
-_080D47AC:
-	add sp, 0xC
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D4700
-
-	thumb_func_start itemid_is_mail
-itemid_is_mail: @ 80D47BC
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x84
-	bgt _080D47CE
-	cmp r0, 0x79
-	blt _080D47CE
-	movs r0, 0x1
-	b _080D47D0
-_080D47CE:
-	movs r0, 0
-_080D47D0:
-	pop {r1}
-	bx r1
-	thumb_func_end itemid_is_mail
-
-	.align 2, 0 @ Don't pad with nop.

asm/main_menu.s

@@ -3025,7 +3025,7 @@ task_new_game_prof_birch_speech_part2_4: @ 8031188
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/map_obj_8097404.s

@@ -82,9 +82,9 @@ _0809748E:
 	bx r1
 	thumb_func_end sub_8097404
 
-	thumb_func_start player_bitmagic
+	thumb_func_start FreezeMapObjects
-@ void player_bitmagic()
+@ void FreezeMapObjects()
-player_bitmagic: @ 8097494
+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
@@ -348,7 +348,7 @@ sub_8098630: @ 8098630
 	bl sub_80B47E0
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_030060A8
+	ldr r0, =gNoOfApproachingTrainers
 	ldrb r0, [r0]
 	cmp r0, 0x2
 	bne _080986E0

asm/menu.s

@@ -2266,8 +2266,8 @@ sub_8198C34: @ 8198C34
 	bx r0
 	thumb_func_end sub_8198C34
 
-	thumb_func_start sub_8198C58
+	thumb_func_start ProcessMenuInputNoWrap_
-sub_8198C58: @ 8198C58
+ProcessMenuInputNoWrap_: @ 8198C58
 	push {r4,lr}
 	bl ProcessMenuInputNoWrapAround
 	lsls r0, 24
@@ -2282,7 +2282,7 @@ _08198C6E:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8198C58
+	thumb_func_end ProcessMenuInputNoWrap_
 
 	thumb_func_start sub_8198C78
 sub_8198C78: @ 8198C78

asm/menu_helpers.s

@@ -277,7 +277,7 @@ Task_CallYesOrNoCallback: @ 8121FDC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -512,7 +512,7 @@ itemid_80BF6D8_mail_related: @ 812217C
 	bne _081221A4
 _08122192:
 	adds r0, r4, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/mystery_event_script.s

@@ -721,7 +721,7 @@ _08153D86:
 	bl GetMonData
 	lsls r0, 16
 	lsrs r0, 16
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _08153DA4

asm/overworld.s

@@ -1381,12 +1381,12 @@ _080850C8:
 	bl prev_quest_postbuffer_cursor_backup_reset
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl sub_80B21B4
+	bl TryUpdateRandomTrainerRematches
 	bl DoTimeBasedEvents
 	bl sub_80AEDBC
 	bl sub_8085B2C
 	bl update_sav1_flash_used_on_map
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	bl mapheader_run_script_with_tag_x3
 	bl not_trainer_hill_battle_pyramid
 	ldr r0, [r4]
@@ -1478,7 +1478,7 @@ _080851A2:
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl sub_80B21B4
+	bl TryUpdateRandomTrainerRematches
 	cmp r7, 0x1
 	beq _080851EE
 	bl DoTimeBasedEvents
@@ -1491,7 +1491,7 @@ _080851EE:
 	bl FlagClear
 _08085200:
 	bl update_sav1_flash_used_on_map
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	bl mapheader_run_script_with_tag_x3
 	bl UpdateLocationHistoryForRoamer
 	bl RoamerMoveToOtherLocationSet
@@ -1880,15 +1880,15 @@ _080854FE:
 	.pool
 	thumb_func_end Overworld_SetFlashLevel
 
-	thumb_func_start sav1_get_flash_used_on_map
+	thumb_func_start Overworld_GetFlashLevel
-sav1_get_flash_used_on_map: @ 8085514
+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
@@ -2272,15 +2272,15 @@ Overworld_SetSavedMusic: @ 80857F4
 	.pool
 	thumb_func_end Overworld_SetSavedMusic
 
-	thumb_func_start sav1_reset_battle_music_maybe
+	thumb_func_start Overworld_ClearSavedMusic
-sav1_reset_battle_music_maybe: @ 8085800
+Overworld_ClearSavedMusic: @ 8085800
 	ldr r0, =gSaveBlock1Ptr
 	ldr r1, [r0]
 	movs r0, 0
 	strh r0, [r1, 0x2C]
 	bx lr
 	.pool
-	thumb_func_end sav1_reset_battle_music_maybe
+	thumb_func_end Overworld_ClearSavedMusic
 
 	thumb_func_start sub_8085810
 sub_8085810: @ 8085810
@@ -3192,8 +3192,8 @@ CB2_NewGame: @ 8085EF8
 	.pool
 	thumb_func_end CB2_NewGame
 
-	thumb_func_start c2_whiteout
+	thumb_func_start CB2_WhiteOut
-c2_whiteout: @ 8085F58
+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/party_menu.s

@@ -2554,7 +2554,7 @@ sub_81B1708: @ 81B1708
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3402,14 +3402,14 @@ sub_81B1DB8: @ 81B1DB8
 	lsrs r4, r5, 16
 	adds r7, r4, 0
 	adds r0, r4, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _081B1DE2
 	adds r0, r6, 0
 	adds r1, r4, 0
-	bl sub_80D4420
+	bl GiveMailToMon
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFF
@@ -4010,7 +4010,7 @@ sub_81B227C: @ 81B227C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -6216,7 +6216,7 @@ _081B34D2:
 	bl GetMonData
 	lsls r0, 16
 	lsrs r0, 16
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B3508
@@ -7791,7 +7791,7 @@ _081B425A:
 	.pool
 _081B4278:
 	ldrh r0, [r6]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B42A4
@@ -7952,7 +7952,7 @@ sub_81B43DC: @ 81B43DC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -7999,7 +7999,7 @@ _081B4402:
 	.pool
 _081B4458:
 	ldrh r0, [r5]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B4498
@@ -8485,7 +8485,7 @@ sub_81B48DC: @ 81B48DC
 	muls r1, r0
 	ldr r0, =gPlayerParty
 	adds r4, r1, r0
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -8681,7 +8681,7 @@ sub_81B4A98: @ 81B4A98
 	adds r0, r1
 	ldr r1, =sub_81B4AE0
 	movs r2, 0x1
-	bl sub_8121478
+	bl ReadMail
 	pop {r0}
 	bx r0
 	.pool
@@ -8777,7 +8777,7 @@ sub_81B4BA0: @ 81B4BA0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -8801,7 +8801,7 @@ _081B4BC6:
 	muls r0, r1
 	ldr r1, =gPlayerParty
 	adds r0, r1
-	bl sub_80D4700
+	bl TakeMailFromMon2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFF
@@ -8883,7 +8883,7 @@ sub_81B4C94: @ 81B4C94
 	push {r7}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -9691,7 +9691,7 @@ sub_81B5430: @ 81B5430
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -9985,7 +9985,7 @@ sub_81B56D8: @ 81B56D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -10735,7 +10735,7 @@ sub_81B5CB0: @ 81B5CB0
 	b _081B5D24
 	.pool
 _081B5CD8:
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B5CFC
@@ -10821,7 +10821,7 @@ _081B5D68:
 	adds r0, r7, r5
 	ldrb r4, [r0]
 	adds r0, r1, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -10853,7 +10853,7 @@ _081B5DAC:
 	adds r0, r5, r7
 	ldrb r4, [r0, 0x6]
 	adds r0, r1, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -12970,7 +12970,7 @@ sub_81B7028: @ 81B7028
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -13272,7 +13272,7 @@ sub_81B72C8: @ 81B72C8
 	muls r1, r0
 	ldr r0, =gPlayerParty
 	adds r4, r1, r0
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r5, r0, 24
 	cmp r5, 0
@@ -14728,7 +14728,7 @@ sub_81B7FAC: @ 81B7FAC
 	.pool
 _081B7FF8:
 	ldrh r0, [r5]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B800C
@@ -14770,7 +14770,7 @@ sub_81B8044: @ 81B8044
 	lsrs r4, r0, 24
 	ldr r5, =gUnknown_0203CEC8
 	ldrh r0, [r5, 0xC]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B807C
@@ -15054,7 +15054,7 @@ sub_81B82D4: @ 81B82D4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -15093,7 +15093,7 @@ _081B82FA:
 	.pool
 _081B8338:
 	adds r0, r4, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B835C

asm/player_pc.s

@@ -1263,7 +1263,7 @@ sub_816B8A4: @ 816B8A4
 	adds r0, r1
 	ldr r1, =sub_816B900
 	movs r2, 0x1
-	bl sub_8121478
+	bl ReadMail
 	adds r0, r4, 0
 	bl DestroyTask
 _0816B8E6:
@@ -1378,7 +1378,7 @@ sub_816B9D8: @ 816B9D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r0, 24
 	movs r1, 0x1

asm/pokemon_icon.s

@@ -156,7 +156,7 @@ mon_icon_convert_unown_species_id: @ 80D2E08
 	cmp r2, 0xC9
 	bne _080D2E32
 	adds r0, r1, 0
-	bl mon_icon_personality_to_unown_id
+	bl GetUnownLetterByPersonality
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0
@@ -186,8 +186,8 @@ _080D2E40:
 	bx r1
 	thumb_func_end mon_icon_convert_unown_species_id
 
-	thumb_func_start mon_icon_personality_to_unown_id
+	thumb_func_start GetUnownLetterByPersonality
-mon_icon_personality_to_unown_id: @ 80D2E48
+GetUnownLetterByPersonality: @ 80D2E48
 	push {lr}
 	adds r2, r0, 0
 	cmp r2, 0
@@ -219,7 +219,7 @@ _080D2E7E:
 _080D2E80:
 	pop {r1}
 	bx r1
-	thumb_func_end mon_icon_personality_to_unown_id
+	thumb_func_end GetUnownLetterByPersonality
 
 	thumb_func_start sub_80D2E84
 sub_80D2E84: @ 80D2E84
@@ -229,7 +229,7 @@ sub_80D2E84: @ 80D2E84
 	lsrs r4, r0, 16
 	adds r0, r4, 0
 	mov r1, sp
-	bl sub_80D45E8
+	bl MailSpeciesToSpecies
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0xC9

asm/pokemon_storage_system.s

@@ -2201,7 +2201,7 @@ _080C83CC:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C83F4
@@ -2304,7 +2304,7 @@ _080C84C8:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C84F8
@@ -2874,7 +2874,7 @@ _080C8A0C:
 	ldr r2, =0x00000ce6
 	adds r0, r2
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C8A8C
@@ -2913,7 +2913,7 @@ _080C8A7C:
 	ldr r2, =0x00000ce6
 	adds r0, r1, r2
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C8A98
@@ -3409,7 +3409,7 @@ _080C8F0C:
 	adds r0, 0x1
 	strb r0, [r1]
 _080C8F22:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3661,7 +3661,7 @@ _080C914E:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C9168
@@ -3943,7 +3943,7 @@ _080C93E4:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C9404
@@ -4133,7 +4133,7 @@ _080C9584:
 	b _080C9664
 	.pool
 _080C95A4:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -4927,7 +4927,7 @@ _080C9C78:
 	b _080C9CAA
 	.pool
 _080C9C8C:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -5058,7 +5058,7 @@ _080C9DAC:
 	b _080C9DE0
 	.pool
 _080C9DC0:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -16168,7 +16168,7 @@ sub_80CFB44: @ 80CFB44
 	.pool
 _080CFB8C:
 	ldrh r0, [r1]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080CFBA4
@@ -16197,7 +16197,7 @@ _080CFBAC:
 	.pool
 _080CFBCC:
 	ldrh r0, [r1]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/pokemon_summary_screen.s

@@ -4207,7 +4207,7 @@ sub_81C61E0: @ 81C61E0
 	cmp r0, 0x3
 	beq _081C620C
 	ldrh r0, [r4]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4673,7 +4673,7 @@ sub_81C6648: @ 81C6648
 	bl sub_81C61A8
 	ldr r5, =gSpecialVar_ItemId
 	ldrh r0, [r5]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/pokenav.s

@@ -8089,7 +8089,7 @@ _081CB0C0:
 	thumb_func_start sub_81CB0C8
 sub_81CB0C8: @ 81CB0C8
 	push {lr}
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, 4
 	adds r0, r1
 	ldrh r2, [r0, 0xA]
@@ -20738,7 +20738,7 @@ _081D15B6:
 
 	thumb_func_start sub_81D15BC
 sub_81D15BC: @ 81D15BC
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, 4
 	adds r0, r1
 	ldrh r0, [r0]
@@ -20751,7 +20751,7 @@ sub_81D15CC: @ 81D15CC
 	push {lr}
 	adds r3, r0, 0
 	movs r1, 0
-	ldr r2, =gUnknown_085500A4
+	ldr r2, =gRematchTable
 _081D15D4:
 	ldrh r0, [r2]
 	cmp r0, r3
@@ -21440,7 +21440,7 @@ _081D1A24:
 	cmp r0, 0
 	bne _081D1A1C
 	adds r0, r7, 0
-	bl sub_80B2318
+	bl CountBattledRematchTeams
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0x1
@@ -30343,8 +30343,8 @@ _081D6176:
 	.pool
 	thumb_func_end sub_81D6134
 
-	thumb_func_start battle_init
+	thumb_func_start sub_81D6180
-battle_init: @ 81D6180
+sub_81D6180: @ 81D6180
 	lsls r0, 24
 	ldr r1, =gSaveBlock2Ptr
 	ldr r1, [r1]
@@ -30355,7 +30355,7 @@ battle_init: @ 81D6180
 	ldrh r0, [r1]
 	bx lr
 	.pool
-	thumb_func_end battle_init
+	thumb_func_end sub_81D6180
 
 	thumb_func_start GetTrainerHillTrainerFlag
 @ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)

asm/record_mixing.s

@@ -3650,7 +3650,7 @@ _080E8A78:
 	beq _080E8A90
 	mov r0, r8
 	movs r1, 0xFC
-	bl sub_81DB4DC
+	bl PadNameString
 _080E8A90:
 	ldrb r1, [r7]
 	lsrs r1, 4

asm/rom_81370FC.s

@@ -5,9 +5,6 @@
 
 	.text
 
-
-
-
 	thumb_func_start sub_81370FC
 sub_81370FC: @ 81370FC
 	push {r4,lr}
@@ -862,7 +859,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}
@@ -870,6 +867,8 @@ sp0C8_whiteout_maybe: @ 813787C
 	.pool
 	thumb_func_end sp0C8_whiteout_maybe
 
+@ time_events.o
+
 	thumb_func_start sub_8137890
 sub_8137890: @ 8137890
 	push {r4,lr}
@@ -926,8 +925,8 @@ sub_81378E4: @ 81378E4
 	bx r0
 	thumb_func_end sub_81378E4
 
-	thumb_func_start sub_8137904
+	thumb_func_start UpdateMirageRnd
-sub_8137904: @ 8137904
+UpdateMirageRnd: @ 8137904
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -953,7 +952,7 @@ _08137928:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8137904
+	thumb_func_end UpdateMirageRnd
 
 	thumb_func_start sub_813793C
 sub_813793C: @ 813793C
@@ -1067,8 +1066,8 @@ sub_8137A0C: @ 8137A0C
 	.pool
 	thumb_func_end sub_8137A0C
 
-	thumb_func_start sub_8137A20
+	thumb_func_start UpdateBirchState
-sub_8137A20: @ 8137A20
+UpdateBirchState: @ 8137A20
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -1087,7 +1086,9 @@ sub_8137A20: @ 8137A20
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8137A20
+	thumb_func_end UpdateBirchState
+
+@ birch_pc.o
 
 	thumb_func_start sub_8137A4C
 sub_8137A4C: @ 8137A4C
@@ -4287,15 +4288,15 @@ _08139456:
 	bx r1
 	thumb_func_end sub_81393FC
 
-	thumb_func_start sub_813945C
+	thumb_func_start SetShoalItemFlag
-sub_813945C: @ 813945C
+SetShoalItemFlag: @ 813945C
 	push {lr}
 	ldr r0, =0x000008bf
 	bl FlagSet
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_813945C
+	thumb_func_end SetShoalItemFlag
 
 	thumb_func_start sub_813946C
 sub_813946C: @ 813946C
@@ -5616,8 +5617,8 @@ _08139EEE:
 	bx r1
 	thumb_func_end sub_8139ED0
 
-	thumb_func_start sub_8139EF4
+	thumb_func_start UpdateFrontierManiac
-sub_8139EF4: @ 8139EF4
+UpdateFrontierManiac: @ 8139EF4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -5636,7 +5637,7 @@ sub_8139EF4: @ 8139EF4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8139EF4
+	thumb_func_end UpdateFrontierManiac
 
 	thumb_func_start sub_8139F20
 sub_8139F20: @ 8139F20
@@ -6684,8 +6685,8 @@ _0813A7C6:
 	.pool
 	thumb_func_end sub_813A7B8
 
-	thumb_func_start sub_813A7F4
+	thumb_func_start UpdateFrontierGambler
-sub_813A7F4: @ 813A7F4
+UpdateFrontierGambler: @ 813A7F4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -6704,7 +6705,7 @@ sub_813A7F4: @ 813A7F4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_813A7F4
+	thumb_func_end UpdateFrontierGambler
 
 	thumb_func_start sub_813A820
 sub_813A820: @ 813A820

asm/script_menu.s

@@ -444,7 +444,7 @@ task_yes_no_maybe: @ 80E215C
 	b _080E21C4
 	.pool
 _080E2180:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	movs r0, 0x1

asm/script_pokemon_util_80F87D8.s

@@ -1359,8 +1359,8 @@ ScriptGiveEgg: @ 80F92C8
 	bx r1
 	thumb_func_end ScriptGiveEgg
 
-	thumb_func_start sub_80F92F8
+	thumb_func_start HasEnoughMonsForDoubleBattle
-sub_80F92F8: @ 80F92F8
+HasEnoughMonsForDoubleBattle: @ 80F92F8
 	push {lr}
 	bl GetMonsStateToDoubles
 	lsls r0, 24
@@ -1382,7 +1382,7 @@ _080F9318:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80F92F8
+	thumb_func_end HasEnoughMonsForDoubleBattle
 
 	thumb_func_start sub_80F9320
 sub_80F9320: @ 80F9320

asm/slot_machine.s

@@ -1581,7 +1581,7 @@ sub_812B158: @ 812B158
 	thumb_func_start sub_812B1B0
 sub_812B1B0: @ 812B1B0
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

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:
@@ -1121,7 +1121,7 @@ sub_80A00EC: @ 80A00EC
 	thumb_func_start sub_80A0108
 sub_80A0108: @ 80A0108
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1226,7 +1226,7 @@ sub_80A01D0: @ 80A01D0
 	thumb_func_start sub_80A01EC
 sub_80A01EC: @ 80A01EC
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1441,7 +1441,7 @@ sub_80A0388: @ 80A0388
 	thumb_func_start sub_80A03A4
 sub_80A03A4: @ 80A03A4
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/trade.s

@@ -3696,7 +3696,7 @@ _0807920E:
 	thumb_func_start sub_8079218
 sub_8079218: @ 8079218
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3798,7 +3798,7 @@ _080792D8:
 	thumb_func_start sub_80792E4
 sub_80792E4: @ 80792E4
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -13369,7 +13369,7 @@ sub_807E7E8: @ 807E7E8
 	ldrh r0, [r5, 0x28]
 	cmp r0, 0
 	beq _0807E960
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _0807E954
@@ -13442,7 +13442,7 @@ _0807E98E:
 	bl StringCopy
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_81DB4DC
+	bl PadNameString
 	ldr r1, [r6, 0x18]
 	lsrs r0, r1, 24
 	strb r0, [r5, 0x1A]

asm/trainer_rematch.s

@@ -178,14 +178,14 @@ sub_81DA6CC: @ 81DA6CC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
-	ldr r6, =gUnknown_085500A4
+	ldr r6, =gRematchTable
 _081DA6D4:
 	lsls r0, r4, 1
 	lsls r1, r5, 4
 	adds r0, r1
 	adds r0, r6
 	ldrh r0, [r0]
-	bl HasTrainerAlreadyBeenFought
+	bl HasTrainerBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	bne _081DA6F0

asm/trainer_see.s

@@ -5,133 +5,6 @@
 
 	.text
 
-	thumb_func_start CheckForTrainersWantingBattle
-@ bool8 CheckForTrainersWantingBattle()
-CheckForTrainersWantingBattle: @ 80B3BE8
-	push {r4-r7,lr}
-	ldr r0, =gUnknown_030060A8
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, =gUnknown_02038BFC
-	strb r1, [r0]
-	movs r4, 0
-	ldr r6, =gMapObjects
-_080B3BF8:
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r6
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _080B3C38
-	ldrb r0, [r1, 0x7]
-	cmp r0, 0x1
-	beq _080B3C12
-	cmp r0, 0x3
-	bne _080B3C38
-_080B3C12:
-	adds r0, r4, 0
-	bl CheckIfTrainerWantsBattle
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x2
-	beq _080B3C42
-	cmp r0, 0
-	beq _080B3C38
-	ldr r0, =gUnknown_030060A8
-	ldrb r1, [r0]
-	adds r5, r0, 0
-	cmp r1, 0x1
-	bhi _080B3C88
-	bl GetMonsStateToDoubles_2
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B3C42
-_080B3C38:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _080B3BF8
-_080B3C42:
-	ldr r0, =gUnknown_030060A8
-	ldrb r4, [r0]
-	adds r5, r0, 0
-	cmp r4, 0x1
-	bne _080B3C88
-	bl ResetTrainerOpponentIds
-	ldr r2, =gUnknown_03006090
-	ldrb r0, [r5]
-	subs r0, 0x1
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r2, 0x4
-	adds r1, r2
-	ldr r1, [r1]
-	bl SingleTrainerWantsBattle
-	ldr r0, =gUnknown_030060AC
-	strb r4, [r0]
-	movs r0, 0x1
-	b _080B3CF4
-	.pool
-_080B3C88:
-	ldrb r0, [r5]
-	cmp r0, 0x2
-	bne _080B3CEC
-	bl ResetTrainerOpponentIds
-	movs r4, 0
-	ldrb r5, [r5]
-	cmp r4, r5
-	bcs _080B3CC6
-	ldr r6, =gUnknown_03006090
-	adds r7, r6, 0x4
-	ldr r5, =gUnknown_02038BFC
-_080B3CA0:
-	lsls r1, r4, 1
-	adds r1, r4
-	lsls r1, 2
-	adds r0, r1, r6
-	ldrb r0, [r0]
-	adds r1, r7
-	ldr r1, [r1]
-	bl TwoTrainersWantBattle
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	ldr r0, =gUnknown_030060A8
-	ldrb r0, [r0]
-	cmp r4, r0
-	bcc _080B3CA0
-_080B3CC6:
-	bl TwoTrainersWantBattleExecuteScript
-	ldr r1, =gUnknown_02038BFC
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, =gUnknown_030060AC
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r0, 0x1
-	b _080B3CF4
-	.pool
-_080B3CEC:
-	ldr r1, =gUnknown_030060AC
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0
-_080B3CF4:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end CheckForTrainersWantingBattle
-
 	thumb_func_start CheckIfTrainerWantsBattle
 @ u8 CheckIfTrainerWantsBattle(u8 trainerFieldObjectId)
 CheckIfTrainerWantsBattle: @ 80B3D00
@@ -203,8 +76,8 @@ _080B3D7C:
 	movs r1, 0x2
 	mov r9, r1
 _080B3D8A:
-	ldr r2, =gUnknown_03006090
+	ldr r2, =gApproachingTrainers
-	ldr r4, =gUnknown_030060A8
+	ldr r4, =gNoOfApproachingTrainers
 	ldrb r1, [r4]
 	lsls r0, r1, 1
 	adds r0, r1
@@ -608,8 +481,8 @@ TrainerApproachPlayer: @ 80B406C
 	ldr r0, =c3_8081EDC
 	movs r1, 0x50
 	bl CreateTask
-	ldr r4, =gUnknown_03006090
+	ldr r4, =gApproachingTrainers
-	ldr r3, =gUnknown_030060A8
+	ldr r3, =gNoOfApproachingTrainers
 	ldrb r2, [r3]
 	lsls r1, r2, 1
 	adds r1, r2
@@ -645,16 +518,16 @@ TrainerApproachPlayer: @ 80B406C
 sub_80B40C8: @ 80B40C8
 	push {r4,r5,lr}
 	adds r2, r0, 0
-	ldr r0, =gUnknown_02038BFC
+	ldr r0, =gApproachingTrainerId
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B40E4
-	ldr r0, =gUnknown_03006090
+	ldr r0, =gApproachingTrainers
 	ldrb r5, [r0, 0x8]
 	b _080B40E8
 	.pool
 _080B40E4:
-	ldr r0, =gUnknown_03006090
+	ldr r0, =gApproachingTrainers
 	ldrb r5, [r0, 0x14]
 _080B40E8:
 	ldr r4, =c3_8081EDC
@@ -1290,11 +1163,11 @@ sub_80B45BC: @ 80B45BC
 	thumb_func_start sub_80B45D0
 sub_80B45D0: @ 80B45D0
 	push {lr}
-	ldr r0, =gUnknown_030060A8
+	ldr r0, =gNoOfApproachingTrainers
 	ldrb r0, [r0]
 	cmp r0, 0x2
 	bne _080B4610
-	ldr r1, =gUnknown_02038BFC
+	ldr r1, =gApproachingTrainerId
 	ldrb r0, [r1]
 	cmp r0, 0
 	bne _080B460C
@@ -1304,7 +1177,7 @@ sub_80B45D0: @ 80B45D0
 	movs r0, 0x1
 	strh r0, [r1]
 	bl UnfreezeMapObjects
-	ldr r0, =gUnknown_03006090
+	ldr r0, =gApproachingTrainers
 	ldrb r0, [r0, 0xC]
 	bl sub_80974D0
 	b _080B4616
@@ -1531,16 +1404,16 @@ _080B47B2:
 	thumb_func_start sub_80B47BC
 sub_80B47BC: @ 80B47BC
 	push {lr}
-	ldr r0, =gUnknown_02038BFC
+	ldr r0, =gApproachingTrainerId
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080B47D4
-	ldr r0, =gUnknown_03006090
+	ldr r0, =gApproachingTrainers
 	ldrb r0, [r0, 0xC]
 	b _080B47D8
 	.pool
 _080B47D4:
-	ldr r0, =gUnknown_03006090
+	ldr r0, =gApproachingTrainers
 	ldrb r0, [r0]
 _080B47D8:
 	pop {r1}
@@ -1560,12 +1433,12 @@ sub_80B47E0: @ 80B47E0
 _080B47EE:
 	cmp r0, 0
 	beq _080B47FC
-	ldr r0, =gUnknown_03006090
+	ldr r0, =gApproachingTrainers
 	ldrb r0, [r0, 0xC]
 	b _080B4800
 	.pool
 _080B47FC:
-	ldr r0, =gUnknown_03006090
+	ldr r0, =gApproachingTrainers
 	ldrb r0, [r0]
 _080B4800:
 	pop {r1}
@@ -1580,7 +1453,7 @@ sub_80B4808: @ 80B4808
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080B4870
-	ldr r2, =gUnknown_03006090
+	ldr r2, =gApproachingTrainers
 	ldr r0, =gUnknown_03006080
 	ldrh r1, [r0]
 	lsls r0, r1, 1

asm/use_pokeblock.s

@@ -900,7 +900,7 @@ sub_8166D44: @ 8166D44
 	thumb_func_start sub_8166DE4
 sub_8166DE4: @ 8166DE4
 	push {r4,lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	lsrs r4, r0, 24
 	asrs r1, r0, 24

constants/battle_constants.inc

@@ -19,7 +19,7 @@
     .set BATTLE_TYPE_PALACE,          0x20000
     .set BATTLE_TYPE_ARENA,          0x40000
     .set BATTLE_TYPE_FACTORY,         0x80000
-    .set BATTLE_TYPE_x100000,         0x100000
+    .set BATTLE_TYPE_PIKE,         0x100000
     .set BATTLE_TYPE_PYRAMID,         0x200000
     .set BATTLE_TYPE_INGAME_PARTNER,  0x400000
     .set BATTLE_TYPE_x800000,         0x800000
@@ -28,7 +28,7 @@
     .set BATTLE_TYPE_x4000000,        0x4000000
     .set BATTLE_TYPE_SECRET_BASE,     0x8000000
     .set BATTLE_TYPE_GROUDON,         0x10000000
-    .set BATTLE_TYPE_KYORGE,          0x20000000
+    .set BATTLE_TYPE_KYOGRE,          0x20000000
     .set BATTLE_TYPE_RAYQUAZA,        0x40000000
     .set BATTLE_TYPE_x80000000,       0x80000000
     

data/battle_scripts_1.s

@@ -2870,7 +2870,7 @@ BattleScript_FaintedMonTryChooseAnother::
 	jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
-	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
+	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
 	jumpifword COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
 	jumpifbyte EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
@@ -2965,7 +2965,7 @@ BattleScript_PayDayMoneyAndPickUpItems::
 
 BattleScript_LocalBattleLost::
 	jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
-	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
+	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
 	jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText
 	jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
 	jumpifhalfword EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd

data/battle_setup.s

@@ -1,190 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0854FE88:: @ 854FE88
-	.byte 0x08, 0x09, 0x05, 0x0a, 0x00, 0x0a, 0x07, 0x06
-
-gUnknown_0854FE90:: @ 854FE90
-	.byte 0x04, 0x0b, 0x02, 0x03, 0x00, 0x0a, 0x01, 0x06
-
-gUnknown_0854FE98:: @ 854FE98
-	.byte 0x1d, 0x1e, 0x1f, 0x20, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29
-
-gUnknown_0854FEA4:: @ 854FEA4
-	.byte 0x1f, 0x20, 0x21
-
-gUnknown_0854FEA7:: @ 854FEA7
-	.byte 0x1d, 0x1f, 0x20, 0x21, 0x00
-
-	.align 2
-gUnknown_0854FEAC:: @ 854FEAC
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000002
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF0, 0x00000005
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0854FEF4:: @ 854FEF4
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000002
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF0, 0x00000002
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0854FF3C:: @ 854FF3C
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000002
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000002
-	.4byte gUnknown_02038BF0, 0x00000005
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0854FF84:: @ 854FF84
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000005
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF0, 0x00000005
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0854FFCC:: @ 854FFCC
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000002
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000002
-	.4byte gUnknown_02038BF0, 0x00000002
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_08550014:: @ 8550014
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_B, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD8, 0x00000002
-	.4byte gUnknown_02038BE0, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF4, 0x00000005
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0855005C:: @ 855005C
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_B, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD8, 0x00000002
-	.4byte gUnknown_02038BE0, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF4, 0x00000002
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_085500A4:: @ 85500A4
-	.2byte 0x0025, 0x0028, 0x0029, 0x002a, 0x002b, 0x0000, 0x0021, 0x0000
-	.2byte 0x02e1, 0x032c, 0x032d, 0x032e, 0x032f, 0x0000, 0x0014, 0x0000
-	.2byte 0x002c, 0x002f, 0x0030, 0x0031, 0x0032, 0x0000, 0x001a, 0x0000
-	.2byte 0x0039, 0x003c, 0x003d, 0x003e, 0x003f, 0x0000, 0x0018, 0x0000
-	.2byte 0x0040, 0x0043, 0x0044, 0x0045, 0x0046, 0x0000, 0x0018, 0x0000
-	.2byte 0x02af, 0x02b0, 0x02b1, 0x02b2, 0x02b3, 0x0000, 0x0027, 0x0000
-	.2byte 0x02ff, 0x033c, 0x033d, 0x033e, 0x033f, 0x0000, 0x0024, 0x0000
-	.2byte 0x005e, 0x0065, 0x0066, 0x0067, 0x0068, 0x0000, 0x001a, 0x0000
-	.2byte 0x004e, 0x0054, 0x0055, 0x0056, 0x0057, 0x0000, 0x001a, 0x0000
-	.2byte 0x006c, 0x006e, 0x006f, 0x0070, 0x0071, 0x0018, 0x0014, 0x0000
-	.2byte 0x0072, 0x0078, 0x0079, 0x007a, 0x007b, 0x0000, 0x0013, 0x0000
-	.2byte 0x0090, 0x034c, 0x034d, 0x034e, 0x034f, 0x0018, 0x0038, 0x0000
-	.2byte 0x007f, 0x0084, 0x0085, 0x0086, 0x0087, 0x0000, 0x0024, 0x0000
-	.2byte 0x0088, 0x008b, 0x008c, 0x008d, 0x008e, 0x0000, 0x0013, 0x0000
-	.2byte 0x008f, 0x0093, 0x0094, 0x0095, 0x0096, 0x0000, 0x001d, 0x0000
-	.2byte 0x009b, 0x00af, 0x00b0, 0x00b1, 0x00b2, 0x0000, 0x0016, 0x0000
-	.2byte 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x0000, 0x001e, 0x0000
-	.2byte 0x02a0, 0x0338, 0x0339, 0x033a, 0x033b, 0x0000, 0x002a, 0x0000
-	.2byte 0x00c3, 0x0340, 0x0341, 0x0342, 0x0343, 0x0000, 0x0026, 0x0000
-	.2byte 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x0000, 0x0021, 0x0000
-	.2byte 0x00ce, 0x00cf, 0x00d0, 0x00d1, 0x00d2, 0x0000, 0x001d, 0x0000
-	.2byte 0x00d8, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x0018, 0x000d, 0x0000
-	.2byte 0x02a9, 0x02aa, 0x02ab, 0x02ac, 0x02ad, 0x0018, 0x0001, 0x0000
-	.2byte 0x00e2, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x0000, 0x0023, 0x0000
-	.2byte 0x00ee, 0x00ef, 0x00f0, 0x00f1, 0x00f2, 0x0000, 0x0026, 0x0000
-	.2byte 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x0000, 0x0026, 0x0000
-	.2byte 0x00fe, 0x0101, 0x0102, 0x0103, 0x0104, 0x0000, 0x0024, 0x0000
-	.2byte 0x0118, 0x011a, 0x011b, 0x011c, 0x011d, 0x0000, 0x001f, 0x0000
-	.2byte 0x0111, 0x0114, 0x0115, 0x0116, 0x0117, 0x0000, 0x001f, 0x0000
-	.2byte 0x011f, 0x0120, 0x0121, 0x0122, 0x0123, 0x0000, 0x0020, 0x0000
-	.2byte 0x012e, 0x012f, 0x0130, 0x0131, 0x0132, 0x0000, 0x0019, 0x0000
-	.2byte 0x0125, 0x0127, 0x0128, 0x0129, 0x012a, 0x0000, 0x0012, 0x0000
-	.2byte 0x0133, 0x0134, 0x0135, 0x0136, 0x0137, 0x0000, 0x001e, 0x0000
-	.2byte 0x0139, 0x013a, 0x013b, 0x013c, 0x013d, 0x0018, 0x000c, 0x0000
-	.2byte 0x013e, 0x0148, 0x0149, 0x014a, 0x014b, 0x0000, 0x0011, 0x0000
-	.2byte 0x0153, 0x015a, 0x015b, 0x015c, 0x015d, 0x0000, 0x0015, 0x0000
-	.2byte 0x0178, 0x017b, 0x017c, 0x017d, 0x017e, 0x0000, 0x002b, 0x0000
-	.2byte 0x0171, 0x0172, 0x0173, 0x0174, 0x0175, 0x0000, 0x0020, 0x0000
-	.2byte 0x0166, 0x0168, 0x0169, 0x016a, 0x016b, 0x0000, 0x0019, 0x0000
-	.2byte 0x016c, 0x016d, 0x016e, 0x016f, 0x0170, 0x0000, 0x0020, 0x0000
-	.2byte 0x0182, 0x0184, 0x0185, 0x0186, 0x0187, 0x0000, 0x002b, 0x0000
-	.2byte 0x0161, 0x0162, 0x0163, 0x0164, 0x0165, 0x0000, 0x0019, 0x0000
-	.2byte 0x0179, 0x0334, 0x0335, 0x0336, 0x0337, 0x0000, 0x0029, 0x0000
-	.2byte 0x0188, 0x0189, 0x018a, 0x018b, 0x018c, 0x0018, 0x0001, 0x0000
-	.2byte 0x0196, 0x0199, 0x019a, 0x019b, 0x019c, 0x0000, 0x0023, 0x0000
-	.2byte 0x01a3, 0x01a5, 0x01a6, 0x01a7, 0x01a8, 0x0000, 0x001c, 0x0000
-	.2byte 0x01ab, 0x01ae, 0x01af, 0x01b0, 0x01b1, 0x0000, 0x001e, 0x0000
-	.2byte 0x01b2, 0x01b5, 0x01b6, 0x01b7, 0x01b8, 0x0000, 0x001c, 0x0000
-	.2byte 0x01c1, 0x01d1, 0x01d2, 0x01d3, 0x01d4, 0x0000, 0x0027, 0x0000
-	.2byte 0x01da, 0x01dd, 0x01de, 0x01df, 0x01e0, 0x0018, 0x000d, 0x0000
-	.2byte 0x01e1, 0x01e2, 0x01e7, 0x01e8, 0x01e9, 0x0000, 0x0012, 0x0000
-	.2byte 0x01ec, 0x01f1, 0x01f2, 0x01f3, 0x01f4, 0x0000, 0x0028, 0x0000
-	.2byte 0x02e4, 0x0330, 0x0331, 0x0332, 0x0333, 0x0000, 0x0017, 0x0000
-	.2byte 0x0200, 0x0203, 0x0204, 0x0205, 0x0206, 0x0000, 0x0019, 0x0000
-	.2byte 0x0221, 0x0224, 0x0225, 0x0226, 0x0227, 0x0000, 0x0020, 0x0000
-	.2byte 0x021a, 0x021d, 0x021e, 0x021f, 0x0220, 0x0000, 0x0020, 0x0000
-	.2byte 0x0009, 0x0348, 0x0349, 0x034a, 0x034b, 0x0018, 0x0011, 0x0000
-	.2byte 0x022f, 0x0232, 0x0233, 0x0234, 0x0235, 0x0000, 0x0022, 0x0000
-	.2byte 0x0228, 0x022b, 0x022c, 0x022d, 0x022e, 0x0000, 0x0022, 0x0000
-	.2byte 0x025c, 0x025f, 0x0260, 0x0261, 0x0262, 0x0000, 0x0013, 0x0000
-	.2byte 0x026d, 0x026e, 0x026f, 0x0270, 0x0271, 0x0018, 0x000b, 0x0000
-	.2byte 0x0273, 0x027c, 0x027d, 0x027e, 0x027f, 0x0000, 0x001b, 0x0000
-	.2byte 0x0001, 0x0344, 0x0345, 0x0346, 0x0347, 0x0018, 0x000c, 0x0000
-	.2byte 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0018, 0x003e, 0x0000
-	.2byte 0x0291, 0x0292, 0x0293, 0x0294, 0x0294, 0x0018, 0x002b, 0x0000
-	.2byte 0x0109, 0x0302, 0x0303, 0x0304, 0x0305, 0x0000, 0x0003, 0x0000
-	.2byte 0x010a, 0x0306, 0x0307, 0x0308, 0x0309, 0x0000, 0x000b, 0x0000
-	.2byte 0x010b, 0x030a, 0x030b, 0x030c, 0x030d, 0x0000, 0x0002, 0x0000
-	.2byte 0x010c, 0x030e, 0x030f, 0x0310, 0x0311, 0x0000, 0x000c, 0x0000
-	.2byte 0x010d, 0x0312, 0x0313, 0x0314, 0x0315, 0x0000, 0x0000, 0x0000
-	.2byte 0x010e, 0x0316, 0x0317, 0x0318, 0x0319, 0x0000, 0x0004, 0x0000
-	.2byte 0x010f, 0x031a, 0x031b, 0x031c, 0x031d, 0x0000, 0x0006, 0x0000
-	.2byte 0x0110, 0x031e, 0x031f, 0x0320, 0x0321, 0x0000, 0x0007, 0x0000
-	.2byte 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0000, 0x0008, 0x0000
-	.2byte 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0000, 0x0008, 0x0000
-	.2byte 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0000, 0x0008, 0x0000
-	.2byte 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0000, 0x0008, 0x0000
-	.2byte 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x0000, 0x0008, 0x0000
-
-	.align 2
-gUnknown_08550584:: @ 8550584
-	.2byte 0x0867, 0x0868, 0x0869, 0x086a, 0x086b, 0x086c, 0x086d, 0x086e
-

data/data4c.s

@@ -1,40 +0,0 @@
-@ the fourth big chunk of data
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_085B21D4:: @ 85B21D4
-	.incbin "baserom.gba", 0x5b21d4, 0x8
-
-gUnknown_085B21DC:: @ 85B21DC
-	.incbin "baserom.gba", 0x5b21dc, 0x18
-
-gUnknown_085B21F4:: @ 85B21F4
-	.incbin "baserom.gba", 0x5b21f4, 0x8
-
-gUnknown_085B21FC:: @ 85B21FC
-	.incbin "baserom.gba", 0x5b21fc, 0xc
-
-gUnknown_085B2208:: @ 85B2208
-	.incbin "baserom.gba", 0x5b2208, 0x10
-
-gUnknown_085B2218:: @ 85B2218
-	.incbin "baserom.gba", 0x5b2218, 0x38
-
-gUnknown_085B2250:: @ 85B2250
-	.incbin "baserom.gba", 0x5b2250, 0x18
-
-gUnknown_085B2268:: @ 85B2268
-	.incbin "baserom.gba", 0x5b2268, 0x38
-
-gUnknown_085B22A0:: @ 85B22A0
-	.incbin "baserom.gba", 0x5b22a0, 0x18
-
-gUnknown_085B22B8:: @ 85B22B8
-	.incbin "baserom.gba", 0x5b22b8, 0x18
-
-gUnknown_085B22D0:: @ 85B22D0
-	.incbin "baserom.gba", 0x5b22d0, 0x2d0
-

data/event_scripts.s

@@ -846,101 +846,101 @@ EventScript_271356:: @ 8271356
 	special SetUpTrainerEncounterMusic
 	special sub_80B45AC
 	waitstate
-	goto EventScript_27143C
+	goto EventScript_ShowTrainerIntroMsg
 
 EventScript_271362:: @ 8271362
 	lock
 	faceplayer
-	applymovement 0x800F, Movement_27143A
+	applymovement VAR_LAST_TALKED, Movement_27143A
 	waitmovement 0
-	specialvar VAR_RESULT, check_trainer_flag
+	specialvar VAR_RESULT, GetTrainerFlag
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 5, EventScript_271389
 	special SetUpTrainerEncounterMusic
 	special sub_80B16D8
-	goto EventScript_27143C
+	goto EventScript_ShowTrainerIntroMsg
 
 EventScript_271389:: @ 8271389
-	ontrainerbattleend
+	gotopostbattlescript
 
-EventScript_27138A:: @ 827138A
+EventScript_TryDoDoubleTrainerBattle:: @ 827138A
 	lock
 	faceplayer
 	call EventScript_27142F
-	specialvar VAR_RESULT, check_trainer_flag
+	specialvar VAR_RESULT, GetTrainerFlag
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 5, EventScript_2713C1
-	special sub_80F92F8
+	special HasEnoughMonsForDoubleBattle
 	compare_var_to_value VAR_RESULT, 0
-	goto_if 5, EventScript_2713BA
+	goto_if 5, EventScript_NotEnoughMonsForDoubleBattle
 	special SetUpTrainerEncounterMusic
 	special sub_80B16D8
-	goto EventScript_27143C
+	goto EventScript_ShowTrainerIntroMsg
 
-EventScript_2713BA:: @ 82713BA
+EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA
-	special special_trainer_unable_to_battle
+	special ShowTrainerCantBattleSpeech
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 EventScript_2713C1:: @ 82713C1
-	ontrainerbattleend
+	gotopostbattlescript
 
 EventScript_2713C2:: @ 82713C2
-	applymovement 0x800F, Movement_27143A
+	applymovement VAR_LAST_TALKED, Movement_27143A
 	waitmovement 0
 	special SetUpTrainerEncounterMusic
 	trainerbattlebegin
-	ontrainerbattleend
+	gotopostbattlescript
 
 EventScript_2713D1:: @ 82713D1
 	call EventScript_27142F
-	specialvar VAR_RESULT, sub_80B22A0
+	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare_var_to_value VAR_RESULT, 0
 	goto_eq EventScript_2713F7
 	special SetUpTrainerEncounterMusic
 	special sub_80B16D8
-	special sub_80B1A14
+	special ShowTrainerIntroSpeech
 	waitmessage
 	waitbuttonpress
-	special sub_80B19EC
+	special BattleSetup_StartRematchBattle
 	waitstate
 	releaseall
 	end
 
 EventScript_2713F7:: @ 82713F7
-	ontrainerbattleend
+	gotopostbattlescript
 
-EventScript_2713F8:: @ 82713F8
+EventScript_TryDoDoubleRematchBattle:: @ 82713F8
-	specialvar VAR_RESULT, sub_80B22A0
+	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare_var_to_value VAR_RESULT, 0
 	goto_eq EventScript_271427
-	special sub_80F92F8
+	special HasEnoughMonsForDoubleBattle
 	compare_var_to_value VAR_RESULT, 0
-	goto_if 5, EventScript_271428
+	goto_if 5, EventScript_NotEnoughMonsForDoubleRematchBattle
 	special SetUpTrainerEncounterMusic
 	special sub_80B16D8
-	special sub_80B1A14
+	special ShowTrainerIntroSpeech
 	waitmessage
 	waitbuttonpress
-	special sub_80B19EC
+	special BattleSetup_StartRematchBattle
 	waitstate
 	releaseall
 	end
 
 EventScript_271427:: @ 8271427
-	ontrainerbattleend
+	gotopostbattlescript
 
-EventScript_271428:: @ 8271428
+EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 8271428
-	special special_trainer_unable_to_battle
+	special ShowTrainerCantBattleSpeech
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 EventScript_27142F:: @ 827142F
-	applymovement 0x800F, Movement_27143A
+	applymovement VAR_LAST_TALKED, Movement_27143A
 	waitmovement 0
 	return
 
@@ -948,18 +948,18 @@ Movement_27143A: @ 827143A
 	step_59
 	step_end
 
-EventScript_27143C:: @ 827143C
+EventScript_ShowTrainerIntroMsg:: @ 827143C
-	special sub_80B1A14
+	special ShowTrainerIntroSpeech
 	waitmessage
 	waitbuttonpress
 	special sub_80B45D0
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq EventScript_271356
-	goto EventScript_271454
+	goto EventScript_DoTrainerBattle
 
-EventScript_271454:: @ 8271454
+EventScript_DoTrainerBattle:: @ 8271454
 	trainerbattlebegin
-	specialvar VAR_RESULT, sub_80B170C
+	specialvar VAR_RESULT, GetTrainerBattleMode
 	compare_var_to_value VAR_RESULT, 0
 	goto_eq EventScript_271491
 	compare_var_to_value VAR_RESULT, 2
@@ -972,7 +972,7 @@ EventScript_271454:: @ 8271454
 	goto_eq EventScript_271491
 
 EventScript_271491:: @ 8271491
-	ontrainerbattleendgoto
+	gotobeatenscript
 	releaseall
 	end
 
@@ -2272,7 +2272,7 @@ Route101_EventScript_272141:: @ 8272141
 Route103_EventScript_272141:: @ 8272141
 	lock
 	faceplayer
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_if 0, Route101_EventScript_272155
 	checkflag FLAG_0x119
 	goto_if 0, Route101_EventScript_1FA2D2
@@ -4086,15 +4086,15 @@ Std_8:: @ 82742C9
 	delay 30
 	return
 
-LavaridgeTown_Gym_1F_EventScript_2742E6:: @ 82742E6
+EventScript_TryGetTrainerScript:: @ 82742E6
-	special CheckIfMultipleTrainersWantBattle
+	special ShouldTryGetTrainerScript
 	compare_var_to_value VAR_RESULT, 1
-	goto_eq LavaridgeTown_Gym_1F_EventScript_2742F6
+	goto_eq EventScript_GotoTrainerScript
 	releaseall
 	end
 
-LavaridgeTown_Gym_1F_EventScript_2742F6:: @ 82742F6
+EventScript_GotoTrainerScript:: @ 82742F6
-	ontrainerbattleendgoto
+	gotobeatenscript
 	releaseall
 	end
 
@@ -13973,12 +13973,12 @@ EventScript_2C83F0:: @ 82C83F0
 	closemessage
 	end
 
-Text_2C840A:: @ 82C840A
+Text_ThisIsATestSignpostMsg:: @ 82C840A
 	.string "This is a test message.\n"
 	.string "This is a signpost.$"
 
-EventScript_2C8436:: @ 82C8436
+EventScript_TestSignpostMsg:: @ 82C8436
-	msgbox Text_2C840A, 3
+	msgbox Text_ThisIsATestSignpostMsg, 3
 	end
 
 	.string "It’s very disappointing…$"

data/script_cmd_table.inc

@@ -94,8 +94,8 @@ gScriptCmdTable:: @ 81DB67C
 	.4byte ScrCmd_turnobject
 	.4byte ScrCmd_trainerbattle
 	.4byte ScrCmd_dotrainerbattle
-	.4byte ScrCmd_ontrainerbattleend
+	.4byte ScrCmd_gotopostbattlescript
-	.4byte ScrCmd_ontrainerbattleendgoto
+	.4byte ScrCmd_gotobeatenscript
 	.4byte ScrCmd_checktrainerflag
 	.4byte ScrCmd_settrainerflag
 	.4byte ScrCmd_cleartrainerflag

data/scripts/cable_club.inc

@@ -409,7 +409,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E
-	special sub_80F92F8
+	special HasEnoughMonsForDoubleBattle
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_276F47
 	setvar VAR_0x8004, 2
@@ -1194,7 +1194,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899
-	special sub_80F92F8
+	special HasEnoughMonsForDoubleBattle
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_2778B2
 	setvar VAR_0x8004, 1

data/scripts/maps/AbandonedShip_Rooms2_1F.inc

@@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6
 
 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7
 	trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0
 	msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4
@@ -26,7 +26,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0
 
 AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
 	trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms2_1F_EventScript_238154
 	msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4

data/scripts/maps/AbandonedShip_Rooms_1F.inc

@@ -12,7 +12,7 @@ AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C
 
 AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3
 	trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE
 	msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4

data/scripts/maps/AncientTomb.inc

@@ -72,7 +72,7 @@ AncientTomb_EventScript_23905A:: @ 823905A
 	waitmoncry
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0A74
+	special StartRegiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80

data/scripts/maps/BattleFrontier_Lounge2.inc

@@ -17,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F
 	end
 
 BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
-	compare_var_to_value VAR_0x402F, 0
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 0
 	call_if 1, BattleFrontier_Lounge2_EventScript_26070A
-	compare_var_to_value VAR_0x402F, 1
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 1
 	call_if 1, BattleFrontier_Lounge2_EventScript_26070F
-	compare_var_to_value VAR_0x402F, 2
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 2
 	call_if 1, BattleFrontier_Lounge2_EventScript_260714
-	compare_var_to_value VAR_0x402F, 3
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 3
 	call_if 1, BattleFrontier_Lounge2_EventScript_260719
-	compare_var_to_value VAR_0x402F, 4
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 4
 	call_if 1, BattleFrontier_Lounge2_EventScript_26071E
-	compare_var_to_value VAR_0x402F, 5
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 5
 	call_if 1, BattleFrontier_Lounge2_EventScript_260723
-	compare_var_to_value VAR_0x402F, 6
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 6
 	call_if 1, BattleFrontier_Lounge2_EventScript_260728
-	compare_var_to_value VAR_0x402F, 7
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 7
 	call_if 1, BattleFrontier_Lounge2_EventScript_26072D
-	compare_var_to_value VAR_0x402F, 8
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 8
 	call_if 1, BattleFrontier_Lounge2_EventScript_260732
-	compare_var_to_value VAR_0x402F, 9
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 9
 	call_if 1, BattleFrontier_Lounge2_EventScript_260737
-	compare_var_to_value VAR_0x402F, 3
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 3
 	call_if 3, BattleFrontier_Lounge2_EventScript_2606F8
-	compare_var_to_value VAR_0x402F, 4
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 4
 	call_if 4, BattleFrontier_Lounge2_EventScript_260701
 	special sub_8139F20
 	waitmessage

data/scripts/maps/BattleFrontier_Lounge3.inc

@@ -32,7 +32,7 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
 
 BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9
 	multichoice 20, 4, 87, 0
-	copyvar VAR_0x4032, VAR_RESULT
+	copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
 	switch VAR_RESULT
 	case 0, BattleFrontier_Lounge3_EventScript_261E30
 	case 1, BattleFrontier_Lounge3_EventScript_261E3B
@@ -69,7 +69,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
 BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75
 	copyvar VAR_0x8004, VAR_0x8008
 	special sub_813A9A4
-	setvar VAR_0x4033, 1
+	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
 	special sub_813A8FC
 	playse SE_REGI
 	msgbox BattleFrontier_Lounge3_Text_262BE0, 4
@@ -113,37 +113,37 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
 
 BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
 	msgbox BattleFrontier_Lounge3_Text_26346B, 4
-	compare_var_to_value VAR_0x4033, 1
+	compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
 	goto_if 4, BattleFrontier_Lounge3_EventScript_261F12
 	goto BattleFrontier_Lounge3_EventScript_261DAF
 	end
 
 BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
-	compare_var_to_value VAR_0x4033, 1
+	compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
 	goto_eq BattleFrontier_Lounge3_EventScript_261F9E
-	compare_var_to_value VAR_0x4033, 2
+	compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2
 	goto_eq BattleFrontier_Lounge3_EventScript_261F2E
 	goto BattleFrontier_Lounge3_EventScript_261F71
 	end
 
 BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
 	msgbox BattleFrontier_Lounge3_Text_263334, 4
-	compare_var_to_value VAR_0x4032, 0
+	compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0
 	call_if 1, BattleFrontier_Lounge3_EventScript_261F80
-	compare_var_to_value VAR_0x4032, 1
+	compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1
 	call_if 1, BattleFrontier_Lounge3_EventScript_261F8A
-	compare_var_to_value VAR_0x4032, 2
+	compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2
 	call_if 1, BattleFrontier_Lounge3_EventScript_261F94
 	msgbox BattleFrontier_Lounge3_Text_2633D4, 9
 	special sub_813A9D0
 	msgbox BattleFrontier_Lounge3_Text_2633F2, 4
-	setvar VAR_0x4033, 0
+	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
 	release
 	end
 
 BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71
 	msgbox BattleFrontier_Lounge3_Text_263298, 4
-	setvar VAR_0x4033, 0
+	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
 	release
 	end
 

data/scripts/maps/BirthIsland_Exterior.inc

@@ -88,7 +88,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
 	setvar VAR_0x8006, 0
 	special DoScriptedWildBattle
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0934
+	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80

data/scripts/maps/DesertRuins.inc

@@ -72,7 +72,7 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
 	waitmoncry
 	setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0A74
+	special StartRegiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80

data/scripts/maps/DewfordTown_Gym.inc

@@ -157,7 +157,7 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1
 
 DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2
 	trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq DewfordTown_Gym_EventScript_1FC89C
 	checkflag FLAG_0x0A6

data/scripts/maps/FarawayIsland_Interior.inc

@@ -145,7 +145,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
 	setvar VAR_0x8006, 0
 	special DoScriptedWildBattle
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0934
+	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80

data/scripts/maps/FortreeCity_Gym.inc

@@ -17,7 +17,7 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4
 
 FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
 	trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq FortreeCity_Gym_EventScript_21668D
 	checkflag FLAG_0x0AA

data/scripts/maps/IslandCave.inc

@@ -104,7 +104,7 @@ IslandCave_EventScript_238F58:: @ 8238F58
 	waitmoncry
 	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0A74
+	special StartRegiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80

data/scripts/maps/JaggedPass.inc

@@ -104,7 +104,7 @@ JaggedPass_EventScript_230785:: @ 8230785
 
 JaggedPass_EventScript_23079C:: @ 823079C
 	trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq JaggedPass_EventScript_2307E4
 	msgbox JaggedPass_Text_2309D8, 4
@@ -128,7 +128,7 @@ JaggedPass_EventScript_2307E4:: @ 82307E4
 
 JaggedPass_EventScript_2307FB:: @ 82307FB
 	trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq JaggedPass_EventScript_230843
 	msgbox JaggedPass_Text_230B93, 4

data/scripts/maps/LavaridgeTown_Gym_1F.inc

@@ -60,7 +60,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B
 
 LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
 	trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864
 	checkflag FLAG_0x0A8
@@ -127,9 +127,9 @@ LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A
 LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A
 	call LavaridgeTown_Gym_1F_EventScript_1FE705
 	release
-	special CheckIfMultipleTrainersWantBattle
+	special ShouldTryGetTrainerScript
 	compare_var_to_value VAR_RESULT, 1
-	goto_eq LavaridgeTown_Gym_1F_EventScript_2742F6
+	goto_eq EventScript_GotoTrainerScript
 	end
 
 LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF

data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc

@@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
 	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A
 	compare_var_to_value VAR_0x40D3, 2
 	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
 	checkflag FLAG_0x119
 	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2

data/scripts/maps/MarineCave_End.inc

@@ -38,7 +38,7 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
 	setvar VAR_LAST_TALKED, 1
 	setwildbattle SPECIES_KYOGRE, 70, ITEM_NONE
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0934
+	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	setvar VAR_0x4001, 0

data/scripts/maps/MauvilleCity_Gym.inc

@@ -77,7 +77,7 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7
 
 MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
 	trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MauvilleCity_Gym_EventScript_20DFDE
 	checkflag FLAG_0x0A7

data/scripts/maps/MeteorFalls_1F_2R.inc

@@ -3,7 +3,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD
 
 MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE
 	trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MeteorFalls_1F_2R_EventScript_22C529
 	msgbox MeteorFalls_1F_2R_Text_22C6A3, 4
@@ -28,7 +28,7 @@ MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529
 
 MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540
 	trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MeteorFalls_1F_2R_EventScript_22C589
 	msgbox MeteorFalls_1F_2R_Text_22C8C1, 4
@@ -51,7 +51,7 @@ MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589
 
 MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4
 	trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MeteorFalls_1F_2R_EventScript_22C5ED
 	msgbox MeteorFalls_1F_2R_Text_22CA70, 4

data/scripts/maps/MossdeepCity_Gym.inc

@@ -50,7 +50,7 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885
 
 MossdeepCity_Gym_EventScript_220898:: @ 8220898
 	trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MossdeepCity_Gym_EventScript_22097E
 	checkflag FLAG_0x0AB

data/scripts/maps/MtChimney.inc

@@ -488,7 +488,7 @@ MtChimney_EventScript_22F141:: @ 822F141
 
 MtChimney_EventScript_22F14A:: @ 822F14A
 	trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MtChimney_EventScript_22F195
 	msgbox MtChimney_Text_2300A2, 4
@@ -533,7 +533,7 @@ MtChimney_EventScript_22F1F1:: @ 822F1F1
 
 MtChimney_EventScript_22F208:: @ 822F208
 	trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MtChimney_EventScript_22F253
 	msgbox MtChimney_Text_230519, 4

data/scripts/maps/MtPyre_3F.inc

@@ -13,7 +13,7 @@ MtPyre_3F_EventScript_23176A:: @ 823176A
 
 MtPyre_3F_EventScript_231781:: @ 8231781
 	trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MtPyre_3F_EventScript_2317CC
 	msgbox MtPyre_3F_Text_23199B, 4

data/scripts/maps/MtPyre_6F.inc

@@ -3,7 +3,7 @@ MtPyre_6F_MapScripts:: @ 8231D3A
 
 MtPyre_6F_EventScript_231D3B:: @ 8231D3B
 	trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq MtPyre_6F_EventScript_231D86
 	msgbox MtPyre_6F_Text_231DFC, 4

data/scripts/maps/NavelRock_Bottom.inc

@@ -61,7 +61,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
 	setvar VAR_0x8006, 0
 	special DoScriptedWildBattle
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0934
+	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80

data/scripts/maps/NavelRock_Top.inc

@@ -65,7 +65,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
 	setvar VAR_0x8006, 0
 	special DoScriptedWildBattle
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0934
+	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	setvar VAR_LAST_TALKED, 1

data/scripts/maps/PetalburgCity.inc

@@ -36,7 +36,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 	applymovement 255, PetalburgCity_Movement_1DC430
 	waitmovement 0
 	msgbox PetalburgCity_Text_1EC1F8, 4
-	special sub_80B086C
+	special StartWallyTutorialBattle
 	waitstate
 	msgbox PetalburgCity_Text_1EC271, 4
 	applymovementat 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY

data/scripts/maps/PetalburgCity_Gym.inc

@@ -62,7 +62,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955
 
 PetalburgCity_Gym_EventScript_20495D:: @ 820495D
 	setorcopyvar 0x8015, 269
-	specialvar VAR_RESULT, sub_80B22A0
+	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq PetalburgCity_Gym_EventScript_204985
 	compare_var_to_value VAR_0x4085, 8

data/scripts/maps/PetalburgWoods.inc

@@ -279,7 +279,7 @@ PetalburgWoods_EventScript_22E26D:: @ 822E26D
 
 PetalburgWoods_EventScript_22E284:: @ 822E284
 	trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq PetalburgWoods_EventScript_22E31B
 	setvar VAR_0x8004, 621
@@ -293,7 +293,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284
 PetalburgWoods_EventScript_22E2C5:: @ 822E2C5
 	special sub_80B4808
 	waitmovement 0
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq PetalburgWoods_EventScript_22E2D6
 	release
 	end
@@ -308,7 +308,7 @@ PetalburgWoods_EventScript_22E2D6:: @ 822E2D6
 	end
 
 PetalburgWoods_EventScript_22E2EF:: @ 822E2EF
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq PetalburgWoods_EventScript_22E302
 	msgbox PetalburgWoods_Text_22E889, 4
 	release

data/scripts/maps/Route101.inc

@@ -225,7 +225,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	setobjectxy 255, 6, 13
 	applymovement 255, Route101_Movement_2725A4
 	waitmovement 0
-	special sub_80B1138
+	special ChooseStarter
 	waitstate
 	applymovement 2, Route101_Movement_1EBE8D
 	waitmovement 0

data/scripts/maps/Route102.inc

@@ -19,7 +19,7 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC
 
 Route102_EventScript_1EC105:: @ 81EC105
 	trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route102_EventScript_1EC19C
 	setvar VAR_0x8004, 318
@@ -33,7 +33,7 @@ Route102_EventScript_1EC105:: @ 81EC105
 Route102_EventScript_1EC146:: @ 81EC146
 	special sub_80B4808
 	waitmovement 0
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route102_EventScript_1EC157
 	release
 	end
@@ -48,7 +48,7 @@ Route102_EventScript_1EC157:: @ 81EC157
 	end
 
 Route102_EventScript_1EC170:: @ 81EC170
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route102_EventScript_1EC183
 	msgbox Route102_Text_2945AC, 4
 	release

data/scripts/maps/Route103.inc

@@ -209,7 +209,7 @@ Route103_EventScript_1EC5F4:: @ 81EC5F4
 
 Route103_EventScript_1EC60B:: @ 81EC60B
 	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC653
 	msgbox Route103_Text_294A52, 6
@@ -231,7 +231,7 @@ Route103_EventScript_1EC653:: @ 81EC653
 
 Route103_EventScript_1EC66E:: @ 81EC66E
 	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC6B6
 	msgbox Route103_Text_294B40, 6
@@ -258,7 +258,7 @@ Route103_EventScript_1EC6D1:: @ 81EC6D1
 
 Route103_EventScript_1EC6E8:: @ 81EC6E8
 	trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC733
 	msgbox Route103_Text_294F42, 4

data/scripts/maps/Route104.inc

@@ -882,7 +882,7 @@ Route104_EventScript_1ED376:: @ 81ED376
 
 Route104_EventScript_1ED38D:: @ 81ED38D
 	trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route104_EventScript_1ED424
 	setvar VAR_0x8004, 604
@@ -896,7 +896,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D
 Route104_EventScript_1ED3CE:: @ 81ED3CE
 	special sub_80B4808
 	waitmovement 0
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route104_EventScript_1ED3DF
 	release
 	end
@@ -911,7 +911,7 @@ Route104_EventScript_1ED3DF:: @ 81ED3DF
 	end
 
 Route104_EventScript_1ED3F8:: @ 81ED3F8
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route104_EventScript_1ED40B
 	msgbox Route104_Text_295689, 4
 	release
@@ -933,7 +933,7 @@ Route104_EventScript_1ED424:: @ 81ED424
 
 Route104_EventScript_1ED43B:: @ 81ED43B
 	trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route104_EventScript_1ED4D2
 	setvar VAR_0x8004, 136
@@ -947,7 +947,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B
 Route104_EventScript_1ED47C:: @ 81ED47C
 	special sub_80B4808
 	waitmovement 0
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route104_EventScript_1ED48D
 	release
 	end
@@ -962,7 +962,7 @@ Route104_EventScript_1ED48D:: @ 81ED48D
 	end
 
 Route104_EventScript_1ED4A6:: @ 81ED4A6
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route104_EventScript_1ED4B9
 	msgbox Route104_Text_2958C1, 4
 	release
@@ -984,7 +984,7 @@ Route104_EventScript_1ED4D2:: @ 81ED4D2
 
 Route104_EventScript_1ED4E9:: @ 81ED4E9
 	trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route104_EventScript_1ED580
 	setvar VAR_0x8004, 114
@@ -998,7 +998,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9
 Route104_EventScript_1ED52A:: @ 81ED52A
 	special sub_80B4808
 	waitmovement 0
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route104_EventScript_1ED53B
 	release
 	end
@@ -1013,7 +1013,7 @@ Route104_EventScript_1ED53B:: @ 81ED53B
 	end
 
 Route104_EventScript_1ED554:: @ 81ED554
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route104_EventScript_1ED567
 	msgbox Route104_Text_295AC3, 4
 	release

data/scripts/maps/Route105.inc

@@ -63,7 +63,7 @@ Route105_EventScript_1EE2BD:: @ 81EE2BD
 
 Route105_EventScript_1EE2D4:: @ 81EE2D4
 	trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route105_EventScript_1EE31F
 	msgbox Route105_Text_2960FA, 4

data/scripts/maps/Route106.inc

@@ -17,7 +17,7 @@ Route106_EventScript_1EE4AA:: @ 81EE4AA
 
 Route106_EventScript_1EE4C1:: @ 81EE4C1
 	trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route106_EventScript_1EE50C
 	msgbox Route106_Text_29638C, 4

data/scripts/maps/Route107.inc

@@ -8,7 +8,7 @@ Route107_EventScript_1EE595:: @ 81EE595
 
 Route107_EventScript_1EE5AC:: @ 81EE5AC
 	trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route107_EventScript_1EE5F7
 	msgbox Route107_Text_2967FF, 4

data/scripts/maps/Route108.inc

@@ -28,7 +28,7 @@ Route108_EventScript_1EE6E6:: @ 81EE6E6
 
 Route108_EventScript_1EE6FD:: @ 81EE6FD
 	trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route108_EventScript_1EE748
 	msgbox Route108_Text_296FB0, 4

data/scripts/maps/Route109.inc

@@ -397,7 +397,7 @@ Route109_EventScript_1EEA82:: @ 81EEA82
 
 Route109_EventScript_1EEA99:: @ 81EEA99
 	trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route109_EventScript_1EEAE4
 	msgbox Route109_Text_297380, 4
@@ -422,7 +422,7 @@ Route109_EventScript_1EEAE4:: @ 81EEAE4
 
 Route109_EventScript_1EEAFB:: @ 81EEAFB
 	trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route109_EventScript_1EEB46
 	msgbox Route109_Text_2974D6, 4

data/scripts/maps/Route110.inc

@@ -176,7 +176,7 @@ Route110_EventScript_1EF409:: @ 81EF409
 
 Route110_EventScript_1EF420:: @ 81EF420
 	trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF46B
 	msgbox Route110_Text_2981B3, 4
@@ -216,7 +216,7 @@ Route110_EventScript_1EF4B0:: @ 81EF4B0
 
 Route110_EventScript_1EF4C7:: @ 81EF4C7
 	trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF512
 	msgbox Route110_Text_297CB4, 4
@@ -246,7 +246,7 @@ Route110_EventScript_1EF529:: @ 81EF529
 
 Route110_EventScript_1EF540:: @ 81EF540
 	trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF58B
 	msgbox Route110_Text_297E88, 4
@@ -271,7 +271,7 @@ Route110_EventScript_1EF58B:: @ 81EF58B
 
 Route110_EventScript_1EF5A2:: @ 81EF5A2
 	trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF5ED
 	msgbox Route110_Text_2983A2, 4

data/scripts/maps/Route111.inc

@@ -473,7 +473,7 @@ Route111_EventScript_1F1249:: @ 81F1249
 
 Route111_EventScript_1F1260:: @ 81F1260
 	trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route111_EventScript_1F12AB
 	msgbox Route111_Text_298B9A, 4
@@ -513,7 +513,7 @@ Route111_EventScript_1F12F0:: @ 81F12F0
 
 Route111_EventScript_1F1307:: @ 81F1307
 	trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route111_EventScript_1F1352
 	msgbox Route111_Text_298FD4, 4
@@ -538,7 +538,7 @@ Route111_EventScript_1F1352:: @ 81F1352
 
 Route111_EventScript_1F1369:: @ 81F1369
 	trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route111_EventScript_1F13B4
 	msgbox Route111_Text_2991C2, 4

data/scripts/maps/Route112.inc

@@ -67,7 +67,7 @@ Route112_EventScript_1F1E6A:: @ 81F1E6A
 
 Route112_EventScript_1F1E81:: @ 81F1E81
 	trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route112_EventScript_1F1ECC
 	msgbox Route112_Text_299896, 4

data/scripts/maps/Route113.inc

@@ -60,7 +60,7 @@ Route113_EventScript_1F21D7:: @ 81F21D7
 
 Route113_EventScript_1F21EE:: @ 81F21EE
 	trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route113_EventScript_1F2239
 	msgbox Route113_Text_299F15, 4
@@ -85,7 +85,7 @@ Route113_EventScript_1F2239:: @ 81F2239
 
 Route113_EventScript_1F2250:: @ 81F2250
 	trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route113_EventScript_1F229B
 	msgbox Route113_Text_29A067, 4

data/scripts/maps/Route114.inc

@@ -110,7 +110,7 @@ Route114_EventScript_1F2685:: @ 81F2685
 
 Route114_EventScript_1F269C:: @ 81F269C
 	trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route114_EventScript_1F26E7
 	msgbox Route114_Text_29A981, 4
@@ -135,7 +135,7 @@ Route114_EventScript_1F26E7:: @ 81F26E7
 
 Route114_EventScript_1F26FE:: @ 81F26FE
 	trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route114_EventScript_1F2749
 	msgbox Route114_Text_29AB36, 4

data/scripts/maps/Route115.inc

@@ -38,7 +38,7 @@ Route115_EventScript_1F2985:: @ 81F2985
 
 Route115_EventScript_1F298E:: @ 81F298E
 	trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F29D9
 	msgbox Route115_Text_29B258, 4
@@ -68,7 +68,7 @@ Route115_EventScript_1F29F0:: @ 81F29F0
 
 Route115_EventScript_1F2A07:: @ 81F2A07
 	trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F2A52
 	msgbox Route115_Text_29B49D, 4
@@ -93,7 +93,7 @@ Route115_EventScript_1F2A52:: @ 81F2A52
 
 Route115_EventScript_1F2A69:: @ 81F2A69
 	trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F2AB4
 	msgbox Route115_Text_29B647, 4

data/scripts/maps/Route116.inc

@@ -259,7 +259,7 @@ Route116_EventScript_1F2EA0:: @ 81F2EA0
 
 Route116_EventScript_1F2EB7:: @ 81F2EB7
 	trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route116_EventScript_1F2F4E
 	setvar VAR_0x8004, 273
@@ -271,7 +271,7 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7
 	end
 
 Route116_EventScript_1F2EF8:: @ 81F2EF8
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route116_EventScript_1F2F03
 	release
 	end
@@ -288,7 +288,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03
 	end
 
 Route116_EventScript_1F2F22:: @ 81F2F22
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route116_EventScript_1F2F35
 	msgbox Route116_Text_29BD92, 4
 	release
@@ -320,7 +320,7 @@ Route116_EventScript_1F2F7C:: @ 81F2F7C
 
 Route116_EventScript_1F2F93:: @ 81F2F93
 	trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route116_EventScript_1F302A
 	setvar VAR_0x8004, 280
@@ -332,7 +332,7 @@ Route116_EventScript_1F2F93:: @ 81F2F93
 	end
 
 Route116_EventScript_1F2FD4:: @ 81F2FD4
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route116_EventScript_1F2FDF
 	release
 	end
@@ -349,7 +349,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF
 	end
 
 Route116_EventScript_1F2FFE:: @ 81F2FFE
-	checkflag FLAG_0x12F
+	checkflag FLAG_HAS_MATCH_CALL
 	goto_eq Route116_EventScript_1F3011
 	msgbox Route116_Text_29C010, 4
 	release

data/scripts/maps/Route117.inc

@@ -40,7 +40,7 @@ Route117_EventScript_1F39C7:: @ 81F39C7
 
 Route117_EventScript_1F39D0:: @ 81F39D0
 	trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3A1B
 	msgbox Route117_Text_29C498, 4
@@ -65,7 +65,7 @@ Route117_EventScript_1F3A1B:: @ 81F3A1B
 
 Route117_EventScript_1F3A32:: @ 81F3A32
 	trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3A7D
 	msgbox Route117_Text_29C679, 4
@@ -90,7 +90,7 @@ Route117_EventScript_1F3A7D:: @ 81F3A7D
 
 Route117_EventScript_1F3A94:: @ 81F3A94
 	trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3ADF
 	msgbox Route117_Text_29C800, 4
@@ -115,7 +115,7 @@ Route117_EventScript_1F3ADF:: @ 81F3ADF
 
 Route117_EventScript_1F3AF6:: @ 81F3AF6
 	trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3B41
 	msgbox Route117_Text_29C9D0, 4
@@ -145,7 +145,7 @@ Route117_EventScript_1F3B58:: @ 81F3B58
 
 Route117_EventScript_1F3B6F:: @ 81F3B6F
 	trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3BB8
 	msgbox Route117_Text_29CCCB, 4
@@ -168,7 +168,7 @@ Route117_EventScript_1F3BB8:: @ 81F3BB8
 
 Route117_EventScript_1F3BD3:: @ 81F3BD3
 	trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3C1C
 	msgbox Route117_Text_29CE17, 4

data/scripts/maps/Route118.inc

@@ -188,7 +188,7 @@ Route118_Movement_1F3F7E: @ 81F3F7E
 
 Route118_EventScript_1F3F87:: @ 81F3F87
 	trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route118_EventScript_1F3FD2
 	msgbox Route118_Text_29D2FA, 4
@@ -223,7 +223,7 @@ Route118_EventScript_1F4000:: @ 81F4000
 
 Route118_EventScript_1F4017:: @ 81F4017
 	trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route118_EventScript_1F4062
 	msgbox Route118_Text_29D6D8, 4

data/scripts/maps/Route119.inc

@@ -368,7 +368,7 @@ Route119_EventScript_1F47F9:: @ 81F47F9
 
 Route119_EventScript_1F4810:: @ 81F4810
 	trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route119_EventScript_1F485B
 	msgbox Route119_Text_29DCC6, 4
@@ -393,7 +393,7 @@ Route119_EventScript_1F485B:: @ 81F485B
 
 Route119_EventScript_1F4872:: @ 81F4872
 	trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route119_EventScript_1F48BD
 	msgbox Route119_Text_29DE88, 4

data/scripts/maps/Route120.inc

@@ -297,7 +297,7 @@ Route120_EventScript_1F57D7:: @ 81F57D7
 
 Route120_EventScript_1F57EE:: @ 81F57EE
 	trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route120_EventScript_1F5839
 	msgbox Route120_Text_29E726, 4
@@ -332,7 +332,7 @@ Route120_EventScript_1F5867:: @ 81F5867
 
 Route120_EventScript_1F587E:: @ 81F587E
 	trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route120_EventScript_1F58C9
 	msgbox Route120_Text_29EA08, 4

data/scripts/maps/Route121.inc

@@ -72,7 +72,7 @@ Route121_EventScript_1F5E74:: @ 81F5E74
 
 Route121_EventScript_1F5E8B:: @ 81F5E8B
 	trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route121_EventScript_1F5ED6
 	msgbox Route121_Text_29F21E, 4
@@ -112,7 +112,7 @@ Route121_EventScript_1F5F1F:: @ 81F5F1F
 
 Route121_EventScript_1F5F3A:: @ 81F5F3A
 	trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route121_EventScript_1F5F85
 	msgbox Route121_Text_29F66F, 4
@@ -157,7 +157,7 @@ Route121_EventScript_1F5FE1:: @ 81F5FE1
 
 Route121_EventScript_1F5FF8:: @ 81F5FF8
 	trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route121_EventScript_1F6043
 	msgbox Route121_Text_29F7D4, 4

data/scripts/maps/Route123.inc

@@ -62,7 +62,7 @@ Route123_EventScript_1F61F3:: @ 81F61F3
 
 Route123_EventScript_1F620A:: @ 81F620A
 	trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route123_EventScript_1F6255
 	msgbox Route123_Text_29FE2A, 4
@@ -87,7 +87,7 @@ Route123_EventScript_1F6255:: @ 81F6255
 
 Route123_EventScript_1F626C:: @ 81F626C
 	trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route123_EventScript_1F62B7
 	msgbox Route123_Text_29FFE5, 4
@@ -162,7 +162,7 @@ Route123_EventScript_1F63A5:: @ 81F63A5
 
 Route123_EventScript_1F63BC:: @ 81F63BC
 	trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route123_EventScript_1F6407
 	msgbox Route123_Text_2A0389, 4