Merge pull request #38 from PikalaxALT/scrcmd

scrcmd

asm/battle_controller_oak.s

@@ -308,7 +308,7 @@ _080E77AC:
 	bhi _080E7838
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 _080E780A:
 	movs r0, 0x5
 	bl PlaySE

asm/battle_controller_player.s

@@ -381,7 +381,7 @@ _0802E5A8:
 	bhi _0802E634
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 _0802E606:
 	movs r0, 0x5
 	bl PlaySE

asm/battle_message.s

@@ -1604,7 +1604,7 @@ _080D7F9C:
 	ldrh r0, [r0]
 _080D7FA0:
 	mov r1, sp
-	bl sub_8099E90
+	bl CopyItemName
 	mov r4, sp
 	b _080D8382
 	.align 2, 0
@@ -2495,12 +2495,12 @@ _080D8698: .4byte gUnknown_83FD8A2
 _080D869C:
 	adds r0, r2, 0
 	adds r1, r6, 0
-	bl sub_8099E90
+	bl CopyItemName
 	b _080D86AE
 _080D86A6:
 	adds r0, r2, 0
 	adds r1, r6, 0
-	bl sub_8099E90
+	bl CopyItemName
 _080D86AE:
 	adds r5, 0x3
 _080D86B0:

asm/battle_setup.s

@@ -104,7 +104,7 @@ sub_807F6CC: @ 807F6CC
 	bhi _0807F6FC
 	ldr r0, _0807F6F8 @ =0x00000167
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _0807F6FC
@@ -318,8 +318,8 @@ _0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
 _0807F8C0: .4byte gBattleTypeFlags
 	thumb_func_end sub_807F888
 
-	thumb_func_start sub_807F8C4
+	thumb_func_start BattleSetup_StartScriptedWildBattle
-sub_807F8C4: @ 807F8C4
+BattleSetup_StartScriptedWildBattle: @ 807F8C4
 	push {lr}
 	bl ScriptContext2_Enable
 	ldr r1, _0807F8F8 @ =gMain
@@ -344,7 +344,7 @@ sub_807F8C4: @ 807F8C4
 _0807F8F8: .4byte gMain
 _0807F8FC: .4byte sub_807FBA0
 _0807F900: .4byte gBattleTypeFlags
-	thumb_func_end sub_807F8C4
+	thumb_func_end BattleSetup_StartScriptedWildBattle
 
 	thumb_func_start sub_807F904
 sub_807F904: @ 807F904
@@ -356,7 +356,7 @@ sub_807F904: @ 807F904
 	str r0, [r1, 0x8]
 	ldr r0, _0807F94C @ =0x00000167
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	cmp r0, 0
 	beq _0807F958
@@ -1512,7 +1512,7 @@ battle_80801F0: @ 80801F0
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	bl GetFieldObjectIdByLocalIdAndMap
-	ldr r1, _08080224 @ =gUnknown_3005074
+	ldr r1, _08080224 @ =gSelectedEventObject
 	strb r0, [r1]
 _08080212:
 	pop {r0}
@@ -1521,11 +1521,11 @@ _08080212:
 _08080218: .4byte gUnknown_20386B0
 _0808021C: .4byte gSpecialVar_LastTalked
 _08080220: .4byte gSaveBlock1Ptr
-_08080224: .4byte gUnknown_3005074
+_08080224: .4byte gSelectedEventObject
 	thumb_func_end battle_80801F0
 
-	thumb_func_start sub_8080228
+	thumb_func_start BattleSetup_ConfigureTrainerBattle
-sub_8080228: @ 8080228
+BattleSetup_ConfigureTrainerBattle: @ 8080228
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_8080110
@@ -1640,14 +1640,14 @@ _08080326:
 	.align 2, 0
 _0808032C: .4byte gUnknown_83C6900
 _08080330: .4byte gUnknown_81A4EC1
-	thumb_func_end sub_8080228
+	thumb_func_end BattleSetup_ConfigureTrainerBattle
 
 	thumb_func_start TrainerWantsBattle
 TrainerWantsBattle: @ 8080334
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, _08080368 @ =gUnknown_3005074
+	ldr r2, _08080368 @ =gSelectedEventObject
 	strb r0, [r2]
 	ldr r4, _0808036C @ =gSpecialVar_LastTalked
 	ldr r3, _08080370 @ =gMapObjects
@@ -1659,7 +1659,7 @@ TrainerWantsBattle: @ 8080334
 	strh r0, [r4]
 	adds r1, 0x1
 	adds r0, r1, 0
-	bl sub_8080228
+	bl BattleSetup_ConfigureTrainerBattle
 	ldr r0, _08080374 @ =gUnknown_81A4EB4
 	bl ScriptContext1_SetupScript
 	bl ScriptContext2_Enable
@@ -1667,7 +1667,7 @@ TrainerWantsBattle: @ 8080334
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08080368: .4byte gUnknown_3005074
+_08080368: .4byte gSelectedEventObject
 _0808036C: .4byte gSpecialVar_LastTalked
 _08080370: .4byte gMapObjects
 _08080374: .4byte gUnknown_81A4EB4
@@ -1693,7 +1693,7 @@ GetTrainerFlagFromScriptPointer: @ 8080378
 	thumb_func_start sub_8080398
 sub_8080398: @ 8080398
 	push {r4,lr}
-	ldr r0, _080803C4 @ =gUnknown_3005074
+	ldr r0, _080803C4 @ =gSelectedEventObject
 	ldrb r0, [r0]
 	lsls r4, r0, 3
 	adds r4, r0
@@ -1713,7 +1713,7 @@ sub_8080398: @ 8080398
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080803C4: .4byte gUnknown_3005074
+_080803C4: .4byte gSelectedEventObject
 _080803C8: .4byte gMapObjects
 	thumb_func_end sub_8080398
 
@@ -1785,8 +1785,8 @@ HasTrainerAlreadyBeenFought: @ 8080424
 	bx r1
 	thumb_func_end HasTrainerAlreadyBeenFought
 
-	thumb_func_start trainer_flag_set
+	thumb_func_start SetTrainerFlag
-trainer_flag_set: @ 808043C
+SetTrainerFlag: @ 808043C
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xA0
@@ -1796,10 +1796,10 @@ trainer_flag_set: @ 808043C
 	bl FlagSet
 	pop {r0}
 	bx r0
-	thumb_func_end trainer_flag_set
+	thumb_func_end SetTrainerFlag
 
-	thumb_func_start trainer_flag_clear
+	thumb_func_start ClearTrainerFlag
-trainer_flag_clear: @ 8080450
+ClearTrainerFlag: @ 8080450
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xA0
@@ -1809,10 +1809,10 @@ trainer_flag_clear: @ 8080450
 	bl FlagClear
 	pop {r0}
 	bx r0
-	thumb_func_end trainer_flag_clear
+	thumb_func_end ClearTrainerFlag
 
-	thumb_func_start sub_8080464
+	thumb_func_start BattleSetup_StartTrainerBattle
-sub_8080464: @ 8080464
+BattleSetup_StartTrainerBattle: @ 8080464
 	push {r4,lr}
 	ldr r4, _080804A0 @ =gBattleTypeFlags
 	movs r0, 0x8
@@ -1844,7 +1844,7 @@ _0808048C:
 _080804A0: .4byte gBattleTypeFlags
 _080804A4: .4byte gMain
 _080804A8: .4byte sub_80804AC
-	thumb_func_end sub_8080464
+	thumb_func_end BattleSetup_StartTrainerBattle
 
 	thumb_func_start sub_80804AC
 sub_80804AC: @ 80804AC
@@ -1992,8 +1992,8 @@ sub_80805D8: @ 80805D8
 	bx r0
 	thumb_func_end sub_80805D8
 
-	thumb_func_start sub_80805E8
+	thumb_func_start BattleSetup_GetScriptAddrAfterBattle
-sub_80805E8: @ 80805E8
+BattleSetup_GetScriptAddrAfterBattle: @ 80805E8
 	push {lr}
 	ldr r0, _080805F8 @ =gUnknown_20386C4
 	ldr r0, [r0]
@@ -2006,10 +2006,10 @@ _080805F4:
 	.align 2, 0
 _080805F8: .4byte gUnknown_20386C4
 _080805FC: .4byte gUnknown_81C555B
-	thumb_func_end sub_80805E8
+	thumb_func_end BattleSetup_GetScriptAddrAfterBattle
 
-	thumb_func_start sub_8080600
+	thumb_func_start BattleSetup_GetTrainerPostBattleScript
-sub_8080600: @ 8080600
+BattleSetup_GetTrainerPostBattleScript: @ 8080600
 	push {lr}
 	ldr r0, _08080610 @ =gUnknown_20386C8
 	ldr r0, [r0]
@@ -2022,7 +2022,7 @@ _0808060C:
 	.align 2, 0
 _08080610: .4byte gUnknown_20386C8
 _08080614: .4byte gUnknown_81C555B
-	thumb_func_end sub_8080600
+	thumb_func_end BattleSetup_GetTrainerPostBattleScript
 
 	thumb_func_start sub_8080618
 sub_8080618: @ 8080618

asm/battle_tower.s

@@ -3218,7 +3218,7 @@ sub_80E724C: @ 80E724C
 	adds r1, r0
 	ldrh r0, [r1]
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0x1
@@ -3229,7 +3229,7 @@ sub_80E724C: @ 80E724C
 	adds r0, r1
 	ldrh r0, [r0]
 	ldr r1, _080E7290 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _080E7294 @ =gSpecialVar_Result
 	strh r4, [r0]
 	b _080E72AA

asm/berry_pouch.s

@@ -733,7 +733,7 @@ sub_813D31C: @ 813D31C
 	bl StringAppend
 	adds r0, r5, 0
 	adds r1, r6, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r1, _0813D394 @ =gUnknown_84643B4
 	adds r0, r4, 0
 	bl StringAppend
@@ -2497,7 +2497,7 @@ _0813E18A:
 	ldr r0, _0813E1F4 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldrh r1, [r5, 0x10]
-	bl sub_809A1D8
+	bl RemoveBagItem
 	movs r0, 0x9
 	bl sub_813EA98
 	ldrb r0, [r5]
@@ -2736,7 +2736,7 @@ sub_813E37C: @ 813E37C
 	bne _0813E3D8
 	ldr r1, _0813E3C8 @ =gStringVar1
 	adds r0, r4, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _0813E3CC @ =gStringVar4
 	ldr r1, _0813E3D0 @ =gUnknown_8416374
 	adds r0, r4, 0
@@ -2815,7 +2815,7 @@ sub_813E428: @ 813E428
 	bne _0813E488
 	ldrh r0, [r6]
 	ldr r1, _0813E478 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _0813E47C @ =gStringVar4
 	ldr r1, _0813E480 @ =gUnknown_84168F1
 	adds r0, r4, 0
@@ -2855,7 +2855,7 @@ _0813E4A0:
 _0813E4A8:
 	ldrh r0, [r6]
 	ldr r1, _0813E4D4 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _0813E4D8 @ =gStringVar4
 	ldr r1, _0813E4DC @ =gUnknown_8416911
 	adds r0, r4, 0
@@ -3188,7 +3188,7 @@ sub_813E768: @ 813E768
 	ldr r0, _0813E7D8 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _0813E7DC @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r6, _0813E7E0 @ =gStringVar3
 	ldrh r1, [r4, 0x2]
 	movs r0, 0x5
@@ -3250,7 +3250,7 @@ sub_813E7F0: @ 813E7F0
 	ldrh r0, [r5]
 	mov r2, r8
 	ldrh r1, [r2, 0x10]
-	bl sub_809A1D8
+	bl RemoveBagItem
 	ldr r7, _0813E8C4 @ =gSaveBlock1Ptr
 	ldr r4, [r7]
 	movs r3, 0xA4

asm/bike.s

@@ -745,9 +745,9 @@ _080BD5F8:
 	cmp r0, 0
 	beq _080BD618
 	adds r0, r4, 0
-	bl sub_8055E78
+	bl Overworld_SetSavedMusic
 	adds r0, r4, 0
-	bl sub_8055F48
+	bl Overworld_ChangeMusicTo
 _080BD618:
 	pop {r4}
 	pop {r0}

asm/field_control_avatar.s

@@ -936,7 +936,7 @@ _0806CFBC:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0806CFB0
-	ldr r0, _0806CFE8 @ =gUnknown_3005074
+	ldr r0, _0806CFE8 @ =gSelectedEventObject
 	strb r3, [r0]
 	ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
 	adds r0, r2, r3
@@ -954,7 +954,7 @@ _0806CFDE:
 	bx r1
 	.align 2, 0
 _0806CFE4: .4byte gUnknown_2031DEC
-_0806CFE8: .4byte gUnknown_3005074
+_0806CFE8: .4byte gSelectedEventObject
 _0806CFEC: .4byte gSpecialVar_LastTalked
 _0806CFF0: .4byte gSpecialVar_Facing
 	thumb_func_end sub_806CF38
@@ -1044,7 +1044,7 @@ _0806D092:
 _0806D098: .4byte gMapObjects
 _0806D09C: .4byte gUnknown_826D2D8
 _0806D0A0:
-	ldr r0, _0806D0D4 @ =gUnknown_3005074
+	ldr r0, _0806D0D4 @ =gSelectedEventObject
 	strb r5, [r0]
 	ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
 	ldr r1, _0806D0DC @ =gMapObjects
@@ -1069,7 +1069,7 @@ _0806D0C8:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0806D0D4: .4byte gUnknown_3005074
+_0806D0D4: .4byte gSelectedEventObject
 _0806D0D8: .4byte gSpecialVar_LastTalked
 _0806D0DC: .4byte gMapObjects
 _0806D0E0: .4byte gSpecialVar_Facing
@@ -2195,7 +2195,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964
 	adds r1, r5, 0
 	adds r2, r7, 0
 	bl sub_806DC54
-	bl sub_807E438
+	bl DoWarp
 	movs r0, 0x1
 	b _0806DA02
 	.align 2, 0
@@ -2331,7 +2331,7 @@ _0806DAC4:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806DAE4
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	ldr r0, _0806DAE0 @ =gUnknown_81C1361
 	bl ScriptContext1_SetupScript
 	movs r0, 0x1
@@ -2339,7 +2339,7 @@ _0806DAC4:
 	.align 2, 0
 _0806DAE0: .4byte gUnknown_81C1361
 _0806DAE4:
-	bl sub_807E438
+	bl DoWarp
 	movs r0, 0x1
 	b _0806DAEE
 _0806DAEC:
@@ -2638,7 +2638,7 @@ map_warp_consider_2_to_inside: @ 806DCD0
 	adds r1, r4, 0
 	adds r2, r6, 0
 	bl sub_806DC54
-	bl sub_807E4DC
+	bl DoDoorWarp
 	movs r0, 0x1
 	b _0806DD32
 	.align 2, 0
@@ -2990,7 +2990,7 @@ _0806DF98:
 	cmp r0, 0
 	beq _0806DFB0
 	bl sub_8055A08
-	bl sp13E_warp_to_last_warp
+	bl DoDiveWarp
 	movs r0, 0xE2
 	bl PlaySE
 	movs r0, 0x1

asm/field_door.s

@@ -478,8 +478,8 @@ _0805B25C:
 _0805B264: .4byte gUnknown_835B4B0
 	thumb_func_end sub_805B210
 
-	thumb_func_start sub_805B268
+	thumb_func_start FieldSetDoorOpened
-sub_805B268: @ 805B268
+FieldSetDoorOpened: @ 805B268
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -504,10 +504,10 @@ _0805B292:
 	bx r0
 	.align 2, 0
 _0805B298: .4byte gUnknown_835B5D8
-	thumb_func_end sub_805B268
+	thumb_func_end FieldSetDoorOpened
 
-	thumb_func_start sub_805B29C
+	thumb_func_start FieldSetDoorClosed
-sub_805B29C: @ 805B29C
+FieldSetDoorClosed: @ 805B29C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -532,10 +532,10 @@ _0805B2C6:
 	bx r0
 	.align 2, 0
 _0805B2CC: .4byte gUnknown_835B5D8
-	thumb_func_end sub_805B29C
+	thumb_func_end FieldSetDoorClosed
 
-	thumb_func_start sub_805B2D0
+	thumb_func_start FieldAnimateDoorClose
-sub_805B2D0: @ 805B2D0
+FieldAnimateDoorClose: @ 805B2D0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -566,10 +566,10 @@ _0805B308:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_805B2D0
+	thumb_func_end FieldAnimateDoorClose
 
-	thumb_func_start sub_805B310
+	thumb_func_start FieldAnimateDoorOpen
-sub_805B310: @ 805B310
+FieldAnimateDoorOpen: @ 805B310
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -600,10 +600,10 @@ _0805B348:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_805B310
+	thumb_func_end FieldAnimateDoorOpen
 
-	thumb_func_start sub_805B350
+	thumb_func_start FieldIsDoorAnimationRunning
-sub_805B350: @ 805B350
+FieldIsDoorAnimationRunning: @ 805B350
 	push {lr}
 	ldr r0, _0805B360 @ =sub_805B028
 	bl FuncIsActiveTask
@@ -613,10 +613,10 @@ sub_805B350: @ 805B350
 	bx r1
 	.align 2, 0
 _0805B360: .4byte sub_805B028
-	thumb_func_end sub_805B350
+	thumb_func_end FieldIsDoorAnimationRunning
 
-	thumb_func_start sub_805B364
+	thumb_func_start GetDoorSoundEffect
-sub_805B364: @ 805B364
+GetDoorSoundEffect: @ 805B364
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -635,7 +635,7 @@ _0805B380:
 _0805B382:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_805B364
+	thumb_func_end GetDoorSoundEffect
 
 	thumb_func_start sub_805B388
 sub_805B388: @ 805B388

asm/field_effect.s

@@ -6955,7 +6955,7 @@ sub_8086944: @ 8086944
 	cmp r0, 0
 	beq _08086978
 	adds r0, r4, 0
-	bl sub_8055F48
+	bl Overworld_ChangeMusicTo
 _08086978:
 	movs r0, 0
 	pop {r4}

asm/field_fadetransition.s

@@ -661,7 +661,7 @@ _0807E028:
 	ldrsh r0, [r6, r2]
 	movs r2, 0
 	ldrsh r1, [r7, r2]
-	bl sub_805B268
+	bl FieldSetDoorOpened
 	movs r0, 0x1
 	strh r0, [r4, 0x8]
 	b _0807E206
@@ -691,7 +691,7 @@ _0807E074:
 	ldrsh r0, [r6, r1]
 	movs r2, 0
 	ldrsh r1, [r7, r2]
-	bl sub_805B364
+	bl GetDoorSoundEffect
 	lsls r0, 16
 	lsrs r0, 16
 	bl PlaySE
@@ -699,12 +699,12 @@ _0807E074:
 	ldrsh r0, [r6, r1]
 	movs r2, 0
 	ldrsh r1, [r7, r2]
-	bl sub_805B310
+	bl FieldAnimateDoorOpen
 	movs r0, 0x7
 	strh r0, [r4, 0x8]
 	b _0807E206
 _0807E0A2:
-	bl sub_805B350
+	bl FieldIsDoorAnimationRunning
 	lsls r0, 24
 	cmp r0, 0
 	beq _0807E0AE
@@ -750,7 +750,7 @@ _0807E0FC:
 	ldrsh r0, [r4, r1]
 	movs r2, 0x22
 	ldrsh r1, [r4, r2]
-	bl sub_805B2D0
+	bl FieldAnimateDoorClose
 	movs r0, 0x9
 	strh r0, [r4, 0x8]
 	b _0807E206
@@ -762,7 +762,7 @@ _0807E10E:
 	lsls r0, 24
 	cmp r0, 0
 	beq _0807E206
-	bl sub_805B350
+	bl FieldIsDoorAnimationRunning
 	lsls r0, 24
 	cmp r0, 0
 	bne _0807E206
@@ -822,7 +822,7 @@ _0807E198:
 	ldrsh r0, [r6, r1]
 	movs r2, 0
 	ldrsh r1, [r7, r2]
-	bl sub_805B2D0
+	bl FieldAnimateDoorClose
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r4, 0xA]
@@ -1153,8 +1153,8 @@ _0807E434:
 	bx r1
 	thumb_func_end sub_807E418
 
-	thumb_func_start sub_807E438
+	thumb_func_start DoWarp
-sub_807E438: @ 807E438
+DoWarp: @ 807E438
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8055F88
@@ -1174,10 +1174,10 @@ sub_807E438: @ 807E438
 _0807E464: .4byte gUnknown_3005020
 _0807E468: .4byte sub_807DF64
 _0807E46C: .4byte sub_807E718
-	thumb_func_end sub_807E438
+	thumb_func_end DoWarp
 
-	thumb_func_start sp13E_warp_to_last_warp
+	thumb_func_start DoDiveWarp
-sp13E_warp_to_last_warp: @ 807E470
+DoDiveWarp: @ 807E470
 	push {lr}
 	bl ScriptContext2_Enable
 	bl sub_8055F88
@@ -1195,7 +1195,7 @@ sp13E_warp_to_last_warp: @ 807E470
 _0807E494: .4byte gUnknown_3005020
 _0807E498: .4byte sub_807DF64
 _0807E49C: .4byte sub_807E718
-	thumb_func_end sp13E_warp_to_last_warp
+	thumb_func_end DoDiveWarp
 
 	thumb_func_start sub_807E4A0
 sub_807E4A0: @ 807E4A0
@@ -1228,8 +1228,8 @@ _0807E4D4: .4byte sub_807E980
 _0807E4D8: .4byte gTasks
 	thumb_func_end sub_807E4A0
 
-	thumb_func_start sub_807E4DC
+	thumb_func_start DoDoorWarp
-sub_807E4DC: @ 807E4DC
+DoDoorWarp: @ 807E4DC
 	push {lr}
 	bl ScriptContext2_Enable
 	ldr r0, _0807E4F4 @ =gUnknown_3005020
@@ -1244,7 +1244,7 @@ sub_807E4DC: @ 807E4DC
 _0807E4F4: .4byte gUnknown_3005020
 _0807E4F8: .4byte sub_807DF64
 _0807E4FC: .4byte sub_807E80C
-	thumb_func_end sub_807E4DC
+	thumb_func_end DoDoorWarp
 
 	thumb_func_start sub_807E500
 sub_807E500: @ 807E500
@@ -1282,10 +1282,10 @@ _0807E540: .4byte sub_807DF64
 _0807E544: .4byte sub_807E784
 	thumb_func_end sub_807E524
 
-	thumb_func_start sp13F_fall_to_last_warp
+	thumb_func_start DoFallWarp
-sp13F_fall_to_last_warp: @ 807E548
+DoFallWarp: @ 807E548
 	push {lr}
-	bl sp13E_warp_to_last_warp
+	bl DoDiveWarp
 	ldr r1, _0807E558 @ =gUnknown_3005020
 	ldr r0, _0807E55C @ =sub_8084454
 	str r0, [r1]
@@ -1294,7 +1294,7 @@ sp13F_fall_to_last_warp: @ 807E548
 	.align 2, 0
 _0807E558: .4byte gUnknown_3005020
 _0807E55C: .4byte sub_8084454
-	thumb_func_end sp13F_fall_to_last_warp
+	thumb_func_end DoFallWarp
 
 	thumb_func_start sub_807E560
 sub_807E560: @ 807E560
@@ -1690,7 +1690,7 @@ _0807E85C:
 	movs r2, 0
 	ldrsh r1, [r6, r2]
 	subs r1, 0x1
-	bl sub_805B364
+	bl GetDoorSoundEffect
 	lsls r0, 16
 	lsrs r0, 16
 	bl PlaySE
@@ -1699,7 +1699,7 @@ _0807E85C:
 	movs r2, 0
 	ldrsh r1, [r6, r2]
 	subs r1, 0x1
-	bl sub_805B310
+	bl FieldAnimateDoorOpen
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r5, 0xA]
@@ -1760,7 +1760,7 @@ _0807E8F4:
 	movs r2, 0
 	ldrsh r1, [r6, r2]
 	subs r1, 0x1
-	bl sub_805B2D0
+	bl FieldAnimateDoorClose
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r5, 0xA]

asm/field_map_obj.s

@@ -1614,8 +1614,8 @@ _0805E9F0: .4byte 0x0000ffff
 _0805E9F4: .4byte gSprites
 	thumb_func_end AddPseudoFieldObject
 
-	thumb_func_start sub_805E9F8
+	thumb_func_start sprite_new
-sub_805E9F8: @ 805E9F8
+sprite_new: @ 805E9F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1772,7 +1772,7 @@ _0805EB24:
 _0805EB38: .4byte sub_8068FA8
 _0805EB3C: .4byte 0x0000ffff
 _0805EB40: .4byte gSprites
-	thumb_func_end sub_805E9F8
+	thumb_func_end sprite_new
 
 	thumb_func_start sub_805EB44
 sub_805EB44: @ 805EB44

asm/field_player_avatar.s

@@ -2818,7 +2818,7 @@ PartyHasMonWithSurf: @ 805C83C
 _0805C84E:
 	adds r0, r4, 0
 	movs r1, 0x39
-	bl pokemon_has_move
+	bl MonKnowsMove
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805C860

asm/field_specials.s

@@ -33,9 +33,9 @@ _080CA644:
 	movs r4, 0x8D
 	lsls r4, 1
 	adds r0, r4, 0
-	bl sub_8055E78
+	bl Overworld_SetSavedMusic
 	adds r0, r4, 0
-	bl sub_8055F48
+	bl Overworld_ChangeMusicTo
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -3138,7 +3138,7 @@ _080CBDE4: .4byte gSpecialVar_0x8004
 
 	thumb_func_start sub_80CBDE8
 sub_80CBDE8: @ 80CBDE8
-	ldr r1, _080CBDF8 @ =gUnknown_3005074
+	ldr r1, _080CBDF8 @ =gSelectedEventObject
 	movs r0, 0
 	strb r0, [r1]
 	ldr r1, _080CBDFC @ =gUnknown_20370DA
@@ -3146,7 +3146,7 @@ sub_80CBDE8: @ 80CBDE8
 	strh r0, [r1]
 	bx lr
 	.align 2, 0
-_080CBDF8: .4byte gUnknown_3005074
+_080CBDF8: .4byte gSelectedEventObject
 _080CBDFC: .4byte gUnknown_20370DA
 	thumb_func_end sub_80CBDE8
 
@@ -3157,7 +3157,7 @@ sub_80CBE00: @ 80CBE00
 	ldrh r0, [r0]
 	cmp r0, 0xFF
 	bne _080CBE44
-	ldr r1, _080CBE1C @ =gUnknown_3005074
+	ldr r1, _080CBE1C @ =gSelectedEventObject
 	ldrb r0, [r1]
 	cmp r0, 0
 	bne _080CBE20
@@ -3165,7 +3165,7 @@ sub_80CBE00: @ 80CBE00
 	b _080CBE48
 	.align 2, 0
 _080CBE18: .4byte gUnknown_20370DA
-_080CBE1C: .4byte gUnknown_3005074
+_080CBE1C: .4byte gSelectedEventObject
 _080CBE20:
 	ldr r2, _080CBE4C @ =gMapObjects
 	ldrb r1, [r1]
@@ -3267,7 +3267,7 @@ TV_PrintIntToStringVar: @ 80CBED4
 	lsls r4, 24
 	lsrs r4, 24
 	adds r0, r5, 0
-	bl sub_80CBF04
+	bl CountDigits
 	adds r3, r0, 0
 	ldr r0, _080CBF00 @ =gUnknown_83F5AF8
 	lsls r4, 2
@@ -3285,8 +3285,8 @@ TV_PrintIntToStringVar: @ 80CBED4
 _080CBF00: .4byte gUnknown_83F5AF8
 	thumb_func_end TV_PrintIntToStringVar
 
-	thumb_func_start sub_80CBF04
+	thumb_func_start CountDigits
-sub_80CBF04: @ 80CBF04
+CountDigits: @ 80CBF04
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0xA
@@ -3366,7 +3366,7 @@ _080CBF9A:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80CBF04
+	thumb_func_end CountDigits
 
 	thumb_func_start sub_80CBFA0
 sub_80CBFA0: @ 80CBFA0

asm/field_weather.s

@@ -2804,8 +2804,8 @@ sav1_get_weather_probably: @ 807B130
 _0807B13C: .4byte gSaveBlock1Ptr
 	thumb_func_end sav1_get_weather_probably
 
-	thumb_func_start sub_807B140
+	thumb_func_start SetSav1WeatherFromCurrMapHeader
-sub_807B140: @ 807B140
+SetSav1WeatherFromCurrMapHeader: @ 807B140
 	push {r4,r5,lr}
 	ldr r4, _0807B16C @ =gSaveBlock1Ptr
 	ldr r0, [r4]
@@ -2828,7 +2828,7 @@ sub_807B140: @ 807B140
 	.align 2, 0
 _0807B16C: .4byte gSaveBlock1Ptr
 _0807B170: .4byte gMapHeader
-	thumb_func_end sub_807B140
+	thumb_func_end SetSav1WeatherFromCurrMapHeader
 
 	thumb_func_start SetWeather
 SetWeather: @ 807B174

asm/hall_of_fame.s

@@ -1459,8 +1459,8 @@ sub_80F2934: @ 80F2934
 	movs r1, 0x9
 	movs r3, 0xB
 	bl Overworld_SetWarpDestination
-	bl sub_807E438
+	bl DoWarp
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	add sp, 0x4
 	pop {r0}
 	bx r0

asm/help_system_812B1E0.s

@@ -967,7 +967,7 @@ _0812B98C: .4byte 0x00000829
 _0812B990:
 	ldr r0, _0812B99C @ =0x00000169
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	b _0812BAF6
 	.align 2, 0
 _0812B99C: .4byte 0x00000169

asm/item.s

@@ -149,8 +149,8 @@ _08099E88: .4byte gSaveBlock1Ptr
 _08099E8C: .4byte 0x0000054c
 	thumb_func_end sub_8099E44
 
-	thumb_func_start sub_8099E90
+	thumb_func_start CopyItemName
-sub_8099E90: @ 8099E90
+CopyItemName: @ 8099E90
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -177,7 +177,7 @@ _08099EC4:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8099E90
+	thumb_func_end CopyItemName
 
 	thumb_func_start sub_8099ECC
 sub_8099ECC: @ 8099ECC
@@ -252,8 +252,8 @@ _08099F3C:
 	bx r1
 	thumb_func_end sub_8099F08
 
-	thumb_func_start sub_8099F40
+	thumb_func_start CheckBagHasItem
-sub_8099F40: @ 8099F40
+CheckBagHasItem: @ 8099F40
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -310,14 +310,14 @@ _08099FA6:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8099F40
+	thumb_func_end CheckBagHasItem
 
 	thumb_func_start sub_8099FAC
 sub_8099FAC: @ 8099FAC
 	push {r4,lr}
 	ldr r0, _08099FC0 @ =0x0000016d
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0
@@ -338,7 +338,7 @@ _08099FD4:
 _08099FD6:
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0
@@ -360,8 +360,8 @@ _08099FF6:
 _08099FFC: .4byte gSpecialVar_Result
 	thumb_func_end sub_8099FAC
 
-	thumb_func_start sub_809A000
+	thumb_func_start CheckBagHasSpace
-sub_809A000: @ 809A000
+CheckBagHasSpace: @ 809A000
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -428,10 +428,10 @@ _0809A07C:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809A000
+	thumb_func_end CheckBagHasSpace
 
-	thumb_func_start sub_809A084
+	thumb_func_start AddBagItem
-sub_809A084: @ 809A084
+AddBagItem: @ 809A084
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -494,7 +494,7 @@ _0809A0F4:
 	lsls r4, 1
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809A132
@@ -522,7 +522,7 @@ _0809A132:
 	ldr r4, _0809A1B0 @ =0x0000016d
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809A174
@@ -595,10 +595,10 @@ _0809A1CC:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809A084
+	thumb_func_end AddBagItem
 
-	thumb_func_start sub_809A1D8
+	thumb_func_start RemoveBagItem
-sub_809A1D8: @ 809A1D8
+RemoveBagItem: @ 809A1D8
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -667,7 +667,7 @@ _0809A25A:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809A1D8
+	thumb_func_end RemoveBagItem
 
 	thumb_func_start GetPocketByItemId
 GetPocketByItemId: @ 809A260
@@ -832,8 +832,8 @@ _0809A35C:
 _0809A370: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_809A33C
 
-	thumb_func_start sub_809A374
+	thumb_func_start CheckPCHasItem
-sub_809A374: @ 809A374
+CheckPCHasItem: @ 809A374
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -875,10 +875,10 @@ _0809A3C0:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809A374
+	thumb_func_end CheckPCHasItem
 
-	thumb_func_start sub_809A3C8
+	thumb_func_start AddPCItem
-sub_809A3C8: @ 809A3C8
+AddPCItem: @ 809A3C8
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -955,7 +955,7 @@ _0809A458:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809A3C8
+	thumb_func_end AddPCItem
 
 	thumb_func_start sub_809A460
 sub_809A460: @ 809A460

asm/item_menu.s

@@ -3237,7 +3237,7 @@ sub_810971C: @ 810971C
 	lsrs r0, 16
 	ldr r1, _081097D8 @ =gStringVar1
 	mov r10, r1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _081097DC @ =gStringVar4
 	mov r9, r0
 	adds r1, r6, 0
@@ -3725,7 +3725,7 @@ _08109AD4:
 	ldr r0, _08109BA8 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _08109BAC @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r6, _08109BB0 @ =gStringVar4
 	ldr r1, _08109BB4 @ =gUnknown_84162FF
 	adds r0, r6, 0
@@ -4125,7 +4125,7 @@ sub_8109EA8: @ 8109EA8
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, _08109F30 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _08109F34 @ =gStringVar2
 	movs r2, 0x10
 	ldrsh r1, [r6, r2]
@@ -4200,7 +4200,7 @@ _08109F6E:
 	ldr r0, _08109FF4 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldrh r1, [r7, 0x10]
-	bl sub_809A1D8
+	bl RemoveBagItem
 	movs r0, 0x6
 	bl sub_810BA3C
 	ldrb r0, [r7]
@@ -4447,7 +4447,7 @@ sub_810A18C: @ 810A18C
 	ldr r0, _0810A1BC @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _0810A1C0 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r5, _0810A1C4 @ =gStringVar4
 	ldr r1, _0810A1C8 @ =gUnknown_841635E
 	adds r0, r5, 0
@@ -4969,7 +4969,7 @@ _0810A5B4:
 	bne _0810A5F8
 	ldrh r0, [r6]
 	ldr r1, _0810A5E8 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _0810A5EC @ =gStringVar4
 	ldr r1, _0810A5F0 @ =gUnknown_84168F1
 	adds r0, r4, 0
@@ -5007,7 +5007,7 @@ _0810A610:
 _0810A618:
 	ldrh r0, [r6]
 	ldr r1, _0810A644 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _0810A648 @ =gStringVar4
 	ldr r1, _0810A64C @ =gUnknown_8416911
 	adds r0, r4, 0
@@ -5397,7 +5397,7 @@ sub_810A940: @ 810A940
 	ldr r0, _0810A9B8 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _0810A9BC @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r6, _0810A9C0 @ =gStringVar3
 	ldr r0, _0810A9C4 @ =gUnknown_203ACFC
 	ldrb r0, [r0, 0x6]
@@ -5464,7 +5464,7 @@ sub_810A9D4: @ 810A9D4
 	ldrh r0, [r5]
 	mov r2, r8
 	ldrh r1, [r2, 0x10]
-	bl sub_809A1D8
+	bl RemoveBagItem
 	ldr r3, _0810AAE0 @ =gSaveBlock1Ptr
 	ldr r4, [r3]
 	movs r7, 0xA4
@@ -5744,7 +5744,7 @@ sub_810AC40: @ 810AC40
 	ldr r5, _0810ACD0 @ =gSpecialVar_ItemId
 	ldrh r0, [r5]
 	ldrh r1, [r7, 0x10]
-	bl sub_809A3C8
+	bl AddPCItem
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x1
@@ -5756,7 +5756,7 @@ sub_810AC40: @ 810AC40
 	bl sub_80A2294
 	ldrh r0, [r5]
 	ldr r1, _0810ACD8 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _0810ACDC @ =gStringVar2
 	movs r2, 0x10
 	ldrsh r1, [r7, r2]
@@ -5839,7 +5839,7 @@ _0810AD1E:
 	cmp r0, 0
 	beq _0810AD98
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x1
@@ -6120,10 +6120,10 @@ sub_810AF74: @ 810AF74
 	bl sub_810ADD8
 	movs r0, 0xD
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	movs r0, 0x4
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	ldr r2, _0810AF98 @ =sub_8030AEC
 	movs r0, 0x6
 	movs r1, 0
@@ -6317,27 +6317,27 @@ sub_810B108: @ 810B108
 	bl sub_810ADD8
 	movs r0, 0xD
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	movs r0, 0xE
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	movs r0, 0xB7
 	lsls r0, 1
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	movs r0, 0xB6
 	lsls r0, 1
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	movs r0, 0x4
 	movs r1, 0x5
-	bl sub_809A084
+	bl AddBagItem
 	movs r0, 0x3
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	movs r0, 0x8
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	cmp r4, 0x7
 	beq _0810B160
 	cmp r4, 0x8

asm/item_pc.s

@@ -1886,7 +1886,7 @@ sub_810E274: @ 810E274
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, _0810E348 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r6, _0810E34C @ =gStringVar4
 	ldr r1, _0810E350 @ =gUnknown_84162FF
 	adds r0, r6, 0
@@ -2036,7 +2036,7 @@ sub_810E418: @ 810E418
 	lsrs r4, r0, 16
 	ldrh r1, [r5, 0x10]
 	adds r0, r4, 0
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2048,7 +2048,7 @@ sub_810E418: @ 810E418
 	bl sub_80A2294
 	ldr r1, _0810E4A4 @ =gStringVar1
 	adds r0, r4, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _0810E4A8 @ =gStringVar2
 	movs r2, 0x10
 	ldrsh r1, [r5, r2]
@@ -2241,7 +2241,7 @@ sub_810E5E0: @ 810E5E0
 	lsrs r0, 16
 	ldr r6, _0810E660 @ =gStringVar1
 	adds r1, r6, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r5, _0810E664 @ =gStringVar4
 	ldr r1, _0810E668 @ =gUnknown_84177AC
 	adds r0, r5, 0

asm/item_use.s

@@ -1361,7 +1361,7 @@ sub_80A1A44: @ 80A1A44
 	ldr r4, _080A1A84 @ =gSpecialVar_ItemId
 	ldrh r0, [r4]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	ldrh r0, [r4]
 	bl ItemId_GetPocket
 	lsls r0, 24
@@ -1374,7 +1374,7 @@ sub_80A1A44: @ 80A1A44
 	bl sub_81089F4
 	ldrh r0, [r4]
 	ldr r1, _080A1A88 @ =gStringVar2
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _080A1A8C @ =gStringVar4
 	ldr r1, _080A1A90 @ =gUnknown_841658C
 	bl StringExpandPlaceholders
@@ -1409,7 +1409,7 @@ sub_80A1A94: @ 80A1A94
 	bl FlagClear
 	ldrh r0, [r5]
 	ldr r1, _080A1AE4 @ =gStringVar2
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _080A1AE8 @ =gStringVar4
 	ldr r1, _080A1AEC @ =gUnknown_84165D2
 	bl StringExpandPlaceholders
@@ -1435,7 +1435,7 @@ _080A1AF4:
 	bl FlagClear
 	ldrh r0, [r5]
 	ldr r1, _080A1B34 @ =gStringVar2
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _080A1B38 @ =gStringVar4
 	ldr r1, _080A1B3C @ =gUnknown_8416600
 	bl StringExpandPlaceholders
@@ -1597,7 +1597,7 @@ sub_80A1C44: @ 80A1C44
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	bl sub_8085620
 	adds r0, r4, 0
 	bl DestroyTask
@@ -1844,7 +1844,7 @@ sub_80A1E1C: @ 80A1E1C
 	ldr r0, _080A1E44 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	bl sub_8108CB4
 	adds r0, r4, 0
 	bl sub_8108B50
@@ -1959,7 +1959,7 @@ sub_80A1EF4: @ 80A1EF4
 	bl PlaySE
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	adds r0, r4, 0
 	bl sub_8042DA4
 	adds r2, r0, 0

asm/link_rfu.s

@@ -3259,7 +3259,7 @@ sub_80FEC54: @ 80FEC54
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0
 	bne _080FEC70
 _080FEC62:

asm/link_rfu_3.s

@@ -3366,7 +3366,7 @@ sub_8117440: @ 8117440
 	str r5, [sp, 0x4]
 	movs r0, 0
 	mov r3, r8
-	bl saved_warp2_set_2
+	bl SetDynamicWarpWithCoords
 	bl warp_in
 	add sp, 0x8
 	pop {r3}
@@ -11969,7 +11969,7 @@ _0811BADA:
 	str r0, [sp, 0x4]
 	movs r0, 0x19
 	adds r1, r4, 0
-	bl sub_805E9F8
+	bl sprite_new
 	ldr r1, [sp, 0x8]
 	adds r5, r1, r5
 	strb r0, [r5]

asm/map_obj_lock.s

@@ -101,7 +101,7 @@ _080695F6:
 	cmp r0, 0
 	bne _0806961E
 	ldr r2, _08069640 @ =gMapObjects
-	ldr r0, _08069644 @ =gUnknown_3005074
+	ldr r0, _08069644 @ =gSelectedEventObject
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -133,7 +133,7 @@ _08069634:
 	.align 2, 0
 _0806963C: .4byte gTasks
 _08069640: .4byte gMapObjects
-_08069644: .4byte gUnknown_3005074
+_08069644: .4byte gSelectedEventObject
 	thumb_func_end sub_80695CC
 
 	thumb_func_start sub_8069648
@@ -159,7 +159,7 @@ _08069666:
 	thumb_func_start LockSelectedMapObject
 LockSelectedMapObject: @ 806966C
 	push {r4,r5,lr}
-	ldr r4, _080696B0 @ =gUnknown_3005074
+	ldr r4, _080696B0 @ =gSelectedEventObject
 	ldrb r0, [r4]
 	bl FreezeMapObjectsExceptOne
 	ldr r0, _080696B4 @ =sub_80695CC
@@ -191,7 +191,7 @@ _080696AA:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080696B0: .4byte gUnknown_3005074
+_080696B0: .4byte gSelectedEventObject
 _080696B4: .4byte sub_80695CC
 _080696B8: .4byte gMapObjects
 _080696BC: .4byte gTasks
@@ -225,7 +225,7 @@ _080696EC: .4byte gMapObjects
 sub_80696F0: @ 80696F0
 	push {r4,lr}
 	ldr r4, _08069738 @ =gMapObjects
-	ldr r0, _0806973C @ =gUnknown_3005074
+	ldr r0, _0806973C @ =gSelectedEventObject
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -257,13 +257,13 @@ _0806970E:
 	bx r0
 	.align 2, 0
 _08069738: .4byte gMapObjects
-_0806973C: .4byte gUnknown_3005074
+_0806973C: .4byte gSelectedEventObject
 	thumb_func_end sub_80696F0
 
 	thumb_func_start sub_8069740
 sub_8069740: @ 8069740
 	push {lr}
-	ldr r0, _0806975C @ =gUnknown_3005074
+	ldr r0, _0806975C @ =gSelectedEventObject
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -276,7 +276,7 @@ sub_8069740: @ 8069740
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0806975C: .4byte gUnknown_3005074
+_0806975C: .4byte gSelectedEventObject
 _08069760: .4byte gMapObjects
 _08069764: .4byte gSpecialVar_Facing
 	thumb_func_end sub_8069740
@@ -284,7 +284,7 @@ _08069764: .4byte gSpecialVar_Facing
 	thumb_func_start sub_8069768
 sub_8069768: @ 8069768
 	push {lr}
-	ldr r0, _08069780 @ =gUnknown_3005074
+	ldr r0, _08069780 @ =gSelectedEventObject
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -295,7 +295,7 @@ sub_8069768: @ 8069768
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08069780: .4byte gUnknown_3005074
+_08069780: .4byte gSelectedEventObject
 _08069784: .4byte gMapObjects
 	thumb_func_end sub_8069768
 

asm/menu_helpers.s

@@ -334,7 +334,7 @@ itemid_80BF6D8_mail_related: @ 80BF6D8
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0x1
 	beq _080BF6EE
 	bl InUnionRoom
@@ -360,7 +360,7 @@ _080BF702:
 	thumb_func_start sub_80BF708
 sub_80BF708: @ 80BF708
 	push {lr}
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0x1
 	beq _080BF71A
 	ldr r0, _080BF720 @ =gReceivedRemoteLinkPlayers

asm/overworld.s

@@ -72,7 +72,7 @@ sub_8054C48: @ 8054C48
 	bl sub_8054C04
 	adds r4, r0, 0
 	ldr r5, _08054C6C @ =gStringVar1
-	bl sub_80CBF04
+	bl CountDigits
 	adds r3, r0, 0
 	lsls r3, 24
 	lsrs r3, 24
@@ -118,7 +118,7 @@ _08054C9C: .4byte gUnknown_826D29E
 	thumb_func_start sub_8054CA0
 sub_8054CA0: @ 8054CA0
 	push {lr}
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	movs r0, 0x83
 	lsls r0, 4
 	bl FlagClear
@@ -157,7 +157,7 @@ _08054D04: .4byte 0x0000404d
 	thumb_func_start sub_8054D08
 sub_8054D08: @ 8054D08
 	push {lr}
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	movs r0, 0x83
 	lsls r0, 4
 	bl FlagClear
@@ -196,7 +196,7 @@ _08054D6C: .4byte 0x0000404d
 	thumb_func_start sub_8054D70
 sub_8054D70: @ 8054D70
 	push {lr}
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	movs r0, 0x83
 	lsls r0, 4
 	bl FlagClear
@@ -235,7 +235,7 @@ _08054DD4: .4byte 0x0000404d
 	thumb_func_start sub_8054DD8
 sub_8054DD8: @ 8054DD8
 	push {lr}
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	movs r0, 0x83
 	lsls r0, 4
 	bl FlagClear
@@ -1084,8 +1084,8 @@ saved_warp2_set: @ 80553E8
 _08055418: .4byte gSaveBlock1Ptr
 	thumb_func_end saved_warp2_set
 
-	thumb_func_start saved_warp2_set_2
+	thumb_func_start SetDynamicWarpWithCoords
-saved_warp2_set_2: @ 805541C
+SetDynamicWarpWithCoords: @ 805541C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r4, [sp, 0x14]
@@ -1112,7 +1112,7 @@ saved_warp2_set_2: @ 805541C
 	bx r0
 	.align 2, 0
 _08055450: .4byte gSaveBlock1Ptr
-	thumb_func_end saved_warp2_set_2
+	thumb_func_end SetDynamicWarpWithCoords
 
 	thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1
 copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8055454
@@ -1185,8 +1185,8 @@ sub_80554BC: @ 80554BC
 _080554C8: .4byte gUnknown_2031DBC
 	thumb_func_end sub_80554BC
 
-	thumb_func_start sub_80554CC
+	thumb_func_start SetLastHealLocationWarp
-sub_80554CC: @ 80554CC
+SetLastHealLocationWarp: @ 80554CC
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -1218,7 +1218,7 @@ _08055500:
 	bx r0
 	.align 2, 0
 _08055508: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_80554CC
+	thumb_func_end SetLastHealLocationWarp
 
 	thumb_func_start sub_805550C
 sub_805550C: @ 805550C
@@ -1281,7 +1281,7 @@ sub_805550C: @ 805550C
 	lsls r4, 24
 	asrs r4, 24
 	str r4, [sp]
-	bl sub_80555A0
+	bl SetEscapeWarp
 _08055590:
 	add sp, 0x4
 	pop {r4-r7}
@@ -1292,8 +1292,8 @@ _08055598: .4byte gUnknown_2031DBC
 _0805559C: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_805550C
 
-	thumb_func_start sub_80555A0
+	thumb_func_start SetEscapeWarp
-sub_80555A0: @ 80555A0
+SetEscapeWarp: @ 80555A0
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -1325,7 +1325,7 @@ sub_80555A0: @ 80555A0
 	bx r0
 	.align 2, 0
 _080555DC: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_80555A0
+	thumb_func_end SetEscapeWarp
 
 	thumb_func_start sub_80555E0
 sub_80555E0: @ 80555E0
@@ -1342,8 +1342,8 @@ _080555F0: .4byte gUnknown_2031DBC
 _080555F4: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_80555E0
 
-	thumb_func_start sub_80555F8
+	thumb_func_start SetFixedDiveWarp
-sub_80555F8: @ 80555F8
+SetFixedDiveWarp: @ 80555F8
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -1373,7 +1373,7 @@ sub_80555F8: @ 80555F8
 	bx r0
 	.align 2, 0
 _08055630: .4byte gUnknown_2031DC4
-	thumb_func_end sub_80555F8
+	thumb_func_end SetFixedDiveWarp
 
 	thumb_func_start warp1_set_to_warp2
 warp1_set_to_warp2: @ 8055634
@@ -1389,8 +1389,8 @@ _08055644: .4byte gUnknown_2031DBC
 _08055648: .4byte gUnknown_2031DC4
 	thumb_func_end warp1_set_to_warp2
 
-	thumb_func_start sub_805564C
+	thumb_func_start SetFixedHoleWarp
-sub_805564C: @ 805564C
+SetFixedHoleWarp: @ 805564C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -1420,10 +1420,10 @@ sub_805564C: @ 805564C
 	bx r0
 	.align 2, 0
 _08055684: .4byte gUnknown_2031DCC
-	thumb_func_end sub_805564C
+	thumb_func_end SetFixedHoleWarp
 
-	thumb_func_start sub_8055688
+	thumb_func_start SetWarpDestinationToFixedHoleWarp
-sub_8055688: @ 8055688
+SetWarpDestinationToFixedHoleWarp: @ 8055688
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -1464,7 +1464,7 @@ _080556D6:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8055688
+	thumb_func_end SetWarpDestinationToFixedHoleWarp
 
 	thumb_func_start warp1_set_to_sav1w
 warp1_set_to_sav1w: @ 80556E0
@@ -1712,7 +1712,7 @@ sub_8055864: @ 8055864
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl sub_810C578
-	bl sub_807B140
+	bl SetSav1WeatherFromCurrMapHeader
 	bl sub_805610C
 	bl sub_8055CB8
 	bl sav1_reset_battle_music_maybe
@@ -1784,7 +1784,7 @@ sub_8055920: @ 8055920
 	lsls r1, 16
 	lsrs r1, 16
 	bl sub_810C578
-	bl sub_807B140
+	bl SetSav1WeatherFromCurrMapHeader
 	bl sub_805610C
 	cmp r4, 0
 	beq _08055974
@@ -1817,7 +1817,7 @@ sub_80559A8: @ 80559A8
 	ldrb r0, [r0, 0x17]
 	bl is_light_level_1_2_3_5_or_6
 	bl TrySetMapSaveWarpStatus
-	bl sub_807B140
+	bl SetSav1WeatherFromCurrMapHeader
 	bl sub_805610C
 	bl sub_8055CB8
 	bl sub_8110920
@@ -1830,8 +1830,8 @@ sub_80559A8: @ 80559A8
 _080559E0: .4byte gMapHeader
 	thumb_func_end sub_80559A8
 
-	thumb_func_start sub_80559E4
+	thumb_func_start ResetInitialPlayerAvatarState
-sub_80559E4: @ 80559E4
+ResetInitialPlayerAvatarState: @ 80559E4
 	ldr r0, _080559F4 @ =gUnknown_2031DD4
 	movs r2, 0
 	movs r1, 0x1
@@ -1841,7 +1841,7 @@ sub_80559E4: @ 80559E4
 	bx lr
 	.align 2, 0
 _080559F4: .4byte gUnknown_2031DD4
-	thumb_func_end sub_80559E4
+	thumb_func_end ResetInitialPlayerAvatarState
 
 	thumb_func_start sub_80559F8
 sub_80559F8: @ 80559F8
@@ -2295,8 +2295,8 @@ sav1_get_flash_used_on_map: @ 8055D30
 _08055D3C: .4byte gSaveBlock1Ptr
 	thumb_func_end sav1_get_flash_used_on_map
 
-	thumb_func_start sub_8055D40
+	thumb_func_start SetCurrentMapLayout
-sub_8055D40: @ 8055D40
+SetCurrentMapLayout: @ 8055D40
 	push {lr}
 	ldr r1, _08055D54 @ =gSaveBlock1Ptr
 	ldr r1, [r1]
@@ -2309,7 +2309,7 @@ sub_8055D40: @ 8055D40
 	.align 2, 0
 _08055D54: .4byte gSaveBlock1Ptr
 _08055D58: .4byte gMapHeader
-	thumb_func_end sub_8055D40
+	thumb_func_end SetCurrentMapLayout
 
 	thumb_func_start sub_8055D5C
 sub_8055D5C: @ 8055D5C
@@ -2464,15 +2464,15 @@ _08055E6C:
 _08055E74: .4byte 0x00000131
 	thumb_func_end sub_8055DC4
 
-	thumb_func_start sub_8055E78
+	thumb_func_start Overworld_SetSavedMusic
-sub_8055E78: @ 8055E78
+Overworld_SetSavedMusic: @ 8055E78
 	ldr r1, _08055E80 @ =gSaveBlock1Ptr
 	ldr r1, [r1]
 	strh r0, [r1, 0x2C]
 	bx lr
 	.align 2, 0
 _08055E80: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_8055E78
+	thumb_func_end Overworld_SetSavedMusic
 
 	thumb_func_start sav1_reset_battle_music_maybe
 sav1_reset_battle_music_maybe: @ 8055E84
@@ -2573,8 +2573,8 @@ _08055F42:
 	bx r0
 	thumb_func_end Overworld_ChangeMusicToDefault
 
-	thumb_func_start sub_8055F48
+	thumb_func_start Overworld_ChangeMusicTo
-sub_8055F48: @ 8055F48
+Overworld_ChangeMusicTo: @ 8055F48
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -2590,7 +2590,7 @@ _08055F62:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8055F48
+	thumb_func_end Overworld_ChangeMusicTo
 
 	thumb_func_start GetMapMusicFadeoutSpeed
 GetMapMusicFadeoutSpeed: @ 8055F68
@@ -3225,8 +3225,8 @@ sub_8056420: @ 8056420
 	bx r0
 	thumb_func_end sub_8056420
 
-	thumb_func_start sub_805642C
+	thumb_func_start is_c1_link_related_active
-sub_805642C: @ 805642C
+is_c1_link_related_active: @ 805642C
 	push {lr}
 	ldr r0, _0805643C @ =gMain
 	ldr r1, [r0]
@@ -3243,7 +3243,7 @@ _08056444:
 _08056446:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_805642C
+	thumb_func_end is_c1_link_related_active
 
 	thumb_func_start sub_805644C
 sub_805644C: @ 805644C
@@ -3494,7 +3494,7 @@ CB2_NewGame: @ 8056644
 	bl StopMapMusic
 	bl sub_8056420
 	bl sub_8054A60
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	bl PlayTimeCounter_Start
 	bl ScriptContext1_Init
 	bl ScriptContext2_Disable
@@ -3662,7 +3662,7 @@ _080567D8: .4byte sub_80565B4
 	thumb_func_start c2_exit_to_overworld_2_switch
 c2_exit_to_overworld_2_switch: @ 80567DC
 	push {lr}
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0x1
 	bne _080567F4
 	ldr r0, _080567F0 @ =c2_exit_to_overworld_2_link
@@ -4705,7 +4705,7 @@ mli4_mapscripts_and_other: @ 805709C
 	bl InitPlayerAvatar
 	ldrb r0, [r5]
 	bl SetPlayerAvatarTransitionFlags
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	movs r0, 0
 	movs r1, 0
 	bl sub_805EC30
@@ -6144,7 +6144,7 @@ _08057C72:
 	bl sub_805833C
 	cmp r0, 0x1
 	bls _08057CA8
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0x1
 	bne _08057CA8
 	bl sub_800A00C
@@ -6976,7 +6976,7 @@ _08058240: .4byte gUnknown_81BB9F0
 	thumb_func_start sub_8058244
 sub_8058244: @ 8058244
 	push {lr}
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0
 	bne _08058252
 	movs r0, 0
@@ -7009,7 +7009,7 @@ sub_8058274: @ 8058274
 	bl sub_800B248
 	cmp r0, 0x1
 	bls _080582D8
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0x1
 	bne _080582D8
 	bl sub_800A00C
@@ -7062,7 +7062,7 @@ sub_80582E0: @ 80582E0
 	bl sub_805833C
 	cmp r0, 0x1
 	bls _08058304
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0x1
 	bne _08058304
 	bl sub_800A00C

asm/party_menu.s

@@ -3383,7 +3383,7 @@ _08120468:
 	bl GetMonNickname
 	ldr r1, _081204A0 @ =gStringVar2
 	adds r0, r4, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _081204A4 @ =gStringVar4
 	ldr r1, _081204A8 @ =gUnknown_8416C2A
 	adds r0, r4, 0
@@ -3424,7 +3424,7 @@ sub_81204AC: @ 81204AC
 	bl GetMonNickname
 	ldr r1, _08120500 @ =gStringVar2
 	adds r0, r4, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _08120504 @ =gStringVar4
 	ldr r1, _08120508 @ =gUnknown_8416CAC
 	adds r0, r4, 0
@@ -3458,7 +3458,7 @@ sub_812050C: @ 812050C
 	bl GetMonNickname
 	ldr r1, _0812054C @ =gStringVar2
 	adds r0, r4, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _08120550 @ =gStringVar4
 	ldr r1, _08120554 @ =gUnknown_8416C49
 	adds r0, r4, 0
@@ -3502,10 +3502,10 @@ sub_8120558: @ 8120558
 	bl sub_8124B60
 	ldr r1, _081205B8 @ =gStringVar1
 	adds r0, r4, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r1, _081205BC @ =gStringVar2
 	adds r0, r5, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _081205C0 @ =gStringVar4
 	ldr r1, _081205C4 @ =gUnknown_8416CEA
 	adds r0, r4, 0
@@ -3582,7 +3582,7 @@ sub_8120610: @ 8120610
 	b _0812064E
 _0812062C:
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	cmp r0, 0
 	beq _0812064C
@@ -4298,7 +4298,7 @@ _08120B86:
 	lsls r0, 16
 	lsrs r1, r0, 16
 	adds r0, r5, 0
-	bl pokemon_has_move
+	bl MonKnowsMove
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -9943,7 +9943,7 @@ _081237CC:
 	beq _081237F8
 	ldrh r0, [r6]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	movs r0, 0x9
 	ldrsb r0, [r5, r0]
 	mov r1, r8
@@ -10016,7 +10016,7 @@ sub_8123824: @ 8123824
 	bl sub_81205C8
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	ldr r1, _0812389C @ =gTasks
 	lsls r0, r7, 2
 	adds r0, r7
@@ -10133,17 +10133,17 @@ _08123956:
 	ldr r5, _08123998 @ =gSpecialVar_ItemId
 	ldrh r0, [r5]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	ldr r6, _0812399C @ =gUnknown_203B0D8
 	ldrh r0, [r6]
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _081239AC
 	ldrh r0, [r5]
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	ldrh r0, [r6]
 	bl sub_8120658
 	ldr r0, _081239A0 @ =gStringVar4
@@ -10330,10 +10330,10 @@ sub_8123ACC: @ 8123ACC
 	bl SetMonData
 	ldrh r0, [r4]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	mov r0, r8
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	ldrb r0, [r6, 0x8]
 	lsls r0, 28
 	lsrs r0, 28
@@ -10903,7 +10903,7 @@ _08123FAA:
 	lsrs r4, r0, 16
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -12735,7 +12735,7 @@ sub_8124E48: @ 8124E48
 	bhi _08124EB0
 	adds r0, r1, 0
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 _08124EB0:
 	mov r1, r8
 	ldr r0, [r1]
@@ -12828,7 +12828,7 @@ sub_8124EFC: @ 8124EFC
 	bhi _08124F7C
 	adds r0, r1, 0
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 _08124F7C:
 	mov r1, r8
 	ldr r0, [r1]
@@ -13418,7 +13418,7 @@ _0812544C:
 	beq _0812547E
 	adds r0, r6, 0
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	b _0812547E
 	.align 2, 0
 _08125474: .4byte gUnknown_203B0C0
@@ -13963,7 +13963,7 @@ sub_8125898: @ 8125898
 	bl PlaySE
 	ldrh r0, [r6]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	movs r2, 0xE
 	ldrsh r1, [r5, r2]
 	adds r1, 0xD
@@ -14065,7 +14065,7 @@ _081259A0:
 	bl PlaySE
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	movs r0, 0
 	ldrsh r1, [r7, r0]
 	adds r1, 0xD
@@ -14185,8 +14185,8 @@ _08125ABC:
 	bx r1
 	thumb_func_end sub_8125A90
 
-	thumb_func_start pokemon_has_move
+	thumb_func_start MonKnowsMove
-pokemon_has_move: @ 8125AC0
+MonKnowsMove: @ 8125AC0
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -14212,7 +14212,7 @@ _08125AE8:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end pokemon_has_move
+	thumb_func_end MonKnowsMove
 
 	thumb_func_start sub_8125AF0
 sub_8125AF0: @ 8125AF0
@@ -14406,7 +14406,7 @@ sub_8125C48: @ 8125C48
 	bhi _08125C84
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 _08125C84:
 	ldr r1, _08125CD8 @ =gStringVar1
 	adds r0, r5, 0
@@ -15276,7 +15276,7 @@ sub_8126350: @ 8126350
 	bl sub_8126440
 	ldrh r0, [r5]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	ldr r1, _08126428 @ =gStringVar1
 	adds r0, r4, 0
 	bl GetMonNickname
@@ -16117,7 +16117,7 @@ _08126AB4:
 	ldr r0, _08126ADC @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 _08126ABE:
 	ldr r1, _08126AE4 @ =gTasks
 	lsls r0, r4, 2
@@ -16269,7 +16269,7 @@ sub_8126BD4: @ 8126BD4
 	bl sub_80A2294
 	ldrh r0, [r5]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -16971,7 +16971,7 @@ sub_812713C: @ 812713C
 	bl SetMonData
 	ldrh r0, [r4]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 	adds r0, r7, 0
 	bl sub_81273AC
 	ldr r0, [r6]
@@ -17117,7 +17117,7 @@ _0812728E:
 	ldr r6, _081272C4 @ =gUnknown_203B0D8
 	ldrh r0, [r6]
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _081272CC
@@ -17240,7 +17240,7 @@ _0812739C: .4byte gUnknown_203B0A0
 _081273A0:
 	adds r0, r1, 0
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 _081273A8:
 	pop {r0}
 	bx r0
@@ -17257,14 +17257,14 @@ sub_81273AC: @ 81273AC
 	beq _081273C8
 	adds r0, r1, 0
 	movs r1, 0x1
-	bl sub_809A3C8
+	bl AddPCItem
 	b _081273D0
 	.align 2, 0
 _081273C4: .4byte gUnknown_203B0A0
 _081273C8:
 	adds r0, r1, 0
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 _081273D0:
 	lsls r0, 24
 	lsrs r0, 24

asm/player_pc.s

@@ -25,7 +25,7 @@ _080EB672:
 	ldrh r0, [r0]
 	adds r1, r6
 	ldrh r1, [r1]
-	bl sub_809A3C8
+	bl AddPCItem
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1649,7 +1649,7 @@ sub_80EC364: @ 80EC364
 	adds r5, r1, r0
 	ldrh r0, [r5, 0x20]
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _080EC3B4

asm/pokemon_storage_system.s

@@ -5151,7 +5151,7 @@ _0808E2E8:
 	adds r0, r1
 	ldrh r0, [r0]
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808E314
@@ -5504,7 +5504,7 @@ _0808E5E0:
 	adds r0, r1
 	ldrh r0, [r0]
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -6643,7 +6643,7 @@ _0808EF56:
 	mov r0, sp
 	ldrh r0, [r0]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 _0808EF60:
 	add sp, 0x4
 	pop {r0}

asm/pokemon_summary_screen.s

@@ -3587,7 +3587,7 @@ _08136338:
 	ldr r1, [r6]
 	ldr r2, _0813634C @ =0x00003074
 	adds r1, r2
-	bl sub_8099E90
+	bl CopyItemName
 _08136342:
 	add sp, 0x14
 	pop {r4-r7}
@@ -8431,7 +8431,7 @@ _08138B48: .4byte 0x00003208
 	thumb_func_start sub_8138B4C
 sub_8138B4C: @ 8138B4C
 	push {lr}
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0
 	bne _08138B84
 	bl sub_811FA20
@@ -13239,7 +13239,7 @@ _0813B16C:
 _0813B190: .4byte 0x000032f4
 _0813B194: .4byte 0x00003210
 _0813B198:
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0
 	bne _0813B1C4
 	ldr r0, _0813B1C0 @ =gReceivedRemoteLinkPlayers

asm/script_menu.s

@@ -613,8 +613,8 @@ _0809CDE0:
 _0809CDE8: .4byte gUnknown_83E0748
 	thumb_func_end sub_809CD48
 
-	thumb_func_start sub_809CDEC
+	thumb_func_start ScriptMenu_YesNo
-sub_809CDEC: @ 809CDEC
+ScriptMenu_YesNo: @ 809CDEC
 	push {r4,lr}
 	ldr r4, _0809CE04 @ =task_yes_no_maybe
 	adds r0, r4, 0
@@ -649,7 +649,7 @@ _0809CE28:
 	.align 2, 0
 _0809CE30: .4byte gSpecialVar_Result
 _0809CE34: .4byte sub_809D6D4
-	thumb_func_end sub_809CDEC
+	thumb_func_end ScriptMenu_YesNo
 
 	thumb_func_start sub_809CE38
 sub_809CE38: @ 809CE38
@@ -733,8 +733,8 @@ _0809CEBC:
 _0809CEC4: .4byte gSpecialVar_Result
 	thumb_func_end task_yes_no_maybe
 
-	thumb_func_start sub_809CEC8
+	thumb_func_start ScriptMenu_MultichoiceGrid
-sub_809CEC8: @ 809CEC8
+ScriptMenu_MultichoiceGrid: @ 809CEC8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -862,7 +862,7 @@ _0809CFCC: .4byte gSpecialVar_Result
 _0809CFD0: .4byte sub_809D6D4
 _0809CFD4: .4byte gUnknown_83E04B0
 _0809CFD8: .4byte gTasks
-	thumb_func_end sub_809CEC8
+	thumb_func_end ScriptMenu_MultichoiceGrid
 
 	thumb_func_start sub_809CFDC
 sub_809CFDC: @ 809CFDC
@@ -1241,8 +1241,8 @@ _0809D2E8:
 	bx r0
 	thumb_func_end sub_809D288
 
-	thumb_func_start sub_809D2F0
+	thumb_func_start ScriptMenu_ShowPokemonPic
-sub_809D2F0: @ 809D2F0
+ScriptMenu_ShowPokemonPic: @ 809D2F0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1344,10 +1344,10 @@ _0809D3C2:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809D2F0
+	thumb_func_end ScriptMenu_ShowPokemonPic
 
-	thumb_func_start sub_809D3CC
+	thumb_func_start ScriptMenu_GetPicboxWaitFunc
-sub_809D3CC: @ 809D3CC
+ScriptMenu_GetPicboxWaitFunc: @ 809D3CC
 	push {lr}
 	ldr r0, _0809D3F0 @ =sub_809D288
 	bl FindTaskIdByFunc
@@ -1374,7 +1374,7 @@ _0809D3FC:
 _0809D3FE:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809D3CC
+	thumb_func_end ScriptMenu_GetPicboxWaitFunc
 
 	thumb_func_start sub_809D404
 sub_809D404: @ 809D404

asm/script_pokemon_util_80A0058.s

@@ -170,8 +170,8 @@ _080A0196:
 	bx r1
 	thumb_func_end ScriptGiveMon
 
-	thumb_func_start sub_80A01AC
+	thumb_func_start ScriptGiveEgg
-sub_80A01AC: @ 80A01AC
+ScriptGiveEgg: @ 80A01AC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -202,7 +202,7 @@ sub_80A01AC: @ 80A01AC
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80A01AC
+	thumb_func_end ScriptGiveEgg
 
 	thumb_func_start CheckForAlivePartyMons
 CheckForAlivePartyMons: @ 80A01F4

asm/seagallop.s

@@ -371,7 +371,7 @@ _08147150:
 	bl warp_in
 	ldr r0, _081471BC @ =sub_805671C
 	bl SetMainCallback2
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	bl sub_81473A0
 	ldr r0, _081471C0 @ =gUnknown_203F3D0
 	ldr r0, [r0]

asm/shop.s

@@ -1023,7 +1023,7 @@ sub_809B300: @ 809B300
 	lsrs r5, 16
 	adds r0, r5, 0
 	adds r1, r6, 0
-	bl sub_8099E90
+	bl CopyItemName
 	str r6, [r4]
 	str r5, [r4, 0x4]
 	pop {r4-r6}
@@ -2232,7 +2232,7 @@ _0809BC78: .4byte sub_809BF98
 _0809BC7C:
 	ldr r1, _0809BC94 @ =gStringVar1
 	adds r0, r4, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r1, _0809BC98 @ =gUnknown_8416766
 	ldr r2, _0809BC9C @ =sub_809BCA0
 	adds r0, r6, 0
@@ -2408,7 +2408,7 @@ _0809BDD4:
 	bl PutWindowTilemap
 	ldrh r0, [r4, 0xA]
 	ldr r1, _0809BE40 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, _0809BE44 @ =gStringVar2
 	movs r2, 0x2
 	ldrsh r1, [r4, r2]
@@ -2485,7 +2485,7 @@ sub_809BEA4: @ 809BEA4
 	bl PutWindowTilemap
 	ldrh r0, [r4, 0xA]
 	ldrh r1, [r4, 0x2]
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2826,8 +2826,8 @@ _0809C15A:
 _0809C160: .4byte gUnknown_203996C
 	thumb_func_end sub_809C138
 
-	thumb_func_start sub_809C164
+	thumb_func_start CreatePokemartMenu
-sub_809C164: @ 809C164
+CreatePokemartMenu: @ 809C164
 	push {r4,lr}
 	bl sub_809ABD8
 	movs r0, 0
@@ -2851,10 +2851,10 @@ sub_809C164: @ 809C164
 _0809C194: .4byte EnableBothScriptContexts
 _0809C198: .4byte gUnknown_203996C
 _0809C19C: .4byte gMapHeader
-	thumb_func_end sub_809C164
+	thumb_func_end CreatePokemartMenu
 
-	thumb_func_start sub_809C1A0
+	thumb_func_start CreateDecorationShop1Menu
-sub_809C1A0: @ 809C1A0
+CreateDecorationShop1Menu: @ 809C1A0
 	push {lr}
 	bl sub_809ABD8
 	movs r0, 0x2
@@ -2865,10 +2865,10 @@ sub_809C1A0: @ 809C1A0
 	bx r0
 	.align 2, 0
 _0809C1B8: .4byte EnableBothScriptContexts
-	thumb_func_end sub_809C1A0
+	thumb_func_end CreateDecorationShop1Menu
 
-	thumb_func_start sub_809C1BC
+	thumb_func_start CreateDecorationShop2Menu
-sub_809C1BC: @ 809C1BC
+CreateDecorationShop2Menu: @ 809C1BC
 	push {lr}
 	bl sub_809ABD8
 	movs r0, 0x3
@@ -2879,7 +2879,7 @@ sub_809C1BC: @ 809C1BC
 	bx r0
 	.align 2, 0
 _0809C1D4: .4byte EnableBothScriptContexts
-	thumb_func_end sub_809C1BC
+	thumb_func_end CreateDecorationShop2Menu
 
 	thumb_func_start sub_809C1D8
 sub_809C1D8: @ 809C1D8

asm/slot_machine.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_813F804
+	thumb_func_start PlaySlotMachine
-sub_813F804: @ 813F804
+PlaySlotMachine: @ 813F804
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 16
@@ -39,7 +39,7 @@ _0813F840:
 	bx r0
 	.align 2, 0
 _0813F848: .4byte sub_813F898
-	thumb_func_end sub_813F804
+	thumb_func_end PlaySlotMachine
 
 	thumb_func_start sub_813F84C
 sub_813F84C: @ 813F84C

asm/start_menu.s

@@ -11,7 +11,7 @@ sub_806ED54: @ 806ED54
 	ldr r0, _0806ED6C @ =gUnknown_20370F5
 	movs r1, 0
 	strb r1, [r0]
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0x1
 	bne _0806ED70
 	bl sub_806EE34
@@ -634,7 +634,7 @@ _0806F254: .4byte gUnknown_20370F0
 	thumb_func_start ShowStartMenu
 ShowStartMenu: @ 806F258
 	push {lr}
-	bl sub_805642C
+	bl is_c1_link_related_active
 	cmp r0, 0
 	bne _0806F26E
 	bl player_bitmagic

asm/teachy_tv.s

@@ -398,7 +398,7 @@ sub_815AEE8: @ 815AEE8
 	movs r0, 0xB6
 	lsls r0, 1
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815AF30
@@ -443,7 +443,7 @@ sub_815AF5C: @ 815AF5C
 	movs r0, 0xB6
 	lsls r0, 1
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815AF84

asm/tm_case.s

@@ -1855,7 +1855,7 @@ sub_8132714: @ 8132714
 	ldr r0, _08132744 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _08132748 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r5, _0813274C @ =gStringVar4
 	ldr r1, _08132750 @ =gUnknown_841635E
 	adds r0, r5, 0
@@ -2093,7 +2093,7 @@ sub_8132908: @ 8132908
 	bne _08132968
 	ldrh r0, [r6]
 	ldr r1, _08132958 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _0813295C @ =gStringVar4
 	ldr r1, _08132960 @ =gUnknown_84168F1
 	adds r0, r4, 0
@@ -2133,7 +2133,7 @@ _08132980:
 _08132988:
 	ldrh r0, [r6]
 	ldr r1, _081329B4 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r4, _081329B8 @ =gStringVar4
 	ldr r1, _081329BC @ =gUnknown_8416911
 	adds r0, r4, 0
@@ -2506,7 +2506,7 @@ sub_8132CAC: @ 8132CAC
 	ldr r0, _08132D1C @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _08132D20 @ =gStringVar1
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r6, _08132D24 @ =gStringVar3
 	ldrh r1, [r4, 0x2]
 	movs r0, 0x4
@@ -2568,7 +2568,7 @@ sub_8132D34: @ 8132D34
 	ldrh r0, [r5]
 	mov r2, r8
 	ldrh r1, [r2, 0x10]
-	bl sub_809A1D8
+	bl RemoveBagItem
 	ldr r7, _08132DFC @ =gSaveBlock1Ptr
 	ldr r4, [r7]
 	movs r3, 0xA4
@@ -2729,16 +2729,16 @@ sub_8132E64: @ 8132E64
 	bl sub_81320AC
 	ldr r0, _08132F0C @ =0x00000121
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	ldr r0, _08132F10 @ =0x00000123
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	ldr r0, _08132F14 @ =0x00000129
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	ldr r0, _08132F18 @ =0x00000143
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	ldr r1, _08132F1C @ =sub_815ABFC
 	movs r0, 0x4
 	movs r2, 0

asm/trainer_tower.s

@@ -5,720 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_815E068
-sub_815E068: @ 815E068
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r3, r0, 0
-	lsls r1, 24
-	lsrs r2, r1, 24
-	movs r5, 0
-	cmp r0, 0x1
-	beq _0815E0B4
-	cmp r0, 0x1
-	bgt _0815E084
-	cmp r0, 0
-	beq _0815E088
-	b _0815E0F8
-_0815E084:
-	cmp r3, 0x2
-	bne _0815E0F8
-_0815E088:
-	movs r4, 0
-	ldr r0, _0815E0B0 @ =gUnknown_8479ED8
-	ldrb r1, [r0, 0x1]
-	adds r3, r0, 0
-	cmp r1, r2
-	beq _0815E0A4
-	adds r1, r3, 0
-_0815E096:
-	adds r1, 0x4
-	adds r4, 0x1
-	cmp r4, 0x52
-	bhi _0815E0A4
-	ldrb r0, [r1, 0x1]
-	cmp r0, r2
-	bne _0815E096
-_0815E0A4:
-	cmp r4, 0x53
-	beq _0815E0F8
-	lsls r0, r4, 2
-	adds r0, r3
-	ldrb r5, [r0, 0x2]
-	b _0815E0F8
-	.align 2, 0
-_0815E0B0: .4byte gUnknown_8479ED8
-_0815E0B4:
-	movs r4, 0
-	ldr r1, _0815E0BC @ =gUnknown_847A024
-	b _0815E0C8
-	.align 2, 0
-_0815E0BC: .4byte gUnknown_847A024
-_0815E0C0:
-	adds r1, 0x8
-	adds r4, 0x1
-	cmp r4, 0x9
-	bhi _0815E0CE
-_0815E0C8:
-	ldrb r0, [r1, 0x2]
-	cmp r0, r2
-	bne _0815E0C0
-_0815E0CE:
-	cmp r4, 0xA
-	beq _0815E0F8
-	ldr r0, _0815E0E8 @ =0x00004003
-	bl VarGet
-	lsls r0, 16
-	cmp r0, 0
-	beq _0815E0F0
-	ldr r1, _0815E0EC @ =gUnknown_847A024
-	lsls r0, r4, 3
-	adds r0, r1
-	ldrb r5, [r0, 0x4]
-	b _0815E0F8
-	.align 2, 0
-_0815E0E8: .4byte 0x00004003
-_0815E0EC: .4byte gUnknown_847A024
-_0815E0F0:
-	ldr r1, _0815E108 @ =gUnknown_847A024
-	lsls r0, r4, 3
-	adds r0, r1
-	ldrb r5, [r0, 0x3]
-_0815E0F8:
-	ldr r2, _0815E10C @ =gUnknown_20370DC
-	ldr r1, _0815E110 @ =gUnknown_20370DA
-	ldrh r0, [r1]
-	strh r0, [r2]
-	strh r5, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E108: .4byte gUnknown_847A024
-_0815E10C: .4byte gUnknown_20370DC
-_0815E110: .4byte gUnknown_20370DA
-	thumb_func_end sub_815E068
-
-	thumb_func_start sub_815E114
-sub_815E114: @ 815E114
-	push {lr}
-	ldr r0, _0815E120 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E120: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
-	thumb_func_end sub_815E114
-
-	thumb_func_start sub_815E124
-sub_815E124: @ 815E124
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_80D08F8
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0815E14C
-	ldr r0, _0815E154 @ =gMain
-	ldr r1, _0815E158 @ =sub_815E114
-	str r1, [r0, 0x8]
-	bl sub_80563F0
-	ldr r0, _0815E15C @ =sub_800FD9C
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_0815E14C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E154: .4byte gMain
-_0815E158: .4byte sub_815E114
-_0815E15C: .4byte sub_800FD9C
-	thumb_func_end sub_815E124
-
-	thumb_func_start sub_815E160
-sub_815E160: @ 815E160
-	push {r4,lr}
-	ldr r4, _0815E1AC @ =gBattleTypeFlags
-	ldr r3, _0815E1B0 @ =0x00080008
-	str r3, [r4]
-	ldr r0, _0815E1B4 @ =gUnknown_203F458
-	ldr r1, [r0]
-	ldrb r2, [r1]
-	lsls r0, r2, 5
-	subs r0, r2
-	lsls r0, 5
-	adds r1, r0
-	ldrb r0, [r1, 0xE]
-	cmp r0, 0x1
-	bne _0815E180
-	orrs r0, r3
-	str r0, [r4]
-_0815E180:
-	ldr r1, _0815E1B8 @ =gTrainerBattleOpponent_A
-	movs r0, 0
-	strh r0, [r1]
-	bl sub_815E9FC
-	ldr r0, _0815E1BC @ =sub_815E124
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	bl sub_8080060
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80D08B8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E1AC: .4byte gBattleTypeFlags
-_0815E1B0: .4byte 0x00080008
-_0815E1B4: .4byte gUnknown_203F458
-_0815E1B8: .4byte gTrainerBattleOpponent_A
-_0815E1BC: .4byte sub_815E124
-	thumb_func_end sub_815E160
-
-	thumb_func_start sub_815E1C0
-sub_815E1C0: @ 815E1C0
-	push {lr}
-	ldr r0, _0815E1E4 @ =gSpecialVar_0x8005
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _0815E1DE
-	ldr r3, _0815E1E8 @ =gSpecialVar_Result
-	ldr r0, _0815E1EC @ =gUnknown_203F458
-	ldr r1, [r0]
-	ldrb r2, [r1]
-	lsls r0, r2, 5
-	subs r0, r2
-	lsls r0, 5
-	adds r1, r0
-	ldrb r0, [r1, 0xE]
-	strh r0, [r3]
-_0815E1DE:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E1E4: .4byte gSpecialVar_0x8005
-_0815E1E8: .4byte gSpecialVar_Result
-_0815E1EC: .4byte gUnknown_203F458
-	thumb_func_end sub_815E1C0
-
-	thumb_func_start sub_815E1F0
-sub_815E1F0: @ 815E1F0
-	ldr r0, _0815E210 @ =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, _0815E214 @ =0x00003d34
-	adds r0, r1, r2
-	ldr r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	movs r0, 0xF5
-	lsls r0, 6
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_0815E210: .4byte gSaveBlock1Ptr
-_0815E214: .4byte 0x00003d34
-	thumb_func_end sub_815E1F0
-
-	thumb_func_start sub_815E218
-sub_815E218: @ 815E218
-	push {lr}
-	ldr r0, _0815E260 @ =gMapHeader
-	ldrh r0, [r0, 0x12]
-	mov r12, r0
-	ldr r3, _0815E264 @ =0xfffffed6
-	add r3, r12
-	ldr r0, _0815E268 @ =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, _0815E26C @ =0x00003d34
-	adds r0, r1, r2
-	ldr r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	movs r0, 0xF5
-	lsls r0, 6
-	adds r1, r0
-	ldrb r1, [r1]
-	cmp r3, r1
-	bne _0815E27C
-	ldr r3, _0815E270 @ =0xfffffed7
-	add r3, r12
-	ldr r0, _0815E274 @ =gUnknown_203F458
-	ldr r1, [r0]
-	ldrb r2, [r1]
-	lsls r0, r2, 5
-	subs r0, r2
-	lsls r0, 5
-	adds r1, r0
-	ldrb r1, [r1, 0xD]
-	cmp r3, r1
-	bgt _0815E27C
-	ldr r1, _0815E278 @ =gSpecialVar_Result
-	movs r0, 0
-	b _0815E280
-	.align 2, 0
-_0815E260: .4byte gMapHeader
-_0815E264: .4byte 0xfffffed6
-_0815E268: .4byte gSaveBlock1Ptr
-_0815E26C: .4byte 0x00003d34
-_0815E270: .4byte 0xfffffed7
-_0815E274: .4byte gUnknown_203F458
-_0815E278: .4byte gSpecialVar_Result
-_0815E27C:
-	ldr r1, _0815E288 @ =gSpecialVar_Result
-	movs r0, 0x1
-_0815E280:
-	strh r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E288: .4byte gSpecialVar_Result
-	thumb_func_end sub_815E218
-
-	thumb_func_start sub_815E28C
-sub_815E28C: @ 815E28C
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	ldr r4, _0815E2D0 @ =gSaveBlock1Ptr
-	ldr r0, [r4]
-	ldr r5, _0815E2D4 @ =0x00003d34
-	adds r1, r0, r5
-	ldr r0, _0815E2D8 @ =gSpecialVar_0x8005
-	ldrh r0, [r0]
-	str r0, [r1]
-	cmp r0, 0x3
-	bls _0815E2A8
-	movs r0, 0
-	str r0, [r1]
-_0815E2A8:
-	bl sub_815EC0C
-	bl sub_815D834
-	cmp r0, 0
-	bne _0815E2E0
-	ldr r1, [r4]
-	adds r0, r1, r5
-	ldr r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, _0815E2DC @ =0x00003d42
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x20
-	orrs r0, r2
-	b _0815E2FA
-	.align 2, 0
-_0815E2D0: .4byte gSaveBlock1Ptr
-_0815E2D4: .4byte 0x00003d34
-_0815E2D8: .4byte gSpecialVar_0x8005
-_0815E2DC: .4byte 0x00003d42
-_0815E2E0:
-	ldr r1, [r4]
-	adds r0, r1, r5
-	ldr r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, _0815E384 @ =0x00003d42
-	adds r1, r0
-	ldrb r2, [r1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r2
-_0815E2FA:
-	strb r0, [r1]
-	ldr r6, _0815E388 @ =gSaveBlock1Ptr
-	ldr r2, [r6]
-	ldr r5, _0815E38C @ =0x00003d34
-	adds r0, r2, r5
-	ldr r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r2, r0
-	movs r0, 0xF5
-	lsls r0, 6
-	adds r2, r0
-	movs r0, 0
-	mov r8, r0
-	mov r0, r8
-	strb r0, [r2]
-	ldr r0, [r6]
-	adds r1, r0, r5
-	ldr r2, [r1]
-	lsls r1, r2, 1
-	adds r1, r2
-	lsls r1, 2
-	ldr r4, _0815E390 @ =0x00003d38
-	adds r1, r4
-	adds r0, r1
-	bl SetVBlankCounter1Ptr
-	ldr r2, [r6]
-	adds r3, r2, r5
-	ldr r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r4, r2, r4
-	adds r4, r0
-	mov r0, r8
-	str r0, [r4]
-	ldr r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r2, r0
-	ldr r3, _0815E384 @ =0x00003d42
-	adds r2, r3
-	ldrb r1, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	ldr r1, [r6]
-	adds r5, r1, r5
-	ldr r2, [r5]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	adds r1, r3
-	ldrb r2, [r1]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E384: .4byte 0x00003d42
-_0815E388: .4byte gSaveBlock1Ptr
-_0815E38C: .4byte 0x00003d34
-_0815E390: .4byte 0x00003d38
-	thumb_func_end sub_815E28C
-
-	thumb_func_start sub_815E394
-sub_815E394: @ 815E394
-	push {lr}
-	bl DisableVBlankCounter1
-	ldr r3, _0815E3F8 @ =gSpecialVar_Result
-	movs r0, 0
-	strh r0, [r3]
-	ldr r0, _0815E3FC @ =gSaveBlock1Ptr
-	ldr r2, [r0]
-	ldr r1, _0815E400 @ =0x00003d34
-	adds r0, r2, r1
-	ldr r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r2, r0
-	ldr r0, _0815E404 @ =0x00003d42
-	adds r2, r0
-	ldrb r0, [r2]
-	lsls r0, 29
-	cmp r0, 0
-	bge _0815E3C2
-	movs r0, 0x1
-	strh r0, [r3]
-_0815E3C2:
-	ldrb r2, [r2]
-	lsls r0, r2, 31
-	cmp r0, 0
-	beq _0815E3D6
-	lsls r0, r2, 30
-	cmp r0, 0
-	bge _0815E3D6
-	ldrh r0, [r3]
-	adds r0, 0x1
-	strh r0, [r3]
-_0815E3D6:
-	ldr r0, _0815E3FC @ =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, _0815E400 @ =0x00003d34
-	adds r0, r1, r2
-	ldr r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, _0815E404 @ =0x00003d42
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E3F8: .4byte gSpecialVar_Result
-_0815E3FC: .4byte gSaveBlock1Ptr
-_0815E400: .4byte 0x00003d34
-_0815E404: .4byte 0x00003d42
-	thumb_func_end sub_815E394
-
-	thumb_func_start sub_815E408
-sub_815E408: @ 815E408
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r1, _0815E444 @ =gUnknown_847A2B4
-	ldr r0, _0815E448 @ =gUnknown_203F458
-	ldr r0, [r0]
-	ldrb r0, [r0, 0xF]
-	lsls r0, 1
-	adds r0, r1
-	ldrh r4, [r0]
-	ldr r0, _0815E44C @ =gSaveBlock1Ptr
-	mov r8, r0
-	ldr r2, [r0]
-	ldr r7, _0815E450 @ =0x00003d34
-	adds r0, r2, r7
-	ldr r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r2, r0
-	ldr r6, _0815E454 @ =0x00003d42
-	adds r2, r6
-	ldrb r0, [r2]
-	lsls r0, 31
-	lsrs r5, r0, 31
-	cmp r5, 0
-	beq _0815E45C
-	ldr r1, _0815E458 @ =gSpecialVar_Result
-	movs r0, 0x2
-	b _0815E4A0
-	.align 2, 0
-_0815E444: .4byte gUnknown_847A2B4
-_0815E448: .4byte gUnknown_203F458
-_0815E44C: .4byte gSaveBlock1Ptr
-_0815E450: .4byte 0x00003d34
-_0815E454: .4byte 0x00003d42
-_0815E458: .4byte gSpecialVar_Result
-_0815E45C:
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_809A084
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0815E49C
-	ldr r1, _0815E494 @ =gStringVar2
-	adds r0, r4, 0
-	bl sub_8099E90
-	mov r0, r8
-	ldr r1, [r0]
-	adds r0, r1, r7
-	ldr r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	adds r1, r6
-	ldrb r0, [r1]
-	movs r2, 0x1
-	orrs r0, r2
-	strb r0, [r1]
-	ldr r0, _0815E498 @ =gSpecialVar_Result
-	strh r5, [r0]
-	b _0815E4A2
-	.align 2, 0
-_0815E494: .4byte gStringVar2
-_0815E498: .4byte gSpecialVar_Result
-_0815E49C:
-	ldr r1, _0815E4AC @ =gSpecialVar_Result
-	movs r0, 0x1
-_0815E4A0:
-	strh r0, [r1]
-_0815E4A2:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E4AC: .4byte gSpecialVar_Result
-	thumb_func_end sub_815E408
-
-	thumb_func_start sub_815E4B0
-sub_815E4B0: @ 815E4B0
-	push {r4-r6,lr}
-	ldr r6, _0815E4D8 @ =gSaveBlock1Ptr
-	ldr r2, [r6]
-	ldr r1, _0815E4DC @ =0x00003d34
-	adds r0, r2, r1
-	ldr r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r1, r0, 2
-	adds r0, r2, r1
-	ldr r3, _0815E4E0 @ =0x00003d42
-	adds r0, r3
-	ldrb r0, [r0]
-	lsls r0, 30
-	lsrs r5, r0, 31
-	cmp r5, 0
-	beq _0815E4E8
-	ldr r1, _0815E4E4 @ =gSpecialVar_Result
-	movs r0, 0x2
-	b _0815E534
-	.align 2, 0
-_0815E4D8: .4byte gSaveBlock1Ptr
-_0815E4DC: .4byte 0x00003d34
-_0815E4E0: .4byte 0x00003d42
-_0815E4E4: .4byte gSpecialVar_Result
-_0815E4E8:
-	ldr r4, _0815E520 @ =0x00003d38
-	adds r0, r1, r4
-	adds r0, r2, r0
-	adds r0, 0x4
-	bl sub_815EDDC
-	ldr r3, [r6]
-	ldr r2, _0815E524 @ =0x00003d34
-	adds r1, r3, r2
-	ldr r2, [r1]
-	lsls r1, r2, 1
-	adds r1, r2
-	lsls r1, 2
-	adds r4, r3, r4
-	adds r4, r1
-	ldr r4, [r4]
-	cmp r0, r4
-	bls _0815E530
-	adds r0, r1, r3
-	ldr r3, _0815E528 @ =0x00003d3c
-	adds r0, r3
-	adds r1, r4, 0
-	bl sub_815EDF4
-	ldr r0, _0815E52C @ =gSpecialVar_Result
-	strh r5, [r0]
-	b _0815E536
-	.align 2, 0
-_0815E520: .4byte 0x00003d38
-_0815E524: .4byte 0x00003d34
-_0815E528: .4byte 0x00003d3c
-_0815E52C: .4byte gSpecialVar_Result
-_0815E530:
-	ldr r1, _0815E55C @ =gSpecialVar_Result
-	movs r0, 0x1
-_0815E534:
-	strh r0, [r1]
-_0815E536:
-	ldr r0, _0815E560 @ =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, _0815E564 @ =0x00003d34
-	adds r0, r1, r2
-	ldr r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	ldr r3, _0815E568 @ =0x00003d42
-	adds r1, r3
-	ldrb r0, [r1]
-	movs r2, 0x2
-	orrs r0, r2
-	strb r0, [r1]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E55C: .4byte gSpecialVar_Result
-_0815E560: .4byte gSaveBlock1Ptr
-_0815E564: .4byte 0x00003d34
-_0815E568: .4byte 0x00003d42
-	thumb_func_end sub_815E4B0
-
-	thumb_func_start sub_815E56C
-sub_815E56C: @ 815E56C
-	push {r4,lr}
-	ldr r0, _0815E5A0 @ =gSaveBlock1Ptr
-	ldr r4, [r0]
-	ldr r1, _0815E5A4 @ =0x00003d34
-	adds r0, r4, r1
-	ldr r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r3, r0, 2
-	adds r0, r4, r3
-	ldr r1, _0815E5A8 @ =0x00003d42
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 29
-	cmp r0, 0
-	blt _0815E5BA
-	subs r1, 0xA
-	adds r0, r4, r1
-	adds r2, r0, r3
-	ldr r1, [r2]
-	ldr r0, _0815E5AC @ =0x00034bbe
-	cmp r1, r0
-	bls _0815E5B0
-	adds r0, 0x1
-	str r0, [r2]
-	b _0815E5BA
-	.align 2, 0
-_0815E5A0: .4byte gSaveBlock1Ptr
-_0815E5A4: .4byte 0x00003d34
-_0815E5A8: .4byte 0x00003d42
-_0815E5AC: .4byte 0x00034bbe
-_0815E5B0:
-	ldr r1, _0815E5C0 @ =0x00003d38
-	adds r0, r3, r1
-	adds r0, r4, r0
-	bl SetVBlankCounter1Ptr
-_0815E5BA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815E5C0: .4byte 0x00003d38
-	thumb_func_end sub_815E56C
-
-	thumb_func_start sub_815E5C4
-sub_815E5C4: @ 815E5C4
-	ldr r0, _0815E5E4 @ =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, _0815E5E8 @ =0x00003d34
-	adds r0, r1, r2
-	ldr r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, _0815E5EC @ =0x00003d42
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x8
-	orrs r0, r2
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_0815E5E4: .4byte gSaveBlock1Ptr
-_0815E5E8: .4byte 0x00003d34
-_0815E5EC: .4byte 0x00003d42
-	thumb_func_end sub_815E5C4
-
 	thumb_func_start sub_815E5F0
 sub_815E5F0: @ 815E5F0
 	push {lr}
@@ -1676,4 +962,59 @@ _0815EDD4: .4byte gUnknown_83FE998
 _0815EDD8: .4byte gUnknown_83FE9C4
 	thumb_func_end sub_815EC8C
 
+	thumb_func_start sub_815EDDC
+sub_815EDDC: @ 815EDDC
+	ldr r1, _0815EDF0 @ =gSaveBlock2Ptr
+	ldr r1, [r1]
+	movs r2, 0xF2
+	lsls r2, 4
+	adds r1, r2
+	ldr r0, [r0]
+	ldr r1, [r1]
+	eors r0, r1
+	bx lr
+	.align 2, 0
+_0815EDF0: .4byte gSaveBlock2Ptr
+	thumb_func_end sub_815EDDC
+
+	thumb_func_start sub_815EDF4
+sub_815EDF4: @ 815EDF4
+	ldr r2, _0815EE08 @ =gSaveBlock2Ptr
+	ldr r2, [r2]
+	movs r3, 0xF2
+	lsls r3, 4
+	adds r2, r3
+	ldr r2, [r2]
+	eors r2, r1
+	str r2, [r0]
+	bx lr
+	.align 2, 0
+_0815EE08: .4byte gSaveBlock2Ptr
+	thumb_func_end sub_815EDF4
+
+	thumb_func_start sub_815EE0C
+sub_815EE0C: @ 815EE0C
+	push {r4-r6,lr}
+	ldr r6, _0815EE30 @ =gSaveBlock1Ptr
+	ldr r5, _0815EE34 @ =0x00003d38
+	movs r4, 0x3
+_0815EE14:
+	ldr r0, [r6]
+	adds r0, r5
+	adds r0, 0x4
+	ldr r1, _0815EE38 @ =0x00034bbf
+	bl sub_815EDF4
+	adds r5, 0xC
+	subs r4, 0x1
+	cmp r4, 0
+	bge _0815EE14
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0815EE30: .4byte gSaveBlock1Ptr
+_0815EE34: .4byte 0x00003d38
+_0815EE38: .4byte 0x00034bbf
+	thumb_func_end sub_815EE0C
+
 	.align 2, 0 @ Don't pad with nop.

asm/unk_810C3A4.s

@@ -180,7 +180,7 @@ sub_810C4EC: @ 810C4EC
 	movs r0, 0xB5
 	lsls r0, 1
 	movs r1, 0x1
-	bl sub_8099F40
+	bl CheckBagHasItem
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/unk_8147AA8.s

@@ -2300,14 +2300,14 @@ _08148BFC:
 	beq _08148C54
 	ldrh r0, [r1, 0x3E]
 	ldrh r1, [r2]
-	bl sub_809A084
+	bl AddBagItem
 	lsls r0, 24
 	cmp r0, 0
 	beq _08148C54
 	ldr r0, [r4]
 	ldrh r0, [r0, 0x3E]
 	movs r1, 0x1
-	bl sub_809A000
+	bl CheckBagHasSpace
 	lsls r0, 24
 	cmp r0, 0
 	bne _08148C4C
@@ -4162,7 +4162,7 @@ _0814998A:
 	beq _0814999C
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl sub_809A000
+	bl CheckBagHasSpace
 	lsls r0, 24
 	cmp r0, 0
 	beq _08149984
@@ -5613,7 +5613,7 @@ sub_814A468: @ 814A468
 	ldr r1, [r5]
 	adds r1, 0x26
 	adds r0, r4, 0
-	bl sub_8099E90
+	bl CopyItemName
 	ldr r0, [r5]
 	adds r0, 0x66
 	adds r1, r6, 0
@@ -5705,7 +5705,7 @@ sub_814A53C: @ 814A53C
 	ldr r4, _0814A5AC @ =gUnknown_203F3D8
 	ldr r1, [r4]
 	adds r1, 0x26
-	bl sub_8099E90
+	bl CopyItemName
 	bl UnkTextUtil_Reset
 	ldr r1, [r4]
 	adds r1, 0x26
@@ -5760,7 +5760,7 @@ sub_814A5B4: @ 814A5B4
 	ldr r4, _0814A624 @ =gUnknown_203F3D8
 	ldr r1, [r4]
 	adds r1, 0x26
-	bl sub_8099E90
+	bl CopyItemName
 	bl UnkTextUtil_Reset
 	ldr r1, [r4]
 	adds r1, 0x26

asm/unk_814B6F0.s

@@ -204,7 +204,7 @@ _0814B878: .4byte gSpecialVar_ItemId
 _0814B87C:
 	ldrh r0, [r1]
 	movs r1, 0x1
-	bl sub_809A1D8
+	bl RemoveBagItem
 _0814B884:
 	ldr r4, _0814B8E0 @ =gUnknown_203F3DC
 	ldr r2, [r4]

asm/unk_81507FC.s

@@ -6240,7 +6240,7 @@ _08153754: .4byte gUnknown_203F3E0
 _08153758:
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_809A000
+	bl CheckBagHasSpace
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815376A
@@ -6249,10 +6249,10 @@ _08153758:
 _0815376A:
 	adds r0, r6, 0
 	movs r1, 0x1
-	bl sub_809A084
+	bl AddBagItem
 	adds r0, r6, 0
 	movs r1, 0x1
-	bl sub_809A000
+	bl CheckBagHasSpace
 	lsls r0, 24
 	cmp r0, 0
 	beq _08153784
@@ -9989,7 +9989,7 @@ _08155480:
 	lsrs r0, 16
 	add r5, sp, 0x70
 	adds r1, r5, 0
-	bl sub_8099E90
+	bl CopyItemName
 	movs r0, 0
 	adds r1, r5, 0
 	bl UnkTextUtil_SetPtrI
@@ -10021,7 +10021,7 @@ _08155480:
 	lsls r0, 16
 	lsrs r0, 16
 	adds r1, r5, 0
-	bl sub_8099E90
+	bl CopyItemName
 	movs r0, 0
 	adds r1, r5, 0
 	bl UnkTextUtil_SetPtrI

asm/unk_815EDDC.s

@@ -5,61 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_815EDDC
-sub_815EDDC: @ 815EDDC
-	ldr r1, _0815EDF0 @ =gSaveBlock2Ptr
-	ldr r1, [r1]
-	movs r2, 0xF2
-	lsls r2, 4
-	adds r1, r2
-	ldr r0, [r0]
-	ldr r1, [r1]
-	eors r0, r1
-	bx lr
-	.align 2, 0
-_0815EDF0: .4byte gSaveBlock2Ptr
-	thumb_func_end sub_815EDDC
-
-	thumb_func_start sub_815EDF4
-sub_815EDF4: @ 815EDF4
-	ldr r2, _0815EE08 @ =gSaveBlock2Ptr
-	ldr r2, [r2]
-	movs r3, 0xF2
-	lsls r3, 4
-	adds r2, r3
-	ldr r2, [r2]
-	eors r2, r1
-	str r2, [r0]
-	bx lr
-	.align 2, 0
-_0815EE08: .4byte gSaveBlock2Ptr
-	thumb_func_end sub_815EDF4
-
-	thumb_func_start sub_815EE0C
-sub_815EE0C: @ 815EE0C
-	push {r4-r6,lr}
-	ldr r6, _0815EE30 @ =gSaveBlock1Ptr
-	ldr r5, _0815EE34 @ =0x00003d38
-	movs r4, 0x3
-_0815EE14:
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, 0x4
-	ldr r1, _0815EE38 @ =0x00034bbf
-	bl sub_815EDF4
-	adds r5, 0xC
-	subs r4, 0x1
-	cmp r4, 0
-	bge _0815EE14
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815EE30: .4byte gSaveBlock1Ptr
-_0815EE34: .4byte 0x00003d38
-_0815EE38: .4byte 0x00034bbf
-	thumb_func_end sub_815EE0C
-
 	thumb_func_start sub_815EE3C
 sub_815EE3C: @ 815EE3C
 	ldr r1, _0815EE50 @ =gSaveBlock2Ptr

data/data_835B488.s

@@ -657,29 +657,16 @@ gUnknown_83A720C:: @ 83A720C
 gUnknown_83A7240:: @ 83A7240
 	.asciz "0"
 
-	.align 2
+    .section .rodata.83A72A0
-gNullScriptPtr:: @ 83A7244
-	.incbin "baserom.gba", 0x3A7244, 0x4
-
-gUnknown_83A7248:: @ 83A7248
-	.incbin "baserom.gba", 0x3A7248, 0x14
-
-gUnknown_83A725C:: @ 83A725C
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c"
-
-	.align 2
-gUnknown_83A7290:: @ 83A7290
-	.asciz "0"
-
-	.align 2
-gUnknown_83A7294:: @ 83A7294
-	.incbin "baserom.gba", 0x3A7294, 0xC
 
 gUnknown_83A72A0:: @ 83A72A0
-	.incbin "baserom.gba", 0x3A72A0, 0x2
+	.string "S$"
 
 gUnknown_83A72A2:: @ 83A72A2
-	.incbin "baserom.gba", 0x3A72A2, 0x6
+	.string "IES$"
+
+gUnknown_83A72A6:: @ 83A72A6
+	.string "  "
 
 gUnknown_83A72A8:: @ 83A72A8
 	.incbin "baserom.gba", 0x3A72A8, 0x68
@@ -1560,7 +1547,7 @@ gUnknown_83DFC9C:: @ 83DFC9C
 gUnknown_83E04B0:: @ 83E04B0
 	.incbin "baserom.gba", 0x3E04B0, 0x208
 
-gUnknown_83E06B8:: @ 83E06B8
+gStdStringPtrs:: @ 83E06B8
 	.incbin "baserom.gba", 0x3E06B8, 0x74
 
 gUnknown_83E072C:: @ 83E072C

data/data_83FECCC.s

@@ -785,7 +785,7 @@ gUnknown_84162B9:: @ 84162B9
 	.incbin "baserom.gba", 0x4162B9, 0x4
 
 gUnknown_84162BD:: @ 84162BD
-	.incbin "baserom.gba", 0x4162BD, 0x7
+	.string " BERRY$"
 
 gText_Coins:: @ 84162C4
 	.incbin "baserom.gba", 0x4162C4, 0x24

data/event_scripts.s

@@ -40,7 +40,7 @@ gStdScripts:: @ 8160450
 	.4byte gStdScript_81A676C
 	.4byte gStdScript_81A8E58
 	.4byte gStdScript_81A4E66
-gStdScripts_End::
+gStdScriptsEnd::
 
 gUnknown_8160478:: @ 8160478
 	.incbin "baserom.gba", 0x160478, 0x886C

data/script_cmd_table.inc

@@ -1,8 +1,8 @@
     .align 2
 
 gScriptCmdTable:: @ 815F9B4
-	.4byte sub_8069ED0
+	.4byte ScrCmd_nop
-	.4byte sub_8069ED4
+	.4byte ScrCmd_nop1
 	.4byte ScrCmd_end
 	.4byte ScrCmd_return
 	.4byte ScrCmd_call
@@ -38,48 +38,48 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_compare_var_to_var
 	.4byte ScrCmd_callnative
 	.4byte ScrCmd_gotonative
-	.4byte sub_8069EFC
+	.4byte ScrCmd_special
-	.4byte sub_8069F3C
+	.4byte ScrCmd_specialvar
-	.4byte sub_8069FA4
+	.4byte ScrCmd_waitstate
 	.4byte ScrCmd_delay
 	.4byte ScrCmd_setflag
 	.4byte ScrCmd_clearflag
 	.4byte ScrCmd_checkflag
-	.4byte sub_806A9D4
+	.4byte ScrCmd_initclock
-	.4byte sub_806A9D8
+	.4byte ScrCmd_dodailyevents
-	.4byte sub_806A9DC
+	.4byte ScrCmd_gettime
 	.4byte ScrCmd_playse
-	.4byte sub_806B094
+	.4byte ScrCmd_waitse
 	.4byte ScrCmd_playfanfare
-	.4byte sub_806B0CC
+	.4byte ScrCmd_waitfanfare
-	.4byte sub_806B0E0
+	.4byte ScrCmd_playbgm
-	.4byte sub_806B120
+	.4byte ScrCmd_savebgm
-	.4byte sub_806B134
+	.4byte ScrCmd_fadedefaultbgm
-	.4byte sub_806B154
+	.4byte ScrCmd_fadenewbgm
-	.4byte sub_806B17C
+	.4byte ScrCmd_fadeoutbgm
-	.4byte sub_806B1C8
+	.4byte ScrCmd_fadeinbgm
 	.4byte ScrCmd_warp
 	.4byte ScrCmd_warpsilent
 	.4byte ScrCmd_warpdoor
 	.4byte ScrCmd_warphole
-	.4byte sub_806AC70
+	.4byte ScrCmd_warpteleport
 	.4byte ScrCmd_setwarp
 	.4byte ScrCmd_setdynamicwarp
-	.4byte sub_806AE90
+	.4byte ScrCmd_setdivewarp
-	.4byte sub_806AF10
+	.4byte ScrCmd_setholewarp
 	.4byte ScrCmd_getplayerxy
 	.4byte ScrCmd_getpartysize
-	.4byte sub_806A610
+	.4byte ScrCmd_giveitem
 	.4byte ScrCmd_takeitem
-	.4byte sub_806A6A0
+	.4byte ScrCmd_checkitemspace
-	.4byte sub_806A6E4
+	.4byte ScrCmd_checkitem
 	.4byte ScrCmd_checkitemtype
 	.4byte ScrCmd_givepcitem
 	.4byte ScrCmd_checkpcitem
-	.4byte sub_806A7DC
+	.4byte ScrCmd_givedecoration
-	.4byte sub_806A7F0
+	.4byte ScrCmd_takedecoration
-	.4byte sub_806A818
+	.4byte ScrCmd_checkdecor
-	.4byte sub_806A804
+	.4byte ScrCmd_checkdecorspace
 	.4byte ScrCmd_applymovement
 	.4byte ScrCmd_applymovement_at
 	.4byte ScrCmd_waitmovement
@@ -94,34 +94,34 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_faceplayer
 	.4byte ScrCmd_turnobject
 	.4byte ScrCmd_trainerbattle
-	.4byte sub_806C2D8
+	.4byte ScrCmd_dotrainerbattle
-	.4byte ScrCmd_ontrainerbattleend
+	.4byte ScrCmd_gotopostbattlescript
-	.4byte ScrCmd_ontrainerbattleendgoto
+	.4byte ScrCmd_gotobeatenscript
 	.4byte ScrCmd_checktrainerflag
 	.4byte ScrCmd_settrainerflag
 	.4byte ScrCmd_cleartrainerflag
 	.4byte ScrCmd_setobjectxyperm
 	.4byte ScrCmd_moveobjectoffscreen
 	.4byte ScrCmd_setobjectmovementtype
-	.4byte sub_806B878
+	.4byte ScrCmd_waitmessage
-	.4byte sub_806B80C
+	.4byte ScrCmd_message
-	.4byte sub_806B88C
+	.4byte ScrCmd_closemessage
 	.4byte ScrCmd_lockall
 	.4byte ScrCmd_lock
 	.4byte ScrCmd_releaseall
 	.4byte ScrCmd_release
-	.4byte sub_806BA3C
+	.4byte ScrCmd_waitbuttonpress
 	.4byte ScrCmd_yesnobox
 	.4byte ScrCmd_multichoice
 	.4byte ScrCmd_multichoicedefault
 	.4byte ScrCmd_multichoicegrid
-	.4byte sub_806BB38
+	.4byte ScrCmd_drawbox
-	.4byte sub_806BB8C
+	.4byte ScrCmd_erasebox
-	.4byte sub_806BB98
+	.4byte ScrCmd_drawboxtext
-	.4byte sub_806BB9C
+	.4byte ScrCmd_showmonpic
-	.4byte sub_806BBD8
+	.4byte ScrCmd_hidemonpic
-	.4byte sub_806BBF8
+	.4byte ScrCmd_showcontestwinner
-	.4byte sub_806BC04
+	.4byte ScrCmd_braillemessage
 	.4byte ScrCmd_givemon
 	.4byte ScrCmd_giveegg
 	.4byte ScrCmd_setmonmove
@@ -130,33 +130,33 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_bufferleadmonspeciesname
 	.4byte ScrCmd_bufferpartymonnick
 	.4byte ScrCmd_bufferitemname
-	.4byte sub_806BE34
+	.4byte ScrCmd_bufferdecorationname
 	.4byte ScrCmd_buffermovename
 	.4byte ScrCmd_buffernumberstring
 	.4byte ScrCmd_bufferstdstring
 	.4byte ScrCmd_bufferstring
-	.4byte sub_806C3AC
+	.4byte ScrCmd_pokemart
-	.4byte sub_806C3C0
+	.4byte ScrCmd_pokemartdecoration
-	.4byte sub_806C3D4
+	.4byte ScrCmd_pokemartdecoration2
 	.4byte ScrCmd_playslotmachine
-	.4byte sub_806C410
+	.4byte ScrCmd_setberrytree
-	.4byte sub_806C418
+	.4byte ScrCmd_choosecontestmon
-	.4byte sub_806C424
+	.4byte ScrCmd_startcontest
-	.4byte sub_806C428
+	.4byte ScrCmd_showcontestresults
-	.4byte sub_806C42C
+	.4byte ScrCmd_contestlinktransfer
 	.4byte ScrCmd_random
 	.4byte ScrCmd_givemoney
 	.4byte ScrCmd_takemoney
 	.4byte ScrCmd_checkmoney
-	.4byte sub_806C1CC
+	.4byte ScrCmd_showmoneybox
-	.4byte sub_806C21C
+	.4byte ScrCmd_hidemoneybox
-	.4byte sub_806C228
+	.4byte ScrCmd_updatemoneybox
-	.4byte sub_806C414
+	.4byte ScrCmd_getpricereduction
 	.4byte ScrCmd_fadescreen
 	.4byte ScrCmd_fadescreenspeed
 	.4byte ScrCmd_setflashradius
 	.4byte ScrCmd_animateflash
-	.4byte sub_806B85C
+	.4byte ScrCmd_messageautoscroll
 	.4byte ScrCmd_dofieldeffect
 	.4byte ScrCmd_setfieldeffectarg
 	.4byte ScrCmd_waitfieldeffect
@@ -175,16 +175,16 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_turnvobject
 	.4byte ScrCmd_opendoor
 	.4byte ScrCmd_closedoor
-	.4byte sub_806C688
+	.4byte ScrCmd_waitdooranim
 	.4byte ScrCmd_setdooropen
 	.4byte ScrCmd_setdoorclosed
-	.4byte sub_806C724
+	.4byte ScrCmd_addelevmenuitem
-	.4byte sub_806C728
+	.4byte ScrCmd_showelevmenu
 	.4byte ScrCmd_checkcoins
 	.4byte ScrCmd_givecoins
 	.4byte ScrCmd_takecoins
 	.4byte ScrCmd_setwildbattle
-	.4byte sub_806C39C
+	.4byte ScrCmd_dowildbattle
 	.4byte ScrCmd_setvaddress
 	.4byte ScrCmd_vgoto
 	.4byte ScrCmd_vcall
@@ -193,27 +193,27 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_vmessage
 	.4byte ScrCmd_vloadword
 	.4byte ScrCmd_vbufferstring
-	.4byte sub_806C258
+	.4byte ScrCmd_showcoinsbox
 	.4byte ScrCmd_hidecoinsbox
 	.4byte ScrCmd_updatecoinsbox
 	.4byte ScrCmd_incrementgamestat
 	.4byte ScrCmd_setescapewarp
-	.4byte sub_806C540
+	.4byte ScrCmd_waitmoncry
 	.4byte ScrCmd_bufferboxname
-	.4byte sub_806B7EC
+	.4byte ScrCmd_cmdC7
-	.4byte sub_806B828
+	.4byte ScrCmd_cmdC8
-	.4byte sub_806B850
+	.4byte ScrCmd_cmdC9
-	.4byte sub_806C7BC
+	.4byte ScrCmd_cmdCA
-	.4byte sub_806C7C8
+	.4byte ScrCmd_cmdCB
-	.4byte sub_806A888
+	.4byte ScrCmd_comparestattoword
 	.4byte ScrCmd_setmonobedient
 	.4byte ScrCmd_checkmonobedience
-	.4byte sub_806A28C
+	.4byte ScrCmd_cmdCF
-	.4byte sub_806A8C0
+	.4byte ScrCmd_cmdD0
-	.4byte sub_806ACF8
+	.4byte ScrCmd_warpD1
-	.4byte sub_806C844
+	.4byte ScrCmd_setmonmetlocation
-	.4byte sub_806BC40
+	.4byte ScrCmd_getbraillestringwidth
-	.4byte sub_806BD90
+	.4byte ScrCmd_bufferitemnameplural
 
 gScriptCmdTableEnd:: @ 815FD08
-	.4byte sub_8069ED0
+	.4byte ScrCmd_nop

data/specials.inc

@@ -327,8 +327,8 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special sub_807B6C0
-	def_special sp13E_warp_to_last_warp
+	def_special DoDiveWarp
-	def_special sp13F_fall_to_last_warp
+	def_special DoFallWarp
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special sub_80E5E70

data/trainer_tower.s

@@ -1,5 +1,7 @@
+#include "constants/items.h"
 	.include "asm/macros.inc"
-	.include "constants/constants.inc"
+    .include "constants/gba_constants.inc"
+	.include "constants/misc_constants.inc"
 
 	.section .rodata
 
@@ -562,7 +564,21 @@ gUnknown_847A284:: @ 847A284
 	.2byte 0x0131, 0x0175, 0x017d
 
 gUnknown_847A2B4:: @ 847A2B4
-	.2byte 0x3f, 0x40, 0x41, 0x42, 0x43, 0x46, 0xb3, 0xb4, 0xb9, 0xba, 0xbb, 0xc6, 0xc7, 0xc9, 0xda
+	.2byte ITEM_HP_UP
+    .2byte ITEM_PROTEIN
+    .2byte ITEM_IRON
+    .2byte ITEM_CARBOS
+    .2byte ITEM_CALCIUM
+    .2byte ITEM_ZINC
+    .2byte ITEM_BRIGHT_POWDER
+    .2byte ITEM_WHITE_HERB
+    .2byte ITEM_MENTAL_HERB
+    .2byte ITEM_CHOICE_BAND
+    .2byte ITEM_KINGS_ROCK
+    .2byte ITEM_SCOPE_LENS
+    .2byte ITEM_METAL_COAT
+    .2byte ITEM_DRAGON_SCALE
+    .2byte ITEM_UP_GRADE
 
 gUnknown_847A2D2:: @ 847A2D2
 	.2byte 0x011d

data/trainer_tower/trainers.inc

@@ -22,8 +22,8 @@
 
 	.macro dummy_tower_team
 	.string "$", 11
-	.byte FACILITY_CLASS_AQUA_LEADER, 0x01, 0x00
+	.byte FACILITY_CLASS_AQUA_LEADER, 0x01
-
+	.align 1
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -41,8 +41,8 @@
 gUnknown_847ABAC::
 	.byte 0x01, 0x08, 0x00, 0x07
 	.string "COLE$", 11
-	.byte FACILITY_CLASS_YOUNGSTER_2, 0x01, 0x00
+	.byte FACILITY_CLASS_YOUNGSTER_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_AHAHA, EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_ANYWHERE, EC_WORD_EXCL
 	.2byte EC_WORD_ALL_RIGHT, EC_WORD_EXCL, EC_WORD_BYE_BYE, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_HIYAH, EC_WORD_EXCL_EXCL, EC_WORD_DONE, EC_WORD_IN, EC_WORD_TOTALLY, EC_WORD_EXCL_EXCL
@@ -128,8 +128,8 @@ gUnknown_847ABAC::
 gUnknown_847AF8C::
 	.byte 0x02, 0x08, 0x00, 0x0d
 	.string "JAC$", 11
-	.byte FACILITY_CLASS_BURGLAR, 0x01, 0x00
+	.byte FACILITY_CLASS_BURGLAR, 0x01
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_A, EC_MOVE2(THIEF), EC_WORD_EXCL, EC_WORD_GIVE_ME, EC_WORD_SOMETHING
 	.2byte EC_WORD_YOU_VE, EC_WORD_GOT, EC_WORD_NOTHING, EC_WORD_THAT, EC_WORD_I, EC_WORD_WANT
 	.2byte EC_WORD_EEK, EC_WORD_EXCL_EXCL, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_I, EC_WORD_SURRENDER
@@ -215,8 +215,8 @@ gUnknown_847AF8C::
 gUnknown_847B36C::
 	.byte 0x03, 0x08, 0x00, 0x02
 	.string "MILY$", 11
-	.byte FACILITY_CLASS_PSYCHIC_4, 0x01, 0x00
+	.byte FACILITY_CLASS_PSYCHIC_4, 0x01
-
+	.align 1
 	.2byte EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(SUPERPOWER), EC_WORD_EXCL
 	.2byte EC_WORD_ISN_T, EC_WORD_IT, EC_WORD_INCREDIBLE, EC_WORD_QUES, EC_WORD_POKEMON, EC_WORD_POWER
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWFUL, EC_MOVE(NIGHTMARE), EC_WORD_ELLIPSIS_EXCL
@@ -302,8 +302,8 @@ gUnknown_847B36C::
 gUnknown_847B74C::
 	.byte 0x04, 0x08, 0x01, 0x09
 	.string "JOS & ANNE$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
-
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_TO, EC_WORD_YOU, EC_WORD_HERE
 	.2byte EC_WORD_VERY, EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, EC_WORD_GOOD, EC_WORD_BATTLE
 	.2byte EC_WORD_UNBELIEVABLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -382,8 +382,8 @@ gUnknown_847B74C::
 	.byte 255 @ friendship
 
 	.string "JOS & ANNE$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
-
+	.align 1
 	.2byte EC_WORD_HERE_GOES, EC_WORD_EXCL_EXCL, EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_LOSE
 	.2byte EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_WE, EC_WORD_GET, EC_WORD_THE, EC_WORD_WIN
 	.2byte EC_WORD_LOST, EC_WORD_QUES_EXCL, EC_WORD_YOU, EC_WORD_MUST_BE, EC_WORD_JOKING, EC_WORD_EXCL
@@ -468,8 +468,8 @@ gUnknown_847B74C::
 gUnknown_847BB2C::
 	.byte 0x05, 0x08, 0x01, 0x04
 	.string "EMY & ALEK$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01, 0x00
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LOST, EC_WORD_IN, EC_WORD_LOVEY_DOVEY, EC_WORD_HAPPINESS
 	.2byte EC_WORD_OH, EC_WORD_OH, EC_WORD_HE, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_AWESOME
 	.2byte EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_SERIOUS, EC_WORD_QUES
@@ -548,8 +548,8 @@ gUnknown_847BB2C::
 	.byte 255 @ friendship
 
 	.string "EMY & ALEK$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01, 0x00
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GIDDY, EC_WORD_WITH, EC_WORD_LOVEY_DOVEY, EC_WORD_JOY, EC_WORD_EXCL_EXCL
 	.2byte EC_WORD_SIGH, EC_WORD_ELLIPSIS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_IS, EC_WORD_CUTE
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_SERIOUS
@@ -634,8 +634,8 @@ gUnknown_847BB2C::
 gUnknown_847BF0C::
 	.byte 0x06, 0x08, 0x01, 0x00
 	.string "JO & HALEY$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
-
+	.align 1
 	.2byte EC_WORD_WE_RE, EC_WORD_USING, EC_WORD_THAT, EC_WORD_STRATEGY, EC_WORD_OKAY, EC_WORD_QUES
 	.2byte EC_WORD_YAY, EC_WORD_WE, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_SORRY, EC_WORD_EXCL
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TERRIBLE, EC_WORD_EXCL
@@ -714,8 +714,8 @@ gUnknown_847BF0C::
 	.byte 255 @ friendship
 
 	.string "JO & HALEY$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
-
+	.align 1
 	.2byte EC_WORD_YOU, EC_WORD_YOU, EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_WORD_WIN
 	.2byte EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_JOKING, EC_WORD_QUES, EC_WORD_WE, EC_WORD_WON
 	.2byte EC_WORD_WIMPY, EC_WORD_ELLIPSIS, EC_WORD_WE, EC_WORD_WERE, EC_WORD_WEAK, EC_WORD_ELLIPSIS
@@ -800,8 +800,8 @@ gUnknown_847BF0C::
 gUnknown_847C2EC::
 	.byte 0x07, 0x08, 0x02, 0x0c
 	.string "JORDY$", 11
-	.byte FACILITY_CLASS_BIKER, 0x03, 0x00
+	.byte FACILITY_CLASS_BIKER, 0x03
-
+	.align 1
 	.2byte EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GIGGLE, EC_WORD_YOU, EC_WORD_PUSHOVER
 	.2byte EC_WORD_WHAT, EC_WORD_A_LITTLE, EC_WORD_PUSHOVER, EC_WORD_YOU, EC_WORD_ARE, EC_WORD_EXCL
 	.2byte EC_WORD_YOU, EC_WORD_WERE, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_EXCL
@@ -880,8 +880,8 @@ gUnknown_847C2EC::
 	.byte 0 @ friendship
 
 	.string "ERNEST$", 11
-	.byte FACILITY_CLASS_BIKER, 0x01, 0x00
+	.byte FACILITY_CLASS_BIKER, 0x01
-
+	.align 1
 	.2byte EC_WORD_IT_S, EC_WORD_SLEEP, EC_WORD_TIME, EC_WORD_FOR, EC_WORD_CHILDREN, EC_WORD_EXCL
 	.2byte EC_WORD_NOT, EC_WORD_GUTSY, EC_WORD_ENOUGH, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WHY, EC_WORD_DID, EC_WORD_YOU, EC_WORD_CRUSH, EC_WORD_ME, EC_WORD_QUES
@@ -960,8 +960,8 @@ gUnknown_847C2EC::
 	.byte 0 @ friendship
 
 	.string "GABRIEL$", 11
-	.byte FACILITY_CLASS_CUE_BALL, 0x01, 0x00
+	.byte FACILITY_CLASS_CUE_BALL, 0x01
-
+	.align 1
 	.2byte EC_WORD_YAHOO, EC_WORD_EXCL, EC_WORD_HERE_I_COME, EC_WORD_TO, EC_WORD_SWARM, EC_WORD_YOU
 	.2byte EC_WORD_I_AM, EC_WORD_INVINCIBLE, EC_WORD_YOU, EC_WORD_GOT, EC_WORD_THAT, EC_WORD_QUES
 	.2byte EC_WORD_WHAT, EC_WORD_WAS, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF, 0xFFFF
@@ -1045,8 +1045,8 @@ gUnknown_847C2EC::
 gUnknown_847C6CC::
 	.byte 0x08, 0x08, 0x02, 0x0e
 	.string "MIKE$", 11
-	.byte FACILITY_CLASS_HIKER_2, 0x05, 0x00
+	.byte FACILITY_CLASS_HIKER_2, 0x05
-
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_FULL, EC_WORD_OF, EC_WORD_POWER
 	.2byte EC_WORD_WHAT_S_UP_QUES, EC_WORD_WHERE, EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_QUES
 	.2byte EC_WORD_YOU, EC_WORD_GOT, EC_WORD_ME, EC_WORD_WITH, EC_WORD_YOUR, EC_MOVE2(FAKE_OUT)
@@ -1125,8 +1125,8 @@ gUnknown_847C6CC::
 	.byte 255 @ friendship
 
 	.string "REBECCA$", 11
-	.byte FACILITY_CLASS_CRUSH_GIRL, 0x05, 0x00
+	.byte FACILITY_CLASS_CRUSH_GIRL, 0x05
-
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_OVERWHELMING
 	.2byte EC_WORD_ARRGH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1205,8 +1205,8 @@ gUnknown_847C6CC::
 	.byte 255 @ friendship
 
 	.string "NICOLAS$", 11
-	.byte FACILITY_CLASS_BLACK_BELT_2, 0x05, 0x00
+	.byte FACILITY_CLASS_BLACK_BELT_2, 0x05
-
+	.align 1
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_WHERE, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_EXCL
 	.2byte EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_EVER, EC_WORD_BEAT, EC_WORD_ME
 	.2byte EC_WORD_WHY, EC_WORD_COULDN_T, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_QUES
@@ -1290,8 +1290,8 @@ gUnknown_847C6CC::
 gUnknown_847CAAC::
 	.byte 0x09, 0x08, 0x00, 0x00
 	.string "JOEY$", 11
-	.byte FACILITY_CLASS_CAMPER_2, 0x01, 0x00
+	.byte FACILITY_CLASS_CAMPER_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SCARY, EC_WORD_STRONG, EC_WORD_EXCL
 	.2byte EC_WORD_WERE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES
 	.2byte EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_WAY, EC_WORD_TOO_STRONG, EC_WORD_EXCL
@@ -1377,8 +1377,8 @@ gUnknown_847CAAC::
 gUnknown_847CE8C::
 	.byte 0x0a, 0x08, 0x00, 0x0c
 	.string "LILY$", 11
-	.byte FACILITY_CLASS_PKMN_BREEDER_3, 0x01, 0x00
+	.byte FACILITY_CLASS_PKMN_BREEDER_3, 0x01
-
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_WANT, EC_WORD_SOMETHING, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_NEED, EC_WORD_SOMETHING, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_ELLIPSIS
@@ -1464,8 +1464,8 @@ gUnknown_847CE8C::
 gUnknown_847D26C::
 	.byte 0x0b, 0x08, 0x00, 0x0e
 	.string "BRANDON$", 11
-	.byte FACILITY_CLASS_BUG_CATCHER_2, 0x01, 0x00
+	.byte FACILITY_CLASS_BUG_CATCHER_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_POISON, EC_WORD_IS, EC_WORD_JUST, EC_WORD_SO, EC_WORD_AWFUL, EC_WORD_ISN_T_IT_QUES
 	.2byte EC_WORD_SEE, EC_WORD_QUES, EC_WORD_ISN_T, EC_WORD_POISON, EC_WORD_TERRIBLE, EC_WORD_QUES
 	.2byte EC_WORD_HUH_QUES, EC_WORD_OUR, EC_WORD_POISON, EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_QUES
@@ -1551,8 +1551,8 @@ gUnknown_847D26C::
 gUnknown_847D64C::
 	.byte 0x0c, 0x08, 0x01, 0x02
 	.string "RIC & RENE$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
-
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_AWESOME
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_IS, EC_WORD_TOO, EC_WORD_AWESOME
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_ISN_T, EC_WORD_AWESOME, EC_WORD_QUES
@@ -1631,8 +1631,8 @@ gUnknown_847D64C::
 	.byte 255 @ friendship
 
 	.string "RIC & RENE$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_AWESOME, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_AWESOME, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_HUH_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_NOT_VERY, EC_WORD_AWESOME, EC_WORD_QUES
@@ -1717,8 +1717,8 @@ gUnknown_847D64C::
 gUnknown_847DA2C::
 	.byte 0x0d, 0x08, 0x01, 0x0d
 	.string "JEN & KIRA$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x05, 0x00
+	.byte FACILITY_CLASS_TWINS_2, 0x05
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL
 	.2byte EC_WORD_EHEHE, EC_WORD_YAY, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1797,8 +1797,8 @@ gUnknown_847DA2C::
 	.byte 255 @ friendship
 
 	.string "JEN & KIRA$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x03, 0x00
+	.byte FACILITY_CLASS_TWINS_2, 0x03
-
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1883,8 +1883,8 @@ gUnknown_847DA2C::
 gUnknown_847DE0C::
 	.byte 0x0e, 0x08, 0x01, 0x08
 	.string "ISAC & MAG$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x01, 0x00
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x01
-
+	.align 1
 	.2byte EC_WORD_OUR, EC_MOVE(EARTHQUAKE), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SHAKY
 	.2byte EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_I_AM, EC_WORD_ALL, EC_WORD_SHAKY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF
@@ -1963,8 +1963,8 @@ gUnknown_847DE0C::
 	.byte 255 @ friendship
 
 	.string "ISAC & MAG$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x01, 0x00
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x01
-
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_DOESN_T, EC_WORD_GET, EC_WORD_ALL, EC_WORD_SHAKY
 	.2byte EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_LIE, EC_WORD_EXCL
 	.2byte EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_SHAKY
@@ -2049,8 +2049,8 @@ gUnknown_847DE0C::
 gUnknown_847E1EC::
 	.byte 0x0f, 0x08, 0x02, 0x06
 	.string "CHELSEA$", 11
-	.byte FACILITY_CLASS_PKMN_RANGER_4, 0x07, 0x00
+	.byte FACILITY_CLASS_PKMN_RANGER_4, 0x07
-
+	.align 1
 	.2byte EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_IMPORTANT, EC_WORD_ISN_T_IT_QUES
 	.2byte EC_WORD_YOU, EC_WORD_TAKE, EC_WORD_THE, EC_WORD_LOSS, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_BE, EC_WORD_KIND, EC_WORD_TO, EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD
@@ -2129,8 +2129,8 @@ gUnknown_847E1EC::
 	.byte 255 @ friendship
 
 	.string "TRENTON$", 11
-	.byte FACILITY_CLASS_PKMN_RANGER_3, 0x07, 0x00
+	.byte FACILITY_CLASS_PKMN_RANGER_3, 0x07
-
+	.align 1
 	.2byte EC_WORD_I, EC_MOVE2(PROTECT), EC_WORD_THE, EC_WORD_GREAT, EC_WORD_GREEN, EC_WORD_WORLD
 	.2byte EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_YOURS
 	.2byte EC_MOVE2(PROTECT), EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD, 0xFFFF, 0xFFFF
@@ -2209,8 +2209,8 @@ gUnknown_847E1EC::
 	.byte 255 @ friendship
 
 	.string "ALBERT$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_3, 0x07, 0x00
+	.byte FACILITY_CLASS_COOLTRAINER_3, 0x07
-
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_HERE
 	.2byte EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_THINGS, EC_WORD_EXCITING
 	.2byte EC_WORD_YOU_RE, EC_WORD_STRONG, EC_WORD_THAT_WAS, EC_WORD_WILD, EC_WORD_AND, EC_WORD_EXCITING
@@ -2294,8 +2294,8 @@ gUnknown_847E1EC::
 gUnknown_847E5CC::
 	.byte 0x10, 0x08, 0x02, 0x04
 	.string "CAMRYN$", 11
-	.byte FACILITY_CLASS_PICNICKER_2, 0x01, 0x00
+	.byte FACILITY_CLASS_PICNICKER_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_I, EC_WORD_WON_T, EC_WORD_LOSE, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_I, EC_WORD_WOULD, EC_WORD_WIN
 	.2byte EC_WORD_OH_QUES, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_DID, EC_WORD_I, EC_WORD_LOSE, EC_WORD_QUES
@@ -2374,8 +2374,8 @@ gUnknown_847E5CC::
 	.byte 255 @ friendship
 
 	.string "NATALIA$", 11
-	.byte FACILITY_CLASS_AROMA_LADY_2, 0x01, 0x00
+	.byte FACILITY_CLASS_AROMA_LADY_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_THIS, EC_MOVE(SWEET_SCENT), EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_IT, EC_WORD_QUES
 	.2byte EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_NICE, EC_WORD_QUES, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_THAT, EC_WORD_WASN_T, EC_WORD_GOOD, EC_WORD_QUES, 0xFFFF, 0xFFFF
@@ -2454,8 +2454,8 @@ gUnknown_847E5CC::
 	.byte 255 @ friendship
 
 	.string "KATHLEEN$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07, 0x00
+	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07
-
+	.align 1
 	.2byte EC_WORD_TOO, EC_WORD_BAD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU
 	.2byte EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_HARD, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_ELLIPSIS
@@ -2539,8 +2539,8 @@ gUnknown_847E5CC::
 gUnknown_847E9AC::
 	.byte 0x11, 0x08, 0x00, 0x03
 	.string "BRADEN$", 11
-	.byte FACILITY_CLASS_SWIMMER_MALE_2, 0x01, 0x00
+	.byte FACILITY_CLASS_SWIMMER_MALE_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_PRETTY, EC_WORD_HAPPY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_TOUGHNESS
 	.2byte EC_WORD_WROOOAAR_EXCL, 0xFFFF, EC_WORD_SERIOUSLY, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES
 	.2byte EC_WORD_YOU, EC_WORD_SHOCKED, EC_WORD_ME, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HAPPINESS
@@ -2626,8 +2626,8 @@ gUnknown_847E9AC::
 gUnknown_847ED8C::
 	.byte 0x12, 0x08, 0x00, 0x0a
 	.string "ALLYSON$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07, 0x00
+	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_ABOUT, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_TODAY
 	.2byte EC_WORD_YES, EC_WORD_EXCL_EXCL, EC_WORD_I, EC_WORD_ADORE, EC_WORD_MYSELF, EC_WORD_TODAY
 	.2byte EC_WORD_I_WAS, EC_WORD_CONFUSED, EC_WORD_ABOUT, EC_WORD_THINGS, EC_WORD_I, EC_WORD_THINK
@@ -2713,8 +2713,8 @@ gUnknown_847ED8C::
 gUnknown_847F16C::
 	.byte 0x13, 0x08, 0x00, 0x0e
 	.string "ALBERTO$", 11
-	.byte FACILITY_CLASS_SAILOR_2, 0x05, 0x00
+	.byte FACILITY_CLASS_SAILOR_2, 0x05
-
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_GET, EC_WORD_WITH, EC_WORD_IT, EC_WORD_RIGHT, EC_WORD_AWAY
 	.2byte EC_WORD_YO, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_NOW, EC_WORD_EH_QUES
 	.2byte EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_OVER, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SURRENDER
@@ -2800,8 +2800,8 @@ gUnknown_847F16C::
 gUnknown_847F54C::
 	.byte 0x14, 0x08, 0x01, 0x0c
 	.string "KAT & KIPP$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04, 0x00
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_MY, EC_WORD_BEST
 	.2byte EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO, EC_WORD_MY, EC_WORD_AWESOME, EC_WORD_BROTHER
 	.2byte EC_WORD_SIGH, EC_WORD_ELLIPSIS, EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_IT, EC_WORD_GOES
@@ -2880,8 +2880,8 @@ gUnknown_847F54C::
 	.byte 255 @ friendship
 
 	.string "KAT & KIPP$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04, 0x00
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04
-
+	.align 1
 	.2byte EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE, EC_WORD_NEVER, EC_WORD_LOSE, EC_WORD_EXCL
 	.2byte EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE_RE, EC_WORD_TOO_STRONG, EC_WORD_TO, EC_WORD_LOSE
 	.2byte EC_WORD_WHAT, EC_WORD_HUH_QUES, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_JOKING, EC_WORD_QUES
@@ -2966,8 +2966,8 @@ gUnknown_847F54C::
 gUnknown_847F92C::
 	.byte 0x15, 0x08, 0x01, 0x08
 	.string "GEB&MEGAN$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
-
+	.align 1
 	.2byte EC_WORD_YOU_RE, EC_WORD_OUR, EC_WORD_OPPONENT, EC_WORD_QUES, EC_WORD_PUSHOVER, EC_WORD_HAHAHA
 	.2byte EC_WORD_HAHAHA, EC_WORD_SORRY, EC_WORD_MY, EC_WORD_FRIEND, EC_WORD_TOUGH, EC_WORD_LOSS
 	.2byte EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_FRIEND, EC_WORD_QUES
@@ -3046,8 +3046,8 @@ gUnknown_847F92C::
 	.byte 255 @ friendship
 
 	.string "GEB&MEGAN$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
-
+	.align 1
 	.2byte EC_WORD_YOU_RE, EC_WORD_OUR, EC_WORD_FOE, EC_WORD_QUES, EC_WORD_GIGGLE, EC_WORD_ELLIPSIS
 	.2byte EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, 0xFFFF
 	.2byte EC_WORD_MY, EC_WORD_WORD, EC_WORD_THIS, EC_WORD_IS, EC_WORD_JUST, EC_WORD_INCREDIBLE
@@ -3132,8 +3132,8 @@ gUnknown_847F92C::
 gUnknown_847FD0C::
 	.byte 0x16, 0x08, 0x01, 0x05
 	.string "LISA&LEAH$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x01, 0x00
+	.byte FACILITY_CLASS_TWINS_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_ABSOLUTELY, EC_WORD_WE_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL
 	.2byte EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
@@ -3212,8 +3212,8 @@ gUnknown_847FD0C::
 	.byte 255 @ friendship
 
 	.string "LISA&LEAH$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x01, 0x00
+	.byte FACILITY_CLASS_TWINS_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_CAN, EC_WORD_WE, EC_WORD_WIN, EC_WORD_QUES, EC_WORD_IT_S, EC_WORD_EXCITING
 	.2byte EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
@@ -3292,8 +3292,8 @@ gUnknown_847FD0C::
 	.byte 255 @ friendship
 
 	.string "$", 11
-	.byte FACILITY_CLASS_AQUA_LEADER, 0x01, 0x00
+	.byte FACILITY_CLASS_AQUA_LEADER, 0x01
-
+	.align 1
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -3377,8 +3377,8 @@ gUnknown_847FD0C::
 gUnknown_84800EC::
 	.byte 0x17, 0x08, 0x02, 0x01
 	.string "PRISCILLA$", 11
-	.byte FACILITY_CLASS_TUBER_3, 0x01, 0x00
+	.byte FACILITY_CLASS_TUBER_3, 0x01
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_A_LITTLE, EC_WORD_POKEMON, EC_WORD_GIRL, EC_WORD_HERE_I_COME, EC_WORD_EXCL
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DID, EC_WORD_I, EC_WORD_WIN, EC_WORD_QUES
 	.2byte EC_WORD_OH_DEAR, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_COULDN_T, EC_WORD_WIN, EC_WORD_ELLIPSIS
@@ -3457,8 +3457,8 @@ gUnknown_84800EC::
 	.byte 0 @ friendship
 
 	.string "CHARLOTTE$", 11
-	.byte FACILITY_CLASS_LADY_2, 0x01, 0x00
+	.byte FACILITY_CLASS_LADY_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_HELLO, EC_WORD_THERE, EC_WORD_I_AM, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_LADY
 	.2byte EC_WORD_OH, EC_WORD_MY, EC_WORD_MY, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_SORRY
 	.2byte EC_WORD_YOU_RE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_LADY
@@ -3537,8 +3537,8 @@ gUnknown_84800EC::
 	.byte 255 @ friendship
 
 	.string "SHANIA$", 11
-	.byte FACILITY_CLASS_SWIMMER_FEMALE_2, 0x01, 0x00
+	.byte FACILITY_CLASS_SWIMMER_FEMALE_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_A, EC_WORD_POKEMON, EC_WORD_HEROINE, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM
 	.2byte EC_WORD_AHAHA, EC_WORD_NO, EC_WORD_WAY, EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_SERIOUSLY
 	.2byte EC_WORD_WHY, EC_WORD_QUES_EXCL, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_LIE
@@ -3622,8 +3622,8 @@ gUnknown_84800EC::
 gUnknown_84804CC::
 	.byte 0x18, 0x08, 0x02, 0x0d
 	.string "BRENNAN$", 11
-	.byte FACILITY_CLASS_SAILOR_2, 0x01, 0x00
+	.byte FACILITY_CLASS_SAILOR_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_TAKE, EC_WORD_THINGS, EC_WORD_EASY, EC_WORD_ELLIPSIS, EC_WORD_THAT_S, EC_WORD_IMPORTANT
 	.2byte EC_WORD_YOU, EC_WORD_LOSE, EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_EXCL
 	.2byte EC_WORD_OOPS, EC_WORD_YOU, EC_WORD_GOT, EC_WORD_AN, EC_WORD_EASY, EC_WORD_WIN
@@ -3702,8 +3702,8 @@ gUnknown_84804CC::
 	.byte 255 @ friendship
 
 	.string "KADEN$", 11
-	.byte FACILITY_CLASS_FISHERMAN_2, 0x01, 0x00
+	.byte FACILITY_CLASS_FISHERMAN_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_FISHING, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_IS, EC_WORD_FANTASTIC
 	.2byte EC_WORD_MY, EC_WORD_FANTASTIC, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_WINS, EC_WORD_OUT
 	.2byte EC_WORD_UH_OH, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SEE, EC_WORD_I, EC_WORD_LOST
@@ -3782,8 +3782,8 @@ gUnknown_84804CC::
 	.byte 255 @ friendship
 
 	.string "EMANUEL$", 11
-	.byte FACILITY_CLASS_GENTLEMAN_2, 0x01, 0x00
+	.byte FACILITY_CLASS_GENTLEMAN_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_HMM, EC_WORD_QUES, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SKILLED, EC_WORD_QUES
 	.2byte EC_WORD_I, EC_WORD_SEE, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_RIGHT, EC_WORD_ELLIPSIS
 	.2byte EC_WORD_YOU, EC_WORD_TRULY, EC_WORD_ARE, EC_WORD_A, EC_WORD_MASTER, EC_WORD_TRAINER
@@ -3867,8 +3867,8 @@ gUnknown_84804CC::
 gUnknown_84808AC::
 	.byte 0x19, 0x08, 0x00, 0x0c
 	.string "JARRETT$", 11
-	.byte FACILITY_CLASS_JUGGLER, 0x02, 0x00
+	.byte FACILITY_CLASS_JUGGLER, 0x02
-
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_AN, EC_MOVE2(EXPLOSION), EC_WORD_PARTY, EC_WORD_EXCL
 	.2byte EC_WORD_CONGRATS, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS, EC_WORD_PARTY, EC_WORD_KID
 	.2byte EC_WORD_NICE, EC_MOVE(SELF_DESTRUCT), EC_WORD_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_PERFECT
@@ -3954,8 +3954,8 @@ gUnknown_84808AC::
 gUnknown_8480C8C::
 	.byte 0x1a, 0x08, 0x00, 0x0d
 	.string "OWEN$", 11
-	.byte FACILITY_CLASS_SUPER_NERD, 0x02, 0x00
+	.byte FACILITY_CLASS_SUPER_NERD, 0x02
-
+	.align 1
 	.2byte EC_WORD_HERE_IT_IS, EC_MOVE2(THUNDER_WAVE), EC_WORD_DON_T, EC_MOVE2(WRAP), EC_WORD_ME, EC_WORD_EXCL
 	.2byte EC_WORD_ACCEPT, EC_WORD_MY, EC_MOVE2(PRESENT), EC_WORD_OF, EC_MOVE2(THUNDER_WAVE), EC_WORD_EXCL
 	.2byte EC_MOVE2(WRAP), EC_MOVE(BIND), EC_WORD_ELECTRIC, EC_MOVE2(WHIRLWIND), EC_WORD_SPIRALING, EC_WORD_AROUND
@@ -4041,8 +4041,8 @@ gUnknown_8480C8C::
 gUnknown_848106C::
 	.byte 0x1b, 0x08, 0x00, 0x01
 	.string "LORENZO$", 11
-	.byte FACILITY_CLASS_PSYCHIC_3, 0x01, 0x00
+	.byte FACILITY_CLASS_PSYCHIC_3, 0x01
-
+	.align 1
 	.2byte EC_WORD_THIS, EC_WORD_POWER, EC_WORD_IS, EC_WORD_NOW, EC_WORD_COMPLETE, EC_WORD_EXCL
 	.2byte EC_WORD_NO, EC_WORD_KEEN_EYE, EC_WORD_CAN, EC_WORD_STOP, EC_WORD_MY, EC_WORD_POWER
 	.2byte EC_WORD_HERE_IT_IS, EC_WORD_EXCL, EC_MOVE(KINESIS), EC_WORD_EXCL, EC_WORD_ELLIPSIS, EC_WORD_WHAT
@@ -4128,8 +4128,8 @@ gUnknown_848106C::
 gUnknown_848144C::
 	.byte 0x1c, 0x08, 0x01, 0x0b
 	.string "NIA & CARL$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x04, 0x00
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x04
-
+	.align 1
 	.2byte EC_WORD_HERE_GOES, EC_WORD_MY, EC_WORD_DIGITAL, EC_WORD_ROMANTIC, EC_WORD_HERO, EC_WORD_STRATEGY
 	.2byte EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_DIGITAL, EC_WORD_HYPER, EC_WORD_MODE, EC_WORD_POWER
 	.2byte EC_WORD_MY, EC_WORD_PERFECT, EC_WORD_STRATEGY, EC_WORD_WAS, EC_MOVE2(BEAT_UP), EC_WORD_QUES
@@ -4208,8 +4208,8 @@ gUnknown_848144C::
 	.byte 255 @ friendship
 
 	.string "NIA & CARL$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x04, 0x00
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x04
-
+	.align 1
 	.2byte EC_WORD_MASTER, EC_WORD_COMPLETE, EC_WORD_FASHION, EC_WORD_SYSTEM, EC_WORD_START, EC_WORD_EXCL
 	.2byte EC_WORD_THAT_S_IT_EXCL, EC_WORD_THE, EC_WORD_POWER, EC_WORD_OF, EC_WORD_OUR, EC_WORD_SYSTEM
 	.2byte EC_WORD_OKAY, EC_WORD_EXCL, EC_MOVE(THUNDERBOLT), EC_WORD_RUN_AWAY, EC_WORD_SYSTEM, EC_WORD_START
@@ -4294,8 +4294,8 @@ gUnknown_848144C::
 gUnknown_848182C::
 	.byte 0x1d, 0x08, 0x01, 0x03
 	.string "AXE & REN$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02, 0x00
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02
-
+	.align 1
 	.2byte EC_WORD_IT_S, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_WORD_AWFULLY, EC_WORD_COLD
 	.2byte EC_WORD_THAT_S, EC_WORD_THAT, EC_WORD_MAN, EC_WORD_I_AM, EC_WORD_COLD, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_IN, EC_WORD_THIS, EC_MOVE(SHEER_COLD), EC_WORD_ELLIPSIS
@@ -4374,8 +4374,8 @@ gUnknown_848182C::
 	.byte 255 @ friendship
 
 	.string "AXE & REN$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02, 0x00
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02
-
+	.align 1
 	.2byte EC_WORD_OUR, EC_WORD_SWIFT_SWIM, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_COLD
 	.2byte EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_HOT
 	.2byte EC_WORD_I_AM, EC_WORD_HUNGRY, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_HOT, EC_WORD_EATS
@@ -4460,8 +4460,8 @@ gUnknown_848182C::
 gUnknown_8481C0C::
 	.byte 0x1e, 0x08, 0x01, 0x05
 	.string "KATI & GEB$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02, 0x00
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02
-
+	.align 1
 	.2byte EC_WORD_WELCOME, EC_WORD_TO, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_MOVE2(THUNDER_WAVE), EC_MOVE(SANDSTORM)
 	.2byte EC_WORD_LALALA, EC_WORD_LALALA, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LALALA, EC_WORD_LIFE
 	.2byte EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_MY, EC_MOVE2(FRUSTRATION)
@@ -4540,8 +4540,8 @@ gUnknown_8481C0C::
 	.byte 255 @ friendship
 
 	.string "KATI & GEB$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02, 0x00
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_PLUS, EC_WORD_YOU_RE, EC_WORD_MINUS, EC_WORD_LOVEY_DOVEY, EC_WORD_MAGNET_PULL
 	.2byte EC_WORD_DON_T, EC_WORD_STOP, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LOCOMOTIVE, EC_WORD_EXCL
 	.2byte EC_WORD_HIS, EC_WORD_CRY, EC_WORD_HAS, EC_WORD_CUTE_CHARM, EC_WORD_TOO, EC_WORD_EXCL
@@ -4626,8 +4626,8 @@ gUnknown_8481C0C::
 gUnknown_8481FEC::
 	.byte 0x1f, 0x08, 0x02, 0x07
 	.string "BEN$", 11
-	.byte FACILITY_CLASS_ROCKER, 0x01, 0x00
+	.byte FACILITY_CLASS_ROCKER, 0x01
-
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_WORD_STATIC, EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_YES, EC_WORD_IT, EC_WORD_IS
 	.2byte EC_WORD_ELECTRIC, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_DIGITAL, EC_WORD_TELEVISION, EC_WORD_I_AM
@@ -4706,8 +4706,8 @@ gUnknown_8481FEC::
 	.byte 255 @ friendship
 
 	.string "CAMDEN$", 11
-	.byte FACILITY_CLASS_ENGINEER, 0x01, 0x00
+	.byte FACILITY_CLASS_ENGINEER, 0x01
-
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_WORD_A, EC_MOVE(THUNDERBOLT), EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_TOO, EC_WORD_EXCL
 	.2byte EC_WORD_ELECTRIC, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_WIRELESS, EC_WORD_LINK
@@ -4786,8 +4786,8 @@ gUnknown_8481FEC::
 	.byte 255 @ friendship
 
 	.string "ZACKERY$", 11
-	.byte FACILITY_CLASS_SCIENTIST, 0x01, 0x00
+	.byte FACILITY_CLASS_SCIENTIST, 0x01
-
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_MOVE2(THUNDER_SHOCK), EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_QUES
 	.2byte EC_WORD_ELECTRIC, EC_WORD_EXCL, EC_MOVE2(FLASH), EC_MOVE2(FLASH), EC_MOVE2(FLASH), EC_WORD_EXCL_EXCL
@@ -4871,8 +4871,8 @@ gUnknown_8481FEC::
 gUnknown_84823CC::
 	.byte 0x20, 0x08, 0x02, 0x0e
 	.string "MAURA$", 11
-	.byte FACILITY_CLASS_BEAUTY_2, 0x02, 0x00
+	.byte FACILITY_CLASS_BEAUTY_2, 0x02
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_THE, EC_WORD_GROUP, EC_WORD_LEADER, EC_WORD_EXCL, 0xFFFF
 	.2byte EC_WORD_WHAT, EC_WORD_AM, EC_WORD_I, EC_WORD_LEADER, EC_WORD_OF, EC_WORD_QUES
 	.2byte EC_WORD_I_AM, EC_WORD_NO, EC_WORD_LEADER, EC_WORD_IT_S, EC_WORD_A_LITTLE, EC_WORD_LIE
@@ -4951,8 +4951,8 @@ gUnknown_84823CC::
 	.byte 255 @ friendship
 
 	.string "MIKAELA$", 11
-	.byte FACILITY_CLASS_LASS_2, 0x01, 0x00
+	.byte FACILITY_CLASS_LASS_2, 0x01
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_THE, EC_WORD_NO_1, EC_WORD_TRAINER, EC_WORD_HERE
 	.2byte EC_WORD_NEVER, EC_WORD_SAID, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_AT
 	.2byte EC_WORD_NEXT, EC_WORD_TIME, EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_OVERWHELMING
@@ -5031,8 +5031,8 @@ gUnknown_84823CC::
 	.byte 255 @ friendship
 
 	.string "FLINT$", 11
-	.byte FACILITY_CLASS_ENGINEER, 0x04, 0x00
+	.byte FACILITY_CLASS_ENGINEER, 0x04
-
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(MILK_DRINK), EC_WORD_WORLD, EC_WORD_LEADER, EC_WORD_EXCL
 	.2byte EC_WORD_I_VE, EC_WORD_WON, EC_WORD_THIS, EC_MOVE2(MILK_DRINK), EC_WORD_MATCH, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_CAN_T, EC_WORD_DRINK, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_DRINKS

include/battle_2.h

@@ -43,6 +43,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
 void RunBattleScriptCommands_PopCallbacksStack(void);
 void RunBattleScriptCommands(void);
 bool8 TryRunFromBattle(u8 bank);
+void sub_800FD9C(void);
 
 extern const u8 gStatusConditionString_PoisonJpn[8];
 extern const u8 gStatusConditionString_SleepJpn[8];

include/battle_setup.h

@@ -11,11 +11,12 @@ void BattleSetup_StartWildBattle(void);
 void BattleSetup_StartRoamerBattle(void);
 
 u8 HasTrainerAlreadyBeenFought(u16);
-void trainer_flag_set(u16);
+void SetTrainerFlag(u16);
-void trainer_flag_clear(u16);
+void ClearTrainerFlag(u16);
 void BattleSetup_StartTrainerBattle(void);
 u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 u8 *BattleSetup_GetTrainerPostBattleScript(void);
 void sub_80803FC(void);
+u8 sub_8080060(void);
 
 #endif // GUARD_BATTLE_SETUP_H

include/battle_transition.h

@@ -3,6 +3,8 @@
 
 #include "global.h"
 
-void sub_8149DFC(u8 a1);
+void sub_8149DFC(u8 a0);
+bool8 sub_80D08F8(void);
+void sub_80D08B8(u8 a0);
 
 #endif // GUARD_BATTLE_TRANSITION_H

include/event_data.h

@@ -59,4 +59,7 @@ extern u16 gSpecialVar_0x8014;
 extern u16 gSpecialVar_Result;
 extern u16 gSpecialVar_0x8004;
 
+extern u16 gUnknown_20370DA;
+extern u16 gUnknown_20370DC;
+
 #endif // GUARD_EVENT_DATA_H

include/field_fadetransition.h

@@ -3,14 +3,14 @@
 
 #include "global.h"
 
-void sub_80AF734(void);
-void sp13E_warp_to_last_warp(void);
-void sub_80AF7D0(void);
-void sp13F_fall_to_last_warp(void);
-
-void sub_80AF848(void);
-void sub_80AF87C(void);
-void sub_807DF64(void);
 void sub_807DF7C(void);
+void DoWarp(void);
+void DoDiveWarp(void);
+void DoDoorWarp(void);
+
+void DoFallWarp(void);
+void sub_807E59C(void);
+void sub_807E500(void);
+void sub_807DF64(void);
 
 #endif // GUARD_FIELD_FADETRANSITION_H

include/field_map_obj.h

@@ -35,7 +35,7 @@ u8 sub_808D4F4(void);
 void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
 void npc_load_two_palettes__no_record(u16, u8);
 void npc_load_two_palettes__and_record(u16, u8);
-void sub_808EBA8(u8, u8, u8, s16, s16);
+void sub_805F7C4(u8, u8, u8, s16, s16);
 void pal_patch_for_npc(u16, u8);
 void sub_808E16C(s16, s16);
 void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
@@ -59,13 +59,13 @@ const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
 void gpu_pal_allocator_reset__manage_upper_four(void);
 void sub_808E82C(u8, u8, u8, s16, s16);
-void sub_808E7E4(u8, u8, u8);
+void sub_805F400(u8, u8, u8);
-void sub_808E78C(u8, u8, u8, u8);
+void sub_805F3A8(u8, u8, u8, u8);
 void sub_808E75C(s16, s16);
 void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
 void npc_coords_shift(struct MapObject *, s16, s16);
 void sub_808EB08(struct MapObject *, s16, s16);
-void sub_808F254(u8, u8, u8);
+void sub_805FE94(u8, u8, u8);
 void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
 u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
 u8 GetOppositeDirection(u8);

include/field_map_obj_helpers.h

@@ -4,6 +4,6 @@
 #include "global.h"
 
 void UnfreezeMapObjects(void);
-void sub_8097B78(u8, u8);
+void sub_8069058(u8, u8);
 
 #endif

include/field_player_avatar.h

@@ -20,5 +20,6 @@ u8 sub_805C808(u8);
 void SetPlayerAvatarStateMask(u8 mask);
 void sub_805D9C4(struct Sprite *sprite);
 void sub_805D154(u8 direction);
+void sub_805DAE4(u8 direction);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H

include/field_screen_effect.h

@@ -4,7 +4,7 @@
 #include "global.h"
 
 void sub_80AF79C(void);
-void sub_80B009C(u8);
+void sub_807F028(u8);
 void sub_80B0244(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H

include/field_specials.h

@@ -4,6 +4,7 @@
 #include "global.h"
 
 u8 GetLeadMonIndex(void);
+u8 CountDigits(u16 number);
 void TV_PrintIntToStringVar(u8, int);
 
 #endif // GUARD_FIELD_SPECIALS_H

include/field_weather.h

@@ -10,6 +10,7 @@ u8 GetSav1Weather(void);
 void sub_80AEDBC(void);
 
 void DoCurrentWeather(void);
+void SetSav1WeatherFromCurrMapHeader(void);
 void sub_807B0C4(u16 *, u16 *, u32);
 
 #endif // GUARD_WEATHER_H

include/global.h

@@ -709,6 +709,21 @@ struct MEventBuffers
     /*0x344 0x3464*/ u32 unk_344[2][5];
 }; // 0x36C 0x348C
 
+struct TrainerTowerLog
+{
+    u32 unk0;
+    u32 unk4;
+    u8 unk8;
+    u8 unk9;
+    u8 unkA_0:1;
+    u8 unkA_1:1;
+    u8 unkA_2:1;
+    u8 unkA_3:1;
+    u8 unkA_4:1;
+    u8 unkA_5:1;
+    u8 unkA_6:2;
+};
+
 struct SaveBlock1
 {
     /*0x0000*/ struct Coords16 pos;
@@ -766,7 +781,7 @@ struct SaveBlock1
     /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
     /*0x3A94*/ u8 filler3A94[0x2A0];
     /*0x3D34*/ u32 unkArrayIdx;
-    /*0x3D38*/ u32 unkArray[4][3];
+    /*0x3D38*/ struct TrainerTowerLog unkArray[4];
 };
 
 extern struct SaveBlock1* gSaveBlock1Ptr;

include/item.h

@@ -62,6 +62,8 @@ u8 ItemId_GetSecondaryId(u16 itemId);
 u16 itemid_get_market_price(u16 itemId);
 void sub_809A2DC(void);
 void sub_809A2A4(void);
-void sub_8099E90(u16, u8 *);
+void CopyItemName(u16, u8 *);
+void sub_809A824(u16 itemId);
+bool8 AddBagItem(u16 itemId, u16 amount);
 
 #endif // ITEM_H

include/main.h

@@ -66,6 +66,7 @@ void DoSoftReset(void);
 void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
 void SetVBlankCounter1Ptr(u32 *ptr);
+void DisableVBlankCounter1(void);
 
 extern const char RomHeaderGameCode[4];
 extern const char RomHeaderSoftwareVersion;

include/map_obj_lock.h

@@ -3,9 +3,9 @@
 
 #include "global.h"
 
-bool8 sub_80983C4(void);
+bool8 sub_8069590(void);
 void ScriptFreezeMapObjects(void);
-bool8 sub_809847C(void);
+bool8 sub_8069648(void);
 void LockSelectedMapObject(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);

include/map_preview_screen.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_MAP_PREVIEW_SCREEN_H
+#define GUARD_MAP_PREVIEW_SCREEN_H
+
+void sub_80F85BC(u16 a0);
+
+#endif //GUARD_MAP_PREVIEW_SCREEN_H

include/new_menu_helpers.h

@@ -19,5 +19,8 @@ void sub_80F6F54(u8, u8);
 u8 sub_80F78A8(void);
 void sub_80F6E9C(void);
 void sub_80F6EE4(u8 windowId, bool8 transfer);
+void sub_80F7974(const u8 *);
+u8 GetStartMenuWindowId(void);
+void sub_80F7998(void);
 
 #endif // GUARD_NEW_MENU_HELPERS_H

include/overworld.h

@@ -35,7 +35,10 @@ void Overworld_SetMapObjTemplateMovementType(u8, u8);
 void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 
 void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId);
-void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetDynamicWarpWithCoords(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void Overworld_SetHealLocationWarp(u8);
 void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void sub_8084E2C(s8, s8, s8, s8, s8);
@@ -81,11 +84,17 @@ void sub_8055DC4(void);
 
 u8 sav1_map_get_name(void);
 
+void SetCurrentMapLayout(u16 mapDataId);
+void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
+
+void ResetInitialPlayerAvatarState(void);
 void sub_8055D40(u16 mapDataId);
+void sub_80563F0(void);
 
 extern u8 gUnknown_2031DD8;
 extern u8 gUnknown_2036E28;
 
 extern bool8 (* gUnknown_3005024)(void);
+void SetLastHealLocationWarp(u8 healLocaionId);
 
 #endif //GUARD_ROM4_H

include/party_menu.h

@@ -12,7 +12,7 @@ enum {
     AILMENT_BRN
 };
 
-bool8 pokemon_has_move(struct Pokemon *, u16);
+bool8 MonKnowsMove(struct Pokemon *, u16);
 void sub_81B58A8(void);
 void DoWallyTutorialBagMenu(void);
 u8 pokemon_ailments_get_primary(u32 status);

include/pokemon.h

@@ -670,4 +670,6 @@ void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry,
 void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
 void BattleAnimateBackSprite(struct Sprite* sprite, u16 species);
 
+void PlayMapChosenOrBattleBGM(u16 songId);
+
 #endif // GUARD_POKEMON_H

include/pokemon_storage_system.h

@@ -12,5 +12,6 @@ void SetBoxMonNickFromAnyBox(u8 boxId, u8 monPosition, u8 * newNick);
 void CompactPartySlots(void);
 u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
 void sub_808BCB4(u8 boxId, u8 monPosition);
+u8 * GetBoxNamePtr(u8 boxId);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H

include/quest_log.h

@@ -21,5 +21,10 @@ extern struct UnkStruct_203AE98 * gUnknown_3005E94;
 
 void sub_8112720(u8);
 void sub_8113550(u16, const u16 *);
+void sub_8115748(u16);
+u8 sub_8112CAC(void);
+bool8 sub_81119D4(void (*func)(void));
+
+extern u8 gUnknown_203ADFA;
 
 #endif //GUARD_QUEST_LOG_H

include/script.h

@@ -65,5 +65,14 @@ void sub_80992A0(u8 *script, u16 scriptSize);
 bool32 sub_8069DFC(void);
 void sub_8069EA4(u8 * script, u16 scriptSize);
 u8 * sub_8069E48(void);
+void sub_8069998(u8 var);
+void sub_80699F8(void);
+void sub_8069964(void);
+void sub_80699A4(void);
+void sub_8069970(void);
+void sub_8069A20(void);
+void sub_8069A2C(void);
+
+extern const u8 *gRAMScriptPtr;
 
 #endif // GUARD_SCRIPT_H

include/script_menu.h

@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-extern const u8 *const gUnknown_0858BAF0[9];
+extern const u8 *const gStdStringPtrs[9];
 
 bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4);
 bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
@@ -11,5 +11,6 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
 bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
 bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
 bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
+void sub_809D6D4(void);
 
 #endif //GUARD_SCRIPT_MENU_H

include/script_movement.h

@@ -5,6 +5,6 @@
 
 bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, const u8 *);
 bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8);
-void sub_80D338C(void);
+void sub_80974D8(void);
 
 #endif // GUARD_SCRIPT_MOVEMENT_H

include/script_pokemon_util_80A0058.h

@@ -0,0 +1,8 @@
+#ifndef GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
+#define GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
+
+bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3);
+bool8 ScriptGiveEgg(u16 species);
+void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
+
+#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H

include/sound.h

@@ -31,6 +31,7 @@ void PlayCry3(u16 species, s8 pan, u8 mode);
 void PlayCry4(u16 species, s8 pan, u8 mode);
 void PlayCry5(u16 species, u8 mode);
 void PlayCry6(u16 species, s8 pan, u8 mode);
+void PlayCry7(u16 species, u8 mode);
 void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode);
 bool8 IsCryFinished(void);
 void StopCryAndClearCrySongs(void);

ld_script.txt

@@ -103,7 +103,7 @@ SECTIONS {
         asm/map_obj_lock.o(.text);
         asm/text_window_graphics.o(.text);
         src/script.o(.text);
-        asm/scrcmd.o(.text);
+        src/scrcmd.o(.text);
         asm/field_control_avatar.o(.text);
         asm/event_data.o(.text);
         asm/coord_event_weather.o(.text);
@@ -370,6 +370,8 @@ SECTIONS {
         src/metatile_behavior.o(.rodata);
         data/metatile_behavior.o(.rodata);
         data/data_835B488.o(.rodata);
+        src/scrcmd.o(.rodata);
+        data/data_835B488.o(.rodata.83A72A0);
         src/battle_ai_script_commands.o(.rodata);
         data/data_83F5738.o(.rodata);
         src/save.o(.rodata);

src/load_save.c

@@ -287,7 +287,7 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey)
     int i;
 
     for(i = 0; i < 4; i++)
-        ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->unkArray[i][1], encryptionKey);
+        ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->unkArray[i].unk4, encryptionKey);
 
     sub_8054F38(encryptionKey);
     ApplyNewEncryptionKeyToBagItems_(encryptionKey);

src/quest_log.c

@@ -4312,7 +4312,7 @@ u16 * sub_8114C68(u16 * a0, const u16 * a1)
 const u16 * sub_8114C8C(const u16 * a0)
 {
     const u16 *r4 = sub_8113E88(28, a0);
-    sub_8099E90(r4[0], gStringVar1);
+    CopyItemName(r4[0], gStringVar1);
     StringExpandPlaceholders(gStringVar4, gUnknown_841A391);
     return r4 + 1;
 }
@@ -4329,7 +4329,7 @@ u16 * sub_8114CC0(u16 * a0, const u16 * a1)
 const u16 * sub_8114CE4(const u16 * a0)
 {
     const u16 *r4 = sub_8113E88(29, a0);
-    sub_8099E90(r4[0], gStringVar1);
+    CopyItemName(r4[0], gStringVar1);
     StringExpandPlaceholders(gStringVar4, gUnknown_841A3DA);
     return r4 + 1;
 }

src/script.c

@@ -19,7 +19,7 @@ enum
 };
 
 EWRAM_DATA u8 gUnknown_20370A0 = 0;
-EWRAM_DATA u8 *gUnknown_20370A4 = NULL;
+EWRAM_DATA const u8 *gRAMScriptPtr = NULL;
 
 // ewram bss
 /*IWRAM_DATA*/ static u8 sScriptContext1Status;
@@ -485,7 +485,7 @@ bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objec
 u8 *GetRamScript(u8 objectId, u8 *script)
 {
     struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
-    gUnknown_20370A4 = NULL;
+    gRAMScriptPtr = NULL;
     if (scriptData->magic != RAM_SCRIPT_MAGIC)
         return script;
     if (scriptData->mapGroup != gSaveBlock1Ptr->location.mapGroup)
@@ -501,7 +501,7 @@ u8 *GetRamScript(u8 objectId, u8 *script)
     }
     else
     {
-        gUnknown_20370A4 = script;
+        gRAMScriptPtr = script;
         return scriptData->script;
     }
 }

src/trainer_tower.c

@@ -1,5 +1,6 @@
 #include "global.h"
 #include "main.h"
+#include "task.h"
 #include "constants/flags.h"
 #include "constants/vars.h"
 #include "malloc.h"
@@ -11,7 +12,12 @@
 #include "cereader_tool.h"
 #include "easy_chat.h"
 #include "text.h"
+#include "battle_setup.h"
+#include "battle_transition.h"
+#include "battle.h"
+#include "battle_2.h"
 #include "overworld.h"
+#include "item.h"
 
 struct UnkStruct_8479D34
 {
@@ -28,7 +34,6 @@ struct UnkSubstruct_203F458_000C_004
     /* 0x000 */ u8 unk_000[11];
     /* 0x00B */ u8 unk_00B;
     /* 0x00C */ u8 unk_00C;
-    /* 0x00D */ u8 unk_00D;
     /* 0x00E */ u16 unk_00E[6];
     /* 0x01A */ u16 unk_01A[6];
     /* 0x026 */ u16 unk_026[6];
@@ -38,7 +43,8 @@ struct UnkSubstruct_203F458_000C_004
 
 struct UnkSubstruct_203F458_000C
 {
-    /* 0x000 */ u8 filler_000[2];
+    /* 0x000 */ u8 unk_000;
+    /* 0x000 */ u8 unk_001;
     /* 0x002 */ u8 unk_002;
     /* 0x003 */ u8 unk_003;
     /* 0x004 */ struct UnkSubstruct_203F458_000C_004 unk_004[3];
@@ -122,15 +128,19 @@ void sub_815E8CC(void);
 void sub_815E908(void);
 void sub_815E948(void);
 void sub_815E9C8(void);
+void sub_815E9FC(void);
 void sub_815EC0C(void);
+u32 sub_815EDDC(u32 *);
+void sub_815EDF4(u32 *, u32);
 
 extern const struct UnkStruct_8479D34 gUnknown_8479D34[15];
+extern const struct UnkStruct_8479ED8 gUnknown_8479ED8[83];
+extern const struct UnkStruct_847A024 gUnknown_847A024[10];
 extern void (*const gUnknown_847A230[])(void);
 extern const struct Unk_203F458_Header gUnknown_84827AC;
 extern const struct UnkSubstruct_203F458_000C *const gUnknown_84827B4[][8];
 extern const u16 gUnknown_847A284[8][3];
-extern const struct UnkStruct_8479ED8 gUnknown_8479ED8[83];
+extern const u16 gUnknown_847A2B4[];
-extern const struct UnkStruct_847A024 gUnknown_847A024[10];
 
 bool32 sub_815D7BC(void * dest, void * buffer)
 {
@@ -280,7 +290,7 @@ void sub_815DA54(void)
     gUnknown_203F45C->unk_3C = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002;
     gUnknown_203F45C->unk_3D = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_004[r10].unk_00B;
     gUnknown_203F45C->unk_3E = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_004[r10].unk_00C;
-    SetVBlankCounter1Ptr(gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx]);
+    SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
     sub_815DD2C();
 }
 
@@ -430,12 +440,12 @@ void sub_815DD44(void)
     if (gMapHeader.mapDataId - 0x129 > gUnknown_203F458->unk_0004.unk_0000.unk0)
     {
         gSpecialVar_Result = 3;
-        sub_8055D40(0x132);
+        SetCurrentMapLayout(0x132);
     }
     else
     {
         gSpecialVar_Result = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002;
-        sub_8055D40(gUnknown_847A284[gUnknown_203F458->unk_0000][gSpecialVar_Result]);
+        SetCurrentMapLayout(gUnknown_847A284[gUnknown_203F458->unk_0000][gSpecialVar_Result]);
         sub_815DDB0();
     }
 }
@@ -692,3 +702,159 @@ void sub_815DF54(void)
                 "_0815E064: .4byte gStringVar4");
 }
 #endif // NONMATCHING
+
+void sub_815E068(u8 battleType, u8 facilityClass)
+{
+    u16 r5 = FALSE;
+    s32 r4;
+    switch (battleType)
+    {
+        case 0:
+        case 2:
+            for (r4 = 0; r4 < NELEMS(gUnknown_8479ED8); r4++)
+            {
+                if (gUnknown_8479ED8[r4].unk1 == facilityClass)
+                    break;
+            }
+            if (r4 != NELEMS(gUnknown_8479ED8))
+                r5 = gUnknown_8479ED8[r4].unk2;
+            break;
+        case 1:
+            for (r4 = 0; r4 < NELEMS(gUnknown_847A024); r4++)
+            {
+                if (gUnknown_847A024[r4].unk2 == facilityClass)
+                    break;
+            }
+            if (r4 != NELEMS(gUnknown_847A024))
+            {
+                if (VarGet(VAR_0x4003))
+                    r5 = gUnknown_847A024[r4].unk4;
+                else
+                    r5 = gUnknown_847A024[r4].unk3;
+            }
+            break;
+    }
+    gUnknown_20370DC = gUnknown_20370DA;
+    gUnknown_20370DA = r5;
+}
+
+void sub_815E114(void)
+{
+    SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+}
+
+void sub_815E124(u8 taskId)
+{
+    if (sub_80D08F8() == TRUE)
+    {
+        gMain.savedCallback = sub_815E114;
+        sub_80563F0();
+        SetMainCallback2(sub_800FD9C);
+        DestroyTask(taskId);
+    }
+}
+
+void sub_815E160(void)
+{
+    gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_FACTORY;
+    if (gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002 == 1)
+        gBattleTypeFlags |= BATTLE_TYPE_DOUBLE;
+    gTrainerBattleOpponent_A = 0;
+    sub_815E9FC();
+    CreateTask(sub_815E124, 1);
+    PlayMapChosenOrBattleBGM(0);
+    sub_80D08B8(sub_8080060());
+}
+
+void sub_815E1C0(void)
+{
+    if (!gSpecialVar_0x8005)
+        gSpecialVar_Result = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002;
+}
+
+void sub_815E1F0(void)
+{
+    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8++;
+}
+
+void sub_815E218(void)
+{
+    u16 mapDataId = gMapHeader.mapDataId;
+    if (mapDataId - 0x12A == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapDataId - 0x129 <= gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_001)
+        gSpecialVar_Result = FALSE;
+    else
+        gSpecialVar_Result = TRUE;
+}
+
+void sub_815E28C(void)
+{
+    gSaveBlock1Ptr->unkArrayIdx = gSpecialVar_0x8005;
+    if (gSaveBlock1Ptr->unkArrayIdx >= NELEMS(gSaveBlock1Ptr->unkArray))
+        gSaveBlock1Ptr->unkArrayIdx = 0;
+    sub_815EC0C();
+    if (!sub_815D834())
+        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_5 = TRUE;
+    else
+        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_5 = FALSE;
+    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 = 0;
+    SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
+    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 = 0;
+    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2 = FALSE;
+    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1 = FALSE;
+}
+
+void sub_815E394(void)
+{
+    DisableVBlankCounter1();
+    gSpecialVar_Result = 0;
+    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2)
+        gSpecialVar_Result++;
+    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 && gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1)
+        gSpecialVar_Result++;
+    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2 = TRUE;
+}
+
+void sub_815E408(void)
+{
+    u16 itemId = gUnknown_847A2B4[gUnknown_203F458->unk_0004.unk_0008->unk_003];
+    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0)
+        gSpecialVar_Result = 2;
+    else if (AddBagItem(itemId, 1) == 1)
+    {
+        CopyItemName(itemId, gStringVar2);
+        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 = TRUE;
+        gSpecialVar_Result = 0;
+    }
+    else
+        gSpecialVar_Result = 1;
+}
+
+void sub_815E4B0(void)
+{
+    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1)
+        gSpecialVar_Result = 2;
+    else if (sub_815EDDC(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4) > gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0)
+    {
+        sub_815EDF4(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4, gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
+        gSpecialVar_Result = 0;
+    }
+    else
+        gSpecialVar_Result = 1;
+    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1 = TRUE;
+}
+
+void sub_815E56C(void)
+{
+    if (!gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2)
+    {
+        if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 >= 215999)
+            gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 = 215999;
+        else
+            SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
+    }
+}
+
+void sub_815E5C4(void)
+{
+    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_3 = 1;
+}

src/vs_seeker.c

@@ -65,7 +65,7 @@ struct VsSeekerStruct
 
 extern u16 gSpecialVar_LastTalked;
 extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT];
-extern u8 gUnknown_3005074;
+extern u8 gSelectedEventObject;
 
 // static declarations
 static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL;
@@ -1012,7 +1012,7 @@ void sub_810CB90(void)
                 sub_810CF54(&r4[r8]); // You are using this function incorrectly.  Please consult the manual.
                 sub_805FE7C(r4_2, gUnknown_8453F67[r4_2->mapobj_unk_18]);
                 gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0;
-                if (gUnknown_3005074 == sp0)
+                if (gSelectedEventObject == sp0)
                     r4_2->animPattern = gUnknown_8453F67[r4_2->mapobj_unk_18];
                 else
                     r4_2->animPattern = 0x08;

sym_common.txt

@@ -175,7 +175,7 @@ gUnknown_300506C: @ 300506C
 gUnknown_3005070: @ 3005070
 	.space 0x4
 
-gUnknown_3005074: @ 3005074
+gSelectedEventObject: @ 3005074
 	.space 0x4
 
 gUnknown_3005078: @ 3005078

sym_ewram.txt

@@ -633,29 +633,9 @@ gUnknown_203709C: @ 203709C
 	.space 0x4
 
 	.include "src/script.o"
+    .include "src/scrcmd.o"
 
-	.align 2
+    .align 2
-gUnknown_20370A8: @ 20370A8
-	.space 0x4
-
-gUnknown_20370AC: @ 20370AC
-	.space 0x2
-
-gUnknown_20370AE: @ 20370AE
-	.space 0x2
-
-gUnknown_20370B0: @ 20370B0
-	.space 0x2
-
-gUnknown_20370B2: @ 20370B2
-	.space 0x2
-
-gUnknown_20370B4: @ 20370B4
-	.space 0x2
-
-gUnknown_20370B6: @ 20370B6
-	.space 0x2
-
 gSpecialVar_0x8000: @ 20370B8
 	.space 0x2