Merge branch 'master' into pokemon_storage_system

277 files changed, 13316 insertions, 18729 deletions

diff --git a/asm/battle_2.s b/asm/battle_2.s
deleted file mode 100644
index 5a751ba55..000000000
--- a/asm/battle_2.s
+++ /dev/null
@@ -1,6434 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8012324
-sub_8012324: @ 8012324
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x1C
-	ldr r0, _08012340 @ =gBattleCommunication
-	movs r1, 0
-	strb r1, [r0, 0x4]
-	ldr r0, _08012344 @ =gActiveBank
-	strb r1, [r0]
-	ldr r0, _08012348 @ =gNoOfAllBanks
-	bl _08012F74
-	.align 2, 0
-_08012340: .4byte gBattleCommunication
-_08012344: .4byte gActiveBank
-_08012348: .4byte gNoOfAllBanks
-_0801234C:
-	ldr r4, _08012374 @ =gActiveBank
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _08012378 @ =gBattleCommunication
-	ldrb r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x6
-	bls _08012368
-	bl _08012F66
-_08012368:
-	lsls r0, 2
-	ldr r1, _0801237C @ =_08012380
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08012374: .4byte gActiveBank
-_08012378: .4byte gBattleCommunication
-_0801237C: .4byte _08012380
-	.align 2, 0
-_08012380:
-	.4byte _0801239C
-	.4byte _080124C8
-	.4byte _08012A28
-	.4byte _08012DA8
-	.4byte _08012E50
-	.4byte _08012E94
-	.4byte _08012F38
-_0801239C:
-	ldr r4, _08012434 @ =gSharedMem
-	ldr r0, _08012438 @ =gActiveBank
-	ldrb r0, [r0]
-	ldr r1, _0801243C @ =0x00016068
-	adds r0, r1
-	adds r0, r4
-	movs r1, 0x6
-	strb r1, [r0]
-	ldr r0, _08012440 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _080123F8
-	movs r1, 0x2
-	movs r0, 0x2
-	ands r0, r5
-	cmp r0, 0
-	beq _080123F8
-	eors r5, r1
-	adds r0, r5, 0
-	bl GetBankByPlayerAI
-	ldr r2, _08012444 @ =0x000160a6
-	adds r1, r4, r2
-	ldrb r1, [r1]
-	ldr r2, _08012448 @ =gBitTable
-	lsls r0, 24
-	lsrs r0, 22
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	bne _080123F8
-	ldr r4, _0801244C @ =gBattleCommunication
-	adds r0, r5, 0
-	bl GetBankByPlayerAI
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0x4
-	beq _080123F8
-	bl _08012F66
-_080123F8:
-	ldr r0, _08012434 @ =gSharedMem
-	ldr r3, _08012444 @ =0x000160a6
-	adds r0, r3
-	ldrb r3, [r0]
-	ldr r1, _08012448 @ =gBitTable
-	ldr r4, _08012438 @ =gActiveBank
-	ldrb r2, [r4]
-	lsls r0, r2, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ands r3, r0
-	cmp r3, 0
-	beq _08012468
-	ldr r0, _08012450 @ =gActionForBanks
-	adds r0, r2, r0
-	movs r1, 0xD
-	strb r1, [r0]
-	ldr r0, _08012440 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _08012454
-	ldr r0, _0801244C @ =gBattleCommunication
-	ldrb r1, [r4]
-	adds r1, r0
-	movs r0, 0x4
-	strb r0, [r1]
-	bl _08012F66
-	.align 2, 0
-_08012434: .4byte gSharedMem
-_08012438: .4byte gActiveBank
-_0801243C: .4byte 0x00016068
-_08012440: .4byte gBattleTypeFlags
-_08012444: .4byte 0x000160a6
-_08012448: .4byte gBitTable
-_0801244C: .4byte gBattleCommunication
-_08012450: .4byte gActionForBanks
-_08012454:
-	ldr r0, _08012464 @ =gBattleCommunication
-	ldrb r1, [r4]
-	adds r1, r0
-	movs r0, 0x3
-	strb r0, [r1]
-	bl _08012F66
-	.align 2, 0
-_08012464: .4byte gBattleCommunication
-_08012468:
-	ldr r1, _0801249C @ =gBattleMons
-	movs r0, 0x58
-	muls r0, r2
-	adds r1, 0x50
-	adds r0, r1
-	ldr r1, [r0]
-	movs r0, 0x80
-	lsls r0, 5
-	ands r0, r1
-	cmp r0, 0
-	bne _08012488
-	movs r0, 0x80
-	lsls r0, 15
-	ands r1, r0
-	cmp r1, 0
-	beq _080124A8
-_08012488:
-	ldr r0, _080124A0 @ =gActionForBanks
-	adds r0, r2, r0
-	strb r3, [r0]
-	ldr r1, _080124A4 @ =gBattleCommunication
-	ldrb r0, [r4]
-	adds r0, r1
-	movs r1, 0x3
-	strb r1, [r0]
-	bl _08012F66
-	.align 2, 0
-_0801249C: .4byte gBattleMons
-_080124A0: .4byte gActionForBanks
-_080124A4: .4byte gBattleCommunication
-_080124A8:
-	ldr r0, _080124C0 @ =gActionForBanks
-	ldrb r1, [r0]
-	ldr r0, _080124C4 @ =gBattleBufferB
-	ldrb r2, [r0, 0x1]
-	ldrb r0, [r0, 0x2]
-	lsls r0, 8
-	orrs r2, r0
-	movs r0, 0
-	bl Emitcmd18
-	bl _08012E32
-	.align 2, 0
-_080124C0: .4byte gActionForBanks
-_080124C4: .4byte gBattleBufferB
-_080124C8:
-	ldr r4, _08012520 @ =gBattleExecBuffer
-	ldr r1, _08012524 @ =gBitTable
-	ldr r3, _08012528 @ =gActiveBank
-	ldrb r5, [r3]
-	lsls r0, r5, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r0, r2, 4
-	movs r1, 0xF0
-	lsls r1, 24
-	orrs r0, r1
-	orrs r0, r2
-	lsls r1, r2, 8
-	orrs r0, r1
-	lsls r2, 12
-	orrs r0, r2
-	ldr r1, [r4]
-	ands r1, r0
-	mov r8, r3
-	cmp r1, 0
-	beq _080124F6
-	bl _08012F66
-_080124F6:
-	ldr r2, _0801252C @ =gActionForBanks
-	adds r2, r5, r2
-	ldr r1, _08012530 @ =gBattleBufferB
-	lsls r0, r5, 9
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	ldrb r0, [r3]
-	lsls r0, 9
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0xC
-	bls _08012514
-	b _08012968
-_08012514:
-	lsls r0, 2
-	ldr r1, _08012534 @ =_08012538
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08012520: .4byte gBattleExecBuffer
-_08012524: .4byte gBitTable
-_08012528: .4byte gActiveBank
-_0801252C: .4byte gActionForBanks
-_08012530: .4byte gBattleBufferB
-_08012534: .4byte _08012538
-	.align 2, 0
-_08012538:
-	.4byte _0801256C
-	.4byte _080126B4
-	.4byte _080126E0
-	.4byte _08012968
-	.4byte _08012968
-	.4byte _080128B0
-	.4byte _08012908
-	.4byte _08012968
-	.4byte _08012968
-	.4byte _08012968
-	.4byte _08012968
-	.4byte _08012968
-	.4byte _0801292C
-_0801256C:
-	bl AreAllMovesUnusable
-	lsls r0, 24
-	cmp r0, 0
-	beq _080125D0
-	ldr r0, _080125B4 @ =gBattleCommunication
-	ldr r2, _080125B8 @ =gActiveBank
-	ldrb r1, [r2]
-	adds r1, r0
-	movs r4, 0
-	movs r0, 0x5
-	strb r0, [r1]
-	ldr r3, _080125BC @ =gSharedMem
-	ldrb r0, [r2]
-	ldr r1, _080125C0 @ =0x00016060
-	adds r0, r1
-	adds r0, r3
-	strb r4, [r0]
-	ldrb r0, [r2]
-	ldr r4, _080125C4 @ =0x00016094
-	adds r0, r4
-	adds r0, r3
-	movs r1, 0x3
-	strb r1, [r0]
-	ldrb r1, [r2]
-	ldr r0, _080125C8 @ =0x00016010
-	adds r2, r1, r0
-	adds r2, r3
-	ldr r0, _080125CC @ =gBattleBufferB
-	lsls r1, 9
-	adds r0, 0x3
-	adds r1, r0
-	ldrb r0, [r1]
-	strb r0, [r2]
-	bl _08012F90
-	.align 2, 0
-_080125B4: .4byte gBattleCommunication
-_080125B8: .4byte gActiveBank
-_080125BC: .4byte gSharedMem
-_080125C0: .4byte 0x00016060
-_080125C4: .4byte 0x00016094
-_080125C8: .4byte 0x00016010
-_080125CC: .4byte gBattleBufferB
-_080125D0:
-	ldr r1, _080125FC @ =gDisableStructs
-	ldr r5, _08012600 @ =gActiveBank
-	ldrb r4, [r5]
-	lsls r0, r4, 3
-	subs r0, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrh r2, [r0, 0x6]
-	cmp r2, 0
-	beq _0801260C
-	ldr r1, _08012604 @ =gChosenMovesByBanks
-	lsls r0, r4, 1
-	adds r0, r1
-	strh r2, [r0]
-	ldr r1, _08012608 @ =gBattleCommunication
-	ldrb r0, [r5]
-	adds r0, r1
-	movs r1, 0x3
-	strb r1, [r0]
-	bl _08012F90
-	.align 2, 0
-_080125FC: .4byte gDisableStructs
-_08012600: .4byte gActiveBank
-_08012604: .4byte gChosenMovesByBanks
-_08012608: .4byte gBattleCommunication
-_0801260C:
-	add r2, sp, 0x4
-	ldr r3, _080126AC @ =gBattleMons
-	movs r1, 0x58
-	adds r0, r4, 0
-	muls r0, r1
-	adds r0, r3
-	ldrh r0, [r0]
-	strh r0, [r2, 0x10]
-	ldrb r0, [r5]
-	muls r0, r1
-	adds r0, r3
-	adds r0, 0x21
-	ldrb r0, [r0]
-	strb r0, [r2, 0x12]
-	ldrb r0, [r5]
-	muls r0, r1
-	adds r0, r3
-	adds r0, 0x22
-	ldrb r0, [r0]
-	strb r0, [r2, 0x13]
-	movs r4, 0
-	mov r1, sp
-	adds r1, 0xC
-	str r1, [sp, 0x18]
-	add r2, sp, 0x10
-	mov r10, r2
-	mov r8, r3
-	adds r7, r5, 0
-	movs r6, 0x58
-	movs r3, 0xC
-	add r3, r8
-	mov r9, r3
-	add r5, sp, 0x4
-_0801264E:
-	lsls r2, r4, 1
-	ldrb r0, [r7]
-	muls r0, r6
-	adds r0, r2, r0
-	add r0, r9
-	ldrh r0, [r0]
-	strh r0, [r5]
-	ldr r0, [sp, 0x18]
-	adds r3, r0, r4
-	ldrb r0, [r7]
-	muls r0, r6
-	adds r0, r4, r0
-	mov r1, r8
-	adds r1, 0x24
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r3]
-	ldrb r0, [r7]
-	adds r1, r0, 0
-	muls r1, r6
-	adds r2, r1
-	add r2, r9
-	ldrh r0, [r2]
-	add r1, r8
-	adds r1, 0x3B
-	ldrb r1, [r1]
-	lsls r2, r4, 24
-	lsrs r2, 24
-	bl CalculatePPWithBonus
-	mov r2, r10
-	adds r1, r2, r4
-	strb r0, [r1]
-	adds r5, 0x2
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _0801264E
-	ldr r0, _080126B0 @ =gBattleTypeFlags
-	ldrb r0, [r0]
-	movs r1, 0x1
-	ands r1, r0
-	movs r0, 0
-	movs r2, 0
-	add r3, sp, 0x4
-	bl Emitcmd20
-	b _0801289E
-	.align 2, 0
-_080126AC: .4byte gBattleMons
-_080126B0: .4byte gBattleTypeFlags
-_080126B4:
-	ldr r0, _080126D0 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	ldr r0, _080126D4 @ =0x00000902
-	ands r0, r1
-	cmp r0, 0
-	bne _080126C2
-	b _08012908
-_080126C2:
-	ldr r1, _080126D8 @ =gUnknown_02024C1C
-	mov r3, r8
-	ldrb r0, [r3]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _080126DC @ =BattleScript_ActionSelectionItemsCantBeUsed
-	b _080129CC
-	.align 2, 0
-_080126D0: .4byte gBattleTypeFlags
-_080126D4: .4byte 0x00000902
-_080126D8: .4byte gUnknown_02024C1C
-_080126DC: .4byte BattleScript_ActionSelectionItemsCantBeUsed
-_080126E0:
-	ldr r3, _08012738 @ =gSharedMem
-	ldr r5, _0801273C @ =gActiveBank
-	ldrb r0, [r5]
-	ldr r4, _08012740 @ =0x00016064
-	adds r1, r0, r4
-	adds r1, r3
-	ldr r2, _08012744 @ =gBattlePartyID
-	lsls r0, 1
-	adds r0, r2
-	ldrh r0, [r0]
-	strb r0, [r1]
-	ldr r7, _08012748 @ =gBattleMons
-	ldrb r2, [r5]
-	movs r6, 0x58
-	adds r0, r2, 0
-	muls r0, r6
-	adds r1, r7, 0
-	adds r1, 0x50
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, _0801274C @ =0x0400e000
-	ands r0, r1
-	cmp r0, 0
-	bne _08012722
-	ldr r0, _08012750 @ =gStatuses3
-	lsls r1, r2, 2
-	adds r1, r0
-	ldr r1, [r1]
-	movs r0, 0x80
-	lsls r0, 3
-	ands r1, r0
-	cmp r1, 0
-	beq _08012758
-_08012722:
-	lsls r0, r2, 1
-	adds r0, r2
-	ldr r2, _08012754 @ =0x0001606c
-	adds r1, r3, r2
-	adds r0, r1
-	str r0, [sp]
-	movs r0, 0
-	movs r1, 0x2
-	movs r2, 0x6
-	b _0801286C
-	.align 2, 0
-_08012738: .4byte gSharedMem
-_0801273C: .4byte gActiveBank
-_08012740: .4byte 0x00016064
-_08012744: .4byte gBattlePartyID
-_08012748: .4byte gBattleMons
-_0801274C: .4byte 0x0400e000
-_08012750: .4byte gStatuses3
-_08012754: .4byte 0x0001606c
-_08012758:
-	str r1, [sp]
-	movs r0, 0xC
-	adds r1, r2, 0
-	movs r2, 0x17
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _080127E0
-	ldrb r1, [r5]
-	str r4, [sp]
-	movs r0, 0xC
-	movs r2, 0x47
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	beq _080127A8
-	ldrb r0, [r5]
-	muls r0, r6
-	adds r1, r0, r7
-	adds r0, r1, 0
-	adds r0, 0x21
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _080127A8
-	adds r0, r1, 0
-	adds r0, 0x22
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _080127A8
-	adds r0, r1, 0
-	adds r0, 0x20
-	ldrb r0, [r0]
-	cmp r0, 0x1A
-	bne _080127E0
-_080127A8:
-	ldr r5, _08012808 @ =gActiveBank
-	ldrb r1, [r5]
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xF
-	movs r2, 0x2A
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	beq _08012818
-	ldr r2, _0801280C @ =gBattleMons
-	ldrb r1, [r5]
-	movs r0, 0x58
-	muls r0, r1
-	adds r1, r0, r2
-	adds r0, r1, 0
-	adds r0, 0x21
-	ldrb r0, [r0]
-	cmp r0, 0x8
-	beq _080127E0
-	adds r0, r1, 0
-	adds r0, 0x22
-	ldrb r0, [r0]
-	cmp r0, 0x8
-	bne _08012818
-_080127E0:
-	subs r1, r4, 0x1
-	lsls r1, 4
-	movs r0, 0x4
-	orrs r1, r0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, _08012810 @ =gLastUsedAbility
-	ldrb r3, [r0]
-	ldr r0, _08012808 @ =gActiveBank
-	ldrb r2, [r0]
-	lsls r0, r2, 1
-	adds r0, r2
-	ldr r2, _08012814 @ =gSharedMem + 0x1606C
-	adds r0, r2
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x6
-	bl EmitChoosePokemon
-	b _0801289E
-	.align 2, 0
-_08012808: .4byte gActiveBank
-_0801280C: .4byte gBattleMons
-_08012810: .4byte gLastUsedAbility
-_08012814: .4byte gSharedMem + 0x1606C
-_08012818:
-	ldr r0, _08012830 @ =gActiveBank
-	ldrb r1, [r0]
-	mov r8, r0
-	cmp r1, 0x2
-	bne _08012840
-	ldr r0, _08012834 @ =gActionForBanks
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _08012840
-	ldr r3, _08012838 @ =gSharedMem
-	ldr r4, _0801283C @ =0x00016068
-	b _08012854
-	.align 2, 0
-_08012830: .4byte gActiveBank
-_08012834: .4byte gActionForBanks
-_08012838: .4byte gSharedMem
-_0801283C: .4byte 0x00016068
-_08012840:
-	mov r2, r8
-	ldrb r0, [r2]
-	cmp r0, 0x3
-	bne _08012884
-	ldr r0, _08012874 @ =gActionForBanks
-	ldrb r0, [r0, 0x1]
-	cmp r0, 0x2
-	bne _08012884
-	ldr r3, _08012878 @ =gSharedMem
-	ldr r4, _0801287C @ =0x00016069
-_08012854:
-	adds r0, r3, r4
-	ldrb r2, [r0]
-	mov r0, r8
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	ldr r1, _08012880 @ =0x0001606c
-	adds r3, r1
-	adds r0, r3
-	str r0, [sp]
-	movs r0, 0
-	movs r1, 0
-_0801286C:
-	movs r3, 0
-	bl EmitChoosePokemon
-	b _0801289E
-	.align 2, 0
-_08012874: .4byte gActionForBanks
-_08012878: .4byte gSharedMem
-_0801287C: .4byte 0x00016069
-_08012880: .4byte 0x0001606c
-_08012884:
-	ldr r0, _080128A8 @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	ldr r1, _080128AC @ =gSharedMem + 0x1606C
-	adds r0, r1
-	str r0, [sp]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x6
-	movs r3, 0
-	bl EmitChoosePokemon
-_0801289E:
-	ldr r0, _080128A8 @ =gActiveBank
-	ldrb r0, [r0]
-	bl MarkBufferBankForExecution
-	b _08012968
-	.align 2, 0
-_080128A8: .4byte gActiveBank
-_080128AC: .4byte gSharedMem + 0x1606C
-_080128B0:
-	bl PlayerPartyAndPokemonStorageFull
-	lsls r0, 24
-	cmp r0, 0
-	beq _08012968
-	ldr r1, _080128EC @ =gUnknown_02024C1C
-	ldr r2, _080128F0 @ =gActiveBank
-	ldrb r0, [r2]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _080128F4 @ =BattleScript_PrintFullBox
-	str r1, [r0]
-	ldr r0, _080128F8 @ =gBattleCommunication
-	ldrb r1, [r2]
-	adds r1, r0
-	movs r3, 0
-	movs r0, 0x5
-	strb r0, [r1]
-	ldr r1, _080128FC @ =gSharedMem
-	ldrb r0, [r2]
-	ldr r4, _08012900 @ =0x00016060
-	adds r0, r4
-	adds r0, r1
-	strb r3, [r0]
-	ldrb r0, [r2]
-	ldr r2, _08012904 @ =0x00016094
-	adds r0, r2
-	adds r0, r1
-	strb r3, [r0]
-	b _08012F90
-	.align 2, 0
-_080128EC: .4byte gUnknown_02024C1C
-_080128F0: .4byte gActiveBank
-_080128F4: .4byte BattleScript_PrintFullBox
-_080128F8: .4byte gBattleCommunication
-_080128FC: .4byte gSharedMem
-_08012900: .4byte 0x00016060
-_08012904: .4byte 0x00016094
-_08012908:
-	ldr r4, _08012924 @ =gActiveBank
-	ldrb r0, [r4]
-	lsls r1, r0, 1
-	adds r1, r0
-	ldr r0, _08012928 @ =gSharedMem + 0x1606C
-	adds r1, r0
-	movs r0, 0
-	bl EmitOpenBag
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	b _08012968
-	.align 2, 0
-_08012924: .4byte gActiveBank
-_08012928: .4byte gSharedMem + 0x1606C
-_0801292C:
-	ldr r4, _08012964 @ =gBattleCommunication
-	mov r3, r8
-	ldrb r1, [r3]
-	adds r1, r4
-	movs r5, 0
-	movs r0, 0x6
-	strb r0, [r1]
-	ldrb r0, [r3]
-	bl GetBankIdentity
-	movs r1, 0x2
-	eors r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByPlayerAI
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	strb r5, [r0]
-	movs r0, 0
-	bl Emitcmd50
-	mov r4, r8
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	b _08012F90
-	.align 2, 0
-_08012964: .4byte gBattleCommunication
-_08012968:
-	ldr r0, _08012994 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0xA
-	ands r0, r1
-	cmp r0, 0x8
-	bne _080129A8
-	ldr r0, _08012998 @ =gBattleBufferB
-	ldr r4, _0801299C @ =gActiveBank
-	ldrb r1, [r4]
-	lsls r1, 9
-	adds r0, 0x1
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x3
-	bne _080129A8
-	ldr r0, _080129A0 @ =BattleScript_PrintCantRunFromTrainer
-	bl b_call_bc_move_exec
-	ldr r1, _080129A4 @ =gBattleCommunication
-	ldrb r0, [r4]
-	adds r0, r1
-	b _08012BFE
-	.align 2, 0
-_08012994: .4byte gBattleTypeFlags
-_08012998: .4byte gBattleBufferB
-_0801299C: .4byte gActiveBank
-_080129A0: .4byte BattleScript_PrintCantRunFromTrainer
-_080129A4: .4byte gBattleCommunication
-_080129A8:
-	bl CanRunFromBattle
-	lsls r0, 24
-	cmp r0, 0
-	beq _08012A14
-	ldr r0, _080129F4 @ =gBattleBufferB
-	ldr r3, _080129F8 @ =gActiveBank
-	ldrb r2, [r3]
-	lsls r1, r2, 9
-	adds r0, 0x1
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x3
-	bne _08012A14
-	ldr r1, _080129FC @ =gUnknown_02024C1C
-	lsls r0, r2, 2
-	adds r0, r1
-	ldr r1, _08012A00 @ =BattleScript_PrintCantEscapeFromBattle
-_080129CC:
-	str r1, [r0]
-	ldr r0, _08012A04 @ =gBattleCommunication
-	ldrb r1, [r3]
-	adds r1, r0
-	movs r2, 0
-	movs r0, 0x5
-	strb r0, [r1]
-	ldr r1, _08012A08 @ =gSharedMem
-	ldrb r0, [r3]
-	ldr r4, _08012A0C @ =0x00016060
-	adds r0, r4
-	adds r0, r1
-	strb r2, [r0]
-	ldrb r0, [r3]
-	ldr r3, _08012A10 @ =0x00016094
-	adds r0, r3
-	adds r0, r1
-	strb r2, [r0]
-	b _08012F90
-	.align 2, 0
-_080129F4: .4byte gBattleBufferB
-_080129F8: .4byte gActiveBank
-_080129FC: .4byte gUnknown_02024C1C
-_08012A00: .4byte BattleScript_PrintCantEscapeFromBattle
-_08012A04: .4byte gBattleCommunication
-_08012A08: .4byte gSharedMem
-_08012A0C: .4byte 0x00016060
-_08012A10: .4byte 0x00016094
-_08012A14:
-	ldr r2, _08012A20 @ =gBattleCommunication
-	ldr r0, _08012A24 @ =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _08012E3E
-	.align 2, 0
-_08012A20: .4byte gBattleCommunication
-_08012A24: .4byte gActiveBank
-_08012A28:
-	ldr r4, _08012A6C @ =gBattleExecBuffer
-	ldr r1, _08012A70 @ =gBitTable
-	ldr r3, _08012A74 @ =gActiveBank
-	ldrb r5, [r3]
-	lsls r0, r5, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r0, r2, 4
-	movs r1, 0xF0
-	lsls r1, 24
-	orrs r0, r1
-	orrs r0, r2
-	lsls r1, r2, 8
-	orrs r0, r1
-	lsls r2, 12
-	orrs r0, r2
-	ldr r1, [r4]
-	ands r1, r0
-	mov r8, r3
-	cmp r1, 0
-	beq _08012A54
-	b _08012F66
-_08012A54:
-	ldr r1, _08012A78 @ =gActionForBanks
-	adds r0, r5, r1
-	ldrb r0, [r0]
-	adds r3, r1, 0
-	cmp r0, 0x9
-	bls _08012A62
-	b _08012F66
-_08012A62:
-	lsls r0, 2
-	ldr r1, _08012A7C @ =_08012A80
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08012A6C: .4byte gBattleExecBuffer
-_08012A70: .4byte gBitTable
-_08012A74: .4byte gActiveBank
-_08012A78: .4byte gActionForBanks
-_08012A7C: .4byte _08012A80
-	.align 2, 0
-_08012A80:
-	.4byte _08012AA8
-	.4byte _08012BB0
-	.4byte _08012BE8
-	.4byte _08012CE0
-	.4byte _08012D04
-	.4byte _08012D18
-	.4byte _08012D2C
-	.4byte _08012D5C
-	.4byte _08012D70
-	.4byte _08012D94
-_08012AA8:
-	ldr r0, _08012AC8 @ =gBattleBufferB
-	mov r1, r8
-	ldrb r4, [r1]
-	lsls r1, r4, 9
-	adds r2, r0, 0x1
-	adds r1, r2
-	ldrb r1, [r1]
-	adds r6, r0, 0
-	cmp r1, 0x9
-	bgt _08012ACC
-	cmp r1, 0x3
-	blt _08012ACC
-	adds r0, r4, r3
-	strb r1, [r0]
-	b _08012F90
-	.align 2, 0
-_08012AC8: .4byte gBattleBufferB
-_08012ACC:
-	adds r3, r6, 0
-	mov r5, r8
-	ldrb r4, [r5]
-	lsls r1, r4, 9
-	adds r7, r3, 0x2
-	adds r0, r1, r7
-	ldrb r2, [r0]
-	adds r3, 0x3
-	mov r9, r3
-	add r1, r9
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r2, r0
-	ldr r0, _08012AF4 @ =0x0000ffff
-	cmp r2, r0
-	bne _08012AFC
-	ldr r0, _08012AF8 @ =gBattleCommunication
-	adds r0, r4, r0
-	b _08012BFE
-	.align 2, 0
-_08012AF4: .4byte 0x0000ffff
-_08012AF8: .4byte gBattleCommunication
-_08012AFC:
-	bl sub_8015894
-	lsls r0, 24
-	cmp r0, 0
-	beq _08012B48
-	ldr r0, _08012B38 @ =gBattleCommunication
-	ldrb r1, [r5]
-	adds r1, r0
-	movs r2, 0
-	movs r0, 0x5
-	strb r0, [r1]
-	ldr r3, _08012B3C @ =gSharedMem
-	ldrb r0, [r5]
-	ldr r4, _08012B40 @ =0x00016060
-	adds r0, r4
-	adds r0, r3
-	strb r2, [r0]
-	ldrb r0, [r5]
-	lsls r0, 9
-	adds r1, r6, 0x1
-	adds r0, r1
-	strb r2, [r0]
-	ldrb r0, [r5]
-	ldr r1, _08012B44 @ =0x00016094
-	adds r0, r1
-	adds r0, r3
-	movs r1, 0x1
-	strb r1, [r0]
-	b _08012F90
-	.align 2, 0
-_08012B38: .4byte gBattleCommunication
-_08012B3C: .4byte gSharedMem
-_08012B40: .4byte 0x00016060
-_08012B44: .4byte 0x00016094
-_08012B48:
-	ldr r6, _08012B98 @ =gSharedMem
-	mov r2, r8
-	ldrb r0, [r2]
-	ldr r2, _08012B9C @ =0x0001608c
-	adds r1, r0, r2
-	adds r1, r6
-	lsls r0, 9
-	adds r0, r7
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r0, _08012BA0 @ =gChosenMovesByBanks
-	mov r4, r8
-	ldrb r3, [r4]
-	lsls r5, r3, 1
-	adds r5, r0
-	ldr r4, _08012BA4 @ =gBattleMons
-	adds r2, r3, r2
-	adds r2, r6
-	ldrb r0, [r2]
-	lsls r0, 1
-	movs r1, 0x58
-	muls r1, r3
-	adds r0, r1
-	adds r4, 0xC
-	adds r0, r4
-	ldrh r0, [r0]
-	strh r0, [r5]
-	mov r1, r8
-	ldrb r0, [r1]
-	ldr r2, _08012BA8 @ =0x00016010
-	adds r1, r0, r2
-	adds r1, r6
-	lsls r0, 9
-	add r0, r9
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r0, _08012BAC @ =gBattleCommunication
-	mov r3, r8
-	ldrb r1, [r3]
-	b _08012E3C
-	.align 2, 0
-_08012B98: .4byte gSharedMem
-_08012B9C: .4byte 0x0001608c
-_08012BA0: .4byte gChosenMovesByBanks
-_08012BA4: .4byte gBattleMons
-_08012BA8: .4byte 0x00016010
-_08012BAC: .4byte gBattleCommunication
-_08012BB0:
-	ldr r2, _08012BD8 @ =gBattleBufferB
-	ldr r5, _08012BDC @ =gActiveBank
-	ldrb r4, [r5]
-	lsls r1, r4, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r3, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r3, r0
-	cmp r3, 0
-	bne _08012BCE
-	b _08012F60
-_08012BCE:
-	ldr r0, _08012BE0 @ =gLastUsedItem
-	strh r3, [r0]
-	ldr r0, _08012BE4 @ =gBattleCommunication
-	ldrb r1, [r5]
-	b _08012E3C
-	.align 2, 0
-_08012BD8: .4byte gBattleBufferB
-_08012BDC: .4byte gActiveBank
-_08012BE0: .4byte gLastUsedItem
-_08012BE4: .4byte gBattleCommunication
-_08012BE8:
-	ldr r4, _08012C04 @ =gBattleBufferB
-	ldr r7, _08012C08 @ =gActiveBank
-	ldrb r2, [r7]
-	lsls r0, r2, 9
-	adds r1, r4, 0x1
-	adds r0, r1
-	ldrb r1, [r0]
-	cmp r1, 0x6
-	bne _08012C10
-	ldr r0, _08012C0C @ =gBattleCommunication
-	adds r0, r2, r0
-_08012BFE:
-	movs r1, 0
-	strb r1, [r0]
-	b _08012F66
-	.align 2, 0
-_08012C04: .4byte gBattleBufferB
-_08012C08: .4byte gActiveBank
-_08012C0C: .4byte gBattleCommunication
-_08012C10:
-	ldr r0, _08012CC4 @ =gSharedMem
-	mov r12, r0
-	ldr r3, _08012CC8 @ =0x00016068
-	adds r0, r2, r3
-	add r0, r12
-	strb r1, [r0]
-	ldr r0, _08012CCC @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08012CBE
-	ldrb r0, [r7]
-	lsls r1, r0, 1
-	adds r1, r0
-	ldr r5, _08012CD0 @ =0x0001606c
-	adds r1, r5
-	add r1, r12
-	ldrb r2, [r1]
-	movs r0, 0xF
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r0, [r7]
-	lsls r2, r0, 1
-	adds r2, r0
-	adds r2, r5
-	add r2, r12
-	lsls r0, 9
-	adds r6, r4, 0x2
-	adds r0, r6
-	ldrb r1, [r0]
-	movs r3, 0xF0
-	adds r0, r3, 0
-	ands r0, r1
-	ldrb r1, [r2]
-	orrs r0, r1
-	strb r0, [r2]
-	ldrb r0, [r7]
-	lsls r1, r0, 1
-	adds r1, r0
-	ldr r2, _08012CD4 @ =0x0001606d
-	adds r1, r2
-	add r1, r12
-	lsls r0, 9
-	adds r4, 0x3
-	mov r8, r4
-	add r0, r8
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldrb r0, [r7]
-	movs r4, 0x2
-	eors r0, r4
-	lsls r1, r0, 1
-	adds r1, r0
-	adds r1, r5
-	add r1, r12
-	ldrb r2, [r1]
-	adds r0, r3, 0
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r0, [r7]
-	eors r0, r4
-	lsls r1, r0, 1
-	adds r1, r0
-	adds r1, r5
-	add r1, r12
-	ldrb r0, [r7]
-	lsls r0, 9
-	adds r0, r6
-	ldrb r0, [r0]
-	ands r3, r0
-	lsrs r3, 4
-	ldrb r0, [r1]
-	orrs r3, r0
-	strb r3, [r1]
-	ldrb r0, [r7]
-	eors r4, r0
-	lsls r1, r4, 1
-	adds r1, r4
-	ldr r3, _08012CD8 @ =0x0001606e
-	adds r1, r3
-	add r1, r12
-	ldrb r0, [r7]
-	lsls r0, 9
-	add r0, r8
-	ldrb r0, [r0]
-	strb r0, [r1]
-_08012CBE:
-	ldr r0, _08012CDC @ =gBattleCommunication
-	ldrb r1, [r7]
-	b _08012E3C
-	.align 2, 0
-_08012CC4: .4byte gSharedMem
-_08012CC8: .4byte 0x00016068
-_08012CCC: .4byte gBattleTypeFlags
-_08012CD0: .4byte 0x0001606c
-_08012CD4: .4byte 0x0001606d
-_08012CD8: .4byte 0x0001606e
-_08012CDC: .4byte gBattleCommunication
-_08012CE0:
-	ldr r2, _08012CF8 @ =gHitMarker
-	ldr r0, [r2]
-	movs r1, 0x80
-	lsls r1, 8
-	orrs r0, r1
-	str r0, [r2]
-	ldr r2, _08012CFC @ =gBattleCommunication
-	ldr r0, _08012D00 @ =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _08012E3E
-	.align 2, 0
-_08012CF8: .4byte gHitMarker
-_08012CFC: .4byte gBattleCommunication
-_08012D00: .4byte gActiveBank
-_08012D04:
-	ldr r2, _08012D10 @ =gBattleCommunication
-	ldr r0, _08012D14 @ =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _08012E3E
-	.align 2, 0
-_08012D10: .4byte gBattleCommunication
-_08012D14: .4byte gActiveBank
-_08012D18:
-	ldr r2, _08012D24 @ =gBattleCommunication
-	ldr r0, _08012D28 @ =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _08012E3E
-	.align 2, 0
-_08012D24: .4byte gBattleCommunication
-_08012D28: .4byte gActiveBank
-_08012D2C:
-	ldr r2, _08012D50 @ =gBattleBufferB
-	ldr r0, _08012D54 @ =gActiveBank
-	ldrb r4, [r0]
-	lsls r1, r4, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r3, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r3, r0
-	cmp r3, 0
-	bne _08012D4A
-	b _08012F60
-_08012D4A:
-	ldr r1, _08012D58 @ =gBattleCommunication
-	adds r1, r4, r1
-	b _08012E3E
-	.align 2, 0
-_08012D50: .4byte gBattleBufferB
-_08012D54: .4byte gActiveBank
-_08012D58: .4byte gBattleCommunication
-_08012D5C:
-	ldr r2, _08012D68 @ =gBattleCommunication
-	ldr r0, _08012D6C @ =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _08012E3E
-	.align 2, 0
-_08012D68: .4byte gBattleCommunication
-_08012D6C: .4byte gActiveBank
-_08012D70:
-	ldr r2, _08012D88 @ =gHitMarker
-	ldr r0, [r2]
-	movs r1, 0x80
-	lsls r1, 8
-	orrs r0, r1
-	str r0, [r2]
-	ldr r2, _08012D8C @ =gBattleCommunication
-	ldr r0, _08012D90 @ =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _08012E3E
-	.align 2, 0
-_08012D88: .4byte gHitMarker
-_08012D8C: .4byte gBattleCommunication
-_08012D90: .4byte gActiveBank
-_08012D94:
-	ldr r2, _08012DA0 @ =gBattleCommunication
-	ldr r0, _08012DA4 @ =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _08012E3E
-	.align 2, 0
-_08012DA0: .4byte gBattleCommunication
-_08012DA4: .4byte gActiveBank
-_08012DA8:
-	ldr r3, _08012E10 @ =gBattleExecBuffer
-	ldr r4, _08012E14 @ =gBitTable
-	ldr r0, _08012E18 @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r4
-	ldr r2, [r0]
-	lsls r1, r2, 4
-	movs r0, 0xF0
-	lsls r0, 24
-	orrs r1, r0
-	orrs r1, r2
-	lsls r0, r2, 8
-	orrs r1, r0
-	lsls r2, 12
-	orrs r1, r2
-	ldr r0, [r3]
-	ands r0, r1
-	cmp r0, 0
-	beq _08012DD2
-	b _08012F66
-_08012DD2:
-	ldr r0, _08012E1C @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x41
-	ands r0, r1
-	cmp r0, 0x1
-	bne _08012E06
-	movs r1, 0x2
-	movs r0, 0x2
-	ands r0, r5
-	cmp r0, 0
-	bne _08012E06
-	adds r0, r5, 0
-	eors r0, r1
-	bl GetBankByPlayerAI
-	ldr r1, _08012E20 @ =gSharedMem
-	ldr r2, _08012E24 @ =0x000160a6
-	adds r1, r2
-	ldrb r1, [r1]
-	lsls r0, 24
-	lsrs r0, 22
-	adds r0, r4
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _08012E28
-_08012E06:
-	movs r0, 0
-	movs r1, 0
-	bl EmitLinkStandbyMsg
-	b _08012E30
-	.align 2, 0
-_08012E10: .4byte gBattleExecBuffer
-_08012E14: .4byte gBitTable
-_08012E18: .4byte gActiveBank
-_08012E1C: .4byte gBattleTypeFlags
-_08012E20: .4byte gSharedMem
-_08012E24: .4byte 0x000160a6
-_08012E28:
-	movs r0, 0
-	movs r1, 0x1
-	bl EmitLinkStandbyMsg
-_08012E30:
-	ldr r4, _08012E48 @ =gActiveBank
-_08012E32:
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	ldr r0, _08012E4C @ =gBattleCommunication
-	ldrb r1, [r4]
-_08012E3C:
-	adds r1, r0
-_08012E3E:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08012F66
-	.align 2, 0
-_08012E48: .4byte gActiveBank
-_08012E4C: .4byte gBattleCommunication
-_08012E50:
-	ldr r3, _08012E84 @ =gBattleExecBuffer
-	ldr r1, _08012E88 @ =gBitTable
-	ldr r0, _08012E8C @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r1, r2, 4
-	movs r0, 0xF0
-	lsls r0, 24
-	orrs r1, r0
-	orrs r1, r2
-	lsls r0, r2, 8
-	orrs r1, r0
-	lsls r2, 12
-	orrs r1, r2
-	ldr r0, [r3]
-	ands r0, r1
-	cmp r0, 0
-	bne _08012F66
-	ldr r1, _08012E90 @ =gBattleCommunication
-	ldrb r0, [r1, 0x4]
-	adds r0, 0x1
-	strb r0, [r1, 0x4]
-	b _08012F66
-	.align 2, 0
-_08012E84: .4byte gBattleExecBuffer
-_08012E88: .4byte gBitTable
-_08012E8C: .4byte gActiveBank
-_08012E90: .4byte gBattleCommunication
-_08012E94:
-	ldr r2, _08012EB8 @ =gSharedMem
-	ldr r5, _08012EBC @ =gActiveBank
-	ldrb r1, [r5]
-	ldr r3, _08012EC0 @ =0x00016060
-	adds r0, r1, r3
-	adds r0, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08012ECC
-	ldr r0, _08012EC4 @ =gBattleCommunication
-	adds r0, r1, r0
-	ldr r4, _08012EC8 @ =0x00016094
-	adds r1, r4
-	adds r1, r2
-	ldrb r1, [r1]
-	strb r1, [r0]
-	b _08012F66
-	.align 2, 0
-_08012EB8: .4byte gSharedMem
-_08012EBC: .4byte gActiveBank
-_08012EC0: .4byte 0x00016060
-_08012EC4: .4byte gBattleCommunication
-_08012EC8: .4byte 0x00016094
-_08012ECC:
-	ldr r0, _08012F20 @ =gBankAttacker
-	strb r1, [r0]
-	ldr r7, _08012F24 @ =gBattlescriptCurrInstr
-	ldr r6, _08012F28 @ =gUnknown_02024C1C
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r6
-	ldr r4, [r0]
-	str r4, [r7]
-	ldr r3, _08012F2C @ =gBattleExecBuffer
-	ldr r1, _08012F30 @ =gBitTable
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r1, r2, 4
-	movs r0, 0xF0
-	lsls r0, 24
-	orrs r1, r0
-	orrs r1, r2
-	lsls r0, r2, 8
-	orrs r1, r0
-	lsls r2, 12
-	orrs r1, r2
-	ldr r0, [r3]
-	ands r0, r1
-	cmp r0, 0
-	bne _08012F12
-	ldr r0, _08012F34 @ =gBattleScriptingCommandsTable
-	ldrb r1, [r4]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, [r1]
-	bl _call_via_r0
-_08012F12:
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r6
-	ldr r1, [r7]
-	str r1, [r0]
-	b _08012F66
-	.align 2, 0
-_08012F20: .4byte gBankAttacker
-_08012F24: .4byte gBattlescriptCurrInstr
-_08012F28: .4byte gUnknown_02024C1C
-_08012F2C: .4byte gBattleExecBuffer
-_08012F30: .4byte gBitTable
-_08012F34: .4byte gBattleScriptingCommandsTable
-_08012F38:
-	ldr r3, _08012FA0 @ =gBattleExecBuffer
-	ldr r1, _08012FA4 @ =gBitTable
-	ldr r0, _08012FA8 @ =gActiveBank
-	ldrb r4, [r0]
-	lsls r0, r4, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r0, r2, 4
-	movs r1, 0xF0
-	lsls r1, 24
-	orrs r0, r1
-	orrs r0, r2
-	lsls r1, r2, 8
-	orrs r0, r1
-	lsls r2, 12
-	orrs r0, r2
-	ldr r3, [r3]
-	ands r3, r0
-	cmp r3, 0
-	bne _08012F66
-_08012F60:
-	ldr r0, _08012FAC @ =gBattleCommunication
-	adds r0, r4, r0
-	strb r3, [r0]
-_08012F66:
-	ldr r0, _08012FA8 @ =gActiveBank
-	ldrb r1, [r0]
-	adds r1, 0x1
-	strb r1, [r0]
-	ldr r0, _08012FB0 @ =gNoOfAllBanks
-	lsls r1, 24
-	lsrs r1, 24
-_08012F74:
-	adds r2, r0, 0
-	ldrb r0, [r2]
-	cmp r1, r0
-	bcs _08012F80
-	bl _0801234C
-_08012F80:
-	ldr r0, _08012FAC @ =gBattleCommunication
-	ldrb r0, [r0, 0x4]
-	ldrb r2, [r2]
-	cmp r0, r2
-	bne _08012F90
-	ldr r1, _08012FB4 @ =gBattleMainFunc
-	ldr r0, _08012FB8 @ =sub_80133C8
-	str r0, [r1]
-_08012F90:
-	add sp, 0x1C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08012FA0: .4byte gBattleExecBuffer
-_08012FA4: .4byte gBitTable
-_08012FA8: .4byte gActiveBank
-_08012FAC: .4byte gBattleCommunication
-_08012FB0: .4byte gNoOfAllBanks
-_08012FB4: .4byte gBattleMainFunc
-_08012FB8: .4byte sub_80133C8
-	thumb_func_end sub_8012324
-
-	thumb_func_start sub_8012FBC
-sub_8012FBC: @ 8012FBC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, _08012FE8 @ =gUnknown_02024A76
-	adds r4, r0, r2
-	ldrb r5, [r4]
-	adds r2, r1, r2
-	ldrb r3, [r2]
-	strb r3, [r4]
-	strb r5, [r2]
-	ldr r2, _08012FEC @ =gTurnOrder
-	adds r0, r2
-	ldrb r5, [r0]
-	adds r1, r2
-	ldrb r2, [r1]
-	strb r2, [r0]
-	strb r5, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08012FE8: .4byte gUnknown_02024A76
-_08012FEC: .4byte gTurnOrder
-	thumb_func_end sub_8012FBC
-
-	thumb_func_start GetWhoStrikesFirst
-GetWhoStrikesFirst: @ 8012FF0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r10, r1
-	lsls r2, 24
-	lsrs r2, 24
-	str r2, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	str r0, [sp]
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0xD
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	cmp r0, 0
-	bne _080130B8
-	ldr r1, [sp, 0x8]
-	str r1, [sp]
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x4D
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	cmp r0, 0
-	bne _080130B8
-	ldr r1, _08013070 @ =gBattleMons
-	movs r0, 0x58
-	mov r2, r9
-	muls r2, r0
-	adds r0, r2, 0
-	adds r0, r1
-	adds r0, 0x20
-	ldrb r3, [r0]
-	cmp r3, 0x21
-	bne _0801305C
-	ldr r0, _08013074 @ =gBattleWeather
-	ldrh r1, [r0]
-	movs r0, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0801306C
-_0801305C:
-	cmp r3, 0x22
-	bne _08013078
-	ldr r0, _08013074 @ =gBattleWeather
-	ldrh r1, [r0]
-	movs r0, 0x60
-	ands r0, r1
-	cmp r0, 0
-	beq _08013078
-_0801306C:
-	movs r3, 0x2
-	b _0801307A
-	.align 2, 0
-_08013070: .4byte gBattleMons
-_08013074: .4byte gBattleWeather
-_08013078:
-	movs r3, 0x1
-_0801307A:
-	movs r0, 0x58
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	ldr r2, _080130B0 @ =gBattleMons
-	adds r0, r2
-	adds r0, 0x20
-	ldrb r2, [r0]
-	cmp r2, 0x21
-	bne _0801309A
-	ldr r0, _080130B4 @ =gBattleWeather
-	ldrh r1, [r0]
-	movs r0, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _080130AA
-_0801309A:
-	cmp r2, 0x22
-	bne _080130BA
-	ldr r0, _080130B4 @ =gBattleWeather
-	ldrh r1, [r0]
-	movs r0, 0x60
-	ands r0, r1
-	cmp r0, 0
-	beq _080130BA
-_080130AA:
-	movs r7, 0x2
-	b _080130BC
-	.align 2, 0
-_080130B0: .4byte gBattleMons
-_080130B4: .4byte gBattleWeather
-_080130B8:
-	movs r3, 0x1
-_080130BA:
-	movs r7, 0x1
-_080130BC:
-	ldr r1, _08013100 @ =gBattleMons
-	movs r0, 0x58
-	mov r2, r9
-	muls r2, r0
-	adds r0, r2, 0
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x6]
-	muls r3, r0
-	ldr r2, _08013104 @ =gStatStageRatios
-	movs r1, 0x1B
-	ldrsb r1, [r4, r1]
-	lsls r1, 1
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	muls r0, r3
-	adds r2, 0x1
-	adds r1, r2
-	ldrb r1, [r1]
-	bl __divsi3
-	mov r8, r0
-	ldrh r0, [r4, 0x2E]
-	cmp r0, 0xAF
-	bne _0801310C
-	ldr r1, _08013108 @ =gEnigmaBerries
-	mov r3, r9
-	lsls r0, r3, 3
-	subs r0, r3
-	lsls r0, 2
-	adds r0, r1
-	ldrb r6, [r0, 0x7]
-	ldrb r5, [r0, 0x1A]
-	b _08013120
-	.align 2, 0
-_08013100: .4byte gBattleMons
-_08013104: .4byte gStatStageRatios
-_08013108: .4byte gEnigmaBerries
-_0801310C:
-	ldrh r0, [r4, 0x2E]
-	bl ItemId_GetHoldEffect
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldrh r0, [r4, 0x2E]
-	bl ItemId_GetHoldEffectParam
-	lsls r0, 24
-	lsrs r5, r0, 24
-_08013120:
-	ldr r0, _080131DC @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _08013154
-	ldr r0, _080131E0 @ =0x00000809
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _08013154
-	mov r0, r9
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _08013154
-	movs r0, 0x6E
-	mov r1, r8
-	muls r1, r0
-	adds r0, r1, 0
-	movs r1, 0x64
-	bl __udivsi3
-	mov r8, r0
-_08013154:
-	cmp r6, 0x18
-	bne _0801315E
-	mov r2, r8
-	lsrs r2, 1
-	mov r8, r2
-_0801315E:
-	ldr r1, _080131E4 @ =gBattleMons
-	movs r0, 0x58
-	mov r3, r9
-	muls r3, r0
-	adds r0, r3, 0
-	adds r1, 0x4C
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0801317C
-	mov r0, r8
-	lsrs r0, 2
-	mov r8, r0
-_0801317C:
-	cmp r6, 0x1A
-	bne _08013198
-	ldr r0, _080131E8 @ =gRandomTurnNumber
-	ldrh r4, [r0]
-	lsls r0, r5, 16
-	subs r0, r5
-	movs r1, 0x64
-	bl __divsi3
-	cmp r4, r0
-	bge _08013198
-	movs r1, 0x1
-	negs r1, r1
-	mov r8, r1
-_08013198:
-	ldr r1, _080131E4 @ =gBattleMons
-	movs r0, 0x58
-	mov r2, r10
-	muls r2, r0
-	adds r0, r2, 0
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x6]
-	adds r3, r0, 0
-	muls r3, r7
-	ldr r2, _080131EC @ =gStatStageRatios
-	movs r1, 0x1B
-	ldrsb r1, [r4, r1]
-	lsls r1, 1
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	muls r0, r3
-	adds r2, 0x1
-	adds r1, r2
-	ldrb r1, [r1]
-	bl __divsi3
-	adds r7, r0, 0
-	ldrh r0, [r4, 0x2E]
-	cmp r0, 0xAF
-	bne _080131F4
-	ldr r1, _080131F0 @ =gEnigmaBerries
-	mov r3, r10
-	lsls r0, r3, 3
-	subs r0, r3
-	lsls r0, 2
-	adds r0, r1
-	ldrb r6, [r0, 0x7]
-	ldrb r5, [r0, 0x1A]
-	b _08013208
-	.align 2, 0
-_080131DC: .4byte gBattleTypeFlags
-_080131E0: .4byte 0x00000809
-_080131E4: .4byte gBattleMons
-_080131E8: .4byte gRandomTurnNumber
-_080131EC: .4byte gStatStageRatios
-_080131F0: .4byte gEnigmaBerries
-_080131F4:
-	ldrh r0, [r4, 0x2E]
-	bl ItemId_GetHoldEffect
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldrh r0, [r4, 0x2E]
-	bl ItemId_GetHoldEffectParam
-	lsls r0, 24
-	lsrs r5, r0, 24
-_08013208:
-	ldr r0, _08013280 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _08013238
-	ldr r0, _08013284 @ =0x00000809
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _08013238
-	mov r0, r10
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _08013238
-	movs r0, 0x6E
-	muls r0, r7
-	movs r1, 0x64
-	bl __udivsi3
-	adds r7, r0, 0
-_08013238:
-	cmp r6, 0x18
-	bne _0801323E
-	lsrs r7, 1
-_0801323E:
-	ldr r2, _08013288 @ =gBattleMons
-	movs r0, 0x58
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	adds r1, r2, 0
-	adds r1, 0x4C
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0801325A
-	lsrs r7, 2
-_0801325A:
-	cmp r6, 0x1A
-	bne _08013274
-	ldr r0, _0801328C @ =gRandomTurnNumber
-	ldrh r4, [r0]
-	lsls r0, r5, 16
-	subs r0, r5
-	movs r1, 0x64
-	bl __divsi3
-	cmp r4, r0
-	bge _08013274
-	movs r7, 0x1
-	negs r7, r7
-_08013274:
-	ldr r2, [sp, 0x4]
-	cmp r2, 0
-	beq _08013290
-	movs r3, 0
-	b _08013334
-	.align 2, 0
-_08013280: .4byte gBattleTypeFlags
-_08013284: .4byte 0x00000809
-_08013288: .4byte gBattleMons
-_0801328C: .4byte gRandomTurnNumber
-_08013290:
-	ldr r0, _080132B0 @ =gActionForBanks
-	mov r3, r9
-	adds r1, r3, r0
-	ldrb r1, [r1]
-	adds r2, r0, 0
-	cmp r1, 0
-	bne _080132E4
-	ldr r0, _080132B4 @ =gProtectStructs
-	lsls r1, r3, 4
-	adds r1, r0
-	ldrb r0, [r1]
-	lsls r0, 29
-	cmp r0, 0
-	bge _080132B8
-	movs r3, 0xA5
-	b _080132E6
-	.align 2, 0
-_080132B0: .4byte gActionForBanks
-_080132B4: .4byte gProtectStructs
-_080132B8:
-	ldr r1, _080132D8 @ =gSharedMem
-	ldr r0, _080132DC @ =0x0001608c
-	add r0, r9
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 1
-	movs r1, 0x58
-	mov r3, r9
-	muls r3, r1
-	adds r1, r3, 0
-	adds r0, r1
-	ldr r1, _080132E0 @ =gBattleMons
-	adds r1, 0xC
-	adds r0, r1
-	ldrh r3, [r0]
-	b _080132E6
-	.align 2, 0
-_080132D8: .4byte gSharedMem
-_080132DC: .4byte 0x0001608c
-_080132E0: .4byte gBattleMons
-_080132E4:
-	movs r3, 0
-_080132E6:
-	mov r1, r10
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08013334
-	ldr r0, _08013304 @ =gProtectStructs
-	lsls r1, 4
-	adds r1, r0
-	ldrb r0, [r1]
-	lsls r0, 29
-	cmp r0, 0
-	bge _08013308
-	movs r2, 0xA5
-	b _08013336
-	.align 2, 0
-_08013304: .4byte gProtectStructs
-_08013308:
-	ldr r1, _08013328 @ =gSharedMem
-	ldr r0, _0801332C @ =0x0001608c
-	add r0, r10
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 1
-	movs r1, 0x58
-	mov r2, r10
-	muls r2, r1
-	adds r1, r2, 0
-	adds r0, r1
-	ldr r1, _08013330 @ =gBattleMons
-	adds r1, 0xC
-	adds r0, r1
-	ldrh r2, [r0]
-	b _08013336
-	.align 2, 0
-_08013328: .4byte gSharedMem
-_0801332C: .4byte 0x0001608c
-_08013330: .4byte gBattleMons
-_08013334:
-	movs r2, 0
-_08013336:
-	ldr r4, _08013380 @ =gBattleMoves
-	lsls r0, r3, 1
-	adds r0, r3
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x7
-	ldrsb r1, [r0, r1]
-	lsls r3, r2, 1
-	cmp r1, 0
-	bne _0801335A
-	adds r0, r3, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x7]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0
-	beq _08013398
-_0801335A:
-	adds r0, r3, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x7]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r1, r0
-	bne _0801338E
-	cmp r8, r7
-	bne _08013384
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _08013384
-	movs r3, 0x2
-	b _080133B4
-	.align 2, 0
-_08013380: .4byte gBattleMoves
-_08013384:
-	cmp r8, r7
-	bcs _080133B6
-	movs r0, 0x1
-	str r0, [sp, 0x8]
-	b _080133B6
-_0801338E:
-	cmp r1, r0
-	bge _080133B6
-	movs r1, 0x1
-	str r1, [sp, 0x8]
-	b _080133B6
-_08013398:
-	cmp r8, r7
-	bne _080133AE
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _080133AE
-	movs r2, 0x2
-	str r2, [sp, 0x8]
-	b _080133B6
-_080133AE:
-	cmp r8, r7
-	bcs _080133B6
-	movs r3, 0x1
-_080133B4:
-	str r3, [sp, 0x8]
-_080133B6:
-	ldr r0, [sp, 0x8]
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end GetWhoStrikesFirst
-
-	thumb_func_start sub_80133C8
-sub_80133C8: @ 80133C8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	movs r3, 0
-	ldr r0, _0801341C @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08013434
-	ldr r0, _08013420 @ =gActiveBank
-	strb r3, [r0]
-	ldr r4, _08013424 @ =gNoOfAllBanks
-	mov r8, r0
-	ldrb r0, [r4]
-	cmp r3, r0
-	bcc _080133F0
-	b _08013622
-_080133F0:
-	ldr r7, _08013428 @ =gUnknown_02024A76
-	ldr r6, _0801342C @ =gActionForBanks
-	mov r2, r8
-	ldr r5, _08013430 @ =gTurnOrder
-_080133F8:
-	adds r1, r3, r7
-	ldrb r0, [r2]
-	adds r0, r6
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r1, r3, r5
-	ldrb r0, [r2]
-	strb r0, [r1]
-	adds r3, 0x1
-	ldrb r0, [r2]
-	adds r0, 0x1
-	strb r0, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r4]
-	cmp r0, r1
-	bcc _080133F8
-	b _08013622
-	.align 2, 0
-_0801341C: .4byte gBattleTypeFlags
-_08013420: .4byte gActiveBank
-_08013424: .4byte gNoOfAllBanks
-_08013428: .4byte gUnknown_02024A76
-_0801342C: .4byte gActionForBanks
-_08013430: .4byte gTurnOrder
-_08013434:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08013484
-	ldr r0, _08013478 @ =gActiveBank
-	strb r3, [r0]
-	ldr r1, _0801347C @ =gNoOfAllBanks
-	mov r8, r0
-	adds r2, r1, 0
-	ldrb r2, [r2]
-	cmp r3, r2
-	bcs _08013494
-	ldr r0, _08013480 @ =gActionForBanks
-	ldrb r1, [r0]
-	adds r4, r0, 0
-	cmp r1, 0x3
-	beq _08013492
-_08013456:
-	mov r7, r8
-	ldrb r0, [r7]
-	adds r0, 0x1
-	strb r0, [r7]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0801347C @ =gNoOfAllBanks
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcs _08013494
-	ldrb r0, [r7]
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bne _08013456
-	b _08013492
-	.align 2, 0
-_08013478: .4byte gActiveBank
-_0801347C: .4byte gNoOfAllBanks
-_08013480: .4byte gActionForBanks
-_08013484:
-	ldr r0, _080134FC @ =gActionForBanks
-	ldrb r0, [r0]
-	ldr r2, _08013500 @ =gActiveBank
-	mov r8, r2
-	cmp r0, 0x3
-	bne _08013494
-	strb r3, [r2]
-_08013492:
-	movs r3, 0x5
-_08013494:
-	cmp r3, 0x5
-	bne _08013520
-	ldr r6, _08013504 @ =gUnknown_02024A76
-	ldr r1, _080134FC @ =gActionForBanks
-	mov r3, r8
-	ldrb r0, [r3]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r6]
-	ldr r2, _08013508 @ =gTurnOrder
-	ldrb r0, [r3]
-	strb r0, [r2]
-	movs r3, 0x1
-	movs r5, 0
-	adds r4, r1, 0
-	ldr r7, _0801350C @ =gBattleMainFunc
-	mov r9, r7
-	ldr r0, _08013510 @ =bc_80154A0
-	mov r12, r0
-	ldr r1, _08013514 @ =gSharedMem
-	mov r10, r1
-	ldr r7, _08013518 @ =gNoOfAllBanks
-	ldrb r7, [r7]
-	cmp r5, r7
-	bge _080134EC
-	adds r7, r6, 0
-	adds r6, r4, 0
-	adds r4, r2, 0
-	ldr r2, _08013518 @ =gNoOfAllBanks
-_080134CE:
-	mov r0, r8
-	ldrb r0, [r0]
-	cmp r5, r0
-	beq _080134E4
-	adds r1, r3, r7
-	adds r0, r5, r6
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r0, r3, r4
-	strb r5, [r0]
-	adds r3, 0x1
-_080134E4:
-	adds r5, 0x1
-	ldrb r1, [r2]
-	cmp r5, r1
-	blt _080134CE
-_080134EC:
-	mov r2, r12
-	mov r3, r9
-	str r2, [r3]
-	ldr r1, _0801351C @ =0x0001601d
-	add r1, r10
-	movs r0, 0
-	strb r0, [r1]
-	b _08013632
-	.align 2, 0
-_080134FC: .4byte gActionForBanks
-_08013500: .4byte gActiveBank
-_08013504: .4byte gUnknown_02024A76
-_08013508: .4byte gTurnOrder
-_0801350C: .4byte gBattleMainFunc
-_08013510: .4byte bc_80154A0
-_08013514: .4byte gSharedMem
-_08013518: .4byte gNoOfAllBanks
-_0801351C: .4byte 0x0001601d
-_08013520:
-	movs r0, 0
-	mov r7, r8
-	strb r0, [r7]
-	ldr r1, _080135B0 @ =gNoOfAllBanks
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _08013566
-	ldr r6, _080135B4 @ =gActionForBanks
-	mov r2, r8
-	ldr r5, _080135B8 @ =gUnknown_02024A76
-	ldr r4, _080135BC @ =gTurnOrder
-_08013536:
-	ldrb r0, [r2]
-	adds r0, r6
-	ldrb r1, [r0]
-	subs r0, r1, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bhi _08013554
-	adds r0, r3, r5
-	strb r1, [r0]
-	adds r1, r3, r4
-	mov r7, r8
-	ldrb r0, [r7]
-	strb r0, [r1]
-	adds r3, 0x1
-_08013554:
-	ldrb r0, [r2]
-	adds r0, 0x1
-	strb r0, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _080135B0 @ =gNoOfAllBanks
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _08013536
-_08013566:
-	movs r0, 0
-	mov r2, r8
-	strb r0, [r2]
-	ldr r7, _080135B0 @ =gNoOfAllBanks
-	ldrb r0, [r7]
-	cmp r0, 0
-	beq _080135AA
-	ldr r6, _080135B4 @ =gActionForBanks
-	ldr r5, _080135B8 @ =gUnknown_02024A76
-	ldr r4, _080135BC @ =gTurnOrder
-_0801357A:
-	ldrb r0, [r2]
-	adds r0, r6
-	ldrb r1, [r0]
-	subs r0, r1, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _08013598
-	adds r0, r3, r5
-	strb r1, [r0]
-	adds r1, r3, r4
-	mov r7, r8
-	ldrb r0, [r7]
-	strb r0, [r1]
-	adds r3, 0x1
-_08013598:
-	ldrb r0, [r2]
-	adds r0, 0x1
-	strb r0, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _080135B0 @ =gNoOfAllBanks
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0801357A
-_080135AA:
-	movs r5, 0
-	b _08013618
-	.align 2, 0
-_080135B0: .4byte gNoOfAllBanks
-_080135B4: .4byte gActionForBanks
-_080135B8: .4byte gUnknown_02024A76
-_080135BC: .4byte gTurnOrder
-_080135C0:
-	adds r4, r5, 0x1
-	adds r7, r4, 0
-	ldrb r1, [r1]
-	cmp r7, r1
-	bge _08013616
-	ldr r6, _08013640 @ =gUnknown_02024A76
-	lsls r2, r5, 24
-	mov r8, r2
-_080135D0:
-	ldr r0, _08013644 @ =gTurnOrder
-	adds r1, r5, r0
-	ldrb r3, [r1]
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	adds r0, r5, r6
-	ldrb r2, [r0]
-	cmp r2, 0x1
-	beq _0801360C
-	adds r0, r4, r6
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0801360C
-	cmp r2, 0x2
-	beq _0801360C
-	cmp r0, 0x2
-	beq _0801360C
-	adds r0, r3, 0
-	movs r2, 0
-	bl GetWhoStrikesFirst
-	lsls r0, 24
-	cmp r0, 0
-	beq _0801360C
-	lsls r1, r4, 24
-	lsrs r1, 24
-	mov r3, r8
-	lsrs r0, r3, 24
-	bl sub_8012FBC
-_0801360C:
-	adds r4, 0x1
-	ldr r0, _08013648 @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	blt _080135D0
-_08013616:
-	adds r5, r7, 0
-_08013618:
-	ldr r1, _08013648 @ =gNoOfAllBanks
-	ldrb r0, [r1]
-	subs r0, 0x1
-	cmp r5, r0
-	blt _080135C0
-_08013622:
-	ldr r1, _0801364C @ =gBattleMainFunc
-	ldr r0, _08013650 @ =bc_80154A0
-	str r0, [r1]
-	ldr r0, _08013654 @ =gSharedMem
-	ldr r7, _08013658 @ =0x0001601d
-	adds r0, r7
-	movs r1, 0
-	strb r1, [r0]
-_08013632:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013640: .4byte gUnknown_02024A76
-_08013644: .4byte gTurnOrder
-_08013648: .4byte gNoOfAllBanks
-_0801364C: .4byte gBattleMainFunc
-_08013650: .4byte bc_80154A0
-_08013654: .4byte gSharedMem
-_08013658: .4byte 0x0001601d
-	thumb_func_end sub_80133C8
-
-	thumb_func_start TurnValuesCleanUp
-TurnValuesCleanUp: @ 801365C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	ldr r1, _080136B4 @ =gActiveBank
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, _080136B8 @ =gNoOfAllBanks
-	ldrb r2, [r0]
-	adds r5, r1, 0
-	cmp r2, 0
-	beq _08013754
-	ldr r7, _080136BC @ =gProtectStructs
-	adds r6, r5, 0
-	ldr r0, _080136C0 @ =gUnknown_02024AD0
-	mov r12, r0
-	ldr r1, _080136C4 @ =gDisableStructs
-	mov r8, r1
-	mov r10, r8
-_0801368A:
-	mov r2, r9
-	cmp r2, 0
-	beq _080136C8
-	ldrb r1, [r6]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r1, [r6]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	b _08013724
-	.align 2, 0
-_080136B4: .4byte gActiveBank
-_080136B8: .4byte gNoOfAllBanks
-_080136BC: .4byte gProtectStructs
-_080136C0: .4byte gUnknown_02024AD0
-_080136C4: .4byte gDisableStructs
-_080136C8:
-	ldrb r0, [r6]
-	lsls r0, 4
-	adds r2, r0, r7
-	movs r1, 0
-	mov r4, r10
-	movs r3, 0
-_080136D4:
-	adds r0, r2, r1
-	strb r3, [r0]
-	adds r1, 0x1
-	cmp r1, 0xF
-	bls _080136D4
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r1, r0, r4
-	ldrb r0, [r1, 0x16]
-	cmp r0, 0
-	beq _080136F2
-	subs r0, 0x1
-	strb r0, [r1, 0x16]
-_080136F2:
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r1, r0, r4
-	ldrb r0, [r1, 0x19]
-	cmp r0, 0
-	beq _08013724
-	subs r0, 0x1
-	strb r0, [r1, 0x19]
-	ldrb r2, [r5]
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x19]
-	cmp r0, 0
-	bne _08013724
-	movs r0, 0x58
-	muls r2, r0
-	add r2, r12
-	ldr r0, [r2]
-	ldr r1, _0801376C @ =0xffbfffff
-	ands r0, r1
-	str r0, [r2]
-_08013724:
-	ldrb r2, [r5]
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	add r0, r8
-	ldrb r0, [r0, 0xA]
-	cmp r0, 0
-	bne _08013742
-	movs r0, 0x58
-	muls r2, r0
-	add r2, r12
-	ldr r0, [r2]
-	ldr r1, _08013770 @ =0xfeffffff
-	ands r0, r1
-	str r0, [r2]
-_08013742:
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08013774 @ =gNoOfAllBanks
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0801368A
-_08013754:
-	movs r0, 0
-	ldr r2, _08013778 @ =gSideTimer
-	strb r0, [r2, 0x8]
-	strb r0, [r2, 0x14]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801376C: .4byte 0xffbfffff
-_08013770: .4byte 0xfeffffff
-_08013774: .4byte gNoOfAllBanks
-_08013778: .4byte gSideTimer
-	thumb_func_end TurnValuesCleanUp
-
-	thumb_func_start SpecialStatusesClear
-SpecialStatusesClear: @ 801377C
-	push {r4-r6,lr}
-	ldr r2, _080137C0 @ =gActiveBank
-	movs r0, 0
-	strb r0, [r2]
-	ldr r0, _080137C4 @ =gNoOfAllBanks
-	ldrb r1, [r0]
-	adds r6, r0, 0
-	cmp r1, 0
-	beq _080137BA
-	adds r3, r2, 0
-	movs r4, 0
-	ldr r5, _080137C8 @ =gSpecialStatuses
-_08013794:
-	ldrb r1, [r3]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	adds r2, r0, r5
-	movs r1, 0
-_080137A0:
-	adds r0, r2, r1
-	strb r4, [r0]
-	adds r1, 0x1
-	cmp r1, 0x13
-	bls _080137A0
-	ldrb r0, [r3]
-	adds r0, 0x1
-	strb r0, [r3]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r6]
-	cmp r0, r1
-	bcc _08013794
-_080137BA:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080137C0: .4byte gActiveBank
-_080137C4: .4byte gNoOfAllBanks
-_080137C8: .4byte gSpecialStatuses
-	thumb_func_end SpecialStatusesClear
-
-	thumb_func_start bc_80154A0
-bc_80154A0: @ 80137CC
-	push {r4-r7,lr}
-	ldr r0, _08013850 @ =gHitMarker
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 8
-	ands r0, r1
-	cmp r0, 0
-	bne _08013884
-	ldr r0, _08013854 @ =gSharedMem
-	ldr r1, _08013858 @ =0x0001601d
-	adds r2, r0, r1
-	ldr r0, _0801385C @ =gNoOfAllBanks
-	ldrb r1, [r2]
-	adds r7, r0, 0
-	ldrb r0, [r7]
-	cmp r1, r0
-	bcs _08013884
-	ldr r6, _08013860 @ =gActiveBank
-	ldr r5, _08013864 @ =gBankAttacker
-	adds r4, r2, 0
-	movs r1, 0x84
-	lsls r1, 1
-	mov r12, r1
-_080137FA:
-	ldrb r0, [r4]
-	strb r0, [r5]
-	strb r0, [r6]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, _08013868 @ =gChosenMovesByBanks
-	ldrb r3, [r6]
-	lsls r0, r3, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r0, r12
-	bne _0801387C
-	ldr r1, _0801386C @ =gBattleMons
-	movs r0, 0x58
-	muls r0, r3
-	adds r1, 0x4C
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0801387C
-	ldr r2, _08013870 @ =gDisableStructs
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x18]
-	lsls r0, 31
-	cmp r0, 0
-	bne _0801387C
-	ldr r0, _08013874 @ =gProtectStructs
-	lsls r1, r3, 4
-	adds r1, r0
-	ldrb r0, [r1]
-	lsls r0, 29
-	cmp r0, 0
-	blt _0801387C
-	ldr r0, _08013878 @ =BattleScript_FocusPunchSetUp
-	bl b_call_bc_move_exec
-	b _080138BE
-	.align 2, 0
-_08013850: .4byte gHitMarker
-_08013854: .4byte gSharedMem
-_08013858: .4byte 0x0001601d
-_0801385C: .4byte gNoOfAllBanks
-_08013860: .4byte gActiveBank
-_08013864: .4byte gBankAttacker
-_08013868: .4byte gChosenMovesByBanks
-_0801386C: .4byte gBattleMons
-_08013870: .4byte gDisableStructs
-_08013874: .4byte gProtectStructs
-_08013878: .4byte BattleScript_FocusPunchSetUp
-_0801387C:
-	ldrb r0, [r4]
-	ldrb r2, [r7]
-	cmp r0, r2
-	bcc _080137FA
-_08013884:
-	bl b_clear_atk_up_if_hit_flag_unless_enraged
-	ldr r1, _080138C4 @ =gCurrentMoveTurn
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, _080138C8 @ =gFightStateTracker
-	ldr r0, _080138CC @ =gUnknown_02024A76
-	movs r2, 0
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r0, _080138D0 @ =gDynamicBasePower
-	movs r3, 0
-	strh r2, [r0]
-	ldr r1, _080138D4 @ =gSharedMem
-	ldr r2, _080138D8 @ =0x0001601c
-	adds r0, r1, r2
-	strb r3, [r0]
-	ldr r2, _080138DC @ =gBattleMainFunc
-	ldr r0, _080138E0 @ =sub_80138F0
-	str r0, [r2]
-	ldr r0, _080138E4 @ =gBattleCommunication
-	strb r3, [r0, 0x3]
-	strb r3, [r0, 0x4]
-	ldr r2, _080138E8 @ =0x00016112
-	adds r0, r1, r2
-	strb r3, [r0]
-	ldr r0, _080138EC @ =0x00017130
-	adds r1, r0
-	strb r3, [r1]
-_080138BE:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080138C4: .4byte gCurrentMoveTurn
-_080138C8: .4byte gFightStateTracker
-_080138CC: .4byte gUnknown_02024A76
-_080138D0: .4byte gDynamicBasePower
-_080138D4: .4byte gSharedMem
-_080138D8: .4byte 0x0001601c
-_080138DC: .4byte gBattleMainFunc
-_080138E0: .4byte sub_80138F0
-_080138E4: .4byte gBattleCommunication
-_080138E8: .4byte 0x00016112
-_080138EC: .4byte 0x00017130
-	thumb_func_end bc_80154A0
-
-	thumb_func_start sub_80138F0
-sub_80138F0: @ 80138F0
-	push {r4-r6,lr}
-	ldr r6, _08013944 @ =gBattleOutcome
-	ldrb r0, [r6]
-	ldr r2, _08013948 @ =gFightStateTracker
-	cmp r0, 0
-	beq _08013900
-	movs r0, 0xC
-	strb r0, [r2]
-_08013900:
-	ldr r1, _0801394C @ =gSharedMem
-	ldr r4, _08013950 @ =gCurrentMoveTurn
-	ldrb r0, [r4]
-	ldr r3, _08013954 @ =0x00016057
-	adds r5, r1, r3
-	strb r0, [r5]
-	ldr r1, _08013958 @ =gUnknown_081FA640
-	ldrb r0, [r2]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	ldr r0, _0801395C @ =gNoOfAllBanks
-	ldrb r1, [r4]
-	ldrb r0, [r0]
-	cmp r1, r0
-	bcc _08013970
-	ldr r2, _08013960 @ =gHitMarker
-	ldr r0, [r2]
-	ldr r1, _08013964 @ =0xffefffff
-	ands r0, r1
-	str r0, [r2]
-	ldr r3, _08013968 @ =gBattleMainFunc
-	ldr r2, _0801396C @ =gUnknown_081FA678
-	ldrb r1, [r6]
-	movs r0, 0x7F
-	ands r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldr r0, [r0]
-	str r0, [r3]
-	b _08013984
-	.align 2, 0
-_08013944: .4byte gBattleOutcome
-_08013948: .4byte gFightStateTracker
-_0801394C: .4byte gSharedMem
-_08013950: .4byte gCurrentMoveTurn
-_08013954: .4byte 0x00016057
-_08013958: .4byte gUnknown_081FA640
-_0801395C: .4byte gNoOfAllBanks
-_08013960: .4byte gHitMarker
-_08013964: .4byte 0xffefffff
-_08013968: .4byte gBattleMainFunc
-_0801396C: .4byte gUnknown_081FA678
-_08013970:
-	ldrb r0, [r5]
-	cmp r0, r1
-	beq _08013984
-	ldr r2, _0801398C @ =gHitMarker
-	ldr r0, [r2]
-	ldr r1, _08013990 @ =0xfffffdff
-	ands r0, r1
-	ldr r1, _08013994 @ =0xfff7ffff
-	ands r0, r1
-	str r0, [r2]
-_08013984:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801398C: .4byte gHitMarker
-_08013990: .4byte 0xfffffdff
-_08013994: .4byte 0xfff7ffff
-	thumb_func_end sub_80138F0
-
-	thumb_func_start sub_8013998
-sub_8013998: @ 8013998
-	push {r4,lr}
-	ldr r1, _080139D0 @ =gFightStateTracker
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, _080139D4 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _080139EC
-	ldr r1, _080139D8 @ =gBattleTextBuff1
-	ldr r4, _080139DC @ =gBattleOutcome
-	ldrb r0, [r4]
-	strb r0, [r1]
-	movs r0, 0
-	bl GetBankByPlayerAI
-	ldr r1, _080139E0 @ =gBankAttacker
-	strb r0, [r1]
-	ldr r1, _080139E4 @ =gBattlescriptCurrInstr
-	ldr r0, _080139E8 @ =gUnknown_081D8E02
-	str r0, [r1]
-	ldrb r1, [r4]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r4]
-	b _08013B48
-	.align 2, 0
-_080139D0: .4byte gFightStateTracker
-_080139D4: .4byte gBattleTypeFlags
-_080139D8: .4byte gBattleTextBuff1
-_080139DC: .4byte gBattleOutcome
-_080139E0: .4byte gBankAttacker
-_080139E4: .4byte gBattlescriptCurrInstr
-_080139E8: .4byte gUnknown_081D8E02
-_080139EC:
-	movs r0, 0x90
-	lsls r0, 4
-	ands r0, r1
-	cmp r0, 0
-	beq _08013A04
-	ldr r1, _080139FC @ =gBattlescriptCurrInstr
-	ldr r0, _08013A00 @ =gUnknown_081D8E0D
-	b _08013B46
-	.align 2, 0
-_080139FC: .4byte gBattlescriptCurrInstr
-_08013A00: .4byte gUnknown_081D8E0D
-_08013A04:
-	movs r0, 0xA
-	ands r0, r1
-	cmp r0, 0x8
-	beq _08013A0E
-	b _08013B42
-_08013A0E:
-	bl BattleMusicStop
-	ldr r1, _08013A3C @ =gBattlescriptCurrInstr
-	ldr r0, _08013A40 @ =BattleScript_LocalTrainerBattleWon
-	str r0, [r1]
-	ldr r2, _08013A44 @ =gTrainers
-	ldr r0, _08013A48 @ =gTrainerBattleOpponent
-	ldrh r1, [r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	ldrb r0, [r0, 0x1]
-	subs r0, 0x2
-	cmp r0, 0x31
-	bls _08013A30
-	b _08013B38
-_08013A30:
-	lsls r0, 2
-	ldr r1, _08013A4C @ =_08013A50
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08013A3C: .4byte gBattlescriptCurrInstr
-_08013A40: .4byte BattleScript_LocalTrainerBattleWon
-_08013A44: .4byte gTrainers
-_08013A48: .4byte gTrainerBattleOpponent
-_08013A4C: .4byte _08013A50
-	.align 2, 0
-_08013A50:
-	.4byte _08013B24
-	.4byte _08013B24
-	.4byte _08013B24
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B18
-	.4byte _08013B2E
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B18
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B38
-	.4byte _08013B24
-	.4byte _08013B24
-	.4byte _08013B24
-_08013B18:
-	ldr r0, _08013B20 @ =0x00000163
-	bl PlayBGM
-	b _08013B48
-	.align 2, 0
-_08013B20: .4byte 0x00000163
-_08013B24:
-	movs r0, 0xD4
-	lsls r0, 1
-	bl PlayBGM
-	b _08013B48
-_08013B2E:
-	movs r0, 0xB1
-	lsls r0, 1
-	bl PlayBGM
-	b _08013B48
-_08013B38:
-	movs r0, 0xCE
-	lsls r0, 1
-	bl PlayBGM
-	b _08013B48
-_08013B42:
-	ldr r1, _08013B54 @ =gBattlescriptCurrInstr
-	ldr r0, _08013B58 @ =BattleScript_PayDayMoneyAndPickUpItems
-_08013B46:
-	str r0, [r1]
-_08013B48:
-	ldr r1, _08013B5C @ =gBattleMainFunc
-	ldr r0, _08013B60 @ =sub_8013C9C
-	str r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013B54: .4byte gBattlescriptCurrInstr
-_08013B58: .4byte BattleScript_PayDayMoneyAndPickUpItems
-_08013B5C: .4byte gBattleMainFunc
-_08013B60: .4byte sub_8013C9C
-	thumb_func_end sub_8013998
-
-	thumb_func_start sub_8013B64
-sub_8013B64: @ 8013B64
-	push {r4,lr}
-	ldr r1, _08013B9C @ =gFightStateTracker
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, _08013BA0 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08013BB8
-	ldr r1, _08013BA4 @ =gBattleTextBuff1
-	ldr r4, _08013BA8 @ =gBattleOutcome
-	ldrb r0, [r4]
-	strb r0, [r1]
-	movs r0, 0
-	bl GetBankByPlayerAI
-	ldr r1, _08013BAC @ =gBankAttacker
-	strb r0, [r1]
-	ldr r1, _08013BB0 @ =gBattlescriptCurrInstr
-	ldr r0, _08013BB4 @ =gUnknown_081D8E02
-	str r0, [r1]
-	ldrb r1, [r4]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r4]
-	b _08013BBE
-	.align 2, 0
-_08013B9C: .4byte gFightStateTracker
-_08013BA0: .4byte gBattleTypeFlags
-_08013BA4: .4byte gBattleTextBuff1
-_08013BA8: .4byte gBattleOutcome
-_08013BAC: .4byte gBankAttacker
-_08013BB0: .4byte gBattlescriptCurrInstr
-_08013BB4: .4byte gUnknown_081D8E02
-_08013BB8:
-	ldr r1, _08013BCC @ =gBattlescriptCurrInstr
-	ldr r0, _08013BD0 @ =BattleScript_LocalBattleLost
-	str r0, [r1]
-_08013BBE:
-	ldr r1, _08013BD4 @ =gBattleMainFunc
-	ldr r0, _08013BD8 @ =sub_8013C9C
-	str r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013BCC: .4byte gBattlescriptCurrInstr
-_08013BD0: .4byte BattleScript_LocalBattleLost
-_08013BD4: .4byte gBattleMainFunc
-_08013BD8: .4byte sub_8013C9C
-	thumb_func_end sub_8013B64
-
-	thumb_func_start sub_8013BDC
-sub_8013BDC: @ 8013BDC
-	push {lr}
-	ldr r1, _08013C04 @ =gFightStateTracker
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, _08013C08 @ =gProtectStructs
-	ldr r0, _08013C0C @ =gBankAttacker
-	ldrb r0, [r0]
-	lsls r0, 4
-	adds r0, r1
-	ldrb r0, [r0, 0x1]
-	lsls r0, 27
-	lsrs r0, 30
-	cmp r0, 0x1
-	beq _08013C18
-	cmp r0, 0x2
-	beq _08013C28
-	ldr r1, _08013C10 @ =gBattlescriptCurrInstr
-	ldr r0, _08013C14 @ =BattleScript_GotAwaySafely
-	b _08013C2C
-	.align 2, 0
-_08013C04: .4byte gFightStateTracker
-_08013C08: .4byte gProtectStructs
-_08013C0C: .4byte gBankAttacker
-_08013C10: .4byte gBattlescriptCurrInstr
-_08013C14: .4byte BattleScript_GotAwaySafely
-_08013C18:
-	ldr r1, _08013C20 @ =gBattlescriptCurrInstr
-	ldr r0, _08013C24 @ =BattleScript_SmokeBallEscape
-	b _08013C2C
-	.align 2, 0
-_08013C20: .4byte gBattlescriptCurrInstr
-_08013C24: .4byte BattleScript_SmokeBallEscape
-_08013C28:
-	ldr r1, _08013C38 @ =gBattlescriptCurrInstr
-	ldr r0, _08013C3C @ =BattleScript_RanAwayUsingMonAbility
-_08013C2C:
-	str r0, [r1]
-	ldr r1, _08013C40 @ =gBattleMainFunc
-	ldr r0, _08013C44 @ =sub_8013C9C
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013C38: .4byte gBattlescriptCurrInstr
-_08013C3C: .4byte BattleScript_RanAwayUsingMonAbility
-_08013C40: .4byte gBattleMainFunc
-_08013C44: .4byte sub_8013C9C
-	thumb_func_end sub_8013BDC
-
-	thumb_func_start sub_8013C48
-sub_8013C48: @ 8013C48
-	ldr r1, _08013C7C @ =gFightStateTracker
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, _08013C80 @ =gBattleTextBuff1
-	movs r0, 0xFD
-	strb r0, [r1]
-	movs r0, 0x7
-	strb r0, [r1, 0x1]
-	ldr r2, _08013C84 @ =gBankAttacker
-	ldrb r0, [r2]
-	strb r0, [r1, 0x2]
-	ldr r3, _08013C88 @ =gBattlePartyID
-	ldrb r0, [r2]
-	lsls r0, 1
-	adds r0, r3
-	ldrh r0, [r0]
-	strb r0, [r1, 0x3]
-	movs r0, 0xFF
-	strb r0, [r1, 0x4]
-	ldr r1, _08013C8C @ =gBattlescriptCurrInstr
-	ldr r0, _08013C90 @ =BattleScript_WildMonFled
-	str r0, [r1]
-	ldr r1, _08013C94 @ =gBattleMainFunc
-	ldr r0, _08013C98 @ =sub_8013C9C
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_08013C7C: .4byte gFightStateTracker
-_08013C80: .4byte gBattleTextBuff1
-_08013C84: .4byte gBankAttacker
-_08013C88: .4byte gBattlePartyID
-_08013C8C: .4byte gBattlescriptCurrInstr
-_08013C90: .4byte BattleScript_WildMonFled
-_08013C94: .4byte gBattleMainFunc
-_08013C98: .4byte sub_8013C9C
-	thumb_func_end sub_8013C48
-
-	thumb_func_start sub_8013C9C
-sub_8013C9C: @ 8013C9C
-	push {r4-r7,lr}
-	ldr r0, _08013D00 @ =gFightStateTracker
-	ldrb r0, [r0]
-	subs r0, 0xB
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bhi _08013D7C
-	ldr r0, _08013D04 @ =gBattleTypeFlags
-	ldrh r0, [r0]
-	ldr r1, _08013D08 @ =0x00000b92
-	ands r1, r0
-	cmp r1, 0
-	bne _08013D4C
-	ldr r2, _08013D0C @ =gActiveBank
-	strb r1, [r2]
-	ldr r0, _08013D10 @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r1, r0
-	bcs _08013D48
-	adds r4, r2, 0
-	ldr r6, _08013D14 @ =gBattleMons
-	movs r5, 0x58
-	adds r7, r6, 0
-	adds r7, 0x30
-_08013CCE:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _08013D36
-	ldr r2, _08013D18 @ =gBattleResults
-	ldrh r0, [r2, 0x6]
-	cmp r0, 0
-	bne _08013D1C
-	ldrb r0, [r4]
-	muls r0, r5
-	adds r0, r6
-	ldrh r0, [r0]
-	strh r0, [r2, 0x6]
-	ldrb r0, [r4]
-	adds r1, r0, 0
-	muls r1, r5
-	adds r1, r7
-	adds r0, r2, 0
-	adds r0, 0x8
-	bl StringCopy
-	b _08013D36
-	.align 2, 0
-_08013D00: .4byte gFightStateTracker
-_08013D04: .4byte gBattleTypeFlags
-_08013D08: .4byte 0x00000b92
-_08013D0C: .4byte gActiveBank
-_08013D10: .4byte gNoOfAllBanks
-_08013D14: .4byte gBattleMons
-_08013D18: .4byte gBattleResults
-_08013D1C:
-	ldrb r0, [r4]
-	muls r0, r5
-	adds r0, r6
-	ldrh r0, [r0]
-	strh r0, [r2, 0x26]
-	ldrb r0, [r4]
-	adds r1, r0, 0
-	muls r1, r5
-	adds r1, r7
-	adds r0, r2, 0
-	adds r0, 0x14
-	bl StringCopy
-_08013D36:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, _08013D68 @ =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _08013CCE
-_08013D48:
-	bl sub_80BDEC8
-_08013D4C:
-	movs r0, 0x3
-	bl BeginFastPaletteFade
-	movs r0, 0x5
-	bl FadeOutMapMusic
-	ldr r1, _08013D6C @ =gBattleMainFunc
-	ldr r0, _08013D70 @ =sub_8013DA8
-	str r0, [r1]
-	ldr r1, _08013D74 @ =gCB2_AfterEvolution
-	ldr r0, _08013D78 @ =sub_800F808
-	str r0, [r1]
-	b _08013D96
-	.align 2, 0
-_08013D68: .4byte gNoOfAllBanks
-_08013D6C: .4byte gBattleMainFunc
-_08013D70: .4byte sub_8013DA8
-_08013D74: .4byte gCB2_AfterEvolution
-_08013D78: .4byte sub_800F808
-_08013D7C:
-	ldr r0, _08013D9C @ =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _08013D96
-	ldr r1, _08013DA0 @ =gBattleScriptingCommandsTable
-	ldr r0, _08013DA4 @ =gBattlescriptCurrInstr
-	ldr r0, [r0]
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-_08013D96:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013D9C: .4byte gBattleExecBuffer
-_08013DA0: .4byte gBattleScriptingCommandsTable
-_08013DA4: .4byte gBattlescriptCurrInstr
-	thumb_func_end sub_8013C9C
-
-	thumb_func_start sub_8013DA8
-sub_8013DA8: @ 8013DA8
-	push {lr}
-	ldr r0, _08013DD0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08013DEA
-	bl ResetSpriteData
-	ldr r0, _08013DD4 @ =gLeveledUpInBattle
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08013DCA
-	ldr r0, _08013DD8 @ =gBattleOutcome
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _08013DE4
-_08013DCA:
-	ldr r1, _08013DDC @ =gBattleMainFunc
-	ldr r0, _08013DE0 @ =c4_overworld
-	b _08013DE8
-	.align 2, 0
-_08013DD0: .4byte gPaletteFade
-_08013DD4: .4byte gLeveledUpInBattle
-_08013DD8: .4byte gBattleOutcome
-_08013DDC: .4byte gBattleMainFunc
-_08013DE0: .4byte c4_overworld
-_08013DE4:
-	ldr r1, _08013DF0 @ =gBattleMainFunc
-	ldr r0, _08013DF4 @ =bc_evolution_cutscene
-_08013DE8:
-	str r0, [r1]
-_08013DEA:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013DF0: .4byte gBattleMainFunc
-_08013DF4: .4byte bc_evolution_cutscene
-	thumb_func_end sub_8013DA8
-
-	thumb_func_start bc_evolution_cutscene
-bc_evolution_cutscene: @ 8013DF8
-	push {r4,r5,lr}
-	ldr r0, _08013E4C @ =gLeveledUpInBattle
-	ldrb r1, [r0]
-	adds r3, r0, 0
-	cmp r1, 0
-	beq _08013E6E
-_08013E04:
-	movs r5, 0
-_08013E06:
-	ldrb r2, [r3]
-	ldr r0, _08013E50 @ =gBitTable
-	lsls r1, r5, 2
-	adds r1, r0
-	ldr r1, [r1]
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08013E60
-	bics r2, r1
-	strb r2, [r3]
-	movs r0, 0x64
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, _08013E54 @ =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetEvolutionTargetSpecies
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r2, 0
-	beq _08013E60
-	ldr r0, _08013E58 @ =gBattleMainFunc
-	ldr r1, _08013E5C @ =sub_8013E88
-	str r1, [r0]
-	lsls r3, r5, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r2, 0
-	movs r2, 0x81
-	bl EvolutionScene
-	b _08013E74
-	.align 2, 0
-_08013E4C: .4byte gLeveledUpInBattle
-_08013E50: .4byte gBitTable
-_08013E54: .4byte gPlayerParty
-_08013E58: .4byte gBattleMainFunc
-_08013E5C: .4byte sub_8013E88
-_08013E60:
-	adds r5, 0x1
-	ldr r3, _08013E7C @ =gLeveledUpInBattle
-	cmp r5, 0x5
-	ble _08013E06
-	ldrb r0, [r3]
-	cmp r0, 0
-	bne _08013E04
-_08013E6E:
-	ldr r1, _08013E80 @ =gBattleMainFunc
-	ldr r0, _08013E84 @ =c4_overworld
-	str r0, [r1]
-_08013E74:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013E7C: .4byte gLeveledUpInBattle
-_08013E80: .4byte gBattleMainFunc
-_08013E84: .4byte c4_overworld
-	thumb_func_end bc_evolution_cutscene
-
-	thumb_func_start sub_8013E88
-sub_8013E88: @ 8013E88
-	push {lr}
-	ldr r0, _08013EA0 @ =gMain
-	ldr r1, [r0, 0x4]
-	ldr r0, _08013EA4 @ =sub_800F808
-	cmp r1, r0
-	bne _08013E9A
-	ldr r1, _08013EA8 @ =gBattleMainFunc
-	ldr r0, _08013EAC @ =bc_evolution_cutscene
-	str r0, [r1]
-_08013E9A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013EA0: .4byte gMain
-_08013EA4: .4byte sub_800F808
-_08013EA8: .4byte gBattleMainFunc
-_08013EAC: .4byte bc_evolution_cutscene
-	thumb_func_end sub_8013E88
-
-	thumb_func_start c4_overworld
-c4_overworld: @ 8013EB0
-	push {r4-r6,lr}
-	ldr r5, _08013F30 @ =gBattleTypeFlags
-	ldrh r1, [r5]
-	movs r6, 0x2
-	adds r0, r6, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _08013ECE
-	ldr r4, _08013F34 @ =gPlayerParty
-	adds r0, r4, 0
-	bl RandomlyGivePartyPokerus
-	adds r0, r4, 0
-	bl PartySpreadPokerus
-_08013ECE:
-	ldrh r4, [r5]
-	adds r0, r6, 0
-	ands r0, r4
-	cmp r0, 0
-	beq _08013EE0
-	ldr r0, _08013F38 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08013F2A
-_08013EE0:
-	ldr r1, _08013F3C @ =gSpecialVar_Result
-	ldr r5, _08013F40 @ =gBattleOutcome
-	ldrb r0, [r5]
-	strh r0, [r1]
-	ldr r3, _08013F44 @ =gMain
-	ldr r0, _08013F48 @ =0x0000043d
-	adds r2, r3, r0
-	ldrb r1, [r2]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	ldr r0, _08013F4C @ =gPreBattleCallback1
-	ldr r0, [r0]
-	str r0, [r3]
-	movs r0, 0x80
-	lsls r0, 3
-	ands r0, r4
-	cmp r0, 0
-	beq _08013F1C
-	ldr r0, _08013F50 @ =gEnemyParty
-	bl UpdateRoamerHPStatus
-	ldrb r0, [r5]
-	cmp r0, 0x1
-	beq _08013F18
-	cmp r0, 0x7
-	bne _08013F1C
-_08013F18:
-	bl SetRoamerInactive
-_08013F1C:
-	movs r0, 0x5A
-	bl m4aSongNumStop
-	ldr r0, _08013F44 @ =gMain
-	ldr r0, [r0, 0x8]
-	bl SetMainCallback2
-_08013F2A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013F30: .4byte gBattleTypeFlags
-_08013F34: .4byte gPlayerParty
-_08013F38: .4byte gReceivedRemoteLinkPlayers
-_08013F3C: .4byte gSpecialVar_Result
-_08013F40: .4byte gBattleOutcome
-_08013F44: .4byte gMain
-_08013F48: .4byte 0x0000043d
-_08013F4C: .4byte gPreBattleCallback1
-_08013F50: .4byte gEnemyParty
-	thumb_func_end c4_overworld
-
-	thumb_func_start sub_8013F54
-sub_8013F54: @ 8013F54
-	push {lr}
-	ldr r0, _08013F84 @ =gFightStateTracker
-	ldrb r0, [r0]
-	subs r0, 0xB
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bhi _08013F90
-	ldr r2, _08013F88 @ =gSharedMem + 0x17140
-	adds r1, r2, 0
-	adds r1, 0x20
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _08013F74
-	subs r0, 0x1
-	strb r0, [r1]
-_08013F74:
-	ldr r0, _08013F8C @ =gBattleMainFunc
-	ldrb r1, [r1]
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	str r1, [r0]
-	b _08013FAA
-	.align 2, 0
-_08013F84: .4byte gFightStateTracker
-_08013F88: .4byte gSharedMem + 0x17140
-_08013F8C: .4byte gBattleMainFunc
-_08013F90:
-	ldr r0, _08013FB0 @ =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _08013FAA
-	ldr r1, _08013FB4 @ =gBattleScriptingCommandsTable
-	ldr r0, _08013FB8 @ =gBattlescriptCurrInstr
-	ldr r0, [r0]
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-_08013FAA:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013FB0: .4byte gBattleExecBuffer
-_08013FB4: .4byte gBattleScriptingCommandsTable
-_08013FB8: .4byte gBattlescriptCurrInstr
-	thumb_func_end sub_8013F54
-
-	thumb_func_start sub_8013FBC
-sub_8013FBC: @ 8013FBC
-	push {lr}
-	ldr r0, _08013FDC @ =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _08013FD8
-	ldr r1, _08013FE0 @ =gBattleScriptingCommandsTable
-	ldr r0, _08013FE4 @ =gBattlescriptCurrInstr
-	ldr r0, [r0]
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-_08013FD8:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08013FDC: .4byte gBattleExecBuffer
-_08013FE0: .4byte gBattleScriptingCommandsTable
-_08013FE4: .4byte gBattlescriptCurrInstr
-	thumb_func_end sub_8013FBC
-
-	thumb_func_start sub_8013FE8
-sub_8013FE8: @ 8013FE8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	movs r0, 0x4
-	str r0, [sp]
-	ldr r7, _08014028 @ =gBankAttacker
-	ldr r1, _0801402C @ =gTurnOrder
-	ldr r0, _08014030 @ =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r7]
-	ldr r1, _08014034 @ =gSharedMem
-	mov r10, r1
-	ldr r0, _08014038 @ =0x000160a6
-	add r0, r10
-	ldrb r2, [r0]
-	ldr r1, _0801403C @ =gBitTable
-	ldrb r0, [r7]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ands r2, r0
-	cmp r2, 0
-	beq _08014044
-	ldr r1, _08014040 @ =gFightStateTracker
-	movs r0, 0xC
-	b _080146CC
-	.align 2, 0
-_08014028: .4byte gBankAttacker
-_0801402C: .4byte gTurnOrder
-_08014030: .4byte gCurrentMoveTurn
-_08014034: .4byte gSharedMem
-_08014038: .4byte 0x000160a6
-_0801403C: .4byte gBitTable
-_08014040: .4byte gFightStateTracker
-_08014044:
-	ldr r1, _080140B8 @ =gCritMultiplier
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r1, _080140BC @ =0x0001601f
-	add r1, r10
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, _080140C0 @ =0x000160e7
-	add r0, r10
-	strb r2, [r0]
-	ldr r0, _080140C4 @ =gBattleMoveFlags
-	strb r2, [r0]
-	ldr r0, _080140C8 @ =gMultiHitCounter
-	strb r2, [r0]
-	ldr r0, _080140CC @ =gBattleCommunication
-	strb r2, [r0, 0x6]
-	ldr r3, _080140D0 @ =gCurrMovePos
-	ldrb r0, [r7]
-	ldr r2, _080140D4 @ =0x0001608c
-	adds r0, r2
-	add r0, r10
-	ldrb r0, [r0]
-	ldr r4, _080140D8 @ =gUnknown_02024BE5
-	strb r0, [r4]
-	strb r0, [r3]
-	ldr r1, _080140DC @ =gProtectStructs
-	ldrb r2, [r7]
-	lsls r0, r2, 4
-	adds r5, r0, r1
-	ldrb r1, [r5]
-	lsls r0, r1, 29
-	adds r4, r2, 0
-	mov r8, r3
-	cmp r0, 0
-	bge _080140F0
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r5]
-	ldr r2, _080140E0 @ =gCurrentMove
-	ldr r1, _080140E4 @ =gChosenMove
-	movs r0, 0xA5
-	strh r0, [r1]
-	strh r0, [r2]
-	ldr r2, _080140E8 @ =gHitMarker
-	ldr r0, [r2]
-	movs r1, 0x80
-	lsls r1, 4
-	orrs r0, r1
-	str r0, [r2]
-	movs r0, 0xA5
-	movs r1, 0
-	bl GetMoveTarget
-	ldrb r1, [r7]
-	ldr r2, _080140EC @ =0x00016010
-	adds r1, r2
-	b _08014200
-	.align 2, 0
-_080140B8: .4byte gCritMultiplier
-_080140BC: .4byte 0x0001601f
-_080140C0: .4byte 0x000160e7
-_080140C4: .4byte gBattleMoveFlags
-_080140C8: .4byte gMultiHitCounter
-_080140CC: .4byte gBattleCommunication
-_080140D0: .4byte gCurrMovePos
-_080140D4: .4byte 0x0001608c
-_080140D8: .4byte gUnknown_02024BE5
-_080140DC: .4byte gProtectStructs
-_080140E0: .4byte gCurrentMove
-_080140E4: .4byte gChosenMove
-_080140E8: .4byte gHitMarker
-_080140EC: .4byte 0x00016010
-_080140F0:
-	ldr r1, _08014128 @ =gBattleMons
-	movs r0, 0x58
-	adds r5, r4, 0
-	muls r5, r0
-	adds r0, r1, 0
-	adds r0, 0x50
-	adds r0, r5, r0
-	ldr r2, [r0]
-	movs r0, 0x80
-	lsls r0, 5
-	ands r0, r2
-	cmp r0, 0
-	bne _08014114
-	movs r6, 0x80
-	lsls r6, 15
-	ands r6, r2
-	cmp r6, 0
-	beq _08014138
-_08014114:
-	ldr r3, _0801412C @ =gCurrentMove
-	ldr r2, _08014130 @ =gChosenMove
-	ldr r1, _08014134 @ =gLockedMove
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	strh r0, [r2]
-	strh r0, [r3]
-	b _08014280
-	.align 2, 0
-_08014128: .4byte gBattleMons
-_0801412C: .4byte gCurrentMove
-_08014130: .4byte gChosenMove
-_08014134: .4byte gLockedMove
-_08014138:
-	ldr r3, _08014188 @ =gDisableStructs
-	mov r12, r3
-	lsls r0, r4, 3
-	subs r0, r4
-	lsls r0, 2
-	adds r2, r0, r3
-	ldrh r4, [r2, 0x6]
-	adds r1, r4, 0
-	cmp r1, 0
-	beq _08014218
-	ldrb r3, [r2, 0xC]
-	lsls r0, r3, 1
-	adds r0, r5
-	str r0, [sp, 0x8]
-	ldr r0, _0801418C @ =gBattleMons
-	adds r0, 0xC
-	mov r9, r0
-	ldr r0, [sp, 0x8]
-	add r0, r9
-	ldrh r0, [r0]
-	cmp r1, r0
-	bne _080141A0
-	ldr r1, _08014190 @ =gCurrentMove
-	ldr r0, _08014194 @ =gChosenMove
-	strh r4, [r0]
-	strh r4, [r1]
-	ldrb r0, [r2, 0xC]
-	ldr r2, _08014198 @ =gUnknown_02024BE5
-	strb r0, [r2]
-	mov r3, r8
-	strb r0, [r3]
-	ldrh r0, [r1]
-	movs r1, 0
-	bl GetMoveTarget
-	ldrb r1, [r7]
-	ldr r4, _0801419C @ =0x00016010
-	adds r1, r4
-	b _08014200
-	.align 2, 0
-_08014188: .4byte gDisableStructs
-_0801418C: .4byte gBattleMons
-_08014190: .4byte gCurrentMove
-_08014194: .4byte gChosenMove
-_08014198: .4byte gUnknown_02024BE5
-_0801419C: .4byte 0x00016010
-_080141A0:
-	cmp r1, 0
-	beq _08014218
-	cmp r1, r0
-	beq _08014218
-	ldr r0, _08014208 @ =gUnknown_02024BE5
-	strb r3, [r0]
-	mov r1, r8
-	strb r3, [r1]
-	ldr r3, _0801420C @ =gCurrentMove
-	ldr r1, _08014210 @ =gChosenMove
-	mov r2, r8
-	ldrb r0, [r2]
-	lsls r0, 1
-	adds r0, r5
-	add r0, r9
-	ldrh r0, [r0]
-	strh r0, [r1]
-	strh r0, [r3]
-	ldrb r1, [r7]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	movs r2, 0
-	strh r6, [r0, 0x6]
-	ldrb r1, [r7]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	strb r2, [r0, 0xC]
-	ldrb r0, [r7]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	add r1, r12
-	ldrb r2, [r1, 0xE]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0xE]
-	ldrh r0, [r3]
-	movs r1, 0
-	bl GetMoveTarget
-	ldrb r1, [r7]
-	ldr r3, _08014214 @ =0x00016010
-	adds r1, r3
-_08014200:
-	add r1, r10
-	strb r0, [r1]
-	b _08014280
-	.align 2, 0
-_08014208: .4byte gUnknown_02024BE5
-_0801420C: .4byte gCurrentMove
-_08014210: .4byte gChosenMove
-_08014214: .4byte 0x00016010
-_08014218:
-	mov r4, r8
-	ldrb r0, [r4]
-	lsls r0, 1
-	ldr r4, _0801425C @ =gBankAttacker
-	ldrb r2, [r4]
-	movs r1, 0x58
-	muls r1, r2
-	adds r0, r1
-	ldr r1, _08014260 @ =gBattleMons
-	adds r1, 0xC
-	adds r0, r1
-	ldr r1, _08014264 @ =gChosenMovesByBanks
-	lsls r2, 1
-	adds r2, r1
-	ldrh r3, [r0]
-	ldrh r2, [r2]
-	cmp r3, r2
-	beq _08014278
-	ldr r1, _08014268 @ =gCurrentMove
-	ldr r0, _0801426C @ =gChosenMove
-	strh r3, [r0]
-	strh r3, [r1]
-	ldrh r0, [r1]
-	movs r1, 0
-	bl GetMoveTarget
-	ldr r2, _08014270 @ =gSharedMem
-	ldrb r1, [r4]
-	ldr r3, _08014274 @ =0x00016010
-	adds r1, r3
-	adds r1, r2
-	strb r0, [r1]
-	b _08014280
-	.align 2, 0
-_0801425C: .4byte gBankAttacker
-_08014260: .4byte gBattleMons
-_08014264: .4byte gChosenMovesByBanks
-_08014268: .4byte gCurrentMove
-_0801426C: .4byte gChosenMove
-_08014270: .4byte gSharedMem
-_08014274: .4byte 0x00016010
-_08014278:
-	ldr r1, _08014298 @ =gCurrentMove
-	ldr r0, _0801429C @ =gChosenMove
-	strh r3, [r0]
-	strh r3, [r1]
-_08014280:
-	ldr r0, _080142A0 @ =gBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080142A8
-	ldr r0, _080142A4 @ =gBattleResults
-	ldr r1, _08014298 @ =gCurrentMove
-	ldrh r1, [r1]
-	strh r1, [r0, 0x22]
-	b _080142B0
-	.align 2, 0
-_08014298: .4byte gCurrentMove
-_0801429C: .4byte gChosenMove
-_080142A0: .4byte gBankAttacker
-_080142A4: .4byte gBattleResults
-_080142A8:
-	ldr r0, _08014314 @ =gBattleResults
-	ldr r1, _08014318 @ =gCurrentMove
-	ldrh r1, [r1]
-	strh r1, [r0, 0x24]
-_080142B0:
-	ldr r4, _0801431C @ =gBankAttacker
-	ldrb r0, [r4]
-	bl GetBankSide
-	movs r1, 0x1
-	eors r0, r1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, _08014320 @ =gSideTimer
-	lsls r0, r6, 1
-	adds r0, r6
-	lsls r0, 2
-	adds r5, r0, r1
-	ldrb r0, [r5, 0x8]
-	adds r3, r4, 0
-	cmp r0, 0
-	beq _08014330
-	ldr r2, _08014324 @ =gBattleMoves
-	ldr r0, _08014318 @ =gCurrentMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x6]
-	cmp r0, 0
-	bne _08014330
-	ldrb r0, [r3]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldrb r0, [r5, 0x9]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	beq _08014330
-	ldr r1, _08014328 @ =gBattleMons
-	ldrb r2, [r5, 0x9]
-	movs r0, 0x58
-	muls r0, r2
-	adds r0, r1
-	ldrh r0, [r0, 0x28]
-	cmp r0, 0
-	beq _08014330
-	ldr r0, _0801432C @ =gBankTarget
-	strb r2, [r0]
-	b _080146AC
-	.align 2, 0
-_08014314: .4byte gBattleResults
-_08014318: .4byte gCurrentMove
-_0801431C: .4byte gBankAttacker
-_08014320: .4byte gSideTimer
-_08014324: .4byte gBattleMoves
-_08014328: .4byte gBattleMons
-_0801432C: .4byte gBankTarget
-_08014330:
-	ldr r2, _08014454 @ =gBattleTypeFlags
-	ldrh r1, [r2]
-	movs r0, 0x1
-	ands r0, r1
-	ldr r3, _08014458 @ =gBankAttacker
-	mov r9, r2
-	cmp r0, 0
-	bne _08014342
-	b _0801461C
-_08014342:
-	ldr r1, _0801445C @ =gSideTimer
-	lsls r0, r6, 1
-	adds r0, r6
-	lsls r0, 2
-	adds r0, r1
-	ldrb r7, [r0, 0x8]
-	cmp r7, 0
-	beq _08014354
-	b _08014570
-_08014354:
-	ldr r2, _08014460 @ =gBattleMoves
-	ldr r0, _08014464 @ =gCurrentMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r4, r0, r2
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	bne _08014370
-	ldrb r0, [r4, 0x6]
-	cmp r0, 0x10
-	bne _08014370
-	b _08014570
-_08014370:
-	ldr r3, _08014468 @ =gBattleMons
-	ldr r0, _0801446C @ =gSharedMem
-	mov r8, r0
-	ldr r2, _08014458 @ =gBankAttacker
-	ldrb r5, [r2]
-	ldr r1, _08014470 @ =0x00016010
-	adds r0, r5, r1
-	add r0, r8
-	ldrb r1, [r0]
-	movs r0, 0x58
-	muls r0, r1
-	adds r0, r3
-	adds r0, 0x20
-	ldrb r0, [r0]
-	adds r3, r2, 0
-	cmp r0, 0x1F
-	bne _08014394
-	b _08014570
-_08014394:
-	ldrb r0, [r4, 0x2]
-	cmp r0, 0xD
-	beq _0801439C
-	b _08014570
-_0801439C:
-	adds r0, r5, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, _08014474 @ =gActiveBank
-	strb r7, [r1]
-	ldr r0, _08014478 @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r7, r0
-	bcs _08014416
-	adds r4, r1, 0
-	mov r5, r8
-_080143B6:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r6, r0
-	beq _08014404
-	ldr r0, _08014458 @ =gBankAttacker
-	ldrb r0, [r0]
-	ldr r2, _08014470 @ =0x00016010
-	adds r0, r2
-	adds r0, r5
-	ldrb r0, [r0]
-	ldrb r3, [r4]
-	cmp r0, r3
-	beq _08014404
-	ldr r1, _08014468 @ =gBattleMons
-	ldrb r2, [r4]
-	movs r0, 0x58
-	muls r0, r2
-	adds r0, r1
-	adds r0, 0x20
-	ldrb r0, [r0]
-	cmp r0, 0x1F
-	bne _08014404
-	adds r0, r2, 0
-	bl BankGetTurnOrder
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [sp]
-	cmp r0, r1
-	bcs _08014404
-	ldrb r0, [r4]
-	bl BankGetTurnOrder
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-_08014404:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, _08014478 @ =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _080143B6
-_08014416:
-	ldr r2, [sp]
-	cmp r2, 0x4
-	beq _0801441E
-	b _08014522
-_0801441E:
-	ldr r2, _08014460 @ =gBattleMoves
-	ldr r0, _0801447C @ =gChosenMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x6]
-	ldr r3, [sp]
-	ands r3, r0
-	cmp r3, 0
-	beq _080144A4
-	ldr r0, _08014458 @ =gBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _08014484
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _08014480
-	movs r0, 0x1
-	b _08014496
-	.align 2, 0
-_08014454: .4byte gBattleTypeFlags
-_08014458: .4byte gBankAttacker
-_0801445C: .4byte gSideTimer
-_08014460: .4byte gBattleMoves
-_08014464: .4byte gCurrentMove
-_08014468: .4byte gBattleMons
-_0801446C: .4byte gSharedMem
-_08014470: .4byte 0x00016010
-_08014474: .4byte gActiveBank
-_08014478: .4byte gNoOfAllBanks
-_0801447C: .4byte gChosenMove
-_08014480:
-	movs r0, 0x3
-	b _08014496
-_08014484:
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _08014494
-	movs r0, 0
-	b _08014496
-_08014494:
-	movs r0, 0x2
-_08014496:
-	bl GetBankByPlayerAI
-	ldr r1, _080144A0 @ =gBankTarget
-	strb r0, [r1]
-	b _080144B6
-	.align 2, 0
-_080144A0: .4byte gBankTarget
-_080144A4:
-	ldr r2, _080144EC @ =gBankTarget
-	ldr r1, _080144F0 @ =gSharedMem
-	ldr r0, _080144F4 @ =gBankAttacker
-	ldrb r0, [r0]
-	ldr r4, _080144F8 @ =0x00016010
-	adds r0, r4
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-_080144B6:
-	ldr r7, _080144FC @ =gAbsentBankFlags
-	ldrb r0, [r7]
-	ldr r1, _08014500 @ =gBitTable
-	mov r8, r1
-	ldr r5, _080144EC @ =gBankTarget
-	ldrb r1, [r5]
-	lsls r1, 2
-	add r1, r8
-	ldr r1, [r1]
-	ands r0, r1
-	cmp r0, 0
-	bne _080144D0
-	b _080146AC
-_080144D0:
-	ldr r6, _080144F4 @ =gBankAttacker
-	ldrb r0, [r6]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	beq _08014504
-	ldrb r0, [r5]
-	b _0801469A
-	.align 2, 0
-_080144EC: .4byte gBankTarget
-_080144F0: .4byte gSharedMem
-_080144F4: .4byte gBankAttacker
-_080144F8: .4byte 0x00016010
-_080144FC: .4byte gAbsentBankFlags
-_08014500: .4byte gBitTable
-_08014504:
-	ldrb r0, [r6]
-	bl GetBankIdentity
-	movs r1, 0x1
-	eors r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByPlayerAI
-	strb r0, [r5]
-	ldrb r1, [r7]
-	ldrb r2, [r5]
-	lsls r0, r2, 2
-	add r0, r8
-	b _08014690
-_08014522:
-	ldr r4, _0801455C @ =gActiveBank
-	ldr r0, _08014560 @ =gTurnOrder
-	ldr r2, [sp]
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	strb r0, [r4]
-	ldrb r0, [r4]
-	ldr r2, _08014564 @ =gBattleMons
-	movs r1, 0x58
-	muls r1, r0
-	adds r1, r2
-	adds r1, 0x20
-	ldrb r1, [r1]
-	bl RecordAbilityBattle
-	ldr r2, _08014568 @ =gSpecialStatuses
-	ldrb r1, [r4]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0]
-	movs r2, 0x2
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r1, _0801456C @ =gBankTarget
-	ldrb r0, [r4]
-	strb r0, [r1]
-	b _080146AC
-	.align 2, 0
-_0801455C: .4byte gActiveBank
-_08014560: .4byte gTurnOrder
-_08014564: .4byte gBattleMons
-_08014568: .4byte gSpecialStatuses
-_0801456C: .4byte gBankTarget
-_08014570:
-	mov r4, r9
-	ldrh r1, [r4]
-	movs r4, 0x1
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0801461C
-	ldr r2, _080145B4 @ =gBattleMoves
-	ldr r0, _080145B8 @ =gChosenMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x6]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _0801461C
-	ldrb r0, [r3]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080145C0
-	bl Random
-	adds r1, r4, 0
-	ands r1, r0
-	cmp r1, 0
-	beq _080145BC
-	movs r0, 0x1
-	b _080145D2
-	.align 2, 0
-_080145B4: .4byte gBattleMoves
-_080145B8: .4byte gChosenMove
-_080145BC:
-	movs r0, 0x3
-	b _080145D2
-_080145C0:
-	bl Random
-	adds r1, r4, 0
-	ands r1, r0
-	cmp r1, 0
-	beq _080145D0
-	movs r0, 0
-	b _080145D2
-_080145D0:
-	movs r0, 0x2
-_080145D2:
-	bl GetBankByPlayerAI
-	ldr r1, _0801460C @ =gBankTarget
-	strb r0, [r1]
-	ldr r0, _08014610 @ =gAbsentBankFlags
-	ldrb r1, [r0]
-	ldr r2, _08014614 @ =gBitTable
-	ldr r5, _0801460C @ =gBankTarget
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _080146AC
-	ldr r0, _08014618 @ =gBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	beq _080146AC
-	ldrb r0, [r5]
-	b _0801469A
-	.align 2, 0
-_0801460C: .4byte gBankTarget
-_08014610: .4byte gAbsentBankFlags
-_08014614: .4byte gBitTable
-_08014618: .4byte gBankAttacker
-_0801461C:
-	ldr r5, _08014660 @ =gBankTarget
-	ldr r1, _08014664 @ =gSharedMem
-	adds r2, r3, 0
-	ldrb r0, [r2]
-	ldr r4, _08014668 @ =0x00016010
-	adds r0, r4
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r5]
-	ldr r6, _0801466C @ =gAbsentBankFlags
-	ldrb r1, [r6]
-	ldr r7, _08014670 @ =gBitTable
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r7
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _080146AC
-	ldrb r0, [r2]
-	str r3, [sp, 0x4]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	ldr r3, [sp, 0x4]
-	cmp r4, r0
-	beq _08014674
-	ldrb r0, [r5]
-	b _0801469A
-	.align 2, 0
-_08014660: .4byte gBankTarget
-_08014664: .4byte gSharedMem
-_08014668: .4byte 0x00016010
-_0801466C: .4byte gAbsentBankFlags
-_08014670: .4byte gBitTable
-_08014674:
-	ldrb r0, [r3]
-	bl GetBankIdentity
-	movs r1, 0x1
-	eors r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByPlayerAI
-	strb r0, [r5]
-	ldrb r1, [r6]
-	ldrb r2, [r5]
-	lsls r0, r2, 2
-	adds r0, r7
-_08014690:
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _080146AC
-	adds r0, r2, 0
-_0801469A:
-	bl GetBankIdentity
-	movs r1, 0x2
-	eors r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByPlayerAI
-	strb r0, [r5]
-_080146AC:
-	ldr r4, _080146E0 @ =gBattlescriptCurrInstr
-	ldr r3, _080146E4 @ =gBattleScriptsForMoveEffects
-	ldr r2, _080146E8 @ =gBattleMoves
-	ldr r0, _080146EC @ =gCurrentMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r3
-	ldr r0, [r0]
-	str r0, [r4]
-	ldr r1, _080146F0 @ =gFightStateTracker
-	movs r0, 0xA
-_080146CC:
-	strb r0, [r1]
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080146E0: .4byte gBattlescriptCurrInstr
-_080146E4: .4byte gBattleScriptsForMoveEffects
-_080146E8: .4byte gBattleMoves
-_080146EC: .4byte gCurrentMove
-_080146F0: .4byte gFightStateTracker
-	thumb_func_end sub_8013FE8
-
-	thumb_func_start sub_80146F4
-sub_80146F4: @ 80146F4
-	push {r4,lr}
-	ldr r3, _08014764 @ =gBankAttacker
-	ldr r1, _08014768 @ =gTurnOrder
-	ldr r0, _0801476C @ =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r3]
-	ldr r0, _08014770 @ =gUnknown_030042A4
-	movs r2, 0
-	strh r2, [r0]
-	ldr r0, _08014774 @ =gUnknown_030042A0
-	strh r2, [r0]
-	ldr r1, _08014778 @ =gActionSelectionCursor
-	ldrb r0, [r3]
-	adds r0, r1
-	strb r2, [r0]
-	ldr r1, _0801477C @ =gMoveSelectionCursor
-	ldrb r0, [r3]
-	adds r0, r1
-	strb r2, [r0]
-	ldr r2, _08014780 @ =gBattleTextBuff1
-	movs r0, 0xFD
-	strb r0, [r2]
-	movs r0, 0x7
-	strb r0, [r2, 0x1]
-	ldrb r4, [r3]
-	strb r4, [r2, 0x2]
-	ldr r1, _08014784 @ =gSharedMem
-	ldrb r0, [r3]
-	ldr r3, _08014788 @ =0x00016064
-	adds r0, r3
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2, 0x3]
-	movs r0, 0xFF
-	strb r0, [r2, 0x4]
-	ldr r0, _0801478C @ =0x00016003
-	adds r1, r0
-	strb r4, [r1]
-	ldr r1, _08014790 @ =gBattlescriptCurrInstr
-	ldr r0, _08014794 @ =BattleScript_ActionSwitch
-	str r0, [r1]
-	ldr r1, _08014798 @ =gFightStateTracker
-	movs r0, 0xA
-	strb r0, [r1]
-	ldr r1, _0801479C @ =gBattleResults
-	ldrb r0, [r1, 0x2]
-	cmp r0, 0xFE
-	bhi _0801475C
-	adds r0, 0x1
-	strb r0, [r1, 0x2]
-_0801475C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08014764: .4byte gBankAttacker
-_08014768: .4byte gTurnOrder
-_0801476C: .4byte gCurrentMoveTurn
-_08014770: .4byte gUnknown_030042A4
-_08014774: .4byte gUnknown_030042A0
-_08014778: .4byte gActionSelectionCursor
-_0801477C: .4byte gMoveSelectionCursor
-_08014780: .4byte gBattleTextBuff1
-_08014784: .4byte gSharedMem
-_08014788: .4byte 0x00016064
-_0801478C: .4byte 0x00016003
-_08014790: .4byte gBattlescriptCurrInstr
-_08014794: .4byte BattleScript_ActionSwitch
-_08014798: .4byte gFightStateTracker
-_0801479C: .4byte gBattleResults
-	thumb_func_end sub_80146F4
-
-	thumb_func_start sub_80147A0
-sub_80147A0: @ 80147A0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r4, _08014804 @ =gBankAttacker
-	ldr r2, _08014808 @ =gBankTarget
-	ldr r1, _0801480C @ =gTurnOrder
-	ldr r0, _08014810 @ =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	strb r0, [r4]
-	ldr r0, _08014814 @ =gUnknown_030042A4
-	movs r2, 0
-	strh r2, [r0]
-	ldr r0, _08014818 @ =gUnknown_030042A0
-	strh r2, [r0]
-	ldr r3, _0801481C @ =gDisableStructs
-	ldrb r1, [r4]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r3
-	strb r2, [r0, 0x10]
-	ldr r5, _08014820 @ =gLastUsedItem
-	ldr r2, _08014824 @ =gBattleBufferB
-	ldrb r1, [r4]
-	lsls r1, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r3, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r3, r0
-	strh r3, [r5]
-	cmp r3, 0xC
-	bhi _08014830
-	ldr r2, _08014828 @ =gBattlescriptCurrInstr
-	ldr r1, _0801482C @ =gBattlescriptsForBallThrow
-	ldrh r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	str r0, [r2]
-	b _08014A8C
-	.align 2, 0
-_08014804: .4byte gBankAttacker
-_08014808: .4byte gBankTarget
-_0801480C: .4byte gTurnOrder
-_08014810: .4byte gCurrentMoveTurn
-_08014814: .4byte gUnknown_030042A4
-_08014818: .4byte gUnknown_030042A0
-_0801481C: .4byte gDisableStructs
-_08014820: .4byte gLastUsedItem
-_08014824: .4byte gBattleBufferB
-_08014828: .4byte gBattlescriptCurrInstr
-_0801482C: .4byte gBattlescriptsForBallThrow
-_08014830:
-	adds r0, r3, 0
-	subs r0, 0x50
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _0801484C
-	ldr r0, _08014844 @ =gBattlescriptCurrInstr
-	ldr r1, _08014848 @ =gBattlescriptsForRunningByItem
-	b _0801485C
-	.align 2, 0
-_08014844: .4byte gBattlescriptCurrInstr
-_08014848: .4byte gBattlescriptsForRunningByItem
-_0801484C:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0801486C
-	ldr r0, _08014864 @ =gBattlescriptCurrInstr
-	ldr r1, _08014868 @ =gBattlescriptsForUsingItem
-_0801485C:
-	ldr r1, [r1]
-	str r1, [r0]
-	b _08014A8C
-	.align 2, 0
-_08014864: .4byte gBattlescriptCurrInstr
-_08014868: .4byte gBattlescriptsForUsingItem
-_0801486C:
-	ldr r2, _080148A0 @ =gSharedMem
-	ldrb r0, [r4]
-	ldr r3, _080148A4 @ =0x00016003
-	adds r1, r2, r3
-	strb r0, [r1]
-	lsls r0, 24
-	lsrs r0, 25
-	ldr r1, _080148A8 @ =0x000160d8
-	adds r0, r1
-	adds r0, r2
-	ldrb r0, [r0]
-	subs r0, 0x1
-	mov r8, r4
-	ldr r3, _080148AC @ =gBattlescriptCurrInstr
-	mov r9, r3
-	ldr r1, _080148B0 @ =gBattlescriptsForUsingItem
-	mov r10, r1
-	adds r7, r2, 0
-	cmp r0, 0x4
-	bls _08014896
-	b _08014A74
-_08014896:
-	lsls r0, 2
-	ldr r1, _080148B4 @ =_080148B8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080148A0: .4byte gSharedMem
-_080148A4: .4byte 0x00016003
-_080148A8: .4byte 0x000160d8
-_080148AC: .4byte gBattlescriptCurrInstr
-_080148B0: .4byte gBattlescriptsForUsingItem
-_080148B4: .4byte _080148B8
-	.align 2, 0
-_080148B8:
-	.4byte _08014A74
-	.4byte _08014A74
-	.4byte _080148CC
-	.4byte _08014958
-	.4byte _08014A30
-_080148CC:
-	ldr r2, _08014904 @ =gBattleCommunication
-	movs r0, 0
-	strb r0, [r2, 0x5]
-	ldr r1, _08014908 @ =gBankAttacker
-	ldrb r0, [r1]
-	lsrs r0, 1
-	ldr r6, _0801490C @ =0x000160da
-	adds r0, r6
-	adds r0, r7
-	ldrb r3, [r0]
-	movs r0, 0x1
-	ands r0, r3
-	mov r8, r1
-	cmp r0, 0
-	beq _08014918
-	movs r0, 0x3E
-	ands r0, r3
-	ldr r3, _08014910 @ =gBattlescriptCurrInstr
-	mov r9, r3
-	ldr r1, _08014914 @ =gBattlescriptsForUsingItem
-	mov r10, r1
-	cmp r0, 0
-	bne _080148FC
-	b _08014A74
-_080148FC:
-	movs r0, 0x5
-	strb r0, [r2, 0x5]
-	b _08014A74
-	.align 2, 0
-_08014904: .4byte gBattleCommunication
-_08014908: .4byte gBankAttacker
-_0801490C: .4byte 0x000160da
-_08014910: .4byte gBattlescriptCurrInstr
-_08014914: .4byte gBattlescriptsForUsingItem
-_08014918:
-	ldr r3, _08014950 @ =gBattlescriptCurrInstr
-	mov r9, r3
-	ldr r0, _08014954 @ =gBattlescriptsForUsingItem
-	mov r10, r0
-	adds r5, r7, 0
-	mov r4, r8
-	adds r3, r6, 0
-_08014926:
-	ldrb r0, [r4]
-	lsrs r0, 1
-	adds r0, r3
-	adds r0, r5
-	ldrb r1, [r0]
-	lsrs r1, 1
-	strb r1, [r0]
-	ldrb r0, [r2, 0x5]
-	adds r0, 0x1
-	strb r0, [r2, 0x5]
-	ldrb r0, [r4]
-	lsrs r0, 1
-	adds r0, r3
-	adds r0, r5
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08014926
-	b _08014A74
-	.align 2, 0
-_08014950: .4byte gBattlescriptCurrInstr
-_08014954: .4byte gBattlescriptsForUsingItem
-_08014958:
-	ldr r3, _0801498C @ =gBattleCommunication
-	movs r0, 0x4
-	strb r0, [r3, 0x5]
-	ldr r2, _08014990 @ =gBankAttacker
-	ldrb r0, [r2]
-	lsrs r0, 1
-	ldr r1, _08014994 @ =0x000160da
-	mov r12, r1
-	add r0, r12
-	adds r6, r0, r7
-	ldrb r1, [r6]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	mov r8, r2
-	cmp r5, 0
-	beq _080149A0
-	movs r0, 0x5
-	strb r0, [r3, 0x5]
-	ldr r2, _08014998 @ =gBattlescriptCurrInstr
-	mov r9, r2
-	ldr r3, _0801499C @ =gBattlescriptsForUsingItem
-	mov r10, r3
-	b _08014A74
-	.align 2, 0
-_0801498C: .4byte gBattleCommunication
-_08014990: .4byte gBankAttacker
-_08014994: .4byte 0x000160da
-_08014998: .4byte gBattlescriptCurrInstr
-_0801499C: .4byte gBattlescriptsForUsingItem
-_080149A0:
-	ldr r3, _08014A18 @ =gBattleTextBuff1
-	movs r4, 0xFD
-	strb r4, [r3]
-	movs r0, 0x5
-	strb r0, [r3, 0x1]
-	movs r2, 0x1
-	strb r2, [r3, 0x2]
-	movs r0, 0xFF
-	strb r0, [r3, 0x3]
-	ldr r1, _08014A1C @ =gBattleTextBuff2
-	strb r4, [r1]
-	strb r5, [r1, 0x1]
-	movs r0, 0xD2
-	strb r0, [r1, 0x2]
-	strb r5, [r1, 0x3]
-	subs r0, 0xD3
-	strb r0, [r1, 0x4]
-	ldrb r0, [r6]
-	ands r2, r0
-	ldr r0, _08014A20 @ =gBattlescriptCurrInstr
-	mov r9, r0
-	ldr r1, _08014A24 @ =gBattlescriptsForUsingItem
-	mov r10, r1
-	adds r6, r3, 0
-	cmp r2, 0
-	bne _08014A02
-	adds r3, r7, 0
-	mov r5, r8
-	mov r4, r12
-	adds r2, r6, 0
-_080149DC:
-	ldrb r0, [r5]
-	lsrs r0, 1
-	adds r0, r4
-	adds r0, r3
-	ldrb r1, [r0]
-	lsrs r1, 1
-	strb r1, [r0]
-	ldrb r0, [r2, 0x2]
-	adds r0, 0x1
-	strb r0, [r2, 0x2]
-	ldrb r0, [r5]
-	lsrs r0, 1
-	adds r0, r4
-	adds r0, r3
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080149DC
-_08014A02:
-	ldrb r0, [r6, 0x2]
-	adds r0, 0xE
-	ldr r2, _08014A28 @ =0x000160a4
-	adds r1, r7, r2
-	movs r2, 0
-	strb r0, [r1]
-	ldr r3, _08014A2C @ =0x000160a5
-	adds r0, r7, r3
-	strb r2, [r0]
-	b _08014A74
-	.align 2, 0
-_08014A18: .4byte gBattleTextBuff1
-_08014A1C: .4byte gBattleTextBuff2
-_08014A20: .4byte gBattlescriptCurrInstr
-_08014A24: .4byte gBattlescriptsForUsingItem
-_08014A28: .4byte 0x000160a4
-_08014A2C: .4byte 0x000160a5
-_08014A30:
-	ldr r0, _08014A50 @ =gBattleTypeFlags
-	ldrh r0, [r0]
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _08014A64
-	ldr r1, _08014A54 @ =gBattleCommunication
-	movs r0, 0x2
-	strb r0, [r1, 0x5]
-	ldr r0, _08014A58 @ =gBankAttacker
-	mov r8, r0
-	ldr r1, _08014A5C @ =gBattlescriptCurrInstr
-	mov r9, r1
-	ldr r2, _08014A60 @ =gBattlescriptsForUsingItem
-	mov r10, r2
-	b _08014A74
-	.align 2, 0
-_08014A50: .4byte gBattleTypeFlags
-_08014A54: .4byte gBattleCommunication
-_08014A58: .4byte gBankAttacker
-_08014A5C: .4byte gBattlescriptCurrInstr
-_08014A60: .4byte gBattlescriptsForUsingItem
-_08014A64:
-	ldr r0, _08014AA0 @ =gBattleCommunication
-	strb r1, [r0, 0x5]
-	ldr r3, _08014AA4 @ =gBankAttacker
-	mov r8, r3
-	ldr r0, _08014AA8 @ =gBattlescriptCurrInstr
-	mov r9, r0
-	ldr r1, _08014AAC @ =gBattlescriptsForUsingItem
-	mov r10, r1
-_08014A74:
-	mov r2, r8
-	ldrb r0, [r2]
-	lsrs r0, 1
-	ldr r3, _08014AB0 @ =0x000160d8
-	adds r0, r3
-	adds r0, r7
-	ldrb r0, [r0]
-	lsls r0, 2
-	add r0, r10
-	ldr r0, [r0]
-	mov r1, r9
-	str r0, [r1]
-_08014A8C:
-	movs r0, 0xA
-	ldr r2, _08014AB4 @ =gFightStateTracker
-	strb r0, [r2]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08014AA0: .4byte gBattleCommunication
-_08014AA4: .4byte gBankAttacker
-_08014AA8: .4byte gBattlescriptCurrInstr
-_08014AAC: .4byte gBattlescriptsForUsingItem
-_08014AB0: .4byte 0x000160d8
-_08014AB4: .4byte gFightStateTracker
-	thumb_func_end sub_80147A0
-
-	thumb_func_start sub_8014AB8
-sub_8014AB8: @ 8014AB8
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	movs r5, 0
-	ldr r1, _08014ADC @ =gBattleMons
-	movs r0, 0x58
-	muls r0, r4
-	adds r1, r0, r1
-	ldrh r0, [r1, 0x2E]
-	cmp r0, 0xAF
-	bne _08014AE4
-	ldr r1, _08014AE0 @ =gEnigmaBerries
-	lsls r0, r4, 3
-	subs r0, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x7]
-	b _08014AEE
-	.align 2, 0
-_08014ADC: .4byte gBattleMons
-_08014AE0: .4byte gEnigmaBerries
-_08014AE4:
-	ldrh r0, [r1, 0x2E]
-	bl ItemId_GetHoldEffect
-	lsls r0, 24
-	lsrs r1, r0, 24
-_08014AEE:
-	ldr r0, _08014B18 @ =gStringBank
-	strb r4, [r0]
-	cmp r1, 0x25
-	bne _08014B28
-	ldr r2, _08014B1C @ =gLastUsedItem
-	ldr r1, _08014B20 @ =gBattleMons
-	movs r0, 0x58
-	muls r0, r4
-	adds r0, r1
-	ldrh r0, [r0, 0x2E]
-	strh r0, [r2]
-	ldr r0, _08014B24 @ =gProtectStructs
-	lsls r2, r4, 4
-	adds r2, r0
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x19
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x8
-	b _08014B50
-	.align 2, 0
-_08014B18: .4byte gStringBank
-_08014B1C: .4byte gLastUsedItem
-_08014B20: .4byte gBattleMons
-_08014B24: .4byte gProtectStructs
-_08014B28:
-	ldr r6, _08014B5C @ =gBattleMons
-	movs r2, 0x58
-	adds r0, r4, 0
-	muls r0, r2
-	adds r3, r0, r6
-	adds r0, r3, 0
-	adds r0, 0x20
-	ldrb r1, [r0]
-	cmp r1, 0x32
-	bne _08014B68
-	ldr r0, _08014B60 @ =gLastUsedAbility
-	strb r1, [r0]
-	ldr r0, _08014B64 @ =gProtectStructs
-	lsls r2, r4, 4
-	adds r2, r0
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x19
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x10
-_08014B50:
-	orrs r0, r1
-	strb r0, [r2, 0x1]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	b _08014BC2
-	.align 2, 0
-_08014B5C: .4byte gBattleMons
-_08014B60: .4byte gLastUsedAbility
-_08014B64: .4byte gProtectStructs
-_08014B68:
-	ldr r0, _08014BDC @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08014BB6
-	movs r1, 0x1
-	adds r0, r4, 0
-	eors r0, r1
-	muls r0, r2
-	adds r2, r0, r6
-	ldrh r0, [r3, 0x6]
-	ldrh r1, [r2, 0x6]
-	cmp r0, r1
-	bcs _08014BB0
-	lsls r0, 7
-	ldrh r1, [r2, 0x6]
-	bl __divsi3
-	adds r4, r0, 0
-	ldr r0, _08014BE0 @ =gSharedMem
-	ldr r1, _08014BE4 @ =0x00016078
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 1
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	bl Random
-	movs r1, 0xFF
-	ands r1, r0
-	cmp r4, r1
-	bls _08014BB6
-_08014BB0:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-_08014BB6:
-	ldr r1, _08014BE0 @ =gSharedMem
-	ldr r0, _08014BE4 @ =0x00016078
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_08014BC2:
-	cmp r5, 0
-	beq _08014BD4
-	ldr r1, _08014BE8 @ =gCurrentMoveTurn
-	ldr r0, _08014BEC @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r1, _08014BF0 @ =gBattleOutcome
-	movs r0, 0x4
-	strb r0, [r1]
-_08014BD4:
-	adds r0, r5, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08014BDC: .4byte gBattleTypeFlags
-_08014BE0: .4byte gSharedMem
-_08014BE4: .4byte 0x00016078
-_08014BE8: .4byte gCurrentMoveTurn
-_08014BEC: .4byte gNoOfAllBanks
-_08014BF0: .4byte gBattleOutcome
-	thumb_func_end sub_8014AB8
-
-	thumb_func_start sub_8014BF4
-sub_8014BF4: @ 8014BF4
-	push {r4-r6,lr}
-	ldr r4, _08014C44 @ =gBankAttacker
-	ldr r1, _08014C48 @ =gTurnOrder
-	ldr r5, _08014C4C @ =gCurrentMoveTurn
-	ldrb r0, [r5]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r4]
-	ldr r0, _08014C50 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08014C9C
-	ldr r0, _08014C54 @ =gNoOfAllBanks
-	ldrb r1, [r0]
-	strb r1, [r5]
-	ldr r2, _08014C58 @ =gActiveBank
-	movs r0, 0
-	strb r0, [r2]
-	lsls r1, 24
-	cmp r1, 0
-	beq _08014C88
-	adds r4, r2, 0
-	ldr r6, _08014C5C @ =gActionForBanks
-	ldr r5, _08014C60 @ =gBattleOutcome
-_08014C28:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _08014C64
-	ldrb r0, [r4]
-	adds r0, r6
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bne _08014C76
-	ldrb r0, [r5]
-	movs r1, 0x2
-	b _08014C72
-	.align 2, 0
-_08014C44: .4byte gBankAttacker
-_08014C48: .4byte gTurnOrder
-_08014C4C: .4byte gCurrentMoveTurn
-_08014C50: .4byte gBattleTypeFlags
-_08014C54: .4byte gNoOfAllBanks
-_08014C58: .4byte gActiveBank
-_08014C5C: .4byte gActionForBanks
-_08014C60: .4byte gBattleOutcome
-_08014C64:
-	ldrb r0, [r4]
-	adds r0, r6
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bne _08014C76
-	ldrb r0, [r5]
-	movs r1, 0x1
-_08014C72:
-	orrs r0, r1
-	strb r0, [r5]
-_08014C76:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, _08014C94 @ =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _08014C28
-_08014C88:
-	ldr r0, _08014C98 @ =gBattleOutcome
-	ldrb r1, [r0]
-	movs r2, 0x80
-	orrs r1, r2
-	strb r1, [r0]
-	b _08014D40
-	.align 2, 0
-_08014C94: .4byte gNoOfAllBanks
-_08014C98: .4byte gBattleOutcome
-_08014C9C:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _08014CF4
-	ldrb r0, [r4]
-	bl sub_8014AB8
-	lsls r0, 24
-	cmp r0, 0
-	bne _08014D40
-	ldr r1, _08014CDC @ =gBattleMons
-	ldrb r2, [r4]
-	movs r0, 0x58
-	muls r2, r0
-	adds r1, 0x50
-	adds r2, r1
-	ldr r0, [r2]
-	ldr r1, _08014CE0 @ =0xfdffffff
-	ands r0, r1
-	str r0, [r2]
-	ldr r1, _08014CE4 @ =gBattleCommunication
-	movs r0, 0x3
-	strb r0, [r1, 0x5]
-	ldr r1, _08014CE8 @ =gBattlescriptCurrInstr
-	ldr r0, _08014CEC @ =BattleScript_PrintFailedToRunString
-	str r0, [r1]
-	ldr r1, _08014CF0 @ =gFightStateTracker
-	movs r0, 0xA
-	b _08014D3E
-	.align 2, 0
-_08014CDC: .4byte gBattleMons
-_08014CE0: .4byte 0xfdffffff
-_08014CE4: .4byte gBattleCommunication
-_08014CE8: .4byte gBattlescriptCurrInstr
-_08014CEC: .4byte BattleScript_PrintFailedToRunString
-_08014CF0: .4byte gFightStateTracker
-_08014CF4:
-	ldr r1, _08014D1C @ =gBattleMons
-	ldrb r2, [r4]
-	movs r0, 0x58
-	muls r0, r2
-	adds r1, 0x50
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, _08014D20 @ =0x0400e000
-	ands r0, r1
-	cmp r0, 0
-	beq _08014D34
-	ldr r1, _08014D24 @ =gBattleCommunication
-	movs r0, 0x4
-	strb r0, [r1, 0x5]
-	ldr r1, _08014D28 @ =gBattlescriptCurrInstr
-	ldr r0, _08014D2C @ =BattleScript_PrintFailedToRunString
-	str r0, [r1]
-	ldr r1, _08014D30 @ =gFightStateTracker
-	movs r0, 0xA
-	b _08014D3E
-	.align 2, 0
-_08014D1C: .4byte gBattleMons
-_08014D20: .4byte 0x0400e000
-_08014D24: .4byte gBattleCommunication
-_08014D28: .4byte gBattlescriptCurrInstr
-_08014D2C: .4byte BattleScript_PrintFailedToRunString
-_08014D30: .4byte gFightStateTracker
-_08014D34:
-	ldr r0, _08014D48 @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	strb r0, [r5]
-	ldr r1, _08014D4C @ =gBattleOutcome
-	movs r0, 0x6
-_08014D3E:
-	strb r0, [r1]
-_08014D40:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08014D48: .4byte gNoOfAllBanks
-_08014D4C: .4byte gBattleOutcome
-	thumb_func_end sub_8014BF4
-
-	thumb_func_start sub_8014D50
-sub_8014D50: @ 8014D50
-	ldr r2, _08014D78 @ =gBankAttacker
-	ldr r1, _08014D7C @ =gTurnOrder
-	ldr r0, _08014D80 @ =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	ldr r0, _08014D84 @ =gUnknown_030042A4
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, _08014D88 @ =gUnknown_030042A0
-	strh r1, [r0]
-	ldr r1, _08014D8C @ =gBattlescriptCurrInstr
-	ldr r0, _08014D90 @ =gBattlescriptsForSafariActions
-	ldr r0, [r0]
-	str r0, [r1]
-	ldr r1, _08014D94 @ =gFightStateTracker
-	movs r0, 0xA
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_08014D78: .4byte gBankAttacker
-_08014D7C: .4byte gTurnOrder
-_08014D80: .4byte gCurrentMoveTurn
-_08014D84: .4byte gUnknown_030042A4
-_08014D88: .4byte gUnknown_030042A0
-_08014D8C: .4byte gBattlescriptCurrInstr
-_08014D90: .4byte gBattlescriptsForSafariActions
-_08014D94: .4byte gFightStateTracker
-	thumb_func_end sub_8014D50
-
-	thumb_func_start sub_8014D98
-sub_8014D98: @ 8014D98
-	ldr r2, _08014DD0 @ =gBankAttacker
-	ldr r1, _08014DD4 @ =gTurnOrder
-	ldr r0, _08014DD8 @ =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	ldr r0, _08014DDC @ =gUnknown_030042A4
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, _08014DE0 @ =gUnknown_030042A0
-	strh r1, [r0]
-	ldr r1, _08014DE4 @ =gNumSafariBalls
-	ldrb r0, [r1]
-	subs r0, 0x1
-	strb r0, [r1]
-	ldr r1, _08014DE8 @ =gLastUsedItem
-	movs r0, 0x5
-	strh r0, [r1]
-	ldr r1, _08014DEC @ =gBattlescriptCurrInstr
-	ldr r0, _08014DF0 @ =gBattlescriptsForBallThrow
-	ldr r0, [r0, 0x14]
-	str r0, [r1]
-	ldr r1, _08014DF4 @ =gFightStateTracker
-	movs r0, 0xA
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_08014DD0: .4byte gBankAttacker
-_08014DD4: .4byte gTurnOrder
-_08014DD8: .4byte gCurrentMoveTurn
-_08014DDC: .4byte gUnknown_030042A4
-_08014DE0: .4byte gUnknown_030042A0
-_08014DE4: .4byte gNumSafariBalls
-_08014DE8: .4byte gLastUsedItem
-_08014DEC: .4byte gBattlescriptCurrInstr
-_08014DF0: .4byte gBattlescriptsForBallThrow
-_08014DF4: .4byte gFightStateTracker
-	thumb_func_end sub_8014D98
-
-	thumb_func_start sub_8014DF8
-sub_8014DF8: @ 8014DF8
-	push {r4-r6,lr}
-	ldr r3, _08014E68 @ =gBankAttacker
-	ldr r1, _08014E6C @ =gTurnOrder
-	ldr r0, _08014E70 @ =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r3]
-	ldr r0, _08014E74 @ =gUnknown_030042A4
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, _08014E78 @ =gUnknown_030042A0
-	strh r1, [r0]
-	ldr r6, _08014E7C @ =gBattleCommunication
-	ldr r2, _08014E80 @ =gBattleBufferB
-	ldrb r0, [r3]
-	lsls r0, 9
-	adds r1, r2, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	subs r0, 0x1
-	strb r0, [r6, 0x5]
-	ldr r1, _08014E84 @ =gLastUsedItem
-	ldrb r0, [r3]
-	lsls r0, 9
-	adds r2, 0x2
-	adds r0, r2
-	ldrb r0, [r0]
-	strh r0, [r1]
-	ldr r2, _08014E88 @ =gSharedMem
-	ldr r0, _08014E8C @ =0x00016087
-	adds r1, r2, r0
-	ldrb r0, [r1]
-	cmp r0, 0x2
-	bhi _08014E42
-	adds r0, 0x1
-	strb r0, [r1]
-_08014E42:
-	ldr r0, _08014E90 @ =0x00016088
-	adds r4, r2, r0
-	ldrb r5, [r4]
-	adds r3, r5, 0
-	cmp r3, 0x1
-	bls _08014E9C
-	ldr r2, _08014E94 @ =gUnknown_081FA70C
-	ldrb r1, [r1]
-	lsls r0, r1, 1
-	adds r0, r1
-	ldrb r6, [r6, 0x5]
-	adds r0, r6
-	adds r0, r2
-	ldrb r0, [r0]
-	cmp r3, r0
-	bcs _08014E98
-	movs r0, 0x1
-	b _08014E9A
-	.align 2, 0
-_08014E68: .4byte gBankAttacker
-_08014E6C: .4byte gTurnOrder
-_08014E70: .4byte gCurrentMoveTurn
-_08014E74: .4byte gUnknown_030042A4
-_08014E78: .4byte gUnknown_030042A0
-_08014E7C: .4byte gBattleCommunication
-_08014E80: .4byte gBattleBufferB
-_08014E84: .4byte gLastUsedItem
-_08014E88: .4byte gSharedMem
-_08014E8C: .4byte 0x00016087
-_08014E90: .4byte 0x00016088
-_08014E94: .4byte gUnknown_081FA70C
-_08014E98:
-	subs r0, r5, r0
-_08014E9A:
-	strb r0, [r4]
-_08014E9C:
-	ldr r1, _08014EB0 @ =gBattlescriptCurrInstr
-	ldr r0, _08014EB4 @ =gBattlescriptsForSafariActions
-	ldr r0, [r0, 0x8]
-	str r0, [r1]
-	ldr r1, _08014EB8 @ =gFightStateTracker
-	movs r0, 0xA
-	strb r0, [r1]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08014EB0: .4byte gBattlescriptCurrInstr
-_08014EB4: .4byte gBattlescriptsForSafariActions
-_08014EB8: .4byte gFightStateTracker
-	thumb_func_end sub_8014DF8
-
-	thumb_func_start sub_8014EBC
-sub_8014EBC: @ 8014EBC
-	push {r4,r5,lr}
-	ldr r2, _08014F28 @ =gBankAttacker
-	ldr r1, _08014F2C @ =gTurnOrder
-	ldr r0, _08014F30 @ =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	ldr r0, _08014F34 @ =gUnknown_030042A4
-	movs r5, 0
-	strh r5, [r0]
-	ldr r0, _08014F38 @ =gUnknown_030042A0
-	strh r5, [r0]
-	ldr r3, _08014F3C @ =gSharedMem
-	ldr r0, _08014F40 @ =0x00016089
-	adds r2, r3, r0
-	ldr r1, _08014F44 @ =gUnknown_081FA71B
-	subs r0, 0x3
-	adds r4, r3, r0
-	ldrb r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	ldrb r1, [r2]
-	adds r0, r1
-	strb r0, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x14
-	bls _08014EFA
-	movs r0, 0x14
-	strb r0, [r2]
-_08014EFA:
-	ldr r0, _08014F48 @ =0x00016088
-	adds r2, r3, r0
-	ldr r1, _08014F4C @ =gUnknown_081FA71F
-	ldrb r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	ldrb r1, [r2]
-	adds r0, r1
-	strb r0, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x14
-	bls _08014F18
-	movs r0, 0x14
-	strb r0, [r2]
-_08014F18:
-	ldrb r0, [r4]
-	cmp r0, 0x2
-	bhi _08014F54
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r0, _08014F50 @ =gBattleCommunication
-	strb r5, [r0, 0x5]
-	b _08014F5A
-	.align 2, 0
-_08014F28: .4byte gBankAttacker
-_08014F2C: .4byte gTurnOrder
-_08014F30: .4byte gCurrentMoveTurn
-_08014F34: .4byte gUnknown_030042A4
-_08014F38: .4byte gUnknown_030042A0
-_08014F3C: .4byte gSharedMem
-_08014F40: .4byte 0x00016089
-_08014F44: .4byte gUnknown_081FA71B
-_08014F48: .4byte 0x00016088
-_08014F4C: .4byte gUnknown_081FA71F
-_08014F50: .4byte gBattleCommunication
-_08014F54:
-	ldr r1, _08014F70 @ =gBattleCommunication
-	movs r0, 0x1
-	strb r0, [r1, 0x5]
-_08014F5A:
-	ldr r1, _08014F74 @ =gBattlescriptCurrInstr
-	ldr r0, _08014F78 @ =gBattlescriptsForSafariActions
-	ldr r0, [r0, 0x4]
-	str r0, [r1]
-	ldr r1, _08014F7C @ =gFightStateTracker
-	movs r0, 0xA
-	strb r0, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08014F70: .4byte gBattleCommunication
-_08014F74: .4byte gBattlescriptCurrInstr
-_08014F78: .4byte gBattlescriptsForSafariActions
-_08014F7C: .4byte gFightStateTracker
-	thumb_func_end sub_8014EBC
-
-	thumb_func_start bs8_exit_by_flight
-bs8_exit_by_flight: @ 8014F80
-	push {r4,lr}
-	ldr r2, _08014FA8 @ =gBankAttacker
-	ldr r1, _08014FAC @ =gTurnOrder
-	ldr r4, _08014FB0 @ =gCurrentMoveTurn
-	ldrb r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	movs r0, 0x11
-	bl PlaySE
-	ldr r0, _08014FB4 @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	strb r0, [r4]
-	ldr r1, _08014FB8 @ =gBattleOutcome
-	movs r0, 0x4
-	strb r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08014FA8: .4byte gBankAttacker
-_08014FAC: .4byte gTurnOrder
-_08014FB0: .4byte gCurrentMoveTurn
-_08014FB4: .4byte gNoOfAllBanks
-_08014FB8: .4byte gBattleOutcome
-	thumb_func_end bs8_exit_by_flight
-
-	thumb_func_start sub_8014FBC
-sub_8014FBC: @ 8014FBC
-	ldr r3, _08015008 @ =gBankAttacker
-	ldr r1, _0801500C @ =gTurnOrder
-	ldr r0, _08015010 @ =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r2, [r0]
-	strb r2, [r3]
-	ldr r0, _08015014 @ =gUnknown_030042A4
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, _08015018 @ =gUnknown_030042A0
-	strh r1, [r0]
-	ldr r1, _0801501C @ =gBattleTextBuff1
-	movs r0, 0xFD
-	strb r0, [r1]
-	movs r0, 0x7
-	strb r0, [r1, 0x1]
-	strb r2, [r1, 0x2]
-	ldr r2, _08015020 @ =gBattlePartyID
-	ldrb r0, [r3]
-	lsls r0, 1
-	adds r0, r2
-	ldrh r0, [r0]
-	strb r0, [r1, 0x3]
-	movs r0, 0xFF
-	strb r0, [r1, 0x4]
-	ldr r1, _08015024 @ =gBattlescriptCurrInstr
-	ldr r0, _08015028 @ =gBattlescriptsForSafariActions
-	ldr r0, [r0, 0xC]
-	str r0, [r1]
-	ldr r1, _0801502C @ =gFightStateTracker
-	movs r0, 0xA
-	strb r0, [r1]
-	ldr r1, _08015030 @ =gUnknown_02024A76
-	movs r0, 0xC
-	strb r0, [r1, 0x1]
-	bx lr
-	.align 2, 0
-_08015008: .4byte gBankAttacker
-_0801500C: .4byte gTurnOrder
-_08015010: .4byte gCurrentMoveTurn
-_08015014: .4byte gUnknown_030042A4
-_08015018: .4byte gUnknown_030042A0
-_0801501C: .4byte gBattleTextBuff1
-_08015020: .4byte gBattlePartyID
-_08015024: .4byte gBattlescriptCurrInstr
-_08015028: .4byte gBattlescriptsForSafariActions
-_0801502C: .4byte gFightStateTracker
-_08015030: .4byte gUnknown_02024A76
-	thumb_func_end sub_8014FBC
-
-	thumb_func_start bsB_exit_by_move
-bsB_exit_by_move: @ 8015034
-	push {lr}
-	bl sub_80173A4
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _08015050
-	ldr r0, _08015054 @ =gSharedMem
-	ldr r2, _08015058 @ =0x00016059
-	adds r0, r2
-	strb r1, [r0]
-	ldr r1, _0801505C @ =gFightStateTracker
-	movs r0, 0xC
-	strb r0, [r1]
-_08015050:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08015054: .4byte gSharedMem
-_08015058: .4byte 0x00016059
-_0801505C: .4byte gFightStateTracker
-	thumb_func_end bsB_exit_by_move
-
-	thumb_func_start sub_8015060
-sub_8015060: @ 8015060
-	ldr r1, _08015080 @ =gCurrentMoveTurn
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r3, _08015084 @ =gFightStateTracker
-	ldr r2, _08015088 @ =gUnknown_02024A76
-	ldrb r0, [r1]
-	adds r0, r2
-	ldrb r0, [r0]
-	strb r0, [r3]
-	ldr r2, _0801508C @ =gHitMarker
-	ldr r0, [r2]
-	ldr r1, _08015090 @ =0xf1e892af
-	ands r0, r1
-	str r0, [r2]
-	bx lr
-	.align 2, 0
-_08015080: .4byte gCurrentMoveTurn
-_08015084: .4byte gFightStateTracker
-_08015088: .4byte gUnknown_02024A76
-_0801508C: .4byte gHitMarker
-_08015090: .4byte 0xf1e892af
-	thumb_func_end sub_8015060
-
-	thumb_func_start bsC_8016D70
-bsC_8016D70: @ 8015094
-	push {r4,r5,lr}
-	ldr r1, _0801510C @ =gCurrentMoveTurn
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r3, _08015110 @ =gFightStateTracker
-	ldr r2, _08015114 @ =gUnknown_02024A76
-	ldrb r0, [r1]
-	adds r0, r2
-	ldrb r0, [r0]
-	strb r0, [r3]
-	bl SpecialStatusesClear
-	ldr r2, _08015118 @ =gHitMarker
-	ldr r0, [r2]
-	ldr r1, _0801511C @ =0xf1e892af
-	ands r0, r1
-	str r0, [r2]
-	ldr r0, _08015120 @ =gBattleMoveDamage
-	movs r4, 0
-	str r4, [r0]
-	ldr r1, _08015124 @ =gSharedMem
-	ldr r2, _08015128 @ =0x00016002
-	adds r0, r1, r2
-	strb r4, [r0]
-	ldr r3, _0801512C @ =0x000160a1
-	adds r0, r1, r3
-	strb r4, [r0]
-	ldr r2, _08015130 @ =gMoveHitWith
-	ldr r5, _08015134 @ =gBankAttacker
-	ldrb r0, [r5]
-	lsls r0, 1
-	adds r0, r2
-	movs r2, 0
-	strh r4, [r0]
-	ldr r3, _08015138 @ =gUnknown_02024C44
-	ldrb r0, [r5]
-	lsls r0, 1
-	adds r0, r3
-	strh r4, [r0]
-	ldr r3, _0801513C @ =0x0001601c
-	adds r0, r1, r3
-	strb r2, [r0]
-	ldr r0, _08015140 @ =gDynamicBasePower
-	strh r4, [r0]
-	subs r3, 0x10
-	adds r0, r1, r3
-	strb r2, [r0]
-	ldr r0, _08015144 @ =gBattleCommunication
-	strb r2, [r0, 0x3]
-	strb r2, [r0, 0x4]
-	ldr r3, _08015148 @ =0x00016112
-	adds r0, r1, r3
-	strb r2, [r0]
-	ldr r0, _0801514C @ =0x00017130
-	adds r1, r0
-	strb r2, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801510C: .4byte gCurrentMoveTurn
-_08015110: .4byte gFightStateTracker
-_08015114: .4byte gUnknown_02024A76
-_08015118: .4byte gHitMarker
-_0801511C: .4byte 0xf1e892af
-_08015120: .4byte gBattleMoveDamage
-_08015124: .4byte gSharedMem
-_08015128: .4byte 0x00016002
-_0801512C: .4byte 0x000160a1
-_08015130: .4byte gMoveHitWith
-_08015134: .4byte gBankAttacker
-_08015138: .4byte gUnknown_02024C44
-_0801513C: .4byte 0x0001601c
-_08015140: .4byte gDynamicBasePower
-_08015144: .4byte gBattleCommunication
-_08015148: .4byte 0x00016112
-_0801514C: .4byte 0x00017130
-	thumb_func_end bsC_8016D70
-
-	thumb_func_start GetBattleBank
-GetBattleBank: @ 8015150
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	movs r2, 0
-	cmp r0, 0xA
-	bhi _080151C8
-	lsls r0, 2
-	ldr r1, _08015168 @ =_0801516C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08015168: .4byte _0801516C
-	.align 2, 0
-_0801516C:
-	.4byte _08015198
-	.4byte _080151A0
-	.4byte _080151A8
-	.4byte _080151C4
-	.4byte _080151C8
-	.4byte _080151C4
-	.4byte _080151C8
-	.4byte _080151B0
-	.4byte _080151C8
-	.4byte _080151C8
-	.4byte _080151B4
-_08015198:
-	ldr r0, _0801519C @ =gBankTarget
-	b _080151C6
-	.align 2, 0
-_0801519C: .4byte gBankTarget
-_080151A0:
-	ldr r0, _080151A4 @ =gBankAttacker
-	b _080151C6
-	.align 2, 0
-_080151A4: .4byte gBankAttacker
-_080151A8:
-	ldr r0, _080151AC @ =gEffectBank
-	b _080151C6
-	.align 2, 0
-_080151AC: .4byte gEffectBank
-_080151B0:
-	movs r2, 0
-	b _080151C8
-_080151B4:
-	ldr r0, _080151BC @ =gSharedMem
-	ldr r1, _080151C0 @ =0x00016003
-	adds r0, r1
-	b _080151C6
-	.align 2, 0
-_080151BC: .4byte gSharedMem
-_080151C0: .4byte 0x00016003
-_080151C4:
-	ldr r0, _080151D0 @ =gBank1
-_080151C6:
-	ldrb r2, [r0]
-_080151C8:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080151D0: .4byte gBank1
-	thumb_func_end GetBattleBank
-
-	thumb_func_start PressurePPLose
-PressurePPLose: @ 80151D4
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	lsls r2, 16
-	lsrs r2, 16
-	ldr r1, _08015204 @ =gBattleMons
-	movs r4, 0x58
-	muls r0, r4
-	adds r0, r1
-	adds r0, 0x20
-	ldrb r0, [r0]
-	mov r12, r1
-	cmp r0, 0x2E
-	bne _08015286
-	movs r3, 0
-	adds r0, r5, 0
-	muls r0, r4
-	adds r1, 0xC
-	adds r1, r0, r1
-	b _08015210
-	.align 2, 0
-_08015204: .4byte gBattleMons
-_08015208:
-	adds r1, 0x2
-	adds r3, 0x1
-	cmp r3, 0x3
-	bgt _08015216
-_08015210:
-	ldrh r0, [r1]
-	cmp r0, r2
-	bne _08015208
-_08015216:
-	cmp r3, 0x4
-	beq _08015286
-	movs r7, 0x58
-	adds r2, r5, 0
-	muls r2, r7
-	adds r0, r3, r2
-	mov r6, r12
-	adds r6, 0x24
-	adds r1, r0, r6
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _08015232
-	subs r0, 0x1
-	strb r0, [r1]
-_08015232:
-	mov r0, r12
-	adds r0, 0x50
-	adds r0, r2, r0
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 14
-	ands r0, r1
-	cmp r0, 0
-	bne _08015286
-	ldr r1, _08015290 @ =gDisableStructs
-	lsls r0, r5, 3
-	subs r0, r5
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x18]
-	lsrs r1, 4
-	ldr r2, _08015294 @ =gBitTable
-	lsls r0, r3, 2
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	bne _08015286
-	ldr r4, _08015298 @ =gActiveBank
-	strb r5, [r4]
-	adds r1, r3, 0
-	adds r1, 0x9
-	lsls r1, 24
-	lsrs r1, 24
-	ldrb r0, [r4]
-	muls r0, r7
-	adds r0, r6
-	adds r0, r3
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl EmitSetAttributes
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_08015286:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08015290: .4byte gDisableStructs
-_08015294: .4byte gBitTable
-_08015298: .4byte gActiveBank
-	thumb_func_end PressurePPLose
-
-	thumb_func_start sub_801529C
-sub_801529C: @ 801529C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r0, 0x4
-	mov r8, r0
-	adds r0, r5, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	movs r4, 0
-	ldr r0, _080153BC @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	bge _08015344
-	ldr r1, _080153C0 @ =gBattleMons
-	movs r0, 0x58
-	adds r7, r5, 0
-	muls r7, r0
-	adds r1, 0xC
-	mov r10, r1
-_080152D2:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	adds r6, r4, 0x1
-	cmp r9, r0
-	beq _0801533A
-	ldr r0, _080153C0 @ =gBattleMons
-	movs r3, 0x58
-	adds r1, r4, 0
-	muls r1, r3
-	adds r1, r0
-	adds r1, 0x20
-	ldrb r1, [r1]
-	adds r4, r0, 0
-	cmp r1, 0x2E
-	bne _0801533A
-	movs r2, 0
-	adds r0, r5, 0
-	muls r0, r3
-	adds r1, r4, 0
-	adds r1, 0xC
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x8F
-	lsls r1, 1
-	cmp r0, r1
-	beq _08015322
-	adds r3, r1, 0
-	mov r0, r10
-	adds r1, r7, r0
-_08015314:
-	adds r1, 0x2
-	adds r2, 0x1
-	cmp r2, 0x3
-	bgt _08015322
-	ldrh r0, [r1]
-	cmp r0, r3
-	bne _08015314
-_08015322:
-	cmp r2, 0x4
-	beq _0801533A
-	mov r8, r2
-	adds r1, r2, r7
-	adds r0, r4, 0
-	adds r0, 0x24
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0801533A
-	subs r0, 0x1
-	strb r0, [r1]
-_0801533A:
-	adds r4, r6, 0
-	ldr r0, _080153BC @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	blt _080152D2
-_08015344:
-	mov r1, r8
-	cmp r1, 0x4
-	beq _080153AC
-	ldr r6, _080153C0 @ =gBattleMons
-	movs r3, 0x58
-	adds r0, r5, 0
-	muls r0, r3
-	adds r1, r6, 0
-	adds r1, 0x50
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 14
-	ands r0, r1
-	cmp r0, 0
-	bne _080153AC
-	ldr r1, _080153C4 @ =gDisableStructs
-	lsls r0, r5, 3
-	subs r0, r5
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x18]
-	lsrs r1, 4
-	ldr r2, _080153C8 @ =gBitTable
-	mov r4, r8
-	lsls r0, r4, 2
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	bne _080153AC
-	ldr r4, _080153CC @ =gActiveBank
-	strb r5, [r4]
-	mov r1, r8
-	adds r1, 0x9
-	lsls r1, 24
-	lsrs r1, 24
-	ldrb r0, [r4]
-	muls r0, r3
-	adds r2, r6, 0
-	adds r2, 0x24
-	adds r0, r2
-	add r0, r8
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl EmitSetAttributes
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_080153AC:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080153BC: .4byte gNoOfAllBanks
-_080153C0: .4byte gBattleMons
-_080153C4: .4byte gDisableStructs
-_080153C8: .4byte gBitTable
-_080153CC: .4byte gActiveBank
-	thumb_func_end sub_801529C
-
-	thumb_func_start sub_80153D0
-sub_80153D0: @ 80153D0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r3, r0, 24
-	movs r6, 0x4
-	movs r1, 0
-	ldr r0, _080154C8 @ =gNoOfAllBanks
-	mov r8, r0
-	ldrb r0, [r0]
-	cmp r1, r0
-	bge _08015452
-	ldr r7, _080154CC @ =gBattleMons
-	movs r2, 0x58
-	mov r12, r2
-	mov r5, r12
-	muls r5, r3
-	adds r0, r7, 0
-	adds r0, 0xC
-	adds r2, r5, r0
-	mov r10, r2
-	mov r9, r5
-_08015402:
-	mov r0, r12
-	muls r0, r1
-	adds r0, r7
-	adds r0, 0x20
-	ldrb r0, [r0]
-	adds r4, r1, 0x1
-	cmp r0, 0x2E
-	bne _08015448
-	cmp r1, r3
-	beq _08015448
-	movs r2, 0
-	mov r1, r10
-	ldrh r0, [r1]
-	cmp r0, 0xC3
-	beq _08015432
-	ldr r1, _080154D0 @ =gUnknown_02024A8C
-	add r1, r9
-_08015424:
-	adds r1, 0x2
-	adds r2, 0x1
-	cmp r2, 0x3
-	bgt _08015432
-	ldrh r0, [r1]
-	cmp r0, 0xC3
-	bne _08015424
-_08015432:
-	cmp r2, 0x4
-	beq _08015448
-	adds r6, r2, 0
-	adds r0, r6, r5
-	ldr r2, _080154D4 @ =gUnknown_02024AA4
-	adds r1, r0, r2
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _08015448
-	subs r0, 0x1
-	strb r0, [r1]
-_08015448:
-	adds r1, r4, 0
-	mov r0, r8
-	ldrb r0, [r0]
-	cmp r1, r0
-	blt _08015402
-_08015452:
-	cmp r6, 0x4
-	beq _080154B6
-	ldr r7, _080154CC @ =gBattleMons
-	movs r5, 0x58
-	adds r0, r3, 0
-	muls r0, r5
-	adds r1, r7, 0
-	adds r1, 0x50
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 14
-	ands r0, r1
-	cmp r0, 0
-	bne _080154B6
-	ldr r1, _080154D8 @ =gDisableStructs
-	lsls r0, r3, 3
-	subs r0, r3
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x18]
-	lsrs r1, 4
-	ldr r2, _080154DC @ =gBitTable
-	lsls r0, r6, 2
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	bne _080154B6
-	ldr r4, _080154E0 @ =gActiveBank
-	strb r3, [r4]
-	adds r1, r6, 0
-	adds r1, 0x9
-	lsls r1, 24
-	lsrs r1, 24
-	ldrb r0, [r4]
-	muls r0, r5
-	adds r2, r7, 0
-	adds r2, 0x24
-	adds r0, r2
-	adds r0, r6
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl EmitSetAttributes
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_080154B6:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080154C8: .4byte gNoOfAllBanks
-_080154CC: .4byte gBattleMons
-_080154D0: .4byte gUnknown_02024A8C
-_080154D4: .4byte gUnknown_02024AA4
-_080154D8: .4byte gDisableStructs
-_080154DC: .4byte gBitTable
-_080154E0: .4byte gActiveBank
-	thumb_func_end sub_80153D0
-
-	thumb_func_start unref_sub_80154E4
-unref_sub_80154E4: @ 80154E4
-	push {r4,r5,lr}
-	ldr r0, _08015514 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08015524
-	movs r2, 0
-	ldr r4, _08015518 @ =gNoOfAllBanks
-	ldrb r0, [r4]
-	cmp r2, r0
-	bge _08015542
-	ldr r3, _0801551C @ =gBattleExecBuffer
-	ldr r5, _08015520 @ =gBitTable
-_08015500:
-	ldm r5!, {r1}
-	lsls r1, 28
-	ldr r0, [r3]
-	orrs r0, r1
-	str r0, [r3]
-	adds r2, 0x1
-	ldrb r0, [r4]
-	cmp r2, r0
-	blt _08015500
-	b _08015542
-	.align 2, 0
-_08015514: .4byte gBattleTypeFlags
-_08015518: .4byte gNoOfAllBanks
-_0801551C: .4byte gBattleExecBuffer
-_08015520: .4byte gBitTable
-_08015524:
-	movs r2, 0
-	ldr r4, _08015548 @ =gNoOfAllBanks
-	ldrb r0, [r4]
-	cmp r2, r0
-	bge _08015542
-	ldr r3, _0801554C @ =gBattleExecBuffer
-	ldr r5, _08015550 @ =gBitTable
-_08015532:
-	ldr r0, [r3]
-	ldm r5!, {r1}
-	orrs r0, r1
-	str r0, [r3]
-	adds r2, 0x1
-	ldrb r0, [r4]
-	cmp r2, r0
-	blt _08015532
-_08015542:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08015548: .4byte gNoOfAllBanks
-_0801554C: .4byte gBattleExecBuffer
-_08015550: .4byte gBitTable
-	thumb_func_end unref_sub_80154E4
-
-	thumb_func_start MarkBufferBankForExecution
-MarkBufferBankForExecution: @ 8015554
-	push {lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r0, _0801557C @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08015588
-	ldr r2, _08015580 @ =gBattleExecBuffer
-	ldr r1, _08015584 @ =gBitTable
-	lsls r0, r3, 2
-	adds r0, r1
-	ldr r1, [r0]
-	lsls r1, 28
-	ldr r0, [r2]
-	orrs r0, r1
-	str r0, [r2]
-	b _08015598
-	.align 2, 0
-_0801557C: .4byte gBattleTypeFlags
-_08015580: .4byte gBattleExecBuffer
-_08015584: .4byte gBitTable
-_08015588:
-	ldr r2, _0801559C @ =gBattleExecBuffer
-	ldr r1, _080155A0 @ =gBitTable
-	lsls r0, r3, 2
-	adds r0, r1
-	ldr r1, [r2]
-	ldr r0, [r0]
-	orrs r1, r0
-	str r1, [r2]
-_08015598:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801559C: .4byte gBattleExecBuffer
-_080155A0: .4byte gBitTable
-	thumb_func_end MarkBufferBankForExecution
-
-	thumb_func_start sub_80155A4
-sub_80155A4: @ 80155A4
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	movs r4, 0
-	ldr r5, _080155B8 @ =gBattleExecBuffer
-	ldr r1, _080155BC @ =gBitTable
-	lsls r0, r7, 2
-	adds r6, r0, r1
-	b _080155CE
-	.align 2, 0
-_080155B8: .4byte gBattleExecBuffer
-_080155BC: .4byte gBitTable
-_080155C0:
-	lsls r0, r4, 2
-	ldr r1, [r6]
-	lsls r1, r0
-	ldr r0, [r5]
-	orrs r0, r1
-	str r0, [r5]
-	adds r4, 0x1
-_080155CE:
-	bl GetLinkPlayerCount
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	blt _080155C0
-	ldr r2, _080155F0 @ =gBattleExecBuffer
-	movs r1, 0x80
-	lsls r1, 21
-	lsls r1, r7
-	ldr r0, [r2]
-	bics r0, r1
-	str r0, [r2]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080155F0: .4byte gBattleExecBuffer
-	thumb_func_end sub_80155A4
-
-	thumb_func_start CancelMultiTurnMoves
-CancelMultiTurnMoves: @ 80155F4
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08015644 @ =gBattleMons
-	movs r2, 0x58
-	adds r3, r0, 0
-	muls r3, r2
-	adds r1, 0x50
-	adds r3, r1
-	ldr r1, [r3]
-	ldr r2, _08015648 @ =0xffffefff
-	ands r1, r2
-	ldr r2, _0801564C @ =0xfffff3ff
-	ands r1, r2
-	movs r2, 0x71
-	negs r2, r2
-	ands r1, r2
-	ldr r2, _08015650 @ =0xfffffcff
-	ands r1, r2
-	str r1, [r3]
-	ldr r1, _08015654 @ =gStatuses3
-	lsls r2, r0, 2
-	adds r2, r1
-	ldr r1, [r2]
-	ldr r3, _08015658 @ =0xfffbff3f
-	ands r1, r3
-	str r1, [r2]
-	ldr r2, _0801565C @ =gDisableStructs
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r2, [r1, 0x11]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x11]
-	movs r0, 0
-	strb r0, [r1, 0x10]
-	bx lr
-	.align 2, 0
-_08015644: .4byte gBattleMons
-_08015648: .4byte 0xffffefff
-_0801564C: .4byte 0xfffff3ff
-_08015650: .4byte 0xfffffcff
-_08015654: .4byte gStatuses3
-_08015658: .4byte 0xfffbff3f
-_0801565C: .4byte gDisableStructs
-	thumb_func_end CancelMultiTurnMoves
-
-	thumb_func_start sub_8015660
-sub_8015660: @ 8015660
-	push {lr}
-	lsls r0, 24
-	ldr r1, _080156AC @ =gProtectStructs
-	lsrs r0, 20
-	adds r1, r0, r1
-	ldrb r0, [r1]
-	lsrs r0, 7
-	cmp r0, 0
-	bne _080156A6
-	ldrb r2, [r1, 0x1]
-	lsls r0, r2, 30
-	cmp r0, 0
-	blt _080156A6
-	lsls r0, r2, 26
-	cmp r0, 0
-	blt _080156A6
-	lsls r0, r2, 25
-	cmp r0, 0
-	blt _080156A6
-	lsrs r0, r2, 7
-	cmp r0, 0
-	bne _080156A6
-	ldrb r1, [r1, 0x2]
-	lsls r0, r1, 31
-	cmp r0, 0
-	bne _080156A6
-	lsls r0, r1, 30
-	cmp r0, 0
-	blt _080156A6
-	lsls r0, r1, 29
-	cmp r0, 0
-	blt _080156A6
-	lsls r0, r2, 31
-	cmp r0, 0
-	beq _080156B0
-_080156A6:
-	movs r0, 0x1
-	b _080156B2
-	.align 2, 0
-_080156AC: .4byte gProtectStructs
-_080156B0:
-	movs r0, 0
-_080156B2:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8015660
-
-	thumb_func_start PrepareStringBattle
-PrepareStringBattle: @ 80156B8
-	push {r4,lr}
-	adds r2, r0, 0
-	lsls r2, 16
-	lsrs r2, 16
-	ldr r4, _080156D8 @ =gActiveBank
-	strb r1, [r4]
-	movs r0, 0
-	adds r1, r2, 0
-	bl EmitPrintString
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080156D8: .4byte gActiveBank
-	thumb_func_end PrepareStringBattle
-
-	thumb_func_start sub_80156DC
-sub_80156DC: @ 80156DC
-	push {r4-r6,lr}
-	movs r3, 0
-	ldr r0, _08015730 @ =gSentPokesToOpponent
-	strb r3, [r0]
-	strb r3, [r0, 0x1]
-	movs r1, 0
-	ldr r0, _08015734 @ =gNoOfAllBanks
-	ldrb r2, [r0]
-	adds r6, r0, 0
-	cmp r1, r2
-	bge _0801570A
-	ldr r5, _08015738 @ =gBitTable
-	adds r4, r2, 0
-	ldr r2, _0801573C @ =gBattlePartyID
-_080156F8:
-	ldrh r0, [r2]
-	lsls r0, 2
-	adds r0, r5
-	ldr r0, [r0]
-	orrs r3, r0
-	adds r2, 0x4
-	adds r1, 0x2
-	cmp r1, r4
-	blt _080156F8
-_0801570A:
-	movs r1, 0x1
-	adds r2, r6, 0
-	ldrb r0, [r2]
-	cmp r1, r0
-	bge _0801572A
-	ldr r5, _08015730 @ =gSentPokesToOpponent
-	movs r4, 0x2
-_08015718:
-	adds r0, r1, 0
-	ands r0, r4
-	asrs r0, 1
-	adds r0, r5
-	strb r3, [r0]
-	adds r1, 0x2
-	ldrb r0, [r2]
-	cmp r1, r0
-	blt _08015718
-_0801572A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08015730: .4byte gSentPokesToOpponent
-_08015734: .4byte gNoOfAllBanks
-_08015738: .4byte gBitTable
-_0801573C: .4byte gBattlePartyID
-	thumb_func_end sub_80156DC
-
-	thumb_func_start sub_8015740
-sub_8015740: @ 8015740
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r4, 0
-	adds r0, r5, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080157A4
-	movs r0, 0x2
-	ands r0, r5
-	lsls r0, 24
-	lsrs r0, 25
-	mov r12, r0
-	ldr r1, _080157B0 @ =gSentPokesToOpponent
-	adds r0, r1
-	strb r4, [r0]
-	adds r5, r4, 0
-	ldr r0, _080157B4 @ =gNoOfAllBanks
-	ldrb r2, [r0]
-	mov r8, r1
-	cmp r4, r2
-	bge _0801579E
-	ldr r0, _080157B8 @ =gAbsentBankFlags
-	ldrb r7, [r0]
-	ldr r1, _080157BC @ =gBitTable
-	adds r6, r2, 0
-	ldr r3, _080157C0 @ =gBattlePartyID
-	adds r2, r1, 0
-_08015782:
-	ldr r0, [r2]
-	ands r0, r7
-	cmp r0, 0
-	bne _08015794
-	ldrh r0, [r3]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	orrs r4, r0
-_08015794:
-	adds r3, 0x4
-	adds r2, 0x8
-	adds r5, 0x2
-	cmp r5, r6
-	blt _08015782
-_0801579E:
-	mov r0, r12
-	add r0, r8
-	strb r4, [r0]
-_080157A4:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080157B0: .4byte gSentPokesToOpponent
-_080157B4: .4byte gNoOfAllBanks
-_080157B8: .4byte gAbsentBankFlags
-_080157BC: .4byte gBitTable
-_080157C0: .4byte gBattlePartyID
-	thumb_func_end sub_8015740
-
-	thumb_func_start sub_80157C4
-sub_80157C4: @ 80157C4
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080157E0
-	adds r0, r4, 0
-	bl sub_8015740
-	b _08015816
-_080157E0:
-	movs r3, 0x1
-	ldr r5, _0801581C @ =gNoOfAllBanks
-	ldrb r0, [r5]
-	cmp r3, r0
-	bge _08015816
-	ldr r0, _08015820 @ =gSentPokesToOpponent
-	mov r12, r0
-	movs r7, 0x2
-	ldr r6, _08015824 @ =gBitTable
-	ldr r1, _08015828 @ =gBattlePartyID
-	lsls r0, r4, 1
-	adds r4, r0, r1
-_080157F8:
-	adds r2, r3, 0
-	ands r2, r7
-	asrs r2, 1
-	add r2, r12
-	ldrh r0, [r4]
-	lsls r0, 2
-	adds r0, r6
-	ldr r0, [r0]
-	ldrb r1, [r2]
-	orrs r0, r1
-	strb r0, [r2]
-	adds r3, 0x1
-	ldrb r0, [r5]
-	cmp r3, r0
-	blt _080157F8
-_08015816:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801581C: .4byte gNoOfAllBanks
-_08015820: .4byte gSentPokesToOpponent
-_08015824: .4byte gBitTable
-_08015828: .4byte gBattlePartyID
-	thumb_func_end sub_80157C4
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_9.s b/asm/battle_9.s
index dce32d076..b86914ca6 100644
--- a/asm/battle_9.s
+++ b/asm/battle_9.s
@@ -95,7 +95,7 @@ _0803609C: .4byte 0x000160c8
 _080360A0:
 	ldr r4, _080361D8 @ =gBattleMons
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x58
@@ -108,7 +108,7 @@ _080360A0:
 	b _080361C8
 _080360BC:
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r2, r0, 24
 	movs r6, 0
@@ -187,7 +187,7 @@ _08036110:
 	movs r1, 0x2E
 	bl GetMonData
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r2, r0, 24
 	movs r4, 0
@@ -312,7 +312,7 @@ _08036242:
 	eors r0, r4
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, _08036290 @ =gAbsentBankFlags
 	ldrb r1, [r1]
 	ldr r2, _08036294 @ =gBitTable
@@ -339,7 +339,7 @@ _08036298:
 	eors r0, r4
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r7, r0, 24
 	b _080362B2
@@ -656,7 +656,7 @@ ai_has_super_effective_move_on_field: @ 8036514
 	lsrs r0, 24
 	mov r8, r0
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r3, r0, 24
 	ldr r0, _080365AC @ =gAbsentBankFlags
@@ -733,7 +733,7 @@ _080365C0:
 	b _08036640
 _080365C4:
 	movs r0, 0x2
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r3, r0, 24
 	ldr r0, _0803664C @ =gAbsentBankFlags
@@ -909,7 +909,7 @@ _080366F6:
 	eors r0, r4
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, _08036748 @ =gAbsentBankFlags
 	ldrb r1, [r1]
 	ldr r2, _0803674C @ =gBitTable
@@ -938,7 +938,7 @@ _08036750:
 	eors r0, r4
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
@@ -1238,7 +1238,7 @@ _080369A0:
 	eors r0, r5
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, _080369F4 @ =gAbsentBankFlags
 	ldrb r1, [r1]
 	ldr r2, _080369F8 @ =gBitTable
@@ -1265,7 +1265,7 @@ _080369FC:
 	eors r0, r5
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r6, r0, 24
 	b _08036A18
@@ -1427,7 +1427,7 @@ _08036B28:
 	cmp r0, 0
 	bne _08036B78
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r6, r5, 0
@@ -1439,11 +1439,11 @@ _08036B70: .4byte gActiveBank
 _08036B74: .4byte 0x000160c8
 _08036B78:
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r6, r0, 24
 	movs r0, 0x3
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r5, r0, 24
 _08036B8C:
@@ -1636,7 +1636,7 @@ sub_8036CD4: @ 8036CD4
 	eors r0, r5
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, _08036D24 @ =gAbsentBankFlags
 	ldrb r1, [r1]
 	ldr r2, _08036D28 @ =gBitTable
@@ -1661,7 +1661,7 @@ _08036D2C:
 	eors r0, r5
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [sp, 0x10]
@@ -1692,7 +1692,7 @@ _08036D70: .4byte gAbsentBankFlags
 _08036D74: .4byte gBitTable
 _08036D78:
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
@@ -2598,7 +2598,7 @@ _08037468:
 	ldrb r0, [r0, 0x16]
 	cmp r0, 0
 	beq _080374A8
-	ldr r0, _080374A4 @ =gSideTimer
+	ldr r0, _080374A4 @ =gSideTimers
 	lsls r1, r3, 1
 	adds r1, r3
 	lsls r1, 2
@@ -2613,7 +2613,7 @@ _08037496:
 	.align 2, 0
 _0803749C: .4byte gActiveBank
 _080374A0: .4byte gDisableStructs
-_080374A4: .4byte gSideTimer
+_080374A4: .4byte gSideTimers
 _080374A8:
 	mov r1, r8
 	cmp r1, 0
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index 73f399caa..fb9c25a82 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -1366,7 +1366,7 @@ _0813FBE0:
 	lsls r4, 24
 	lsrs r4, 24
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_8079E90
@@ -1418,7 +1418,7 @@ _0813FBE0:
 	ldr r0, _0813FCAC @ =SpriteCallbackDummy
 	str r0, [r4]
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, _0813FCB0 @ =gObjectBankIDs
 	lsls r0, 24
 	lsrs r0, 24
@@ -1462,7 +1462,7 @@ sub_813FCBC: @ 813FCBC
 	lsrs r5, r0, 24
 	ldr r6, _0813FD1C @ =gSprites
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, _0813FD20 @ =gObjectBankIDs
 	lsls r0, 24
 	lsrs r0, 24
@@ -1519,7 +1519,7 @@ sub_813FD34: @ 813FD34
 	lsrs r5, r0, 24
 	ldr r6, _0813FD88 @ =gSprites
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r4, _0813FD8C @ =gObjectBankIDs
 	lsls r0, 24
 	lsrs r0, 24
@@ -1535,7 +1535,7 @@ sub_813FD34: @ 813FD34
 	cmp r0, 0
 	bge _0813FD80
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, r4
@@ -5483,7 +5483,7 @@ sub_8141C30: @ 8141C30
 	movs r0, 0x1E
 	strh r0, [r4, 0x2E]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0
@@ -5495,7 +5495,7 @@ sub_8141C30: @ 8141C30
 	adds r0, r1
 	strh r0, [r4, 0x32]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -5644,11 +5644,11 @@ sub_8141D7C: @ 8141D7C
 	lsls r4, 24
 	lsrs r4, 24
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, _08141DA4 @ =gAnimBankAttacker
 	strb r0, [r1]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, _08141DA8 @ =gAnimBankTarget
 	strb r0, [r1]
 	adds r0, r4, 0
diff --git a/asm/battle_intro.s b/asm/battle_intro.s
index 10b504a79..4bfcf42fb 100755
--- a/asm/battle_intro.s
+++ b/asm/battle_intro.s
@@ -1474,7 +1474,7 @@ sub_80E4EF8: @ 80E4EF8
 	lsls r5, 24
 	lsrs r5, 24
 	adds r0, r4, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, _080E4FCC @ =0x040000d4
diff --git a/asm/cable_car.s b/asm/cable_car.s
deleted file mode 100644
index 52bc2668b..000000000
--- a/asm/cable_car.s
+++ /dev/null
@@ -1,2880 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81231EC
-sub_81231EC: @ 81231EC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _08123210 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0812320A
-	ldr r0, _08123214 @ =sub_8123244
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_0812320A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08123210: .4byte gPaletteFade
-_08123214: .4byte sub_8123244
-	thumb_func_end sub_81231EC
-
-	thumb_func_start sub_8123218
-sub_8123218: @ 8123218
-	push {lr}
-	sub sp, 0x4
-	bl ScriptContext2_Enable
-	ldr r0, _08123240 @ =sub_81231EC
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08123240: .4byte sub_81231EC
-	thumb_func_end sub_8123218
-
-	thumb_func_start sub_8123244
-sub_8123244: @ 8123244
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x10
-	ldr r1, _08123268 @ =gMain
-	ldr r2, _0812326C @ =0x0000043c
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	mov r9, r1
-	cmp r0, 0x8
-	bhi _08123298
-	lsls r0, 2
-	ldr r1, _08123270 @ =_08123274
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08123268: .4byte gMain
-_0812326C: .4byte 0x0000043c
-_08123270: .4byte _08123274
-	.align 2, 0
-_08123274:
-	.4byte _08123298
-	.4byte _08123384
-	.4byte _081233E8
-	.4byte _08123484
-	.4byte _081234A0
-	.4byte _08123504
-	.4byte _08123598
-	.4byte _08123678
-	.4byte _081236B0
-_08123298:
-	movs r0, 0
-	bl SetVBlankCallback
-	bl remove_some_task
-	movs r3, 0xC0
-	lsls r3, 19
-	movs r4, 0xC0
-	lsls r4, 9
-	add r0, sp, 0xC
-	mov r9, r0
-	add r2, sp, 0x8
-	movs r6, 0
-	ldr r1, _08123368 @ =0x040000d4
-	movs r5, 0x80
-	lsls r5, 5
-	ldr r7, _0812336C @ =0x81000800
-	movs r0, 0x81
-	lsls r0, 24
-	mov r8, r0
-_081232C0:
-	strh r6, [r2]
-	add r0, sp, 0x8
-	str r0, [r1]
-	str r3, [r1, 0x4]
-	str r7, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r5
-	subs r4, r5
-	cmp r4, r5
-	bhi _081232C0
-	strh r6, [r2]
-	add r2, sp, 0x8
-	str r2, [r1]
-	str r3, [r1, 0x4]
-	lsrs r0, r4, 1
-	mov r2, r8
-	orrs r0, r2
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r0, 0xE0
-	lsls r0, 19
-	movs r3, 0x80
-	lsls r3, 3
-	movs r4, 0
-	str r4, [sp, 0xC]
-	ldr r2, _08123368 @ =0x040000d4
-	mov r1, r9
-	str r1, [r2]
-	str r0, [r2, 0x4]
-	lsrs r0, r3, 2
-	movs r1, 0x85
-	lsls r1, 24
-	orrs r0, r1
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	movs r1, 0xA0
-	lsls r1, 19
-	add r0, sp, 0x8
-	strh r4, [r0]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	lsrs r3, 1
-	movs r4, 0x81
-	lsls r4, 24
-	orrs r3, r4
-	str r3, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	ldr r1, _08123370 @ =gUnknown_02039274
-	ldr r0, _08123374 @ =gSharedMem + 0x17000
-	str r0, [r1]
-	adds r3, r0, 0
-	ldr r5, _08123378 @ =0x000010fc
-	ldr r0, _0812337C @ =gMain
-	mov r9, r0
-	add r1, sp, 0x8
-	movs r7, 0
-	movs r6, 0x80
-	lsls r6, 5
-	ldr r0, _0812336C @ =0x81000800
-	mov r8, r0
-_08123338:
-	strh r7, [r1]
-	add r0, sp, 0x8
-	str r0, [r2]
-	str r3, [r2, 0x4]
-	mov r0, r8
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	adds r3, r6
-	subs r5, r6
-	cmp r5, r6
-	bhi _08123338
-	strh r7, [r1]
-	add r1, sp, 0x8
-	str r1, [r2]
-	str r3, [r2, 0x4]
-	lsrs r0, r5, 1
-	orrs r0, r4
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	ldr r1, _08123380 @ =0x0000043c
-	add r1, r9
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_08123368: .4byte 0x040000d4
-_0812336C: .4byte 0x81000800
-_08123370: .4byte gUnknown_02039274
-_08123374: .4byte gSharedMem + 0x17000
-_08123378: .4byte 0x000010fc
-_0812337C: .4byte gMain
-_08123380: .4byte 0x0000043c
-_08123384:
-	bl ResetSpriteData
-	bl ResetTasks
-	bl FreeAllSpritePalettes
-	bl ResetPaletteFade
-	bl StartWeather
-	movs r4, 0
-	ldr r0, _081233D4 @ =gWeatherPtr
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0xF0
-	movs r2, 0
-_081233A4:
-	lsls r0, r4, 2
-	adds r0, r1, r0
-	str r2, [r0]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x13
-	bls _081233A4
-	bl InitMapMusic
-	bl ResetMapMusic
-	ldr r2, _081233D8 @ =gSpriteCoordOffsetX
-	ldr r1, _081233DC @ =gSpriteCoordOffsetY
-	movs r0, 0
-	strh r0, [r1]
-	strh r0, [r2]
-	ldr r1, _081233E0 @ =gMain
-	ldr r2, _081233E4 @ =0x0000043c
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_081233D4: .4byte gWeatherPtr
-_081233D8: .4byte gSpriteCoordOffsetX
-_081233DC: .4byte gSpriteCoordOffsetY
-_081233E0: .4byte gMain
-_081233E4: .4byte 0x0000043c
-_081233E8:
-	movs r4, 0
-	ldr r5, _08123454 @ =gUnknown_08401CF8
-_081233EC:
-	lsls r0, r4, 3
-	adds r0, r5
-	bl LoadCompressedObjectPic
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x2
-	bls _081233EC
-	ldr r0, _08123458 @ =gUnknown_08401D18
-	bl LoadSpritePalettes
-	ldr r0, _0812345C @ =gCableCarMtChimneyTilemap
-	ldr r4, _08123460 @ =gSharedMem + 0x19000
-	adds r1, r4, 0
-	bl LZDecompressWram
-	ldr r0, _08123464 @ =gCableCarTreeTilemap
-	movs r2, 0xB4
-	lsls r2, 1
-	adds r1, r4, r2
-	bl LZDecompressWram
-	ldr r0, _08123468 @ =gCableCarMountainTilemap
-	movs r2, 0xA5
-	lsls r2, 3
-	adds r1, r4, r2
-	bl LZDecompressWram
-	ldr r0, _0812346C @ =gCableCarPylonStemTilemap
-	ldr r1, _08123470 @ =0x000009d8
-	adds r4, r1
-	adds r1, r4, 0
-	bl LZDecompressWram
-	ldr r0, _08123474 @ =gCableCarBG_Pal
-	movs r1, 0
-	movs r2, 0x80
-	bl LoadPalette
-	ldr r0, _08123478 @ =gCableCarBG_Gfx
-	movs r1, 0xC0
-	lsls r1, 19
-	bl LZ77UnCompVram
-	ldr r1, _0812347C @ =gMain
-	ldr r2, _08123480 @ =0x0000043c
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_08123454: .4byte gUnknown_08401CF8
-_08123458: .4byte gUnknown_08401D18
-_0812345C: .4byte gCableCarMtChimneyTilemap
-_08123460: .4byte gSharedMem + 0x19000
-_08123464: .4byte gCableCarTreeTilemap
-_08123468: .4byte gCableCarMountainTilemap
-_0812346C: .4byte gCableCarPylonStemTilemap
-_08123470: .4byte 0x000009d8
-_08123474: .4byte gCableCarBG_Pal
-_08123478: .4byte gCableCarBG_Gfx
-_0812347C: .4byte gMain
-_08123480: .4byte 0x0000043c
-_08123484:
-	bl sub_8124118
-	bl RunTasks
-	ldr r1, _08123498 @ =gMain
-	ldr r0, _0812349C @ =0x0000043c
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_08123498: .4byte gMain
-_0812349C: .4byte 0x0000043c
-_081234A0:
-	ldr r0, _081234B4 @ =gUnknown_02039274
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x2]
-	cmp r0, 0x7
-	bne _081234BC
-	ldr r1, _081234B8 @ =0x0000043c
-	add r1, r9
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_081234B4: .4byte gUnknown_02039274
-_081234B8: .4byte 0x0000043c
-_081234BC:
-	ldr r0, _081234FC @ =gWeatherPtr
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0xF0
-	ldr r0, [r1]
-	cmp r0, 0
-	bne _081234CC
-	b _0812370E
-_081234CC:
-	movs r4, 0
-	adds r3, r1, 0
-	movs r5, 0xD
-	negs r5, r5
-_081234D4:
-	lsls r0, r4, 2
-	adds r0, r3, r0
-	ldr r2, [r0]
-	cmp r2, 0
-	beq _081234E6
-	ldrb r1, [r2, 0x5]
-	adds r0, r5, 0
-	ands r0, r1
-	strb r0, [r2, 0x5]
-_081234E6:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x13
-	bls _081234D4
-	ldr r1, _08123500 @ =0x0000043c
-	add r1, r9
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_081234FC: .4byte gWeatherPtr
-_08123500: .4byte 0x0000043c
-_08123504:
-	ldr r0, _08123578 @ =0x0600e800
-	ldr r5, _0812357C @ =gSharedMem + 0x19168
-	movs r1, 0x20
-	str r1, [sp]
-	movs r1, 0xF
-	str r1, [sp, 0x4]
-	adds r1, r5, 0
-	movs r2, 0
-	movs r3, 0x11
-	bl sub_8124F08
-	ldr r0, _08123580 @ =0x0600f000
-	movs r2, 0xF0
-	lsls r2, 2
-	adds r1, r5, r2
-	movs r2, 0x1E
-	str r2, [sp]
-	movs r2, 0x14
-	mov r9, r2
-	str r2, [sp, 0x4]
-	movs r2, 0
-	movs r3, 0
-	bl sub_8124F08
-	ldr r0, _08123584 @ =gUnknown_02039274
-	mov r8, r0
-	ldr r0, [r0]
-	ldr r6, _08123588 @ =0x000008fc
-	adds r0, r6
-	ldr r1, _0812358C @ =gCableCarPylonHookTilemapEntries
-	movs r2, 0x5
-	str r2, [sp]
-	movs r4, 0x2
-	str r4, [sp, 0x4]
-	movs r2, 0
-	movs r3, 0
-	bl sub_8124F08
-	mov r1, r8
-	ldr r0, [r1]
-	adds r0, r6
-	movs r2, 0x87
-	lsls r2, 4
-	adds r5, r2
-	str r4, [sp]
-	mov r1, r9
-	str r1, [sp, 0x4]
-	adds r1, r5, 0
-	movs r2, 0
-	movs r3, 0x2
-	bl sub_8124F08
-	ldr r1, _08123590 @ =gMain
-	ldr r2, _08123594 @ =0x0000043c
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_08123578: .4byte 0x0600e800
-_0812357C: .4byte gSharedMem + 0x19168
-_08123580: .4byte 0x0600f000
-_08123584: .4byte gUnknown_02039274
-_08123588: .4byte 0x000008fc
-_0812358C: .4byte gCableCarPylonHookTilemapEntries
-_08123590: .4byte gMain
-_08123594: .4byte 0x0000043c
-_08123598:
-	ldr r0, _08123664 @ =gSpecialVar_0x8004
-	ldrb r0, [r0]
-	bl sub_81248AC
-	ldr r0, _08123668 @ =gUnknown_02039274
-	mov r8, r0
-	ldr r0, [r0]
-	adds r0, 0xFC
-	ldr r4, _0812366C @ =gSharedMem + 0x19090
-	movs r6, 0xC
-	str r6, [sp]
-	movs r5, 0x3
-	str r5, [sp, 0x4]
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0xE
-	bl sub_8124F08
-	mov r1, r8
-	ldr r0, [r1]
-	adds r0, 0xFC
-	adds r1, r4, 0
-	adds r1, 0x48
-	str r6, [sp]
-	str r5, [sp, 0x4]
-	movs r2, 0xC
-	movs r3, 0x11
-	bl sub_8124F08
-	mov r2, r8
-	ldr r0, [r2]
-	adds r0, 0xFC
-	adds r1, r4, 0
-	adds r1, 0x90
-	str r6, [sp]
-	str r5, [sp, 0x4]
-	movs r2, 0x18
-	movs r3, 0x14
-	bl sub_8124F08
-	mov r1, r8
-	ldr r0, [r1]
-	adds r0, 0xFC
-	movs r2, 0x90
-	negs r2, r2
-	adds r2, r4
-	mov r9, r2
-	str r6, [sp]
-	str r5, [sp, 0x4]
-	mov r1, r9
-	movs r2, 0
-	movs r3, 0x11
-	bl sub_8124F08
-	mov r1, r8
-	ldr r0, [r1]
-	adds r0, 0xFC
-	subs r4, 0x48
-	str r6, [sp]
-	str r5, [sp, 0x4]
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0x14
-	bl sub_8124F08
-	mov r2, r8
-	ldr r0, [r2]
-	adds r0, 0xFC
-	str r6, [sp]
-	str r5, [sp, 0x4]
-	mov r1, r9
-	movs r2, 0xC
-	movs r3, 0x14
-	bl sub_8124F08
-	mov r1, r8
-	ldr r0, [r1]
-	adds r0, 0xFC
-	str r6, [sp]
-	str r5, [sp, 0x4]
-	adds r1, r4, 0
-	movs r2, 0xC
-	movs r3, 0x17
-	bl sub_8124F08
-	mov r2, r8
-	ldr r0, [r2]
-	adds r0, 0xFC
-	str r6, [sp]
-	str r5, [sp, 0x4]
-	mov r1, r9
-	movs r2, 0x18
-	movs r3, 0x17
-	bl sub_8124F08
-	ldr r1, _08123670 @ =gMain
-	ldr r0, _08123674 @ =0x0000043c
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_08123664: .4byte gSpecialVar_0x8004
-_08123668: .4byte gUnknown_02039274
-_0812366C: .4byte gSharedMem + 0x19090
-_08123670: .4byte gMain
-_08123674: .4byte 0x0000043c
-_08123678:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r1, 0x3
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r0, _081236A4 @ =0x000001a9
-	movs r1, 0x1
-	bl FadeInNewBGM
-	movs r0, 0x1
-	bl sub_8123FBC
-	ldr r1, _081236A8 @ =gMain
-	ldr r2, _081236AC @ =0x0000043c
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0812370C
-	.align 2, 0
-_081236A4: .4byte 0x000001a9
-_081236A8: .4byte gMain
-_081236AC: .4byte 0x0000043c
-_081236B0:
-	ldr r3, _081236E4 @ =0x04000208
-	ldrh r2, [r3]
-	movs r0, 0
-	strh r0, [r3]
-	ldr r4, _081236E8 @ =0x04000200
-	ldrh r0, [r4]
-	movs r1, 0x1
-	orrs r0, r1
-	strh r0, [r4]
-	strh r2, [r3]
-	ldr r0, _081236EC @ =sub_8123C40
-	bl SetVBlankCallback
-	ldr r0, _081236F0 @ =sub_8123724
-	bl SetMainCallback2
-	ldr r0, _081236F4 @ =sub_8123878
-	movs r1, 0
-	bl CreateTask
-	ldr r0, _081236F8 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _08123700
-	ldr r0, _081236FC @ =sub_81239E4
-	b _08123702
-	.align 2, 0
-_081236E4: .4byte 0x04000208
-_081236E8: .4byte 0x04000200
-_081236EC: .4byte sub_8123C40
-_081236F0: .4byte sub_8123724
-_081236F4: .4byte sub_8123878
-_081236F8: .4byte gSpecialVar_0x8004
-_081236FC: .4byte sub_81239E4
-_08123700:
-	ldr r0, _0812371C @ =sub_8123AF8
-_08123702:
-	movs r1, 0x1
-	bl CreateTask
-	ldr r1, _08123720 @ =gUnknown_02039274
-	ldr r1, [r1]
-_0812370C:
-	strb r0, [r1]
-_0812370E:
-	add sp, 0x10
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812371C: .4byte sub_8123AF8
-_08123720: .4byte gUnknown_02039274
-	thumb_func_end sub_8123244
-
-	thumb_func_start sub_8123724
-sub_8123724: @ 8123724
-	push {lr}
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	bl MapMusicMain
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8123724
-
-	thumb_func_start sub_8123740
-sub_8123740: @ 8123740
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x8
-	movs r4, 0
-	movs r0, 0
-	bl sub_8123FBC
-	ldr r0, _08123854 @ =gSpriteCoordOffsetX
-	strh r4, [r0]
-	movs r0, 0
-	bl sub_807C9B4
-	add r7, sp, 0x4
-	ldr r0, _08123858 @ =gWeatherPtr
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0xF0
-	movs r2, 0
-_08123766:
-	lsls r0, r4, 2
-	adds r0, r1, r0
-	str r2, [r0]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x13
-	bls _08123766
-	bl ResetTasks
-	bl ResetSpriteData
-	bl ResetPaletteFade
-	ldr r2, _0812385C @ =gSharedMem
-	movs r3, 0x80
-	lsls r3, 10
-	movs r5, 0
-	ldr r1, _08123860 @ =0x040000d4
-	movs r4, 0x80
-	lsls r4, 5
-	ldr r6, _08123864 @ =0x85000400
-	movs r0, 0x85
-	lsls r0, 24
-	mov r12, r0
-_08123798:
-	str r5, [sp]
-	mov r0, sp
-	str r0, [r1]
-	str r2, [r1, 0x4]
-	str r6, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r2, r4
-	subs r3, r4
-	cmp r3, r4
-	bhi _08123798
-	str r5, [sp]
-	mov r0, sp
-	str r0, [r1]
-	str r2, [r1, 0x4]
-	lsrs r0, r3, 2
-	mov r2, r12
-	orrs r0, r2
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r1, _08123868 @ =gUnknown_02039274
-	movs r0, 0
-	str r0, [r1]
-	movs r3, 0xC0
-	lsls r3, 19
-	movs r4, 0xC0
-	lsls r4, 9
-	adds r2, r7, 0
-	movs r6, 0
-	ldr r1, _08123860 @ =0x040000d4
-	movs r5, 0x80
-	lsls r5, 5
-	ldr r0, _0812386C @ =0x81000800
-	mov r12, r0
-	movs r0, 0x81
-	lsls r0, 24
-	mov r8, r0
-_081237E0:
-	strh r6, [r2]
-	str r2, [r1]
-	str r3, [r1, 0x4]
-	mov r0, r12
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r5
-	subs r4, r5
-	cmp r4, r5
-	bhi _081237E0
-	strh r6, [r7]
-	str r7, [r1]
-	str r3, [r1, 0x4]
-	lsrs r0, r4, 1
-	mov r2, r8
-	orrs r0, r2
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r0, 0xE0
-	lsls r0, 19
-	movs r3, 0x80
-	lsls r3, 3
-	movs r4, 0
-	str r4, [sp]
-	ldr r2, _08123860 @ =0x040000d4
-	mov r1, sp
-	str r1, [r2]
-	str r0, [r2, 0x4]
-	lsrs r0, r3, 2
-	movs r1, 0x85
-	lsls r1, 24
-	orrs r0, r1
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	movs r0, 0xA0
-	lsls r0, 19
-	strh r4, [r7]
-	str r7, [r2]
-	str r0, [r2, 0x4]
-	lsrs r3, 1
-	movs r0, 0x81
-	lsls r0, 24
-	orrs r3, r0
-	str r3, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	bl warp_in
-	ldr r0, _08123870 @ =gFieldCallback
-	str r4, [r0]
-	ldr r0, _08123874 @ =CB2_LoadMap
-	bl SetMainCallback2
-	add sp, 0x8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08123854: .4byte gSpriteCoordOffsetX
-_08123858: .4byte gWeatherPtr
-_0812385C: .4byte gSharedMem
-_08123860: .4byte 0x040000d4
-_08123864: .4byte 0x85000400
-_08123868: .4byte gUnknown_02039274
-_0812386C: .4byte 0x81000800
-_08123870: .4byte gFieldCallback
-_08123874: .4byte CB2_LoadMap
-	thumb_func_end sub_8123740
-
-	thumb_func_start sub_8123878
-sub_8123878: @ 8123878
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r4, 0
-	ldr r5, _081238A4 @ =gUnknown_02039274
-	ldr r3, [r5]
-	ldrh r0, [r3, 0x6]
-	adds r0, 0x1
-	strh r0, [r3, 0x6]
-	ldrb r2, [r3, 0x1]
-	adds r7, r5, 0
-	cmp r2, 0x2
-	beq _0812397E
-	cmp r2, 0x2
-	bgt _081238A8
-	cmp r2, 0
-	beq _081238B6
-	cmp r2, 0x1
-	beq _081238D0
-	b _081239D6
-	.align 2, 0
-_081238A4: .4byte gUnknown_02039274
-_081238A8:
-	cmp r2, 0x3
-	bne _081238AE
-	b _081239A4
-_081238AE:
-	cmp r2, 0xFF
-	bne _081238B4
-	b _081239BC
-_081238B4:
-	b _081239D6
-_081238B6:
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r3, 0x4]
-	cmp r0, r1
-	beq _081238C2
-	b _081239D6
-_081238C2:
-	ldrb r0, [r3, 0x2]
-	bl DoWeatherEffect
-	ldr r1, [r5]
-	movs r0, 0x1
-	strb r0, [r1, 0x1]
-	b _081239D6
-_081238D0:
-	ldrb r0, [r3, 0x2]
-	cmp r0, 0x2
-	beq _08123924
-	cmp r0, 0x7
-	beq _081238DC
-	b _081239D6
-_081238DC:
-	ldr r0, _08123920 @ =gWeatherPtr
-	ldr r0, [r0]
-	adds r2, r0, 0
-	adds r2, 0xF0
-	ldr r0, [r2]
-	cmp r0, 0
-	beq _081239D6
-	ldrb r1, [r0, 0x5]
-	movs r0, 0xC
-	ands r0, r1
-	cmp r0, 0
-	beq _081239D6
-	adds r3, r2, 0
-	movs r5, 0xD
-	negs r5, r5
-_081238FA:
-	lsls r0, r4, 2
-	adds r0, r3, r0
-	ldr r2, [r0]
-	cmp r2, 0
-	beq _0812390C
-	ldrb r1, [r2, 0x5]
-	adds r0, r5, 0
-	ands r0, r1
-	strb r0, [r2, 0x5]
-_0812390C:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x13
-	bls _081238FA
-	ldr r1, [r7]
-	movs r0, 0x2
-	strb r0, [r1, 0x1]
-	b _081239D6
-	.align 2, 0
-_08123920: .4byte gWeatherPtr
-_08123924:
-	ldr r0, _08123938 @ =gWeatherPtr
-	ldr r2, [r0]
-	movs r1, 0xDA
-	lsls r1, 3
-	adds r0, r2, r1
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _0812393C
-	strb r0, [r3, 0x1]
-	b _081239D6
-	.align 2, 0
-_08123938: .4byte gWeatherPtr
-_0812393C:
-	ldrh r1, [r3, 0x6]
-	ldrh r0, [r3, 0x4]
-	adds r0, 0x8
-	cmp r1, r0
-	blt _081239D6
-	adds r6, r2, 0
-	adds r6, 0xF0
-	movs r5, 0x1
-	movs r7, 0x5
-	negs r7, r7
-_08123950:
-	lsls r0, r4, 2
-	adds r0, r6, r0
-	ldr r0, [r0]
-	cmp r0, 0
-	beq _08123972
-	adds r3, r0, 0
-	adds r3, 0x3E
-	ldrb r2, [r3]
-	lsls r1, r2, 29
-	lsrs r1, 31
-	eors r1, r5
-	ands r1, r5
-	lsls r1, 2
-	adds r0, r7, 0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-_08123972:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x13
-	bls _08123950
-	b _081239D6
-_0812397E:
-	lsls r1, r0, 16
-	ldr r0, _081239A0 @ =0x023a0000
-	cmp r1, r0
-	bne _081239D6
-	movs r0, 0x3
-	strb r0, [r3, 0x1]
-	subs r0, 0x4
-	str r4, [sp]
-	movs r1, 0x3
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	movs r0, 0x4
-	bl FadeOutBGM
-	b _081239D6
-	.align 2, 0
-_081239A0: .4byte 0x023a0000
-_081239A4:
-	ldr r0, _081239B8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _081239D6
-	movs r0, 0xFF
-	strb r0, [r3, 0x1]
-	b _081239D6
-	.align 2, 0
-_081239B8: .4byte gPaletteFade
-_081239BC:
-	movs r0, 0
-	bl SetVBlankCallback
-	adds r0, r6, 0
-	bl DestroyTask
-	ldr r0, [r5]
-	ldrb r0, [r0]
-	bl DestroyTask
-	ldr r0, _081239E0 @ =sub_8123740
-	bl SetMainCallback2
-_081239D6:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081239E0: .4byte sub_8123740
-	thumb_func_end sub_8123878
-
-	thumb_func_start sub_81239E4
-sub_81239E4: @ 81239E4
-	push {r4-r6,lr}
-	sub sp, 0x8
-	ldr r6, _08123A38 @ =gUnknown_02039274
-	ldr r1, [r6]
-	ldrb r0, [r1, 0x1]
-	cmp r0, 0xFF
-	beq _08123AC0
-	ldrb r0, [r1, 0x14]
-	subs r0, 0x1
-	strb r0, [r1, 0x14]
-	ldr r1, [r6]
-	ldrh r0, [r1, 0x6]
-	movs r3, 0x1
-	ands r0, r3
-	cmp r0, 0
-	bne _08123A0A
-	ldrb r0, [r1, 0x15]
-	subs r0, 0x1
-	strb r0, [r1, 0x15]
-_08123A0A:
-	ldr r2, [r6]
-	ldrh r0, [r2, 0x6]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _08123A24
-	ldrb r0, [r2, 0xC]
-	subs r0, 0x1
-	strb r0, [r2, 0xC]
-	ldr r1, [r6]
-	ldrb r0, [r1, 0xD]
-	subs r0, 0x1
-	strb r0, [r1, 0xD]
-_08123A24:
-	ldr r0, [r6]
-	ldrb r1, [r0, 0x14]
-	cmp r1, 0x20
-	beq _08123A74
-	cmp r1, 0x20
-	bgt _08123A3C
-	cmp r1, 0x10
-	beq _08123A90
-	b _08123AC0
-	.align 2, 0
-_08123A38: .4byte gUnknown_02039274
-_08123A3C:
-	cmp r1, 0x28
-	beq _08123A60
-	cmp r1, 0xAF
-	bne _08123AC0
-	ldr r1, _08123A5C @ =0x000008fc
-	adds r0, r1
-	movs r1, 0x2
-	str r1, [sp]
-	movs r1, 0xA
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x16
-	bl sub_8124E7C
-	b _08123AC0
-	.align 2, 0
-_08123A5C: .4byte 0x000008fc
-_08123A60:
-	ldr r1, _08123A70 @ =0x000008fc
-	adds r0, r1
-	movs r1, 0x2
-	str r1, [sp]
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r2, 0x3
-	b _08123A82
-	.align 2, 0
-_08123A70: .4byte 0x000008fc
-_08123A74:
-	ldr r1, _08123A8C @ =0x000008fc
-	adds r0, r1
-	str r3, [sp]
-	movs r1, 0x2
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r2, 0x2
-_08123A82:
-	movs r3, 0
-	bl sub_8124E7C
-	b _08123AC0
-	.align 2, 0
-_08123A8C: .4byte 0x000008fc
-_08123A90:
-	ldr r5, _08123AE8 @ =0x000008fc
-	adds r0, r5
-	ldr r1, _08123AEC @ =gCableCarPylonHookTilemapEntries
-	movs r2, 0x5
-	str r2, [sp]
-	movs r4, 0x2
-	str r4, [sp, 0x4]
-	movs r2, 0
-	movs r3, 0
-	bl sub_8124F08
-	ldr r0, [r6]
-	adds r0, r5
-	ldr r1, _08123AF0 @ =gSharedMem + 0x199D8
-	str r4, [sp]
-	movs r2, 0x1E
-	str r2, [sp, 0x4]
-	movs r2, 0
-	movs r3, 0x2
-	bl sub_8124F08
-	ldr r1, [r6]
-	movs r0, 0x40
-	strb r0, [r1, 0x15]
-_08123AC0:
-	bl sub_812453C
-	ldr r3, _08123AF4 @ =gSpriteCoordOffsetX
-	movs r0, 0
-	ldrsh r2, [r3, r0]
-	adds r1, r2, 0x1
-	adds r0, r1, 0
-	cmp r1, 0
-	bge _08123AD6
-	adds r0, r2, 0
-	adds r0, 0x80
-_08123AD6:
-	asrs r0, 7
-	lsls r0, 7
-	subs r0, r1, r0
-	strh r0, [r3]
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08123AE8: .4byte 0x000008fc
-_08123AEC: .4byte gCableCarPylonHookTilemapEntries
-_08123AF0: .4byte gSharedMem + 0x199D8
-_08123AF4: .4byte gSpriteCoordOffsetX
-	thumb_func_end sub_81239E4
-
-	thumb_func_start sub_8123AF8
-sub_8123AF8: @ 8123AF8
-	push {r4-r6,lr}
-	sub sp, 0x8
-	ldr r6, _08123B4C @ =gUnknown_02039274
-	ldr r1, [r6]
-	ldrb r0, [r1, 0x1]
-	cmp r0, 0xFF
-	beq _08123BEE
-	ldrb r0, [r1, 0x14]
-	adds r0, 0x1
-	strb r0, [r1, 0x14]
-	ldr r2, [r6]
-	ldrh r0, [r2, 0x6]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08123B1E
-	ldrb r0, [r2, 0x15]
-	adds r0, 0x1
-	strb r0, [r2, 0x15]
-_08123B1E:
-	ldr r2, [r6]
-	ldrh r0, [r2, 0x6]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _08123B38
-	ldrb r0, [r2, 0xC]
-	adds r0, 0x1
-	strb r0, [r2, 0xC]
-	ldr r1, [r6]
-	ldrb r0, [r1, 0xD]
-	adds r0, 0x1
-	strb r0, [r1, 0xD]
-_08123B38:
-	ldr r3, [r6]
-	ldrb r0, [r3, 0x14]
-	cmp r0, 0x20
-	beq _08123BB0
-	cmp r0, 0x20
-	bgt _08123B50
-	cmp r0, 0x10
-	beq _08123B78
-	b _08123BEE
-	.align 2, 0
-_08123B4C: .4byte gUnknown_02039274
-_08123B50:
-	cmp r0, 0x28
-	beq _08123BDC
-	cmp r0, 0xB0
-	bne _08123BEE
-	ldr r1, _08123B70 @ =0x000008fc
-	adds r0, r3, r1
-	ldr r1, _08123B74 @ =gSharedMem + 0x199D8
-	movs r2, 0x2
-	str r2, [sp]
-	movs r2, 0x1E
-	str r2, [sp, 0x4]
-	movs r2, 0
-	movs r3, 0x2
-	bl sub_8124F08
-	b _08123BEE
-	.align 2, 0
-_08123B70: .4byte 0x000008fc
-_08123B74: .4byte gSharedMem + 0x199D8
-_08123B78:
-	ldr r5, _08123BAC @ =0x000008fc
-	adds r0, r3, r5
-	movs r1, 0x3
-	str r1, [sp]
-	movs r4, 0x2
-	str r4, [sp, 0x4]
-	movs r1, 0
-	movs r2, 0x2
-	movs r3, 0
-	bl sub_8124E7C
-	ldr r0, [r6]
-	adds r0, r5
-	str r4, [sp]
-	movs r1, 0xA
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x16
-	bl sub_8124E7C
-	ldr r1, [r6]
-	movs r0, 0xC0
-	strb r0, [r1, 0x15]
-	b _08123BEE
-	.align 2, 0
-_08123BAC: .4byte 0x000008fc
-_08123BB0:
-	ldr r1, _08123BD4 @ =gCableCarPylonHookTilemapEntries + 0x4
-	ldrh r2, [r1]
-	movs r4, 0x90
-	lsls r4, 4
-	adds r0, r3, r4
-	strh r2, [r0]
-	ldrh r2, [r1, 0x2]
-	adds r4, 0x2
-	adds r0, r3, r4
-	strh r2, [r0]
-	ldrh r2, [r1, 0xA]
-	adds r4, 0x3E
-	adds r0, r3, r4
-	strh r2, [r0]
-	ldrh r1, [r1, 0xC]
-	ldr r2, _08123BD8 @ =0x00000942
-	b _08123BEA
-	.align 2, 0
-_08123BD4: .4byte gCableCarPylonHookTilemapEntries + 0x4
-_08123BD8: .4byte 0x00000942
-_08123BDC:
-	ldr r2, _08123C08 @ =gCableCarPylonHookTilemapEntries + 0x8
-	ldrh r1, [r2]
-	ldr r4, _08123C0C @ =0x00000904
-	adds r0, r3, r4
-	strh r1, [r0]
-	ldrh r1, [r2, 0xA]
-	ldr r2, _08123C10 @ =0x00000944
-_08123BEA:
-	adds r0, r3, r2
-	strh r1, [r0]
-_08123BEE:
-	bl sub_8124598
-	ldr r0, _08123C14 @ =gUnknown_02039274
-	ldr r1, [r0]
-	ldrh r0, [r1, 0x6]
-	ldrh r1, [r1, 0x4]
-	cmp r0, r1
-	bcs _08123C1C
-	ldr r4, _08123C18 @ =gSpriteCoordOffsetX
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	b _08123C26
-	.align 2, 0
-_08123C08: .4byte gCableCarPylonHookTilemapEntries + 0x8
-_08123C0C: .4byte 0x00000904
-_08123C10: .4byte 0x00000944
-_08123C14: .4byte gUnknown_02039274
-_08123C18: .4byte gSpriteCoordOffsetX
-_08123C1C:
-	ldr r0, _08123C38 @ =gWeatherPtr
-	ldr r4, [r0]
-	ldr r2, _08123C3C @ =0x000006fc
-	adds r4, r2
-	ldrh r0, [r4]
-_08123C26:
-	adds r0, 0xF7
-	movs r1, 0xF8
-	bl __modsi3
-	strh r0, [r4]
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08123C38: .4byte gWeatherPtr
-_08123C3C: .4byte 0x000006fc
-	thumb_func_end sub_8123AF8
-
-	thumb_func_start sub_8123C40
-sub_8123C40: @ 8123C40
-	push {r4,lr}
-	ldr r1, _08123C9C @ =0x040000d4
-	ldr r0, _08123CA0 @ =gUnknown_02039274
-	ldr r2, [r0]
-	adds r0, r2, 0
-	adds r0, 0xFC
-	str r0, [r1]
-	ldr r0, _08123CA4 @ =0x0600e000
-	str r0, [r1, 0x4]
-	ldr r3, _08123CA8 @ =0x80000400
-	str r3, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r4, _08123CAC @ =0x000008fc
-	adds r0, r2, r4
-	str r0, [r1]
-	ldr r0, _08123CB0 @ =0x0600f800
-	str r0, [r1, 0x4]
-	str r3, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	subs r1, 0xB8
-	ldrb r0, [r2, 0x14]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrb r0, [r2, 0x15]
-	strh r0, [r1]
-	subs r1, 0xA
-	ldrb r0, [r2, 0xC]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrb r0, [r2, 0xD]
-	strh r0, [r1]
-	subs r1, 0x6
-	ldrb r0, [r2, 0x8]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrb r0, [r2, 0x9]
-	strh r0, [r1]
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08123C9C: .4byte 0x040000d4
-_08123CA0: .4byte gUnknown_02039274
-_08123CA4: .4byte 0x0600e000
-_08123CA8: .4byte 0x80000400
-_08123CAC: .4byte 0x000008fc
-_08123CB0: .4byte 0x0600f800
-	thumb_func_end sub_8123C40
-
-	thumb_func_start nullsub_76
-nullsub_76: @ 8123CB4
-	bx lr
-	thumb_func_end nullsub_76
-
-	thumb_func_start sub_8123CB8
-sub_8123CB8: @ 8123CB8
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, _08123D20 @ =gUnknown_02039274
-	ldr r6, [r0]
-	ldrb r0, [r6, 0x1]
-	cmp r0, 0xFF
-	beq _08123D84
-	ldr r0, _08123D24 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _08123D34
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123CE2
-	ldr r1, _08123D28 @ =0x47800000
-	bl __addsf3
-_08123CE2:
-	ldr r1, _08123D2C @ =0x3e0f5c29
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x2E]
-	subs r1, r0
-	strh r1, [r5, 0x20]
-	movs r1, 0x6
-	ldrsh r4, [r6, r1]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123D0A
-	ldr r1, _08123D28 @ =0x47800000
-	bl __addsf3
-_08123D0A:
-	ldr r1, _08123D30 @ =0x3d89374c
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x30]
-	subs r1, r0
-	strh r1, [r5, 0x22]
-	b _08123D84
-	.align 2, 0
-_08123D20: .4byte gUnknown_02039274
-_08123D24: .4byte gSpecialVar_0x8004
-_08123D28: .4byte 0x47800000
-_08123D2C: .4byte 0x3e0f5c29
-_08123D30: .4byte 0x3d89374c
-_08123D34:
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123D48
-	ldr r1, _08123D8C @ =0x47800000
-	bl __addsf3
-_08123D48:
-	ldr r1, _08123D90 @ =0x3e0f5c29
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x2E]
-	adds r0, r1
-	strh r0, [r5, 0x20]
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123D70
-	ldr r1, _08123D8C @ =0x47800000
-	bl __addsf3
-_08123D70:
-	ldr r1, _08123D94 @ =0x3d89374c
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x30]
-	adds r0, r1
-	strh r0, [r5, 0x22]
-_08123D84:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08123D8C: .4byte 0x47800000
-_08123D90: .4byte 0x3e0f5c29
-_08123D94: .4byte 0x3d89374c
-	thumb_func_end sub_8123CB8
-
-	thumb_func_start sub_8123D98
-sub_8123D98: @ 8123D98
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, _08123E04 @ =gUnknown_02039274
-	ldr r6, [r0]
-	ldrb r0, [r6, 0x1]
-	cmp r0, 0xFF
-	bne _08123DA8
-	b _08123EB0
-_08123DA8:
-	ldr r0, _08123E08 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _08123E18
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123DC4
-	ldr r1, _08123E0C @ =0x47800000
-	bl __addsf3
-_08123DC4:
-	ldr r1, _08123E10 @ =0x3e0f5c29
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x2E]
-	subs r1, r0
-	strh r1, [r5, 0x20]
-	movs r1, 0x6
-	ldrsh r4, [r6, r1]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123DEC
-	ldr r1, _08123E0C @ =0x47800000
-	bl __addsf3
-_08123DEC:
-	ldr r1, _08123E14 @ =0x3d89374c
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x30]
-	subs r1, r0
-	strh r1, [r5, 0x22]
-	b _08123E68
-	.align 2, 0
-_08123E04: .4byte gUnknown_02039274
-_08123E08: .4byte gSpecialVar_0x8004
-_08123E0C: .4byte 0x47800000
-_08123E10: .4byte 0x3e0f5c29
-_08123E14: .4byte 0x3d89374c
-_08123E18:
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123E2C
-	ldr r1, _08123E8C @ =0x47800000
-	bl __addsf3
-_08123E2C:
-	ldr r1, _08123E90 @ =0x3e0f5c29
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x2E]
-	adds r0, r1
-	strh r0, [r5, 0x20]
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123E54
-	ldr r1, _08123E8C @ =0x47800000
-	bl __addsf3
-_08123E54:
-	ldr r1, _08123E94 @ =0x3d89374c
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x30]
-	adds r0, r1
-	strh r0, [r5, 0x22]
-_08123E68:
-	movs r0, 0x32
-	ldrsh r2, [r5, r0]
-	cmp r2, 0
-	bne _08123E98
-	movs r0, 0x11
-	strh r0, [r5, 0x26]
-	ldrh r0, [r5, 0x34]
-	adds r1, r0, 0x1
-	strh r1, [r5, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x9
-	ble _08123EB0
-	strh r2, [r5, 0x34]
-	ldrh r0, [r5, 0x32]
-	adds r0, 0x1
-	strh r0, [r5, 0x32]
-	b _08123EB0
-	.align 2, 0
-_08123E8C: .4byte 0x47800000
-_08123E90: .4byte 0x3e0f5c29
-_08123E94: .4byte 0x3d89374c
-_08123E98:
-	movs r2, 0
-	movs r0, 0x10
-	strh r0, [r5, 0x26]
-	ldrh r0, [r5, 0x34]
-	adds r1, r0, 0x1
-	strh r1, [r5, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x9
-	ble _08123EB0
-	strh r2, [r5, 0x34]
-	strh r2, [r5, 0x32]
-_08123EB0:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8123D98
-
-	thumb_func_start sub_8123EB8
-sub_8123EB8: @ 8123EB8
-	push {lr}
-	adds r2, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r2, r1]
-	cmp r0, 0
-	bne _08123EE8
-	adds r0, r2, 0
-	adds r0, 0x28
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	lsls r0, 1
-	ldrh r3, [r2, 0x20]
-	adds r0, r3
-	strh r0, [r2, 0x20]
-	ldrh r1, [r2, 0x22]
-	adds r1, 0x10
-	adds r0, r2, 0
-	adds r0, 0x29
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	adds r0, r1
-	strh r0, [r2, 0x22]
-_08123EE8:
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	movs r3, 0x32
-	ldrsh r1, [r2, r3]
-	cmp r0, r1
-	blt _08123F3E
-	movs r0, 0x30
-	ldrsh r1, [r2, r0]
-	cmp r1, 0
-	beq _08123F08
-	cmp r1, 0x1
-	beq _08123F12
-	b _08123F30
-_08123F08:
-	ldrh r0, [r2, 0x20]
-	adds r0, 0x1
-	strh r0, [r2, 0x20]
-	ldrh r0, [r2, 0x2E]
-	b _08123F22
-_08123F12:
-	ldrh r0, [r2, 0x2E]
-	ands r0, r1
-	cmp r0, 0
-	beq _08123F30
-	ldrh r0, [r2, 0x20]
-	adds r0, 0x1
-	strh r0, [r2, 0x20]
-	ldrh r0, [r2, 0x20]
-_08123F22:
-	movs r1, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _08123F30
-	ldrh r0, [r2, 0x22]
-	adds r0, 0x1
-	strh r0, [r2, 0x22]
-_08123F30:
-	movs r1, 0x22
-	ldrsh r0, [r2, r1]
-	cmp r0, 0xA0
-	ble _08123F3E
-	adds r0, r2, 0
-	bl DestroySprite
-_08123F3E:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8123EB8
-
-	thumb_func_start sub_8123F44
-sub_8123F44: @ 8123F44
-	push {lr}
-	adds r2, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r2, r1]
-	cmp r0, 0
-	bne _08123F62
-	ldrh r1, [r2, 0x22]
-	adds r1, 0x10
-	adds r0, r2, 0
-	adds r0, 0x29
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	adds r0, r1
-	strh r0, [r2, 0x22]
-_08123F62:
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	movs r3, 0x32
-	ldrsh r1, [r2, r3]
-	cmp r0, r1
-	blt _08123FB8
-	movs r0, 0x30
-	ldrsh r1, [r2, r0]
-	cmp r1, 0
-	beq _08123F82
-	cmp r1, 0x1
-	beq _08123F8C
-	b _08123FAA
-_08123F82:
-	ldrh r0, [r2, 0x20]
-	subs r0, 0x1
-	strh r0, [r2, 0x20]
-	ldrh r0, [r2, 0x2E]
-	b _08123F9C
-_08123F8C:
-	ldrh r0, [r2, 0x2E]
-	ands r0, r1
-	cmp r0, 0
-	beq _08123FAA
-	ldrh r0, [r2, 0x20]
-	subs r0, 0x1
-	strh r0, [r2, 0x20]
-	ldrh r0, [r2, 0x20]
-_08123F9C:
-	movs r1, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _08123FAA
-	ldrh r0, [r2, 0x22]
-	subs r0, 0x1
-	strh r0, [r2, 0x22]
-_08123FAA:
-	movs r1, 0x22
-	ldrsh r0, [r2, r1]
-	cmp r0, 0x4F
-	bgt _08123FB8
-	adds r0, r2, 0
-	bl DestroySprite
-_08123FB8:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8123F44
-
-	thumb_func_start sub_8123FBC
-sub_8123FBC: @ 8123FBC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _08123FCA
-	cmp r0, 0x1
-	beq _08124024
-_08123FCA:
-	ldr r1, _08124020 @ =REG_WININ
-	movs r0, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	strh r0, [r1]
-	subs r1, 0xA
-	strh r0, [r1]
-	adds r1, 0x2
-	strh r0, [r1]
-	adds r1, 0x2
-	strh r0, [r1]
-	adds r1, 0x2
-	strh r0, [r1]
-	subs r1, 0x46
-	strh r0, [r1]
-	adds r1, 0xE
-	strh r0, [r1]
-	subs r1, 0x2
-	strh r0, [r1]
-	subs r1, 0x2
-	strh r0, [r1]
-	subs r1, 0x2
-	strh r0, [r1]
-	adds r1, 0x14
-	strh r0, [r1]
-	adds r1, 0x2
-	strh r0, [r1]
-	subs r1, 0x6
-	strh r0, [r1]
-	adds r1, 0x2
-	strh r0, [r1]
-	subs r1, 0x6
-	strh r0, [r1]
-	adds r1, 0x2
-	strh r0, [r1]
-	subs r1, 0x6
-	strh r0, [r1]
-	adds r1, 0x2
-	strh r0, [r1]
-	adds r1, 0x3E
-	strh r0, [r1]
-	b _081240EE
-	.align 2, 0
-_08124020: .4byte REG_WININ
-_08124024:
-	ldr r0, _08124060 @ =REG_WININ
-	movs r3, 0
-	strh r3, [r0]
-	adds r0, 0x2
-	strh r3, [r0]
-	subs r0, 0xA
-	strh r3, [r0]
-	adds r0, 0x2
-	strh r3, [r0]
-	adds r0, 0x2
-	strh r3, [r0]
-	adds r0, 0x2
-	strh r3, [r0]
-	ldr r0, _08124064 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _0812406C
-	ldr r1, _08124068 @ =gUnknown_02039274
-	ldr r2, [r1]
-	movs r0, 0xB0
-	strb r0, [r2, 0x14]
-	ldr r2, [r1]
-	movs r0, 0x10
-	strb r0, [r2, 0x15]
-	ldr r0, [r1]
-	strb r3, [r0, 0xC]
-	ldr r2, [r1]
-	movs r0, 0x50
-	b _08124082
-	.align 2, 0
-_08124060: .4byte REG_WININ
-_08124064: .4byte gSpecialVar_0x8004
-_08124068: .4byte gUnknown_02039274
-_0812406C:
-	ldr r1, _081240F4 @ =gUnknown_02039274
-	ldr r2, [r1]
-	movs r0, 0x60
-	strb r0, [r2, 0x14]
-	ldr r2, [r1]
-	movs r0, 0xE8
-	strb r0, [r2, 0x15]
-	ldr r0, [r1]
-	strb r3, [r0, 0xC]
-	ldr r2, [r1]
-	movs r0, 0x4
-_08124082:
-	strb r0, [r2, 0xD]
-	ldr r0, [r1]
-	strb r3, [r0, 0x9]
-	ldr r0, [r1]
-	strb r3, [r0, 0x9]
-	adds r2, r1, 0
-	ldr r1, _081240F8 @ =REG_BG3HOFS
-	ldr r2, [r2]
-	ldrb r0, [r2, 0x14]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrb r0, [r2, 0x15]
-	strh r0, [r1]
-	ldr r0, _081240FC @ =REG_BG2HOFS
-	movs r1, 0
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	ldr r1, _08124100 @ =REG_BG1HOFS
-	ldrb r0, [r2, 0xC]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrb r0, [r2, 0xD]
-	strh r0, [r1]
-	subs r1, 0x6
-	ldrb r0, [r2, 0x8]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrb r0, [r2, 0x9]
-	strh r0, [r1]
-	subs r1, 0xA
-	ldr r2, _08124104 @ =0x00003c01
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r3, _08124108 @ =0x00003d02
-	adds r0, r3, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r2, _0812410C @ =0x00003e03
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _08124110 @ =REG_BG3CNT
-	movs r3, 0xFC
-	lsls r3, 6
-	adds r2, r3, 0
-	strh r2, [r0]
-	subs r1, 0xC
-	movs r3, 0xFA
-	lsls r3, 5
-	adds r0, r3, 0
-	strh r0, [r1]
-	ldr r0, _08124114 @ =REG_BLDCNT
-	strh r2, [r0]
-_081240EE:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081240F4: .4byte gUnknown_02039274
-_081240F8: .4byte REG_BG3HOFS
-_081240FC: .4byte REG_BG2HOFS
-_08124100: .4byte REG_BG1HOFS
-_08124104: .4byte 0x00003c01
-_08124108: .4byte 0x00003d02
-_0812410C: .4byte 0x00003e03
-_08124110: .4byte REG_BG3CNT
-_08124114: .4byte REG_BLDCNT
-	thumb_func_end sub_8123FBC
-
-	thumb_func_start sub_8124118
-sub_8124118: @ 8124118
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x24
-	ldr r1, _0812422C @ =gCableCarPlayerGraphicsIDs
-	add r0, sp, 0x8
-	movs r2, 0x2
-	bl memcpy
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	mov r9, r0
-	add r6, sp, 0xC
-	ldr r1, _08124230 @ =gMtChimneyHikerGraphicsIDs
-	adds r0, r6, 0
-	movs r2, 0x4
-	bl memcpy
-	add r5, sp, 0x10
-	ldr r1, _08124234 @ =gMtChimneyHikerCoords
-	adds r0, r5, 0
-	movs r2, 0x8
-	bl memcpy
-	add r4, sp, 0x18
-	ldr r1, _08124238 @ =gMtChimneyHikerMovementDelayTable
-	adds r0, r4, 0
-	movs r2, 0x4
-	bl memcpy
-	ldr r0, _0812423C @ =gUnknown_08401D9C
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [sp, 0x1C]
-	str r1, [sp, 0x20]
-	ldr r0, _08124240 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	mov r8, r6
-	mov r10, r5
-	cmp r0, 0
-	beq _08124176
-	cmp r0, 0x1
-	beq _08124258
-_08124176:
-	ldr r0, _08124244 @ =gSaveBlock2
-	ldrb r0, [r0, 0x8]
-	add r0, sp
-	adds r0, 0x8
-	ldrb r0, [r0]
-	ldr r1, _08124248 @ =sub_8123D98
-	movs r2, 0x66
-	str r2, [sp]
-	movs r2, 0xC8
-	movs r3, 0x49
-	bl AddPseudoFieldObject
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x40
-	beq _081241BE
-	ldr r0, _0812424C @ =gSprites
-	lsls r1, r6, 4
-	adds r1, r6
-	lsls r1, 2
-	adds r1, r0
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	movs r2, 0x8
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	movs r0, 0x8
-	strh r0, [r1, 0x24]
-	movs r0, 0x10
-	strh r0, [r1, 0x26]
-	movs r0, 0xC8
-	strh r0, [r1, 0x2E]
-	movs r0, 0x49
-	strh r0, [r1, 0x30]
-_081241BE:
-	ldr r4, _08124250 @ =gSpriteTemplate_8401D40
-	adds r0, r4, 0
-	movs r1, 0xB0
-	movs r2, 0x2B
-	movs r3, 0x67
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r5, _0812424C @ =gSprites
-	lsls r0, r6, 4
-	adds r0, r6
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x20
-	strh r1, [r0, 0x26]
-	strh r1, [r0, 0x24]
-	movs r1, 0xB0
-	strh r1, [r0, 0x2E]
-	movs r1, 0x2B
-	strh r1, [r0, 0x30]
-	adds r4, 0x18
-	adds r0, r4, 0
-	movs r1, 0xC8
-	movs r2, 0x63
-	movs r3, 0x65
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 4
-	adds r0, r6
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x8
-	strh r1, [r0, 0x24]
-	movs r1, 0x4
-	strh r1, [r0, 0x26]
-	movs r1, 0xC8
-	strh r1, [r0, 0x2E]
-	movs r1, 0x63
-	strh r1, [r0, 0x30]
-	ldr r2, _08124254 @ =gUnknown_02039274
-	ldr r1, [r2]
-	movs r0, 0x7
-	strb r0, [r1, 0x2]
-	ldr r1, [r2]
-	movs r0, 0xAF
-	lsls r0, 1
-	strh r0, [r1, 0x4]
-	movs r0, 0x2
-	bl sub_807C9B4
-	b _0812431E
-	.align 2, 0
-_0812422C: .4byte gCableCarPlayerGraphicsIDs
-_08124230: .4byte gMtChimneyHikerGraphicsIDs
-_08124234: .4byte gMtChimneyHikerCoords
-_08124238: .4byte gMtChimneyHikerMovementDelayTable
-_0812423C: .4byte gUnknown_08401D9C
-_08124240: .4byte gSpecialVar_0x8004
-_08124244: .4byte gSaveBlock2
-_08124248: .4byte sub_8123D98
-_0812424C: .4byte gSprites
-_08124250: .4byte gSpriteTemplate_8401D40
-_08124254: .4byte gUnknown_02039274
-_08124258:
-	ldr r7, _081243EC @ =gUnknown_02039274
-	ldr r0, [r7]
-	adds r0, 0xFC
-	ldr r1, _081243F0 @ =gSharedMem + 0x19048
-	movs r2, 0xC
-	str r2, [sp]
-	movs r2, 0x3
-	str r2, [sp, 0x4]
-	movs r2, 0x18
-	movs r3, 0x1A
-	bl sub_8124F08
-	ldr r0, _081243F4 @ =gSaveBlock2
-	ldrb r0, [r0, 0x8]
-	add r0, sp
-	adds r0, 0x8
-	ldrb r0, [r0]
-	ldr r1, _081243F8 @ =sub_8123D98
-	movs r2, 0x66
-	str r2, [sp]
-	movs r2, 0x80
-	movs r3, 0x27
-	bl AddPseudoFieldObject
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x40
-	beq _081242B8
-	ldr r0, _081243FC @ =gSprites
-	lsls r1, r6, 4
-	adds r1, r6
-	lsls r1, 2
-	adds r1, r0
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	movs r2, 0x8
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	movs r0, 0x8
-	strh r0, [r1, 0x24]
-	movs r0, 0x10
-	strh r0, [r1, 0x26]
-	movs r0, 0x80
-	strh r0, [r1, 0x2E]
-	movs r0, 0x27
-	strh r0, [r1, 0x30]
-_081242B8:
-	ldr r4, _08124400 @ =gSpriteTemplate_8401D40
-	adds r0, r4, 0
-	movs r1, 0x68
-	movs r2, 0x9
-	movs r3, 0x67
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r5, _081243FC @ =gSprites
-	lsls r0, r6, 4
-	adds r0, r6
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x20
-	strh r1, [r0, 0x26]
-	strh r1, [r0, 0x24]
-	movs r1, 0x68
-	strh r1, [r0, 0x2E]
-	movs r1, 0x9
-	strh r1, [r0, 0x30]
-	adds r4, 0x18
-	adds r0, r4, 0
-	movs r1, 0x80
-	movs r2, 0x41
-	movs r3, 0x65
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 4
-	adds r0, r6
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x8
-	strh r1, [r0, 0x24]
-	movs r1, 0x4
-	strh r1, [r0, 0x26]
-	movs r1, 0x80
-	strh r1, [r0, 0x2E]
-	movs r1, 0x41
-	strh r1, [r0, 0x30]
-	ldr r1, [r7]
-	movs r0, 0x2
-	strb r0, [r1, 0x2]
-	ldr r1, [r7]
-	ldr r0, _08124404 @ =0x00000109
-	strh r0, [r1, 0x4]
-	movs r0, 0x7
-	bl sub_807C9B4
-_0812431E:
-	movs r4, 0
-	ldr r5, _081243FC @ =gSprites
-_08124322:
-	lsls r1, r4, 20
-	movs r0, 0xC0
-	lsls r0, 15
-	adds r1, r0
-	asrs r1, 16
-	lsls r2, r4, 19
-	ldr r3, _08124408 @ =0xfff80000
-	adds r2, r3
-	asrs r2, 16
-	ldr r0, _0812440C @ =gSpriteTemplate_8401D70
-	movs r3, 0x68
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 4
-	adds r0, r6
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x8
-	strh r1, [r0, 0x24]
-	strh r1, [r0, 0x26]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x8
-	bls _08124322
-	movs r0, 0x3F
-	mov r4, r9
-	ands r0, r4
-	cmp r0, 0
-	bne _08124458
-	mov r0, r9
-	movs r1, 0x3
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 16
-	add r0, r8
-	ldrb r0, [r0]
-	ldr r5, _08124410 @ =gSpecialVar_0x8004
-	ldrh r4, [r5]
-	lsls r4, 2
-	add r1, sp, 0x1C
-	adds r1, r4, r1
-	ldr r1, [r1]
-	mov r3, r10
-	adds r2, r3, r4
-	movs r3, 0
-	ldrsh r2, [r2, r3]
-	mov r3, sp
-	adds r3, 0x12
-	adds r3, r4
-	movs r4, 0
-	ldrsh r3, [r3, r4]
-	movs r4, 0x6A
-	str r4, [sp]
-	bl AddPseudoFieldObject
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x40
-	beq _08124458
-	ldr r1, _081243FC @ =gSprites
-	lsls r2, r6, 4
-	adds r0, r2, r6
-	lsls r0, 2
-	adds r4, r0, r1
-	ldrb r1, [r4, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x8
-	orrs r0, r1
-	strb r0, [r4, 0x5]
-	adds r0, r4, 0
-	adds r0, 0x28
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	negs r0, r0
-	strh r0, [r4, 0x24]
-	adds r0, r4, 0
-	adds r0, 0x29
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	negs r0, r0
-	strh r0, [r4, 0x26]
-	ldrh r0, [r5]
-	mov r8, r2
-	cmp r0, 0
-	bne _0812441A
-	movs r7, 0x1
-	mov r5, r9
-	ands r5, r7
-	cmp r5, 0
-	beq _08124414
-	adds r0, r4, 0
-	movs r1, 0x6
-	b _08124428
-	.align 2, 0
-_081243EC: .4byte gUnknown_02039274
-_081243F0: .4byte gSharedMem + 0x19048
-_081243F4: .4byte gSaveBlock2
-_081243F8: .4byte sub_8123D98
-_081243FC: .4byte gSprites
-_08124400: .4byte gSpriteTemplate_8401D40
-_08124404: .4byte 0x00000109
-_08124408: .4byte 0xfff80000
-_0812440C: .4byte gSpriteTemplate_8401D70
-_08124410: .4byte gSpecialVar_0x8004
-_08124414:
-	adds r0, r4, 0
-	movs r1, 0x7
-	b _0812443A
-_0812441A:
-	movs r7, 0x1
-	mov r5, r9
-	ands r5, r7
-	cmp r5, 0
-	beq _08124436
-	adds r0, r4, 0
-	movs r1, 0x7
-_08124428:
-	bl StartSpriteAnim
-	strh r7, [r4, 0x30]
-	ldrh r0, [r4, 0x22]
-	adds r0, 0x2
-	strh r0, [r4, 0x22]
-	b _08124440
-_08124436:
-	adds r0, r4, 0
-	movs r1, 0x6
-_0812443A:
-	bl StartSpriteAnim
-	strh r5, [r4, 0x30]
-_08124440:
-	ldr r0, _08124468 @ =gSprites
-	mov r2, r8
-	adds r1, r2, r6
-	lsls r1, 2
-	adds r1, r0
-	movs r0, 0x3
-	mov r3, r9
-	ands r0, r3
-	add r0, sp
-	adds r0, 0x18
-	ldrb r0, [r0]
-	strh r0, [r1, 0x32]
-_08124458:
-	add sp, 0x24
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08124468: .4byte gSprites
-	thumb_func_end sub_8124118
-
-	thumb_func_start sub_812446C
-sub_812446C: @ 812446C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	movs r3, 0
-	mov r9, r3
-	ldr r2, _08124530 @ =gUnknown_02039274
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x1B]
-	adds r1, 0x2
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 26
-	lsrs r0, 24
-	mov r12, r0
-_0812448E:
-	movs r6, 0
-	lsls r0, r3, 1
-	adds r1, r3, 0x3
-	adds r2, r3, 0x6
-	adds r4, r3, 0x1
-	str r4, [sp]
-	adds r0, r3
-	lsls r0, 3
-	mov r10, r0
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 3
-	mov r8, r0
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 3
-	str r0, [sp, 0x4]
-_081244B0:
-	ldr r7, _08124530 @ =gUnknown_02039274
-	ldr r5, [r7]
-	lsls r3, r6, 1
-	mov r0, r10
-	adds r2, r3, r0
-	adds r4, r5, 0
-	adds r4, 0x22
-	adds r2, r4, r2
-	mov r1, r12
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r12, r0
-	lsls r1, 1
-	ldr r7, _08124534 @ =gSharedMem + 0x19000
-	adds r1, r7
-	ldrh r0, [r1]
-	strh r0, [r2]
-	mov r0, r8
-	adds r1, r3, r0
-	adds r1, r4, r1
-	mov r7, r9
-	lsls r2, r7, 1
-	ldr r7, _08124534 @ =gSharedMem + 0x19000
-	adds r0, r2, r7
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r0, [sp, 0x4]
-	adds r3, r0
-	adds r4, r3
-	ldr r1, _08124538 @ =gSharedMem + 0x19048
-	adds r2, r1
-	ldrh r0, [r2]
-	strh r0, [r4]
-	mov r0, r9
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0xB
-	bls _081244B0
-	ldr r4, [sp]
-	lsls r0, r4, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x2
-	bls _0812448E
-	ldrb r0, [r5, 0x1B]
-	adds r0, 0x1
-	movs r1, 0x3
-	bl __modsi3
-	strb r0, [r5, 0x1B]
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08124530: .4byte gUnknown_02039274
-_08124534: .4byte gSharedMem + 0x19000
-_08124538: .4byte gSharedMem + 0x19048
-	thumb_func_end sub_812446C
-
-	thumb_func_start sub_812453C
-sub_812453C: @ 812453C
-	push {r4,r5,lr}
-	ldr r5, _08124594 @ =gUnknown_02039274
-	ldr r4, [r5]
-	ldrb r0, [r4, 0x1C]
-	adds r0, 0x1
-	movs r1, 0x60
-	bl __modsi3
-	strb r0, [r4, 0x1C]
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x1F]
-	ldrb r2, [r1, 0x1D]
-	subs r0, r2
-	strb r0, [r1, 0x8]
-	ldr r2, [r5]
-	adds r0, r2, 0
-	adds r0, 0x20
-	ldrb r0, [r0]
-	ldrb r1, [r2, 0x1E]
-	subs r0, r1
-	strb r0, [r2, 0x9]
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x1D]
-	adds r0, 0x1
-	strb r0, [r1, 0x1D]
-	ldr r2, [r5]
-	ldrb r0, [r2, 0x1D]
-	movs r1, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _08124580
-	ldrb r0, [r2, 0x1E]
-	adds r0, 0x1
-	strb r0, [r2, 0x1E]
-_08124580:
-	ldr r0, [r5]
-	ldrb r0, [r0, 0x1D]
-	cmp r0, 0x10
-	bls _0812458C
-	bl sub_81245F4
-_0812458C:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08124594: .4byte gUnknown_02039274
-	thumb_func_end sub_812453C
-
-	thumb_func_start sub_8124598
-sub_8124598: @ 8124598
-	push {r4,r5,lr}
-	ldr r5, _081245F0 @ =gUnknown_02039274
-	ldr r4, [r5]
-	ldrb r0, [r4, 0x1C]
-	adds r0, 0x1
-	movs r1, 0x60
-	bl __modsi3
-	strb r0, [r4, 0x1C]
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x1D]
-	ldrb r2, [r1, 0x1F]
-	adds r0, r2
-	strb r0, [r1, 0x8]
-	ldr r1, [r5]
-	adds r2, r1, 0
-	adds r2, 0x20
-	ldrb r0, [r1, 0x1E]
-	ldrb r2, [r2]
-	adds r0, r2
-	strb r0, [r1, 0x9]
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x1D]
-	adds r0, 0x1
-	strb r0, [r1, 0x1D]
-	ldr r2, [r5]
-	ldrb r0, [r2, 0x1D]
-	movs r1, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _081245DC
-	ldrb r0, [r2, 0x1E]
-	adds r0, 0x1
-	strb r0, [r2, 0x1E]
-_081245DC:
-	ldr r0, [r5]
-	ldrb r0, [r0, 0x1D]
-	cmp r0, 0x10
-	bls _081245E8
-	bl sub_812476C
-_081245E8:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081245F0: .4byte gUnknown_02039274
-	thumb_func_end sub_8124598
-
-	thumb_func_start sub_81245F4
-sub_81245F4: @ 81245F4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	movs r0, 0
-	mov r12, r0
-	ldr r2, _0812475C @ =gUnknown_02039274
-	ldr r0, [r2]
-	mov r1, r12
-	strb r1, [r0, 0x1E]
-	strb r1, [r0, 0x1D]
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x8]
-	strb r0, [r1, 0x1F]
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x9]
-	adds r0, 0x20
-	strb r1, [r0]
-	ldr r4, [r2]
-	ldrb r1, [r4, 0x19]
-	adds r3, r1, 0
-	adds r3, 0x1E
-	adds r0, r3, 0
-	mov r9, r2
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r3, r0
-	strb r0, [r4, 0x19]
-	mov r2, r9
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x18]
-	subs r0, 0x2
-	strb r0, [r1, 0x18]
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x1A]
-	adds r2, r1, 0
-	adds r2, 0x17
-	adds r0, r2, 0
-	ldr r3, _08124760 @ =gUnknown_0203927A
-	mov r10, r3
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r2, r0
-	mov r4, r10
-	strb r0, [r4]
-	ldr r7, _08124764 @ =gUnknown_02039278
-	ldr r0, _08124768 @ =gUnknown_02039279
-	mov r8, r0
-_08124658:
-	mov r1, r9
-	ldr r3, [r1]
-	ldrb r0, [r3, 0x19]
-	strb r0, [r7]
-	mov r2, r10
-	ldrb r0, [r2]
-	mov r4, r12
-	adds r1, r0, r4
-	adds r0, r1, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r1, r0
-	mov r1, r8
-	strb r0, [r1]
-	ldrb r2, [r7]
-	lsls r2, 1
-	ldrb r0, [r1]
-	lsls r0, 6
-	adds r2, r0
-	adds r6, r3, 0
-	adds r6, 0xFC
-	adds r2, r6, r2
-	ldrb r1, [r3, 0x18]
-	lsls r1, 1
-	mov r4, r12
-	lsls r0, r4, 1
-	add r0, r12
-	lsls r5, r0, 3
-	adds r1, r5
-	adds r4, r3, 0
-	adds r4, 0x22
-	adds r1, r4, r1
-	ldrh r0, [r1]
-	strh r0, [r2]
-	ldrb r1, [r7]
-	adds r2, r1, 0x1
-	adds r0, r2, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r2, r0
-	strb r0, [r7]
-	ldrb r1, [r7]
-	lsls r1, 1
-	mov r2, r8
-	ldrb r0, [r2]
-	lsls r0, 6
-	adds r1, r0
-	adds r1, r6, r1
-	ldrb r0, [r3, 0x18]
-	adds r0, 0x1
-	lsls r0, 1
-	adds r0, r5
-	adds r0, r4, r0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	mov r0, r12
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r12, r0
-	cmp r0, 0x8
-	bls _08124658
-	ldr r4, _08124764 @ =gUnknown_02039278
-	mov r5, r9
-	ldr r3, [r5]
-	ldrb r1, [r3, 0x19]
-	adds r2, r1, 0
-	adds r2, 0x1E
-	adds r0, r2, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r2, r0
-	strb r0, [r4]
-	adds r0, r3, 0
-	adds r0, 0xFC
-	ldrb r2, [r4]
-	movs r1, 0x2
-	str r1, [sp]
-	movs r6, 0x20
-	str r6, [sp, 0x4]
-	movs r1, 0
-	movs r3, 0
-	bl sub_8124E7C
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x18]
-	cmp r0, 0
-	bne _0812474C
-	ldrb r2, [r1, 0x1A]
-	adds r3, r2, 0
-	adds r3, 0x1D
-	adds r0, r3, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r3, r0
-	strb r0, [r1, 0x1A]
-	mov r3, r9
-	ldr r1, [r3]
-	movs r0, 0xC
-	strb r0, [r1, 0x18]
-	bl sub_812446C
-	mov r4, r9
-	ldr r1, [r4]
-	ldrb r3, [r1, 0x1A]
-	adds r4, r3, 0x1
-	adds r0, r4, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r4, r0
-	ldr r2, _08124764 @ =gUnknown_02039278
-	strb r0, [r2]
-	adds r0, r1, 0
-	adds r0, 0xFC
-	ldrb r3, [r2]
-	str r6, [sp]
-	movs r1, 0x9
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r2, 0
-	bl sub_8124E7C
-_0812474C:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812475C: .4byte gUnknown_02039274
-_08124760: .4byte gUnknown_0203927A
-_08124764: .4byte gUnknown_02039278
-_08124768: .4byte gUnknown_02039279
-	thumb_func_end sub_81245F4
-
-	thumb_func_start sub_812476C
-sub_812476C: @ 812476C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	movs r0, 0
-	mov r12, r0
-	ldr r2, _0812489C @ =gUnknown_02039274
-	ldr r0, [r2]
-	mov r1, r12
-	strb r1, [r0, 0x1E]
-	strb r1, [r0, 0x1D]
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x8]
-	strb r0, [r1, 0x1F]
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x9]
-	adds r0, 0x20
-	strb r1, [r0]
-	ldr r4, [r2]
-	ldrb r1, [r4, 0x19]
-	adds r3, r1, 0x2
-	adds r0, r3, 0
-	mov r9, r2
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r3, r0
-	strb r0, [r4, 0x19]
-	mov r2, r9
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x18]
-	adds r0, 0x2
-	strb r0, [r1, 0x18]
-	ldr r1, _081248A0 @ =gUnknown_0203927D
-	ldr r0, [r2]
-	ldrb r0, [r0, 0x1A]
-	strb r0, [r1]
-	ldr r4, _081248A4 @ =gUnknown_0203927C
-	mov r10, r4
-	ldr r7, _081248A8 @ =gUnknown_0203927B
-	mov r8, r10
-_081247C0:
-	mov r0, r9
-	ldr r3, [r0]
-	ldrb r0, [r3, 0x19]
-	strb r0, [r7]
-	ldr r1, _081248A0 @ =gUnknown_0203927D
-	ldrb r0, [r1]
-	mov r2, r12
-	adds r1, r0, r2
-	adds r0, r1, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r1, r0
-	mov r4, r8
-	strb r0, [r4]
-	ldrb r2, [r7]
-	lsls r2, 1
-	ldrb r0, [r4]
-	lsls r0, 6
-	adds r2, r0
-	adds r6, r3, 0
-	adds r6, 0xFC
-	adds r2, r6, r2
-	ldrb r1, [r3, 0x18]
-	lsls r1, 1
-	mov r4, r12
-	lsls r0, r4, 1
-	add r0, r12
-	lsls r5, r0, 3
-	adds r1, r5
-	adds r4, r3, 0
-	adds r4, 0x22
-	adds r1, r4, r1
-	ldrh r0, [r1]
-	strh r0, [r2]
-	ldrb r1, [r7]
-	adds r2, r1, 0x1
-	adds r0, r2, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r2, r0
-	strb r0, [r7]
-	ldrb r1, [r7]
-	lsls r1, 1
-	mov r2, r8
-	ldrb r0, [r2]
-	lsls r0, 6
-	adds r1, r0
-	adds r1, r6, r1
-	ldrb r0, [r3, 0x18]
-	adds r0, 0x1
-	lsls r0, 1
-	adds r0, r5
-	adds r0, r4, r0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	mov r0, r12
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r12, r0
-	cmp r0, 0x8
-	bls _081247C0
-	mov r4, r9
-	ldr r1, [r4]
-	ldrb r2, [r1, 0x1A]
-	adds r3, r2, 0
-	adds r3, 0x17
-	adds r0, r3, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r3, r0
-	mov r2, r10
-	strb r0, [r2]
-	adds r0, r1, 0
-	adds r0, 0xFC
-	ldrb r2, [r1, 0x19]
-	mov r1, r10
-	ldrb r3, [r1]
-	movs r1, 0x2
-	str r1, [sp]
-	movs r1, 0x9
-	str r1, [sp, 0x4]
-	movs r1, 0
-	bl sub_8124E7C
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x18]
-	cmp r0, 0xA
-	bne _0812488C
-	ldrb r2, [r1, 0x1A]
-	adds r3, r2, 0x3
-	adds r0, r3, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r3, r0
-	strb r0, [r1, 0x1A]
-	mov r2, r9
-	ldr r1, [r2]
-	movs r0, 0xFE
-	strb r0, [r1, 0x18]
-	bl sub_812446C
-_0812488C:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812489C: .4byte gUnknown_02039274
-_081248A0: .4byte gUnknown_0203927D
-_081248A4: .4byte gUnknown_0203927C
-_081248A8: .4byte gUnknown_0203927B
-	thumb_func_end sub_812476C
-
-	thumb_func_start sub_81248AC
-sub_81248AC: @ 81248AC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _081248BA
-	cmp r0, 0x1
-	beq _081248E4
-_081248BA:
-	ldr r1, _081248E0 @ =gUnknown_02039274
-	ldr r2, [r1]
-	movs r3, 0
-	movs r0, 0x2
-	strb r0, [r2, 0x1B]
-	ldr r0, [r1]
-	strb r3, [r0, 0x19]
-	ldr r2, [r1]
-	movs r0, 0x14
-	strb r0, [r2, 0x1A]
-	ldr r1, [r1]
-	movs r0, 0xC
-	strb r0, [r1, 0x18]
-	bl sub_812446C
-	bl sub_81245F4
-	b _08124906
-	.align 2, 0
-_081248E0: .4byte gUnknown_02039274
-_081248E4:
-	ldr r1, _08124914 @ =gUnknown_02039274
-	ldr r2, [r1]
-	movs r0, 0x2
-	strb r0, [r2, 0x1B]
-	ldr r2, [r1]
-	movs r0, 0x1C
-	strb r0, [r2, 0x19]
-	ldr r2, [r1]
-	movs r0, 0x14
-	strb r0, [r2, 0x1A]
-	ldr r1, [r1]
-	movs r0, 0x4
-	strb r0, [r1, 0x18]
-	bl sub_812446C
-	bl sub_812476C
-_08124906:
-	ldr r0, _08124914 @ =gUnknown_02039274
-	ldr r1, [r0]
-	movs r0, 0
-	strb r0, [r1, 0x1C]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08124914: .4byte gUnknown_02039274
-	thumb_func_end sub_81248AC
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/cable_car_util.s b/asm/cable_car_util.s
deleted file mode 100644
index 50ef19dec..000000000
--- a/asm/cable_car_util.s
+++ /dev/null
@@ -1,162 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8124E7C
-sub_8124E7C: @ 8124E7C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r10, r0
-	ldr r0, [sp, 0x24]
-	ldr r4, [sp, 0x28]
-	lsls r1, 16
-	lsrs r1, 16
-	mov r9, r1
-	lsls r2, 24
-	lsrs r2, 24
-	str r2, [sp]
-	lsls r3, 24
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r4, 24
-	lsrs r4, 24
-	mov r8, r4
-	movs r0, 0
-	lsrs r4, r3, 24
-	cmp r0, r8
-	bcs _08124EF6
-_08124EAE:
-	ldr r2, [sp]
-	movs r3, 0
-	adds r6, r4, 0x1
-	adds r0, 0x1
-	mov r12, r0
-	cmp r3, r7
-	bcs _08124EE0
-	lsls r5, r4, 6
-_08124EBE:
-	lsls r0, r2, 1
-	adds r0, r5
-	add r0, r10
-	mov r1, r9
-	strh r1, [r0]
-	adds r1, r2, 0x1
-	adds r0, r1, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r1, r0
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r7
-	bcc _08124EBE
-_08124EE0:
-	adds r0, r6, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r6, r0
-	lsls r0, 24
-	lsrs r4, r0, 24
-	mov r1, r12
-	lsls r0, r1, 24
-	lsrs r0, 24
-	cmp r0, r8
-	bcc _08124EAE
-_08124EF6:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8124E7C
-
-	thumb_func_start sub_8124F08
-sub_8124F08: @ 8124F08
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r10, r0
-	ldr r0, [sp, 0x24]
-	ldr r4, [sp, 0x28]
-	lsls r2, 24
-	lsrs r2, 24
-	str r2, [sp]
-	lsls r3, 24
-	lsls r0, 24
-	lsrs r0, 24
-	mov r12, r0
-	lsls r4, 24
-	lsrs r4, 24
-	mov r9, r4
-	movs r0, 0
-	adds r5, r1, 0
-	lsrs r4, r3, 24
-	cmp r0, r9
-	bcs _08124F82
-_08124F38:
-	ldr r2, [sp]
-	movs r3, 0
-	adds r7, r4, 0x1
-	adds r0, 0x1
-	mov r8, r0
-	cmp r3, r12
-	bcs _08124F6C
-	lsls r6, r4, 6
-_08124F48:
-	lsls r0, r2, 1
-	adds r0, r6
-	add r0, r10
-	ldrh r1, [r5]
-	strh r1, [r0]
-	adds r5, 0x2
-	adds r1, r2, 0x1
-	adds r0, r1, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r1, r0
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r12
-	bcc _08124F48
-_08124F6C:
-	adds r0, r7, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r7, r0
-	lsls r0, 24
-	lsrs r4, r0, 24
-	mov r1, r8
-	lsls r0, r1, 24
-	lsrs r0, 24
-	cmp r0, r9
-	bcc _08124F38
-_08124F82:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8124F08
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 6bd98cc8a..608daba87 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -82,9 +82,9 @@ sub_80C2020: @ 80C2020
 	adds r1, r3, 0
 	orrs r0, r1
 	strh r0, [r5]
-	ldr r0, _080C2114 @ =gUnknown_030042A4
+	ldr r0, _080C2114 @ =gBattle_BG0_X
 	strh r2, [r0]
-	ldr r0, _080C2118 @ =gUnknown_030042A0
+	ldr r0, _080C2118 @ =gBattle_BG0_Y
 	strh r2, [r0]
 	ldr r0, _080C211C @ =gBattle_BG1_X
 	strh r2, [r0]
@@ -119,8 +119,8 @@ _080C2104: .4byte 0x00003a03
 _080C2108: .4byte REG_MOSAIC
 _080C210C: .4byte 0x00003f3f
 _080C2110: .4byte REG_WIN0H
-_080C2114: .4byte gUnknown_030042A4
-_080C2118: .4byte gUnknown_030042A0
+_080C2114: .4byte gBattle_BG0_X
+_080C2118: .4byte gBattle_BG0_Y
 _080C211C: .4byte gBattle_BG1_X
 _080C2120: .4byte gBattle_BG1_Y
 _080C2124: .4byte gBattle_BG2_X
@@ -482,11 +482,11 @@ sub_80C2430: @ 80C2430
 sub_80C2448: @ 80C2448
 	push {lr}
 	ldr r1, _080C24C0 @ =REG_BG0HOFS
-	ldr r0, _080C24C4 @ =gUnknown_030042A4
+	ldr r0, _080C24C4 @ =gBattle_BG0_X
 	ldrh r0, [r0]
 	strh r0, [r1]
 	adds r1, 0x2
-	ldr r0, _080C24C8 @ =gUnknown_030042A0
+	ldr r0, _080C24C8 @ =gBattle_BG0_Y
 	ldrh r0, [r0]
 	strh r0, [r1]
 	adds r1, 0x2
@@ -537,8 +537,8 @@ sub_80C2448: @ 80C2448
 	bx r0
 	.align 2, 0
 _080C24C0: .4byte REG_BG0HOFS
-_080C24C4: .4byte gUnknown_030042A4
-_080C24C8: .4byte gUnknown_030042A0
+_080C24C4: .4byte gBattle_BG0_X
+_080C24C8: .4byte gBattle_BG0_Y
 _080C24CC: .4byte gBattle_BG1_X
 _080C24D0: .4byte gBattle_BG1_Y
 _080C24D4: .4byte gBattle_BG2_X
diff --git a/asm/dark.s b/asm/dark.s
index 3fcc3f56c..f3274861c 100755
--- a/asm/dark.s
+++ b/asm/dark.s
@@ -1940,7 +1940,7 @@ _080E0E8A:
 	beq _080E0EB6
 _080E0E90:
 	adds r0, r4, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
diff --git a/asm/ice.s b/asm/ice.s
index 1fad057ed..557be621c 100755
--- a/asm/ice.s
+++ b/asm/ice.s
@@ -2701,7 +2701,7 @@ sub_80D8BA8: @ 80D8BA8
 	ldrh r0, [r4, 0x2]
 	lsls r0, 20
 	lsrs r0, 24
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r5, 0
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index cf4c9628a..fcbd3a055 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1361,10 +1361,94 @@
 
 @ Supplementary
 
-	.macro goto_if_eq dest
+	.macro goto_if_trainer_not_defeated opponent, dest
+	checktrainerflag \opponent
+	goto_if 0, \dest
+	.endm
+
+	.macro goto_if_trainer_defeated opponent, dest
+	checktrainerflag \opponent
+	goto_if 1, \dest
+	.endm
+
+	.macro call_if_trainer_not_defeated opponent, dest
+	checktrainerflag \opponent
+	call_if 0, \dest
+	.endm
+
+	.macro call_if_trainer_defeated opponent, dest
+	checktrainerflag \opponent
+	call_if 1, \dest
+	.endm
+
+	.macro goto_if_unset flag, dest
+	checkflag \flag
+	goto_if 0, \dest
+	.endm
+
+	.macro goto_if_set flag, dest
+	checkflag \flag
+	goto_if 1, \dest
+	.endm
+
+	.macro goto_if_lt dest @ LESS THAN
+	goto_if 0, \dest
+	.endm	
+
+	.macro goto_if_eq dest @ EQUAL
 	goto_if 1, \dest
 	.endm
 
+	.macro goto_if_gt dest @ GREATER THAN
+	goto_if 2, \dest
+	.endm
+
+	.macro goto_if_le dest @ LESS THAN OR EQUAL
+	goto_if 3, \dest
+	.endm
+
+	.macro goto_if_ge dest @ GREATER THAN OR EQUAL
+	goto_if 4, \dest
+	.endm
+
+	.macro goto_if_ne dest @ NOT EQUAL
+	goto_if 5, \dest
+	.endm
+
+	.macro call_if_unset flag, dest
+	checkflag \flag
+	call_if 0, \dest
+	.endm
+
+	.macro call_if_set flag, dest
+	checkflag \flag
+	call_if 1, \dest
+	.endm
+
+	.macro call_if_lt dest @ LESS THAN
+	call_if 0, \dest
+	.endm
+
+	.macro call_if_eq dest @ EQUAL
+	call_if 1, \dest
+	.endm
+
+	.macro call_if_gt dest @ GREATER THAN
+	call_if 2, \dest
+	.endm
+
+	.macro call_if_le dest @ LESS THAN OR EQUAL
+	call_if 3, \dest
+	.endm
+
+	.macro call_if_ge dest @ GREATER THAN OR EQUAL
+	call_if 4, \dest
+	.endm
+
+	.macro call_if_ne dest @ NOT EQUAL
+	call_if 5, \dest
+	.endm
+
 	.macro switch var
 	copyvar VAR_SPECIAL_0, \var
 	.endm
diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s
index 822c4c566..a8b8fa401 100644
--- a/asm/pokemon_item_effect.s
+++ b/asm/pokemon_item_effect.s
@@ -529,7 +529,7 @@ _0803E59C:
 	adds r6, r2, 0
 	cmp r0, 0
 	beq _0803E5E4
-	ldr r5, _0803E758 @ =gSideTimer
+	ldr r5, _0803E758 @ =gSideTimers
 	ldr r4, _0803E75C @ =gActiveBank
 	ldrb r0, [r4]
 	bl GetBankSide
@@ -738,7 +738,7 @@ _0803E74E:
 	str r5, [sp, 0x1C]
 	bl _0803F14C
 	.align 2, 0
-_0803E758: .4byte gSideTimer
+_0803E758: .4byte gSideTimers
 _0803E75C: .4byte gActiveBank
 _0803E760: .4byte gExperienceTables
 _0803E764: .4byte gBaseStats
diff --git a/asm/psychic.s b/asm/psychic.s
index 7a6000335..20e558bf6 100755
--- a/asm/psychic.s
+++ b/asm/psychic.s
@@ -39,7 +39,7 @@ _080DB77E:
 	cmp r0, 0
 	bne _080DB7DA
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r7, r4, 0
@@ -274,7 +274,7 @@ sub_80DB92C: @ 80DB92C
 	cmp r0, 0
 	bne _080DB9BC
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r6, r4, 0
@@ -349,7 +349,7 @@ sub_80DB9E4: @ 80DB9E4
 	cmp r0, 0
 	bne _080DBA3C
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	adds r4, r0, 0
diff --git a/constants/trainer_constants.inc b/constants/trainer_constants.inc
index 48ed3036e..920ac1e32 100644
--- a/constants/trainer_constants.inc
+++ b/constants/trainer_constants.inc
@@ -1,80 +1,80 @@
-	.set TRAINER_CLASS_AQUA_LEADER,            0
-	.set TRAINER_CLASS_TEAM_AQUA_M,            1
-	.set TRAINER_CLASS_TEAM_AQUA_F,            2
-	.set TRAINER_CLASS_AROMA_LADY,             3
-	.set TRAINER_CLASS_RUIN_MANIAC,            4
-	.set TRAINER_CLASS_INTERVIEWER,            5
-	.set TRAINER_CLASS_TUBER_F,                6
-	.set TRAINER_CLASS_TUBER_M,                7
-	.set TRAINER_CLASS_COOL_TRAINER_M,         8
-	.set TRAINER_CLASS_COOL_TRAINER_F,         9
-	.set TRAINER_CLASS_HEX_MANIAC,            10
-	.set TRAINER_CLASS_LADY,                  11
-	.set TRAINER_CLASS_BEAUTY,                12
-	.set TRAINER_CLASS_RICH_BOY,              13
-	.set TRAINER_CLASS_POKEMANIAC,            14
-	.set TRAINER_CLASS_SWIMMER_M,             15
-	.set TRAINER_CLASS_BLACK_BELT,            16
-	.set TRAINER_CLASS_GUITARIST,             17
-	.set TRAINER_CLASS_KINDLER,               18
-	.set TRAINER_CLASS_CAMPER,                19
-	.set TRAINER_CLASS_BUG_MANIAC,            20
-	.set TRAINER_CLASS_PSYCHIC_M,             21
-	.set TRAINER_CLASS_PSYCHIC_F,             22
-	.set TRAINER_CLASS_GENTLEMAN,             23
-	.set TRAINER_CLASS_ELITE_FOUR_M,          24
-	.set TRAINER_CLASS_ELITE_FOUR_F,          25
-	.set TRAINER_CLASS_LEADER_F,              26
-	.set TRAINER_CLASS_LEADER_M,              27
-	.set TRAINER_CLASS_LEADER_MF,             28
-	.set TRAINER_CLASS_SCHOOL_KID_M,          29
-	.set TRAINER_CLASS_SCHOOL_KID_F,          30
-	.set TRAINER_CLASS_SR_AND_JR,             31
-	.set TRAINER_CLASS_POKEFAN_M,             32
-	.set TRAINER_CLASS_POKEFAN_F,             33
-	.set TRAINER_CLASS_EXPERT_M,              34
-	.set TRAINER_CLASS_EXPERT_F,              35
-	.set TRAINER_CLASS_YOUNGSTER,             36
-	.set TRAINER_CLASS_CHAMPION,              37
-	.set TRAINER_CLASS_FISHERMAN,             38
-	.set TRAINER_CLASS_CYCLING_TRIATHLETE_M,  39
-	.set TRAINER_CLASS_CYCLING_TRIATHLETE_F,  40
-	.set TRAINER_CLASS_RUNNING_TRIATHLETE_M,  41
-	.set TRAINER_CLASS_RUNNING_TRIATHLETE_F,  42
-	.set TRAINER_CLASS_SWIMMING_TRIATHLETE_M, 43
-	.set TRAINER_CLASS_SWIMMING_TRIATHLETE_F, 44
-	.set TRAINER_CLASS_DRAGON_TAMER,          45
-	.set TRAINER_CLASS_BIRD_KEEPER,           46
-	.set TRAINER_CLASS_NINJA_BOY,             47
-	.set TRAINER_CLASS_BATTLE_GIRL,           48
-	.set TRAINER_CLASS_PARASOL_LADY,          49
-	.set TRAINER_CLASS_SWIMMER_F,             50
-	.set TRAINER_CLASS_PICNICKER,             51
-	.set TRAINER_CLASS_TWINS,                 52
-	.set TRAINER_CLASS_SAILOR,                53
-	.set TRAINER_CLASS_BOARDER_1,             54
-	.set TRAINER_CLASS_BOARDER_2,             55
-	.set TRAINER_CLASS_COLLECTOR,             56
-	.set TRAINER_CLASS_WALLY,                 57
-	.set TRAINER_CLASS_BRENDAN_1,             58
-	.set TRAINER_CLASS_BRENDAN_2,             59
-	.set TRAINER_CLASS_BRENDAN_3,             60
-	.set TRAINER_CLASS_MAY_1,                 61
-	.set TRAINER_CLASS_MAY_2,                 62
-	.set TRAINER_CLASS_MAY_3,                 63
-	.set TRAINER_CLASS_POKEMON_BREEDER_M,     64
-	.set TRAINER_CLASS_POKEMON_BREEDER_F,     65
-	.set TRAINER_CLASS_POKEMON_RANGER_M,      66
-	.set TRAINER_CLASS_POKEMON_RANGER_F,      67
-	.set TRAINER_CLASS_MAGMA_LEADER,          68
-	.set TRAINER_CLASS_TEAM_MAGMA_M,          69
-	.set TRAINER_CLASS_TEAM_MAGMA_F,          70
-	.set TRAINER_CLASS_LASS,                  71
-	.set TRAINER_CLASS_BUG_CATCHER,           72
-	.set TRAINER_CLASS_HIKER,                 73
-	.set TRAINER_CLASS_YOUNG_COUPLE,          74
-	.set TRAINER_CLASS_OLD_COUPLE,            75
-	.set TRAINER_CLASS_SIS_AND_BRO,           76
+	.set FACILITY_CLASS_AQUA_LEADER,            0
+	.set FACILITY_CLASS_TEAM_AQUA_M,            1
+	.set FACILITY_CLASS_TEAM_AQUA_F,            2
+	.set FACILITY_CLASS_AROMA_LADY,             3
+	.set FACILITY_CLASS_RUIN_MANIAC,            4
+	.set FACILITY_CLASS_INTERVIEWER,            5
+	.set FACILITY_CLASS_TUBER_F,                6
+	.set FACILITY_CLASS_TUBER_M,                7
+	.set FACILITY_CLASS_COOL_TRAINER_M,         8
+	.set FACILITY_CLASS_COOL_TRAINER_F,         9
+	.set FACILITY_CLASS_HEX_MANIAC,            10
+	.set FACILITY_CLASS_LADY,                  11
+	.set FACILITY_CLASS_BEAUTY,                12
+	.set FACILITY_CLASS_RICH_BOY,              13
+	.set FACILITY_CLASS_POKEMANIAC,            14
+	.set FACILITY_CLASS_SWIMMER_M,             15
+	.set FACILITY_CLASS_BLACK_BELT,            16
+	.set FACILITY_CLASS_GUITARIST,             17
+	.set FACILITY_CLASS_KINDLER,               18
+	.set FACILITY_CLASS_CAMPER,                19
+	.set FACILITY_CLASS_BUG_MANIAC,            20
+	.set FACILITY_CLASS_PSYCHIC_M,             21
+	.set FACILITY_CLASS_PSYCHIC_F,             22
+	.set FACILITY_CLASS_GENTLEMAN,             23
+	.set FACILITY_CLASS_ELITE_FOUR_M,          24
+	.set FACILITY_CLASS_ELITE_FOUR_F,          25
+	.set FACILITY_CLASS_LEADER_F,              26
+	.set FACILITY_CLASS_LEADER_M,              27
+	.set FACILITY_CLASS_LEADER_MF,             28
+	.set FACILITY_CLASS_SCHOOL_KID_M,          29
+	.set FACILITY_CLASS_SCHOOL_KID_F,          30
+	.set FACILITY_CLASS_SR_AND_JR,             31
+	.set FACILITY_CLASS_POKEFAN_M,             32
+	.set FACILITY_CLASS_POKEFAN_F,             33
+	.set FACILITY_CLASS_EXPERT_M,              34
+	.set FACILITY_CLASS_EXPERT_F,              35
+	.set FACILITY_CLASS_YOUNGSTER,             36
+	.set FACILITY_CLASS_CHAMPION,              37
+	.set FACILITY_CLASS_FISHERMAN,             38
+	.set FACILITY_CLASS_CYCLING_TRIATHLETE_M,  39
+	.set FACILITY_CLASS_CYCLING_TRIATHLETE_F,  40
+	.set FACILITY_CLASS_RUNNING_TRIATHLETE_M,  41
+	.set FACILITY_CLASS_RUNNING_TRIATHLETE_F,  42
+	.set FACILITY_CLASS_SWIMMING_TRIATHLETE_M, 43
+	.set FACILITY_CLASS_SWIMMING_TRIATHLETE_F, 44
+	.set FACILITY_CLASS_DRAGON_TAMER,          45
+	.set FACILITY_CLASS_BIRD_KEEPER,           46
+	.set FACILITY_CLASS_NINJA_BOY,             47
+	.set FACILITY_CLASS_BATTLE_GIRL,           48
+	.set FACILITY_CLASS_PARASOL_LADY,          49
+	.set FACILITY_CLASS_SWIMMER_F,             50
+	.set FACILITY_CLASS_PICNICKER,             51
+	.set FACILITY_CLASS_TWINS,                 52
+	.set FACILITY_CLASS_SAILOR,                53
+	.set FACILITY_CLASS_BOARDER_1,             54
+	.set FACILITY_CLASS_BOARDER_2,             55
+	.set FACILITY_CLASS_COLLECTOR,             56
+	.set FACILITY_CLASS_WALLY,                 57
+	.set FACILITY_CLASS_BRENDAN_1,             58
+	.set FACILITY_CLASS_BRENDAN_2,             59
+	.set FACILITY_CLASS_BRENDAN_3,             60
+	.set FACILITY_CLASS_MAY_1,                 61
+	.set FACILITY_CLASS_MAY_2,                 62
+	.set FACILITY_CLASS_MAY_3,                 63
+	.set FACILITY_CLASS_POKEMON_BREEDER_M,     64
+	.set FACILITY_CLASS_POKEMON_BREEDER_F,     65
+	.set FACILITY_CLASS_POKEMON_RANGER_M,      66
+	.set FACILITY_CLASS_POKEMON_RANGER_F,      67
+	.set FACILITY_CLASS_MAGMA_LEADER,          68
+	.set FACILITY_CLASS_TEAM_MAGMA_M,          69
+	.set FACILITY_CLASS_TEAM_MAGMA_F,          70
+	.set FACILITY_CLASS_LASS,                  71
+	.set FACILITY_CLASS_BUG_CATCHER,           72
+	.set FACILITY_CLASS_HIKER,                 73
+	.set FACILITY_CLASS_YOUNG_COUPLE,          74
+	.set FACILITY_CLASS_OLD_COUPLE,            75
+	.set FACILITY_CLASS_SIS_AND_BRO,           76
 
 	.set TRAINER_PIC_BRENDAN,                0
 	.set TRAINER_PIC_MAY,                    1
@@ -160,64 +160,64 @@
 	.set TRAINER_PIC_GLACIA,                81
 	.set TRAINER_PIC_DRAKE,                 82
 
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_1,  0
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_2,  1
-	.set TRAINER_CLASS_NAME_AQUA_LEADER,        2
-	.set TRAINER_CLASS_NAME_TEAM_AQUA,          3
-	.set TRAINER_CLASS_NAME_AQUA_ADMIN,         4
-	.set TRAINER_CLASS_NAME_AROMA_LADY,         5
-	.set TRAINER_CLASS_NAME_RUIN_MANIAC,        6
-	.set TRAINER_CLASS_NAME_INTERVIEWER,        7
-	.set TRAINER_CLASS_NAME_TUBER_F,            8
-	.set TRAINER_CLASS_NAME_TUBER_M,            9
-	.set TRAINER_CLASS_NAME_COOL_TRAINER,      10
-	.set TRAINER_CLASS_NAME_HEX_MANIAC,        11
-	.set TRAINER_CLASS_NAME_LADY,              12
-	.set TRAINER_CLASS_NAME_BEAUTY,            13
-	.set TRAINER_CLASS_NAME_RICH_BOY,          14
-	.set TRAINER_CLASS_NAME_POKEMANIAC,        15
-	.set TRAINER_CLASS_NAME_SWIMMER_M,         16
-	.set TRAINER_CLASS_NAME_BLACK_BELT,        17
-	.set TRAINER_CLASS_NAME_GUITARIST,         18
-	.set TRAINER_CLASS_NAME_KINDLER,           19
-	.set TRAINER_CLASS_NAME_CAMPER,            20
-	.set TRAINER_CLASS_NAME_BUG_MANIAC,        21
-	.set TRAINER_CLASS_NAME_PSYCHIC,           22
-	.set TRAINER_CLASS_NAME_GENTLEMAN,         23
-	.set TRAINER_CLASS_NAME_ELITE_FOUR,        24
-	.set TRAINER_CLASS_NAME_LEADER,            25
-	.set TRAINER_CLASS_NAME_SCHOOL_KID,        26
-	.set TRAINER_CLASS_NAME_SR_AND_JR,         27
-	.set TRAINER_CLASS_NAME_WINSTRATE,         28
-	.set TRAINER_CLASS_NAME_POKEFAN,           29
-	.set TRAINER_CLASS_NAME_EXPERT,            30
-	.set TRAINER_CLASS_NAME_YOUNGSTER,         31
-	.set TRAINER_CLASS_NAME_CHAMPION,          32
-	.set TRAINER_CLASS_NAME_FISHERMAN,         33
-	.set TRAINER_CLASS_NAME_TRIATHLETE,        34
-	.set TRAINER_CLASS_NAME_DRAGON_TAMER,      35
-	.set TRAINER_CLASS_NAME_BIRD_KEEPER,       36
-	.set TRAINER_CLASS_NAME_NINJA_BOY,         37
-	.set TRAINER_CLASS_NAME_BATTLE_GIRL,       38
-	.set TRAINER_CLASS_NAME_PARASOL_LADY,      39
-	.set TRAINER_CLASS_NAME_SWIMMER_F,         40
-	.set TRAINER_CLASS_NAME_PICNICKER,         41
-	.set TRAINER_CLASS_NAME_TWINS,             42
-	.set TRAINER_CLASS_NAME_SAILOR,            43
-	.set TRAINER_CLASS_NAME_BOARDER,           44
-	.set TRAINER_CLASS_NAME_COLLECTOR,         45
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 46
-	.set TRAINER_CLASS_NAME_POKEMON_BREEDER,   47
-	.set TRAINER_CLASS_NAME_POKEMON_RANGER,    48
-	.set TRAINER_CLASS_NAME_MAGMA_LEADER,      49
-	.set TRAINER_CLASS_NAME_TEAM_MAGMA,        50
-	.set TRAINER_CLASS_NAME_MAGMA_ADMIN,       51
-	.set TRAINER_CLASS_NAME_LASS,              52
-	.set TRAINER_CLASS_NAME_BUG_CATCHER,       53
-	.set TRAINER_CLASS_NAME_HIKER,             54
-	.set TRAINER_CLASS_NAME_YOUNG_COUPLE,      55
-	.set TRAINER_CLASS_NAME_OLD_COUPLE,        56
-	.set TRAINER_CLASS_NAME_SIS_AND_BRO,       57
+	.set TRAINER_CLASS_POKEMON_TRAINER_1,  0
+	.set TRAINER_CLASS_POKEMON_TRAINER_2,  1
+	.set TRAINER_CLASS_AQUA_LEADER,        2
+	.set TRAINER_CLASS_TEAM_AQUA,          3
+	.set TRAINER_CLASS_AQUA_ADMIN,         4
+	.set TRAINER_CLASS_AROMA_LADY,         5
+	.set TRAINER_CLASS_RUIN_MANIAC,        6
+	.set TRAINER_CLASS_INTERVIEWER,        7
+	.set TRAINER_CLASS_TUBER_F,            8
+	.set TRAINER_CLASS_TUBER_M,            9
+	.set TRAINER_CLASS_COOL_TRAINER,      10
+	.set TRAINER_CLASS_HEX_MANIAC,        11
+	.set TRAINER_CLASS_LADY,              12
+	.set TRAINER_CLASS_BEAUTY,            13
+	.set TRAINER_CLASS_RICH_BOY,          14
+	.set TRAINER_CLASS_POKEMANIAC,        15
+	.set TRAINER_CLASS_SWIMMER_M,         16
+	.set TRAINER_CLASS_BLACK_BELT,        17
+	.set TRAINER_CLASS_GUITARIST,         18
+	.set TRAINER_CLASS_KINDLER,           19
+	.set TRAINER_CLASS_CAMPER,            20
+	.set TRAINER_CLASS_BUG_MANIAC,        21
+	.set TRAINER_CLASS_PSYCHIC,           22
+	.set TRAINER_CLASS_GENTLEMAN,         23
+	.set TRAINER_CLASS_ELITE_FOUR,        24
+	.set TRAINER_CLASS_LEADER,            25
+	.set TRAINER_CLASS_SCHOOL_KID,        26
+	.set TRAINER_CLASS_SR_AND_JR,         27
+	.set TRAINER_CLASS_WINSTRATE,         28
+	.set TRAINER_CLASS_POKEFAN,           29
+	.set TRAINER_CLASS_EXPERT,            30
+	.set TRAINER_CLASS_YOUNGSTER,         31
+	.set TRAINER_CLASS_CHAMPION,          32
+	.set TRAINER_CLASS_FISHERMAN,         33
+	.set TRAINER_CLASS_TRIATHLETE,        34
+	.set TRAINER_CLASS_DRAGON_TAMER,      35
+	.set TRAINER_CLASS_BIRD_KEEPER,       36
+	.set TRAINER_CLASS_NINJA_BOY,         37
+	.set TRAINER_CLASS_BATTLE_GIRL,       38
+	.set TRAINER_CLASS_PARASOL_LADY,      39
+	.set TRAINER_CLASS_SWIMMER_F,         40
+	.set TRAINER_CLASS_PICNICKER,         41
+	.set TRAINER_CLASS_TWINS,             42
+	.set TRAINER_CLASS_SAILOR,            43
+	.set TRAINER_CLASS_BOARDER,           44
+	.set TRAINER_CLASS_COLLECTOR,         45
+	.set TRAINER_CLASS_POKEMON_TRAINER_3, 46
+	.set TRAINER_CLASS_POKEMON_BREEDER,   47
+	.set TRAINER_CLASS_POKEMON_RANGER,    48
+	.set TRAINER_CLASS_MAGMA_LEADER,      49
+	.set TRAINER_CLASS_TEAM_MAGMA,        50
+	.set TRAINER_CLASS_MAGMA_ADMIN,       51
+	.set TRAINER_CLASS_LASS,              52
+	.set TRAINER_CLASS_BUG_CATCHER,       53
+	.set TRAINER_CLASS_HIKER,             54
+	.set TRAINER_CLASS_YOUNG_COUPLE,      55
+	.set TRAINER_CLASS_OLD_COUPLE,        56
+	.set TRAINER_CLASS_SIS_AND_BRO,       57
 
 	.set TRAINER_ENCOUNTER_MUSIC_MALE,         0 @ standard male encounter music
 	.set TRAINER_ENCOUNTER_MUSIC_FEMALE,       1 @ standard female encounter music
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 020c9a97d..18fb0a64d 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -410,8 +410,7 @@ gUnknown_0815F36C:: @ 815F36C
 EventScript_15F384:
 	message UnknownString_81A3A87
 	waitmessage
-	checkflag FLAG_DECORATION_16
-	goto_if_eq EventScript_15F3A0
+	goto_if_set FLAG_DECORATION_16, EventScript_15F3A0
 	goto EventScript_15F3E2
 	end
 
@@ -954,7 +953,7 @@ gUnknown_0819F818:: @ 819F818
 	waitmovement 0
 	specialvar RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
-	goto_if 5, EventScript_19F83F
+	goto_if_ne EventScript_19F83F
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	goto EventScript_19F8F2
@@ -968,10 +967,10 @@ gUnknown_0819F840:: @ 819F840
 	call EventScript_19F8E5
 	specialvar RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
-	goto_if 5, EventScript_19F877
+	goto_if_ne EventScript_19F877
 	special CheckForAlivePartyMons
 	compare RESULT, 0
-	goto_if 5, EventScript_19F870
+	goto_if_ne EventScript_19F870
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	goto EventScript_19F8F2
@@ -1017,7 +1016,7 @@ gUnknown_0819F8AE:: @ 819F8AE
 	goto_if_eq EventScript_19F8DD
 	special CheckForAlivePartyMons
 	compare RESULT, 0
-	goto_if 5, EventScript_19F8DE
+	goto_if_ne EventScript_19F8DE
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
@@ -1308,14 +1307,10 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
 	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
 	special sub_810FAA0
-	checkflag FLAG_RECEIVED_SS_TICKET
-	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62
-	checkflag FLAG_LATIOS_OR_LATIAS_ROAMING
-	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70
-	checkflag FLAG_RECEIVED_BELDUM
-	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
-	checkflag FLAG_RECEIVED_HM08
-	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
+	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_19FC62
+	call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_19FC70
+	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_19FC5A
+	call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_19FC5E
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
@@ -1343,10 +1338,8 @@ S_WhiteOut:: @ 819FC74
 	end
 
 EventScript_19FC84:
-	checkflag FLAG_RECEIVED_GO_GOGGLES
-	goto_if_eq Route101_EventScript_1A14DC
-	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
-	goto_if 0, Route101_EventScript_1A14DC
+	goto_if_set FLAG_RECEIVED_GO_GOGGLES, Route101_EventScript_1A14DC
+	goto_if_unset FLAG_DEFEATED_LAVARIDGE_GYM, Route101_EventScript_1A14DC
 	clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1
 	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
 	return
@@ -1409,16 +1402,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-	checkflag FLAG_RECEIVED_POKENAV
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49
-	checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
-	checkflag FLAG_HIDE_MR_BRINEY_ROUTE109
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55
+	goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
+	goto_if_unset FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, OldaleTown_PokemonCenter_1F_EventScript_19FD49
+	goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
+	goto_if_unset FLAG_HIDE_MR_BRINEY_ROUTE109, OldaleTown_PokemonCenter_1F_EventScript_19FD55
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49
@@ -1467,8 +1455,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
 	applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845
 	waitmovement 0
 	special ScrSpecial_HealPlayerParty
-	checkflag FLAG_POKERUS_EXPLAINED
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
+	goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
 	goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0
 	end
 
@@ -1516,9 +1503,9 @@ Std_ObtainItem_: @ 819FE07
 	checkitemtype VAR_SPECIAL_0
 	call GetItem_HandlePocket
 	compare VAR_SPECIAL_7, 0x1
-	call_if 1, Std_ObtainItem_Success
+	call_if_eq Std_ObtainItem_Success
 	compare VAR_SPECIAL_7, 0x0
-	call_if 1, Std_ObtainItem_Fail
+	call_if_eq Std_ObtainItem_Fail
 	return
 
 GetItem_HandlePocket:
@@ -1533,31 +1520,31 @@ GetItem_HandlePocket:
 GetItem_HandlePocket_Items:
 	bufferstdstring 2, 0xE
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetItemFanfare
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_KeyItems:
 	bufferstdstring 2, 0xF
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetItemFanfare
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_PokeBalls:
 	bufferstdstring 2, 0x10
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetItemFanfare
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_TMsHMs:
 	bufferstdstring 2, 0x11
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetTMHMFanfare
+	call_if_eq PlayGetTMHMFanfare
 	return
 
 GetItem_HandlePocket_Berries:
 	bufferstdstring 2, 0x12
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetItemFanfare
+	call_if_eq PlayGetItemFanfare
 	return
 
 Std_ObtainItem_Success: @ 819FEB7
@@ -1589,9 +1576,9 @@ Std_ObtainDecoration: @ 819FEDA
 Std_ObtainDecoration_: @ 819FEE8
 	bufferdecorationname 1, VAR_SPECIAL_0
 	compare VAR_SPECIAL_7, 1
-	call_if 1, Std_ObtainDecoration_Success
+	call_if_eq Std_ObtainDecoration_Success
 	compare VAR_SPECIAL_7, 0
-	call_if 1, Std_ObtainDecoration_Fail
+	call_if_eq Std_ObtainDecoration_Fail
 	return
 
 Std_ObtainDecoration_Success: @ 819FF03
@@ -1617,9 +1604,9 @@ Std_FindItem: @ 819FF21
 	checkitemtype VAR_SPECIAL_0
 	call GetItem_HandlePocket
 	compare VAR_SPECIAL_7, 1
-	call_if 1, Std_FindItem_Success
+	call_if_eq Std_FindItem_Success
 	compare VAR_SPECIAL_7, 0
-	call_if 1, Std_FindItem_Fail
+	call_if_eq Std_FindItem_Fail
 	release
 	return
 
@@ -1724,10 +1711,8 @@ EventScript_1A0070:
 
 EventScript_1A0085:
 	playse SE_PC_LOGON
-	checkflag FLAG_SYS_PC_LANETTE
-	call_if 0, EventScript_1A00AC
-	checkflag FLAG_SYS_PC_LANETTE
-	call_if 1, EventScript_1A00B5
+	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_1A00AC
+	call_if_set FLAG_SYS_PC_LANETTE, EventScript_1A00B5
 	msgbox UnknownString_81A0A35, 4
 	special ShowPokemonStorageSystem
 	waitstate
@@ -1750,8 +1735,7 @@ EventScript_1A00BE:
 	end
 
 EventScript_1A00CB:
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, EventScript_1A00BE
+	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A00BE
 	playse SE_PC_LOGON
 	special AccessHallOfFamePC
 	waitstate
@@ -2156,21 +2140,21 @@ Route103_EventScript_1A02F4:: @ 81A02F4
 	compare VAR_PETALBURG_GYM_STATE, 0
 	goto_if_eq Route101_EventScript_1A14DC
 	compare VAR_BIRCH_STATE, 0
-	call_if 1, Route101_EventScript_1A0358
+	call_if_eq Route101_EventScript_1A0358
 	compare VAR_BIRCH_STATE, 1
-	call_if 1, Route101_EventScript_1A0358
+	call_if_eq Route101_EventScript_1A0358
 	compare VAR_BIRCH_STATE, 2
-	call_if 1, Route101_EventScript_1A0365
+	call_if_eq Route101_EventScript_1A0365
 	compare VAR_BIRCH_STATE, 3
-	call_if 1, Route101_EventScript_1A0365
+	call_if_eq Route101_EventScript_1A0365
 	compare VAR_BIRCH_STATE, 4
-	call_if 1, Route101_EventScript_1A0372
+	call_if_eq Route101_EventScript_1A0372
 	compare VAR_BIRCH_STATE, 5
-	call_if 1, Route101_EventScript_1A0372
+	call_if_eq Route101_EventScript_1A0372
 	compare VAR_BIRCH_STATE, 6
-	call_if 1, Route101_EventScript_1A0358
+	call_if_eq Route101_EventScript_1A0358
 	compare VAR_BIRCH_STATE, 7
-	call_if 1, Route101_EventScript_1A0358
+	call_if_eq Route101_EventScript_1A0358
 	return
 
 Route101_EventScript_1A0358:: @ 81A0358
@@ -2297,9 +2281,9 @@ Movement_1A047A:
 BattleTower_Outside_EventScript_1A047C:: @ 81A047C
 SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
 	compare FACING, 1
-	call_if 1, BattleTower_Outside_EventScript_160B2F
+	call_if_eq BattleTower_Outside_EventScript_160B2F
 	compare FACING, 3
-	call_if 1, BattleTower_Outside_EventScript_160B3A
+	call_if_eq BattleTower_Outside_EventScript_160B3A
 	delay 30
 	hideobjectat 255, MAP_PETALBURG_CITY
 	call BattleTower_Outside_EventScript_1A040E
@@ -2467,19 +2451,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3
 	waitmoncry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
 	compare VAR_SPECIAL_4, 1
-	call_if 1, Route119_EventScript_1A0646
+	call_if_eq Route119_EventScript_1A0646
 	compare VAR_SPECIAL_4, 2
-	call_if 1, Route119_EventScript_1A064A
+	call_if_eq Route119_EventScript_1A064A
 	compare VAR_SPECIAL_4, 3
-	call_if 1, Route119_EventScript_1A064E
+	call_if_eq Route119_EventScript_1A064E
 	compare VAR_SPECIAL_4, 4
-	call_if 1, Route119_EventScript_1A0652
+	call_if_eq Route119_EventScript_1A0652
 	compare VAR_SPECIAL_4, 5
-	call_if 1, Route119_EventScript_1A0656
+	call_if_eq Route119_EventScript_1A0656
 	compare VAR_SPECIAL_4, 6
-	call_if 1, Route119_EventScript_1A065A
+	call_if_eq Route119_EventScript_1A065A
 	compare VAR_SPECIAL_4, 7
-	call_if 1, Route119_EventScript_1A065E
+	call_if_eq Route119_EventScript_1A065E
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -3965,8 +3949,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
 	end
 
 SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A3086
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3086
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
 	lock
@@ -4000,8 +3983,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
 	end
 
 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A3102
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3102
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
 	lock
@@ -4035,8 +4017,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
 	end
 
 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A317E
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A317E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
 	lock
@@ -4070,8 +4051,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
 	end
 
 SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A31FA
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A31FA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
 	lock
@@ -4105,8 +4085,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
 	end
 
 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A3276
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3276
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
 	lock
@@ -4140,8 +4119,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
 	end
 
 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A32F2
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A32F2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
 	lock
@@ -4175,8 +4153,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
 	end
 
 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A336E
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A336E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
 	lock
@@ -4210,8 +4187,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
 	end
 
 SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A33EA
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A33EA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
 	lock
@@ -4245,8 +4221,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
 	end
 
 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A3466
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3466
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
 	lock
@@ -4280,8 +4255,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
 	end
 
 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A34E2
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A34E2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
 	lock
@@ -4472,8 +4446,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0
 	compare RESULT, 1
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
 	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
-	checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
+	goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
 	setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
 	msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO
 	compare RESULT, YES
@@ -4601,8 +4574,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_2
-	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E
+	goto_if_set FLAG_TEMP_2, FallarborTown_ContestLobby_EventScript_1AE17E
 	setvar VAR_SPECIAL_5, 6
 	special InterviewBefore
 	compare RESULT, 1
@@ -4662,7 +4634,7 @@ LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188
 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188
 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188
 	compare VAR_LINK_CONTEST_ROOM_STATE, 2
-	goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE
+	goto_if_ne FallarborTown_ContestLobby_EventScript_1AE1FE
 	setvar VAR_SPECIAL_5, 6
 	special InterviewBefore
 	compare RESULT, 1
@@ -4698,8 +4670,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE
 BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_2
-	goto_if_eq BattleTower_Lobby_EventScript_1AE2E3
+	goto_if_set FLAG_TEMP_2, BattleTower_Lobby_EventScript_1AE2E3
 	setvar VAR_SPECIAL_5, 7
 	special InterviewBefore
 	compare RESULT, 1
@@ -4718,9 +4689,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
 	multichoice 19, 8, 45, 1
 	copyvar VAR_SPECIAL_8, RESULT
 	compare RESULT, 0
-	call_if 1, BattleTower_Lobby_EventScript_1AE2A1
+	call_if_eq BattleTower_Lobby_EventScript_1AE2A1
 	compare RESULT, 1
-	call_if 1, BattleTower_Lobby_EventScript_1AE2AA
+	call_if_eq BattleTower_Lobby_EventScript_1AE2AA
 	msgbox BattleTower_Lobby_Text_1A79EB, 4
 	setvar VAR_SPECIAL_4, 12
 	copyvar VAR_SPECIAL_5, VAR_SPECIAL_9
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index 91f6ca620..86a4d1b24 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -1,7 +1,6 @@
 S_CuttableTree:: @ 81B0DCC
 	lockall
-	checkflag FLAG_BADGE01_GET
-	goto_if 0, CannotUseCut
+	goto_if_unset FLAG_BADGE01_GET, CannotUseCut
 	checkpartymove MOVE_CUT
 	compare RESULT, 6
 	goto_if_eq CannotUseCut
@@ -61,8 +60,7 @@ CannotUseCutText: @ 81B0E8E
 
 S_BreakableRock:: @ 81B0EB7
 	lockall
-	checkflag FLAG_BADGE03_GET
-	goto_if 0, CannotUseRockSmash
+	goto_if_unset FLAG_BADGE03_GET, CannotUseRockSmash
 	checkpartymove MOVE_ROCK_SMASH
 	compare RESULT, 6
 	goto_if_eq CannotUseRockSmash
@@ -128,10 +126,8 @@ CannotUseRockSmashText: @ 81B0F90
 
 S_PushableBoulder:: @ 81B0FCB
 	lockall
-	checkflag FLAG_BADGE04_GET
-	goto_if 0, CannotUseStrength
-	checkflag FLAG_SYS_USE_STRENGTH
-	goto_if_eq AlreadyUsedStrength
+	goto_if_unset FLAG_BADGE04_GET, CannotUseStrength
+	goto_if_set FLAG_SYS_USE_STRENGTH, AlreadyUsedStrength
 	checkpartymove 70
 	compare RESULT, 6
 	goto_if_eq CannotUseStrength
diff --git a/data-de/trainers.inc b/data-de/trainers.inc
index 47e4c2289..39bfd9bfe 100644
--- a/data-de/trainers.inc
+++ b/data-de/trainers.inc
@@ -2,7 +2,7 @@
 gTrainers:: @ 81F04FC
 @ NONE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_1
+	.byte TRAINER_CLASS_POKEMON_TRAINER_1
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "$", 12
@@ -14,7 +14,7 @@ gTrainers:: @ 81F04FC
 
 @ ARCHIE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_LEADER
+	.byte TRAINER_CLASS_AQUA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_ARCHIE
 	.string "ADRIAN$", 12
@@ -26,7 +26,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -38,7 +38,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -50,7 +50,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -62,7 +62,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -74,7 +74,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -86,7 +86,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_6
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -98,7 +98,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_7
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -110,7 +110,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_8
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -122,7 +122,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_9
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -134,7 +134,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_10
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -146,7 +146,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_11
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -158,7 +158,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_12
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -170,7 +170,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_13
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -182,7 +182,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_14
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -194,7 +194,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_15
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -206,7 +206,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_16
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -218,7 +218,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_17
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -230,7 +230,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_18
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -242,7 +242,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_19
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -254,7 +254,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_20
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -266,7 +266,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_21
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -278,7 +278,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_22
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -290,7 +290,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_23
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -302,7 +302,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_24
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -314,7 +314,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_25
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.string "RÜPEL$", 12
@@ -326,7 +326,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_26
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.string "RÜPEL$", 12
@@ -338,7 +338,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_27
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.string "RÜPEL$", 12
@@ -350,7 +350,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_M
 	.string "$", 12
@@ -362,7 +362,7 @@ gTrainers:: @ 81F04FC
 
 @ MATT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_M
 	.string "WOLFGANG$", 12
@@ -374,7 +374,7 @@ gTrainers:: @ 81F04FC
 
 @ MATT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_M
 	.string "WOLFGANG$", 12
@@ -386,7 +386,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELLY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_F
 	.string "KORDULA$", 12
@@ -398,7 +398,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELLY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_F
 	.string "KORDULA$", 12
@@ -410,7 +410,7 @@ gTrainers:: @ 81F04FC
 
 @ ARCHIE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_LEADER
+	.byte TRAINER_CLASS_AQUA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_ARCHIE
 	.string "ADRIAN$", 12
@@ -422,7 +422,7 @@ gTrainers:: @ 81F04FC
 
 @ ARCHIE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_LEADER
+	.byte TRAINER_CLASS_AQUA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_ARCHIE
 	.string "ADRIAN$", 12
@@ -434,7 +434,7 @@ gTrainers:: @ 81F04FC
 
 @ DAISY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "MARGARETE$", 12
@@ -446,7 +446,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSEMARIE$", 12
@@ -458,7 +458,7 @@ gTrainers:: @ 81F04FC
 
 @ LILY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "LILLY$", 12
@@ -470,7 +470,7 @@ gTrainers:: @ 81F04FC
 
 @ VIOLET
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ERIKA$", 12
@@ -482,7 +482,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSEMARIE$", 12
@@ -494,7 +494,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSEMARIE$", 12
@@ -506,7 +506,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSEMARIE$", 12
@@ -518,7 +518,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSEMARIE$", 12
@@ -530,7 +530,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "RÜDIGER$", 12
@@ -542,7 +542,7 @@ gTrainers:: @ 81F04FC
 
 @ CHIP
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "RUPRECHT$", 12
@@ -554,7 +554,7 @@ gTrainers:: @ 81F04FC
 
 @ FOSTER
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "RUBEN$", 12
@@ -566,7 +566,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "RÜDIGER$", 12
@@ -578,7 +578,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "RÜDIGER$", 12
@@ -590,7 +590,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "RÜDIGER$", 12
@@ -602,7 +602,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "RÜDIGER$", 12
@@ -614,7 +614,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "PIA & UDO$", 12
@@ -626,7 +626,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "PIA & UDO$", 12
@@ -638,7 +638,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "PIA & UDO$", 12
@@ -650,7 +650,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "PIA & UDO$", 12
@@ -662,7 +662,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "PIA & UDO$", 12
@@ -674,7 +674,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_6
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "PIA & UDO$", 12
@@ -686,7 +686,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -698,7 +698,7 @@ gTrainers:: @ 81F04FC
 
 @ CARMEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "CARMEN$", 12
@@ -710,7 +710,7 @@ gTrainers:: @ 81F04FC
 
 @ GWEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "HILDE $", 12
@@ -722,7 +722,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -734,7 +734,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -746,7 +746,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -758,7 +758,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -770,7 +770,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "GÜNTHER$", 12
@@ -782,7 +782,7 @@ gTrainers:: @ 81F04FC
 
 @ SIMON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "SIMON$", 12
@@ -794,7 +794,7 @@ gTrainers:: @ 81F04FC
 
 @ CHARLIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "HILMAR$", 12
@@ -806,7 +806,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "GÜNTHER$", 12
@@ -818,7 +818,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "GÜNTHER$", 12
@@ -830,7 +830,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "GÜNTHER$", 12
@@ -842,7 +842,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "GÜNTHER$", 12
@@ -854,7 +854,7 @@ gTrainers:: @ 81F04FC
 
 @ RANDALL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "HUBERT$", 12
@@ -866,7 +866,7 @@ gTrainers:: @ 81F04FC
 
 @ PARKER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PATRICK$", 12
@@ -878,7 +878,7 @@ gTrainers:: @ 81F04FC
 
 @ GEORGE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "NILS$", 12
@@ -890,7 +890,7 @@ gTrainers:: @ 81F04FC
 
 @ BERKE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "CHRISTIAN$", 12
@@ -902,7 +902,7 @@ gTrainers:: @ 81F04FC
 
 @ CLYDE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "OSKAR$", 12
@@ -914,7 +914,7 @@ gTrainers:: @ 81F04FC
 
 @ VINCENT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "OTFRIED$", 12
@@ -926,7 +926,7 @@ gTrainers:: @ 81F04FC
 
 @ LEROY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "OTMAR$", 12
@@ -938,7 +938,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PASCAL$", 12
@@ -950,7 +950,7 @@ gTrainers:: @ 81F04FC
 
 @ EDGAR
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "EDGAR$", 12
@@ -962,7 +962,7 @@ gTrainers:: @ 81F04FC
 
 @ ALBERT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PABLO$", 12
@@ -974,7 +974,7 @@ gTrainers:: @ 81F04FC
 
 @ SAMUEL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "RICHARD$", 12
@@ -986,7 +986,7 @@ gTrainers:: @ 81F04FC
 
 @ VITO
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PAUL$", 12
@@ -998,7 +998,7 @@ gTrainers:: @ 81F04FC
 
 @ OWEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "RAIMUND$", 12
@@ -1010,7 +1010,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PASCAL$", 12
@@ -1022,7 +1022,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PASCAL$", 12
@@ -1034,7 +1034,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PASCAL$", 12
@@ -1046,7 +1046,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PASCAL$", 12
@@ -1058,7 +1058,7 @@ gTrainers:: @ 81F04FC
 
 @ WARREN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "MARKUS$", 12
@@ -1070,7 +1070,7 @@ gTrainers:: @ 81F04FC
 
 @ MARY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "YVONNE$", 12
@@ -1082,7 +1082,7 @@ gTrainers:: @ 81F04FC
 
 @ LORI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "RAMONA$", 12
@@ -1094,7 +1094,7 @@ gTrainers:: @ 81F04FC
 
 @ JODY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "ROSWITA$", 12
@@ -1106,7 +1106,7 @@ gTrainers:: @ 81F04FC
 
 @ WENDY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "VIOLA$", 12
@@ -1118,7 +1118,7 @@ gTrainers:: @ 81F04FC
 
 @ ELAINE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "FRAUKE$", 12
@@ -1130,7 +1130,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "VERONIKA$", 12
@@ -1142,7 +1142,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNIFER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "MARIANNE$", 12
@@ -1154,7 +1154,7 @@ gTrainers:: @ 81F04FC
 
 @ HOPE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "TRUDLINDE$", 12
@@ -1166,7 +1166,7 @@ gTrainers:: @ 81F04FC
 
 @ SHANNON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "THERESA$", 12
@@ -1178,7 +1178,7 @@ gTrainers:: @ 81F04FC
 
 @ MICHELLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "MICHELLE$", 12
@@ -1190,7 +1190,7 @@ gTrainers:: @ 81F04FC
 
 @ CAROLINE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "KAROLINE$", 12
@@ -1202,7 +1202,7 @@ gTrainers:: @ 81F04FC
 
 @ JULIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "MICHAELA$", 12
@@ -1214,7 +1214,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "VERONIKA$", 12
@@ -1226,7 +1226,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "VERONIKA$", 12
@@ -1238,7 +1238,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "VERONIKA$", 12
@@ -1250,7 +1250,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "VERONIKA$", 12
@@ -1262,7 +1262,7 @@ gTrainers:: @ 81F04FC
 
 @ PATRICIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "WALBURGA$", 12
@@ -1274,7 +1274,7 @@ gTrainers:: @ 81F04FC
 
 @ KINDRA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "GUNDULA$", 12
@@ -1286,7 +1286,7 @@ gTrainers:: @ 81F04FC
 
 @ TAMMY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "BRUNHILDE$", 12
@@ -1298,7 +1298,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "TABITHA$", 12
@@ -1310,7 +1310,7 @@ gTrainers:: @ 81F04FC
 
 @ TASHA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "PANDORA$", 12
@@ -1322,7 +1322,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "TABITHA$", 12
@@ -1334,7 +1334,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "TABITHA$", 12
@@ -1346,7 +1346,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "TABITHA$", 12
@@ -1358,7 +1358,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "TABITHA$", 12
@@ -1370,7 +1370,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_1
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "PATRIZIA$", 12
@@ -1382,7 +1382,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "$", 12
@@ -1394,7 +1394,7 @@ gTrainers:: @ 81F04FC
 
 @ BRIANNA_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "NATASCHA$", 12
@@ -1406,7 +1406,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "PATRIZIA$", 12
@@ -1418,7 +1418,7 @@ gTrainers:: @ 81F04FC
 
 @ BRIANNA_2
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "NATASCHA$", 12
@@ -1430,7 +1430,7 @@ gTrainers:: @ 81F04FC
 
 @ ANETTE
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "ANETTE$", 12
@@ -1442,7 +1442,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_3
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "PATRIZIA$", 12
@@ -1454,7 +1454,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_4
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "PATRIZIA$", 12
@@ -1466,7 +1466,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "PATRIZIA$", 12
@@ -1478,7 +1478,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_6
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "PATRIZIA$", 12
@@ -1490,7 +1490,7 @@ gTrainers:: @ 81F04FC
 
 @ MELISSA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "MELISSA$", 12
@@ -1502,7 +1502,7 @@ gTrainers:: @ 81F04FC
 
 @ SHEILA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "SYLVIA$", 12
@@ -1514,7 +1514,7 @@ gTrainers:: @ 81F04FC
 
 @ SHIRLEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "MIRJAM$", 12
@@ -1526,7 +1526,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "GERMAINE$", 12
@@ -1538,7 +1538,7 @@ gTrainers:: @ 81F04FC
 
 @ CONNIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "FRANCESCA$", 12
@@ -1550,7 +1550,7 @@ gTrainers:: @ 81F04FC
 
 @ BRIDGET
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "SALMA$", 12
@@ -1562,7 +1562,7 @@ gTrainers:: @ 81F04FC
 
 @ OLIVIA
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "TIA$", 12
@@ -1574,7 +1574,7 @@ gTrainers:: @ 81F04FC
 
 @ TIFFANY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "DANIELA$", 12
@@ -1586,7 +1586,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "GERMAINE$", 12
@@ -1598,7 +1598,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "GERMAINE$", 12
@@ -1610,7 +1610,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "GERMAINE$", 12
@@ -1622,7 +1622,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "GERMAINE$", 12
@@ -1634,7 +1634,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_1
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "RENE$", 12
@@ -1646,7 +1646,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "$", 12
@@ -1658,7 +1658,7 @@ gTrainers:: @ 81F04FC
 
 @ GARRET
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "KAI$", 12
@@ -1670,7 +1670,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_2
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "RENE$", 12
@@ -1682,7 +1682,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_3
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "RENE$", 12
@@ -1694,7 +1694,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_4
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "RENE$", 12
@@ -1706,7 +1706,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_5
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "RENE$", 12
@@ -1718,7 +1718,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "HIRO$", 12
@@ -1730,7 +1730,7 @@ gTrainers:: @ 81F04FC
 
 @ CHRIS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "CHRIS$", 12
@@ -1742,7 +1742,7 @@ gTrainers:: @ 81F04FC
 
 @ MARK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "MARK$", 12
@@ -1754,7 +1754,7 @@ gTrainers:: @ 81F04FC
 
 @ KENN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "KLAUS$", 12
@@ -1766,7 +1766,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "HIRO$", 12
@@ -1778,7 +1778,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "HIRO$", 12
@@ -1790,7 +1790,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "HIRO$", 12
@@ -1802,7 +1802,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "HIRO$", 12
@@ -1814,7 +1814,7 @@ gTrainers:: @ 81F04FC
 
 @ LUIS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "KONSTANTIN$", 12
@@ -1826,7 +1826,7 @@ gTrainers:: @ 81F04FC
 
 @ AUSTIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "GUIDO$", 12
@@ -1838,7 +1838,7 @@ gTrainers:: @ 81F04FC
 
 @ DOUGLAS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "IGNAZ$", 12
@@ -1850,7 +1850,7 @@ gTrainers:: @ 81F04FC
 
 @ DARRIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "MANUEL$", 12
@@ -1862,7 +1862,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "KEVIN$", 12
@@ -1874,7 +1874,7 @@ gTrainers:: @ 81F04FC
 
 @ JEROME
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "OSWALD$", 12
@@ -1886,7 +1886,7 @@ gTrainers:: @ 81F04FC
 
 @ MATTHEW
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "UMBERTO$", 12
@@ -1898,7 +1898,7 @@ gTrainers:: @ 81F04FC
 
 @ DAVID
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "WINFRIED$", 12
@@ -1910,7 +1910,7 @@ gTrainers:: @ 81F04FC
 
 @ SPENCER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "LEOPOLD$", 12
@@ -1922,7 +1922,7 @@ gTrainers:: @ 81F04FC
 
 @ ROLAND
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "THOMAS$", 12
@@ -1934,7 +1934,7 @@ gTrainers:: @ 81F04FC
 
 @ CODY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "TIMO$", 12
@@ -1946,7 +1946,7 @@ gTrainers:: @ 81F04FC
 
 @ STAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "BALTHASAR$", 12
@@ -1958,7 +1958,7 @@ gTrainers:: @ 81F04FC
 
 @ BARRY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "BASIL$", 12
@@ -1970,7 +1970,7 @@ gTrainers:: @ 81F04FC
 
 @ DEAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "DAGOBERT$", 12
@@ -1982,7 +1982,7 @@ gTrainers:: @ 81F04FC
 
 @ RODNEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "DIETER$", 12
@@ -1994,7 +1994,7 @@ gTrainers:: @ 81F04FC
 
 @ RICHARD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "ENNO$", 12
@@ -2006,7 +2006,7 @@ gTrainers:: @ 81F04FC
 
 @ HERMAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "BENNO$", 12
@@ -2018,7 +2018,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "$", 12
@@ -2030,7 +2030,7 @@ gTrainers:: @ 81F04FC
 
 @ GILBERT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "ERICH$", 12
@@ -2042,7 +2042,7 @@ gTrainers:: @ 81F04FC
 
 @ FRANKLIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "KASPER$", 12
@@ -2054,7 +2054,7 @@ gTrainers:: @ 81F04FC
 
 @ DANNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "MARCEL$", 12
@@ -2066,7 +2066,7 @@ gTrainers:: @ 81F04FC
 
 @ JACK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "PEDRO$", 12
@@ -2078,7 +2078,7 @@ gTrainers:: @ 81F04FC
 
 @ DUDLEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "THEODOR$", 12
@@ -2090,7 +2090,7 @@ gTrainers:: @ 81F04FC
 
 @ CHAD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "JANNIK$", 12
@@ -2102,7 +2102,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "KEVIN$", 12
@@ -2114,7 +2114,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "KEVIN$", 12
@@ -2126,7 +2126,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "KEVIN$", 12
@@ -2138,7 +2138,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "KEVIN$", 12
@@ -2150,7 +2150,7 @@ gTrainers:: @ 81F04FC
 
 @ HIDEKI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "SATORU$", 12
@@ -2162,7 +2162,7 @@ gTrainers:: @ 81F04FC
 
 @ HITOSHI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "SHIGERU$", 12
@@ -2174,7 +2174,7 @@ gTrainers:: @ 81F04FC
 
 @ KIYO
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "YU$", 12
@@ -2186,7 +2186,7 @@ gTrainers:: @ 81F04FC
 
 @ KOICHI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "JUNICHI$", 12
@@ -2198,7 +2198,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "MINORU$", 12
@@ -2210,7 +2210,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "MINORU$", 12
@@ -2222,7 +2222,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "MINORU$", 12
@@ -2234,7 +2234,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "MINORU$", 12
@@ -2246,7 +2246,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "MINORU$", 12
@@ -2258,7 +2258,7 @@ gTrainers:: @ 81F04FC
 
 @ YUJI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "HIDEO$", 12
@@ -2270,7 +2270,7 @@ gTrainers:: @ 81F04FC
 
 @ DAISUKE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "KENJI$", 12
@@ -2282,7 +2282,7 @@ gTrainers:: @ 81F04FC
 
 @ ATSUSHI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "HIROSHI$", 12
@@ -2294,7 +2294,7 @@ gTrainers:: @ 81F04FC
 
 @ KIRK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "CHUCK$", 12
@@ -2306,7 +2306,7 @@ gTrainers:: @ 81F04FC
 
 @ SCOTT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "TREY$", 12
@@ -2318,7 +2318,7 @@ gTrainers:: @ 81F04FC
 
 @ HARVEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "KERRY$", 12
@@ -2330,7 +2330,7 @@ gTrainers:: @ 81F04FC
 
 @ SHAWN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "REINHARD$", 12
@@ -2342,7 +2342,7 @@ gTrainers:: @ 81F04FC
 
 @ RANDY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "JEFF$", 12
@@ -2354,7 +2354,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "KIRK$", 12
@@ -2366,7 +2366,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "KIRK$", 12
@@ -2378,7 +2378,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "KIRK$", 12
@@ -2390,7 +2390,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "KIRK$", 12
@@ -2402,7 +2402,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "KIRK$", 12
@@ -2414,7 +2414,7 @@ gTrainers:: @ 81F04FC
 
 @ COLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HENDRIK$", 12
@@ -2426,7 +2426,7 @@ gTrainers:: @ 81F04FC
 
 @ FLINT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HEINZ$", 12
@@ -2438,7 +2438,7 @@ gTrainers:: @ 81F04FC
 
 @ AXLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HAGEN$", 12
@@ -2450,7 +2450,7 @@ gTrainers:: @ 81F04FC
 
 @ JAKE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HANNES$", 12
@@ -2462,7 +2462,7 @@ gTrainers:: @ 81F04FC
 
 @ ANDY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HARTMANN$", 12
@@ -2474,7 +2474,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HASSO$", 12
@@ -2486,7 +2486,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HASSO$", 12
@@ -2498,7 +2498,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HASSO$", 12
@@ -2510,7 +2510,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HASSO$", 12
@@ -2522,7 +2522,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "HASSO$", 12
@@ -2534,7 +2534,7 @@ gTrainers:: @ 81F04FC
 
 @ DREW
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "ISSIDOR$", 12
@@ -2546,7 +2546,7 @@ gTrainers:: @ 81F04FC
 
 @ CLIFF
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "IVAN$", 12
@@ -2558,7 +2558,7 @@ gTrainers:: @ 81F04FC
 
 @ LARRY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "KAREL$", 12
@@ -2570,7 +2570,7 @@ gTrainers:: @ 81F04FC
 
 @ SHANE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "KUNO$", 12
@@ -2582,7 +2582,7 @@ gTrainers:: @ 81F04FC
 
 @ JUSTIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "LAURENZ$", 12
@@ -2594,7 +2594,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "EWALD$", 12
@@ -2606,7 +2606,7 @@ gTrainers:: @ 81F04FC
 
 @ JEFF
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "RAPHAEL$", 12
@@ -2618,7 +2618,7 @@ gTrainers:: @ 81F04FC
 
 @ TRAVIS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "RONALD$", 12
@@ -2630,7 +2630,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "EWALD$", 12
@@ -2642,7 +2642,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "EWALD$", 12
@@ -2654,7 +2654,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "EWALD$", 12
@@ -2666,7 +2666,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "EWALD$", 12
@@ -2678,7 +2678,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "ROMEO$", 12
@@ -2690,7 +2690,7 @@ gTrainers:: @ 81F04FC
 
 @ DONALD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "TILL$", 12
@@ -2702,7 +2702,7 @@ gTrainers:: @ 81F04FC
 
 @ TAYLOR
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "URIEL$", 12
@@ -2714,7 +2714,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRUNO$", 12
@@ -2726,7 +2726,7 @@ gTrainers:: @ 81F04FC
 
 @ DEREK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BURKARD$", 12
@@ -2738,7 +2738,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRUNO$", 12
@@ -2750,7 +2750,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRUNO$", 12
@@ -2762,7 +2762,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRUNO$", 12
@@ -2774,7 +2774,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRUNO$", 12
@@ -2786,7 +2786,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWARD
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "WENDELIN$", 12
@@ -2798,7 +2798,7 @@ gTrainers:: @ 81F04FC
 
 @ PRESTON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "URBAN$", 12
@@ -2810,7 +2810,7 @@ gTrainers:: @ 81F04FC
 
 @ VIRGIL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "ZOLTAN$", 12
@@ -2822,7 +2822,7 @@ gTrainers:: @ 81F04FC
 
 @ FRITZ
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "XAVER$", 12
@@ -2834,7 +2834,7 @@ gTrainers:: @ 81F04FC
 
 @ WILLIAM
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "WULF$", 12
@@ -2846,7 +2846,7 @@ gTrainers:: @ 81F04FC
 
 @ JOSHUA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "JONAS$", 12
@@ -2858,7 +2858,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "MAXIMILIAN$", 12
@@ -2870,7 +2870,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "MAXIMILIAN$", 12
@@ -2882,7 +2882,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "MAXIMILIAN$", 12
@@ -2894,7 +2894,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "MAXIMILIAN$", 12
@@ -2906,7 +2906,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "MAXIMILIAN$", 12
@@ -2918,7 +2918,7 @@ gTrainers:: @ 81F04FC
 
 @ JACLYN
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "COSIMA$", 12
@@ -2930,7 +2930,7 @@ gTrainers:: @ 81F04FC
 
 @ HANNAH
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "HANNAH$", 12
@@ -2942,7 +2942,7 @@ gTrainers:: @ 81F04FC
 
 @ SAMANTHA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "SAMANTHA$", 12
@@ -2954,7 +2954,7 @@ gTrainers:: @ 81F04FC
 
 @ MAURA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "DOLORES$", 12
@@ -2966,7 +2966,7 @@ gTrainers:: @ 81F04FC
 
 @ KAYLA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "CAMILLA$", 12
@@ -2978,7 +2978,7 @@ gTrainers:: @ 81F04FC
 
 @ ALEXIS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "ALEXIS$", 12
@@ -2990,7 +2990,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "KORNELIA$", 12
@@ -3002,7 +3002,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "KORNELIA$", 12
@@ -3014,7 +3014,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "KORNELIA$", 12
@@ -3026,7 +3026,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "KORNELIA$", 12
@@ -3038,7 +3038,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "KORNELIA$", 12
@@ -3050,7 +3050,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "ABRAHAM$", 12
@@ -3062,7 +3062,7 @@ gTrainers:: @ 81F04FC
 
 @ TUCKER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "CLAUDIO$", 12
@@ -3074,7 +3074,7 @@ gTrainers:: @ 81F04FC
 
 @ THOMAS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "NIKOLAI$", 12
@@ -3086,7 +3086,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "ABRAHAM$", 12
@@ -3098,7 +3098,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "ABRAHAM$", 12
@@ -3110,7 +3110,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "ABRAHAM$", 12
@@ -3122,7 +3122,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "ABRAHAM$", 12
@@ -3134,7 +3134,7 @@ gTrainers:: @ 81F04FC
 
 @ SIDNEY
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_ELITE_FOUR
+	.byte TRAINER_CLASS_ELITE_FOUR
 	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_SIDNEY
 	.string "ULRICH$", 12
@@ -3146,7 +3146,7 @@ gTrainers:: @ 81F04FC
 
 @ PHOEBE
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_ELITE_FOUR
+	.byte TRAINER_CLASS_ELITE_FOUR
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_PHOEBE
 	.string "ANTONIA$", 12
@@ -3158,7 +3158,7 @@ gTrainers:: @ 81F04FC
 
 @ GLACIA
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_ELITE_FOUR
+	.byte TRAINER_CLASS_ELITE_FOUR
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_GLACIA
 	.string "FROSINA$", 12
@@ -3170,7 +3170,7 @@ gTrainers:: @ 81F04FC
 
 @ DRAKE
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_ELITE_FOUR
+	.byte TRAINER_CLASS_ELITE_FOUR
 	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAKE
 	.string "DRAGAN$", 12
@@ -3182,7 +3182,7 @@ gTrainers:: @ 81F04FC
 
 @ ROXANNE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_ROXANNE
 	.string "FELIZIA$", 12
@@ -3194,7 +3194,7 @@ gTrainers:: @ 81F04FC
 
 @ BRAWLY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRAWLY
 	.string "KAMILLO$", 12
@@ -3206,7 +3206,7 @@ gTrainers:: @ 81F04FC
 
 @ WATTSON
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WATTSON
 	.string "WALTER$", 12
@@ -3218,7 +3218,7 @@ gTrainers:: @ 81F04FC
 
 @ FLANNERY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_FLANNERY
 	.string "FLAVIA$", 12
@@ -3230,7 +3230,7 @@ gTrainers:: @ 81F04FC
 
 @ NORMAN
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_NORMAN
 	.string "NORMAN$", 12
@@ -3242,7 +3242,7 @@ gTrainers:: @ 81F04FC
 
 @ WINONA
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WINONA
 	.string "WIBKE$", 12
@@ -3254,7 +3254,7 @@ gTrainers:: @ 81F04FC
 
 @ TATE_AND_LIZA
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_TATE_AND_LIZA
 	.string "BEN&SVENJA$", 12
@@ -3266,7 +3266,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLACE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLACE
 	.string "WASSILI$", 12
@@ -3278,7 +3278,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "ORLANDO$", 12
@@ -3290,7 +3290,7 @@ gTrainers:: @ 81F04FC
 
 @ TED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "RAMON$", 12
@@ -3302,7 +3302,7 @@ gTrainers:: @ 81F04FC
 
 @ PAUL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "JÜRGEN$", 12
@@ -3314,7 +3314,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "ORLANDO$", 12
@@ -3326,7 +3326,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "ORLANDO$", 12
@@ -3338,7 +3338,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "ORLANDO$", 12
@@ -3350,7 +3350,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "ORLANDO$", 12
@@ -3362,7 +3362,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KERSTIN$", 12
@@ -3374,7 +3374,7 @@ gTrainers:: @ 81F04FC
 
 @ GEORGIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "ARIANE$", 12
@@ -3386,7 +3386,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KERSTIN$", 12
@@ -3398,7 +3398,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KERSTIN$", 12
@@ -3410,7 +3410,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KERSTIN$", 12
@@ -3422,7 +3422,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KERSTIN$", 12
@@ -3434,7 +3434,7 @@ gTrainers:: @ 81F04FC
 
 @ KATE_AND_JOY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "EVA & UTE$", 12
@@ -3446,7 +3446,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "IRM & IDA$", 12
@@ -3458,7 +3458,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "IRM & IDA$", 12
@@ -3470,7 +3470,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "IRM & IDA$", 12
@@ -3482,7 +3482,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "IRM & IDA$", 12
@@ -3494,7 +3494,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "IRM & IDA$", 12
@@ -3506,7 +3506,7 @@ gTrainers:: @ 81F04FC
 
 @ VICTOR
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_WINSTRATE
+	.byte TRAINER_CLASS_WINSTRATE
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "VIKTOR$", 12
@@ -3518,7 +3518,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_1
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3530,7 +3530,7 @@ gTrainers:: @ 81F04FC
 
 @ COLTON
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "ATTILA$", 12
@@ -3542,7 +3542,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_2
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3554,7 +3554,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_3
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3566,7 +3566,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_4
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3578,7 +3578,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3590,7 +3590,7 @@ gTrainers:: @ 81F04FC
 
 @ VICTORIA
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_WINSTRATE
+	.byte TRAINER_CLASS_WINSTRATE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "VIKTORIA$", 12
@@ -3602,7 +3602,7 @@ gTrainers:: @ 81F04FC
 
 @ VANESSA
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "VANESSA$", 12
@@ -3614,7 +3614,7 @@ gTrainers:: @ 81F04FC
 
 @ MARISSA
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "EVELYN$", 12
@@ -3626,7 +3626,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_1
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3638,7 +3638,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_2
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3650,7 +3650,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_3
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3662,7 +3662,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_4
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3674,7 +3674,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3686,7 +3686,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "THEOBALD$", 12
@@ -3698,7 +3698,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "THEOBALD$", 12
@@ -3710,7 +3710,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "THEOBALD$", 12
@@ -3722,7 +3722,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "THEOBALD$", 12
@@ -3734,7 +3734,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "THEOBALD$", 12
@@ -3746,7 +3746,7 @@ gTrainers:: @ 81F04FC
 
 @ VICKY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_WINSTRATE
+	.byte TRAINER_CLASS_WINSTRATE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "VICKY$", 12
@@ -3758,7 +3758,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "WALTRAUD$", 12
@@ -3770,7 +3770,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "WALTRAUD$", 12
@@ -3782,7 +3782,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "WALTRAUD$", 12
@@ -3794,7 +3794,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "WALTRAUD$", 12
@@ -3806,7 +3806,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "WALTRAUD$", 12
@@ -3818,7 +3818,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "ANSGAR$", 12
@@ -3830,7 +3830,7 @@ gTrainers:: @ 81F04FC
 
 @ BILLY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "FRIDOLIN$", 12
@@ -3842,7 +3842,7 @@ gTrainers:: @ 81F04FC
 
 @ JOSH
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "GASTON$", 12
@@ -3854,7 +3854,7 @@ gTrainers:: @ 81F04FC
 
 @ TOMMY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "DOMINIK$", 12
@@ -3866,7 +3866,7 @@ gTrainers:: @ 81F04FC
 
 @ JOEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "LUDGER$", 12
@@ -3878,7 +3878,7 @@ gTrainers:: @ 81F04FC
 
 @ BEN
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "EGON$", 12
@@ -3890,7 +3890,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "$", 12
@@ -3902,7 +3902,7 @@ gTrainers:: @ 81F04FC
 
 @ KEVIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "JULIUS$", 12
@@ -3914,7 +3914,7 @@ gTrainers:: @ 81F04FC
 
 @ NEAL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "MORITZ$", 12
@@ -3926,7 +3926,7 @@ gTrainers:: @ 81F04FC
 
 @ DILLON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "SÖNCKE$", 12
@@ -3938,7 +3938,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "ANSGAR$", 12
@@ -3950,7 +3950,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "ANSGAR$", 12
@@ -3962,7 +3962,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "ANSGAR$", 12
@@ -3974,7 +3974,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "ANSGAR$", 12
@@ -3986,7 +3986,7 @@ gTrainers:: @ 81F04FC
 
 @ EDDIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "HENRY$", 12
@@ -3998,7 +3998,7 @@ gTrainers:: @ 81F04FC
 
 @ ALLEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "HUGO$", 12
@@ -4010,7 +4010,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMMY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "FRIEDER$", 12
@@ -4022,7 +4022,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVEN
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_CHAMPION
+	.byte TRAINER_CLASS_CHAMPION
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_STEVEN
 	.string "TROY$", 12
@@ -4034,7 +4034,7 @@ gTrainers:: @ 81F04FC
 
 @ ANDREW
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ANSGAR$", 12
@@ -4046,7 +4046,7 @@ gTrainers:: @ 81F04FC
 
 @ IVAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ANGELO$", 12
@@ -4058,7 +4058,7 @@ gTrainers:: @ 81F04FC
 
 @ CLAUDE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ANSELM$", 12
@@ -4070,7 +4070,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALOIS$", 12
@@ -4082,7 +4082,7 @@ gTrainers:: @ 81F04FC
 
 @ NED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ARTHUR$", 12
@@ -4094,7 +4094,7 @@ gTrainers:: @ 81F04FC
 
 @ DALE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALBIN$", 12
@@ -4106,7 +4106,7 @@ gTrainers:: @ 81F04FC
 
 @ NOLAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "AMADEUS$", 12
@@ -4118,7 +4118,7 @@ gTrainers:: @ 81F04FC
 
 @ BARNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALBRECHT$", 12
@@ -4130,7 +4130,7 @@ gTrainers:: @ 81F04FC
 
 @ WADE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALAIN$", 12
@@ -4142,7 +4142,7 @@ gTrainers:: @ 81F04FC
 
 @ CARTER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ARMIN$", 12
@@ -4154,7 +4154,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALOIS$", 12
@@ -4166,7 +4166,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALOIS$", 12
@@ -4178,7 +4178,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALOIS$", 12
@@ -4190,7 +4190,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALOIS$", 12
@@ -4202,7 +4202,7 @@ gTrainers:: @ 81F04FC
 
 @ RONALD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ACHMED$", 12
@@ -4214,7 +4214,7 @@ gTrainers:: @ 81F04FC
 
 @ JACOB
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "ROMAN$", 12
@@ -4226,7 +4226,7 @@ gTrainers:: @ 81F04FC
 
 @ ANTHONY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "EMIL$", 12
@@ -4238,7 +4238,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "EGIDIUS$", 12
@@ -4250,7 +4250,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "EGIDIUS$", 12
@@ -4262,7 +4262,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "EGIDIUS$", 12
@@ -4274,7 +4274,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "EGIDIUS$", 12
@@ -4286,7 +4286,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "EGIDIUS$", 12
@@ -4298,7 +4298,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "IRMGARD$", 12
@@ -4310,7 +4310,7 @@ gTrainers:: @ 81F04FC
 
 @ JASMINE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "MARTHA$", 12
@@ -4322,7 +4322,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "IRMGARD$", 12
@@ -4334,7 +4334,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "IRMGARD$", 12
@@ -4346,7 +4346,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "IRMGARD$", 12
@@ -4358,7 +4358,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "IRMGARD$", 12
@@ -4370,7 +4370,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "IGOR$", 12
@@ -4382,7 +4382,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "IGOR$", 12
@@ -4394,7 +4394,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "IGOR$", 12
@@ -4406,7 +4406,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "IGOR$", 12
@@ -4418,7 +4418,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "IGOR$", 12
@@ -4430,7 +4430,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "JUTTA$", 12
@@ -4442,7 +4442,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "JUTTA$", 12
@@ -4454,7 +4454,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "JUTTA$", 12
@@ -4466,7 +4466,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "JUTTA$", 12
@@ -4478,7 +4478,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "JUTTA$", 12
@@ -4490,7 +4490,7 @@ gTrainers:: @ 81F04FC
 
 @ CALEB
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "OLEG$", 12
@@ -4502,7 +4502,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_6
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "$", 12
@@ -4514,7 +4514,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "KASPAR$", 12
@@ -4526,7 +4526,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_7
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "$", 12
@@ -4538,7 +4538,7 @@ gTrainers:: @ 81F04FC
 
 @ CHASE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "FERDINAND$", 12
@@ -4550,7 +4550,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "KASPAR$", 12
@@ -4562,7 +4562,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "KASPAR$", 12
@@ -4574,7 +4574,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "KASPAR$", 12
@@ -4586,7 +4586,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "KASPAR$", 12
@@ -4598,7 +4598,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_8
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "$", 12
@@ -4610,7 +4610,7 @@ gTrainers:: @ 81F04FC
 
 @ CONNOR
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "MIRA$", 12
@@ -4622,7 +4622,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_9
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "$", 12
@@ -4634,7 +4634,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "MECHTHILD$", 12
@@ -4646,7 +4646,7 @@ gTrainers:: @ 81F04FC
 
 @ ALLISON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "LOTTE$", 12
@@ -4658,7 +4658,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "MECHTHILD$", 12
@@ -4670,7 +4670,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "MECHTHILD$", 12
@@ -4682,7 +4682,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "MECHTHILD$", 12
@@ -4694,7 +4694,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "MECHTHILD$", 12
@@ -4706,7 +4706,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "ALFONS$", 12
@@ -4718,7 +4718,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "ALFONS$", 12
@@ -4730,7 +4730,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "ALFONS$", 12
@@ -4742,7 +4742,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "ALFONS$", 12
@@ -4754,7 +4754,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "ALFONS$", 12
@@ -4766,7 +4766,7 @@ gTrainers:: @ 81F04FC
 
 @ AARON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "EDMUND$", 12
@@ -4778,7 +4778,7 @@ gTrainers:: @ 81F04FC
 
 @ PERRY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "JOSCHKA$", 12
@@ -4790,7 +4790,7 @@ gTrainers:: @ 81F04FC
 
 @ HUGH
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ENRICO$", 12
@@ -4802,7 +4802,7 @@ gTrainers:: @ 81F04FC
 
 @ PHIL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "HENRY$", 12
@@ -4814,7 +4814,7 @@ gTrainers:: @ 81F04FC
 
 @ JARED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "HIOB$", 12
@@ -4826,7 +4826,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_10
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "$", 12
@@ -4838,7 +4838,7 @@ gTrainers:: @ 81F04FC
 
 @ TANNER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ANATOL$", 12
@@ -4850,7 +4850,7 @@ gTrainers:: @ 81F04FC
 
 @ WILL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "BJÖRN$", 12
@@ -4862,7 +4862,7 @@ gTrainers:: @ 81F04FC
 
 @ COLIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "WIM$", 12
@@ -4874,7 +4874,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "FRITJOF$", 12
@@ -4886,7 +4886,7 @@ gTrainers:: @ 81F04FC
 
 @ BENNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "GENADI$", 12
@@ -4898,7 +4898,7 @@ gTrainers:: @ 81F04FC
 
 @ CHESTER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "VITALI$", 12
@@ -4910,7 +4910,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "FRITJOF$", 12
@@ -4922,7 +4922,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "FRITJOF$", 12
@@ -4934,7 +4934,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "FRITJOF$", 12
@@ -4946,7 +4946,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "FRITJOF$", 12
@@ -4958,7 +4958,7 @@ gTrainers:: @ 81F04FC
 
 @ ALEX
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ARNE$", 12
@@ -4970,7 +4970,7 @@ gTrainers:: @ 81F04FC
 
 @ BECK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "VINCENT$", 12
@@ -4982,7 +4982,7 @@ gTrainers:: @ 81F04FC
 
 @ YASU
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "VALENTIN$", 12
@@ -4994,7 +4994,7 @@ gTrainers:: @ 81F04FC
 
 @ TAKASHI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "EUGEN$", 12
@@ -5006,7 +5006,7 @@ gTrainers:: @ 81F04FC
 
 @ MAKOTO
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "HERIBERT$", 12
@@ -5018,7 +5018,7 @@ gTrainers:: @ 81F04FC
 
 @ HIDEO_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "SAUL$", 12
@@ -5030,7 +5030,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "EDUARD$", 12
@@ -5042,7 +5042,7 @@ gTrainers:: @ 81F04FC
 
 @ LUNG
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "ARND$", 12
@@ -5054,7 +5054,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "EDUARD$", 12
@@ -5066,7 +5066,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "EDUARD$", 12
@@ -5078,7 +5078,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "EDUARD$", 12
@@ -5090,7 +5090,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_5
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "EDUARD$", 12
@@ -5102,7 +5102,7 @@ gTrainers:: @ 81F04FC
 
 @ TESSA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "TAMARA$", 12
@@ -5114,7 +5114,7 @@ gTrainers:: @ 81F04FC
 
 @ LAURA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "LAURA$", 12
@@ -5126,7 +5126,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "ELFI$", 12
@@ -5138,7 +5138,7 @@ gTrainers:: @ 81F04FC
 
 @ CORA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "THEA$", 12
@@ -5150,7 +5150,7 @@ gTrainers:: @ 81F04FC
 
 @ JILL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "AGNES$", 12
@@ -5162,7 +5162,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "ELFI$", 12
@@ -5174,7 +5174,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "ELFI$", 12
@@ -5186,7 +5186,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "ELFI$", 12
@@ -5198,7 +5198,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "ELFI$", 12
@@ -5210,7 +5210,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "SASKIA$", 12
@@ -5222,7 +5222,7 @@ gTrainers:: @ 81F04FC
 
 @ CLARISSA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "GERDA$", 12
@@ -5234,7 +5234,7 @@ gTrainers:: @ 81F04FC
 
 @ ANGELICA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "MARIKA$", 12
@@ -5246,7 +5246,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "SASKIA$", 12
@@ -5258,7 +5258,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "SASKIA$", 12
@@ -5270,7 +5270,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "SASKIA$", 12
@@ -5282,7 +5282,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "SASKIA$", 12
@@ -5294,7 +5294,7 @@ gTrainers:: @ 81F04FC
 
 @ BEVERLY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "DAGMAR$", 12
@@ -5306,7 +5306,7 @@ gTrainers:: @ 81F04FC
 
 @ DAWN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "HEIDRUN$", 12
@@ -5318,7 +5318,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "NICOLE$", 12
@@ -5330,7 +5330,7 @@ gTrainers:: @ 81F04FC
 
 @ DENISE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "DENISE$", 12
@@ -5342,7 +5342,7 @@ gTrainers:: @ 81F04FC
 
 @ BETH
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "ALMUT$", 12
@@ -5354,7 +5354,7 @@ gTrainers:: @ 81F04FC
 
 @ TARA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "SIEGLINDE$", 12
@@ -5366,7 +5366,7 @@ gTrainers:: @ 81F04FC
 
 @ MISSY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "MARION$", 12
@@ -5378,7 +5378,7 @@ gTrainers:: @ 81F04FC
 
 @ ALICE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "ALICE$", 12
@@ -5390,7 +5390,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "MONIKA$", 12
@@ -5402,7 +5402,7 @@ gTrainers:: @ 81F04FC
 
 @ GRACE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "ILONA$", 12
@@ -5414,7 +5414,7 @@ gTrainers:: @ 81F04FC
 
 @ TANYA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "EMILIE$", 12
@@ -5426,7 +5426,7 @@ gTrainers:: @ 81F04FC
 
 @ SHARON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "GUDRUN$", 12
@@ -5438,7 +5438,7 @@ gTrainers:: @ 81F04FC
 
 @ NIKKI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "ASTRID$", 12
@@ -5450,7 +5450,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "OTTILIE$", 12
@@ -5462,7 +5462,7 @@ gTrainers:: @ 81F04FC
 
 @ KATIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "SENTA$", 12
@@ -5474,7 +5474,7 @@ gTrainers:: @ 81F04FC
 
 @ SUSIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "JANKA$", 12
@@ -5486,7 +5486,7 @@ gTrainers:: @ 81F04FC
 
 @ KARA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "RENATE$", 12
@@ -5498,7 +5498,7 @@ gTrainers:: @ 81F04FC
 
 @ DANA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "VICKI$", 12
@@ -5510,7 +5510,7 @@ gTrainers:: @ 81F04FC
 
 @ ERIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "REBECCA$", 12
@@ -5522,7 +5522,7 @@ gTrainers:: @ 81F04FC
 
 @ DEBRA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "ANJA$", 12
@@ -5534,7 +5534,7 @@ gTrainers:: @ 81F04FC
 
 @ LINDA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "GISELA$", 12
@@ -5546,7 +5546,7 @@ gTrainers:: @ 81F04FC
 
 @ KAYLEE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "PAOLA$", 12
@@ -5558,7 +5558,7 @@ gTrainers:: @ 81F04FC
 
 @ LAUREL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "BIRTE$", 12
@@ -5570,7 +5570,7 @@ gTrainers:: @ 81F04FC
 
 @ DARCY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "DOROTHEA$", 12
@@ -5582,7 +5582,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "MONIKA$", 12
@@ -5594,7 +5594,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "MONIKA$", 12
@@ -5606,7 +5606,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "MONIKA$", 12
@@ -5618,7 +5618,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "MONIKA$", 12
@@ -5630,7 +5630,7 @@ gTrainers:: @ 81F04FC
 
 @ HEIDI
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "JANA$", 12
@@ -5642,7 +5642,7 @@ gTrainers:: @ 81F04FC
 
 @ BECKY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "HEIDI$", 12
@@ -5654,7 +5654,7 @@ gTrainers:: @ 81F04FC
 
 @ CAROL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "NATALIE$", 12
@@ -5666,7 +5666,7 @@ gTrainers:: @ 81F04FC
 
 @ NANCY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "NANCY$", 12
@@ -5678,7 +5678,7 @@ gTrainers:: @ 81F04FC
 
 @ MARTHA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "MARTHA$", 12
@@ -5690,7 +5690,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "GWENDOLIN$", 12
@@ -5702,7 +5702,7 @@ gTrainers:: @ 81F04FC
 
 @ NINA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "NADJA$", 12
@@ -5714,7 +5714,7 @@ gTrainers:: @ 81F04FC
 
 @ IRENE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "IRENE$", 12
@@ -5726,7 +5726,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "GWENDOLIN$", 12
@@ -5738,7 +5738,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "GWENDOLIN$", 12
@@ -5750,7 +5750,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "GWENDOLIN$", 12
@@ -5762,7 +5762,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "GWENDOLIN$", 12
@@ -5774,7 +5774,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "NORA & JO$", 12
@@ -5786,7 +5786,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "NORA & JO$", 12
@@ -5798,7 +5798,7 @@ gTrainers:: @ 81F04FC
 
 @ GINA_AND_MIA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "GINA & MIA$", 12
@@ -5810,7 +5810,7 @@ gTrainers:: @ 81F04FC
 
 @ MIU_AND_YUKI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "LEA & GRIT$", 12
@@ -5822,7 +5822,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "NORA & JO$", 12
@@ -5834,7 +5834,7 @@ gTrainers:: @ 81F04FC
 
 @ GINA_AND_MIA_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "GINA & MIA$", 12
@@ -5846,7 +5846,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "NORA & JO$", 12
@@ -5858,7 +5858,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "NORA & JO$", 12
@@ -5870,7 +5870,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_6
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "NORA & JO$", 12
@@ -5882,7 +5882,7 @@ gTrainers:: @ 81F04FC
 
 @ HUEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "TASSILO$", 12
@@ -5894,7 +5894,7 @@ gTrainers:: @ 81F04FC
 
 @ EDMOND
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "MONTY$", 12
@@ -5906,7 +5906,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ELERT$", 12
@@ -5918,7 +5918,7 @@ gTrainers:: @ 81F04FC
 
 @ DWAYNE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "RETO$", 12
@@ -5930,7 +5930,7 @@ gTrainers:: @ 81F04FC
 
 @ PHILLIP
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "GUNNAR$", 12
@@ -5942,7 +5942,7 @@ gTrainers:: @ 81F04FC
 
 @ LEONARD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "LEONARD$", 12
@@ -5954,7 +5954,7 @@ gTrainers:: @ 81F04FC
 
 @ DUNCAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "PIERRE$", 12
@@ -5966,7 +5966,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ELERT$", 12
@@ -5978,7 +5978,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ELERT$", 12
@@ -5990,7 +5990,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ELERT$", 12
@@ -6002,7 +6002,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ELERT$", 12
@@ -6014,7 +6014,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_11
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "$", 12
@@ -6026,7 +6026,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_12
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "$", 12
@@ -6038,7 +6038,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_13
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "$", 12
@@ -6050,7 +6050,7 @@ gTrainers:: @ 81F04FC
 
 @ SONNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "WENZEL$", 12
@@ -6062,7 +6062,7 @@ gTrainers:: @ 81F04FC
 
 @ DONOVAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "STANISLAUS$", 12
@@ -6074,7 +6074,7 @@ gTrainers:: @ 81F04FC
 
 @ GERALD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "GERALD$", 12
@@ -6086,7 +6086,7 @@ gTrainers:: @ 81F04FC
 
 @ KELVIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "AARON$", 12
@@ -6098,7 +6098,7 @@ gTrainers:: @ 81F04FC
 
 @ KODY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "ALBERT$", 12
@@ -6110,7 +6110,7 @@ gTrainers:: @ 81F04FC
 
 @ TEVIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "ANDRE$", 12
@@ -6122,7 +6122,7 @@ gTrainers:: @ 81F04FC
 
 @ DAMON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "AMON$", 12
@@ -6134,7 +6134,7 @@ gTrainers:: @ 81F04FC
 
 @ PABLO
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "PABLO$", 12
@@ -6146,7 +6146,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6158,7 +6158,7 @@ gTrainers:: @ 81F04FC
 
 @ HECTOR_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "HEKTOR$", 12
@@ -6170,7 +6170,7 @@ gTrainers:: @ 81F04FC
 
 @ HECTOR_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "HEKTOR$", 12
@@ -6182,7 +6182,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6194,7 +6194,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6206,7 +6206,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6218,7 +6218,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6230,7 +6230,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "HEIKO$", 12
@@ -6242,7 +6242,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6254,7 +6254,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6266,7 +6266,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6278,7 +6278,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6290,7 +6290,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6302,7 +6302,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_6
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6314,7 +6314,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_7
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6326,7 +6326,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_8
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6338,7 +6338,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_9
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -6350,7 +6350,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6362,7 +6362,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6374,7 +6374,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6386,7 +6386,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6398,7 +6398,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6410,7 +6410,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_6
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6422,7 +6422,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_7
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6434,7 +6434,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_8
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6446,7 +6446,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_9
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -6458,7 +6458,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "BLASIUS$", 12
@@ -6470,7 +6470,7 @@ gTrainers:: @ 81F04FC
 
 @ RILEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "CLIFF$", 12
@@ -6482,7 +6482,7 @@ gTrainers:: @ 81F04FC
 
 @ AIDAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "DARIO$", 12
@@ -6494,7 +6494,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "BLASIUS$", 12
@@ -6506,7 +6506,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "BLASIUS$", 12
@@ -6518,7 +6518,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "BLASIUS$", 12
@@ -6530,7 +6530,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "BLASIUS$", 12
@@ -6542,7 +6542,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6554,7 +6554,7 @@ gTrainers:: @ 81F04FC
 
 @ ALEXIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "DORIS$", 12
@@ -6566,7 +6566,7 @@ gTrainers:: @ 81F04FC
 
 @ DANIELLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "DUNJA$", 12
@@ -6578,7 +6578,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6590,7 +6590,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6602,7 +6602,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6614,7 +6614,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6626,7 +6626,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "ECKBERT$", 12
@@ -6638,7 +6638,7 @@ gTrainers:: @ 81F04FC
 
 @ CARLOS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "EDWARD$", 12
@@ -6650,7 +6650,7 @@ gTrainers:: @ 81F04FC
 
 @ SEBASTIAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "EILMAR$", 12
@@ -6662,7 +6662,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "ECKBERT$", 12
@@ -6674,7 +6674,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "ECKBERT$", 12
@@ -6686,7 +6686,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "ECKBERT$", 12
@@ -6698,7 +6698,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "ECKBERT$", 12
@@ -6710,7 +6710,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "HANNELORE$", 12
@@ -6722,7 +6722,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "INGEBORG$", 12
@@ -6734,7 +6734,7 @@ gTrainers:: @ 81F04FC
 
 @ SOPHIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "SOPHIA$", 12
@@ -6746,7 +6746,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "HANNELORE$", 12
@@ -6758,7 +6758,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "HANNELORE$", 12
@@ -6770,7 +6770,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "HANNELORE$", 12
@@ -6782,7 +6782,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "HANNELORE$", 12
@@ -6794,7 +6794,7 @@ gTrainers:: @ 81F04FC
 
 @ MAXIE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
+	.byte TRAINER_CLASS_MAGMA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAXIE
 	.string "MARC$", 12
@@ -6806,7 +6806,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_28
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6818,7 +6818,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_29
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6830,7 +6830,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_30
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6842,7 +6842,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_31
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6854,7 +6854,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_32
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6866,7 +6866,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_33
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6878,7 +6878,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_34
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6890,7 +6890,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_35
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6902,7 +6902,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_36
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6914,7 +6914,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_37
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6926,7 +6926,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_38
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6938,7 +6938,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_39
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6950,7 +6950,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_40
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6962,7 +6962,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_41
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6974,7 +6974,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_42
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6986,7 +6986,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_43
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -6998,7 +6998,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_44
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -7010,7 +7010,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_45
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -7022,7 +7022,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_46
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -7034,7 +7034,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_47
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -7046,7 +7046,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_48
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -7058,7 +7058,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_49
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -7070,7 +7070,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_50
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -7082,7 +7082,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_51
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "RÜPEL$", 12
@@ -7094,7 +7094,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_52
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.string "RÜPEL$", 12
@@ -7106,7 +7106,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_53
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.string "RÜPEL$", 12
@@ -7118,7 +7118,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_54
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.string "RÜPEL$", 12
@@ -7130,7 +7130,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_14
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "$", 12
@@ -7142,7 +7142,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_15
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_M
 	.string "$", 12
@@ -7154,7 +7154,7 @@ gTrainers:: @ 81F04FC
 
 @ TABITHA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_M
 	.string "KALLE$", 12
@@ -7166,7 +7166,7 @@ gTrainers:: @ 81F04FC
 
 @ TABITHA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_M
 	.string "KALLE$", 12
@@ -7178,7 +7178,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_16
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_M
 	.string "$", 12
@@ -7190,7 +7190,7 @@ gTrainers:: @ 81F04FC
 
 @ COURTNEY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_F
 	.string "JÖRDIS$", 12
@@ -7202,7 +7202,7 @@ gTrainers:: @ 81F04FC
 
 @ COURTNEY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_F
 	.string "JÖRDIS$", 12
@@ -7214,7 +7214,7 @@ gTrainers:: @ 81F04FC
 
 @ MAXIE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
+	.byte TRAINER_CLASS_MAGMA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAXIE
 	.string "MARC$", 12
@@ -7226,7 +7226,7 @@ gTrainers:: @ 81F04FC
 
 @ MAXIE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
+	.byte TRAINER_CLASS_MAGMA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAXIE
 	.string "MARC$", 12
@@ -7238,7 +7238,7 @@ gTrainers:: @ 81F04FC
 
 @ TIANA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "KARIN$", 12
@@ -7250,7 +7250,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ELISA$", 12
@@ -7262,7 +7262,7 @@ gTrainers:: @ 81F04FC
 
 @ JANICE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "RICARDA$", 12
@@ -7274,7 +7274,7 @@ gTrainers:: @ 81F04FC
 
 @ VIVI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_WINSTRATE
+	.byte TRAINER_CLASS_WINSTRATE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "SIEGLINDE$", 12
@@ -7286,7 +7286,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ELISA$", 12
@@ -7298,7 +7298,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ELISA$", 12
@@ -7310,7 +7310,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ELISA$", 12
@@ -7322,7 +7322,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ELISA$", 12
@@ -7334,7 +7334,7 @@ gTrainers:: @ 81F04FC
 
 @ SALLY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "FREDERIKE$", 12
@@ -7346,7 +7346,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ROBIN$", 12
@@ -7358,7 +7358,7 @@ gTrainers:: @ 81F04FC
 
 @ ANDREA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "FRIEDA$", 12
@@ -7370,7 +7370,7 @@ gTrainers:: @ 81F04FC
 
 @ CRISSY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ADELHEID$", 12
@@ -7382,7 +7382,7 @@ gTrainers:: @ 81F04FC
 
 @ RICK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "BALDUR$", 12
@@ -7394,7 +7394,7 @@ gTrainers:: @ 81F04FC
 
 @ LYLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "DETWIN$", 12
@@ -7406,7 +7406,7 @@ gTrainers:: @ 81F04FC
 
 @ JOSE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "EROS$", 12
@@ -7418,7 +7418,7 @@ gTrainers:: @ 81F04FC
 
 @ DOUG
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "EUSEBIUS$", 12
@@ -7430,7 +7430,7 @@ gTrainers:: @ 81F04FC
 
 @ GREG
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "GANGOLF$", 12
@@ -7442,7 +7442,7 @@ gTrainers:: @ 81F04FC
 
 @ KENT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "GERIT$", 12
@@ -7454,7 +7454,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "GERNOT$", 12
@@ -7466,7 +7466,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "GERNOT$", 12
@@ -7478,7 +7478,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "GERNOT$", 12
@@ -7490,7 +7490,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "GERNOT$", 12
@@ -7502,7 +7502,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "GERNOT$", 12
@@ -7514,7 +7514,7 @@ gTrainers:: @ 81F04FC
 
 @ BRICE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "GISBERT$", 12
@@ -7526,7 +7526,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "HEIMKE$", 12
@@ -7538,7 +7538,7 @@ gTrainers:: @ 81F04FC
 
 @ LENNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "JANNO$", 12
@@ -7550,7 +7550,7 @@ gTrainers:: @ 81F04FC
 
 @ LUCAS_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "KLODWIG$", 12
@@ -7562,7 +7562,7 @@ gTrainers:: @ 81F04FC
 
 @ ALAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "LANZELOT$", 12
@@ -7574,7 +7574,7 @@ gTrainers:: @ 81F04FC
 
 @ CLARK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "LUZIUS$", 12
@@ -7586,7 +7586,7 @@ gTrainers:: @ 81F04FC
 
 @ ERIC
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "MAURIZIO$", 12
@@ -7598,7 +7598,7 @@ gTrainers:: @ 81F04FC
 
 @ LUCAS_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "KLODWIG$", 12
@@ -7610,7 +7610,7 @@ gTrainers:: @ 81F04FC
 
 @ MIKE_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "MELVIN$", 12
@@ -7622,7 +7622,7 @@ gTrainers:: @ 81F04FC
 
 @ MIKE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "MELVIN$", 12
@@ -7634,7 +7634,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "HEIMKE$", 12
@@ -7646,7 +7646,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "HEIMKE$", 12
@@ -7658,7 +7658,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "HEIMKE$", 12
@@ -7670,7 +7670,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "HEIMKE$", 12
@@ -7682,7 +7682,7 @@ gTrainers:: @ 81F04FC
 
 @ DEZ_AND_LUKE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "INA & LEIF$", 12
@@ -7694,7 +7694,7 @@ gTrainers:: @ 81F04FC
 
 @ LEA_AND_JED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "LENA & UWE$", 12
@@ -7706,7 +7706,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "GESA & PIT$", 12
@@ -7718,7 +7718,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "GESA & PIT$", 12
@@ -7730,7 +7730,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "GESA & PIT$", 12
@@ -7742,7 +7742,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "GESA & PIT$", 12
@@ -7754,7 +7754,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "GESA & PIT$", 12
@@ -7766,7 +7766,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHANNA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "CORDULA$", 12
@@ -7778,7 +7778,7 @@ gTrainers:: @ 81F04FC
 
 @ ZANE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "OTBERT$", 12
@@ -7790,7 +7790,7 @@ gTrainers:: @ 81F04FC
 
 @ VIVIAN
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "BÄRBEL$", 12
@@ -7802,7 +7802,7 @@ gTrainers:: @ 81F04FC
 
 @ SADIE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "CHANTAL$", 12
@@ -7814,7 +7814,7 @@ gTrainers:: @ 81F04FC
 
 @ HIDEO_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "SAUL$", 12
@@ -7826,7 +7826,7 @@ gTrainers:: @ 81F04FC
 
 @ KEIGO
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "NELSON$", 12
@@ -7838,7 +7838,7 @@ gTrainers:: @ 81F04FC
 
 @ TSUNAO
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "NIKODEMUS$", 12
@@ -7850,7 +7850,7 @@ gTrainers:: @ 81F04FC
 
 @ TERRELL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "NESTOR$", 12
@@ -7862,7 +7862,7 @@ gTrainers:: @ 81F04FC
 
 @ KYLEE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "MIREILLE$", 12
@@ -7874,7 +7874,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "HEIKO$", 12
@@ -7886,7 +7886,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "HEIKO$", 12
@@ -7898,7 +7898,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "HEIKO$", 12
@@ -7910,7 +7910,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "HEIKO$", 12
@@ -7922,7 +7922,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_6
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "HEIKO$", 12
@@ -7934,7 +7934,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_10
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -7946,7 +7946,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_11
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -7958,7 +7958,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_12
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRIX$", 12
@@ -7970,7 +7970,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_10
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -7982,7 +7982,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_11
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -7994,7 +7994,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_12
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAIKE$", 12
@@ -8006,7 +8006,7 @@ gTrainers:: @ 81F04FC
 
 @ JONAH
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "OLOF$", 12
@@ -8018,7 +8018,7 @@ gTrainers:: @ 81F04FC
 
 @ HENRY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "PIUS$", 12
@@ -8030,7 +8030,7 @@ gTrainers:: @ 81F04FC
 
 @ ROGER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "AMATUS$", 12
@@ -8042,7 +8042,7 @@ gTrainers:: @ 81F04FC
 
 @ ALEXA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "ANNABEL$", 12
@@ -8054,7 +8054,7 @@ gTrainers:: @ 81F04FC
 
 @ RUBEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "TRUTZ$", 12
@@ -8066,7 +8066,7 @@ gTrainers:: @ 81F04FC
 
 @ KOJI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "REMIGIUS$", 12
@@ -8078,7 +8078,7 @@ gTrainers:: @ 81F04FC
 
 @ WAYNE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ALVARO$", 12
@@ -8090,7 +8090,7 @@ gTrainers:: @ 81F04FC
 
 @ BYRON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "AMALRICH$", 12
@@ -8102,7 +8102,7 @@ gTrainers:: @ 81F04FC
 
 @ REED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "ANDOLIN$", 12
@@ -8114,7 +8114,7 @@ gTrainers:: @ 81F04FC
 
 @ TISHA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "IMKE$", 12
@@ -8126,7 +8126,7 @@ gTrainers:: @ 81F04FC
 
 @ TORI_AND_TIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "LI & FLO$", 12
@@ -8138,7 +8138,7 @@ gTrainers:: @ 81F04FC
 
 @ KIM_AND_IRIS
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "ZOE & IRIS$", 12
@@ -8150,7 +8150,7 @@ gTrainers:: @ 81F04FC
 
 @ TYRA_AND_IVY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "TYRA & IVY$", 12
@@ -8162,7 +8162,7 @@ gTrainers:: @ 81F04FC
 
 @ MEL_AND_PAUL
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "GELI & OLE$", 12
@@ -8174,7 +8174,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "URS & EVI$", 12
@@ -8186,7 +8186,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "URS & EVI$", 12
@@ -8198,7 +8198,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "URS & EVI$", 12
@@ -8210,7 +8210,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "URS & EVI$", 12
@@ -8222,7 +8222,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "URS & EVI$", 12
@@ -8234,7 +8234,7 @@ gTrainers:: @ 81F04FC
 
 @ RELI_AND_IAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "TOBI & UNA$", 12
@@ -8246,7 +8246,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "TOM & UTA$", 12
@@ -8258,7 +8258,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "TOM & UTA$", 12
@@ -8270,7 +8270,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "TOM & UTA$", 12
@@ -8282,7 +8282,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "TOM & UTA$", 12
@@ -8294,7 +8294,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "TOM & UTA$", 12
@@ -8306,7 +8306,7 @@ gTrainers:: @ 81F04FC
 
 @ LISA_AND_RAY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "ERKO & BEA$", 12
@@ -8318,7 +8318,7 @@ gTrainers:: @ 81F04FC
 
 @ EUGENE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ABELKE$", 12
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 3c255b461..41edcb514 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -3065,7 +3065,7 @@ BattleScript_LocalBattleLost:: @ 81D8DD1
 BattleScript_LocalBattleLostEnd: @ 81D8E01
 	end2
 
-gUnknown_081D8E02:: @ 81D8E02
+BattleScript_LinkBattleWonOrLost:: @ 81D8E02
 	printstring 5
 	waitmessage 64
 	atk57
@@ -3248,7 +3248,7 @@ BattleScript_DamagingWeatherContinues:: @ 81D8F7D
 	setbyte gBattleCommunication, 0
 
 BattleScript_DamagingWeatherLoop: @ 81D8F95
-	copyarraywithindex gBankAttacker, gTurnOrder, gBattleCommunication, 1
+	copyarraywithindex gBankAttacker, gBanksByTurnOrder, gBattleCommunication, 1
 	weatherdamage
 	jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
 	printfromtable gSandStormHailDmgStringIds
diff --git a/data/cable_car.s b/data/cable_car.s
deleted file mode 100644
index 775e53b6a..000000000
--- a/data/cable_car.s
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "constants/map_objects.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gCableCarMtChimneyTilemap:: @ 8401820
-	.incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz"
-
-	.align 2
-gCableCarTreeTilemap:: @ 8401978
-	.incbin "graphics/misc/cable_car_tree_map.bin.lz"
-
-	.align 2
-gCableCarMountainTilemap:: @ 8401AFC
-	.incbin "graphics/misc/cable_car_mountain_map.bin.lz"
-
-	.align 2
-gCableCarPylonHookTilemapEntries:: @ 8401CC0
-	.2byte 0x3000
-	.2byte 0x3001
-	.2byte 0x3002
-	.2byte 0x3003
-	.2byte 0x3004
-	.2byte 0x3005
-	.2byte 0x3006
-	.2byte 0x3007
-	.2byte 0x3008
-	.2byte 0x3009
-
-	.align 2
-gCableCarPylonStemTilemap:: @ 8401CD4
-	.incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz"
-
-	.align 2
-gUnknown_08401CF8:: @ 8401CF8
-	obj_tiles gCableCar_Gfx, 0x800, 1
-	obj_tiles gCableCarDoor_Gfx, 0x40, 2
-	obj_tiles gCableCarCord_Gfx, 0x80, 3
-	.space 8
-
-	.align 2
-gUnknown_08401D18:: @ 8401D18
-	obj_pal gCableCar_Pal, 1
-	.space 8
-
-	.align 2
-gOamData_8401D28:: @ 8401D28
-	.2byte 0x0300
-	.2byte 0xC000
-	.2byte 0x0800
-
-	.align 2
-gOamData_8401D30:: @ 8401D30
-	.2byte 0x4300
-	.2byte 0x0000
-	.2byte 0x0800
-
-	.align 2
-gOamData_8401D38:: @ 8401D38
-	.2byte 0x0300
-	.2byte 0x4000
-	.2byte 0x0800
-
-	.align 2
-gSpriteTemplate_8401D40:: @ 8401D40
-	spr_template 1, 1, gOamData_8401D28, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8
-
-	.align 2
-gSpriteTemplate_8401D58:: @ 8401D58
-	spr_template 2, 1, gOamData_8401D30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8
-
-	.align 2
-gSpriteTemplate_8401D70:: @ 8401D70
-	spr_template 3, 1, gOamData_8401D38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_76
-
-gCableCarPlayerGraphicsIDs:: @ 8401D88
-	.byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
-
-gMtChimneyHikerGraphicsIDs:: @ 8401D8A
-	.byte MAP_OBJ_GFX_HIKER
-	.byte MAP_OBJ_GFX_CAMPER
-	.byte MAP_OBJ_GFX_PICNICKER
-	.byte MAP_OBJ_GFX_POOCHYENA @ not used
-
-	.align 1
-gMtChimneyHikerCoords:: @ 8401D8E
-	.2byte   0,  80
-	.2byte 240, 146
-
-gMtChimneyHikerMovementDelayTable:: @ 8401D96
-	.byte   0
-	.byte  60
-	.byte 120
-	.byte 170
-
-	.align 2
-gUnknown_08401D9C:: @ 8401D9C
-	.4byte sub_8123EB8
-	.4byte sub_8123F44
diff --git a/data/data2a.s b/data/data2a.s
index 103b723e8..bd455ce29 100644
--- a/data/data2a.s
+++ b/data/data2a.s
@@ -946,32 +946,32 @@ gSpriteAffineAnimTable_81F971C:: @ 81F971C
 
 	.align 2
 gUnknown_081FA640:: @ 81FA640
-	.4byte sub_8013FE8
-	.4byte sub_80147A0
-	.4byte sub_80146F4
-	.4byte sub_8014BF4
-	.4byte sub_8014D50
-	.4byte sub_8014D98
-	.4byte sub_8014DF8
-	.4byte sub_8014EBC
-	.4byte bs8_exit_by_flight
-	.4byte sub_8014FBC
+	.4byte HandleAction_UseMove
+	.4byte HandleAction_UseItem
+	.4byte HandleAction_Switch
+	.4byte HandleAction_Run
+	.4byte HandleAction_WatchesCarefully
+	.4byte HandleAction_SafariZoneBallThrow
+	.4byte HandleAction_ThrowPokeblock
+	.4byte HandleAction_GoNear
+	.4byte HandleAction_SafriZoneRun
+	.4byte HandleAction_Action9
 	.4byte sub_801B594
-	.4byte bsB_exit_by_move
-	.4byte bsC_8016D70
-	.4byte sub_8015060
+	.4byte HandleAction_Action11
+	.4byte HandleAction_ActionFinished
+	.4byte HandleAction_NothingIsFainted
 
 	.align 2
 gUnknown_081FA678:: @ 81FA678
 	.4byte bc_8013B1C
-	.4byte sub_8013998
-	.4byte sub_8013B64
-	.4byte sub_8013B64
-	.4byte sub_8013BDC
-	.4byte sub_8013C9C
-	.4byte sub_8013C48
-	.4byte sub_8013C9C
-	.4byte sub_8013C9C
+	.4byte HandleEndTurn_BattleWon
+	.4byte HandleEndTurn_BattleLost
+	.4byte HandleEndTurn_BattleLost
+	.4byte HandleEndTurn_RanFromBattle
+	.4byte HandleEndTurn_FinishBattle
+	.4byte HandleEndTurn_MonFled
+	.4byte HandleEndTurn_FinishBattle
+	.4byte HandleEndTurn_FinishBattle
 
 gStatusConditionString_PoisonJpn:: @ 81FA69C
 	.string "どく$$$$$$"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1ed419b52..1c8cff8d6 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -410,8 +410,7 @@ gUnknown_0815F36C:: @ 815F36C
 EventScript_15F384:
 	message UnknownString_81A3A87
 	waitmessage
-	checkflag FLAG_DECORATION_16
-	goto_if_eq EventScript_15F3A0
+	goto_if_set FLAG_DECORATION_16, EventScript_15F3A0
 	goto EventScript_15F3E2
 	end
 
@@ -948,7 +947,7 @@ gUnknown_0819F818:: @ 819F818
 	waitmovement 0
 	specialvar RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
-	goto_if 5, EventScript_19F83F
+	goto_if_ne EventScript_19F83F
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	goto EventScript_19F8F2
@@ -962,10 +961,10 @@ gUnknown_0819F840:: @ 819F840
 	call EventScript_19F8E5
 	specialvar RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
-	goto_if 5, EventScript_19F877
+	goto_if_ne EventScript_19F877
 	special CheckForAlivePartyMons
 	compare RESULT, 0
-	goto_if 5, EventScript_19F870
+	goto_if_ne EventScript_19F870
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	goto EventScript_19F8F2
@@ -1011,7 +1010,7 @@ gUnknown_0819F8AE:: @ 819F8AE
 	goto_if_eq EventScript_19F8DD
 	special CheckForAlivePartyMons
 	compare RESULT, 0
-	goto_if 5, EventScript_19F8DE
+	goto_if_ne EventScript_19F8DE
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
@@ -1302,14 +1301,10 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
 	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
 	special sub_810FAA0
-	checkflag FLAG_RECEIVED_SS_TICKET
-	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62
-	checkflag FLAG_LATIOS_OR_LATIAS_ROAMING
-	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70
-	checkflag FLAG_RECEIVED_BELDUM
-	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
-	checkflag FLAG_RECEIVED_HM08
-	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
+	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_19FC62
+	call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_19FC70
+	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_19FC5A
+	call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_19FC5E
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
@@ -1337,10 +1332,8 @@ S_WhiteOut:: @ 819FC74
 	end
 
 EventScript_19FC84:
-	checkflag FLAG_RECEIVED_GO_GOGGLES
-	goto_if_eq Route101_EventScript_1A14DC
-	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
-	goto_if 0, Route101_EventScript_1A14DC
+	goto_if_set FLAG_RECEIVED_GO_GOGGLES, Route101_EventScript_1A14DC
+	goto_if_unset FLAG_DEFEATED_LAVARIDGE_GYM, Route101_EventScript_1A14DC
 	clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1
 	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
 	return
@@ -1403,16 +1396,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-	checkflag FLAG_RECEIVED_POKENAV
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49
-	checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
-	checkflag FLAG_HIDE_MR_BRINEY_ROUTE109
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55
+	goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
+	goto_if_unset FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, OldaleTown_PokemonCenter_1F_EventScript_19FD49
+	goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
+	goto_if_unset FLAG_HIDE_MR_BRINEY_ROUTE109, OldaleTown_PokemonCenter_1F_EventScript_19FD55
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49
@@ -1461,8 +1449,7 @@ do_heal_party:: @ 819FD7C
 	applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845
 	waitmovement 0
 	special ScrSpecial_HealPlayerParty
-	checkflag FLAG_POKERUS_EXPLAINED
-	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
+	goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
 	goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0
 	end
 
@@ -1510,9 +1497,9 @@ Std_ObtainItem_: @ 819FE07
 	checkitemtype VAR_SPECIAL_0
 	call GetItem_HandlePocket
 	compare VAR_SPECIAL_7, 0x1
-	call_if 1, Std_ObtainItem_Success
+	call_if_eq Std_ObtainItem_Success
 	compare VAR_SPECIAL_7, 0x0
-	call_if 1, Std_ObtainItem_Fail
+	call_if_eq Std_ObtainItem_Fail
 	return
 
 GetItem_HandlePocket:
@@ -1527,31 +1514,31 @@ GetItem_HandlePocket:
 GetItem_HandlePocket_Items:
 	bufferstdstring 2, 0xE
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetItemFanfare
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_KeyItems:
 	bufferstdstring 2, 0xF
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetItemFanfare
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_PokeBalls:
 	bufferstdstring 2, 0x10
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetItemFanfare
+	call_if_eq PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_TMsHMs:
 	bufferstdstring 2, 0x11
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetTMHMFanfare
+	call_if_eq PlayGetTMHMFanfare
 	return
 
 GetItem_HandlePocket_Berries:
 	bufferstdstring 2, 0x12
 	compare VAR_SPECIAL_7, 1
-	call_if 1, PlayGetItemFanfare
+	call_if_eq PlayGetItemFanfare
 	return
 
 Std_ObtainItem_Success: @ 819FEB7
@@ -1583,9 +1570,9 @@ Std_ObtainDecoration: @ 819FEDA
 Std_ObtainDecoration_: @ 819FEE8
 	bufferdecorationname 1, VAR_SPECIAL_0
 	compare VAR_SPECIAL_7, 1
-	call_if 1, Std_ObtainDecoration_Success
+	call_if_eq Std_ObtainDecoration_Success
 	compare VAR_SPECIAL_7, 0
-	call_if 1, Std_ObtainDecoration_Fail
+	call_if_eq Std_ObtainDecoration_Fail
 	return
 
 Std_ObtainDecoration_Success: @ 819FF03
@@ -1611,9 +1598,9 @@ Std_FindItem: @ 819FF21
 	checkitemtype VAR_SPECIAL_0
 	call GetItem_HandlePocket
 	compare VAR_SPECIAL_7, 1
-	call_if 1, Std_FindItem_Success
+	call_if_eq Std_FindItem_Success
 	compare VAR_SPECIAL_7, 0
-	call_if 1, Std_FindItem_Fail
+	call_if_eq Std_FindItem_Fail
 	release
 	return
 
@@ -1718,10 +1705,8 @@ EventScript_1A0070:
 
 EventScript_1A0085:
 	playse SE_PC_LOGON
-	checkflag FLAG_SYS_PC_LANETTE
-	call_if 0, EventScript_1A00AC
-	checkflag FLAG_SYS_PC_LANETTE
-	call_if 1, EventScript_1A00B5
+	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_1A00AC
+	call_if_set FLAG_SYS_PC_LANETTE, EventScript_1A00B5
 	msgbox UnknownString_81A0A35, 4
 	special ShowPokemonStorageSystem
 	waitstate
@@ -1744,8 +1729,7 @@ EventScript_1A00BE:
 	end
 
 EventScript_1A00CB:
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, EventScript_1A00BE
+	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A00BE
 	playse SE_PC_LOGON
 	special AccessHallOfFamePC
 	waitstate
@@ -2150,21 +2134,21 @@ Route103_EventScript_1A02F4:: @ 81A02F4
 	compare VAR_PETALBURG_GYM_STATE, 0
 	goto_if_eq Route101_EventScript_1A14DC
 	compare VAR_BIRCH_STATE, 0
-	call_if 1, Route101_EventScript_1A0358
+	call_if_eq Route101_EventScript_1A0358
 	compare VAR_BIRCH_STATE, 1
-	call_if 1, Route101_EventScript_1A0358
+	call_if_eq Route101_EventScript_1A0358
 	compare VAR_BIRCH_STATE, 2
-	call_if 1, Route101_EventScript_1A0365
+	call_if_eq Route101_EventScript_1A0365
 	compare VAR_BIRCH_STATE, 3
-	call_if 1, Route101_EventScript_1A0365
+	call_if_eq Route101_EventScript_1A0365
 	compare VAR_BIRCH_STATE, 4
-	call_if 1, Route101_EventScript_1A0372
+	call_if_eq Route101_EventScript_1A0372
 	compare VAR_BIRCH_STATE, 5
-	call_if 1, Route101_EventScript_1A0372
+	call_if_eq Route101_EventScript_1A0372
 	compare VAR_BIRCH_STATE, 6
-	call_if 1, Route101_EventScript_1A0358
+	call_if_eq Route101_EventScript_1A0358
 	compare VAR_BIRCH_STATE, 7
-	call_if 1, Route101_EventScript_1A0358
+	call_if_eq Route101_EventScript_1A0358
 	return
 
 Route101_EventScript_1A0358:: @ 81A0358
@@ -2291,9 +2275,9 @@ Movement_1A047A:
 BattleTower_Outside_EventScript_1A047C:: @ 81A047C
 SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
 	compare FACING, 1
-	call_if 1, BattleTower_Outside_EventScript_160B2F
+	call_if_eq BattleTower_Outside_EventScript_160B2F
 	compare FACING, 3
-	call_if 1, BattleTower_Outside_EventScript_160B3A
+	call_if_eq BattleTower_Outside_EventScript_160B3A
 	delay 30
 	hideobjectat 255, MAP_PETALBURG_CITY
 	call BattleTower_Outside_EventScript_1A040E
@@ -2461,19 +2445,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3
 	waitmoncry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
 	compare VAR_SPECIAL_4, 1
-	call_if 1, Route119_EventScript_1A0646
+	call_if_eq Route119_EventScript_1A0646
 	compare VAR_SPECIAL_4, 2
-	call_if 1, Route119_EventScript_1A064A
+	call_if_eq Route119_EventScript_1A064A
 	compare VAR_SPECIAL_4, 3
-	call_if 1, Route119_EventScript_1A064E
+	call_if_eq Route119_EventScript_1A064E
 	compare VAR_SPECIAL_4, 4
-	call_if 1, Route119_EventScript_1A0652
+	call_if_eq Route119_EventScript_1A0652
 	compare VAR_SPECIAL_4, 5
-	call_if 1, Route119_EventScript_1A0656
+	call_if_eq Route119_EventScript_1A0656
 	compare VAR_SPECIAL_4, 6
-	call_if 1, Route119_EventScript_1A065A
+	call_if_eq Route119_EventScript_1A065A
 	compare VAR_SPECIAL_4, 7
-	call_if 1, Route119_EventScript_1A065E
+	call_if_eq Route119_EventScript_1A065E
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -3944,8 +3928,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
 	end
 
 SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A3086
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3086
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
 	lock
@@ -3979,8 +3962,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
 	end
 
 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A3102
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3102
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
 	lock
@@ -4014,8 +3996,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
 	end
 
 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A317E
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A317E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
 	lock
@@ -4049,8 +4030,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
 	end
 
 SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A31FA
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A31FA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
 	lock
@@ -4084,8 +4064,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
 	end
 
 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A3276
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3276
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
 	lock
@@ -4119,8 +4098,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
 	end
 
 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A32F2
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A32F2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
 	lock
@@ -4154,8 +4132,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
 	end
 
 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A336E
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A336E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
 	lock
@@ -4189,8 +4166,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
 	end
 
 SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A33EA
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A33EA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
 	lock
@@ -4224,8 +4200,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
 	end
 
 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A3466
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3466
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
 	lock
@@ -4259,8 +4234,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
 	end
 
 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SecretBase_RedCave1_EventScript_1A34E2
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A34E2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
 	lock
@@ -4440,8 +4414,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0
 	compare RESULT, 1
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
 	copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
-	checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
+	goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
 	setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
 	msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO
 	compare RESULT, YES
@@ -4569,8 +4542,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_2
-	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E
+	goto_if_set FLAG_TEMP_2, FallarborTown_ContestLobby_EventScript_1AE17E
 	setvar VAR_SPECIAL_5, 6
 	special InterviewBefore
 	compare RESULT, 1
@@ -4630,7 +4602,7 @@ LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188
 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188
 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188
 	compare VAR_LINK_CONTEST_ROOM_STATE, 2
-	goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE
+	goto_if_ne FallarborTown_ContestLobby_EventScript_1AE1FE
 	setvar VAR_SPECIAL_5, 6
 	special InterviewBefore
 	compare RESULT, 1
@@ -4666,8 +4638,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE
 BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_2
-	goto_if_eq BattleTower_Lobby_EventScript_1AE2E3
+	goto_if_set FLAG_TEMP_2, BattleTower_Lobby_EventScript_1AE2E3
 	setvar VAR_SPECIAL_5, 7
 	special InterviewBefore
 	compare RESULT, 1
@@ -4686,9 +4657,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
 	multichoice 19, 8, 45, 1
 	copyvar VAR_SPECIAL_8, RESULT
 	compare RESULT, 0
-	call_if 1, BattleTower_Lobby_EventScript_1AE2A1
+	call_if_eq BattleTower_Lobby_EventScript_1AE2A1
 	compare RESULT, 1
-	call_if 1, BattleTower_Lobby_EventScript_1AE2AA
+	call_if_eq BattleTower_Lobby_EventScript_1AE2AA
 	msgbox BattleTower_Lobby_Text_1A79EB, 4
 	setvar VAR_SPECIAL_4, 12
 	copyvar VAR_SPECIAL_5, VAR_SPECIAL_9
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index a4a7513e5..f5ba25643 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -1,7 +1,6 @@
 S_CuttableTree:: @ 81B0DCC
 	lockall
-	checkflag FLAG_BADGE01_GET
-	goto_if 0, CannotUseCut
+	goto_if_unset FLAG_BADGE01_GET, CannotUseCut
 	checkpartymove MOVE_CUT
 	compare RESULT, 6
 	goto_if_eq CannotUseCut
@@ -58,8 +57,7 @@ CannotUseCutText: @ 81B0E8E
 
 S_BreakableRock:: @ 81B0EB7
 	lockall
-	checkflag FLAG_BADGE03_GET
-	goto_if 0, CannotUseRockSmash
+	goto_if_unset FLAG_BADGE03_GET, CannotUseRockSmash
 	checkpartymove MOVE_ROCK_SMASH
 	compare RESULT, 6
 	goto_if_eq CannotUseRockSmash
@@ -125,10 +123,8 @@ CannotUseRockSmashText: @ 81B0F90
 
 S_PushableBoulder:: @ 81B0FCB
 	lockall
-	checkflag FLAG_BADGE04_GET
-	goto_if 0, CannotUseStrength
-	checkflag FLAG_SYS_USE_STRENGTH
-	goto_if_eq AlreadyUsedStrength
+	goto_if_unset FLAG_BADGE04_GET, CannotUseStrength
+	goto_if_set FLAG_SYS_USE_STRENGTH, AlreadyUsedStrength
 	checkpartymove 70
 	compare RESULT, 6
 	goto_if_eq CannotUseStrength
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 334a52382..0e2012de9 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -174,8 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
-	checkflag FLAG_SYS_POKEDEX_GET
-	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342
+	goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4342
 	copyvar VAR_SPECIAL_7, LAST_TALKED
 	lock
 	faceplayer
@@ -282,7 +281,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C
 OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042
 	special CheckForAlivePartyMons
 	compare RESULT, 0
-	goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056
+	goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_1A4056
 	setvar VAR_SPECIAL_4, 2
 	return
 
@@ -346,8 +345,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
-	checkflag FLAG_SYS_POKEDEX_GET
-	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339
+	goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4339
 	copyvar VAR_SPECIAL_7, LAST_TALKED
 	lock
 	faceplayer
@@ -407,7 +405,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB
 	specialvar RESULT, CalculatePlayerPartyCount
 	compare RESULT, 2
-	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1
+	goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_1A41E1
 	specialvar RESULT, GetNameOfEnigmaBerryInPlayerParty
 	compare RESULT, 1
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE
@@ -443,8 +441,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
-	checkflag FLAG_VISITED_MAUVILLE_CITY
-	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B
+	goto_if_unset FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_1A434B
 	copyvar VAR_SPECIAL_7, LAST_TALKED
 	lock
 	faceplayer
@@ -691,7 +688,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418
 	special sub_80B929C
 	waitstate
 	compare VAR_TEMP_1, 0
-	goto_if 5, RecordCorner_EventScript_1A446C
+	goto_if_ne RecordCorner_EventScript_1A446C
 	end
 
 RecordCorner_EventScript_1A442D:: @ 81A442D
@@ -699,7 +696,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D
 	special sub_80B929C
 	waitstate
 	compare VAR_TEMP_1, 0
-	goto_if 5, RecordCorner_EventScript_1A446C
+	goto_if_ne RecordCorner_EventScript_1A446C
 	end
 
 RecordCorner_EventScript_1A4442:: @ 81A4442
@@ -707,7 +704,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442
 	special sub_80B929C
 	waitstate
 	compare VAR_TEMP_1, 0
-	goto_if 5, RecordCorner_EventScript_1A446C
+	goto_if_ne RecordCorner_EventScript_1A446C
 	end
 
 RecordCorner_EventScript_1A4457:: @ 81A4457
@@ -715,7 +712,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457
 	special sub_80B929C
 	waitstate
 	compare VAR_TEMP_1, 0
-	goto_if 5, RecordCorner_EventScript_1A446C
+	goto_if_ne RecordCorner_EventScript_1A446C
 	end
 
 RecordCorner_EventScript_1A446C:: @ 81A446C
@@ -771,7 +768,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD
 
 RecordCorner_EventScript_1A44BC:: @ 81A44BC
 	compare VAR_TEMP_0, 0
-	goto_if 5, RecordCorner_EventScript_1A44D6
+	goto_if_ne RecordCorner_EventScript_1A44D6
 	special sub_8064EAC
 	message RecordCorner_Text_1A4DD7
 	waitmessage
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index af2c39979..7f0f6b710 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -6,11 +6,10 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92
 	faceplayer
 	checkitem ITEM_CONTEST_PASS, 1
 	compare RESULT, 0
-	call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD
+	call_if_eq FallarborTown_ContestLobby_EventScript_1A4EDD
 	compare VAR_CONTEST_PRIZE_PICKUP, 0
-	goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E
-	checkflag FLAG_TEMP_1
-	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F
+	goto_if_ne FallarborTown_ContestLobby_EventScript_1A4F4E
+	goto_if_set FLAG_TEMP_1, FallarborTown_ContestLobby_EventScript_1A4F8F
 	bufferstdstring 0, VAR_SPECIAL_B
 	msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4
 	checkitem ITEM_CONTEST_PASS, 1
@@ -40,8 +39,7 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13
-	checkflag FLAG_RECEIVED_CONTEST_PASS
-	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44
+	goto_if_set FLAG_RECEIVED_CONTEST_PASS, FallarborTown_ContestLobby_EventScript_1A4F44
 	msgbox FallarborTown_ContestLobby_Text_1A6583, 4
 	giveitem_std ITEM_CONTEST_PASS
 	setflag FLAG_RECEIVED_CONTEST_PASS
@@ -288,7 +286,7 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A
 	call LinkContestRoom1_EventScript_1A5880
 	addvar VAR_SPECIAL_6, 1
 	compare VAR_SPECIAL_6, 4
-	goto_if 5, LinkContestRoom1_EventScript_1A527A
+	goto_if_ne LinkContestRoom1_EventScript_1A527A
 	call LinkContestRoom1_EventScript_1A5377
 	setvar VAR_TEMP_1, 6
 	return
@@ -432,15 +430,15 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5
 LinkContestRoom1_EventScript_1A5455:: @ 81A5455
 	special sub_80C47A0
 	compare VAR_CONTEST_LOCATION, 1
-	call_if 1, LinkContestRoom1_EventScript_1A555A
+	call_if_eq LinkContestRoom1_EventScript_1A555A
 	compare VAR_CONTEST_LOCATION, 2
-	call_if 1, LinkContestRoom1_EventScript_1A55B8
+	call_if_eq LinkContestRoom1_EventScript_1A55B8
 	compare VAR_CONTEST_LOCATION, 3
-	call_if 1, LinkContestRoom1_EventScript_1A5616
+	call_if_eq LinkContestRoom1_EventScript_1A5616
 	compare VAR_CONTEST_LOCATION, 4
-	call_if 1, LinkContestRoom1_EventScript_1A5674
+	call_if_eq LinkContestRoom1_EventScript_1A5674
 	compare VAR_CONTEST_LOCATION, 5
-	call_if 1, LinkContestRoom1_EventScript_1A56D2
+	call_if_eq LinkContestRoom1_EventScript_1A56D2
 	setvar VAR_TEMP_1, 9
 	setvar VAR_TEMP_2, 9
 	setvar VAR_TEMP_3, 9
@@ -450,7 +448,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455
 	setvar VAR_TEMP_7, 9
 	setvar VAR_TEMP_8, 9
 	compare VAR_TEMP_0, 0
-	call_if 2, LinkContestRoom1_EventScript_1A54EB
+	call_if_gt LinkContestRoom1_EventScript_1A54EB
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -465,123 +463,123 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB
 	setvar RESULT, 8
 	special ScriptRandom
 	compare RESULT, 0
-	call_if 1, LinkContestRoom1_EventScript_1A5760
+	call_if_eq LinkContestRoom1_EventScript_1A5760
 	compare RESULT, 1
-	call_if 1, LinkContestRoom1_EventScript_1A5784
+	call_if_eq LinkContestRoom1_EventScript_1A5784
 	compare RESULT, 2
-	call_if 1, LinkContestRoom1_EventScript_1A57A8
+	call_if_eq LinkContestRoom1_EventScript_1A57A8
 	compare RESULT, 3
-	call_if 1, LinkContestRoom1_EventScript_1A57CC
+	call_if_eq LinkContestRoom1_EventScript_1A57CC
 	compare RESULT, 4
-	call_if 1, LinkContestRoom1_EventScript_1A57F0
+	call_if_eq LinkContestRoom1_EventScript_1A57F0
 	compare RESULT, 5
-	call_if 1, LinkContestRoom1_EventScript_1A5814
+	call_if_eq LinkContestRoom1_EventScript_1A5814
 	compare RESULT, 6
-	call_if 1, LinkContestRoom1_EventScript_1A5838
+	call_if_eq LinkContestRoom1_EventScript_1A5838
 	compare RESULT, 7
-	call_if 1, LinkContestRoom1_EventScript_1A585C
+	call_if_eq LinkContestRoom1_EventScript_1A585C
 	compare VAR_TEMP_0, 0
-	goto_if 2, LinkContestRoom1_EventScript_1A54EB
+	goto_if_gt LinkContestRoom1_EventScript_1A54EB
 	waitmovement 0
 	return
 
 LinkContestRoom1_EventScript_1A555A:: @ 81A555A
 	compare VAR_SPECIAL_4, 80
-	goto_if 2, LinkContestRoom1_EventScript_1A575A
+	goto_if_gt LinkContestRoom1_EventScript_1A575A
 	compare VAR_SPECIAL_4, 70
-	goto_if 2, LinkContestRoom1_EventScript_1A5754
+	goto_if_gt LinkContestRoom1_EventScript_1A5754
 	compare VAR_SPECIAL_4, 60
-	goto_if 2, LinkContestRoom1_EventScript_1A574E
+	goto_if_gt LinkContestRoom1_EventScript_1A574E
 	compare VAR_SPECIAL_4, 50
-	goto_if 2, LinkContestRoom1_EventScript_1A5748
+	goto_if_gt LinkContestRoom1_EventScript_1A5748
 	compare VAR_SPECIAL_4, 40
-	goto_if 2, LinkContestRoom1_EventScript_1A5742
+	goto_if_gt LinkContestRoom1_EventScript_1A5742
 	compare VAR_SPECIAL_4, 30
-	goto_if 2, LinkContestRoom1_EventScript_1A573C
+	goto_if_gt LinkContestRoom1_EventScript_1A573C
 	compare VAR_SPECIAL_4, 20
-	goto_if 2, LinkContestRoom1_EventScript_1A5736
+	goto_if_gt LinkContestRoom1_EventScript_1A5736
 	compare VAR_SPECIAL_4, 10
-	goto_if 2, LinkContestRoom1_EventScript_1A5730
+	goto_if_gt LinkContestRoom1_EventScript_1A5730
 	setvar VAR_TEMP_0, 0
 	return
 
 LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8
 	compare VAR_SPECIAL_4, 230
-	goto_if 2, LinkContestRoom1_EventScript_1A575A
+	goto_if_gt LinkContestRoom1_EventScript_1A575A
 	compare VAR_SPECIAL_4, 210
-	goto_if 2, LinkContestRoom1_EventScript_1A5754
+	goto_if_gt LinkContestRoom1_EventScript_1A5754
 	compare VAR_SPECIAL_4, 190
-	goto_if 2, LinkContestRoom1_EventScript_1A574E
+	goto_if_gt LinkContestRoom1_EventScript_1A574E
 	compare VAR_SPECIAL_4, 170
-	goto_if 2, LinkContestRoom1_EventScript_1A5748
+	goto_if_gt LinkContestRoom1_EventScript_1A5748
 	compare VAR_SPECIAL_4, 150
-	goto_if 2, LinkContestRoom1_EventScript_1A5742
+	goto_if_gt LinkContestRoom1_EventScript_1A5742
 	compare VAR_SPECIAL_4, 130
-	goto_if 2, LinkContestRoom1_EventScript_1A573C
+	goto_if_gt LinkContestRoom1_EventScript_1A573C
 	compare VAR_SPECIAL_4, 110
-	goto_if 2, LinkContestRoom1_EventScript_1A5736
+	goto_if_gt LinkContestRoom1_EventScript_1A5736
 	compare VAR_SPECIAL_4, 90
-	goto_if 2, LinkContestRoom1_EventScript_1A5730
+	goto_if_gt LinkContestRoom1_EventScript_1A5730
 	setvar VAR_TEMP_0, 0
 	return
 
 LinkContestRoom1_EventScript_1A5616:: @ 81A5616
 	compare VAR_SPECIAL_4, 380
-	goto_if 2, LinkContestRoom1_EventScript_1A575A
+	goto_if_gt LinkContestRoom1_EventScript_1A575A
 	compare VAR_SPECIAL_4, 350
-	goto_if 2, LinkContestRoom1_EventScript_1A5754
+	goto_if_gt LinkContestRoom1_EventScript_1A5754
 	compare VAR_SPECIAL_4, 320
-	goto_if 2, LinkContestRoom1_EventScript_1A574E
+	goto_if_gt LinkContestRoom1_EventScript_1A574E
 	compare VAR_SPECIAL_4, 290
-	goto_if 2, LinkContestRoom1_EventScript_1A5748
+	goto_if_gt LinkContestRoom1_EventScript_1A5748
 	compare VAR_SPECIAL_4, 260
-	goto_if 2, LinkContestRoom1_EventScript_1A5742
+	goto_if_gt LinkContestRoom1_EventScript_1A5742
 	compare VAR_SPECIAL_4, 230
-	goto_if 2, LinkContestRoom1_EventScript_1A573C
+	goto_if_gt LinkContestRoom1_EventScript_1A573C
 	compare VAR_SPECIAL_4, 200
-	goto_if 2, LinkContestRoom1_EventScript_1A5736
+	goto_if_gt LinkContestRoom1_EventScript_1A5736
 	compare VAR_SPECIAL_4, 170
-	goto_if 2, LinkContestRoom1_EventScript_1A5730
+	goto_if_gt LinkContestRoom1_EventScript_1A5730
 	setvar VAR_TEMP_0, 0
 	return
 
 LinkContestRoom1_EventScript_1A5674:: @ 81A5674
 	compare VAR_SPECIAL_4, 600
-	goto_if 2, LinkContestRoom1_EventScript_1A575A
+	goto_if_gt LinkContestRoom1_EventScript_1A575A
 	compare VAR_SPECIAL_4, 560
-	goto_if 2, LinkContestRoom1_EventScript_1A5754
+	goto_if_gt LinkContestRoom1_EventScript_1A5754
 	compare VAR_SPECIAL_4, 520
-	goto_if 2, LinkContestRoom1_EventScript_1A574E
+	goto_if_gt LinkContestRoom1_EventScript_1A574E
 	compare VAR_SPECIAL_4, 480
-	goto_if 2, LinkContestRoom1_EventScript_1A5748
+	goto_if_gt LinkContestRoom1_EventScript_1A5748
 	compare VAR_SPECIAL_4, 440
-	goto_if 2, LinkContestRoom1_EventScript_1A5742
+	goto_if_gt LinkContestRoom1_EventScript_1A5742
 	compare VAR_SPECIAL_4, 400
-	goto_if 2, LinkContestRoom1_EventScript_1A573C
+	goto_if_gt LinkContestRoom1_EventScript_1A573C
 	compare VAR_SPECIAL_4, 360
-	goto_if 2, LinkContestRoom1_EventScript_1A5736
+	goto_if_gt LinkContestRoom1_EventScript_1A5736
 	compare VAR_SPECIAL_4, 320
-	goto_if 2, LinkContestRoom1_EventScript_1A5730
+	goto_if_gt LinkContestRoom1_EventScript_1A5730
 	setvar VAR_TEMP_0, 0
 	return
 
 LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2
 	compare VAR_SPECIAL_4, 600
-	goto_if 2, LinkContestRoom1_EventScript_1A575A
+	goto_if_gt LinkContestRoom1_EventScript_1A575A
 	compare VAR_SPECIAL_4, 550
-	goto_if 2, LinkContestRoom1_EventScript_1A5754
+	goto_if_gt LinkContestRoom1_EventScript_1A5754
 	compare VAR_SPECIAL_4, 500
-	goto_if 2, LinkContestRoom1_EventScript_1A574E
+	goto_if_gt LinkContestRoom1_EventScript_1A574E
 	compare VAR_SPECIAL_4, 450
-	goto_if 2, LinkContestRoom1_EventScript_1A5748
+	goto_if_gt LinkContestRoom1_EventScript_1A5748
 	compare VAR_SPECIAL_4, 400
-	goto_if 2, LinkContestRoom1_EventScript_1A5742
+	goto_if_gt LinkContestRoom1_EventScript_1A5742
 	compare VAR_SPECIAL_4, 300
-	goto_if 2, LinkContestRoom1_EventScript_1A573C
+	goto_if_gt LinkContestRoom1_EventScript_1A573C
 	compare VAR_SPECIAL_4, 200
-	goto_if 2, LinkContestRoom1_EventScript_1A5736
+	goto_if_gt LinkContestRoom1_EventScript_1A5736
 	compare VAR_SPECIAL_4, 100
-	goto_if 2, LinkContestRoom1_EventScript_1A5730
+	goto_if_gt LinkContestRoom1_EventScript_1A5730
 	setvar VAR_TEMP_0, 0
 	return
 
@@ -909,7 +907,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90
 	addvar VAR_TEMP_1, 1
 	lockall
 	compare VAR_CONTEST_LOCATION, 1
-	call_if 2, LinkContestRoom1_EventScript_1A5AE4
+	call_if_gt LinkContestRoom1_EventScript_1A5AE4
 	applymovement 9, LinkContestRoom1_Movement_1A5DB7
 	applymovement 12, LinkContestRoom1_Movement_1A5DBB
 	applymovement 7, LinkContestRoom1_Movement_1A5DB7
@@ -919,7 +917,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90
 	applymovement 6, LinkContestRoom1_Movement_1A5DB3
 	applymovement 8, LinkContestRoom1_Movement_1A5DAF
 	compare VAR_TEMP_1, 4
-	goto_if 5, LinkContestRoom1_EventScript_1A5A90
+	goto_if_ne LinkContestRoom1_EventScript_1A5A90
 	delay 30
 	return
 
@@ -996,8 +994,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A5C4C
 	call LinkContestRoom1_EventScript_1A5C12
-	checkflag FLAG_TEMP_2
-	goto_if_eq LinkContestRoom1_EventScript_1A5BF6
+	goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_1A5BF6
 	msgbox LinkContestRoom1_Text_1A6DC5, 3
 	waitmessage
 	call LinkContestRoom1_EventScript_1A5C7F
@@ -1118,7 +1115,7 @@ LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5
 
 LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC
 	compare VAR_CONTEST_LOCATION, 2
-	call_if 1, LinkContestRoom1_EventScript_1A5C42
+	call_if_eq LinkContestRoom1_EventScript_1A5C42
 	incrementgamestat GAME_STAT_WON_CONTEST
 	specialvar RESULT, sub_80C4440
 	compare RESULT, 0
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 0d0d83801..fc5df6abe 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -29,7 +29,7 @@ Route117_EventScript_1B2262:: @ 81B2262
 Route117_EventScript_1B2298:: @ 81B2298
 	specialvar RESULT, CalculatePlayerPartyCount
 	compare RESULT, 6
-	goto_if 5, Route117_EventScript_1B22B2
+	goto_if_ne Route117_EventScript_1B22B2
 	msgbox Route117_Text_1B2766, 4
 	release
 	end
@@ -49,7 +49,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2
 Route117_EventScript_1B22CD:: @ 81B22CD
 	specialvar RESULT, sub_8042B4C
 	compare RESULT, 1
-	call_if 1, Route117_EventScript_1B22DE
+	call_if_eq Route117_EventScript_1B22DE
 	return
 
 Route117_EventScript_1B22DE:: @ 81B22DE
@@ -155,7 +155,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411
 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A
 	specialvar RESULT, GetNumLevelsGainedFromDaycare
 	compare RESULT, 0
-	call_if 5, Route117_PokemonDayCare_EventScript_1B2411
+	call_if_ne Route117_PokemonDayCare_EventScript_1B2411
 	return
 
 Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index ad7a3d3c5..5ddcf4a65 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -203,13 +203,12 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2
 	special GabbyAndTyBeforeInterview
 	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
 	compare FACING, 2
-	call_if 1, Route111_EventScript_1AE5E0
+	call_if_eq Route111_EventScript_1AE5E0
 	compare FACING, 1
-	call_if 1, Route111_EventScript_1AE5EB
+	call_if_eq Route111_EventScript_1AE5EB
 	compare FACING, 4
-	call_if 1, Route111_EventScript_1AE5FD
-	checkflag FLAG_TEMP_1
-	goto_if_eq Route111_EventScript_1AE73A
+	call_if_eq Route111_EventScript_1AE5FD
+	goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A
 	msgbox Route111_Text_1AC015, MSGBOX_YESNO
 	goto Route111_EventScript_1AE6F3
 	end
@@ -237,13 +236,12 @@ Route120_EventScript_1AE60F:: @ 81AE60F
 	special GabbyAndTyBeforeInterview
 	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
 	compare FACING, 2
-	call_if 1, Route111_EventScript_1AE5E0
+	call_if_eq Route111_EventScript_1AE5E0
 	compare FACING, 1
-	call_if 1, Route111_EventScript_1AE5EB
+	call_if_eq Route111_EventScript_1AE5EB
 	compare FACING, 4
-	call_if 1, Route111_EventScript_1AE5FD
-	checkflag FLAG_TEMP_1
-	goto_if_eq Route111_EventScript_1AE73A
+	call_if_eq Route111_EventScript_1AE5FD
+	goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A
 	specialvar RESULT, GabbyAndTyGetLastQuote
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1AE69F
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index 11f42daf0..ed81e6628 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -1,10 +1,8 @@
 MtChimney_EventScript_1B2C95:: @ 81B2C95
 	lock
 	faceplayer
-	checkflag FLAG_EVIL_LEADER_PLEASE_STOP
-	call_if 0, MtChimney_EventScript_1B2CB9
-	checkflag FLAG_EVIL_LEADER_PLEASE_STOP
-	call_if 1, MtChimney_EventScript_1B2CC2
+	call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CB9
+	call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CC2
 	closemessage
 	applymovement 1, MtChimney_Movement_1A083D
 	waitmovement 0
@@ -68,9 +66,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	setobjectxyperm 1, 10, 12
 	addobject 1
 	compare FACING, 4
-	call_if 1, MtChimney_EventScript_1B2D7D
+	call_if_eq MtChimney_EventScript_1B2D7D
 	compare FACING, 2
-	call_if 1, MtChimney_EventScript_1B2D88
+	call_if_eq MtChimney_EventScript_1B2D88
 	applymovement 255, MtChimney_Movement_1A083F
 	waitmovement 0
 	.ifdef SAPPHIRE
@@ -80,9 +78,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	.endif
 	closemessage
 	compare FACING, 4
-	call_if 1, MtChimney_EventScript_1B2D93
+	call_if_eq MtChimney_EventScript_1B2D93
 	compare FACING, 2
-	call_if 1, MtChimney_EventScript_1B2D9E
+	call_if_eq MtChimney_EventScript_1B2D9E
 	removeobject 1
 	setflag FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
 	setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
index 2430ba4af..22c76847a 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
@@ -4,13 +4,11 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4
 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5
 	lock
 	faceplayer
-	checkflag FLAG_EXCHANGED_SCANNER
-	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D
+	goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_15EB2D
 	checkitem ITEM_SCANNER, 1
 	compare RESULT, 1
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23
-	checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2
-	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D
+	goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D
 	msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4
 	release
 	end
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
index b4d29632e..c34f2c28b 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
@@ -8,10 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A
 	end
 
 AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3
-	checkflag FLAG_USED_STORAGE_KEY
-	call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6
-	checkflag FLAG_USED_STORAGE_KEY
-	call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0
+	call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9B6
+	call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9C0
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6
@@ -28,8 +26,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA
 
 AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3
 	lockall
-	checkflag FLAG_USED_STORAGE_KEY
-	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14
+	goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15EA14
 	checkitem ITEM_STORAGE_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
index 7b61190e5..e8e48a6f6 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
@@ -8,22 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51
 	end
 
 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A
-	checkflag FLAG_USED_ROOM_1_KEY
-	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB
-	checkflag FLAG_USED_ROOM_2_KEY
-	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5
-	checkflag FLAG_USED_ROOM_4_KEY
-	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF
-	checkflag FLAG_USED_ROOM_6_KEY
-	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9
-	checkflag FLAG_USED_ROOM_1_KEY
-	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
-	checkflag FLAG_USED_ROOM_2_KEY
-	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
-	checkflag FLAG_USED_ROOM_4_KEY
-	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
-	checkflag FLAG_USED_ROOM_6_KEY
-	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
+	call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB
+	call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5
+	call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF
+	call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9
+	call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
+	call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
+	call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
+	call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3
@@ -60,8 +52,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
 	lockall
-	checkflag FLAG_USED_ROOM_1_KEY
-	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
+	goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_1_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF
@@ -76,8 +67,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
 	lockall
-	checkflag FLAG_USED_ROOM_2_KEY
-	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
+	goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_2_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9
@@ -92,8 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
 	lockall
-	checkflag FLAG_USED_ROOM_4_KEY
-	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
+	goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_4_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3
@@ -108,8 +97,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98
 	lockall
-	checkflag FLAG_USED_ROOM_6_KEY
-	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
+	goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_6_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
index 9ad419da1..7f9b06500 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
@@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11
 	getplayerxy VAR_TEMP_2, VAR_TEMP_3
 	setvar VAR_TEMP_4, 1
 	compare VAR_TEMP_2, 21
-	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89
 	compare VAR_TEMP_2, 36
-	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F
 	compare VAR_TEMP_3, 2
-	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95
 	switch VAR_TEMP_4
 	case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B
 	case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4
@@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
 	dofieldeffect 54
 	specialvar RESULT, FoundAbandonedShipRoom4Key
 	compare RESULT, 0
-	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B
 	waitfieldeffect 54
 	delay 10
 	end
@@ -59,7 +59,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5
 	goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA
 	delay 20
 	compare RESULT, 0
-	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B
 	waitfieldeffect 54
 	delay 10
 	end
@@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
 	dofieldeffect 54
 	specialvar RESULT, FoundAbandonedShipRoom6Key
 	compare RESULT, 0
-	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B
 	waitfieldeffect 54
 	delay 10
 	end
@@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
 	dofieldeffect 54
 	specialvar RESULT, FoundAbandonedShipRoom2Key
 	compare RESULT, 0
-	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B
 	waitfieldeffect 54
 	delay 10
 	end
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index b849f41ba..8ff39c0a4 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -5,8 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE
 	.byte 0
 
 AncientTomb_MapScript1_15EFCE:: @ 815EFCE
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, AncientTomb_EventScript_15EFD8
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_15EFD8
 	end
 
 AncientTomb_EventScript_15EFD8:: @ 815EFD8
@@ -18,8 +17,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC
 	end
 
 AncientTomb_MapScript1_15EFE0:: @ 815EFE0
-	checkflag FLAG_SYS_BRAILLE_FLY
-	call_if 0, AncientTomb_EventScript_15EFEA
+	call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15EFEA
 	end
 
 AncientTomb_EventScript_15EFEA:: @ 815EFEA
@@ -33,8 +31,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA
 
 AncientTomb_EventScript_15F021:: @ 815F021
 	lockall
-	checkflag FLAG_SYS_BRAILLE_FLY
-	goto_if_eq AncientTomb_EventScript_15F038
+	goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15F038
 	braillemessage AncientTomb_Braille_1C552E
 	waitbuttonpress
 	erasebox 0, 0, 29, 19
diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc
index 028a0ee7b..ee49ba695 100644
--- a/data/scripts/maps/AquaHideout_1F.inc
+++ b/data/scripts/maps/AquaHideout_1F.inc
@@ -10,8 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE
 MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE
 	lock
 	faceplayer
-	checkflag FLAG_MT_PYRE_ORB_STOLEN
-	goto_if_eq AquaHideout_1F_EventScript_15D7E3
+	goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D7E3
 	msgbox AquaHideout_1F_Text_196AFD, 4
 	release
 	end
@@ -25,8 +24,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED
 MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED
 	lock
 	faceplayer
-	checkflag FLAG_MT_PYRE_ORB_STOLEN
-	goto_if_eq AquaHideout_1F_EventScript_15D802
+	goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D802
 	msgbox AquaHideout_1F_Text_196C83, 4
 	release
 	end
diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc
index 82d0c10c5..3be8d487d 100644
--- a/data/scripts/maps/AquaHideout_B1F.inc
+++ b/data/scripts/maps/AquaHideout_B1F.inc
@@ -4,8 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831
 	.byte 0
 
 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, AquaHideout_B1F_EventScript_15D846
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_15D846
 	end
 
 AquaHideout_B1F_EventScript_15D846:: @ 815D846
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 14b85c5b0..57eb62dfe 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -13,13 +13,11 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293
 BattleTower_Lobby_EventScript_16029C:: @ 816029C
 	setvar VAR_SPECIAL_4, 10
 	special SetBattleTowerProperty
-	checkflag FLAG_RECEIVED_GOLD_SHIELD
-	goto_if_eq BattleTower_Lobby_EventScript_1602E4
-	checkflag FLAG_RECEIVED_SILVER_SHIELD
-	goto_if_eq BattleTower_Lobby_EventScript_1602CD
+	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4
+	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD
 	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
 	compare VAR_SPECIAL_7, 50
-	goto_if 0, BattleTower_Lobby_EventScript_1602E4
+	goto_if_lt BattleTower_Lobby_EventScript_1602E4
 	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
 	special sub_810F8FC
 	return
@@ -27,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C
 BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
 	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
 	compare VAR_SPECIAL_7, 100
-	goto_if 0, BattleTower_Lobby_EventScript_1602E4
+	goto_if_lt BattleTower_Lobby_EventScript_1602E4
 	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
 	special sub_810F8FC
 	return
@@ -119,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
 	setvar VAR_SPECIAL_4, 9
 	special BattleTowerUtil
 	compare RESULT, 49
-	goto_if 5, BattleTower_Lobby_EventScript_1603F8
+	goto_if_ne BattleTower_Lobby_EventScript_1603F8
 	msgbox BattleTower_Lobby_Text_19A617, 4
 
 BattleTower_Lobby_EventScript_1603F8:: @ 81603F8
@@ -387,10 +385,8 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727
 BattleTower_Lobby_EventScript_160733:: @ 8160733
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_GOLD_SHIELD
-	goto_if_eq BattleTower_Lobby_EventScript_1607C5
-	checkflag FLAG_RECEIVED_SILVER_SHIELD
-	goto_if_eq BattleTower_Lobby_EventScript_160773
+	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5
+	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773
 	msgbox BattleTower_Lobby_Text_19A9EE, 4
 	setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD
 	givedecoration_std DECOR_SILVER_SHIELD
@@ -404,7 +400,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733
 BattleTower_Lobby_EventScript_160773:: @ 8160773
 	specialvar RESULT, GetBestBattleTowerStreak
 	compare RESULT, 100
-	goto_if 0, BattleTower_Lobby_EventScript_1607C5
+	goto_if_lt BattleTower_Lobby_EventScript_1607C5
 	msgbox BattleTower_Lobby_Text_19AAC4, 4
 	setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD
 	givedecoration_std DECOR_GOLD_SHIELD
diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc
index 6411aad49..58c6563f6 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.inc
+++ b/data/scripts/maps/CaveOfOrigin_1F.inc
@@ -3,6 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C
 	.byte 0
 
 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	call_if 1, CaveOfOrigin_1F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_1F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc
index b8d4149b6..c79eb088e 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B1F.inc
@@ -3,6 +3,5 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C
 	.byte 0
 
 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B1F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc
index 9b014d0e9..66b02ee9f 100644
--- a/data/scripts/maps/CaveOfOrigin_B2F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B2F.inc
@@ -3,6 +3,5 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C
 	.byte 0
 
 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B2F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc
index d6f7bdaf1..8084ceb43 100644
--- a/data/scripts/maps/CaveOfOrigin_B3F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B3F.inc
@@ -3,6 +3,5 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C
 	.byte 0
 
 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B3F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index 315dda886..aa79e1213 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -4,8 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC
 	.byte 0
 
 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, CaveOfOrigin_B4F_EventScript_15DDC1
 	end
 
 CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1
@@ -19,8 +18,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
 	setmaplayoutindex 313
 	.endif
 	call CaveOfOrigin_B4F_EventScript_1A01B5
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3
 	end
 
 CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
@@ -67,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar RESULT, GetBattleOutcome
 	compare RESULT, 1
-	call_if 1, CaveOfOrigin_B4F_EventScript_15DE73
+	call_if_eq CaveOfOrigin_B4F_EventScript_15DE73
 	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
 	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
 	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index 7aa56a82d..2627a8261 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -5,8 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3
 	.byte 0
 
 DesertRuins_MapScript1_15CB03:: @ 815CB03
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, DesertRuins_EventScript_15CB0D
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_15CB0D
 	end
 
 DesertRuins_EventScript_15CB0D:: @ 815CB0D
@@ -14,8 +13,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D
 	return
 
 DesertRuins_MapScript1_15CB11:: @ 815CB11
-	checkflag FLAG_SYS_BRAILLE_STRENGTH
-	call_if 0, DesertRuins_EventScript_15CB1B
+	call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB1B
 	end
 
 DesertRuins_EventScript_15CB1B:: @ 815CB1B
@@ -33,8 +31,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52
 
 DesertRuins_EventScript_15CB56:: @ 815CB56
 	lockall
-	checkflag FLAG_SYS_BRAILLE_STRENGTH
-	goto_if_eq DesertRuins_EventScript_15CB6D
+	goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB6D
 	braillemessage DesertRuins_Braille_1C54C8
 	waitbuttonpress
 	erasebox 0, 0, 29, 19
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
index 50c9d8991..e7aeccbd0 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/scripts/maps/DewfordTown.inc
@@ -9,8 +9,7 @@ DewfordTown_MapScript1_14DFFE:: @ 814DFFE
 DewfordTown_EventScript_14E002:: @ 814E002
 	lock
 	faceplayer
-	checkflag FLAG_DELIVERED_STEVEN_LETTER
-	goto_if 0, DewfordTown_EventScript_14E076
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_14E076
 	message DewfordTown_Text_16B522
 	waitmessage
 	multichoicedefault 21, 6, 0, 2, 0
@@ -74,8 +73,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD
 DewfordTown_EventScript_14E0C6:: @ 814E0C6
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_OLD_ROD
-	goto_if_eq DewfordTown_EventScript_14E11B
+	goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B
 	msgbox DewfordTown_Text_16B665, MSGBOX_YESNO
 	compare RESULT, YES
 	goto_if_eq DewfordTown_EventScript_14E0F0
@@ -176,10 +174,8 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	hideobjectat 4, MAP_DEWFORD_TOWN
-	checkflag FLAG_DELIVERED_DEVON_GOODS
-	call_if 0, DewfordTown_EventScript_14E281
-	checkflag FLAG_DELIVERED_DEVON_GOODS
-	call_if 1, DewfordTown_EventScript_14E28A
+	call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281
+	call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A
 	closemessage
 	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
 	resetobjectpriority 255, MAP_DEWFORD_TOWN
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc
index ba933dbe9..7cdf3dd6a 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -7,8 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B
 	end
 
 DewfordTown_Gym_EventScript_153071:: @ 8153071
-	checktrainerflag OPPONENT_BRAWLY
-	goto_if_eq DewfordTown_Gym_EventScript_1530AA
+	goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA
 	call DewfordTown_Gym_EventScript_153122
 	copyvar VAR_SPECIAL_1, VAR_SPECIAL_0
 	compare VAR_SPECIAL_0, 0
@@ -81,18 +80,15 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117
 
 DewfordTown_Gym_EventScript_153122:: @ 8153122
 	setvar VAR_SPECIAL_0, 0
-	checktrainerflag OPPONENT_HIDEKI
-	goto_if 0, DewfordTown_Gym_EventScript_153135
+	goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135
 	addvar VAR_SPECIAL_0, 1
 
 DewfordTown_Gym_EventScript_153135:: @ 8153135
-	checktrainerflag OPPONENT_TESSA
-	goto_if 0, DewfordTown_Gym_EventScript_153143
+	goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143
 	addvar VAR_SPECIAL_0, 1
 
 DewfordTown_Gym_EventScript_153143:: @ 8153143
-	checktrainerflag OPPONENT_LAURA
-	goto_if 0, DewfordTown_Gym_EventScript_153151
+	goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151
 	addvar VAR_SPECIAL_0, 1
 
 DewfordTown_Gym_EventScript_153151:: @ 8153151
@@ -100,8 +96,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151
 
 DewfordTown_Gym_EventScript_153152:: @ 8153152
 	trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177
-	checkflag FLAG_RECEIVED_TM08
-	goto_if 0, DewfordTown_Gym_EventScript_1531B5
+	goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5
 	msgbox DewfordTown_Gym_Text_175412, 4
 	release
 	end
@@ -116,7 +111,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	setflag FLAG_BADGE02_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if 1, DewfordTown_Gym_EventScript_1A00FB
+	call_if_eq DewfordTown_Gym_EventScript_1A00FB
 	setvar VAR_SPECIAL_8, 2
 	call DewfordTown_Gym_EventScript_1A01C0
 	goto DewfordTown_Gym_EventScript_1531B5
@@ -164,8 +159,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238
 DewfordTown_Gym_EventScript_15323F:: @ 815323F
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_DEWFORD_GYM
-	goto_if_eq DewfordTown_Gym_EventScript_153254
+	goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_153254
 	msgbox DewfordTown_Gym_Text_174D98, 4
 	release
 	end
@@ -177,15 +171,13 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254
 
 DewfordTown_Gym_EventScript_15325E:: @ 815325E
 	lockall
-	checkflag FLAG_BADGE02_GET
-	goto_if_eq DewfordTown_Gym_EventScript_15327E
+	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E
 	goto DewfordTown_Gym_EventScript_153288
 	end
 
 DewfordTown_Gym_EventScript_15326E:: @ 815326E
 	lockall
-	checkflag FLAG_BADGE02_GET
-	goto_if_eq DewfordTown_Gym_EventScript_15327E
+	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E
 	goto DewfordTown_Gym_EventScript_153288
 	end
 
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
index c4ccc769c..84334068e 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/scripts/maps/DewfordTown_Hall.inc
@@ -218,9 +218,9 @@ DewfordTown_Hall_EventScript_153535:: @ 8153535
 
 DewfordTown_Hall_EventScript_153556:: @ 8153556
 	compare FACING, 2
-	call_if 1, DewfordTown_Hall_EventScript_15356D
+	call_if_eq DewfordTown_Hall_EventScript_15356D
 	compare FACING, 1
-	call_if 1, DewfordTown_Hall_EventScript_153578
+	call_if_eq DewfordTown_Hall_EventScript_153578
 	return
 
 DewfordTown_Hall_EventScript_15356D:: @ 815356D
@@ -252,8 +252,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D
 	lock
 	faceplayer
 	call DewfordTown_Hall_EventScript_1A0102
-	checkflag FLAG_RECEIVED_TM36
-	goto_if_eq DewfordTown_Hall_EventScript_1535D1
+	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1
 	msgbox DewfordTown_Hall_Text_175E13, 4
 	giveitem_std ITEM_TM36
 	compare RESULT, 0
diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc
index e704efa50..a2341bc76 100644
--- a/data/scripts/maps/DewfordTown_House2.inc
+++ b/data/scripts/maps/DewfordTown_House2.inc
@@ -4,8 +4,7 @@ DewfordTown_House2_MapScripts:: @ 81535DB
 DewfordTown_House2_EventScript_1535DC:: @ 81535DC
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_SILK_SCARF
-	goto_if_eq DewfordTown_House2_EventScript_153615
+	goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615
 	msgbox DewfordTown_House2_Text_175EFE, 4
 	giveitem_std ITEM_SILK_SCARF
 	compare RESULT, 0
diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc
index 9a1bd9fa7..293780716 100644
--- a/data/scripts/maps/EverGrandeCity.inc
+++ b/data/scripts/maps/EverGrandeCity.inc
@@ -3,8 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5
 	.byte 0
 
 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, EverGrandeCity_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_1A02C1
 	end
 
 EverGrandeCity_EventScript_14D4E5:: @ 814D4E5
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index 29c29c80b..78009271b 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
@@ -54,9 +54,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
 	playse SE_DOOR
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C
 	compare RESULT, 1
-	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881
 	addobject 2
 	call EverGrandeCity_ChampionsRoom_EventScript_15B9BD
 	checkplayergender
@@ -129,9 +129,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
 	msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB
 	compare RESULT, 1
-	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4
 	closemessage
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
 	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
index a738264fe..8eb7bbc45 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
@@ -24,10 +24,9 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
 	end
 
 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
-	checkflag FLAG_DEFEATED_ELITE_4_DRAKE
-	call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758
+	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758
 	compare VAR_ELITE_4_STATE, 4
-	call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E
+	call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E
 	end
 
 EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758
@@ -41,8 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
 EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_ELITE_4_DRAKE
-	goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B
+	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B
 	playbgm BGM_SITENNOU, FALSE
 	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
 	trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
index e3a4145d6..a72b84440 100644
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
@@ -24,10 +24,9 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
-	checkflag FLAG_DEFEATED_ELITE_4_GLACIA
-	call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
+	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
 	compare VAR_ELITE_4_STATE, 3
-	call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4
+	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE
@@ -41,8 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_ELITE_4_GLACIA
-	goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1
+	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1
 	playbgm BGM_SITENNOU, FALSE
 	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
 	trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
index d23f234db..2d09f1ebb 100644
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
@@ -24,10 +24,9 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
-	checkflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624
+	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624
 	compare VAR_ELITE_4_STATE, 2
-	call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A
+	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624
@@ -41,8 +40,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
 EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657
+	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657
 	playbgm BGM_SITENNOU, FALSE
 	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
 	trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
index a787b0f90..a8eb820ea 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
@@ -5,8 +5,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
 	setrespawn 20
 	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
-	checkflag FLAG_ENTERED_ELITE_FOUR
-	call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B
+	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B
 	end
 
 EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B
@@ -47,18 +46,16 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0
 
 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	lockall
-	checkflag FLAG_ENTERED_ELITE_FOUR
-	goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57
+	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 11
-	call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34
+	call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34
 	compare VAR_TEMP_0, 8
-	call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F
+	call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F
 	message EverGrandeCity_PokemonLeague_Text_1916FD
 	waitmessage
 	delay 75
-	checkflag FLAG_BADGE06_GET
-	goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A
+	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A
 	closemessage
 	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
 	applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
index 4531845ab..45a729c0a 100644
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
@@ -5,10 +5,9 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
 	.byte 0
 
 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
-	checkflag FLAG_DEFEATED_ELITE_4_SYDNEY
-	call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564
+	call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564
 	compare VAR_ELITE_4_STATE, 1
-	call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A
+	call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564
@@ -42,8 +41,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_ELITE_4_SYDNEY
-	goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD
+	goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD
 	playbgm BGM_SITENNOU, FALSE
 	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
 	trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823
diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc
index 23295f778..a168a0ef5 100644
--- a/data/scripts/maps/FallarborTown.inc
+++ b/data/scripts/maps/FallarborTown.inc
@@ -12,8 +12,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6
 FallarborTown_EventScript_14E7F5:: @ 814E7F5
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
-	goto_if_eq FallarborTown_EventScript_14E80A
+	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A
 	msgbox FallarborTown_Text_16C7FF, 4
 	release
 	end
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc
index 641a201e3..11dd6159e 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
@@ -92,8 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E
 	end
 
 FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97
-	checkflag FLAG_CONTEST_SKETCH_CREATED
-	goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9
+	goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9
 	msgbox FallarborTown_ContestLobby_Text_177246, 2
 	end
 
diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc
index d2b27f478..f62a2da37 100644
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/scripts/maps/FallarborTown_House1.inc
@@ -8,8 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4
 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM27
-	goto_if_eq FallarborTown_House1_EventScript_153C54
+	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C54
 	checkitem ITEM_METEORITE, 1
 	compare RESULT, 1
 	goto_if_eq FallarborTown_House1_EventScript_153BDA
@@ -18,10 +17,8 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5
 	end
 
 FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
-	checkflag FLAG_TEMP_2
-	call_if 0, FallarborTown_House1_EventScript_153C2D
-	checkflag FLAG_TEMP_2
-	call_if 1, FallarborTown_House1_EventScript_153C3E
+	call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_153C2D
+	call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E
 	compare RESULT, NO
 	goto_if_eq FallarborTown_House1_EventScript_153C47
 	msgbox FallarborTown_House1_Text_1778C4, 4
@@ -58,10 +55,8 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54
 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM27
-	goto_if_eq FallarborTown_House1_EventScript_153C86
-	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
-	goto_if_eq FallarborTown_House1_EventScript_153C7C
+	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C86
+	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_153C7C
 	msgbox FallarborTown_House1_Text_177A2B, 4
 	release
 	end
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc
index 7ceaabdef..bb1656fc2 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/scripts/maps/FallarborTown_House2.inc
@@ -5,8 +5,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91
 	lockall
 	applymovement 1, FallarborTown_House2_Movement_1A0839
 	waitmovement 0
-	checkflag FLAG_TEMP_1
-	goto_if_eq FallarborTown_House2_EventScript_153CB6
+	goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6
 	msgbox FallarborTown_House2_Text_177AF4, 4
 	setflag FLAG_TEMP_1
 	goto FallarborTown_House2_EventScript_153CB6
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index 937b435a6..e576df5bd 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/scripts/maps/FortreeCity.inc
@@ -18,8 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955
 FortreeCity_EventScript_14C95E:: @ 814C95E
 	lock
 	faceplayer
-	checkflag FLAG_KECLEON_FLED_FORTREE
-	goto_if_eq FortreeCity_EventScript_14C973
+	goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973
 	msgbox FortreeCity_Text_1675C2, 4
 	release
 	end
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index 9217ba8f4..94df378f8 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -17,8 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC
 
 FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0
 	trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15
-	checkflag FLAG_RECEIVED_TM40
-	goto_if 0, FortreeCity_Gym_EventScript_157F3E
+	goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E
 	msgbox FortreeCity_Gym_Text_185F98, 4
 	release
 	end
@@ -67,8 +66,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7
 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_FORTREE_GYM
-	goto_if_eq FortreeCity_Gym_EventScript_157FD3
+	goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_157FD3
 	msgbox FortreeCity_Gym_Text_18589C, 4
 	release
 	end
@@ -80,15 +78,13 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3
 
 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD
 	lockall
-	checkflag FLAG_BADGE06_GET
-	goto_if_eq FortreeCity_Gym_EventScript_157FFD
+	goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD
 	goto FortreeCity_Gym_EventScript_158007
 	end
 
 FortreeCity_Gym_EventScript_157FED:: @ 8157FED
 	lockall
-	checkflag FLAG_BADGE06_GET
-	goto_if_eq FortreeCity_Gym_EventScript_157FFD
+	goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD
 	goto FortreeCity_Gym_EventScript_158007
 	end
 
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc
index b308aa836..443cc3a5c 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/scripts/maps/FortreeCity_House1.inc
@@ -4,8 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12
 FortreeCity_House1_EventScript_157E13:: @ 8157E13
 	lock
 	faceplayer
-	checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED
-	goto_if_eq FortreeCity_House1_EventScript_157EAD
+	goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_157EAD
 	setvar VAR_SPECIAL_8, 1
 	copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
 	specialvar RESULT, GetInGameTradeSpeciesInfo
@@ -22,7 +21,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13
 	specialvar RESULT, GetTradeSpecies
 	copyvar VAR_SPECIAL_B, RESULT
 	compare RESULT, VAR_SPECIAL_9
-	goto_if 5, FortreeCity_House1_EventScript_157E9F
+	goto_if_ne FortreeCity_House1_EventScript_157E9F
 	copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
 	copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
 	special CreateInGameTradePokemon
diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc
index ae70b8644..107c3708c 100644
--- a/data/scripts/maps/FortreeCity_House2.inc
+++ b/data/scripts/maps/FortreeCity_House2.inc
@@ -4,10 +4,8 @@ FortreeCity_House2_MapScripts:: @ 81580B3
 FortreeCity_House2_EventScript_1580B4:: @ 81580B4
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM10
-	goto_if_eq FortreeCity_House2_EventScript_158157
-	checkflag FLAG_MET_HIDDEN_POWER_GIVER
-	call_if 0, FortreeCity_House2_EventScript_15814B
+	goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_158157
+	call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B
 	msgbox FortreeCity_House2_Text_186360, 4
 	multichoice 21, 8, 54, 1
 	switch RESULT
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
index 1b1b41877..490ef0c9b 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/scripts/maps/FortreeCity_House4.inc
@@ -7,12 +7,9 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F
 
 FortreeCity_House4_EventScript_158188:: @ 8158188
 	lockall
-	checkflag FLAG_RECEIVED_MENTAL_HERB
-	goto_if_eq FortreeCity_House4_EventScript_158204
-	checkflag FLAG_WINGULL_DELIVERED_MAIL
-	goto_if_eq FortreeCity_House4_EventScript_1581D6
-	checkflag FLAG_WINGULL_SENT_ON_ERRAND
-	goto_if_eq FortreeCity_House4_EventScript_1581C2
+	goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204
+	goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6
+	goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2
 	msgbox FortreeCity_House4_Text_186835, 4
 	closemessage
 	setflag FLAG_WINGULL_SENT_ON_ERRAND
diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc
index 33296e510..7419b5866 100644
--- a/data/scripts/maps/GraniteCave_1F.inc
+++ b/data/scripts/maps/GraniteCave_1F.inc
@@ -4,8 +4,7 @@ GraniteCave_1F_MapScripts:: @ 815CBA6
 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_HM05
-	goto_if_eq GraniteCave_1F_EventScript_15CBD3
+	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3
 	msgbox GraniteCave_1F_Text_194917, 4
 	giveitem_std ITEM_HM05
 	setflag FLAG_RECEIVED_HM05
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc
index c9616266e..9c69e649e 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
@@ -11,17 +11,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
 	msgbox GraniteCave_StevensRoom_Text_194BDD, 4
 	giveitem_std ITEM_TM47
 	compare RESULT, 0
-	call_if 1, GraniteCave_StevensRoom_EventScript_15CC83
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC83
 	msgbox GraniteCave_StevensRoom_Text_194C8D, 4
 	closemessage
 	compare FACING, 2
-	call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
 	compare FACING, 1
-	call_if 1, GraniteCave_StevensRoom_EventScript_15CC78
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC78
 	compare FACING, 3
-	call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
 	compare FACING, 4
-	call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
 	playse SE_KAIDAN
 	removeobject 1
 	release
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index dbc71b6bb..d8576e883 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -5,8 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6
 	.byte 0
 
 IslandCave_MapScript1_15EEC6:: @ 815EEC6
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, IslandCave_EventScript_15EED0
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_15EED0
 	end
 
 IslandCave_EventScript_15EED0:: @ 815EED0
@@ -14,8 +13,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0
 	return
 
 IslandCave_MapScript1_15EED4:: @ 815EED4
-	checkflag FLAG_SYS_BRAILLE_WAIT
-	call_if 0, IslandCave_EventScript_15EEDE
+	call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EEDE
 	end
 
 IslandCave_EventScript_15EEDE:: @ 815EEDE
@@ -45,8 +43,7 @@ S_OpenRegiceChamber:: @ 815EF19
 
 IslandCave_EventScript_15EF59:: @ 815EF59
 	lockall
-	checkflag FLAG_SYS_BRAILLE_WAIT
-	goto_if_eq IslandCave_EventScript_15EF72
+	goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF72
 	braillemessage IslandCave_Braille_1C54FC
 	special DoBrailleWait
 	waitstate
@@ -61,8 +58,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72
 IslandCave_EventScript_15EF7C:: @ 815EF7C
 	lockall
 	braillemessage IslandCave_Braille_1C54FC
-	checkflag FLAG_SYS_BRAILLE_WAIT
-	goto_if_eq IslandCave_EventScript_15EF95
+	goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF95
 	special DoBrailleWait
 	waitstate
 	goto IslandCave_EventScript_15EF95
diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc
index efe5d6a6e..d75420e88 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/scripts/maps/JaggedPass.inc
@@ -9,7 +9,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271
 
 JaggedPass_MapScript1_15D274:: @ 815D274
 	compare VAR_JAGGED_PASS_ASH_WEATHER, 1
-	call_if 1, JaggedPass_EventScript_15D280
+	call_if_eq JaggedPass_EventScript_15D280
 	end
 
 JaggedPass_EventScript_15D280:: @ 815D280
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index 44a1e141b..a7f71baf6 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -5,12 +5,11 @@ LavaridgeTown_MapScripts:: @ 814E4A3
 
 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
 	setflag FLAG_VISITED_LAVARIDGE_TOWN
-	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
-	call_if 1, LavaridgeTown_EventScript_14E4DF
+	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF
 	call LavaridgeTown_EventScript_1A014E
 	call LavaridgeTown_EventScript_1A0172
 	compare VAR_LAVARIDGE_RIVAL_STATE, 2
-	call_if 1, LavaridgeTown_EventScript_14E4D0
+	call_if_eq LavaridgeTown_EventScript_14E4D0
 	end
 
 LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
@@ -45,11 +44,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
 	waitmovement 0
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LavaridgeTown_EventScript_14E56B
+	call_if_eq LavaridgeTown_EventScript_14E56B
 	compare RESULT, 1
-	call_if 1, LavaridgeTown_EventScript_14E570
+	call_if_eq LavaridgeTown_EventScript_14E570
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LavaridgeTown_EventScript_14E68F
+	call_if_eq LavaridgeTown_EventScript_14E68F
 	checkplayergender
 	compare RESULT, 0
 	goto_if_eq LavaridgeTown_EventScript_14E5AB
@@ -71,9 +70,9 @@ LavaridgeTown_EventScript_14E575:: @ 814E575
 	setvar VAR_SPECIAL_8, 0
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LavaridgeTown_EventScript_14E56B
+	call_if_eq LavaridgeTown_EventScript_14E56B
 	compare RESULT, 1
-	call_if 1, LavaridgeTown_EventScript_14E570
+	call_if_eq LavaridgeTown_EventScript_14E570
 	checkplayergender
 	compare RESULT, 0
 	goto_if_eq LavaridgeTown_EventScript_14E5AB
@@ -100,16 +99,16 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5
 	closemessage
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LavaridgeTown_EventScript_14E646
+	call_if_eq LavaridgeTown_EventScript_14E646
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LavaridgeTown_EventScript_14E64E
+	call_if_eq LavaridgeTown_EventScript_14E64E
 	removeobject 8
 	addobject 7
 	delay 30
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LavaridgeTown_EventScript_14E69A
+	call_if_eq LavaridgeTown_EventScript_14E69A
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LavaridgeTown_EventScript_14E6A5
+	call_if_eq LavaridgeTown_EventScript_14E6A5
 	removeobject 7
 	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
 	savebgm 0
@@ -129,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646
 
 LavaridgeTown_EventScript_14E64E:: @ 814E64E
 	compare FACING, 2
-	call_if 1, LavaridgeTown_EventScript_14E67B
+	call_if_eq LavaridgeTown_EventScript_14E67B
 	compare FACING, 1
-	call_if 1, LavaridgeTown_EventScript_14E680
+	call_if_eq LavaridgeTown_EventScript_14E680
 	compare FACING, 3
-	call_if 1, LavaridgeTown_EventScript_14E685
+	call_if_eq LavaridgeTown_EventScript_14E685
 	compare FACING, 4
-	call_if 1, LavaridgeTown_EventScript_14E68A
+	call_if_eq LavaridgeTown_EventScript_14E68A
 	return
 
 LavaridgeTown_EventScript_14E67B:: @ 814E67B
@@ -166,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A
 
 LavaridgeTown_EventScript_14E6A5:: @ 814E6A5
 	compare FACING, 2
-	call_if 1, LavaridgeTown_EventScript_14E6D2
+	call_if_eq LavaridgeTown_EventScript_14E6D2
 	compare FACING, 1
-	call_if 1, LavaridgeTown_EventScript_14E6D2
+	call_if_eq LavaridgeTown_EventScript_14E6D2
 	compare FACING, 3
-	call_if 1, LavaridgeTown_EventScript_14E6DD
+	call_if_eq LavaridgeTown_EventScript_14E6DD
 	compare FACING, 4
-	call_if 1, LavaridgeTown_EventScript_14E6D2
+	call_if_eq LavaridgeTown_EventScript_14E6D2
 	return
 
 LavaridgeTown_EventScript_14E6D2:: @ 814E6D2
@@ -272,8 +271,7 @@ LavaridgeTown_EventScript_14E751:: @ 814E751
 LavaridgeTown_EventScript_14E75A:: @ 814E75A
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_LAVARIDGE_EGG
-	goto_if_eq LavaridgeTown_EventScript_14E79E
+	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E
 	msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq LavaridgeTown_EventScript_14E7B2
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index 1bbad53bf..c0604400e 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
@@ -13,56 +13,46 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F
 	setvar VAR_TEMP_D, 0
 	setvar VAR_TEMP_E, 0
 	setvar VAR_TEMP_F, 0
-	checktrainerflag OPPONENT_COLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6
+	goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6
 	setvar VAR_TEMP_B, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6
-	checktrainerflag OPPONENT_ZANE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4
+	goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4
 	setvar VAR_TEMP_C, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4
-	checktrainerflag OPPONENT_AXLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2
+	goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2
 	setvar VAR_TEMP_D, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2
-	checktrainerflag OPPONENT_SADIE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0
+	goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0
 	setvar VAR_TEMP_E, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0
-	checktrainerflag OPPONENT_ANDY
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE
+	goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE
 	setvar VAR_TEMP_F, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE
 	return
 
 LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF
-	checktrainerflag OPPONENT_COLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C
+	goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C
 	setobjectmovementtype 2, 63
 
 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C
-	checktrainerflag OPPONENT_ZANE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719
+	goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719
 	setobjectmovementtype 3, 63
 
 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719
-	checktrainerflag OPPONENT_AXLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726
+	goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726
 	setobjectmovementtype 4, 63
 
 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726
-	checktrainerflag OPPONENT_SADIE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733
+	goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733
 	setobjectmovementtype 5, 63
 
 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733
-	checktrainerflag OPPONENT_ANDY
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740
+	goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740
 	setobjectmovementtype 7, 63
 
 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740
@@ -70,8 +60,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740
 
 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741
 	trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766
-	checkflag FLAG_RECEIVED_TM50
-	goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7
+	goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7
 	msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4
 	release
 	end
@@ -85,7 +74,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	setflag FLAG_BADGE04_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB
+	call_if_eq LavaridgeTown_Gym_1F_EventScript_1A00FB
 	setvar VAR_SPECIAL_8, 4
 	call LavaridgeTown_Gym_1F_EventScript_1A01C0
 	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
@@ -135,8 +124,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E
 LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_15386E
 	msgbox LavaridgeTown_Gym_1F_Text_176312, 4
 	release
 	end
@@ -148,15 +136,13 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E
 
 LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878
 	lockall
-	checkflag FLAG_BADGE04_GET
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898
+	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898
 	goto LavaridgeTown_Gym_1F_EventScript_1538A2
 	end
 
 LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888
 	lockall
-	checkflag FLAG_BADGE04_GET
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898
+	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898
 	goto LavaridgeTown_Gym_1F_EventScript_1538A2
 	end
 
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc
index 913734dd5..71fc2cbfe 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.inc
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc
@@ -28,8 +28,7 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C
 LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_CHARCOAL
-	goto_if_eq LavaridgeTown_HerbShop_EventScript_153684
+	goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684
 	msgbox LavaridgeTown_HerbShop_Text_1761A2, 4
 	giveitem_std ITEM_CHARCOAL
 	compare RESULT, 0
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index 6ed8054f8..ee29b0f05 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -7,8 +7,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20
 	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
 	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, LilycoveCity_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1
 	call LilycoveCity_EventScript_1A0196
 	call LilycoveCity_EventScript_1A014E
 	end
@@ -28,10 +27,8 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
 	setmetatile 71, 6, 368, 0
 	setmetatile 72, 6, 445, 0
 	.endif
-	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
-	call_if 0, LilycoveCity_EventScript_14CABE
-	checkflag FLAG_BADGE07_GET
-	call_if 1, LilycoveCity_EventScript_14CB2B
+	call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE
+	call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B
 	end
 
 LilycoveCity_EventScript_14CABE:: @ 814CABE
@@ -64,8 +61,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
-	goto_if_eq LilycoveCity_EventScript_14CBB4
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4
 	msgbox LilycoveCity_Text_1C5A7A, 4
 	random 10
 	addvar RESULT, ITEM_CHERI_BERRY
@@ -89,8 +85,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE
 LilycoveCity_EventScript_14CBC7:: @ 814CBC7
 	lock
 	faceplayer
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq LilycoveCity_EventScript_14CBDC
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC
 	msgbox LilycoveCity_Text_168750, 4
 	release
 	end
@@ -107,8 +102,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6
 LilycoveCity_EventScript_14CBEF:: @ 814CBEF
 	lock
 	faceplayer
-	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
-	goto_if_eq LilycoveCity_EventScript_14CC04
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04
 	msgbox LilycoveCity_Text_1688C1, 4
 	release
 	end
@@ -121,8 +115,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04
 LilycoveCity_EventScript_14CC0E:: @ 814CC0E
 	lock
 	faceplayer
-	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
-	goto_if_eq LilycoveCity_EventScript_14CC23
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23
 	msgbox LilycoveCity_Text_1689BF, 4
 	release
 	end
@@ -147,8 +140,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F
 LilycoveCity_EventScript_14CC48:: @ 814CC48
 	lock
 	faceplayer
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq LilycoveCity_EventScript_14CC5D
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D
 	msgbox LilycoveCity_Text_168C16, 4
 	release
 	end
@@ -186,8 +178,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2
 
 LilycoveCity_EventScript_14CCAC:: @ 814CCAC
 	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq LilycoveCity_EventScript_14CCC0
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0
 	msgbox LilycoveCity_Text_168EDA, 4
 	releaseall
 	end
@@ -211,8 +202,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC
 
 LilycoveCity_EventScript_14CCE5:: @ 814CCE5
 	lockall
-	checkflag FLAG_MET_WAILMER_TRAINER
-	goto_if_eq LilycoveCity_EventScript_14CD18
+	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18
 	msgbox LilycoveCity_Text_16864A, 4
 	applymovement LAST_TALKED, LilycoveCity_Movement_1A0839
 	waitmovement 0
@@ -256,10 +246,8 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46
 
 LilycoveCity_EventScript_14CD60:: @ 814CD60
 	playbgm BGM_GIRL_SUP, TRUE
-	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	call_if 1, LilycoveCity_EventScript_14CDB0
-	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	call_if 0, LilycoveCity_EventScript_14CDB9
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9
 	compare RESULT, NO
 	goto_if_eq LilycoveCity_EventScript_14CDC2
 	msgbox LilycoveCity_Text_167B94, 4
@@ -287,10 +275,8 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2
 
 LilycoveCity_EventScript_14CDD3:: @ 814CDD3
 	playbgm BGM_BOY_SUP, TRUE
-	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	call_if 1, LilycoveCity_EventScript_14CE23
-	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	call_if 0, LilycoveCity_EventScript_14CE2C
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C
 	compare RESULT, NO
 	goto_if_eq LilycoveCity_EventScript_14CE35
 	msgbox LilycoveCity_Text_1680A9, 4
@@ -349,20 +335,18 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96
 LilycoveCity_EventScript_14CEA6:: @ 814CEA6
 	msgbox LilycoveCity_Text_167C6B, 4
 	setvar RESULT, 0
-	checkflag FLAG_BADGE06_GET
-	call_if 1, LilycoveCity_EventScript_14CEDE
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
 	compare RESULT, 0
-	call_if 1, LilycoveCity_EventScript_14CEEE
+	call_if_eq LilycoveCity_EventScript_14CEEE
 	compare RESULT, 1
-	call_if 1, LilycoveCity_EventScript_14CEF7
+	call_if_eq LilycoveCity_EventScript_14CEF7
 	clearflag FLAG_HIDE_MAY_UPSTAIRS
 	clearflag FLAG_HIDE_MAY_PICHU_DOLL
 	goto LilycoveCity_EventScript_14CF6B
 	end
 
 LilycoveCity_EventScript_14CEDE:: @ 814CEDE
-	checkflag FLAG_BADGE08_GET
-	goto_if_eq LilycoveCity_EventScript_14CEE8
+	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8
 	return
 
 LilycoveCity_EventScript_14CEE8:: @ 814CEE8
@@ -374,8 +358,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE
 	return
 
 LilycoveCity_EventScript_14CEF7:: @ 814CEF7
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq LilycoveCity_EventScript_14CF09
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09
 	msgbox LilycoveCity_Text_167DDD, 4
 	return
 
@@ -386,12 +369,11 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09
 LilycoveCity_EventScript_14CF12:: @ 814CF12
 	msgbox LilycoveCity_Text_168149, 4
 	setvar RESULT, 0
-	checkflag FLAG_BADGE06_GET
-	call_if 1, LilycoveCity_EventScript_14CEDE
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
 	compare RESULT, 0
-	call_if 1, LilycoveCity_EventScript_14CF47
+	call_if_eq LilycoveCity_EventScript_14CF47
 	compare RESULT, 1
-	call_if 1, LilycoveCity_EventScript_14CF50
+	call_if_eq LilycoveCity_EventScript_14CF50
 	clearflag FLAG_HIDE_BRENDAN_UPSTAIRS
 	goto LilycoveCity_EventScript_14CF6B
 	end
@@ -401,8 +383,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47
 	return
 
 LilycoveCity_EventScript_14CF50:: @ 814CF50
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq LilycoveCity_EventScript_14CF62
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62
 	msgbox LilycoveCity_Text_168282, 4
 	return
 
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 7aceecef6..a04629903 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -13,8 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877
 	.2byte 0
 
 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889
-	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158898
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
@@ -45,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	specialvar RESULT, GiveMonArtistRibbon
 	compare RESULT, 1
-	call_if 1, LilycoveCity_ContestLobby_EventScript_158948
+	call_if_eq LilycoveCity_ContestLobby_EventScript_158948
 	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
 	waitmovement 0
 	removeobject 4
@@ -188,8 +187,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
-	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
@@ -218,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	specialvar RESULT, GiveMonArtistRibbon
 	compare RESULT, 1
-	call_if 1, LilycoveCity_ContestLobby_EventScript_158B18
+	call_if_eq LilycoveCity_ContestLobby_EventScript_158B18
 	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
 	waitmovement 0
 	removeobject 11
@@ -307,8 +305,7 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
 	checkitem ITEM_CONTEST_PASS, 1
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA
-	checkflag FLAG_TEMP_2
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE
+	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE
 	message LilycoveCity_ContestLobby_Text_18848C
 	waitmessage
 	setflag FLAG_TEMP_2
@@ -402,8 +399,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
 	end
 
 LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
-	checkflag FLAG_TEMP_3
-	call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4
+	call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4
 	message LilycoveCity_ContestLobby_Text_1886DC
 	waitmessage
 	multichoice 0, 0, 4, 0
@@ -707,8 +703,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
 	end
 
 LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027
-	checkflag FLAG_RECEIVED_CONTEST_PASS
-	goto_if 0, LilycoveCity_ContestLobby_EventScript_159039
+	goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039
 	msgbox LilycoveCity_ContestLobby_Text_188DDA, 2
 	end
 
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index c8a3dcab9..b80b0873b 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
@@ -3,10 +3,8 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5
 	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
 	waitmovement 0
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index 4878cc6bc..06b982610 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -4,10 +4,8 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_2
-	call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
-	checkflag FLAG_TEMP_2
-	call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
+	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
+	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
 	specialvar RESULT, CompletedHoennPokedex
 	compare RESULT, 1
 	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index 1198054f0..f895ea99d 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
@@ -4,8 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B
 LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_2
-	call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
+	call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
 	copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR
 	special DisplayCurrentElevatorFloor
 	message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
index cd5e0d980..e2274110c 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
@@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F
 LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145
 	getpricereduction 3
 	compare RESULT, 1
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F
 	compare RESULT, 0
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A163
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F
@@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0
 	faceplayer
 	getpricereduction 3
 	compare RESULT, 1
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4
 	release
 	end
@@ -128,22 +128,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	compare VAR_TEMP_1, 0
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D
 	compare VAR_TEMP_1, 1
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A244
 	compare VAR_TEMP_1, 2
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A
 	checkitemspace VAR_TEMP_0, 1
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388
 	compare VAR_TEMP_1, 0
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A252
 	compare VAR_TEMP_1, 1
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A259
 	compare VAR_TEMP_1, 2
-	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A260
 	updatemoneybox 0, 0
 	nop
 	bufferitemname 0, VAR_TEMP_0
@@ -155,7 +155,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4
 	random 64
 	compare RESULT, 0
-	goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E
+	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E
 	checkitemspace VAR_TEMP_0, 1
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388
@@ -167,7 +167,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4
 	random 64
 	compare RESULT, 0
-	goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E
+	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E
 	checkitemspace VAR_TEMP_0, 1
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index db2b8edf9..f6b23bc05 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
@@ -10,9 +10,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	faceplayer
 	dodailyevents
 	compare VAR_LOTTERY_PRIZE, 0
-	goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1
-	checkflag FLAG_DAILY_PICKED_LOTTO_TICKET
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C
+	goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1
+	goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C
 	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56
@@ -37,18 +36,18 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60
 	incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY
 	compare VAR_SPECIAL_6, 0
-	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E3A
 	compare VAR_SPECIAL_6, 1
-	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E43
 	bufferitemname 0, VAR_SPECIAL_5
 	compare VAR_SPECIAL_4, 1
-	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E78
 	compare VAR_SPECIAL_4, 2
-	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E81
 	compare VAR_SPECIAL_4, 3
-	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A
 	compare VAR_SPECIAL_4, 4
-	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93
 	giveitem_std VAR_SPECIAL_5
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index 3b884c233..5dc217585 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -16,8 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2
 	end
 
 LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq LilycoveCity_Harbor_EventScript_1598CD
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD
 	msgbox LilycoveCity_Harbor_Text_18B306, 4
 	release
 	end
@@ -81,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A
 	delay 30
 	hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
 	compare FACING, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_1599D9
+	call_if_eq LilycoveCity_Harbor_EventScript_1599D9
 	compare FACING, 4
-	call_if 1, LilycoveCity_Harbor_EventScript_1599CE
+	call_if_eq LilycoveCity_Harbor_EventScript_1599CE
 	delay 30
 	hideobjectat 255, MAP_PETALBURG_CITY
 	setvar VAR_SPECIAL_4, 2
@@ -106,12 +105,9 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4
 	end
 
 LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, LilycoveCity_Harbor_EventScript_1598BA
-	checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
-	goto_if_eq LilycoveCity_Harbor_EventScript_1598BA
-	checkflag FLAG_SYS_HAS_EON_TICKET
-	goto_if 0, LilycoveCity_Harbor_EventScript_1598BA
+	goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA
+	goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA
+	goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA
 	msgbox LilycoveCity_Harbor_Text_1C50F2, 4
 	closemessage
 	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
@@ -130,9 +126,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	delay 30
 	removeobject 4
 	compare FACING, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_1599D9
+	call_if_eq LilycoveCity_Harbor_EventScript_1599D9
 	compare FACING, 4
-	call_if 1, LilycoveCity_Harbor_EventScript_1599CE
+	call_if_eq LilycoveCity_Harbor_EventScript_1599CE
 	delay 30
 	hideobjectat 255, MAP_PETALBURG_CITY
 	special ScrSpecial_HealPlayerParty
@@ -159,8 +155,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89
 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D
 	lock
 	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq LilycoveCity_Harbor_EventScript_159AA2
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2
 	msgbox LilycoveCity_Harbor_Text_18B504, 4
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc
index d0065c9e8..0572c23cc 100644
--- a/data/scripts/maps/LilycoveCity_House2.inc
+++ b/data/scripts/maps/LilycoveCity_House2.inc
@@ -4,8 +4,7 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2
 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM44
-	goto_if_eq LilycoveCity_House2_EventScript_159BDA
+	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA
 	msgbox LilycoveCity_House2_Text_18B83C, 4
 	giveitem_std ITEM_TM44
 	compare RESULT, 0
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index 120054e91..9cf3ecbd7 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
@@ -4,32 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC
 	.byte 0
 
 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7
-	checkflag FLAG_COOL_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6
-	checkflag FLAG_BEAUTY_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158615
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5
-	checkflag FLAG_CUTE_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15862D
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4
-	checkflag FLAG_SMART_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158645
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3
-	checkflag FLAG_TOUGH_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15865D
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD
@@ -96,8 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
 	lockall
-	checkflag FLAG_RECEIVED_GLASS_ORNAMENT
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793
+	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793
 	specialvar VAR_SPECIAL_4, sub_80C4D50
 	switch VAR_SPECIAL_4
 	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
@@ -146,36 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D
 	lockall
-	checkflag FLAG_CUTE_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0
 	lockall
-	checkflag FLAG_TOUGH_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3
 	lockall
-	checkflag FLAG_COOL_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6
 	lockall
-	checkflag FLAG_BEAUTY_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9
 	lockall
-	checkflag FLAG_SMART_PAINTING_MADE
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3
 	end
 
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
index f6eb35c98..cff88caf0 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
@@ -21,8 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F
 LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348
 	lock
 	faceplayer
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_15935D
 	msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
index 4656f0182..85ee953ac 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
@@ -72,35 +72,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429
 	setvar VAR_SPECIAL_4, 8
 	specialvar RESULT, ShouldMoveLilycoveFanClubMember
 	compare RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5
 	setvar VAR_SPECIAL_4, 9
 	specialvar RESULT, ShouldMoveLilycoveFanClubMember
 	compare RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD
 	setvar VAR_SPECIAL_4, 10
 	specialvar RESULT, ShouldMoveLilycoveFanClubMember
 	compare RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5
 	setvar VAR_SPECIAL_4, 11
 	specialvar RESULT, ShouldMoveLilycoveFanClubMember
 	compare RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED
 	setvar VAR_SPECIAL_4, 12
 	specialvar RESULT, ShouldMoveLilycoveFanClubMember
 	compare RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5
 	setvar VAR_SPECIAL_4, 13
 	specialvar RESULT, ShouldMoveLilycoveFanClubMember
 	compare RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD
 	setvar VAR_SPECIAL_4, 14
 	specialvar RESULT, ShouldMoveLilycoveFanClubMember
 	compare RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505
 	setvar VAR_SPECIAL_4, 15
 	specialvar RESULT, ShouldMoveLilycoveFanClubMember
 	compare RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index ef2145bbb..57ad9aae5 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -6,19 +6,18 @@ LittlerootTown_MapScripts:: @ 814D509
 LittlerootTown_MapScript1_14D514:: @ 814D514
 	setflag FLAG_VISITED_LITTLEROOT_TOWN
 	compare VAR_LITTLEROOT_INTRO_STATE, 2
-	call_if 1, LittlerootTown_EventScript_14D57B
-	checkflag FLAG_RESCUED_BIRCH
-	call_if 0, LittlerootTown_EventScript_14D583
+	call_if_eq LittlerootTown_EventScript_14D57B
+	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583
 	compare VAR_LITTLEROOT_STATE, 3
-	call_if 1, LittlerootTown_EventScript_14D5A6
+	call_if_eq LittlerootTown_EventScript_14D5A6
 	compare VAR_LITTLEROOT_HOUSES_STATE, 4
-	call_if 1, LittlerootTown_EventScript_14D570
+	call_if_eq LittlerootTown_EventScript_14D570
 	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
-	call_if 1, LittlerootTown_EventScript_14D570
+	call_if_eq LittlerootTown_EventScript_14D570
 	compare VAR_OLDALE_STATE, 1
-	call_if 1, LittlerootTown_EventScript_14D567
+	call_if_eq LittlerootTown_EventScript_14D567
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
-	call_if 1, LittlerootTown_EventScript_14D563
+	call_if_eq LittlerootTown_EventScript_14D563
 	end
 
 LittlerootTown_EventScript_14D563:: @ 814D563
@@ -56,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6
 	setobjectmovementtype 4, 8
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_EventScript_14D5C5
+	call_if_eq LittlerootTown_EventScript_14D5C5
 	compare RESULT, 1
-	call_if 1, LittlerootTown_EventScript_14D5CD
+	call_if_eq LittlerootTown_EventScript_14D5CD
 	return
 
 LittlerootTown_EventScript_14D5C5:: @ 814D5C5
@@ -187,12 +186,10 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6
 LittlerootTown_EventScript_14D6DF:: @ 814D6DF
 	lock
 	faceplayer
-	checkflag FLAG_ADVENTURE_STARTED
-	goto_if_eq LittlerootTown_EventScript_14D72F
-	checkflag FLAG_RESCUED_BIRCH
-	goto_if_eq LittlerootTown_EventScript_14D722
+	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F
+	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722
 	compare VAR_LITTLEROOT_STATE, 0
-	goto_if 5, LittlerootTown_EventScript_14D708
+	goto_if_ne LittlerootTown_EventScript_14D708
 	msgbox LittlerootTown_Text_16ACEB, 4
 	release
 	end
@@ -335,9 +332,9 @@ LittlerootTown_EventScript_14D808:: @ 814D808
 	lockall
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_EventScript_14D822
+	call_if_eq LittlerootTown_EventScript_14D822
 	compare RESULT, 1
-	call_if 1, LittlerootTown_EventScript_14D82B
+	call_if_eq LittlerootTown_EventScript_14D82B
 	releaseall
 	end
 
@@ -353,9 +350,9 @@ LittlerootTown_EventScript_14D834:: @ 814D834
 	lockall
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_EventScript_14D84E
+	call_if_eq LittlerootTown_EventScript_14D84E
 	compare RESULT, 1
-	call_if 1, LittlerootTown_EventScript_14D857
+	call_if_eq LittlerootTown_EventScript_14D857
 	releaseall
 	end
 
@@ -408,27 +405,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA
 LittlerootTown_EventScript_14D8B6:: @ 814D8B6
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_EventScript_14D93C
+	call_if_eq LittlerootTown_EventScript_14D93C
 	compare RESULT, 1
-	call_if 1, LittlerootTown_EventScript_14D947
+	call_if_eq LittlerootTown_EventScript_14D947
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_EventScript_14D926
+	call_if_eq LittlerootTown_EventScript_14D926
 	compare RESULT, 1
-	call_if 1, LittlerootTown_EventScript_14D931
+	call_if_eq LittlerootTown_EventScript_14D931
 	msgbox LittlerootTown_Text_16A8EE, 4
 	closemessage
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_EventScript_14D952
+	call_if_eq LittlerootTown_EventScript_14D952
 	compare RESULT, 1
-	call_if 1, LittlerootTown_EventScript_14D995
+	call_if_eq LittlerootTown_EventScript_14D995
 	call LittlerootTown_EventScript_14DD38
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_EventScript_14DAAA
+	call_if_eq LittlerootTown_EventScript_14DAAA
 	compare RESULT, 1
-	call_if 1, LittlerootTown_EventScript_14DAED
+	call_if_eq LittlerootTown_EventScript_14DAED
 	goto LittlerootTown_EventScript_14DD2B
 	end
 
@@ -454,32 +451,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947
 
 LittlerootTown_EventScript_14D952:: @ 814D952
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LittlerootTown_EventScript_14D9D8
+	call_if_eq LittlerootTown_EventScript_14D9D8
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LittlerootTown_EventScript_14D9ED
+	call_if_eq LittlerootTown_EventScript_14D9ED
 	compare VAR_SPECIAL_8, 2
-	call_if 1, LittlerootTown_EventScript_14DA02
+	call_if_eq LittlerootTown_EventScript_14DA02
 	compare VAR_SPECIAL_8, 3
-	call_if 1, LittlerootTown_EventScript_14DA17
+	call_if_eq LittlerootTown_EventScript_14DA17
 	compare VAR_SPECIAL_8, 4
-	call_if 1, LittlerootTown_EventScript_14DA2C
+	call_if_eq LittlerootTown_EventScript_14DA2C
 	compare VAR_SPECIAL_8, 5
-	call_if 1, LittlerootTown_EventScript_14DA41
+	call_if_eq LittlerootTown_EventScript_14DA41
 	return
 
 LittlerootTown_EventScript_14D995:: @ 814D995
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LittlerootTown_EventScript_14D9D8
+	call_if_eq LittlerootTown_EventScript_14D9D8
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LittlerootTown_EventScript_14D9ED
+	call_if_eq LittlerootTown_EventScript_14D9ED
 	compare VAR_SPECIAL_8, 2
-	call_if 1, LittlerootTown_EventScript_14DA56
+	call_if_eq LittlerootTown_EventScript_14DA56
 	compare VAR_SPECIAL_8, 3
-	call_if 1, LittlerootTown_EventScript_14DA6B
+	call_if_eq LittlerootTown_EventScript_14DA6B
 	compare VAR_SPECIAL_8, 4
-	call_if 1, LittlerootTown_EventScript_14DA80
+	call_if_eq LittlerootTown_EventScript_14DA80
 	compare VAR_SPECIAL_8, 5
-	call_if 1, LittlerootTown_EventScript_14DA95
+	call_if_eq LittlerootTown_EventScript_14DA95
 	return
 
 LittlerootTown_EventScript_14D9D8:: @ 814D9D8
@@ -554,32 +551,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95
 
 LittlerootTown_EventScript_14DAAA:: @ 814DAAA
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LittlerootTown_EventScript_14DB30
+	call_if_eq LittlerootTown_EventScript_14DB30
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LittlerootTown_EventScript_14DB3B
+	call_if_eq LittlerootTown_EventScript_14DB3B
 	compare VAR_SPECIAL_8, 2
-	call_if 1, LittlerootTown_EventScript_14DB46
+	call_if_eq LittlerootTown_EventScript_14DB46
 	compare VAR_SPECIAL_8, 3
-	call_if 1, LittlerootTown_EventScript_14DB6C
+	call_if_eq LittlerootTown_EventScript_14DB6C
 	compare VAR_SPECIAL_8, 4
-	call_if 1, LittlerootTown_EventScript_14DB92
+	call_if_eq LittlerootTown_EventScript_14DB92
 	compare VAR_SPECIAL_8, 5
-	call_if 1, LittlerootTown_EventScript_14DBB8
+	call_if_eq LittlerootTown_EventScript_14DBB8
 	return
 
 LittlerootTown_EventScript_14DAED:: @ 814DAED
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LittlerootTown_EventScript_14DB30
+	call_if_eq LittlerootTown_EventScript_14DB30
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LittlerootTown_EventScript_14DB3B
+	call_if_eq LittlerootTown_EventScript_14DB3B
 	compare VAR_SPECIAL_8, 2
-	call_if 1, LittlerootTown_EventScript_14DBDE
+	call_if_eq LittlerootTown_EventScript_14DBDE
 	compare VAR_SPECIAL_8, 3
-	call_if 1, LittlerootTown_EventScript_14DC04
+	call_if_eq LittlerootTown_EventScript_14DC04
 	compare VAR_SPECIAL_8, 4
-	call_if 1, LittlerootTown_EventScript_14DC2A
+	call_if_eq LittlerootTown_EventScript_14DC2A
 	compare VAR_SPECIAL_8, 5
-	call_if 1, LittlerootTown_EventScript_14DC50
+	call_if_eq LittlerootTown_EventScript_14DC50
 	return
 
 LittlerootTown_EventScript_14DB30:: @ 814DB30
@@ -843,9 +840,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2
 	faceplayer
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_EventScript_14D926
+	call_if_eq LittlerootTown_EventScript_14D926
 	compare RESULT, 1
-	call_if 1, LittlerootTown_EventScript_14D931
+	call_if_eq LittlerootTown_EventScript_14D931
 	call LittlerootTown_EventScript_14DD38
 	applymovement 4, LittlerootTown_Movement_1A0841
 	waitmovement 0
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index 8a86cd946..1de2e91a4 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
@@ -6,9 +6,8 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B
 
 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660
-	checkflag FLAG_RECEIVED_RUNNING_SHOES
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673
+	call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_152660
+	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_152673
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660
@@ -28,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680
 
 LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A
 	compare VAR_LITTLEROOT_INTRO_STATE, 3
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526C4
 	compare VAR_LITTLEROOT_INTRO_STATE, 5
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526AC
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526B8
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index e0e1a1086..ed6818fa0 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
@@ -4,10 +4,9 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4
 	.byte 0
 
 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF
-	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
-	call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE
+	call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE
 	compare VAR_LITTLEROOT_INTRO_STATE, 4
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950
 	call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D
 	setvar VAR_0x4089, 0
 	end
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index 45e9e0783..8096589aa 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -6,9 +6,8 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879
 
 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E
-	checkflag FLAG_RECEIVED_RUNNING_SHOES
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1
+	call_if_lt LittlerootTown_MaysHouse_1F_EventScript_15289E
+	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1528B1
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E
@@ -28,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE
 
 LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8
 	compare VAR_LITTLEROOT_INTRO_STATE, 3
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_152902
 	compare VAR_LITTLEROOT_INTRO_STATE, 5
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528EA
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528F6
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA
@@ -118,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0
 	lockall
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E1
 	compare RESULT, 1
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E2
 	releaseall
 	end
 
@@ -135,10 +134,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB
 LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21
-	checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17
+	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A21
+	goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A17
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B
 	special GetRivalSonDaughterString
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index 34300b13e..ede58e7a5 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -4,10 +4,9 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50
 	.byte 0
 
 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
-	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
-	call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A
+	call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A
 	compare VAR_LITTLEROOT_INTRO_STATE, 4
-	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950
+	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950
 	call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D
 	setvar VAR_0x4089, 0
 	end
@@ -30,13 +29,12 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
 LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
 	lockall
-	checkflag FLAG_MET_RIVAL_LILYCOVE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4
 	compare RESULT, 1
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A
 	playse SE_KAIDAN
 	removeobject LAST_TALKED
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
@@ -58,11 +56,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4
 	closemessage
 	compare FACING, 4
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29
 	compare FACING, 2
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34
 	compare FACING, 3
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29
@@ -92,11 +90,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4
 	closemessage
 	compare FACING, 4
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
 	compare FACING, 2
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
 	compare FACING, 3
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F
@@ -114,22 +112,20 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
 	waitmovement 0
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB
 	compare RESULT, 1
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED
 	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
-	checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
-	checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
 	return
 
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index 10e4712bb..7608ba65d 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
@@ -86,9 +86,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
 	lock
 	faceplayer
 	compare VAR_BIRCH_LAB_STATE, 3
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90
-	checkflag FLAG_BIRCH_AIDE_MET
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90
+	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4
 	setflag FLAG_BIRCH_AIDE_MET
 	release
@@ -107,8 +106,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
 	lock
 	faceplayer
-	checkflag FLAG_UNKNOWN_BIRCH_380
-	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
+	goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
 	compare VAR_BIRCH_LAB_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4
@@ -125,9 +123,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
 	waitmovement 0
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13
 	compare RESULT, 1
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40
 	setvar VAR_BIRCH_LAB_STATE, 5
 	setflag FLAG_ADVENTURE_STARTED
 	setvar VAR_ROUTE102_ACCESSIBLE, 1
@@ -140,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4
 	giveitem_std ITEM_POKE_BALL, 5
 	compare RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4
 	setvar RESULT, 0
 	return
@@ -149,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4
 	giveitem_std ITEM_POKE_BALL, 5
 	compare RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4
 	setvar RESULT, 1
 	return
@@ -189,9 +187,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3
 	faceplayer
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE
 	compare RESULT, 1
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7
 	release
 	end
 
diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc
index 6dbdc0461..a55d260ab 100644
--- a/data/scripts/maps/MagmaHideout_B1F.inc
+++ b/data/scripts/maps/MagmaHideout_B1F.inc
@@ -3,8 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8
 	.byte 0
 
 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, MagmaHideout_B1F_EventScript_15F2B8
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MagmaHideout_B1F_EventScript_15F2B8
 	end
 
 MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index 652a25f6f..03974ddae 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -8,8 +8,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038
 	setflag FLAG_SYS_TV_START
 	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	setvar VAR_MAUVILLE_GYM_STATE, 0
-	checkflag FLAG_RECEIVED_TM24
-	call_if 1, MauvilleCity_EventScript_14C053
+	call_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C053
 	end
 
 MauvilleCity_EventScript_14C053:: @ 814C053
@@ -52,8 +51,7 @@ MauvilleCity_EventScript_14C099:: @ 814C099
 MauvilleCity_EventScript_14C0A2:: @ 814C0A2
 	lock
 	faceplayer
-	checkflag FLAG_TV_EXPLAINED
-	goto_if_eq MauvilleCity_EventScript_14C0BA
+	goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA
 	msgbox MauvilleCity_Text_16674A, 4
 	setflag FLAG_TV_EXPLAINED
 	release
@@ -67,8 +65,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA
 MauvilleCity_EventScript_14C0C4:: @ 814C0C4
 	lock
 	faceplayer
-	checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
-	goto_if_eq MauvilleCity_EventScript_14C0E4
+	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4
 	msgbox MauvilleCity_Text_165B76, 4
 	closemessage
 	applymovement 7, MauvilleCity_Movement_1A083D
@@ -86,8 +83,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4
 
 MauvilleCity_EventScript_14C0F9:: @ 814C0F9
 	lockall
-	checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
-	goto_if_eq MauvilleCity_EventScript_14C292
+	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292
 	applymovement 6, MauvilleCity_Movement_1A0843
 	waitmovement 0
 	msgbox MauvilleCity_Text_165BE3, 4
@@ -106,7 +102,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9
 
 MauvilleCity_EventScript_14C154:: @ 814C154
 	compare RESULT, YES
-	call_if 1, MauvilleCity_EventScript_14C23C
+	call_if_eq MauvilleCity_EventScript_14C23C
 	compare RESULT, NO
 	goto_if_eq MauvilleCity_EventScript_14C285
 	closemessage
@@ -284,12 +280,10 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8
 MauvilleCity_EventScript_14C2F2:: @ 814C2F2
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM24
-	goto_if_eq MauvilleCity_EventScript_14C368
+	goto_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C368
 	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq MauvilleCity_EventScript_14C33C
-	checkflag FLAG_RECEIVED_BASEMENT_KEY
-	goto_if_eq MauvilleCity_EventScript_14C332
+	goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332
 	msgbox MauvilleCity_Text_1661C1, 4
 	giveitem_std ITEM_BASEMENT_KEY
 	setflag FLAG_RECEIVED_BASEMENT_KEY
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc
index 6bd7f0f4f..08f11d641 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/scripts/maps/MauvilleCity_BikeShop.inc
@@ -4,10 +4,8 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795
 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_BIKE
-	goto_if_eq MauvilleCity_BikeShop_EventScript_15686E
-	checkflag FLAG_DECLINED_BIKE
-	goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1
+	goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_15686E
+	goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_1567D1
 	msgbox MauvilleCity_BikeShop_Text_180F9F, 4
 	msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO
 	compare RESULT, YES
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc
index e938a1b4c..2b784aeb9 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
@@ -34,7 +34,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60
 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 9950
-	goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C
+	goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C
 	checkmoney 0x3e8, 0
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C
@@ -53,7 +53,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE
 MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 9500
-	goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C
+	goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C
 	checkmoney 0x2710, 0
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C
@@ -155,7 +155,7 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C
 MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
-	goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4
+	goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4
 	bufferdecorationname 1, DECOR_TREECKO_DOLL
 	checkdecorspace DECOR_TREECKO_DOLL
 	compare RESULT, 0
@@ -171,7 +171,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46
 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
-	goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4
+	goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4
 	bufferdecorationname 1, DECOR_TORCHIC_DOLL
 	checkdecorspace DECOR_TORCHIC_DOLL
 	compare RESULT, 0
@@ -187,7 +187,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80
 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
-	goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4
+	goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4
 	bufferdecorationname 1, DECOR_MUDKIP_DOLL
 	checkdecorspace DECOR_MUDKIP_DOLL
 	compare RESULT, 0
@@ -290,7 +290,7 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC
 MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1500
-	goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E
+	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
 	checkitemspace ITEM_TM32, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
@@ -305,7 +305,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C
 MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 3500
-	goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E
+	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
 	checkitemspace ITEM_TM29, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
@@ -320,7 +320,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76
 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 4000
-	goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E
+	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
 	checkitemspace ITEM_TM35, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
@@ -335,7 +335,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0
 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 4000
-	goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E
+	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
 	checkitemspace ITEM_TM24, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
@@ -350,7 +350,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA
 MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 4000
-	goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E
+	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
 	checkitemspace ITEM_TM13, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
@@ -389,8 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D
 MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_STARTER_DOLL
-	goto_if_eq MauvilleCity_GameCorner_EventScript_157072
+	goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_157072
 	msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157068
@@ -460,11 +459,10 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C
 	end
 
 MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C
-	checkflag FLAG_RECEIVED_20_COINS
-	goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA
+	goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_1570CA
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 1
-	goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA
+	goto_if_ge MauvilleCity_GameCorner_EventScript_1570CA
 	setflag FLAG_RECEIVED_20_COINS
 	givecoins 20
 	msgbox MauvilleCity_GameCorner_Text_18208E, 4
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc
index fd9c673dc..1dc7fc0c7 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -3,8 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450
 	.byte 0
 
 MauvilleCity_Gym_MapScript1_156456:: @ 8156456
-	checkflag FLAG_DEFEATED_MAUVILLE_GYM
-	goto_if_eq MauvilleCity_Gym_EventScript_1565A7
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1565A7
 	switch VAR_MAUVILLE_GYM_STATE
 	case 0, MauvilleCity_Gym_EventScript_156491
 	case 1, MauvilleCity_Gym_EventScript_15657D
@@ -13,8 +12,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456
 	end
 
 MauvilleCity_Gym_EventScript_156491:: @ 8156491
-	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
-	goto_if_eq MauvilleCity_Gym_EventScript_15649B
+	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_15649B
 	end
 
 MauvilleCity_Gym_EventScript_15649B:: @ 815649B
@@ -69,8 +67,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7
 
 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB
 	trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB
-	checkflag FLAG_RECEIVED_TM34
-	goto_if 0, MauvilleCity_Gym_EventScript_15661D
+	goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D
 	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_156641
 	msgbox MauvilleCity_Gym_Text_180EDB, 4
@@ -86,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	setflag FLAG_BADGE03_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if 1, MauvilleCity_Gym_EventScript_1A00FB
+	call_if_eq MauvilleCity_Gym_EventScript_1A00FB
 	setvar VAR_SPECIAL_8, 3
 	call MauvilleCity_Gym_EventScript_1A01C0
 	special MauvilleGymSpecial3
@@ -111,8 +108,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641
 
 MauvilleCity_Gym_EventScript_15664B:: @ 815664B
 	lockall
-	checkflag FLAG_DEFEATED_MAUVILLE_GYM
-	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA
 	compare VAR_MAUVILLE_GYM_STATE, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	setvar VAR_MAUVILLE_GYM_STATE, 1
@@ -122,8 +118,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B
 
 MauvilleCity_Gym_EventScript_156670:: @ 8156670
 	lockall
-	checkflag FLAG_DEFEATED_MAUVILLE_GYM
-	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA
 	compare VAR_MAUVILLE_GYM_STATE, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	setvar VAR_MAUVILLE_GYM_STATE, 2
@@ -133,8 +128,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670
 
 MauvilleCity_Gym_EventScript_156695:: @ 8156695
 	lockall
-	checkflag FLAG_DEFEATED_MAUVILLE_GYM
-	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA
 	compare VAR_MAUVILLE_GYM_STATE, 3
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	setvar VAR_MAUVILLE_GYM_STATE, 3
@@ -147,10 +141,8 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA
 	special MauvilleGymSpecial1
 	special DrawWholeMapView
 	playse SE_KI_GASYAN
-	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
-	goto_if_eq MauvilleCity_Gym_EventScript_1566E1
-	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
-	goto_if 0, MauvilleCity_Gym_EventScript_1566DC
+	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1
+	goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC
 	releaseall
 	end
 
@@ -191,8 +183,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B
 MauvilleCity_Gym_EventScript_156742:: @ 8156742
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_MAUVILLE_GYM
-	goto_if_eq MauvilleCity_Gym_EventScript_156757
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_156757
 	msgbox MauvilleCity_Gym_Text_180815, 4
 	release
 	end
@@ -204,15 +195,13 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757
 
 MauvilleCity_Gym_EventScript_156761:: @ 8156761
 	lockall
-	checkflag FLAG_BADGE03_GET
-	goto_if_eq MauvilleCity_Gym_EventScript_156781
+	goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781
 	goto MauvilleCity_Gym_EventScript_15678B
 	end
 
 MauvilleCity_Gym_EventScript_156771:: @ 8156771
 	lockall
-	checkflag FLAG_BADGE03_GET
-	goto_if_eq MauvilleCity_Gym_EventScript_156781
+	goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781
 	goto MauvilleCity_Gym_EventScript_15678B
 	end
 
diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc
index 210288517..eb21a49e9 100644
--- a/data/scripts/maps/MauvilleCity_House1.inc
+++ b/data/scripts/maps/MauvilleCity_House1.inc
@@ -4,8 +4,7 @@ MauvilleCity_House1_MapScripts:: @ 81569FC
 MauvilleCity_House1_EventScript_1569FD:: @ 81569FD
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_HM06
-	goto_if_eq MauvilleCity_House1_EventScript_156A29
+	goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29
 	msgbox MauvilleCity_House1_Text_181B1A, 4
 	giveitem_std ITEM_HM06
 	setflag FLAG_RECEIVED_HM06
diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc
index 9d3bce68a..f18d278b5 100644
--- a/data/scripts/maps/MauvilleCity_House2.inc
+++ b/data/scripts/maps/MauvilleCity_House2.inc
@@ -4,8 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF
 MauvilleCity_House2_EventScript_1572C0:: @ 81572C0
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_COIN_CASE
-	goto_if_eq MauvilleCity_House2_EventScript_15733D
+	goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_15733D
 	msgbox MauvilleCity_House2_Text_18244E, 4
 	checkitem ITEM_HARBOR_MAIL, 1
 	compare RESULT, 1
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc
index bf51408b8..272d7ed6e 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/scripts/maps/MeteorFalls_1F_1R.inc
@@ -215,8 +215,7 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F
 MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656
 	lock
 	faceplayer
-	checkflag FLAG_MET_PROF_COSMO
-	goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E
+	goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E
 	setflag FLAG_MET_PROF_COSMO
 	msgbox MeteorFalls_1F_1R_Text_1937EB, 4
 	release
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc
index 3d1baf143..7ec338927 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/scripts/maps/MossdeepCity.inc
@@ -7,8 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, MossdeepCity_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_1A02C1
 	end
 
 MossdeepCity_EventScript_14CFAE:: @ 814CFAE
@@ -68,8 +67,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011
 MossdeepCity_EventScript_14D027:: @ 814D027
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_KINGS_ROCK
-	goto_if_eq MossdeepCity_EventScript_14D069
+	goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_14D069
 	msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq MossdeepCity_EventScript_14D073
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index eac7f4adb..364778613 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52
 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62
 	special ValidateEReaderTrainer
 	compare RESULT, 1
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71
 	end
 
 MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71
@@ -18,9 +18,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71
 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84
 	special ValidateEReaderTrainer
 	compare RESULT, 0
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E
 	compare VAR_GAME_CORNER_STATE, 0
-	call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF
+	call_if_ne MossdeepCity_GameCorner_1F_EventScript_15ACAF
 	end
 
 MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E
@@ -50,11 +50,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5
 	applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841
 	waitmovement 0
 	compare VAR_GAME_CORNER_STATE, 1
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22
 	compare VAR_GAME_CORNER_STATE, 2
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD2B
 	compare VAR_GAME_CORNER_STATE, 3
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD34
 	special LoadPlayerParty
 	setvar VAR_GAME_CORNER_STATE, 0
 	releaseall
@@ -101,7 +101,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
 	msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO
 	compare RESULT, NO
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
 	special LoadPlayerParty
 	call S_DoSaveDialog
 	compare RESULT, 0
@@ -112,11 +112,11 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
 	msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4
 	closemessage
 	compare FACING, 2
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04
 	compare FACING, 4
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE16
 	compare FACING, 3
-	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE28
 	warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1
 	waitstate
 	release
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index 9f20b6310..f62693756 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -23,11 +23,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
 	special StartSpecialBattle
 	waitstate
 	compare RESULT, 3
-	call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5
+	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AED5
 	compare RESULT, 1
-	call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3
+	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEE3
 	compare RESULT, 2
-	call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE
+	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE
 	closemessage
 	special ScrSpecial_HealPlayerParty
 	applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index bc22ce3fe..341962431 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -3,26 +3,22 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3
 	.byte 0
 
 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9
-	checkflag FLAG_MOSSDEEP_GYM_SWITCH_1
-	goto_if_eq MossdeepCity_Gym_EventScript_15A510
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A510
 	goto MossdeepCity_Gym_EventScript_15A4E8
 	end
 
 MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8
-	checkflag FLAG_MOSSDEEP_GYM_SWITCH_2
-	goto_if_eq MossdeepCity_Gym_EventScript_15A528
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A528
 	goto MossdeepCity_Gym_EventScript_15A4F7
 	end
 
 MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7
-	checkflag FLAG_MOSSDEEP_GYM_SWITCH_3
-	goto_if_eq MossdeepCity_Gym_EventScript_15A540
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A540
 	goto MossdeepCity_Gym_EventScript_15A506
 	end
 
 MossdeepCity_Gym_EventScript_15A506:: @ 815A506
-	checkflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	goto_if_eq MossdeepCity_Gym_EventScript_15A558
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A558
 	end
 
 MossdeepCity_Gym_EventScript_15A510:: @ 815A510
@@ -50,8 +46,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558
 
 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B
 	trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594
-	checkflag FLAG_RECEIVED_TM04
-	goto_if 0, MossdeepCity_Gym_EventScript_15A5C6
+	goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6
 	msgbox MossdeepCity_Gym_Text_18D273, 4
 	release
 	end
@@ -82,8 +77,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6
 
 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA
 	lockall
-	checkflag FLAG_MOSSDEEP_GYM_SWITCH_1
-	goto_if_eq MossdeepCity_Gym_EventScript_15A621
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
@@ -109,8 +103,7 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621
 
 MossdeepCity_Gym_EventScript_15A646:: @ 815A646
 	lockall
-	checkflag FLAG_MOSSDEEP_GYM_SWITCH_2
-	goto_if_eq MossdeepCity_Gym_EventScript_15A675
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
@@ -130,8 +123,7 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675
 
 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A
 	lockall
-	checkflag FLAG_MOSSDEEP_GYM_SWITCH_3
-	goto_if_eq MossdeepCity_Gym_EventScript_15A6C9
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
@@ -151,8 +143,7 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9
 
 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE
 	lockall
-	checkflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	goto_if_eq MossdeepCity_Gym_EventScript_15A71D
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
@@ -210,8 +201,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1
 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_MOSSDEEP_GYM
-	goto_if_eq MossdeepCity_Gym_EventScript_15A7ED
+	goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED
 	msgbox MossdeepCity_Gym_Text_18C7E3, 4
 	release
 	end
@@ -228,15 +218,13 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7
 
 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA
 	lockall
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq MossdeepCity_Gym_EventScript_15A81A
+	goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A
 	goto MossdeepCity_Gym_EventScript_15A824
 	end
 
 MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A
 	lockall
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq MossdeepCity_Gym_EventScript_15A81A
+	goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A
 	goto MossdeepCity_Gym_EventScript_15A824
 	end
 
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
index 1da204ff0..415dbfc33 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/scripts/maps/MossdeepCity_House2.inc
@@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
 	setflag FLAG_WINGULL_DELIVERED_MAIL
 	clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE
 	compare FACING, 2
-	call_if 1, MossdeepCity_House2_EventScript_15A8AE
+	call_if_eq MossdeepCity_House2_EventScript_15A8AE
 	compare FACING, 3
-	call_if 1, MossdeepCity_House2_EventScript_15A8B9
+	call_if_eq MossdeepCity_House2_EventScript_15A8B9
 	removeobject 3
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc
index fb44685d8..4c4d6cbdd 100644
--- a/data/scripts/maps/MossdeepCity_House3.inc
+++ b/data/scripts/maps/MossdeepCity_House3.inc
@@ -4,8 +4,7 @@ MossdeepCity_House3_MapScripts:: @ 815A971
 MossdeepCity_House3_EventScript_15A972:: @ 815A972
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_SUPER_ROD
-	goto_if_eq MossdeepCity_House3_EventScript_15A9B1
+	goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_15A9B1
 	msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq MossdeepCity_House3_EventScript_15A9BB
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc
index 856ee1287..5fb0f97ff 100644
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ b/data/scripts/maps/MossdeepCity_House4.inc
@@ -4,8 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30
 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31
 	lock
 	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq MossdeepCity_House4_EventScript_15AB46
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46
 	msgbox MossdeepCity_House4_Text_18E0E3, 4
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
index 884124567..83b859c26 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
@@ -8,9 +8,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B
 	specialvar RESULT, GetWeekCount
 	buffernumberstring 0, RESULT
 	compare RESULT, 0
-	call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA
+	call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15ABBA
 	compare RESULT, 1
-	call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3
+	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3
 	closemessage
 	applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D
 	waitmovement 0
@@ -32,8 +32,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC
 MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C
+	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C
 	msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4
 	giveitem_std ITEM_SUN_STONE
 	compare RESULT, 0
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index ce2f2aad5..d9ad70f70 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -5,8 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5
 	.byte 0
 
 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF
+	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF
 	end
 
 MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF
@@ -15,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF
 
 MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9
 	compare VAR_STEVENS_HOUSE_STATE, 1
-	call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5
+	call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5
 	end
 
 MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5
@@ -87,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	bufferspeciesname 1, SPECIES_BELDUM
 	msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678
+	call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678
 	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
 	setflag FLAG_RECEIVED_BELDUM
 	releaseall
@@ -113,8 +112,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
 
 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
 	lockall
-	checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16
+	goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16
 	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
 	releaseall
 	end
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
index be4799a45..ac7c00013 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/scripts/maps/MtChimney.inc
@@ -26,7 +26,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95
 	msgbox MtChimney_Text_1957A9, 4
 	checkitemspace ITEM_LAVA_COOKIE, 1
 	compare RESULT, 1
-	call_if 1, MtChimney_EventScript_15D000
+	call_if_eq MtChimney_EventScript_15D000
 	giveitem_std ITEM_LAVA_COOKIE
 	compare RESULT, 0
 	goto_if_eq MtChimney_EventScript_15CFF3
@@ -406,10 +406,8 @@ MtChimney_EventScript_15D174:: @ 815D174
 
 MtChimney_EventScript_15D17D:: @ 815D17D
 	lockall
-	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
-	goto_if 0, MtChimney_EventScript_15D1D0
-	checkflag FLAG_RECEIVED_METEORITE
-	goto_if_eq MtChimney_EventScript_15D1C6
+	goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0
+	goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6
 	msgbox MtChimney_Text_195870, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq MtChimney_EventScript_15D1BC
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
index aefc68bda..1f98778d6 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
@@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA
 
 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105
 	compare VAR_CABLE_CAR_STATION_STATE, 1
-	call_if 1, MtChimney_CableCarStation_EventScript_15C111
+	call_if_eq MtChimney_CableCarStation_EventScript_15C111
 	end
 
 MtChimney_CableCarStation_EventScript_15C111:: @ 815C111
@@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
 	setvar VAR_CABLE_CAR_STATION_STATE, 2
 	incrementgamestat GAME_STAT_RODE_CABLE_CAR
 	special CableCarWarp
-	special sub_8123218
+	special CableCar
 	waitstate
 	release
 	end
diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc
index 7073000d5..f34c31da0 100644
--- a/data/scripts/maps/MtPyre_1F.inc
+++ b/data/scripts/maps/MtPyre_1F.inc
@@ -4,8 +4,7 @@ MtPyre_1F_MapScripts:: @ 815D322
 MtPyre_1F_EventScript_15D323:: @ 815D323
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_CLEANSE_TAG
-	goto_if_eq MtPyre_1F_EventScript_15D352
+	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352
 	msgbox MtPyre_1F_Text_196151, 4
 	giveitem_std ITEM_CLEANSE_TAG
 	compare RESULT, 0
diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc
index ec5864df5..f8b4141d7 100644
--- a/data/scripts/maps/MtPyre_Exterior.inc
+++ b/data/scripts/maps/MtPyre_Exterior.inc
@@ -9,7 +9,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C
 MtPyre_Exterior_EventScript_15D492:: @ 815D492
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 12
-	goto_if 0, MtPyre_Exterior_EventScript_15D4A3
+	goto_if_lt MtPyre_Exterior_EventScript_15D4A3
 	return
 
 MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
index 56ef5db79..d37100938 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/scripts/maps/MtPyre_Summit.inc
@@ -31,11 +31,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	waitmovement 0
 	delay 50
 	compare VAR_SPECIAL_8, 0
-	call_if 1, MtPyre_Summit_EventScript_15D593
+	call_if_eq MtPyre_Summit_EventScript_15D593
 	compare VAR_SPECIAL_8, 1
-	call_if 1, MtPyre_Summit_EventScript_15D59E
+	call_if_eq MtPyre_Summit_EventScript_15D59E
 	compare VAR_SPECIAL_8, 2
-	call_if 1, MtPyre_Summit_EventScript_15D59F
+	call_if_eq MtPyre_Summit_EventScript_15D59F
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B52B0, 4
 	.else
@@ -53,11 +53,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	delay 20
 	call MtPyre_Summit_EventScript_15D57A
 	compare VAR_SPECIAL_8, 0
-	call_if 1, MtPyre_Summit_EventScript_15D5AA
+	call_if_eq MtPyre_Summit_EventScript_15D5AA
 	compare VAR_SPECIAL_8, 1
-	call_if 1, MtPyre_Summit_EventScript_15D5BF
+	call_if_eq MtPyre_Summit_EventScript_15D5BF
 	compare VAR_SPECIAL_8, 2
-	call_if 1, MtPyre_Summit_EventScript_15D5CA
+	call_if_eq MtPyre_Summit_EventScript_15D5CA
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B53AB, 4
 	.else
@@ -144,9 +144,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
 	msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO
 	.endif
 	compare RESULT, YES
-	call_if 1, MtPyre_Summit_EventScript_15D611
+	call_if_eq MtPyre_Summit_EventScript_15D611
 	compare RESULT, NO
-	call_if 1, MtPyre_Summit_EventScript_15D61A
+	call_if_eq MtPyre_Summit_EventScript_15D61A
 	release
 	end
 
@@ -169,12 +169,9 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A
 MtPyre_Summit_EventScript_15D623:: @ 815D623
 	lock
 	faceplayer
-	checkflag FLAG_RETURNED_RED_OR_BLUE_ORB
-	goto_if_eq MtPyre_Summit_EventScript_15D6C4
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq MtPyre_Summit_EventScript_15D64A
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	goto_if_eq MtPyre_Summit_EventScript_15D6BA
+	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_15D6C4
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A
+	goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B54BE, 4
 	.else
@@ -269,11 +266,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
 	waitmovement 0
 	delay 50
 	compare VAR_SPECIAL_8, 0
-	call_if 1, MtPyre_Summit_EventScript_15D75E
+	call_if_eq MtPyre_Summit_EventScript_15D75E
 	compare VAR_SPECIAL_8, 1
-	call_if 1, MtPyre_Summit_EventScript_15D769
+	call_if_eq MtPyre_Summit_EventScript_15D769
 	compare VAR_SPECIAL_8, 2
-	call_if 1, MtPyre_Summit_EventScript_15D774
+	call_if_eq MtPyre_Summit_EventScript_15D774
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B5BFC, 4
 	.else
@@ -281,11 +278,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
 	.endif
 	closemessage
 	compare VAR_SPECIAL_8, 0
-	call_if 1, MtPyre_Summit_EventScript_15D77F
+	call_if_eq MtPyre_Summit_EventScript_15D77F
 	compare VAR_SPECIAL_8, 1
-	call_if 1, MtPyre_Summit_EventScript_15D78A
+	call_if_eq MtPyre_Summit_EventScript_15D78A
 	compare VAR_SPECIAL_8, 2
-	call_if 1, MtPyre_Summit_EventScript_15D795
+	call_if_eq MtPyre_Summit_EventScript_15D795
 	removeobject 2
 	setvar VAR_MT_PYRE_STATE, 3
 	releaseall
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc
index 2a4d8afce..1c8bdfb3f 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/scripts/maps/NewMauville_Entrance.inc
@@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A
 
 NewMauville_Entrance_MapScript1_15E495:: @ 815E495
 	compare VAR_NEW_MAUVILLE_STATE, 0
-	call_if 1, NewMauville_Entrance_EventScript_15E4A1
+	call_if_eq NewMauville_Entrance_EventScript_15E4A1
 	end
 
 NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc
index ae33d7978..e045cda5d 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/scripts/maps/NewMauville_Inside.inc
@@ -6,11 +6,10 @@ NewMauville_Inside_MapScripts:: @ 815E55F
 
 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F
 	compare VAR_TEMP_1, 1
-	call_if 1, NewMauville_Inside_EventScript_15E5DA
+	call_if_eq NewMauville_Inside_EventScript_15E5DA
 	compare VAR_TEMP_2, 1
-	call_if 1, NewMauville_Inside_EventScript_15E728
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, NewMauville_Inside_EventScript_15E58F
+	call_if_eq NewMauville_Inside_EventScript_15E728
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_15E58F
 	end
 
 NewMauville_Inside_EventScript_15E58F:: @ 815E58F
@@ -24,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593
 
 NewMauville_Inside_MapScript1_15E59E:: @ 815E59E
 	compare VAR_NEW_MAUVILLE_STATE, 2
-	call_if 1, NewMauville_Inside_EventScript_15E88B
+	call_if_eq NewMauville_Inside_EventScript_15E88B
 	end
 
 NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index a2d2616d3..9b1c9dd80 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -5,12 +5,9 @@ OldaleTown_MapScripts:: @ 814DD62
 OldaleTown_MapScript1_14DD68:: @ 814DD68
 	call OldaleTown_EventScript_1A014E
 	setflag FLAG_VISITED_OLDALE_TOWN
-	checkflag FLAG_ADVENTURE_STARTED
-	call_if 0, OldaleTown_EventScript_14DD92
-	checkflag FLAG_RECEIVED_POTION_OLDALE
-	call_if 0, OldaleTown_EventScript_14DD9E
-	checkflag FLAG_ADVENTURE_STARTED
-	call_if 1, OldaleTown_EventScript_14DD8C
+	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92
+	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E
+	call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C
 	end
 
 OldaleTown_EventScript_14DD8C:: @ 814DD8C
@@ -38,10 +35,8 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3
 OldaleTown_EventScript_14DDBC:: @ 814DDBC
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_POTION_OLDALE
-	goto_if_eq OldaleTown_EventScript_14DE79
-	checkflag FLAG_TEMP_1
-	goto_if_eq OldaleTown_EventScript_14DE79
+	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79
+	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79
 	setflag FLAG_TEMP_1
 	playbgm BGM_TSURETEK, FALSE
 	msgbox OldaleTown_Text_16AEF2, 4
@@ -195,8 +190,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB
 OldaleTown_EventScript_14DEDF:: @ 814DEDF
 	lock
 	faceplayer
-	checkflag FLAG_ADVENTURE_STARTED
-	goto_if_eq OldaleTown_EventScript_14DF26
+	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26
 	msgbox OldaleTown_Text_16B0CC, 4
 	closemessage
 	applymovement 3, OldaleTown_Movement_1A083D
diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc
index f90c787c2..15cf40027 100644
--- a/data/scripts/maps/OldaleTown_Mart.inc
+++ b/data/scripts/maps/OldaleTown_Mart.inc
@@ -6,8 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79
 	faceplayer
 	message OldaleTown_Mart_Text_1A0BE4
 	waitmessage
-	checkflag FLAG_ADVENTURE_STARTED
-	goto_if_eq OldaleTown_Mart_EventScript_152FA8
+	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FA8
 	pokemart OldaleTown_Mart_Items1
 	msgbox OldaleTown_Mart_Text_1A0C02, 4
 	release
@@ -43,8 +42,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8
 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6
 	lock
 	faceplayer
-	checkflag FLAG_ADVENTURE_STARTED
-	goto_if_eq OldaleTown_Mart_EventScript_152FDB
+	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FDB
 	msgbox OldaleTown_Mart_Text_174A8A, 4
 	release
 	end
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
index d94e02227..c993807c6 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
@@ -26,8 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E
 OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37
 	lock
 	faceplayer
-	checkflag FLAG_SYS_POKEDEX_GET
-	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C
+	goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_152F4C
 	msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4
 	release
 	end
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc
index df7f42a8b..8ad949bf2 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
@@ -6,28 +6,24 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	faceplayer
 	dodailyevents
 	call PacifidlogTown_House2_EventScript_1541B4
-	checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
-	goto_if_eq PacifidlogTown_House2_EventScript_154254
-	checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
-	call_if 1, PacifidlogTown_House2_EventScript_1541CE
-	checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
-	call_if 0, PacifidlogTown_House2_EventScript_1541D7
+	goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_154254
+	call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE
+	call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541D7
 	setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	specialvar RESULT, GetLeadMonFriendshipScore
 	compare RESULT, 4
-	goto_if 4, PacifidlogTown_House2_EventScript_1541EC
+	goto_if_ge PacifidlogTown_House2_EventScript_1541EC
 	specialvar RESULT, GetLeadMonFriendshipScore
 	compare RESULT, 2
-	goto_if 4, PacifidlogTown_House2_EventScript_15421B
+	goto_if_ge PacifidlogTown_House2_EventScript_15421B
 	goto PacifidlogTown_House2_EventScript_154225
 	end
 
 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4
-	checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
-	goto_if 0, PacifidlogTown_House2_EventScript_1A14DC
+	goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_1A14DC
 	specialvar RESULT, GetDaysUntilPacifidlogTMAvailable
 	compare RESULT, 0
-	call_if 1, PacifidlogTown_House2_EventScript_1541E8
+	call_if_eq PacifidlogTown_House2_EventScript_1541E8
 	return
 
 PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc
index f51aea6f7..3b21ac996 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/scripts/maps/PacifidlogTown_House3.inc
@@ -4,8 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D
 PacifidlogTown_House3_EventScript_15429E:: @ 815429E
 	lock
 	faceplayer
-	checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED
-	goto_if_eq PacifidlogTown_House3_EventScript_154338
+	goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_154338
 	setvar VAR_SPECIAL_8, 2
 	copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
 	specialvar RESULT, GetInGameTradeSpeciesInfo
@@ -22,7 +21,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E
 	specialvar RESULT, GetTradeSpecies
 	copyvar VAR_SPECIAL_B, RESULT
 	compare RESULT, VAR_SPECIAL_9
-	goto_if 5, PacifidlogTown_House3_EventScript_15432A
+	goto_if_ne PacifidlogTown_House3_EventScript_15432A
 	copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
 	copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
 	special CreateInGameTradePokemon
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index ea58f50c6..cb47a0edd 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -6,9 +6,9 @@ PetalburgCity_MapScripts:: @ 814B70C
 PetalburgCity_MapScript1_14B717:: @ 814B717
 	setflag FLAG_VISITED_PETALBURG_CITY
 	compare VAR_PETALBURG_STATE, 0
-	call_if 1, PetalburgCity_EventScript_14B731
+	call_if_eq PetalburgCity_EventScript_14B731
 	compare VAR_PETALBURG_STATE, 2
-	call_if 1, PetalburgCity_EventScript_14B739
+	call_if_eq PetalburgCity_EventScript_14B739
 	end
 
 PetalburgCity_EventScript_14B731:: @ 814B731
@@ -188,23 +188,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866
 	applymovement 9, PetalburgCity_Movement_1A0835
 	waitmovement 0
 	compare VAR_SPECIAL_8, 0
-	call_if 1, PetalburgCity_EventScript_14B91B
+	call_if_eq PetalburgCity_EventScript_14B91B
 	compare VAR_SPECIAL_8, 1
-	call_if 1, PetalburgCity_EventScript_14B930
+	call_if_eq PetalburgCity_EventScript_14B930
 	compare VAR_SPECIAL_8, 2
-	call_if 1, PetalburgCity_EventScript_14B93B
+	call_if_eq PetalburgCity_EventScript_14B93B
 	compare VAR_SPECIAL_8, 3
-	call_if 1, PetalburgCity_EventScript_14B950
+	call_if_eq PetalburgCity_EventScript_14B950
 	msgbox PetalburgCity_Text_16438A, 4
 	closemessage
 	compare VAR_SPECIAL_8, 0
-	call_if 1, PetalburgCity_EventScript_14B965
+	call_if_eq PetalburgCity_EventScript_14B965
 	compare VAR_SPECIAL_8, 1
-	call_if 1, PetalburgCity_EventScript_14B977
+	call_if_eq PetalburgCity_EventScript_14B977
 	compare VAR_SPECIAL_8, 2
-	call_if 1, PetalburgCity_EventScript_14B989
+	call_if_eq PetalburgCity_EventScript_14B989
 	compare VAR_SPECIAL_8, 3
-	call_if 1, PetalburgCity_EventScript_14B99B
+	call_if_eq PetalburgCity_EventScript_14B99B
 	msgbox PetalburgCity_Text_164426, 4
 	applymovement 9, PetalburgCity_Movement_1A0843
 	applymovement 255, PetalburgCity_Movement_1A0843
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 406f260b0..1199b3571 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -9,26 +9,19 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C
 	compare VAR_PETALBURG_GYM_STATE, 6
 	goto_if_eq PetalburgCity_Gym_EventScript_1544A3
 	compare VAR_PETALBURG_GYM_STATE, 7
-	call_if 4, PetalburgCity_Gym_EventScript_1544ED
+	call_if_ge PetalburgCity_Gym_EventScript_1544ED
 	end
 
 PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3
 	setvar VAR_SPECIAL_5, 1
 	call PetalburgCity_Gym_EventScript_154F9A
-	checktrainerflag OPPONENT_RANDALL
-	call_if 1, PetalburgCity_Gym_EventScript_154FBB
-	checktrainerflag OPPONENT_MARY
-	call_if 1, PetalburgCity_Gym_EventScript_154FDC
-	checktrainerflag OPPONENT_PARKER
-	call_if 1, PetalburgCity_Gym_EventScript_154FFD
-	checktrainerflag OPPONENT_LORI
-	call_if 1, PetalburgCity_Gym_EventScript_15501E
-	checktrainerflag OPPONENT_GEORGE
-	call_if 1, PetalburgCity_Gym_EventScript_15503F
-	checktrainerflag OPPONENT_JODY
-	call_if 1, PetalburgCity_Gym_EventScript_155060
-	checktrainerflag OPPONENT_BERKE
-	call_if 1, PetalburgCity_Gym_EventScript_155081
+	call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB
+	call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC
+	call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD
+	call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E
+	call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F
+	call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060
+	call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081
 	end
 
 PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED
@@ -45,11 +38,10 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED
 
 PetalburgCity_Gym_MapScript1_15451B:: @ 815451B
 	compare VAR_PETALBURG_GYM_STATE, 1
-	call_if 1, PetalburgCity_Gym_EventScript_15453B
+	call_if_eq PetalburgCity_Gym_EventScript_15453B
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if 0, PetalburgCity_Gym_EventScript_154543
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 1, PetalburgCity_Gym_EventScript_15454B
+	call_if_lt PetalburgCity_Gym_EventScript_154543
+	call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B
 	end
 
 PetalburgCity_Gym_EventScript_15453B:: @ 815453B
@@ -145,65 +137,65 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	addobject 10
 	playse SE_DOOR
 	compare VAR_SPECIAL_8, 0
-	call_if 1, PetalburgCity_Gym_EventScript_1547EE
+	call_if_eq PetalburgCity_Gym_EventScript_1547EE
 	compare VAR_SPECIAL_8, 1
-	call_if 1, PetalburgCity_Gym_EventScript_154800
+	call_if_eq PetalburgCity_Gym_EventScript_154800
 	compare VAR_SPECIAL_8, 2
-	call_if 1, PetalburgCity_Gym_EventScript_15481C
+	call_if_eq PetalburgCity_Gym_EventScript_15481C
 	compare VAR_SPECIAL_8, 3
-	call_if 1, PetalburgCity_Gym_EventScript_15481C
+	call_if_eq PetalburgCity_Gym_EventScript_15481C
 	msgbox PetalburgCity_Gym_Text_179F07, 4
 	msgbox PetalburgCity_Gym_Text_179F37, 4
 	msgbox PetalburgCity_Gym_Text_179F70, 4
 	msgbox PetalburgCity_Gym_Text_17A03A, 4
 	compare VAR_SPECIAL_8, 0
-	call_if 1, PetalburgCity_Gym_EventScript_154884
+	call_if_eq PetalburgCity_Gym_EventScript_154884
 	compare VAR_SPECIAL_8, 1
-	call_if 1, PetalburgCity_Gym_EventScript_15488F
+	call_if_eq PetalburgCity_Gym_EventScript_15488F
 	compare VAR_SPECIAL_8, 2
-	call_if 1, PetalburgCity_Gym_EventScript_1548A1
+	call_if_eq PetalburgCity_Gym_EventScript_1548A1
 	compare VAR_SPECIAL_8, 3
-	call_if 1, PetalburgCity_Gym_EventScript_1548B3
+	call_if_eq PetalburgCity_Gym_EventScript_1548B3
 	msgbox PetalburgCity_Gym_Text_17A04A, 4
 	compare VAR_SPECIAL_8, 0
-	call_if 1, PetalburgCity_Gym_EventScript_1548C5
+	call_if_eq PetalburgCity_Gym_EventScript_1548C5
 	compare VAR_SPECIAL_8, 1
-	call_if 1, PetalburgCity_Gym_EventScript_1548D0
+	call_if_eq PetalburgCity_Gym_EventScript_1548D0
 	compare VAR_SPECIAL_8, 2
-	call_if 1, PetalburgCity_Gym_EventScript_1548DB
+	call_if_eq PetalburgCity_Gym_EventScript_1548DB
 	compare VAR_SPECIAL_8, 3
-	call_if 1, PetalburgCity_Gym_EventScript_1548E6
+	call_if_eq PetalburgCity_Gym_EventScript_1548E6
 	msgbox PetalburgCity_Gym_Text_17A0A8, 4
 	msgbox PetalburgCity_Gym_Text_17A0EB, 4
 	msgbox PetalburgCity_Gym_Text_17A156, 4
 	compare VAR_SPECIAL_8, 0
-	call_if 1, PetalburgCity_Gym_EventScript_15492F
+	call_if_eq PetalburgCity_Gym_EventScript_15492F
 	compare VAR_SPECIAL_8, 1
-	call_if 1, PetalburgCity_Gym_EventScript_154930
+	call_if_eq PetalburgCity_Gym_EventScript_154930
 	compare VAR_SPECIAL_8, 2
-	call_if 1, PetalburgCity_Gym_EventScript_15493B
+	call_if_eq PetalburgCity_Gym_EventScript_15493B
 	compare VAR_SPECIAL_8, 3
-	call_if 1, PetalburgCity_Gym_EventScript_15493C
+	call_if_eq PetalburgCity_Gym_EventScript_15493C
 	compare VAR_SPECIAL_8, 0
-	call_if 1, PetalburgCity_Gym_EventScript_1548F1
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
 	compare VAR_SPECIAL_8, 1
-	call_if 1, PetalburgCity_Gym_EventScript_1548FC
+	call_if_eq PetalburgCity_Gym_EventScript_1548FC
 	compare VAR_SPECIAL_8, 2
-	call_if 1, PetalburgCity_Gym_EventScript_1548F1
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
 	compare VAR_SPECIAL_8, 3
-	call_if 1, PetalburgCity_Gym_EventScript_1548F1
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
 	msgbox PetalburgCity_Gym_Text_17A171, 4
 	closemessage
 	setflag FLAG_SPECIAL_FLAG_1
 	playbgm BGM_TSURETEK, FALSE
 	compare VAR_SPECIAL_8, 0
-	call_if 1, PetalburgCity_Gym_EventScript_154835
+	call_if_eq PetalburgCity_Gym_EventScript_154835
 	compare VAR_SPECIAL_8, 1
-	call_if 1, PetalburgCity_Gym_EventScript_15484E
+	call_if_eq PetalburgCity_Gym_EventScript_15484E
 	compare VAR_SPECIAL_8, 2
-	call_if 1, PetalburgCity_Gym_EventScript_154860
+	call_if_eq PetalburgCity_Gym_EventScript_154860
 	compare VAR_SPECIAL_8, 3
-	call_if 1, PetalburgCity_Gym_EventScript_154872
+	call_if_eq PetalburgCity_Gym_EventScript_154872
 	removeobject 10
 	setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1
 	setvar VAR_PETALBURG_GYM_STATE, 1
@@ -354,10 +346,8 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D
 	call PetalburgCity_Gym_EventScript_154969
 	compare RESULT, 1
 	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
-	checkflag FLAG_RECEIVED_TM42
-	goto_if 0, PetalburgCity_Gym_EventScript_154A2C
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq PetalburgCity_Gym_EventScript_154B69
+	goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C
+	goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69
 	msgbox PetalburgCity_Gym_Text_17AA6B, 4
 	release
 	end
@@ -420,22 +410,22 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
 	msgbox PetalburgCity_Gym_Text_17A976, 4
 	closemessage
 	compare FACING, 2
-	call_if 1, PetalburgCity_Gym_EventScript_154ABC
+	call_if_eq PetalburgCity_Gym_EventScript_154ABC
 	compare FACING, 1
-	call_if 1, PetalburgCity_Gym_EventScript_154AC7
+	call_if_eq PetalburgCity_Gym_EventScript_154AC7
 	compare FACING, 3
-	call_if 1, PetalburgCity_Gym_EventScript_154AD2
+	call_if_eq PetalburgCity_Gym_EventScript_154AD2
 	compare FACING, 4
-	call_if 1, PetalburgCity_Gym_EventScript_154ADD
+	call_if_eq PetalburgCity_Gym_EventScript_154ADD
 	delay 70
 	compare FACING, 2
-	call_if 1, PetalburgCity_Gym_EventScript_154AE8
+	call_if_eq PetalburgCity_Gym_EventScript_154AE8
 	compare FACING, 1
-	call_if 1, PetalburgCity_Gym_EventScript_154AF3
+	call_if_eq PetalburgCity_Gym_EventScript_154AF3
 	compare FACING, 3
-	call_if 1, PetalburgCity_Gym_EventScript_154AFE
+	call_if_eq PetalburgCity_Gym_EventScript_154AFE
 	compare FACING, 4
-	call_if 1, PetalburgCity_Gym_EventScript_154B09
+	call_if_eq PetalburgCity_Gym_EventScript_154B09
 	msgbox PetalburgCity_Gym_Text_17A9F6, 4
 	release
 	end
@@ -593,7 +583,7 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69
 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73
 	lockall
 	compare VAR_PETALBURG_GYM_STATE, 6
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 7
 	setvar VAR_SPECIAL_9, 85
 	msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO
@@ -623,7 +613,7 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9
 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3
 	lockall
 	compare VAR_PETALBURG_GYM_STATE, 6
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 1
 	setvar VAR_SPECIAL_9, 98
 	msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO
@@ -635,8 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3
 
 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
 	lockall
-	checktrainerflag OPPONENT_RANDALL
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 7
 	setvar VAR_SPECIAL_9, 46
 	msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO
@@ -648,8 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
 
 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
 	lockall
-	checktrainerflag OPPONENT_RANDALL
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 1
 	setvar VAR_SPECIAL_9, 59
 	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
@@ -661,8 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
 
 PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
 	lockall
-	checktrainerflag OPPONENT_MARY
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 7
 	setvar VAR_SPECIAL_9, 59
 	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
@@ -674,8 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
 
 PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
 	lockall
-	checktrainerflag OPPONENT_MARY
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 1
 	setvar VAR_SPECIAL_9, 72
 	msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO
@@ -687,8 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
 
 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
 	lockall
-	checktrainerflag OPPONENT_PARKER
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 1
 	setvar VAR_SPECIAL_9, 20
 	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
@@ -700,8 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
 
 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
 	lockall
-	checktrainerflag OPPONENT_LORI
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 7
 	setvar VAR_SPECIAL_9, 20
 	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
@@ -713,8 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
 
 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
 	lockall
-	checktrainerflag OPPONENT_LORI
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 1
 	setvar VAR_SPECIAL_9, 33
 	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
@@ -726,8 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
 
 PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
 	lockall
-	checktrainerflag OPPONENT_GEORGE
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 7
 	setvar VAR_SPECIAL_9, 33
 	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
@@ -739,8 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
 
 PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
 	lockall
-	checktrainerflag OPPONENT_JODY
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 1
 	setvar VAR_SPECIAL_9, 7
 	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
@@ -752,8 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
 
 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
 	lockall
-	checktrainerflag OPPONENT_BERKE
-	goto_if 0, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_SPECIAL_8, 7
 	setvar VAR_SPECIAL_9, 7
 	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
@@ -765,8 +745,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
 
 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
 	trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_Gym_EventScript_154E29
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29
 	msgbox PetalburgCity_Gym_Text_17AE30, 6
 	end
 
@@ -783,8 +762,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
 
 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
 	trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_Gym_EventScript_154E65
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65
 	msgbox PetalburgCity_Gym_Text_17AFD3, 6
 	end
 
@@ -801,8 +779,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
 
 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
 	trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_Gym_EventScript_154EA1
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1
 	msgbox PetalburgCity_Gym_Text_17B12C, 6
 	end
 
@@ -819,8 +796,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
 
 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
 	trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_Gym_EventScript_154EDD
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD
 	msgbox PetalburgCity_Gym_Text_17B2E4, 6
 	end
 
@@ -837,8 +813,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
 
 PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
 	trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_Gym_EventScript_154F19
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19
 	msgbox PetalburgCity_Gym_Text_17B46F, 6
 	end
 
@@ -855,8 +830,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
 
 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
 	trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_Gym_EventScript_154F55
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55
 	msgbox PetalburgCity_Gym_Text_17B5EA, 6
 	end
 
@@ -873,8 +847,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
 
 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
 	trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_Gym_EventScript_154F91
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91
 	msgbox PetalburgCity_Gym_Text_17B749, 6
 	end
 
@@ -892,72 +865,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91
 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A
 	setvar VAR_SPECIAL_4, 1
 	compare VAR_SPECIAL_5, 0
-	call_if 1, PetalburgCity_Gym_EventScript_155182
+	call_if_eq PetalburgCity_Gym_EventScript_155182
 	compare VAR_SPECIAL_5, 1
-	call_if 1, PetalburgCity_Gym_EventScript_155187
+	call_if_eq PetalburgCity_Gym_EventScript_155187
 	call PetalburgCity_Gym_EventScript_1550A2
 	return
 
 PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB
 	setvar VAR_SPECIAL_4, 2
 	compare VAR_SPECIAL_5, 0
-	call_if 1, PetalburgCity_Gym_EventScript_155182
+	call_if_eq PetalburgCity_Gym_EventScript_155182
 	compare VAR_SPECIAL_5, 1
-	call_if 1, PetalburgCity_Gym_EventScript_155187
+	call_if_eq PetalburgCity_Gym_EventScript_155187
 	call PetalburgCity_Gym_EventScript_1550C7
 	return
 
 PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC
 	setvar VAR_SPECIAL_4, 3
 	compare VAR_SPECIAL_5, 0
-	call_if 1, PetalburgCity_Gym_EventScript_155182
+	call_if_eq PetalburgCity_Gym_EventScript_155182
 	compare VAR_SPECIAL_5, 1
-	call_if 1, PetalburgCity_Gym_EventScript_155187
+	call_if_eq PetalburgCity_Gym_EventScript_155187
 	call PetalburgCity_Gym_EventScript_1550EC
 	return
 
 PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD
 	setvar VAR_SPECIAL_4, 4
 	compare VAR_SPECIAL_5, 0
-	call_if 1, PetalburgCity_Gym_EventScript_155182
+	call_if_eq PetalburgCity_Gym_EventScript_155182
 	compare VAR_SPECIAL_5, 1
-	call_if 1, PetalburgCity_Gym_EventScript_155187
+	call_if_eq PetalburgCity_Gym_EventScript_155187
 	call PetalburgCity_Gym_EventScript_155111
 	return
 
 PetalburgCity_Gym_EventScript_15501E:: @ 815501E
 	setvar VAR_SPECIAL_4, 5
 	compare VAR_SPECIAL_5, 0
-	call_if 1, PetalburgCity_Gym_EventScript_155182
+	call_if_eq PetalburgCity_Gym_EventScript_155182
 	compare VAR_SPECIAL_5, 1
-	call_if 1, PetalburgCity_Gym_EventScript_155187
+	call_if_eq PetalburgCity_Gym_EventScript_155187
 	call PetalburgCity_Gym_EventScript_155124
 	return
 
 PetalburgCity_Gym_EventScript_15503F:: @ 815503F
 	setvar VAR_SPECIAL_4, 6
 	compare VAR_SPECIAL_5, 0
-	call_if 1, PetalburgCity_Gym_EventScript_155182
+	call_if_eq PetalburgCity_Gym_EventScript_155182
 	compare VAR_SPECIAL_5, 1
-	call_if 1, PetalburgCity_Gym_EventScript_155187
+	call_if_eq PetalburgCity_Gym_EventScript_155187
 	call PetalburgCity_Gym_EventScript_155149
 	return
 
 PetalburgCity_Gym_EventScript_155060:: @ 8155060
 	setvar VAR_SPECIAL_4, 7
 	compare VAR_SPECIAL_5, 0
-	call_if 1, PetalburgCity_Gym_EventScript_155182
+	call_if_eq PetalburgCity_Gym_EventScript_155182
 	compare VAR_SPECIAL_5, 1
-	call_if 1, PetalburgCity_Gym_EventScript_155187
+	call_if_eq PetalburgCity_Gym_EventScript_155187
 	call PetalburgCity_Gym_EventScript_15515C
 	return
 
 PetalburgCity_Gym_EventScript_155081:: @ 8155081
 	setvar VAR_SPECIAL_4, 8
 	compare VAR_SPECIAL_5, 0
-	call_if 1, PetalburgCity_Gym_EventScript_155182
+	call_if_eq PetalburgCity_Gym_EventScript_155182
 	compare VAR_SPECIAL_5, 1
-	call_if 1, PetalburgCity_Gym_EventScript_155187
+	call_if_eq PetalburgCity_Gym_EventScript_155187
 	call PetalburgCity_Gym_EventScript_15516F
 	return
 
@@ -1021,8 +994,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187
 PetalburgCity_Gym_EventScript_15518B:: @ 815518B
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_Gym_EventScript_1551A0
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0
 	msgbox PetalburgCity_Gym_Text_17AB96, 4
 	release
 	end
@@ -1034,15 +1006,13 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
 
 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA
 	lockall
-	checkflag FLAG_BADGE05_GET
-	goto_if_eq PetalburgCity_Gym_EventScript_1551CA
+	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
 	goto PetalburgCity_Gym_EventScript_1551D4
 	end
 
 PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
 	lockall
-	checkflag FLAG_BADGE05_GET
-	goto_if_eq PetalburgCity_Gym_EventScript_1551CA
+	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
 	goto PetalburgCity_Gym_EventScript_1551D4
 	end
 
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc
index 66e247323..7584f6f19 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/scripts/maps/PetalburgCity_Mart.inc
@@ -6,8 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0
 	faceplayer
 	message PetalburgCity_Mart_Text_1A0BE4
 	waitmessage
-	checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
-	goto_if_eq PetalburgCity_Mart_EventScript_1552EA
+	goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_1552EA
 	pokemart PetalburgCity_Mart_Items1
 	msgbox PetalburgCity_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
index 8dda62ea1..136cc11c5 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
@@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233
 
 PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F
 	compare VAR_STARTER_MON, 0
-	call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272
+	call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155272
 	compare VAR_STARTER_MON, 1
-	call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B
+	call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15527B
 	compare VAR_STARTER_MON, 2
-	call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284
+	call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155284
 	release
 	end
 
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc
index 08bbcb0c7..d642d70ed 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc
@@ -4,22 +4,17 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3
 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
-	goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7
-	checkflag FLAG_RECEIVED_HM03
-	goto_if_eq PetalburgCity_WallysHouse_EventScript_154427
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_WallysHouse_EventScript_154406
-	checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY
-	goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B
+	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_1543F7
+	goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154427
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154406
+	goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_15443B
 	msgbox PetalburgCity_WallysHouse_Text_179805, 4
 	setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY
 	release
 	end
 
 PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7
-	checkflag FLAG_RECEIVED_HM03
-	goto_if_eq PetalburgCity_WallysHouse_EventScript_154431
+	goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154431
 	goto PetalburgCity_WallysHouse_EventScript_154406
 	end
 
@@ -49,10 +44,8 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B
 PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_HM03
-	goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D
-	checkflag FLAG_DEFEATED_PETALBURG_GYM
-	goto_if_eq PetalburgCity_WallysHouse_EventScript_154463
+	goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_15446D
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154463
 	msgbox PetalburgCity_WallysHouse_Text_179C2C, 4
 	release
 	end
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index 149fd4e46..17908440c 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -241,8 +241,7 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3
 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_MIRACLE_SEED
-	goto_if_eq PetalburgWoods_EventScript_15CF0B
+	goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B
 	msgbox PetalburgWoods_Text_19549E, 4
 	giveitem_std ITEM_MIRACLE_SEED
 	compare RESULT, 0
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index c90a97531..a3824efcf 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -17,10 +17,8 @@ Route104_MapScript1_14EEA8:: @ 814EEA8
 	end
 
 Route104_EventScript_14EEAE:: @ 814EEAE
-	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
-	goto_if 0, Route104_EventScript_14EEC4
-	checkflag FLAG_BADGE03_GET
-	goto_if 0, Route104_EventScript_14EEC4
+	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4
+	goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4
 	clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
 	return
 
@@ -31,8 +29,7 @@ Route104_EventScript_14EEC4:: @ 814EEC4
 Route104_EventScript_14EEC8:: @ 814EEC8
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104
-	goto_if_eq Route104_EventScript_14EEFF
+	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF
 	msgbox Route104_Text_1C55B9, 4
 	giveitem_std ITEM_CHESTO_BERRY
 	compare RESULT, 0
@@ -50,8 +47,7 @@ Route104_EventScript_14EEFF:: @ 814EEFF
 Route104_EventScript_14EF09:: @ 814EF09
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_WHITE_HERB
-	goto_if_eq Route104_EventScript_14EF38
+	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38
 	msgbox Route104_Text_16DD91, 4
 	giveitem_std ITEM_WHITE_HERB
 	compare RESULT, 0
@@ -104,8 +100,7 @@ Route104_EventScript_14EF8A:: @ 814EF8A
 Route104_EventScript_14EF93:: @ 814EF93
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM09
-	goto_if_eq Route104_EventScript_14EFC2
+	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2
 	msgbox Route104_Text_16DC5F, 4
 	giveitem_std ITEM_TM09
 	compare RESULT, 0
@@ -158,10 +153,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5
 	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	moveobjectoffscreen 2
 	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0
-	checkflag FLAG_DELIVERED_STEVEN_LETTER
-	goto_if 0, Route104_EventScript_14F08B
-	checkflag FLAG_DELIVERED_STEVEN_LETTER
-	goto_if_eq Route104_EventScript_14F095
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B
+	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095
 	end
 
 Route104_EventScript_14F08B:: @ 814F08B
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc
index 4718f9bb9..514b1b9cc 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
@@ -5,9 +5,8 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2
 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8
 	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
 	compare VAR_BRINEY_HOUSE_STATE, 1
-	call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4
-	checkflag FLAG_RECEIVED_POKENAV
-	call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0
+	call_if_eq Route104_MrBrineysHouse_EventScript_15BCD4
+	call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_15BCD0
 	end
 
 Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0
@@ -24,12 +23,9 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4
 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB
 	lock
 	faceplayer
-	checkflag FLAG_MR_BRINEY_SAILING_INTRO
-	call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E
-	checkflag FLAG_DELIVERED_STEVEN_LETTER
-	goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65
-	checkflag FLAG_DELIVERED_DEVON_GOODS
-	goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E
+	call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_15BD0E
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_15BD65
+	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_15BD7E
 	goto Route104_MrBrineysHouse_EventScript_15BD32
 	end
 
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index f7fbb58b5..5e70a8ec2 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -4,10 +4,8 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4
 
 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA
 	setflag FLAG_LANDMARK_FLOWER_SHOP
-	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
-	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
-	checkflag FLAG_BADGE03_GET
-	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
+	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE03
+	goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_15BE03
 	setflag FLAG_TEMP_1
 	end
 
@@ -18,26 +16,24 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03
 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_1
-	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C
+	goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_15BE7C
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4
-	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
-	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A
+	goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE4A
 	setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A
+	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A
 	compare RESULT, NO
-	call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73
+	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73
 	release
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A
+	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A
 	compare RESULT, NO
-	call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73
+	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73
 	release
 	end
 
@@ -72,8 +68,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94
 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_WAILMER_PAIL
-	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9
+	goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_15BEB9
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4
 	release
 	end
@@ -90,8 +85,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP
-	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP, Route104_PrettyPetalFlowerShop_EventScript_15BF1A
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4
 	random 8
 	addvar RESULT, ITEM_CHERI_BERRY
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc
index b3b256d79..e0aba01c9 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/scripts/maps/Route104_Prototype.inc
@@ -4,22 +4,15 @@ Route104_Prototype_MapScripts:: @ 8160C4A
 Route104_Prototype_EventScript_160C4B:: @ 8160C4B
 	lock
 	faceplayer
-	checktrainerflag OPPONENT_BRIANNA_1
-	goto_if 0, Route104_Prototype_EventScript_160C99
-	checktrainerflag OPPONENT_CINDY_2
-	goto_if 0, Route104_Prototype_EventScript_160C99
-	checktrainerflag OPPONENT_AMY_AND_LIV_3
-	goto_if 0, Route104_Prototype_EventScript_160C99
-	checktrainerflag OPPONENT_GINA_AND_MIA_2
-	goto_if 0, Route104_Prototype_EventScript_160C99
-	checktrainerflag OPPONENT_LUCAS_2
-	goto_if 0, Route104_Prototype_EventScript_160C99
-	checktrainerflag OPPONENT_MIKE_1
-	goto_if 0, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99
 	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
 	msgbox Route104_Prototype_Text_19B267, 4
-	checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
-	goto_if_eq Route104_Prototype_EventScript_160CFB
+	goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB
 	release
 	end
 
@@ -31,22 +24,15 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99
 Route104_Prototype_EventScript_160CA3:: @ 8160CA3
 	lock
 	faceplayer
-	checktrainerflag OPPONENT_BRIANNA_1
-	goto_if 0, Route104_Prototype_EventScript_160CF1
-	checktrainerflag OPPONENT_CINDY_2
-	goto_if 0, Route104_Prototype_EventScript_160CF1
-	checktrainerflag OPPONENT_AMY_AND_LIV_3
-	goto_if 0, Route104_Prototype_EventScript_160CF1
-	checktrainerflag OPPONENT_GINA_AND_MIA_2
-	goto_if 0, Route104_Prototype_EventScript_160CF1
-	checktrainerflag OPPONENT_LUCAS_2
-	goto_if 0, Route104_Prototype_EventScript_160CF1
-	checktrainerflag OPPONENT_MIKE_1
-	goto_if 0, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1
 	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
 	msgbox Route104_Prototype_Text_19B2E9, 4
-	checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
-	goto_if_eq Route104_Prototype_EventScript_160CFB
+	goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB
 	release
 	end
 
diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc
index 30157e52f..305a2e9af 100644
--- a/data/scripts/maps/Route105.inc
+++ b/data/scripts/maps/Route105.inc
@@ -3,8 +3,7 @@ Route105_MapScripts:: @ 814F298
 	.byte 0
 
 Route105_MapScript1_14F29E:: @ 814F29E
-	checkflag FLAG_REGI_DOORS_OPENED
-	call_if 0, Route105_EventScript_14F2A8
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_14F2A8
 	end
 
 Route105_EventScript_14F2A8:: @ 814F2A8
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index c0344f150..c70365b6a 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -271,8 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D
 Route109_EventScript_14F680:: @ 814F680
 	lock
 	faceplayer
-	checkflag FLAG_DELIVERED_DEVON_GOODS
-	goto_if 0, Route109_EventScript_14F691
+	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_14F691
 	goto Route109_EventScript_14F6AF
 	end
 
@@ -328,8 +327,7 @@ Route109_EventScript_14F725:: @ 814F725
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
-	checkflag FLAG_RECEIVED_SOFT_SAND
-	goto_if_eq Route109_EventScript_14F762
+	goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762
 	msgbox Route109_Text_16E433, 4
 	giveitem_std ITEM_SOFT_SAND
 	compare RESULT, 0
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc
index 4c1574824..13d37e7bd 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
@@ -9,12 +9,9 @@ Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0
 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_6_SODA_POP
-	goto_if_eq Route109_SeashoreHouse_EventScript_160E36
-	checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS
-	goto_if_eq Route109_SeashoreHouse_EventScript_160E08
-	checkflag FLAG_TEMP_2
-	goto_if_eq Route109_SeashoreHouse_EventScript_160DFE
+	goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_160E36
+	goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS, Route109_SeashoreHouse_EventScript_160E08
+	goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_160DFE
 	msgbox Route109_SeashoreHouse_Text_19B4D9, 4
 	setflag FLAG_TEMP_2
 	release
@@ -94,12 +91,9 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE
 	end
 
 Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09
-	checktrainerflag OPPONENT_DWAYNE
-	goto_if 0, Route109_SeashoreHouse_EventScript_160F29
-	checktrainerflag OPPONENT_JOHANNA
-	goto_if 0, Route109_SeashoreHouse_EventScript_160F29
-	checktrainerflag OPPONENT_SIMON
-	goto_if 0, Route109_SeashoreHouse_EventScript_160F29
+	goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29
+	goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29
+	goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29
 	setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS
 	release
 	end
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index d5219582c..070340760 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -13,7 +13,7 @@ Route110_MapScript1_14F914:: @ 814F914
 	call Route110_EventScript_1A014E
 	call Route110_EventScript_1A0172
 	compare VAR_CYCLING_CHALLENGE_STATE, 1
-	call_if 1, Route110_EventScript_14F92F
+	call_if_eq Route110_EventScript_14F92F
 	end
 
 Route110_EventScript_14F92F:: @ 814F92F
@@ -327,9 +327,9 @@ Route110_EventScript_14FD34:: @ 814FD34
 	lockall
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, Route110_EventScript_14FDA7
+	call_if_eq Route110_EventScript_14FDA7
 	compare RESULT, 1
-	call_if 1, Route110_EventScript_14FDAC
+	call_if_eq Route110_EventScript_14FDAC
 	applymovement 28, Route110_Movement_1A0845
 	waitmovement 0
 	applymovement 28, Route110_Movement_1A0833
@@ -338,11 +338,11 @@ Route110_EventScript_14FD34:: @ 814FD34
 	waitmovement 0
 	delay 30
 	compare VAR_SPECIAL_8, 1
-	call_if 1, Route110_EventScript_14FF14
+	call_if_eq Route110_EventScript_14FF14
 	compare VAR_SPECIAL_8, 2
-	call_if 1, Route110_EventScript_14FF1F
+	call_if_eq Route110_EventScript_14FF1F
 	compare VAR_SPECIAL_8, 3
-	call_if 1, Route110_EventScript_14FF2A
+	call_if_eq Route110_EventScript_14FF2A
 	checkplayergender
 	compare RESULT, 0
 	goto_if_eq Route110_EventScript_14FDB1
@@ -426,22 +426,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5
 Route110_EventScript_14FEB2:: @ 814FEB2
 	closemessage
 	compare VAR_SPECIAL_8, 1
-	call_if 1, Route110_EventScript_14FF56
+	call_if_eq Route110_EventScript_14FF56
 	compare VAR_SPECIAL_8, 2
-	call_if 1, Route110_EventScript_14FF5E
+	call_if_eq Route110_EventScript_14FF5E
 	compare VAR_SPECIAL_8, 3
-	call_if 1, Route110_EventScript_14FF66
+	call_if_eq Route110_EventScript_14FF66
 	setobjectmovementtype 28, 10
 	setobjectmovementtype 29, 10
 	removeobject 28
 	addobject 29
 	delay 45
 	compare VAR_SPECIAL_8, 1
-	call_if 1, Route110_EventScript_14FF35
+	call_if_eq Route110_EventScript_14FF35
 	compare VAR_SPECIAL_8, 2
-	call_if 1, Route110_EventScript_14FF40
+	call_if_eq Route110_EventScript_14FF40
 	compare VAR_SPECIAL_8, 3
-	call_if 1, Route110_EventScript_14FF4B
+	call_if_eq Route110_EventScript_14FF4B
 	removeobject 29
 	setvar VAR_ROUTE110_STATE, 1
 	savebgm 0
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index af72dedd0..f05e2caa2 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
@@ -4,9 +4,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8
 
 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE
 	compare VAR_CYCLING_CHALLENGE_STATE, 3
-	call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5
+	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5
 	compare VAR_CYCLING_CHALLENGE_STATE, 2
-	call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5
+	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5
 	end
 
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5
@@ -25,7 +25,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7
 	lockall
 	specialvar RESULT, GetPlayerAvatarBike @ player state?
 	compare RESULT, 2
-	call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D
+	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D
 	compare RESULT, 0
 	goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523
 	setflag FLAG_SYS_CYCLING_ROAD
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc
index 68ce0f5a7..020c61258 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
@@ -7,7 +7,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936
 
 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B
 	compare VAR_TEMP_1, 1
-	call_if 1, Route110_TrickHouseEnd_EventScript_161994
+	call_if_eq Route110_TrickHouseEnd_EventScript_161994
 	end
 
 Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957
@@ -62,7 +62,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_RARE_CANDY
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
@@ -75,7 +75,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TIMER_BALL
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
@@ -88,7 +88,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_HARD_STONE
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
@@ -101,7 +101,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_SMOKE_BALL
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
@@ -114,7 +114,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TM12
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
@@ -127,7 +127,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_MAGNET
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
@@ -140,7 +140,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_PP_MAX
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
@@ -151,13 +151,13 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
 	msgbox Route110_TrickHouseEnd_Text_19C5AF, 4
 	closemessage
 	compare FACING, 1
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C74
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C74
 	compare FACING, 2
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C7F
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C7F
 	compare FACING, 3
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C8A
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C8A
 	compare FACING, 4
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C95
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C95
 	delay 30
 	msgbox Route110_TrickHouseEnd_Text_19C602, 4
 	closemessage
@@ -172,7 +172,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
 	givedecoration_std DECOR_RED_TENT
 	.endc
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_161C61
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C61
 	msgbox Route110_TrickHouseEnd_Text_19C85C, 4
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	special ResetTrickHouseEndRoomFlag
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 232d324a4..527f09d27 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -13,11 +13,11 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
 	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E
 	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
 	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
 	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
 	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
 	case 0, Route110_TrickHouseEntrance_EventScript_16109A
 	case 1, Route110_TrickHouseEntrance_EventScript_1610A0
@@ -45,56 +45,49 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE
 Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if 1, Route110_TrickHouseEntrance_EventScript_16103C
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16103C
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if 1, Route110_TrickHouseEntrance_EventScript_161046
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161046
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
-	call_if 1, Route110_TrickHouseEntrance_EventScript_161050
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161050
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
-	call_if 1, Route110_TrickHouseEntrance_EventScript_16105A
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16105A
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
-	call_if 1, Route110_TrickHouseEntrance_EventScript_161064
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161064
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
-	call_if 1, Route110_TrickHouseEntrance_EventScript_16106E
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16106E
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
-	call_if 1, Route110_TrickHouseEntrance_EventScript_161078
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161078
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
-	call_if 1, Route110_TrickHouseEntrance_EventScript_161082
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161082
 	return
 
 Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C
-	checkflag FLAG_BADGE03_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
+	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046
-	checkflag FLAG_BADGE04_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
+	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050
-	checkflag FLAG_BADGE05_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
+	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A
-	checkflag FLAG_BADGE06_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
+	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064
-	checkflag FLAG_BADGE07_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
+	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E
-	checkflag FLAG_BADGE08_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
+	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
+	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082
@@ -214,7 +207,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7
 	lockall
 	delay 20
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_161327
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161327
 	msgbox Route110_TrickHouseEntrance_Text_19BD82, 4
 	closemessage
 	delay 20
@@ -249,21 +242,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D
 	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835
 	waitmovement 0
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
-	call_if 1, Route110_TrickHouseEntrance_EventScript_161303
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161303
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
-	call_if 1, Route110_TrickHouseEntrance_EventScript_16130C
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16130C
 	closemessage
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
 	warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
@@ -372,7 +365,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
 	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
 	releaseall
 	end
@@ -382,7 +375,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
 	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
 	releaseall
 	end
@@ -392,7 +385,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
 	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
 	releaseall
 	end
@@ -402,7 +395,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
 	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
 	releaseall
 	end
@@ -412,7 +405,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
 	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
 	releaseall
 	end
@@ -422,7 +415,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
 	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
 	releaseall
 	end
@@ -432,7 +425,7 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
 	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
 	releaseall
 	end
@@ -457,7 +450,7 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161551
 	compare RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8
 	msgbox Route110_TrickHouseEntrance_Text_19C18D, 4
 	releaseall
 	end
@@ -727,11 +720,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0
 	msgbox Route110_TrickHouseEntrance_Text_19BA56, 4
 	releaseall
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if 1, Route110_TrickHouseEntrance_EventScript_16190B
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16190B
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
 	end
 
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
index b1cb0c9df..cdde15d1a 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
@@ -5,13 +5,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76
 
 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81
 	compare VAR_TEMP_1, 1
-	call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_161E2C
 	compare VAR_TEMP_2, 1
-	call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_161E3F
 	compare VAR_TEMP_3, 1
-	call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_161E52
 	compare VAR_TEMP_4, 1
-	call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_161E65
 	end
 
 Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
index 8d5392ae8..14a021e8d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
@@ -6,9 +6,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD
 Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8
 	call Route110_TrickHousePuzzle3_EventScript_161F12
 	compare VAR_TEMP_9, 0
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5
 	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8
 	end
 
 Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4
@@ -32,19 +32,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12
 	setmetatile 1, 3, 600, 0
 	setmetatile 10, 2, 600, 0
 	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161F9F
 	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161FA9
 	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161FB3
 	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161FBD
 	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161FC7
 	compare VAR_TEMP_8, 6
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161FD1
 	compare VAR_TEMP_8, 7
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161FDB
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F
@@ -303,19 +303,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612
 	setvar VAR_TEMP_6, 0
 	setvar VAR_TEMP_7, 0
 	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_162683
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_162683
 	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_162689
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_162689
 	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_16268F
 	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_162695
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_162695
 	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_16269B
 	compare VAR_TEMP_8, 6
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A1
 	compare VAR_TEMP_8, 7
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A7
 	return
 
 Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683
@@ -348,9 +348,9 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7
 
 Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD
 	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5
 	compare VAR_TEMP_9, 0
-	call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8
 	special DrawWholeMapView
 	compare VAR_TEMP_9, 1
 	goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
index 1bcdb8087..5ec1a4d64 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
@@ -166,11 +166,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F
 	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
 	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
 	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
 	msgbox Route110_TrickHousePuzzle5_Text_19D423, 4
 	random 3
 	switch RESULT
@@ -188,11 +188,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3
 	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B
 	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3
 	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B
 	msgbox Route110_TrickHousePuzzle5_Text_19D636, 4
 	random 3
 	switch RESULT
@@ -210,11 +210,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27
 	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
 	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
 	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
 	msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4
 	random 3
 	switch RESULT
@@ -232,11 +232,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B
 	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
 	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
 	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
 	msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4
 	random 3
 	switch RESULT
@@ -254,11 +254,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F
 	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B
 	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3
 	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B
 	msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4
 	random 3
 	switch RESULT
@@ -419,80 +419,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9
 
 Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3
 	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F43
 	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F4E
 	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F59
 	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F64
 	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F6F
 	return
 
 Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B
 	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F7A
 	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F85
 	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F90
 	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F9B
 	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FA6
 	return
 
 Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63
 	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FB1
 	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FBC
 	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FC7
 	compare VAR_TEMP_9, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FD2
 	compare VAR_TEMP_9, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FDD
 	return
 
 Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B
 	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FE8
 	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FF3
 	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FFE
 	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_163009
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163009
 	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_163014
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163014
 	return
 
 Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3
 	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_16301F
 	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_16302A
 	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_163035
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163035
 	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_163040
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163040
 	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_16304B
 	return
 
 Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B
 	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_163056
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163056
 	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_163061
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163061
 	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_16306C
 	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_163077
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163077
 	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_163082
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163082
 	return
 
 Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
index d1de7682f..1ee608166 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
@@ -10,16 +10,11 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_163195
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195
@@ -87,7 +82,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E
 
 Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_163167
+	call_if_eq Route110_TrickHousePuzzle7_EventScript_163167
 	end
 
 Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B
@@ -121,76 +116,56 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8
 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9
 	lockall
 	delay 32
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_163195
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8
 	lockall
 	delay 32
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_163207
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317
 	lockall
 	delay 32
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346
 	lockall
 	delay 32
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375
 	lockall
 	delay 32
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_163240
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC
-	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index c338091a0..99fa29efb 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -4,8 +4,7 @@ Route111_MapScripts:: @ 814FF91
 	.byte 0
 
 Route111_MapScript1_14FF9C:: @ 814FF9C
-	checkflag FLAG_REGI_DOORS_OPENED
-	call_if 0, Route111_EventScript_14FFA6
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6
 	end
 
 Route111_EventScript_14FFA6:: @ 814FFA6
@@ -16,22 +15,21 @@ Route111_EventScript_14FFA6:: @ 814FFA6
 Route111_MapScript1_14FFB9:: @ 814FFB9
 	call Route111_EventScript_14FFCD
 	call Route111_EventScript_1AE313
-	checktrainerflag OPPONENT_VICKY
-	goto_if 0, Route111_EventScript_15000D
+	goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D
 	end
 
 Route111_EventScript_14FFCD:: @ 814FFCD
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 34
-	goto_if 0, Route111_EventScript_15000C
+	goto_if_lt Route111_EventScript_15000C
 	compare VAR_TEMP_1, 107
-	goto_if 2, Route111_EventScript_15000C
+	goto_if_gt Route111_EventScript_15000C
 	compare VAR_TEMP_1, 72
-	goto_if 2, Route111_EventScript_150009
+	goto_if_gt Route111_EventScript_150009
 	compare VAR_TEMP_0, 2000
-	goto_if 2, Route111_EventScript_15000C
+	goto_if_gt Route111_EventScript_15000C
 	compare VAR_TEMP_0, 8
-	goto_if 0, Route111_EventScript_15000C
+	goto_if_lt Route111_EventScript_15000C
 
 Route111_EventScript_150009:: @ 8150009
 	setweather WEATHER_SANDSTORM
@@ -121,8 +119,7 @@ Route111_EventScript_1500C5:: @ 81500C5
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
-	goto_if_eq Route111_EventScript_150100
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100
 	msgbox Route111_Text_1C56F0, 4
 	giveitem_std ITEM_RAZZ_BERRY
 	compare RESULT, 0
@@ -174,13 +171,13 @@ Route111_EventScript_150151:: @ 8150151
 	msgbox Route111_Text_1A0F93, 4
 	closemessage
 	compare VAR_SPECIAL_4, 0
-	call_if 1, Route111_EventScript_150188
+	call_if_eq Route111_EventScript_150188
 	compare VAR_SPECIAL_4, 1
-	call_if 1, Route111_EventScript_150193
+	call_if_eq Route111_EventScript_150193
 	compare VAR_SPECIAL_4, 2
-	call_if 1, Route111_EventScript_15019E
+	call_if_eq Route111_EventScript_15019E
 	compare VAR_SPECIAL_4, 3
-	call_if 1, Route111_EventScript_1501A9
+	call_if_eq Route111_EventScript_1501A9
 	releaseall
 	end
 
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
index 8352db786..020b51791 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
@@ -13,8 +13,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A
 	lock
 	faceplayer
 	setvar VAR_SPECIAL_8, 3
-	checkflag FLAG_RECEIVED_MACHO_BRACE
-	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72
+	goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_15BF72
 	msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4
 	giveitem_std ITEM_MACHO_BRACE
 	compare RESULT, 0
@@ -40,8 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95
 	lock
 	faceplayer
 	setvar VAR_SPECIAL_8, 4
-	checkflag FLAG_TEMP_4
-	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6
+	goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_15BFB6
 	msgbox Route111_WinstrateFamilysHouse_Text_192219, 4
 	setflag FLAG_TEMP_4
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
index adbea780e..570075078 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/scripts/maps/Route112_CableCarStation.inc
@@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033
 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E
 	setescapewarp MAP_ROUTE112, 255, 28, 28
 	compare VAR_CABLE_CAR_STATION_STATE, 2
-	call_if 1, Route112_CableCarStation_EventScript_15C052
+	call_if_eq Route112_CableCarStation_EventScript_15C052
 	end
 
 Route112_CableCarStation_EventScript_15C052:: @ 815C052
@@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
 	setvar VAR_CABLE_CAR_STATION_STATE, 1
 	incrementgamestat GAME_STAT_RODE_CABLE_CAR
 	special CableCarWarp
-	special sub_8123218
+	special CableCar
 	waitstate
 	release
 	end
diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc
index a1593ba1e..41b289db0 100644
--- a/data/scripts/maps/Route113.inc
+++ b/data/scripts/maps/Route113.inc
@@ -15,9 +15,9 @@ Route113_MapScript1_1505DA:: @ 81505DA
 Route113_EventScript_1505E5:: @ 81505E5
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 19
-	goto_if 0, Route113_EventScript_150604
+	goto_if_lt Route113_EventScript_150604
 	compare VAR_TEMP_0, 84
-	goto_if 2, Route113_EventScript_150604
+	goto_if_gt Route113_EventScript_150604
 	setweather WEATHER_ASH
 	return
 
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc
index 3f991277f..e42a6f89a 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
@@ -5,7 +5,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A
 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550
 	setflag FLAG_LANDMARK_GLASS_WORKSHOP
 	compare VAR_GLASS_WORKSHOP_STATE, 1
-	call_if 1, Route113_GlassWorkshop_EventScript_16355F
+	call_if_eq Route113_GlassWorkshop_EventScript_16355F
 	end
 
 Route113_GlassWorkshop_EventScript_16355F:: @ 816355F
@@ -16,7 +16,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565
 	lock
 	faceplayer
 	compare VAR_GLASS_WORKSHOP_STATE, 10
-	goto_if 4, Route113_GlassWorkshop_EventScript_1638D2
+	goto_if_ge Route113_GlassWorkshop_EventScript_1638D2
 	compare VAR_GLASS_WORKSHOP_STATE, 2
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635B5
 	compare VAR_GLASS_WORKSHOP_STATE, 1
@@ -39,7 +39,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635E4
 	msgbox Route113_GlassWorkshop_Text_19E65B, 4
 	compare VAR_ASH_GATHER_COUNT, 250
-	goto_if 0, Route113_GlassWorkshop_EventScript_163818
+	goto_if_lt Route113_GlassWorkshop_EventScript_163818
 	message Route113_GlassWorkshop_Text_19E757
 	waitmessage
 	goto Route113_GlassWorkshop_EventScript_1635EE
@@ -71,7 +71,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660
 	bufferitemname 0, VAR_SPECIAL_8
 	setvar VAR_SPECIAL_A, 250
 	compare VAR_ASH_GATHER_COUNT, 250
-	goto_if 0, Route113_GlassWorkshop_EventScript_163830
+	goto_if_lt Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
@@ -85,7 +85,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C
 	bufferitemname 0, VAR_SPECIAL_8
 	setvar VAR_SPECIAL_A, 500
 	compare VAR_ASH_GATHER_COUNT, 500
-	goto_if 0, Route113_GlassWorkshop_EventScript_163830
+	goto_if_lt Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
@@ -99,7 +99,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8
 	bufferitemname 0, VAR_SPECIAL_8
 	setvar VAR_SPECIAL_A, 500
 	compare VAR_ASH_GATHER_COUNT, 500
-	goto_if 0, Route113_GlassWorkshop_EventScript_163830
+	goto_if_lt Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
@@ -113,7 +113,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714
 	bufferitemname 0, VAR_SPECIAL_8
 	setvar VAR_SPECIAL_A, 1000
 	compare VAR_ASH_GATHER_COUNT, 1000
-	goto_if 0, Route113_GlassWorkshop_EventScript_163830
+	goto_if_lt Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
@@ -127,7 +127,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750
 	bufferitemname 0, VAR_SPECIAL_8
 	setvar VAR_SPECIAL_A, 1000
 	compare VAR_ASH_GATHER_COUNT, 1000
-	goto_if 0, Route113_GlassWorkshop_EventScript_163830
+	goto_if_lt Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
@@ -142,7 +142,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C
 	bufferdecorationname 0, VAR_SPECIAL_8
 	setvar VAR_SPECIAL_A, 6000
 	compare VAR_ASH_GATHER_COUNT, 6000
-	goto_if 0, Route113_GlassWorkshop_EventScript_163830
+	goto_if_lt Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
@@ -157,7 +157,7 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD
 	bufferdecorationname 0, VAR_SPECIAL_8
 	setvar VAR_SPECIAL_A, 8000
 	compare VAR_ASH_GATHER_COUNT, 8000
-	goto_if 0, Route113_GlassWorkshop_EventScript_163830
+	goto_if_lt Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
@@ -202,9 +202,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851
 	fadescreen 0
 	msgbox Route113_GlassWorkshop_Text_19E9D7, 4
 	compare VAR_SPECIAL_9, 0
-	call_if 1, Route113_GlassWorkshop_EventScript_163889
+	call_if_eq Route113_GlassWorkshop_EventScript_163889
 	compare VAR_SPECIAL_9, 1
-	call_if 1, Route113_GlassWorkshop_EventScript_1638A1
+	call_if_eq Route113_GlassWorkshop_EventScript_1638A1
 	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	release
 	end
@@ -296,9 +296,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D
 Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1
 	msgbox Route113_GlassWorkshop_Text_19E9D7, 4
 	compare VAR_SPECIAL_9, 0
-	call_if 1, Route113_GlassWorkshop_EventScript_163889
+	call_if_eq Route113_GlassWorkshop_EventScript_163889
 	compare VAR_SPECIAL_9, 1
-	call_if 1, Route113_GlassWorkshop_EventScript_1638A1
+	call_if_eq Route113_GlassWorkshop_EventScript_1638A1
 	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	release
 	end
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc
index f6bb6d8ba..30ab8c572 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/scripts/maps/Route114.inc
@@ -5,8 +5,7 @@ Route114_EventScript_150733:: @ 8150733
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114
-	goto_if_eq Route114_EventScript_150778
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778
 	msgbox Route114_Text_1C5803, 4
 	random 5
 	addvar RESULT, 15
@@ -27,8 +26,7 @@ Route114_EventScript_150778:: @ 8150778
 Route114_EventScript_150782:: @ 8150782
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM05
-	goto_if_eq Route114_EventScript_1507B9
+	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9
 	msgbox Route114_Text_170154, 4
 	giveitem_std ITEM_TM05
 	compare RESULT, 0
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc
index 1a1445fde..b191db5f6 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc
@@ -9,8 +9,7 @@ Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF
 Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM28
-	goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2
+	goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2
 	msgbox Route114_FossilManiacsHouse_Text_1925E1, 4
 	giveitem_std ITEM_TM28
 	compare RESULT, 0
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
index 2ce9c1bfa..740a48314 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
@@ -4,8 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E
 Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_FOSSIL_MON
-	goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E
+	goto_if_set FLAG_RECEIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_15C24E
 	checkitem ITEM_ROOT_FOSSIL, 1
 	compare RESULT, 1
 	goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc
index c34d4fc7e..30eb844ac 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/scripts/maps/Route114_LanettesHouse.inc
@@ -9,8 +9,7 @@ Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E
 Route114_LanettesHouse_EventScript_15C262:: @ 815C262
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_DOLL_LANETTE
-	goto_if_eq Route114_LanettesHouse_EventScript_15C28F
+	goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_15C28F
 	setflag FLAG_SYS_PC_LANETTE
 	msgbox Route114_LanettesHouse_Text_192A0D, 4
 	.ifdef SAPPHIRE
@@ -41,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299
 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7
 	msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, Route114_LanettesHouse_EventScript_15C2CC
+	call_if_eq Route114_LanettesHouse_EventScript_15C2CC
 	releaseall
 	end
 
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index 4e08705cf..eea14e25d 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -3,8 +3,7 @@ Route116_MapScripts:: @ 8150A31
 	.byte 0
 
 Route116_MapScript1_150A37:: @ 8150A37
-	checkflag FLAG_RECOVERED_DEVON_GOODS
-	call_if 1, Route116_EventScript_150A41
+	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A41
 	end
 
 Route116_EventScript_150A41:: @ 8150A41
@@ -14,10 +13,8 @@ Route116_EventScript_150A41:: @ 8150A41
 Route116_EventScript_150A49:: @ 8150A49
 	lock
 	faceplayer
-	checkflag FLAG_RECOVERED_DEVON_GOODS
-	goto_if_eq Route116_EventScript_150A67
-	checkflag FLAG_DEVON_GOODS_STOLEN
-	goto_if_eq Route116_EventScript_150A71
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71
 	msgbox Route116_Text_1703CF, 4
 	release
 	end
@@ -35,8 +32,7 @@ Route116_EventScript_150A71:: @ 8150A71
 Route116_EventScript_150A7B:: @ 8150A7B
 	lock
 	faceplayer
-	checkflag FLAG_MET_DEVON_EMPLOYEE
-	goto_if_eq Route116_EventScript_150B04
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04
 	msgbox Route116_Text_1705AE, 4
 	goto Route116_EventScript_150A94
 	end
@@ -49,13 +45,13 @@ Route116_EventScript_150A94:: @ 8150A94
 	msgbox Route116_Text_1707B8, 4
 	closemessage
 	compare FACING, 2
-	call_if 1, Route116_EventScript_150AEE
+	call_if_eq Route116_EventScript_150AEE
 	compare FACING, 1
-	call_if 1, Route116_EventScript_150AEE
+	call_if_eq Route116_EventScript_150AEE
 	compare FACING, 3
-	call_if 1, Route116_EventScript_150AEE
+	call_if_eq Route116_EventScript_150AEE
 	compare FACING, 4
-	call_if 1, Route116_EventScript_150AF9
+	call_if_eq Route116_EventScript_150AF9
 	removeobject LAST_TALKED
 	clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
 	setflag FLAG_RECEIVED_REPEAT_BALL
@@ -182,13 +178,13 @@ Route116_EventScript_150BF4:: @ 8150BF4
 Route116_EventScript_150C03:: @ 8150C03
 	delay 20
 	compare FACING, 2
-	call_if 1, Route116_EventScript_150C37
+	call_if_eq Route116_EventScript_150C37
 	compare FACING, 1
-	call_if 1, Route116_EventScript_150C37
+	call_if_eq Route116_EventScript_150C37
 	compare FACING, 3
-	call_if 1, Route116_EventScript_150C37
+	call_if_eq Route116_EventScript_150C37
 	compare FACING, 4
-	call_if 1, Route116_EventScript_150C42
+	call_if_eq Route116_EventScript_150C42
 	removeobject LAST_TALKED
 	release
 	end
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc
index 24091c4ac..5ec6ef642 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc
@@ -17,8 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1
 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA
 	lock
 	faceplayer
-	checkflag FLAG_RUSTURF_TUNNEL_OPENED
-	goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F
+	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_15C30F
 	msgbox Route116_TunnelersRestHouse_Text_193135, 4
 	release
 	end
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc
index fa648f79e..9f42412ab 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/scripts/maps/Route117.inc
@@ -7,8 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40
 	end
 
 Route117_EventScript_150D46:: @ 8150D46
-	checkflag FLAG_PENDING_DAYCARE_EGG
-	goto_if 0, Route117_EventScript_150D56
+	goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_150D56
 	setobjectxyperm 3, 47, 6
 
 Route117_EventScript_150D56:: @ 8150D56
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index a4452d989..569a7103e 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -9,8 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E
 Route118_EventScript_150F34:: @ 8150F34
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_GOOD_ROD
-	goto_if_eq Route118_EventScript_150F89
+	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89
 	msgbox Route118_Text_170F12, MSGBOX_YESNO
 	compare RESULT, YES
 	goto_if_eq Route118_EventScript_150F5E
@@ -84,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004
 	msgbox Route118_Text_170D66, 4
 	closemessage
 	compare VAR_SPECIAL_8, 0
-	call_if 1, Route118_EventScript_151048
+	call_if_eq Route118_EventScript_151048
 	compare VAR_SPECIAL_8, 1
-	call_if 1, Route118_EventScript_151053
+	call_if_eq Route118_EventScript_151053
 	compare VAR_SPECIAL_8, 2
-	call_if 1, Route118_EventScript_15105E
+	call_if_eq Route118_EventScript_15105E
 	setvar VAR_ROUTE118_STATE, 1
 	removeobject 19
 	releaseall
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 8d9f88474..4b9f3ce5f 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -4,15 +4,14 @@ Route119_MapScripts:: @ 8151167
 	.byte 0
 
 Route119_MapScript1_151172:: @ 8151172
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, Route119_EventScript_15117C
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C
 	end
 
 Route119_EventScript_15117C:: @ 815117C
 	compare VAR_SPECIAL_4, 6
-	call_if 1, Route119_EventScript_151193
+	call_if_eq Route119_EventScript_151193
 	compare VAR_SPECIAL_4, 7
-	call_if 1, Route119_EventScript_151197
+	call_if_eq Route119_EventScript_151197
 	return
 
 Route119_EventScript_151193:: @ 8151193
@@ -28,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B
 	call Route119_EventScript_1A0172
 	call Route119_EventScript_1A0196
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if 1, Route119_EventScript_1511B9
+	call_if_eq Route119_EventScript_1511B9
 	special SetRoute119Weather
 	end
 
@@ -53,21 +52,21 @@ Route119_EventScript_1511DB:: @ 81511DB
 	addobject 25
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, Route119_EventScript_151254
+	call_if_eq Route119_EventScript_151254
 	compare RESULT, 1
-	call_if 1, Route119_EventScript_151259
+	call_if_eq Route119_EventScript_151259
 	delay 65
 	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1513A6
+	call_if_eq Route119_EventScript_1513A6
 	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1513B1
+	call_if_eq Route119_EventScript_1513B1
 	applymovement 255, Route119_Movement_1A0845
 	waitmovement 0
 	delay 30
 	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1513D2
+	call_if_eq Route119_EventScript_1513D2
 	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1513E1
+	call_if_eq Route119_EventScript_1513E1
 	removeobject 25
 	addobject 16
 	delay 30
@@ -155,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352
 Route119_EventScript_151362:: @ 8151362
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1513D2
+	call_if_eq Route119_EventScript_1513D2
 	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1513E1
+	call_if_eq Route119_EventScript_1513E1
 	removeobject 16
 	addobject 25
 	delay 30
 	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1513BC
+	call_if_eq Route119_EventScript_1513BC
 	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1513C7
+	call_if_eq Route119_EventScript_1513C7
 	removeobject 25
 	setvar VAR_ROUTE119_STATE, 1
 	savebgm 0
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
index 8a5c1033f..e5ca6550b 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
@@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A
 Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30
 	call Route119_WeatherInstitute_1F_EventScript_1A0196
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
-	call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41
+	call_if_eq Route119_WeatherInstitute_1F_EventScript_163C41
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index b36500345..81037941f 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
@@ -5,9 +5,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2
 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8
 	call Route119_WeatherInstitute_2F_EventScript_1A0196
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
-	call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4
+	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0
+	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4
@@ -87,7 +87,6 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_CASTFORM
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE
+	goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE
 	goto Route119_WeatherInstitute_2F_EventScript_163D7A
 	end
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index bacdcd7dd..b49834564 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -5,23 +5,22 @@ Route120_MapScripts:: @ 815160E
 	.byte 0
 
 Route120_MapScript1_15161E:: @ 815161E
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, Route120_EventScript_151628
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_151628
 	end
 
 Route120_EventScript_151628:: @ 8151628
 	compare VAR_SPECIAL_4, 0
-	call_if 1, Route120_EventScript_15166B
+	call_if_eq Route120_EventScript_15166B
 	compare VAR_SPECIAL_4, 1
-	call_if 1, Route120_EventScript_151672
+	call_if_eq Route120_EventScript_151672
 	compare VAR_SPECIAL_4, 2
-	call_if 1, Route120_EventScript_151676
+	call_if_eq Route120_EventScript_151676
 	compare VAR_SPECIAL_4, 3
-	call_if 1, Route120_EventScript_15167A
+	call_if_eq Route120_EventScript_15167A
 	compare VAR_SPECIAL_4, 4
-	call_if 1, Route120_EventScript_15167E
+	call_if_eq Route120_EventScript_15167E
 	compare VAR_SPECIAL_4, 5
-	call_if 1, Route120_EventScript_151682
+	call_if_eq Route120_EventScript_151682
 	return
 
 Route120_EventScript_15166B:: @ 815166B
@@ -50,12 +49,9 @@ Route120_EventScript_151682:: @ 8151682
 	return
 
 Route120_MapScript1_151686:: @ 8151686
-	checkflag FLAG_REGI_DOORS_OPENED
-	call_if 0, Route120_EventScript_1516A2
-	checkflag FLAG_RECEIVED_DEVON_SCOPE
-	call_if 1, Route120_EventScript_1516B5
-	checkflag FLAG_RECEIVED_DEVON_SCOPE
-	call_if 0, Route120_EventScript_1516DA
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1516A2
+	call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516B5
+	call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516DA
 	end
 
 Route120_EventScript_1516A2:: @ 81516A2
@@ -82,11 +78,11 @@ Route120_MapScript1_1516DF:: @ 81516DF
 Route120_EventScript_1516EA:: @ 81516EA
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 14
-	goto_if 3, Route120_EventScript_151715
+	goto_if_le Route120_EventScript_151715
 	compare VAR_TEMP_1, 60
-	goto_if 3, Route120_EventScript_151719
+	goto_if_le Route120_EventScript_151719
 	compare VAR_TEMP_1, 61
-	goto_if 4, Route120_EventScript_151711
+	goto_if_ge Route120_EventScript_151711
 	return
 
 Route120_EventScript_151711:: @ 8151711
@@ -99,9 +95,9 @@ Route120_EventScript_151715:: @ 8151715
 
 Route120_EventScript_151719:: @ 8151719
 	compare VAR_TEMP_0, 7
-	goto_if 3, Route120_EventScript_151735
+	goto_if_le Route120_EventScript_151735
 	compare VAR_TEMP_0, 19
-	goto_if 3, Route120_EventScript_151715
+	goto_if_le Route120_EventScript_151715
 	goto Route120_EventScript_151735
 	end
 
@@ -113,13 +109,12 @@ Route120_EventScript_151739:: @ 8151739
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
-	goto_if_eq Route120_EventScript_151837
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837
 	msgbox Route120_Text_1C58F1, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, Route120_EventScript_151841
+	call_if_eq Route120_EventScript_151841
 	compare RESULT, NO
-	call_if 1, Route120_EventScript_15184A
+	call_if_eq Route120_EventScript_15184A
 	specialvar RESULT, GetPlayerTrainerIdOnesDigit
 	switch RESULT
 	case 0, Route120_EventScript_1517DC
@@ -184,8 +179,7 @@ Route120_EventScript_15184A:: @ 815184A
 Route120_EventScript_151853:: @ 8151853
 	lock
 	faceplayer
-	checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
-	goto_if_eq Route120_EventScript_151884
+	goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884
 	msgbox Route120_Text_171827, MSGBOX_YESNO
 	compare RESULT, NO
 	goto_if_eq Route120_EventScript_151877
@@ -209,9 +203,9 @@ Route120_EventScript_15189D:: @ 815189D
 	msgbox Route120_Text_1719A0, 4
 	closemessage
 	compare FACING, 2
-	call_if 1, Route120_EventScript_15197F
+	call_if_eq Route120_EventScript_15197F
 	compare FACING, 3
-	call_if 1, Route120_EventScript_15198A
+	call_if_eq Route120_EventScript_15198A
 	applymovement 31, Route120_Movement_1A083F
 	waitmovement 0
 	delay 20
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index ded372aa6..2648e19ce 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
@@ -89,7 +89,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425
 	getpartysize
 	compare RESULT, 6
-	goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F
+	goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F
 	specialvar RESULT, CheckFreePokemonStorageSpace
 	compare RESULT, 1
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc
index a25c306cc..5f77ea023 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/scripts/maps/Route123.inc
@@ -9,8 +9,7 @@ Route123_MapScript1_151C59:: @ 8151C59
 Route123_EventScript_151C5D:: @ 8151C5D
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM19
-	goto_if_eq Route123_EventScript_151CAC
+	goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_151CAC
 	msgbox Route123_Text_171D83, 4
 	special IsGrassTypeInParty
 	compare RESULT, 0
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc
index 26edb6fbb..3356df83b 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/scripts/maps/Route123_BerryMastersHouse.inc
@@ -10,8 +10,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER
-	goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A
 	msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4
 	random 10
 	addvar RESULT, 20
@@ -40,8 +39,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE
-	goto_if_eq Route123_BerryMastersHouse_EventScript_163C13
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13
 	msgbox Route123_BerryMastersHouse_Text_1C5D24, 4
 	setvar VAR_SPECIAL_4, 13
 	call Route123_BerryMastersHouse_EventScript_1A00F3
@@ -86,8 +84,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0
 	end
 
 Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E
-	checkflag FLAG_RECEIVED_SPELON_BERRY
-	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
+	goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem_std ITEM_SPELON_BERRY
 	compare RESULT, 0
@@ -97,8 +94,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E
 	end
 
 Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F
-	checkflag FLAG_RECEIVED_PAMTRE_BERRY
-	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
+	goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem_std ITEM_PAMTRE_BERRY
 	compare RESULT, 0
@@ -108,8 +104,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F
 	end
 
 Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80
-	checkflag FLAG_RECEIVED_WATMEL_BERRY
-	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
+	goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem_std ITEM_WATMEL_BERRY
 	compare RESULT, 0
@@ -119,8 +114,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80
 	end
 
 Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1
-	checkflag FLAG_RECEIVED_DURIN_BERRY
-	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
+	goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem_std ITEM_DURIN_BERRY
 	compare RESULT, 0
@@ -130,8 +124,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1
 	end
 
 Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2
-	checkflag FLAG_RECEIVED_BELUE_BERRY
-	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
+	goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem_std ITEM_BELUE_BERRY
 	compare RESULT, 0
diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc
index 289ea2d29..3f02fc6e3 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/scripts/maps/Route124.inc
@@ -3,8 +3,7 @@ Route124_MapScripts:: @ 8151DDF
 	.byte 0
 
 Route124_MapScript1_151DE5:: @ 8151DE5
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, Route124_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_1A02C1
 	end
 
 Route124_EventScript_151DEF:: @ 8151DEF
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
index 9423cf845..7bcddfe19 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
@@ -9,8 +9,7 @@ Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00
 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04
 	lock
 	faceplayer
-	checkflag FLAG_MET_DIVING_TREASURE_HUNTER
-	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20
+	goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_163E20
 	msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4
 	setflag FLAG_MET_DIVING_TREASURE_HUNTER
 	goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E
@@ -32,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44
 	setvar VAR_TEMP_1, 0
 	checkitem ITEM_RED_SHARD, 1
 	compare RESULT, 1
-	call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A
+	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E8A
 	checkitem ITEM_YELLOW_SHARD, 1
 	compare RESULT, 1
-	call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90
+	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E90
 	checkitem ITEM_BLUE_SHARD, 1
 	compare RESULT, 1
-	call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96
+	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E96
 	checkitem ITEM_GREEN_SHARD, 1
 	compare RESULT, 1
-	call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C
+	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E9C
 	return
 
 Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc
index 58bf75c51..a1495ac83 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/scripts/maps/Route125.inc
@@ -3,8 +3,7 @@ Route125_MapScripts:: @ 8151F1E
 	.byte 0
 
 Route125_MapScript1_151F24:: @ 8151F24
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, Route125_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1
 	end
 
 Route125_EventScript_151F2E:: @ 8151F2E
diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc
index a89087994..4a28abfb7 100644
--- a/data/scripts/maps/Route126.inc
+++ b/data/scripts/maps/Route126.inc
@@ -3,8 +3,7 @@ Route126_MapScripts:: @ 8151FFE
 	.byte 0
 
 Route126_MapScript1_152004:: @ 8152004
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, Route126_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_1A02C1
 	end
 
 Route126_EventScript_15200E:: @ 815200E
diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc
index 5fb122821..7552f7c5d 100644
--- a/data/scripts/maps/Route127.inc
+++ b/data/scripts/maps/Route127.inc
@@ -3,8 +3,7 @@ Route127_MapScripts:: @ 815206A
 	.byte 0
 
 Route127_MapScript1_152070:: @ 8152070
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, Route127_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_1A02C1
 	end
 
 Route127_EventScript_15207A:: @ 815207A
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
index a97a1e93f..6550db979 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/scripts/maps/Route128.inc
@@ -4,8 +4,7 @@ Route128_MapScripts:: @ 815211B
 	.byte 0
 
 Route128_MapScript1_152126:: @ 8152126
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, Route128_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1
 	call Route128_EventScript_1A0196
 	end
 
diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc
index efa26ecd2..ffd204bb9 100644
--- a/data/scripts/maps/Route131.inc
+++ b/data/scripts/maps/Route131.inc
@@ -3,8 +3,7 @@ Route131_MapScripts:: @ 815243E
 	.byte 0
 
 Route131_MapScript1_152444:: @ 8152444
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 1, Route131_EventScript_15244E
+	call_if_set FLAG_SYS_GAME_CLEAR, Route131_EventScript_15244E
 	end
 
 Route131_EventScript_15244E:: @ 815244E
diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
index c6bdbbdb7..415138d67 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/scripts/maps/RustboroCity.inc
@@ -11,8 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378
 RustboroCity_EventScript_14C386:: @ 814C386
 	lock
 	faceplayer
-	checkflag FLAG_DEVON_GOODS_STOLEN
-	goto_if_eq RustboroCity_EventScript_14C39B
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B
 	msgbox RustboroCity_Text_16689D, 4
 	release
 	end
@@ -36,8 +35,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1
 RustboroCity_EventScript_14C3BA:: @ 814C3BA
 	lock
 	faceplayer
-	checkflag FLAG_BADGE01_GET
-	goto_if_eq RustboroCity_EventScript_14C3CF
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF
 	msgbox RustboroCity_Text_16696D, 4
 	release
 	end
@@ -50,8 +48,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF
 RustboroCity_EventScript_14C3D9:: @ 814C3D9
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_POKENAV
-	goto_if_eq RustboroCity_EventScript_14C3EE
+	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE
 	msgbox RustboroCity_Text_166B86, 4
 	release
 	end
@@ -326,8 +323,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7
 RustboroCity_EventScript_14C5FF:: @ 814C5FF
 	lock
 	faceplayer
-	checkflag FLAG_RECOVERED_DEVON_GOODS
-	goto_if_eq RustboroCity_EventScript_14C614
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614
 	msgbox RustboroCity_Text_166F6B, 4
 	release
 	end
@@ -364,13 +360,13 @@ RustboroCity_EventScript_14C644:: @ 814C644
 
 RustboroCity_EventScript_14C650:: @ 814C650
 	compare VAR_TEMP_1, 0
-	call_if 1, RustboroCity_EventScript_14C691
+	call_if_eq RustboroCity_EventScript_14C691
 	compare VAR_TEMP_1, 1
-	call_if 1, RustboroCity_EventScript_14C6BD
+	call_if_eq RustboroCity_EventScript_14C6BD
 	compare VAR_TEMP_1, 2
-	call_if 1, RustboroCity_EventScript_14C6E9
+	call_if_eq RustboroCity_EventScript_14C6E9
 	compare VAR_TEMP_1, 3
-	call_if 1, RustboroCity_EventScript_14C715
+	call_if_eq RustboroCity_EventScript_14C715
 	setflag FLAG_UNKNOWN_9F
 	setvar VAR_RUSTBORO_STATE, 3
 	moveobjectoffscreen 9
@@ -458,19 +454,19 @@ RustboroCity_EventScript_14C771:: @ 814C771
 
 RustboroCity_EventScript_14C77D:: @ 814C77D
 	compare VAR_TEMP_1, 0
-	call_if 1, RustboroCity_EventScript_14C7FE
+	call_if_eq RustboroCity_EventScript_14C7FE
 	compare VAR_TEMP_1, 1
-	call_if 1, RustboroCity_EventScript_14C82A
+	call_if_eq RustboroCity_EventScript_14C82A
 	compare VAR_TEMP_1, 2
-	call_if 1, RustboroCity_EventScript_14C856
+	call_if_eq RustboroCity_EventScript_14C856
 	compare VAR_TEMP_1, 3
-	call_if 1, RustboroCity_EventScript_14C882
+	call_if_eq RustboroCity_EventScript_14C882
 	compare VAR_TEMP_1, 4
-	call_if 1, RustboroCity_EventScript_14C8B8
+	call_if_eq RustboroCity_EventScript_14C8B8
 	msgbox RustboroCity_Text_166FB4, 4
 	giveitem_std ITEM_GREAT_BALL
 	compare RESULT, 0
-	call_if 1, RustboroCity_EventScript_14C7F5
+	call_if_eq RustboroCity_EventScript_14C7F5
 	msgbox RustboroCity_Text_16707F, 4
 	closemessage
 	setflag FLAG_RETURNED_DEVON_GOODS
@@ -549,8 +545,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8
 RustboroCity_EventScript_14C8DA:: @ 814C8DA
 	lock
 	faceplayer
-	checkflag FLAG_MET_RIVAL_RUSTBORO
-	goto_if_eq RustboroCity_EventScript_14C917
+	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917
 	checkplayergender
 	compare RESULT, 0
 	goto_if_eq RustboroCity_EventScript_14C8FD
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc
index 3371005c0..e18a1e029 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.inc
+++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc
@@ -4,8 +4,7 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26
 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_HM01
-	goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53
+	goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53
 	msgbox RustboroCity_CuttersHouse_Text_18509C, 4
 	giveitem_std ITEM_HM01
 	setflag FLAG_RECEIVED_HM01
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
index f9e902763..7b56c72a2 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
@@ -3,8 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406
 	.byte 0
 
 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C
-	checkflag FLAG_RETURNED_DEVON_GOODS
-	call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416
+	call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157416
 	end
 
 RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416
@@ -15,10 +14,8 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416
 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422
 	lock
 	faceplayer
-	checkflag FLAG_RETURNED_DEVON_GOODS
-	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A
-	checkflag FLAG_DEVON_GOODS_STOLEN
-	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440
+	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15744A
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157440
 	msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4
 	release
 	end
@@ -36,12 +33,9 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A
 RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454
 	lock
 	faceplayer
-	checkflag FLAG_RETURNED_DEVON_GOODS
-	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B
-	checkflag FLAG_RECOVERED_DEVON_GOODS
-	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485
-	checkflag FLAG_DEVON_GOODS_STOLEN
-	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485
+	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15747B
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157485
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157485
 	msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4
 	release
 	end
@@ -59,12 +53,9 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485
 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F
 	lock
 	faceplayer
-	checkflag FLAG_RETURNED_DEVON_GOODS
-	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6
-	checkflag FLAG_RECOVERED_DEVON_GOODS
-	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0
-	checkflag FLAG_DEVON_GOODS_STOLEN
-	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0
+	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574B6
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574C0
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_1574C0
 	msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
index 179140378..b7b36dd6d 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
@@ -4,7 +4,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA
 
 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC
@@ -15,7 +15,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
 	msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4
 	release
 	end
@@ -24,9 +24,8 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
-	checkflag FLAG_MET_DEVON_EMPLOYEE
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519
 	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
 	release
 	end
@@ -40,9 +39,8 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
-	checkflag FLAG_RECEIVED_POKENAV
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543
 	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
 	release
 	end
@@ -56,7 +54,7 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
 	msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4
 	release
 	end
@@ -147,7 +145,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
 	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
 	release
 	end
 
@@ -167,7 +165,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
 	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
 	release
 	end
 
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index ff854d7ef..0b71effee 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -6,7 +6,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711
 
 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721
 	compare VAR_DEVON_CORP_3F_STATE, 0
-	call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D
+	call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D
@@ -146,10 +146,8 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_EXP_SHARE
-	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B
-	checkflag FLAG_DELIVERED_STEVEN_LETTER
-	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864
+	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B
+	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864
 	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
 	closemessage
 	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
@@ -181,8 +179,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
 RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_REPEAT_BALL
-	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5
+	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5
 	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc
index 3a2242c7a..5ed9ac0ef 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.inc
+++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc
@@ -8,8 +8,7 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97
 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO
-	goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF
+	goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF
 	msgbox RustboroCity_Flat2_2F_Text_185461, 4
 	giveitem_std ITEM_PREMIER_BALL
 	compare RESULT, 0
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc
index 1e2256b47..bcd597541 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/scripts/maps/RustboroCity_Gym.inc
@@ -3,8 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8
 
 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9
 	trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE
-	checkflag FLAG_RECEIVED_TM39
-	goto_if 0, RustboroCity_Gym_EventScript_15793C
+	goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C
 	msgbox RustboroCity_Gym_Text_184252, 4
 	release
 	end
@@ -21,7 +20,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	setvar VAR_SPECIAL_8, 1
 	call RustboroCity_Gym_EventScript_1A01C0
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if 1, RustboroCity_Gym_EventScript_1A00FB
+	call_if_eq RustboroCity_Gym_EventScript_1A00FB
 	goto RustboroCity_Gym_EventScript_15793C
 	end
 
@@ -47,8 +46,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977
 RustboroCity_Gym_EventScript_15798E:: @ 815798E
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_RUSTBORO_GYM
-	goto_if_eq RustboroCity_Gym_EventScript_1579A3
+	goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_1579A3
 	msgbox RustboroCity_Gym_Text_183A4B, 4
 	release
 	end
@@ -60,15 +58,13 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3
 
 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD
 	lockall
-	checkflag FLAG_BADGE01_GET
-	goto_if_eq RustboroCity_Gym_EventScript_1579CD
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD
 	goto RustboroCity_Gym_EventScript_1579D7
 	end
 
 RustboroCity_Gym_EventScript_1579BD:: @ 81579BD
 	lockall
-	checkflag FLAG_BADGE01_GET
-	goto_if_eq RustboroCity_Gym_EventScript_1579CD
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD
 	goto RustboroCity_Gym_EventScript_1579D7
 	end
 
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc
index c0f1bc689..abbac505b 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/scripts/maps/RustboroCity_House1.inc
@@ -4,8 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C
 RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
 	lock
 	faceplayer
-	checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
-	goto_if_eq RustboroCity_House1_EventScript_157D13
+	goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_157D13
 	setvar VAR_SPECIAL_8, 0
 	copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
 	specialvar RESULT, GetInGameTradeSpeciesInfo
@@ -22,7 +21,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
 	specialvar RESULT, GetTradeSpecies
 	copyvar VAR_SPECIAL_B, RESULT
 	compare RESULT, VAR_SPECIAL_9
-	goto_if 5, RustboroCity_House1_EventScript_157D05
+	goto_if_ne RustboroCity_House1_EventScript_157D05
 	copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
 	copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
 	special CreateInGameTradePokemon
diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc
index 69f977e79..c8e3f3a43 100644
--- a/data/scripts/maps/RustboroCity_Mart.inc
+++ b/data/scripts/maps/RustboroCity_Mart.inc
@@ -6,10 +6,8 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4
 	faceplayer
 	message RustboroCity_Mart_Text_1A0BE4
 	waitmessage
-	checkflag FLAG_MET_DEVON_EMPLOYEE
-	goto_if 0, RustboroCity_Mart_EventScript_157BEF
-	checkflag FLAG_MET_DEVON_EMPLOYEE
-	goto_if_eq RustboroCity_Mart_EventScript_157C18
+	goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18
 	end
 
 RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc
index 21fdf3d3b..155df8de5 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc
@@ -77,12 +77,11 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5
 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_QUICK_CLAW
-	goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34
+	goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34
 	compare FACING, 4
-	call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E
+	call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E
 	compare FACING, 3
-	call_if 1, RustboroCity_PokemonSchool_EventScript_157B29
+	call_if_eq RustboroCity_PokemonSchool_EventScript_157B29
 	msgbox RustboroCity_PokemonSchool_Text_1846A2, 4
 	giveitem_std ITEM_QUICK_CLAW
 	compare RESULT, 0
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
index 050cf28c2..7c715b6c2 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -11,7 +11,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750
 RusturfTunnel_MapScript1_15C762:: @ 815C762
 	call RusturfTunnel_EventScript_1A0196
 	compare VAR_RUSTURF_TUNNEL_STATE, 2
-	call_if 1, RusturfTunnel_EventScript_15C773
+	call_if_eq RusturfTunnel_EventScript_15C773
 	end
 
 RusturfTunnel_EventScript_15C773:: @ 815C773
@@ -32,8 +32,7 @@ RusturfTunnel_EventScript_15C782:: @ 815C782
 RusturfTunnel_EventScript_15C799:: @ 815C799
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_1
-	goto_if_eq RusturfTunnel_EventScript_15C7BC
+	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC
 	setflag FLAG_TEMP_1
 	msgbox RusturfTunnel_Text_1944C5, 4
 	closemessage
@@ -53,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC
 RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	lockall
 	compare VAR_TEMP_1, 1
-	call_if 1, RusturfTunnel_EventScript_15C8CA
+	call_if_eq RusturfTunnel_EventScript_15C8CA
 	compare VAR_TEMP_1, 2
-	call_if 1, RusturfTunnel_EventScript_15C8DF
+	call_if_eq RusturfTunnel_EventScript_15C8DF
 	compare VAR_TEMP_1, 3
-	call_if 1, RusturfTunnel_EventScript_15C8EA
+	call_if_eq RusturfTunnel_EventScript_15C8EA
 	call RusturfTunnel_EventScript_15C92D
 	msgbox RusturfTunnel_Text_19461D, 4
 	compare VAR_TEMP_1, 2
-	call_if 1, RusturfTunnel_EventScript_15C8EB
+	call_if_eq RusturfTunnel_EventScript_15C8EB
 	compare VAR_TEMP_1, 3
-	call_if 1, RusturfTunnel_EventScript_15C8EB
+	call_if_eq RusturfTunnel_EventScript_15C8EB
 	giveitem_std ITEM_HM04
 	setflag FLAG_RECEIVED_HM04
 	msgbox RusturfTunnel_Text_194693, 4
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if 1, RusturfTunnel_EventScript_15C880
+	call_if_eq RusturfTunnel_EventScript_15C880
 	compare VAR_TEMP_1, 2
-	call_if 1, RusturfTunnel_EventScript_15C892
+	call_if_eq RusturfTunnel_EventScript_15C892
 	compare VAR_TEMP_1, 3
-	call_if 1, RusturfTunnel_EventScript_15C8AE
+	call_if_eq RusturfTunnel_EventScript_15C8AE
 	msgbox RusturfTunnel_Text_194706, 4
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if 1, RusturfTunnel_EventScript_15C8F7
+	call_if_eq RusturfTunnel_EventScript_15C8F7
 	compare VAR_TEMP_1, 2
-	call_if 1, RusturfTunnel_EventScript_15C909
+	call_if_eq RusturfTunnel_EventScript_15C909
 	compare VAR_TEMP_1, 3
-	call_if 1, RusturfTunnel_EventScript_15C91B
+	call_if_eq RusturfTunnel_EventScript_15C91B
 	call RusturfTunnel_EventScript_1A0442
 	releaseall
 	end
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
index dd5aee95c..7bc5a7fdd 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/scripts/maps/SSTidalCorridor.inc
@@ -124,8 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6
 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 	setrespawn 8
 	msgbox SSTidalCorridor_Text_1991F4, 4
-	checkflag FLAG_RECEIVED_TM49
-	call_if 1, SSTidalCorridor_EventScript_15FE36
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
@@ -134,8 +133,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 SSTidalCorridor_EventScript_15FE17:: @ 815FE17
 	setrespawn 4
 	msgbox SSTidalCorridor_Text_1991F4, 4
-	checkflag FLAG_RECEIVED_TM49
-	call_if 1, SSTidalCorridor_EventScript_15FE36
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
@@ -163,8 +161,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B
 SSTidalCorridor_EventScript_15FE60:: @ 815FE60
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
-	goto_if_eq SSTidalCorridor_EventScript_15FE7A
+	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A
 	call SSTidalCorridor_EventScript_15FE84
 	msgbox SSTidalCorridor_Text_199203, 4
 	release
@@ -176,22 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A
 	end
 
 SSTidalCorridor_EventScript_15FE84:: @ 815FE84
-	checktrainerflag OPPONENT_PHILLIP
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_LEONARD
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_COLTON
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_TUCKER
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_THOMAS
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_LEA_AND_JED
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_GARRET
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_ANETTE
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
+	goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5
+	goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5
+	goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5
+	goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5
+	goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5
+	goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5
+	goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5
+	goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5
 	setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
 	goto SSTidalCorridor_EventScript_15FE7A
 	return
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc
index 0390177de..58e7c3235 100644
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/scripts/maps/SSTidalRooms.inc
@@ -4,8 +4,7 @@ SSTidalRooms_MapScripts:: @ 815FF05
 SSTidalRooms_EventScript_15FF06:: @ 815FF06
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM49
-	goto_if_eq SSTidalRooms_EventScript_15FF3D
+	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D
 	msgbox SSTidalRooms_Text_199B65, 4
 	giveitem_std ITEM_TM49
 	compare RESULT, 0
diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc
index b3eb297e9..493aa55a1 100644
--- a/data/scripts/maps/SafariZone_Southeast.inc
+++ b/data/scripts/maps/SafariZone_Southeast.inc
@@ -21,7 +21,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B
 
 SafariZone_Southeast_MapScript1_160073:: @ 8160073
 	compare VAR_SAFARI_ZONE_STATE, 2
-	call_if 1, SafariZone_Southeast_EventScript_16007F
+	call_if_eq SafariZone_Southeast_EventScript_16007F
 	end
 
 SafariZone_Southeast_EventScript_16007F:: @ 816007F
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc
index d788be9b3..11aba3ac8 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/scripts/maps/SealedChamber_InnerRoom.inc
@@ -6,8 +6,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
 	braillemessage SealedChamber_InnerRoom_Braille_1C53C1
 	waitbuttonpress
 	erasebox 0, 0, 29, 19
-	checkflag FLAG_REGI_DOORS_OPENED
-	goto_if_eq SealedChamber_InnerRoom_EventScript_15F247
+	goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_15F247
 	specialvar RESULT, CheckRelicanthWailord
 	compare RESULT, 0
 	goto_if_eq SealedChamber_InnerRoom_EventScript_15F247
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc
index ad17819c2..1f2159010 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
@@ -14,8 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7
 	end
 
 SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB
-	checkflag FLAG_SYS_BRAILLE_DIG
-	call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5
+	call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F0F5
 	end
 
 SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5
@@ -109,8 +108,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA
 
 SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8
 	lockall
-	checkflag FLAG_SYS_BRAILLE_DIG
-	goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF
+	goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F1CF
 	braillemessage SealedChamber_OuterRoom_Braille_1C53B1
 	waitbuttonpress
 	erasebox 0, 0, 29, 19
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 4dcd88761..2005cb67b 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
@@ -4,8 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057
 
 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D
 	special UpdateShoalTideFlag
-	checkflag FLAG_SYS_SHOAL_TIDE
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_15E06E
 	goto ShoalCave_LowTideEntranceRoom_EventScript_15E072
 
 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E
@@ -20,8 +19,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_SYS_SHOAL_ITEM
-	call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176
+	call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176
 	checkitem ITEM_SHOAL_SALT, 4
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138
@@ -33,7 +31,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C
 	checkitemspace ITEM_SHELL_BELL, 1
 	compare RESULT, 0
-	call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106
+	call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E106
 	compare RESULT, 2
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E
 	msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index b6aba9523..21997d076 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
@@ -4,8 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192
 	.byte 0
 
 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D
-	checkflag FLAG_SYS_SHOAL_TIDE
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1AB
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB
@@ -21,47 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9
-	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
-	checkflag FLAG_SYS_SHOAL_TIDE
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E1DA
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1DA
 	setmetatile 31, 8, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA
-	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
-	checkflag FLAG_SYS_SHOAL_TIDE
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E1FB
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1FB
 	setmetatile 14, 26, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB
-	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E213
 	setmetatile 41, 20, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E213
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213
-	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E22B
 	setmetatile 41, 10, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E22B
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B
-	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E243
 	setmetatile 6, 9, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E243
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243
-	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E256
 	setmetatile 16, 13, 857, 1
 	return
 
@@ -70,8 +61,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256
 
 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257
 	lockall
-	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289
 	giveitem_std ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
@@ -88,8 +78,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289
 
 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
 	lockall
-	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289
 	giveitem_std ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
@@ -101,8 +90,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
 
 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
 	lockall
-	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289
 	giveitem_std ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
@@ -114,8 +102,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
 
 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
 	lockall
-	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289
 	giveitem_std ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
@@ -127,8 +114,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
 
 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329
 	lockall
-	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B
 	giveitem_std ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
@@ -145,8 +131,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B
 
 ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365
 	lockall
-	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B
 	giveitem_std ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
index c7cb08a9b..19223a499 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
@@ -7,8 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9
 	end
 
 ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF
-	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4
-	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E412
 	setmetatile 18, 2, 856, 1
 	return
 
@@ -17,8 +16,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412
 
 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413
 	lockall
-	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4
-	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445
 	giveitem_std ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B
@@ -36,8 +34,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445
 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_FOCUS_BAND
-	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E
+	goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_15E47E
 	msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4
 	giveitem_std ITEM_FOCUS_BAND
 	compare RESULT, 0
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
index efcad59d3..5f9726038 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
@@ -7,8 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3
-	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3
-	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3B6
 	setmetatile 11, 11, 856, 1
 	return
 
@@ -17,8 +16,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6
 
 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7
 	lockall
-	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3
-	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9
+	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9
 	giveitem_std ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index 07a78d2c4..82149a4bc 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -3,8 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302
 	.byte 0
 
 SkyPillar_Top_MapScript1_15F308:: @ 815F308
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, SkyPillar_Top_EventScript_15F312
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_15F312
 	end
 
 SkyPillar_Top_EventScript_15F312:: @ 815F312
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index ae8534ad9..4af912ed3 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -13,7 +13,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
 	call SlateportCity_EventScript_14BA5C
 	compare VAR_SLATEPORT_STATE, 1
-	call_if 1, SlateportCity_EventScript_14BA68
+	call_if_eq SlateportCity_EventScript_14BA68
 	end
 
 SlateportCity_EventScript_14BA5C:: @ 814BA5C
@@ -68,10 +68,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0
 	msgbox SlateportCity_Text_164682, 4
 	specialvar RESULT, LeadMonHasEffortRibbon
 	compare RESULT, 1
-	call_if 1, SlateportCity_EventScript_14BB35
+	call_if_eq SlateportCity_EventScript_14BB35
 	specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
 	compare RESULT, 0
-	call_if 1, SlateportCity_EventScript_14BB2B
+	call_if_eq SlateportCity_EventScript_14BB2B
 	msgbox SlateportCity_Text_164691, 4
 	playfanfare BGM_FANFA4
 	message SlateportCity_Text_1646DD
@@ -96,7 +96,7 @@ SlateportCity_EventScript_14BB3F:: @ 814BB3F
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
-	call_if 1, SlateportCity_EventScript_14BB56
+	call_if_eq SlateportCity_EventScript_14BB56
 	msgbox SlateportCity_Text_164814, 4
 	release
 	end
@@ -110,7 +110,7 @@ SlateportCity_EventScript_14BB60:: @ 814BB60
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
-	call_if 1, SlateportCity_EventScript_14BB77
+	call_if_eq SlateportCity_EventScript_14BB77
 	msgbox SlateportCity_Text_1648A0, 4
 	release
 	end
@@ -124,9 +124,8 @@ SlateportCity_EventScript_14BB81:: @ 814BB81
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
-	call_if 1, SlateportCity_EventScript_14BBA1
-	checkflag FLAG_RECEIVED_SECRET_POWER
-	goto_if_eq SlateportCity_EventScript_14BBAB
+	call_if_eq SlateportCity_EventScript_14BBA1
+	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB
 	msgbox SlateportCity_Text_164937, 4
 	release
 	end
@@ -145,7 +144,7 @@ SlateportCity_EventScript_14BBB5:: @ 814BBB5
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
-	call_if 1, SlateportCity_EventScript_14BBCC
+	call_if_eq SlateportCity_EventScript_14BBCC
 	msgbox SlateportCity_Text_164A30, 4
 	release
 	end
@@ -169,7 +168,7 @@ SlateportCity_EventScript_14BBF3:: @ 814BBF3
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
-	call_if 1, SlateportCity_EventScript_14BC0A
+	call_if_eq SlateportCity_EventScript_14BC0A
 	msgbox SlateportCity_Text_164B34, 4
 	release
 	end
@@ -182,8 +181,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A
 SlateportCity_EventScript_14BC14:: @ 814BC14
 	lock
 	faceplayer
-	checkflag FLAG_DOCK_REJECTED_DEVON_GOODS
-	goto_if_eq SlateportCity_EventScript_14BC29
+	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29
 	msgbox SlateportCity_Text_164BBF, 4
 	release
 	end
@@ -199,10 +197,8 @@ SlateportCity_EventScript_14BC33:: @ 814BC33
 
 SlateportCity_EventScript_14BC3C:: @ 814BC3C
 	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq SlateportCity_EventScript_14BC63
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq SlateportCity_EventScript_14BC59
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59
 	msgbox SlateportCity_Text_1658A0, 4
 	releaseall
 	end
@@ -235,8 +231,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88
 
 SlateportCity_EventScript_14BC91:: @ 814BC91
 	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq SlateportCity_EventScript_14BCA5
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5
 	msgbox SlateportCity_Text_165A8B, 4
 	releaseall
 	end
@@ -254,7 +249,7 @@ SlateportCity_EventScript_14BCB8:: @ 814BCB8
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
-	call_if 1, SlateportCity_EventScript_14BCCF
+	call_if_eq SlateportCity_EventScript_14BCCF
 	msgbox SlateportCity_Text_164F9E, 4
 	release
 	end
@@ -289,9 +284,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06
 	faceplayer
 	msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, SlateportCity_EventScript_14BD28
+	call_if_eq SlateportCity_EventScript_14BD28
 	compare RESULT, NO
-	call_if 1, SlateportCity_EventScript_14BD31
+	call_if_eq SlateportCity_EventScript_14BD31
 	release
 	end
 
@@ -410,8 +405,7 @@ SlateportCity_EventScript_14BE16:: @ 814BE16
 SlateportCity_EventScript_14BE20:: @ 814BE20
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_SECRET_POWER
-	goto_if 0, SlateportCity_EventScript_14BE16
+	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
 	message SlateportCity_Text_1A0BE4
 	waitmessage
 	pokemartdecoration SlateportCity_Decorations2
@@ -442,8 +436,7 @@ SlateportCity_Decorations2:: @ 814BE40
 @ 814BE60
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_SECRET_POWER
-	goto_if 0, SlateportCity_EventScript_14BE16
+	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
 	message SlateportCity_Text_1A0BE4
 	waitmessage
 	pokemartdecoration SlateportCity_Decorations3
diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc
index 0a6f40c75..4151579a2 100644
--- a/data/scripts/maps/SlateportCity_ContestHall.inc
+++ b/data/scripts/maps/SlateportCity_ContestHall.inc
@@ -12,8 +12,7 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555
 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM41
-	goto_if_eq SlateportCity_ContestHall_EventScript_155595
+	goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595
 	msgbox SlateportCity_ContestHall_Text_17CCE2, 4
 	giveitem_std ITEM_TM41
 	compare RESULT, 0
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc
index 59c5b13fc..22f797968 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
@@ -101,8 +101,7 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0
 
 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9
 	lockall
-	checkflag FLAG_RECEIVED_POKEBLOCK_CASE
-	goto_if_eq SlateportCity_ContestLobby_EventScript_155526
+	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526
 	applymovement 7, SlateportCity_ContestLobby_Movement_1A0839
 	waitmovement 0
 	msgbox SlateportCity_ContestLobby_Text_17CA67, 4
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index 4be5c6daf..82a17b0a6 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -6,9 +6,8 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
 	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
 	setvar VAR_TEMP_1, 0
 	compare VAR_SLATEPORT_HARBOR_STATE, 1
-	call_if 1, SlateportCity_Harbor_EventScript_155F89
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 1, SlateportCity_Harbor_EventScript_155F85
+	call_if_eq SlateportCity_Harbor_EventScript_155F89
+	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85
 	end
 
 SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
@@ -64,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
 	removeobject 8
 	setvar VAR_SLATEPORT_HARBOR_STATE, 2
 	compare VAR_SPECIAL_8, 0
-	call_if 1, SlateportCity_Harbor_EventScript_15605C
+	call_if_eq SlateportCity_Harbor_EventScript_15605C
 	compare VAR_SPECIAL_8, 1
-	call_if 1, SlateportCity_Harbor_EventScript_156071
+	call_if_eq SlateportCity_Harbor_EventScript_156071
 	compare VAR_SPECIAL_8, 2
-	call_if 1, SlateportCity_Harbor_EventScript_156086
+	call_if_eq SlateportCity_Harbor_EventScript_156086
 	compare VAR_SPECIAL_8, 3
-	call_if 1, SlateportCity_Harbor_EventScript_156086
+	call_if_eq SlateportCity_Harbor_EventScript_156086
 	msgbox SlateportCity_Harbor_Text_17FE60, 4
 	closemessage
 	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
@@ -159,8 +158,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
 	lock
 	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq SlateportCity_Harbor_EventScript_1560D9
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9
 	msgbox SlateportCity_Harbor_Text_17FA0A, 4
 	release
 	end
@@ -224,9 +222,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196
 	delay 30
 	hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
 	compare FACING, 2
-	call_if 1, SlateportCity_Harbor_EventScript_1561EF
+	call_if_eq SlateportCity_Harbor_EventScript_1561EF
 	compare FACING, 4
-	call_if 1, SlateportCity_Harbor_EventScript_1561E4
+	call_if_eq SlateportCity_Harbor_EventScript_1561E4
 	delay 30
 	hideobjectat 255, MAP_PETALBURG_CITY
 	setvar VAR_SPECIAL_4, 5
@@ -268,12 +266,9 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208
 SlateportCity_Harbor_EventScript_156211:: @ 8156211
 	lock
 	faceplayer
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq SlateportCity_Harbor_EventScript_15626F
-	checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
-	goto_if_eq SlateportCity_Harbor_EventScript_156265
-	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
-	goto_if_eq SlateportCity_Harbor_EventScript_156258
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258
 	compare VAR_SLATEPORT_HARBOR_STATE, 2
 	goto_if_eq SlateportCity_Harbor_EventScript_15624E
 	msgbox SlateportCity_Harbor_Text_17FD1C, 4
@@ -305,8 +300,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F
 	checkitem ITEM_SCANNER, 1
 	compare RESULT, 1
 	goto_if_eq SlateportCity_Harbor_EventScript_1562A7
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq SlateportCity_Harbor_EventScript_15629D
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D
 	msgbox SlateportCity_Harbor_Text_18017B, 4
 	release
 	end
diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc
index 13de091cb..be2955937 100644
--- a/data/scripts/maps/SlateportCity_House1.inc
+++ b/data/scripts/maps/SlateportCity_House1.inc
@@ -16,7 +16,7 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C
 	special SelectMonForNPCTrade
 	waitstate
 	compare VAR_SPECIAL_4, 255
-	goto_if 5, SlateportCity_House1_EventScript_1556C9
+	goto_if_ne SlateportCity_House1_EventScript_1556C9
 	compare VAR_SPECIAL_4, 255
 	goto_if_eq SlateportCity_House1_EventScript_1556BF
 	end
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 5d0fdb411..c8ece697d 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -57,8 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
-	checkflag FLAG_DELIVERED_DEVON_GOODS
-	goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
+	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4
 	closemessage
 	hidemoneybox 0, 0
@@ -173,7 +172,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
 	compare FACING, 2
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98
 	compare FACING, 2
-	goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD
+	goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
index 5dae0bc6b..d84982e2e 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
@@ -22,21 +22,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5
 	waitmovement 0
 	compare FACING, 1
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
 	compare FACING, 4
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4
 	compare FACING, 4
-	call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D
+	call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4
 	closemessage
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2
 	waitmovement 0
 	compare FACING, 1
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78
 	compare FACING, 3
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83
 	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4
 	closemessage
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
index f7cc67236..6a8c88e1e 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
@@ -23,18 +23,13 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795
 
 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8
 	setvar VAR_TEMP_2, 0
-	checkflag FLAG_RECEIVED_YELLOW_SCARF
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag FLAG_RECEIVED_GREEN_SCARF
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag FLAG_RECEIVED_PINK_SCARF
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag FLAG_RECEIVED_BLUE_SCARF
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag FLAG_RECEIVED_RED_SCARF
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
+	call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_155893
+	call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_155893
+	call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_155893
+	call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_155893
+	call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_155893
 	compare VAR_TEMP_2, 5
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_15588D
 	compare VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE
 	msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4
@@ -49,16 +44,11 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE
 SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808
 	msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4
 	setvar VAR_TEMP_1, 0
-	checkflag FLAG_RECEIVED_YELLOW_SCARF
-	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE
-	checkflag FLAG_RECEIVED_GREEN_SCARF
-	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7
-	checkflag FLAG_RECEIVED_PINK_SCARF
-	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0
-	checkflag FLAG_RECEIVED_BLUE_SCARF
-	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9
-	checkflag FLAG_RECEIVED_RED_SCARF
-	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2
+	call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_1559FE
+	call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_1559E7
+	call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_1559D0
+	call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_1559B9
+	call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_1559A2
 	bufferleadmonspeciesname 0
 	switch VAR_TEMP_1
 	case 0, SlateportCity_PokemonFanClub_EventScript_155899
@@ -146,7 +136,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998
 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2
 	specialvar RESULT, CheckLeadMonCool
 	compare RESULT, 1
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_1559B3
 	return
 
 SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3
@@ -156,7 +146,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3
 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9
 	specialvar RESULT, CheckLeadMonBeauty
 	compare RESULT, 1
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_1559CA
 	return
 
 SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA
@@ -166,7 +156,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA
 SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0
 	specialvar RESULT, CheckLeadMonCute
 	compare RESULT, 1
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_1559E1
 	return
 
 SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1
@@ -176,7 +166,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1
 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7
 	specialvar RESULT, CheckLeadMonSmart
 	compare RESULT, 1
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_1559F8
 	return
 
 SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8
@@ -186,7 +176,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8
 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE
 	specialvar RESULT, CheckLeadMonTough
 	compare RESULT, 1
-	call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_155A0F
 	return
 
 SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F
@@ -196,12 +186,11 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F
 SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_SOOTHE_BELL
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75
+	goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_155A75
 	msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4
 	specialvar RESULT, GetLeadMonFriendshipScore
 	compare RESULT, 4
-	goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A
+	goto_if_ge SlateportCity_PokemonFanClub_EventScript_155A3A
 	release
 	end
 
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
index 46dc8419c..dd31e8e26 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
@@ -3,14 +3,10 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335
 
 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388
-	checkflag FLAG_BADGE07_GET
-	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C
-	checkflag FLAG_DELIVERED_DEVON_GOODS
-	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF
-	checkflag FLAG_DOCK_REJECTED_DEVON_GOODS
-	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_155388
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_15539C
+	goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553CF
+	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553B0
 	msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
 	waitmovement 0
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 367677751..669d4ecfa 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -5,10 +5,8 @@ SootopolisCity_MapScripts:: @ 814D07D
 	.byte 0
 
 SootopolisCity_MapScript1_14D08D:: @ 814D08D
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	call_if 0, SootopolisCity_EventScript_14D0A0
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	call_if 1, SootopolisCity_EventScript_14D0B1
+	call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0A0
+	call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0B1
 	end
 
 SootopolisCity_EventScript_14D0A0:: @ 814D0A0
@@ -17,8 +15,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0
 	return
 
 SootopolisCity_EventScript_14D0B1:: @ 814D0B1
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	call_if 0, SootopolisCity_EventScript_14D0BB
+	call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D0BB
 	return
 
 SootopolisCity_EventScript_14D0BB:: @ 814D0BB
@@ -35,10 +32,8 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB
 
 SootopolisCity_MapScript1_14D10D:: @ 814D10D
 	setflag FLAG_VISITED_SOOTOPOLIS_CITY
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	call_if 1, SootopolisCity_EventScript_14D159
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, SootopolisCity_EventScript_14D123
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D159
+	call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_14D123
 	end
 
 SootopolisCity_EventScript_14D123:: @ 814D123
@@ -46,7 +41,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123
 	setobjectxyperm 1, 29, 19
 	setobjectxyperm 2, 33, 19
 	compare VAR_SOOTOPOLIS_STATE, 1
-	call_if 1, SootopolisCity_EventScript_14D142
+	call_if_eq SootopolisCity_EventScript_14D142
 	return
 
 SootopolisCity_EventScript_14D142:: @ 814D142
@@ -68,8 +63,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165
 SootopolisCity_EventScript_14D16E:: @ 814D16E
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_EventScript_14D183
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183
 	msgbox SootopolisCity_Text_1696A4, 4
 	release
 	end
@@ -92,8 +86,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F
 	faceplayer
 	dodailyevents
 	special GetPlayerBigGuyGirlString
-	checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
-	goto_if_eq SootopolisCity_EventScript_14D241
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241
 	msgbox SootopolisCity_Text_1C63F2, 4
 	random 10
 	addvar RESULT, 20
@@ -142,8 +135,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E
 SootopolisCity_EventScript_14D268:: @ 814D268
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM
-	goto_if_eq SootopolisCity_EventScript_14D27D
+	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D
 	msgbox SootopolisCity_Text_16A4D6, 4
 	release
 	end
@@ -156,8 +148,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D
 SootopolisCity_EventScript_14D287:: @ 814D287
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_EventScript_14D29C
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C
 	msgbox SootopolisCity_Text_169813, 4
 	release
 	end
@@ -170,8 +161,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C
 SootopolisCity_EventScript_14D2A6:: @ 814D2A6
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_EventScript_14D2BB
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB
 	msgbox SootopolisCity_Text_1698A0, 4
 	release
 	end
@@ -184,8 +174,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB
 SootopolisCity_EventScript_14D2C5:: @ 814D2C5
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_EventScript_14D2DA
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA
 	msgbox SootopolisCity_Text_1697A7, 4
 	release
 	end
@@ -445,8 +434,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F
 SootopolisCity_EventScript_14D498:: @ 814D498
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_EventScript_14D4AD
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD
 	.ifdef SAPPHIRE
 	msgbox SootopolisCity_Text_169DA6, 4
 	.else
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index 35fa306e6..44bcda12f 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -20,11 +20,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25
 
 SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E
 	compare VAR_ICE_STEP_COUNT, 8
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85
+	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF85
 	compare VAR_ICE_STEP_COUNT, 28
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73
+	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73
 	compare VAR_ICE_STEP_COUNT, 69
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61
+	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61
 	setmetatile 8, 4, 519, 0
 	setmetatile 8, 5, 519, 0
 
@@ -87,10 +87,8 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD
 
 SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF
 	trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D
-	checkflag FLAG_RECEIVED_TM03
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056
-	checkflag FLAG_BADGE06_GET
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A
+	goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056
+	goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A
 	msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4
 	release
 	end
@@ -124,8 +122,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A
 SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM
-	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099
+	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099
 	msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4
 	release
 	end
@@ -137,15 +134,13 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099
 
 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3
 	lockall
-	checkflag FLAG_BADGE08_GET
-	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3
+	goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3
 	goto SootopolisCity_Gym_1F_EventScript_15B0CD
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3
 	lockall
-	checkflag FLAG_BADGE08_GET
-	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3
+	goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3
 	goto SootopolisCity_Gym_1F_EventScript_15B0CD
 	end
 
diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc
index 074c9a179..67be3738b 100644
--- a/data/scripts/maps/SootopolisCity_House1.inc
+++ b/data/scripts/maps/SootopolisCity_House1.inc
@@ -4,8 +4,7 @@ SootopolisCity_House1_MapScripts:: @ 815B29A
 SootopolisCity_House1_EventScript_15B29B:: @ 815B29B
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM31
-	goto_if_eq SootopolisCity_House1_EventScript_15B2C7
+	goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7
 	msgbox SootopolisCity_House1_Text_18F991, 4
 	giveitem_std ITEM_TM31
 	setflag FLAG_RECEIVED_TM31
diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc
index e32e993dd..d714993d4 100644
--- a/data/scripts/maps/SootopolisCity_House2.inc
+++ b/data/scripts/maps/SootopolisCity_House2.inc
@@ -6,9 +6,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5
 	faceplayer
 	msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO
 	compare RESULT, YES
-	call_if 1, SootopolisCity_House2_EventScript_15B307
+	call_if_eq SootopolisCity_House2_EventScript_15B307
 	compare RESULT, NO
-	call_if 1, SootopolisCity_House2_EventScript_15B310
+	call_if_eq SootopolisCity_House2_EventScript_15B310
 	release
 	end
 
diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc
index d2fb4ed7b..24c59500a 100644
--- a/data/scripts/maps/SootopolisCity_House6.inc
+++ b/data/scripts/maps/SootopolisCity_House6.inc
@@ -4,11 +4,10 @@ SootopolisCity_House6_MapScripts:: @ 815B385
 SootopolisCity_House6_EventScript_15B386:: @ 815B386
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_WAILMER_DOLL
-	goto_if_eq SootopolisCity_House6_EventScript_15B3CD
+	goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_15B3CD
 	msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO
 	compare RESULT, NO
-	call_if 1, SootopolisCity_House6_EventScript_15B3C3
+	call_if_eq SootopolisCity_House6_EventScript_15B3C3
 	msgbox SootopolisCity_House6_Text_18FF12, 4
 	givedecoration_std DECOR_WAILMER_DOLL
 	compare RESULT, 0
diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc
index 115ed0453..1687bd91e 100644
--- a/data/scripts/maps/SootopolisCity_Mart.inc
+++ b/data/scripts/maps/SootopolisCity_Mart.inc
@@ -29,10 +29,8 @@ SootopolisCity_Mart_Items:: @ 815B234
 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_Mart_EventScript_15B268
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	goto_if 0, SootopolisCity_Mart_EventScript_15B268
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B268
+	goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B268
 	msgbox SootopolisCity_Mart_Text_18F8D7, 4
 	release
 	end
@@ -45,10 +43,8 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268
 SootopolisCity_Mart_EventScript_15B272:: @ 815B272
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_Mart_EventScript_15B290
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	goto_if 0, SootopolisCity_Mart_EventScript_15B290
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B290
+	goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B290
 	msgbox SootopolisCity_Mart_Text_18F96B, 4
 	release
 	end
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
index 9eb5b4a57..820dd4858 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
@@ -17,10 +17,8 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196
 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
+	goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
 	msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4
 	release
 	end
@@ -33,10 +31,8 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6
 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0
 	lock
 	faceplayer
-	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
+	goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
 	msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4
 	release
 	end
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index cbc451a18..5878a43d5 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -4,8 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53
 	.byte 0
 
 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, SouthernIsland_Interior_EventScript_160B68
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_160B68
 	end
 
 SouthernIsland_Interior_EventScript_160B68:: @ 8160B68
@@ -44,10 +43,8 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B
 	end
 
 SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
-	checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
-	goto_if_eq SouthernIsland_Interior_EventScript_160C08
-	checkflag FLAG_SYS_HAS_EON_TICKET
-	goto_if 0, SouthernIsland_Interior_EventScript_160C08
+	goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08
+	goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_160C08
 	setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
 	special SpawnCameraDummy
 	applymovement 127, SouthernIsland_Interior_Movement_160C12
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc
index d991a7096..d34558e40 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/scripts/maps/Underwater_SeafloorCavern.inc
@@ -6,8 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E
 
 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE
 	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB
+	goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9BB
 	end
 
 Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB
@@ -15,8 +14,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB
 	end
 
 Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF
-	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9
+	call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9C9
 	end
 
 Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9
diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc
index 8d3e8e723..3151c4575 100644
--- a/data/scripts/maps/Underwater_SealedChamber.inc
+++ b/data/scripts/maps/Underwater_SealedChamber.inc
@@ -5,9 +5,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080
 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086
 	getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5
 	compare VAR_SPECIAL_4, 12
-	goto_if 5, Underwater_SealedChamber_EventScript_15F0A6
+	goto_if_ne Underwater_SealedChamber_EventScript_15F0A6
 	compare VAR_SPECIAL_5, 44
-	goto_if 5, Underwater_SealedChamber_EventScript_15F0A6
+	goto_if_ne Underwater_SealedChamber_EventScript_15F0A6
 	goto Underwater_SealedChamber_EventScript_15F0AF
 
 Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
index ffd184ddf..44b9463b4 100644
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ b/data/scripts/maps/UnknownMap_25_34.inc
@@ -14,15 +14,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595
 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5
 	special ScriptGetMultiplayerId
 	compare RESULT, 0
-	call_if 1, LinkContestRoom1_EventScript_15F5E0
+	call_if_eq LinkContestRoom1_EventScript_15F5E0
 	compare RESULT, 1
-	call_if 1, LinkContestRoom1_EventScript_15F5E4
+	call_if_eq LinkContestRoom1_EventScript_15F5E4
 	compare RESULT, 2
-	call_if 1, LinkContestRoom1_EventScript_15F5E8
+	call_if_eq LinkContestRoom1_EventScript_15F5E8
 	compare RESULT, 3
-	call_if 1, LinkContestRoom1_EventScript_15F5EC
+	call_if_eq LinkContestRoom1_EventScript_15F5EC
 	compare RESULT, 4
-	call_if 1, LinkContestRoom1_EventScript_15F5F0
+	call_if_eq LinkContestRoom1_EventScript_15F5F0
 	return
 
 LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0
@@ -47,7 +47,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0
 
 LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4
 	compare VAR_TEMP_9, 1
-	call_if 1, LinkContestRoom1_EventScript_15F600
+	call_if_eq LinkContestRoom1_EventScript_15F600
 	end
 
 LinkContestRoom1_EventScript_15F600:: @ 815F600
@@ -76,7 +76,7 @@ LinkContestRoom1_EventScript_15F630:: @ 815F630
 	call LinkContestRoom1_EventScript_15F6E6
 	call LinkContestRoom1_EventScript_15F646
 	compare VAR_TEMP_0, 8
-	goto_if 0, LinkContestRoom1_EventScript_15F630
+	goto_if_lt LinkContestRoom1_EventScript_15F630
 	return
 
 LinkContestRoom1_EventScript_15F646:: @ 815F646
diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc
index ca2a3c245..c8adf85c3 100644
--- a/data/scripts/maps/VerdanturfTown.inc
+++ b/data/scripts/maps/VerdanturfTown.inc
@@ -11,8 +11,7 @@ VerdanturfTown_MapScript1_14E85A:: @ 814E85A
 VerdanturfTown_EventScript_14E866:: @ 814E866
 	lock
 	faceplayer
-	checkflag FLAG_RUSTURF_TUNNEL_OPENED
-	goto_if_eq VerdanturfTown_EventScript_14E885
+	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E885
 	msgbox VerdanturfTown_Text_16CAEB, 4
 	applymovement 2, VerdanturfTown_Movement_1A083D
 	waitmovement 0
@@ -37,8 +36,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2
 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB
 	lock
 	faceplayer
-	checkflag FLAG_RUSTURF_TUNNEL_OPENED
-	goto_if_eq VerdanturfTown_EventScript_14E8C0
+	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E8C0
 	msgbox VerdanturfTown_Text_16CD4D, 4
 	release
 	end
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 37811dbc1..85b524c99 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
@@ -101,8 +101,7 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E
 VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_TM45
-	goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76
+	goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76
 	msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4
 	giveitem_std ITEM_TM45
 	compare RESULT, 0
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
index 205a4315c..4410beaba 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
@@ -4,8 +4,7 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A
 VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B
 	lock
 	faceplayer
-	checkflag FLAG_WALLY_SPEECH
-	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73
+	goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_153F73
 	msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4
 	setflag FLAG_WALLY_SPEECH
 	release
@@ -19,10 +18,8 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73
 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
-	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5
-	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
-	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B
+	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_153FA5
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153F9B
 	msgbox VerdanturfTown_WandasHouse_Text_17859A, 4
 	release
 	end
@@ -44,10 +41,8 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF
 VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
-	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0
-	checkflag FLAG_DEFEATED_WALLY_MAUVILLE
-	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153FE0
+	goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_153FD6
 	msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4
 	release
 	end
@@ -65,12 +60,9 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0
 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
-	goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025
-	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
-	goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B
-	checkflag FLAG_RUSTURF_TUNNEL_OPENED
-	goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011
+	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_154025
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_15401B
+	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_154011
 	msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4
 	release
 	end
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
index ed0440343..4f3180318 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/scripts/maps/VictoryRoad_1F.inc
@@ -3,8 +3,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83
 	.byte 0
 
 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89
-	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
-	call_if 1, VictoryRoad_1F_EventScript_15DE93
+	call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_15DE93
 	end
 
 VictoryRoad_1F_EventScript_15DE93:: @ 815DE93
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index b02ab4faa..4813caa68 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -1,8 +1,7 @@
 PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14
 	lock
 	faceplayer
-	checkflag FLAG_SYS_CHAT_USED
-	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB
+	goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4
 	goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D
 	end
@@ -30,7 +29,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A
 	lock
 	faceplayer
 	compare VAR_SPECIAL_4, 1
-	call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77
+	call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77
 	compare RESULT, 0
 	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1
 	compare RESULT, 1
@@ -84,7 +83,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36
 	lock
 	faceplayer
 	compare VAR_SPECIAL_4, 1
-	call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77
+	call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77
 	compare RESULT, 0
 	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1
 	compare RESULT, 1
@@ -97,10 +96,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77
-	checkflag FLAG_BADGE05_GET
-	goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
-	checkflag FLAG_SYS_EXDATA_ENABLE
-	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
+	goto_if_unset FLAG_BADGE05_GET, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
+	goto_if_set FLAG_SYS_EXDATA_ENABLE, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
 	setflag FLAG_SYS_EXDATA_ENABLE
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3
 	release
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index b1ead4060..3d8f5532f 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -9,9 +9,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956
 	applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839
 	waitmovement 0
 	compare VAR_SPECIAL_5, 0
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F
 	compare VAR_SPECIAL_5, 1
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B69AA
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4
 	closemessage
 	setvar VAR_LITTLEROOT_INTRO_STATE, 4
@@ -59,8 +59,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF
 
 LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB
 LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB
-	checkflag FLAG_SET_WALL_CLOCK
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91
+	goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_1B6A91
 	msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4
 	call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B
 	delay 30
@@ -70,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB
 	setflag FLAG_HIDE_MACHOKE_MOVER_2
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A31
 	compare RESULT, 1
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A61
 	playse SE_KAIDAN
 	removeobject VAR_SPECIAL_8
 	releaseall
@@ -256,14 +255,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
 	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
-	checkflag FLAG_BADGE05_GET
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D
-	checkflag FLAG_RESCUED_BIRCH
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
+	goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D
+	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
 	compare VAR_TEMP_1, 1
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80
 	compare VAR_LITTLEROOT_INTRO_STATE, 7
-	goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C
+	goto_if_ge LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4
 	release
 	end
@@ -274,8 +271,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D
-	checkflag FLAG_RECEIVED_AMULET_COIN
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
+	goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4
 	giveitem_std ITEM_AMULET_COIN
 	compare RESULT, 0
@@ -363,13 +359,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	lockall
 	checkplayergender
 	compare RESULT, 0
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD
 	compare RESULT, 1
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E28
 	applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839
 	waitmovement 0
 	playse SE_PIN
@@ -379,23 +375,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	waitmovement 0
 	delay 20
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8
 	msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4
 	giveitem_std ITEM_SS_TICKET
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4
 	closemessage
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4
 	closemessage
 	compare VAR_SPECIAL_8, 0
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9
 	compare VAR_SPECIAL_8, 1
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B
 	playse SE_DOOR
 	removeobject VAR_SPECIAL_9
 	setflag FLAG_RECEIVED_SS_TICKET
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 589d4e21c..4b21aa99b 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -55,7 +55,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1
 	msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4
 	specialvar RESULT, GetFirstFreePokeblockSlot
 	compare RESULT, -1
-	goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF
+	goto_if_ne FallarborTown_ContestLobby_EventScript_1B76EF
 	compare RESULT, -1
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776
 	end
@@ -76,8 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF
 FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E
 	msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
-	goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F
 	goto FallarborTown_ContestLobby_EventScript_1B7759
 	end
 
@@ -162,8 +161,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC
 
 FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6
 	dodailyevents
-	checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
-	goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B77F6
 	goto FallarborTown_ContestLobby_EventScript_1B7800
 	end
 
@@ -216,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942
 	specialvar RESULT, GetFirstFreePokeblockSlot
 	compare RESULT, -1
-	goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878
+	goto_if_ne FallarborTown_ContestLobby_EventScript_1B7878
 	compare RESULT, -1
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938
 	end
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index f41fd1f8c..d34b357ea 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -44,7 +44,7 @@ gUnknown_081C346A:: @ 81C346A
 	lockall
 	special SafariZoneGetPokeblockNameInFeeder
 	compare RESULT, 0xFFFF
-	goto_if 5, EventScript_1C34A9
+	goto_if_ne EventScript_1C34A9
 	msgbox UnknownString_81C354E, MSGBOX_YESNO
 	compare RESULT, YES
 	goto_if_eq EventScript_1C348E
@@ -56,7 +56,7 @@ EventScript_1C348E:
 	special OpenPokeblockCaseOnFeeder
 	waitstate
 	compare RESULT, 0xFFFF
-	goto_if 5, EventScript_1C34A0
+	goto_if_ne EventScript_1C34A0
 	end
 
 EventScript_1C34A0:
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 2a5905191..1f5e074d9 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -17,11 +17,11 @@ Route111_EventScript_1A3877:: @ 81A3877
 	setflag FLAG_RECEIVED_SECRET_POWER
 	clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
 	compare FACING, 3
-	call_if 1, Route111_EventScript_1A38C3
+	call_if_eq Route111_EventScript_1A38C3
 	compare FACING, 4
-	call_if 1, Route111_EventScript_1A38C3
+	call_if_eq Route111_EventScript_1A38C3
 	compare FACING, 2
-	call_if 1, Route111_EventScript_1A38CE
+	call_if_eq Route111_EventScript_1A38CE
 	removeobject LAST_TALKED
 	release
 	end
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index cf82cf943..5a84a1b48 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -7,10 +7,8 @@ Event_TV:: @ 81A6E72
 	goto_if_eq EventScript_1A6F01
 	compare RESULT, 1
 	goto_if_eq EventScript_1A6F0B
-	checkflag FLAG_SYS_TV_START
-	goto_if 0, EventScript_1A6EF1
-	checkflag FLAG_SYS_TV_WATCH
-	goto_if_eq EventScript_1A6EF1
+	goto_if_unset FLAG_SYS_TV_START, EventScript_1A6EF1
+	goto_if_set FLAG_SYS_TV_WATCH, EventScript_1A6EF1
 	specialvar RESULT, IsTVShowInSearchOfTrainersAiring
 	compare RESULT, 1
 	goto_if_eq EventScript_1A6F66
@@ -27,7 +25,7 @@ EventScript_1A6EBB:
 	copyvar VAR_SPECIAL_4, RESULT
 	specialvar RESULT, GetTVShowType
 	compare RESULT, 0
-	goto_if 5, EventScript_1A6F21
+	goto_if_ne EventScript_1A6F21
 	end
 
 EventScript_1A6EF1:
@@ -60,7 +58,7 @@ EventScript_1A6F21:
 	waitmessage
 	waitbuttonpress
 	compare RESULT, 1
-	goto_if 5, EventScript_1A6F21
+	goto_if_ne EventScript_1A6F21
 	goto EventScript_1A6F37
 	end
 
diff --git a/data/specials.inc b/data/specials.inc
index 032a3884c..6904a2b6b 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -159,7 +159,7 @@ gSpecials::
 	def_special GetRivalSonDaughterString
 	def_special SetFlagInVar
 	def_special CableCarWarp
-	def_special sub_8123218
+	def_special CableCar
 	def_special Overworld_PlaySpecialMapMusic
 	def_special StartWallClock
 	def_special ScrSpecial_ViewWallClock
diff --git a/data/trainer_money.inc b/data/trainer_money.inc
index 95da92fea..ceffb0a61 100644
--- a/data/trainer_money.inc
+++ b/data/trainer_money.inc
@@ -1,58 +1,58 @@
 @ This is a factor in how much money you get for beating a trainer.
 	.align 2
 gTrainerMoney:: @ 81F98F0
-	.byte         TRAINER_CLASS_NAME_TEAM_AQUA,  5, 0, 0
-	.byte        TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0
-	.byte       TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0
-	.byte        TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0
-	.byte       TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0
-	.byte       TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0
-	.byte           TRAINER_CLASS_NAME_TUBER_F,  1, 0, 0
-	.byte           TRAINER_CLASS_NAME_TUBER_M,  1, 0, 0
-	.byte       TRAINER_CLASS_NAME_SIS_AND_BRO,  3, 0, 0
-	.byte      TRAINER_CLASS_NAME_COOL_TRAINER, 12, 0, 0
-	.byte        TRAINER_CLASS_NAME_HEX_MANIAC,  6, 0, 0
-	.byte              TRAINER_CLASS_NAME_LADY, 50, 0, 0
-	.byte            TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0
-	.byte          TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0
-	.byte        TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0
-	.byte         TRAINER_CLASS_NAME_SWIMMER_M,  2, 0, 0
-	.byte        TRAINER_CLASS_NAME_BLACK_BELT,  8, 0, 0
-	.byte         TRAINER_CLASS_NAME_GUITARIST,  8, 0, 0
-	.byte           TRAINER_CLASS_NAME_KINDLER,  8, 0, 0
-	.byte            TRAINER_CLASS_NAME_CAMPER,  4, 0, 0
-	.byte        TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0
-	.byte        TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0
-	.byte           TRAINER_CLASS_NAME_PSYCHIC,  6, 0, 0
-	.byte         TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0
-	.byte        TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0
-	.byte            TRAINER_CLASS_NAME_LEADER, 25, 0, 0
-	.byte        TRAINER_CLASS_NAME_SCHOOL_KID,  5, 0, 0
-	.byte         TRAINER_CLASS_NAME_SR_AND_JR,  4, 0, 0
-	.byte           TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0
-	.byte            TRAINER_CLASS_NAME_EXPERT, 10, 0, 0
-	.byte         TRAINER_CLASS_NAME_YOUNGSTER,  4, 0, 0
-	.byte          TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0
-	.byte         TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0
-	.byte        TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0
-	.byte      TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0
-	.byte       TRAINER_CLASS_NAME_BIRD_KEEPER,  8, 0, 0
-	.byte         TRAINER_CLASS_NAME_NINJA_BOY,  3, 0, 0
-	.byte       TRAINER_CLASS_NAME_BATTLE_GIRL,  6, 0, 0
-	.byte      TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0
-	.byte         TRAINER_CLASS_NAME_SWIMMER_F,  2, 0, 0
-	.byte         TRAINER_CLASS_NAME_PICNICKER,  4, 0, 0
-	.byte             TRAINER_CLASS_NAME_TWINS,  3, 0, 0
-	.byte            TRAINER_CLASS_NAME_SAILOR,  8, 0, 0
-	.byte         TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 15, 0, 0
-	.byte   TRAINER_CLASS_NAME_POKEMON_BREEDER, 10, 0, 0
-	.byte    TRAINER_CLASS_NAME_POKEMON_RANGER, 12, 0, 0
-	.byte        TRAINER_CLASS_NAME_TEAM_MAGMA,  5, 0, 0
-	.byte       TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0
-	.byte      TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0
-	.byte              TRAINER_CLASS_NAME_LASS,  4, 0, 0
-	.byte       TRAINER_CLASS_NAME_BUG_CATCHER,  4, 0, 0
-	.byte             TRAINER_CLASS_NAME_HIKER, 10, 0, 0
-	.byte      TRAINER_CLASS_NAME_YOUNG_COUPLE,  8, 0, 0
+	.byte         TRAINER_CLASS_TEAM_AQUA,  5, 0, 0
+	.byte        TRAINER_CLASS_AQUA_ADMIN, 10, 0, 0
+	.byte       TRAINER_CLASS_AQUA_LEADER, 20, 0, 0
+	.byte        TRAINER_CLASS_AROMA_LADY, 10, 0, 0
+	.byte       TRAINER_CLASS_RUIN_MANIAC, 15, 0, 0
+	.byte       TRAINER_CLASS_INTERVIEWER, 12, 0, 0
+	.byte           TRAINER_CLASS_TUBER_F,  1, 0, 0
+	.byte           TRAINER_CLASS_TUBER_M,  1, 0, 0
+	.byte       TRAINER_CLASS_SIS_AND_BRO,  3, 0, 0
+	.byte      TRAINER_CLASS_COOL_TRAINER, 12, 0, 0
+	.byte        TRAINER_CLASS_HEX_MANIAC,  6, 0, 0
+	.byte              TRAINER_CLASS_LADY, 50, 0, 0
+	.byte            TRAINER_CLASS_BEAUTY, 20, 0, 0
+	.byte          TRAINER_CLASS_RICH_BOY, 50, 0, 0
+	.byte        TRAINER_CLASS_POKEMANIAC, 15, 0, 0
+	.byte         TRAINER_CLASS_SWIMMER_M,  2, 0, 0
+	.byte        TRAINER_CLASS_BLACK_BELT,  8, 0, 0
+	.byte         TRAINER_CLASS_GUITARIST,  8, 0, 0
+	.byte           TRAINER_CLASS_KINDLER,  8, 0, 0
+	.byte            TRAINER_CLASS_CAMPER,  4, 0, 0
+	.byte        TRAINER_CLASS_OLD_COUPLE, 10, 0, 0
+	.byte        TRAINER_CLASS_BUG_MANIAC, 15, 0, 0
+	.byte           TRAINER_CLASS_PSYCHIC,  6, 0, 0
+	.byte         TRAINER_CLASS_GENTLEMAN, 20, 0, 0
+	.byte        TRAINER_CLASS_ELITE_FOUR, 25, 0, 0
+	.byte            TRAINER_CLASS_LEADER, 25, 0, 0
+	.byte        TRAINER_CLASS_SCHOOL_KID,  5, 0, 0
+	.byte         TRAINER_CLASS_SR_AND_JR,  4, 0, 0
+	.byte           TRAINER_CLASS_POKEFAN, 20, 0, 0
+	.byte            TRAINER_CLASS_EXPERT, 10, 0, 0
+	.byte         TRAINER_CLASS_YOUNGSTER,  4, 0, 0
+	.byte          TRAINER_CLASS_CHAMPION, 50, 0, 0
+	.byte         TRAINER_CLASS_FISHERMAN, 10, 0, 0
+	.byte        TRAINER_CLASS_TRIATHLETE, 10, 0, 0
+	.byte      TRAINER_CLASS_DRAGON_TAMER, 12, 0, 0
+	.byte       TRAINER_CLASS_BIRD_KEEPER,  8, 0, 0
+	.byte         TRAINER_CLASS_NINJA_BOY,  3, 0, 0
+	.byte       TRAINER_CLASS_BATTLE_GIRL,  6, 0, 0
+	.byte      TRAINER_CLASS_PARASOL_LADY, 10, 0, 0
+	.byte         TRAINER_CLASS_SWIMMER_F,  2, 0, 0
+	.byte         TRAINER_CLASS_PICNICKER,  4, 0, 0
+	.byte             TRAINER_CLASS_TWINS,  3, 0, 0
+	.byte            TRAINER_CLASS_SAILOR,  8, 0, 0
+	.byte         TRAINER_CLASS_COLLECTOR, 15, 0, 0
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3, 15, 0, 0
+	.byte   TRAINER_CLASS_POKEMON_BREEDER, 10, 0, 0
+	.byte    TRAINER_CLASS_POKEMON_RANGER, 12, 0, 0
+	.byte        TRAINER_CLASS_TEAM_MAGMA,  5, 0, 0
+	.byte       TRAINER_CLASS_MAGMA_ADMIN, 10, 0, 0
+	.byte      TRAINER_CLASS_MAGMA_LEADER, 20, 0, 0
+	.byte              TRAINER_CLASS_LASS,  4, 0, 0
+	.byte       TRAINER_CLASS_BUG_CATCHER,  4, 0, 0
+	.byte             TRAINER_CLASS_HIKER, 10, 0, 0
+	.byte      TRAINER_CLASS_YOUNG_COUPLE,  8, 0, 0
 	.byte                                   -1,  5, 0, 0
diff --git a/data/trainers.inc b/data/trainers.inc
index 8e80cd77f..be9ce1a81 100644
--- a/data/trainers.inc
+++ b/data/trainers.inc
@@ -2,7 +2,7 @@
 gTrainers:: @ 81F04FC
 @ NONE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_1
+	.byte TRAINER_CLASS_POKEMON_TRAINER_1
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "$", 12
@@ -14,7 +14,7 @@ gTrainers:: @ 81F04FC
 
 @ ARCHIE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_LEADER
+	.byte TRAINER_CLASS_AQUA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_ARCHIE
 	.string "ARCHIE$", 12
@@ -26,7 +26,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -38,7 +38,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -50,7 +50,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -62,7 +62,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -74,7 +74,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -86,7 +86,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_6
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -98,7 +98,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_7
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -110,7 +110,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_8
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -122,7 +122,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_9
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -134,7 +134,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_10
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -146,7 +146,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_11
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -158,7 +158,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_12
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -170,7 +170,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_13
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -182,7 +182,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_14
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -194,7 +194,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_15
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -206,7 +206,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_16
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -218,7 +218,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_17
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -230,7 +230,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_18
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -242,7 +242,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_19
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -254,7 +254,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_20
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -266,7 +266,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_21
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -278,7 +278,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_22
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -290,7 +290,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_23
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -302,7 +302,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_24
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.string "GRUNT$", 12
@@ -314,7 +314,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_25
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.string "GRUNT$", 12
@@ -326,7 +326,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_26
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.string "GRUNT$", 12
@@ -338,7 +338,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_27
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_AQUA
+	.byte TRAINER_CLASS_TEAM_AQUA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.string "GRUNT$", 12
@@ -350,7 +350,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_M
 	.string "$", 12
@@ -362,7 +362,7 @@ gTrainers:: @ 81F04FC
 
 @ MATT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_M
 	.string "MATT$", 12
@@ -374,7 +374,7 @@ gTrainers:: @ 81F04FC
 
 @ MATT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_M
 	.string "MATT$", 12
@@ -386,7 +386,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELLY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_F
 	.string "SHELLY$", 12
@@ -398,7 +398,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELLY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
+	.byte TRAINER_CLASS_AQUA_ADMIN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_F
 	.string "SHELLY$", 12
@@ -410,7 +410,7 @@ gTrainers:: @ 81F04FC
 
 @ ARCHIE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_LEADER
+	.byte TRAINER_CLASS_AQUA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_ARCHIE
 	.string "ARCHIE$", 12
@@ -422,7 +422,7 @@ gTrainers:: @ 81F04FC
 
 @ ARCHIE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AQUA_LEADER
+	.byte TRAINER_CLASS_AQUA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_ARCHIE
 	.string "ARCHIE$", 12
@@ -434,7 +434,7 @@ gTrainers:: @ 81F04FC
 
 @ DAISY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "DAISY$", 12
@@ -446,7 +446,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSE$", 12
@@ -458,7 +458,7 @@ gTrainers:: @ 81F04FC
 
 @ LILY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "LILY$", 12
@@ -470,7 +470,7 @@ gTrainers:: @ 81F04FC
 
 @ VIOLET
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "VIOLET$", 12
@@ -482,7 +482,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSE$", 12
@@ -494,7 +494,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSE$", 12
@@ -506,7 +506,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSE$", 12
@@ -518,7 +518,7 @@ gTrainers:: @ 81F04FC
 
 @ ROSE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_AROMA_LADY
+	.byte TRAINER_CLASS_AROMA_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.string "ROSE$", 12
@@ -530,7 +530,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "DUSTY$", 12
@@ -542,7 +542,7 @@ gTrainers:: @ 81F04FC
 
 @ CHIP
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "CHIP$", 12
@@ -554,7 +554,7 @@ gTrainers:: @ 81F04FC
 
 @ FOSTER
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "FOSTER$", 12
@@ -566,7 +566,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "DUSTY$", 12
@@ -578,7 +578,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "DUSTY$", 12
@@ -590,7 +590,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "DUSTY$", 12
@@ -602,7 +602,7 @@ gTrainers:: @ 81F04FC
 
 @ DUSTY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
+	.byte TRAINER_CLASS_RUIN_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.string "DUSTY$", 12
@@ -614,7 +614,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "GABBY & TY$", 12
@@ -626,7 +626,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "GABBY & TY$", 12
@@ -638,7 +638,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "GABBY & TY$", 12
@@ -650,7 +650,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "GABBY & TY$", 12
@@ -662,7 +662,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "GABBY & TY$", 12
@@ -674,7 +674,7 @@ gTrainers:: @ 81F04FC
 
 @ GABBY_AND_TY_6
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_INTERVIEWER
+	.byte TRAINER_CLASS_INTERVIEWER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.string "GABBY & TY$", 12
@@ -686,7 +686,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -698,7 +698,7 @@ gTrainers:: @ 81F04FC
 
 @ CARMEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "CARMEN$", 12
@@ -710,7 +710,7 @@ gTrainers:: @ 81F04FC
 
 @ GWEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "GWEN $", 12
@@ -722,7 +722,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -734,7 +734,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -746,7 +746,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -758,7 +758,7 @@ gTrainers:: @ 81F04FC
 
 @ LOLA_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_F
+	.byte TRAINER_CLASS_TUBER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.string "LOLA$", 12
@@ -770,7 +770,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "RICKY$", 12
@@ -782,7 +782,7 @@ gTrainers:: @ 81F04FC
 
 @ SIMON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "SIMON$", 12
@@ -794,7 +794,7 @@ gTrainers:: @ 81F04FC
 
 @ CHARLIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "CHARLIE$", 12
@@ -806,7 +806,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "RICKY$", 12
@@ -818,7 +818,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "RICKY$", 12
@@ -830,7 +830,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "RICKY$", 12
@@ -842,7 +842,7 @@ gTrainers:: @ 81F04FC
 
 @ RICKY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TUBER_M
+	.byte TRAINER_CLASS_TUBER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.string "RICKY$", 12
@@ -854,7 +854,7 @@ gTrainers:: @ 81F04FC
 
 @ RANDALL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "RANDALL$", 12
@@ -866,7 +866,7 @@ gTrainers:: @ 81F04FC
 
 @ PARKER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "PARKER$", 12
@@ -878,7 +878,7 @@ gTrainers:: @ 81F04FC
 
 @ GEORGE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "GEORGE$", 12
@@ -890,7 +890,7 @@ gTrainers:: @ 81F04FC
 
 @ BERKE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "BERKE$", 12
@@ -902,7 +902,7 @@ gTrainers:: @ 81F04FC
 
 @ CLYDE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "CLYDE$", 12
@@ -914,7 +914,7 @@ gTrainers:: @ 81F04FC
 
 @ VINCENT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "VINCENT$", 12
@@ -926,7 +926,7 @@ gTrainers:: @ 81F04FC
 
 @ LEROY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "LEROY$", 12
@@ -938,7 +938,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "WILTON$", 12
@@ -950,7 +950,7 @@ gTrainers:: @ 81F04FC
 
 @ EDGAR
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "EDGAR$", 12
@@ -962,7 +962,7 @@ gTrainers:: @ 81F04FC
 
 @ ALBERT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "ALBERT$", 12
@@ -974,7 +974,7 @@ gTrainers:: @ 81F04FC
 
 @ SAMUEL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "SAMUEL$", 12
@@ -986,7 +986,7 @@ gTrainers:: @ 81F04FC
 
 @ VITO
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "VITO$", 12
@@ -998,7 +998,7 @@ gTrainers:: @ 81F04FC
 
 @ OWEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "OWEN$", 12
@@ -1010,7 +1010,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "WILTON$", 12
@@ -1022,7 +1022,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "WILTON$", 12
@@ -1034,7 +1034,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "WILTON$", 12
@@ -1046,7 +1046,7 @@ gTrainers:: @ 81F04FC
 
 @ WILTON_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "WILTON$", 12
@@ -1058,7 +1058,7 @@ gTrainers:: @ 81F04FC
 
 @ WARREN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "WARREN$", 12
@@ -1070,7 +1070,7 @@ gTrainers:: @ 81F04FC
 
 @ MARY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "MARY$", 12
@@ -1082,7 +1082,7 @@ gTrainers:: @ 81F04FC
 
 @ LORI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "LORI$", 12
@@ -1094,7 +1094,7 @@ gTrainers:: @ 81F04FC
 
 @ JODY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "JODY$", 12
@@ -1106,7 +1106,7 @@ gTrainers:: @ 81F04FC
 
 @ WENDY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "WENDY$", 12
@@ -1118,7 +1118,7 @@ gTrainers:: @ 81F04FC
 
 @ ELAINE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "ELAINE$", 12
@@ -1130,7 +1130,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "BROOKE$", 12
@@ -1142,7 +1142,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNIFER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "JENNIFER$", 12
@@ -1154,7 +1154,7 @@ gTrainers:: @ 81F04FC
 
 @ HOPE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "HOPE$", 12
@@ -1166,7 +1166,7 @@ gTrainers:: @ 81F04FC
 
 @ SHANNON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "SHANNON$", 12
@@ -1178,7 +1178,7 @@ gTrainers:: @ 81F04FC
 
 @ MICHELLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "MICHELLE$", 12
@@ -1190,7 +1190,7 @@ gTrainers:: @ 81F04FC
 
 @ CAROLINE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "CAROLINE$", 12
@@ -1202,7 +1202,7 @@ gTrainers:: @ 81F04FC
 
 @ JULIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "JULIE$", 12
@@ -1214,7 +1214,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "BROOKE$", 12
@@ -1226,7 +1226,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "BROOKE$", 12
@@ -1238,7 +1238,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "BROOKE$", 12
@@ -1250,7 +1250,7 @@ gTrainers:: @ 81F04FC
 
 @ BROOKE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "BROOKE$", 12
@@ -1262,7 +1262,7 @@ gTrainers:: @ 81F04FC
 
 @ PATRICIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "PATRICIA$", 12
@@ -1274,7 +1274,7 @@ gTrainers:: @ 81F04FC
 
 @ KINDRA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "KINDRA$", 12
@@ -1286,7 +1286,7 @@ gTrainers:: @ 81F04FC
 
 @ TAMMY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "TAMMY$", 12
@@ -1298,7 +1298,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "VALERIE$", 12
@@ -1310,7 +1310,7 @@ gTrainers:: @ 81F04FC
 
 @ TASHA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "TASHA$", 12
@@ -1322,7 +1322,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "VALERIE$", 12
@@ -1334,7 +1334,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "VALERIE$", 12
@@ -1346,7 +1346,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "VALERIE$", 12
@@ -1358,7 +1358,7 @@ gTrainers:: @ 81F04FC
 
 @ VALERIE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HEX_MANIAC
+	.byte TRAINER_CLASS_HEX_MANIAC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.string "VALERIE$", 12
@@ -1370,7 +1370,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_1
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "CINDY$", 12
@@ -1382,7 +1382,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "$", 12
@@ -1394,7 +1394,7 @@ gTrainers:: @ 81F04FC
 
 @ BRIANNA_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "BRIANNA$", 12
@@ -1406,7 +1406,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "CINDY$", 12
@@ -1418,7 +1418,7 @@ gTrainers:: @ 81F04FC
 
 @ BRIANNA_2
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "BRIANNA$", 12
@@ -1430,7 +1430,7 @@ gTrainers:: @ 81F04FC
 
 @ ANETTE
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "ANETTE$", 12
@@ -1442,7 +1442,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_3
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "CINDY$", 12
@@ -1454,7 +1454,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_4
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "CINDY$", 12
@@ -1466,7 +1466,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "CINDY$", 12
@@ -1478,7 +1478,7 @@ gTrainers:: @ 81F04FC
 
 @ CINDY_6
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LADY
+	.byte TRAINER_CLASS_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.string "CINDY$", 12
@@ -1490,7 +1490,7 @@ gTrainers:: @ 81F04FC
 
 @ MELISSA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "MELISSA$", 12
@@ -1502,7 +1502,7 @@ gTrainers:: @ 81F04FC
 
 @ SHEILA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "SHEILA$", 12
@@ -1514,7 +1514,7 @@ gTrainers:: @ 81F04FC
 
 @ SHIRLEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "SHIRLEY$", 12
@@ -1526,7 +1526,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "JESSICA$", 12
@@ -1538,7 +1538,7 @@ gTrainers:: @ 81F04FC
 
 @ CONNIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "CONNIE$", 12
@@ -1550,7 +1550,7 @@ gTrainers:: @ 81F04FC
 
 @ BRIDGET
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "BRIDGET$", 12
@@ -1562,7 +1562,7 @@ gTrainers:: @ 81F04FC
 
 @ OLIVIA
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "OLIVIA$", 12
@@ -1574,7 +1574,7 @@ gTrainers:: @ 81F04FC
 
 @ TIFFANY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "TIFFANY$", 12
@@ -1586,7 +1586,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "JESSICA$", 12
@@ -1598,7 +1598,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "JESSICA$", 12
@@ -1610,7 +1610,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "JESSICA$", 12
@@ -1622,7 +1622,7 @@ gTrainers:: @ 81F04FC
 
 @ JESSICA_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "JESSICA$", 12
@@ -1634,7 +1634,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_1
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "WINSTON$", 12
@@ -1646,7 +1646,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "$", 12
@@ -1658,7 +1658,7 @@ gTrainers:: @ 81F04FC
 
 @ GARRET
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "GARRET$", 12
@@ -1670,7 +1670,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_2
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "WINSTON$", 12
@@ -1682,7 +1682,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_3
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "WINSTON$", 12
@@ -1694,7 +1694,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_4
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "WINSTON$", 12
@@ -1706,7 +1706,7 @@ gTrainers:: @ 81F04FC
 
 @ WINSTON_5
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_RICH_BOY
+	.byte TRAINER_CLASS_RICH_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.string "WINSTON$", 12
@@ -1718,7 +1718,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "STEVE$", 12
@@ -1730,7 +1730,7 @@ gTrainers:: @ 81F04FC
 
 @ CHRIS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "CHRIS$", 12
@@ -1742,7 +1742,7 @@ gTrainers:: @ 81F04FC
 
 @ MARK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "MARK$", 12
@@ -1754,7 +1754,7 @@ gTrainers:: @ 81F04FC
 
 @ KENN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "KENN$", 12
@@ -1766,7 +1766,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "STEVE$", 12
@@ -1778,7 +1778,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "STEVE$", 12
@@ -1790,7 +1790,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "STEVE$", 12
@@ -1802,7 +1802,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMANIAC
+	.byte TRAINER_CLASS_POKEMANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.string "STEVE$", 12
@@ -1814,7 +1814,7 @@ gTrainers:: @ 81F04FC
 
 @ LUIS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "LUIS$", 12
@@ -1826,7 +1826,7 @@ gTrainers:: @ 81F04FC
 
 @ AUSTIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "AUSTIN$", 12
@@ -1838,7 +1838,7 @@ gTrainers:: @ 81F04FC
 
 @ DOUGLAS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "DOUGLAS$", 12
@@ -1850,7 +1850,7 @@ gTrainers:: @ 81F04FC
 
 @ DARRIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "DARRIN$", 12
@@ -1862,7 +1862,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "TONY$", 12
@@ -1874,7 +1874,7 @@ gTrainers:: @ 81F04FC
 
 @ JEROME
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "JEROME$", 12
@@ -1886,7 +1886,7 @@ gTrainers:: @ 81F04FC
 
 @ MATTHEW
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "MATTHEW$", 12
@@ -1898,7 +1898,7 @@ gTrainers:: @ 81F04FC
 
 @ DAVID
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "DAVID$", 12
@@ -1910,7 +1910,7 @@ gTrainers:: @ 81F04FC
 
 @ SPENCER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "SPENCER$", 12
@@ -1922,7 +1922,7 @@ gTrainers:: @ 81F04FC
 
 @ ROLAND
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "ROLAND$", 12
@@ -1934,7 +1934,7 @@ gTrainers:: @ 81F04FC
 
 @ CODY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "CODY$", 12
@@ -1946,7 +1946,7 @@ gTrainers:: @ 81F04FC
 
 @ STAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "STAN$", 12
@@ -1958,7 +1958,7 @@ gTrainers:: @ 81F04FC
 
 @ BARRY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "BARRY$", 12
@@ -1970,7 +1970,7 @@ gTrainers:: @ 81F04FC
 
 @ DEAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "DEAN$", 12
@@ -1982,7 +1982,7 @@ gTrainers:: @ 81F04FC
 
 @ RODNEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "RODNEY$", 12
@@ -1994,7 +1994,7 @@ gTrainers:: @ 81F04FC
 
 @ RICHARD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "RICHARD$", 12
@@ -2006,7 +2006,7 @@ gTrainers:: @ 81F04FC
 
 @ HERMAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "HERMAN$", 12
@@ -2018,7 +2018,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "$", 12
@@ -2030,7 +2030,7 @@ gTrainers:: @ 81F04FC
 
 @ GILBERT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "GILBERT$", 12
@@ -2042,7 +2042,7 @@ gTrainers:: @ 81F04FC
 
 @ FRANKLIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "FRANKLIN$", 12
@@ -2054,7 +2054,7 @@ gTrainers:: @ 81F04FC
 
 @ DANNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "DANNY$", 12
@@ -2066,7 +2066,7 @@ gTrainers:: @ 81F04FC
 
 @ JACK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "JACK$", 12
@@ -2078,7 +2078,7 @@ gTrainers:: @ 81F04FC
 
 @ DUDLEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "DUDLEY$", 12
@@ -2090,7 +2090,7 @@ gTrainers:: @ 81F04FC
 
 @ CHAD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "CHAD$", 12
@@ -2102,7 +2102,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "TONY$", 12
@@ -2114,7 +2114,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "TONY$", 12
@@ -2126,7 +2126,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "TONY$", 12
@@ -2138,7 +2138,7 @@ gTrainers:: @ 81F04FC
 
 @ TONY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "TONY$", 12
@@ -2150,7 +2150,7 @@ gTrainers:: @ 81F04FC
 
 @ HIDEKI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "HIDEKI$", 12
@@ -2162,7 +2162,7 @@ gTrainers:: @ 81F04FC
 
 @ HITOSHI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "HITOSHI$", 12
@@ -2174,7 +2174,7 @@ gTrainers:: @ 81F04FC
 
 @ KIYO
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "KIYO$", 12
@@ -2186,7 +2186,7 @@ gTrainers:: @ 81F04FC
 
 @ KOICHI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "KOICHI$", 12
@@ -2198,7 +2198,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "NOB$", 12
@@ -2210,7 +2210,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "NOB$", 12
@@ -2222,7 +2222,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "NOB$", 12
@@ -2234,7 +2234,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "NOB$", 12
@@ -2246,7 +2246,7 @@ gTrainers:: @ 81F04FC
 
 @ NOB_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "NOB$", 12
@@ -2258,7 +2258,7 @@ gTrainers:: @ 81F04FC
 
 @ YUJI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "YUJI$", 12
@@ -2270,7 +2270,7 @@ gTrainers:: @ 81F04FC
 
 @ DAISUKE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "DAISUKE$", 12
@@ -2282,7 +2282,7 @@ gTrainers:: @ 81F04FC
 
 @ ATSUSHI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "ATSUSHI$", 12
@@ -2294,7 +2294,7 @@ gTrainers:: @ 81F04FC
 
 @ KIRK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "KIRK$", 12
@@ -2306,7 +2306,7 @@ gTrainers:: @ 81F04FC
 
 @ SCOTT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "SCOTT$", 12
@@ -2318,7 +2318,7 @@ gTrainers:: @ 81F04FC
 
 @ HARVEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "HARVEY$", 12
@@ -2330,7 +2330,7 @@ gTrainers:: @ 81F04FC
 
 @ SHAWN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "SHAWN$", 12
@@ -2342,7 +2342,7 @@ gTrainers:: @ 81F04FC
 
 @ RANDY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "RANDY$", 12
@@ -2354,7 +2354,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "DALTON$", 12
@@ -2366,7 +2366,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "DALTON$", 12
@@ -2378,7 +2378,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "DALTON$", 12
@@ -2390,7 +2390,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "DALTON$", 12
@@ -2402,7 +2402,7 @@ gTrainers:: @ 81F04FC
 
 @ DALTON_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GUITARIST
+	.byte TRAINER_CLASS_GUITARIST
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.string "DALTON$", 12
@@ -2414,7 +2414,7 @@ gTrainers:: @ 81F04FC
 
 @ COLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "COLE$", 12
@@ -2426,7 +2426,7 @@ gTrainers:: @ 81F04FC
 
 @ FLINT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "FLINT$", 12
@@ -2438,7 +2438,7 @@ gTrainers:: @ 81F04FC
 
 @ AXLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "AXLE$", 12
@@ -2450,7 +2450,7 @@ gTrainers:: @ 81F04FC
 
 @ JAKE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "JAKE$", 12
@@ -2462,7 +2462,7 @@ gTrainers:: @ 81F04FC
 
 @ ANDY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "ANDY$", 12
@@ -2474,7 +2474,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "BERNIE$", 12
@@ -2486,7 +2486,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "BERNIE$", 12
@@ -2498,7 +2498,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "BERNIE$", 12
@@ -2510,7 +2510,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "BERNIE$", 12
@@ -2522,7 +2522,7 @@ gTrainers:: @ 81F04FC
 
 @ BERNIE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_KINDLER
+	.byte TRAINER_CLASS_KINDLER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.string "BERNIE$", 12
@@ -2534,7 +2534,7 @@ gTrainers:: @ 81F04FC
 
 @ DREW
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "DREW$", 12
@@ -2546,7 +2546,7 @@ gTrainers:: @ 81F04FC
 
 @ CLIFF
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "CLIFF$", 12
@@ -2558,7 +2558,7 @@ gTrainers:: @ 81F04FC
 
 @ LARRY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "LARRY$", 12
@@ -2570,7 +2570,7 @@ gTrainers:: @ 81F04FC
 
 @ SHANE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "SHANE$", 12
@@ -2582,7 +2582,7 @@ gTrainers:: @ 81F04FC
 
 @ JUSTIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "JUSTIN$", 12
@@ -2594,7 +2594,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "ETHAN$", 12
@@ -2606,7 +2606,7 @@ gTrainers:: @ 81F04FC
 
 @ JEFF
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "JEFF$", 12
@@ -2618,7 +2618,7 @@ gTrainers:: @ 81F04FC
 
 @ TRAVIS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "TRAVIS$", 12
@@ -2630,7 +2630,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "ETHAN$", 12
@@ -2642,7 +2642,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "ETHAN$", 12
@@ -2654,7 +2654,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "ETHAN$", 12
@@ -2666,7 +2666,7 @@ gTrainers:: @ 81F04FC
 
 @ ETHAN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "ETHAN$", 12
@@ -2678,7 +2678,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRENT$", 12
@@ -2690,7 +2690,7 @@ gTrainers:: @ 81F04FC
 
 @ DONALD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "DONALD$", 12
@@ -2702,7 +2702,7 @@ gTrainers:: @ 81F04FC
 
 @ TAYLOR
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "TAYLOR$", 12
@@ -2714,7 +2714,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRANDON$", 12
@@ -2726,7 +2726,7 @@ gTrainers:: @ 81F04FC
 
 @ DEREK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "DEREK$", 12
@@ -2738,7 +2738,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRANDON$", 12
@@ -2750,7 +2750,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRANDON$", 12
@@ -2762,7 +2762,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRANDON$", 12
@@ -2774,7 +2774,7 @@ gTrainers:: @ 81F04FC
 
 @ BRANDON_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_MANIAC
+	.byte TRAINER_CLASS_BUG_MANIAC
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.string "BRANDON$", 12
@@ -2786,7 +2786,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWARD
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "EDWARD$", 12
@@ -2798,7 +2798,7 @@ gTrainers:: @ 81F04FC
 
 @ PRESTON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "PRESTON$", 12
@@ -2810,7 +2810,7 @@ gTrainers:: @ 81F04FC
 
 @ VIRGIL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "VIRGIL$", 12
@@ -2822,7 +2822,7 @@ gTrainers:: @ 81F04FC
 
 @ FRITZ
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "FRITZ$", 12
@@ -2834,7 +2834,7 @@ gTrainers:: @ 81F04FC
 
 @ WILLIAM
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "WILLIAM$", 12
@@ -2846,7 +2846,7 @@ gTrainers:: @ 81F04FC
 
 @ JOSHUA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "JOSHUA$", 12
@@ -2858,7 +2858,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "CAMERON$", 12
@@ -2870,7 +2870,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "CAMERON$", 12
@@ -2882,7 +2882,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "CAMERON$", 12
@@ -2894,7 +2894,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "CAMERON$", 12
@@ -2906,7 +2906,7 @@ gTrainers:: @ 81F04FC
 
 @ CAMERON_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.string "CAMERON$", 12
@@ -2918,7 +2918,7 @@ gTrainers:: @ 81F04FC
 
 @ JACLYN
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "JACLYN$", 12
@@ -2930,7 +2930,7 @@ gTrainers:: @ 81F04FC
 
 @ HANNAH
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "HANNAH$", 12
@@ -2942,7 +2942,7 @@ gTrainers:: @ 81F04FC
 
 @ SAMANTHA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "SAMANTHA$", 12
@@ -2954,7 +2954,7 @@ gTrainers:: @ 81F04FC
 
 @ MAURA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "MAURA$", 12
@@ -2966,7 +2966,7 @@ gTrainers:: @ 81F04FC
 
 @ KAYLA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "KAYLA$", 12
@@ -2978,7 +2978,7 @@ gTrainers:: @ 81F04FC
 
 @ ALEXIS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "ALEXIS$", 12
@@ -2990,7 +2990,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "JACKI$", 12
@@ -3002,7 +3002,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "JACKI$", 12
@@ -3014,7 +3014,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "JACKI$", 12
@@ -3026,7 +3026,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "JACKI$", 12
@@ -3038,7 +3038,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKI_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PSYCHIC
+	.byte TRAINER_CLASS_PSYCHIC
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.string "JACKI$", 12
@@ -3050,7 +3050,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "WALTER$", 12
@@ -3062,7 +3062,7 @@ gTrainers:: @ 81F04FC
 
 @ TUCKER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "TUCKER$", 12
@@ -3074,7 +3074,7 @@ gTrainers:: @ 81F04FC
 
 @ THOMAS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "THOMAS$", 12
@@ -3086,7 +3086,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "WALTER$", 12
@@ -3098,7 +3098,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "WALTER$", 12
@@ -3110,7 +3110,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "WALTER$", 12
@@ -3122,7 +3122,7 @@ gTrainers:: @ 81F04FC
 
 @ WALTER_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_GENTLEMAN
+	.byte TRAINER_CLASS_GENTLEMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.string "WALTER$", 12
@@ -3134,7 +3134,7 @@ gTrainers:: @ 81F04FC
 
 @ SIDNEY
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_ELITE_FOUR
+	.byte TRAINER_CLASS_ELITE_FOUR
 	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_SIDNEY
 	.string "SIDNEY$", 12
@@ -3146,7 +3146,7 @@ gTrainers:: @ 81F04FC
 
 @ PHOEBE
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_ELITE_FOUR
+	.byte TRAINER_CLASS_ELITE_FOUR
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_PHOEBE
 	.string "PHOEBE$", 12
@@ -3158,7 +3158,7 @@ gTrainers:: @ 81F04FC
 
 @ GLACIA
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_ELITE_FOUR
+	.byte TRAINER_CLASS_ELITE_FOUR
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_GLACIA
 	.string "GLACIA$", 12
@@ -3170,7 +3170,7 @@ gTrainers:: @ 81F04FC
 
 @ DRAKE
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_ELITE_FOUR
+	.byte TRAINER_CLASS_ELITE_FOUR
 	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAKE
 	.string "DRAKE$", 12
@@ -3182,7 +3182,7 @@ gTrainers:: @ 81F04FC
 
 @ ROXANNE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_ROXANNE
 	.string "ROXANNE$", 12
@@ -3194,7 +3194,7 @@ gTrainers:: @ 81F04FC
 
 @ BRAWLY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRAWLY
 	.string "BRAWLY$", 12
@@ -3206,7 +3206,7 @@ gTrainers:: @ 81F04FC
 
 @ WATTSON
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WATTSON
 	.string "WATTSON$", 12
@@ -3218,7 +3218,7 @@ gTrainers:: @ 81F04FC
 
 @ FLANNERY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_FLANNERY
 	.string "FLANNERY$", 12
@@ -3230,7 +3230,7 @@ gTrainers:: @ 81F04FC
 
 @ NORMAN
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_NORMAN
 	.string "NORMAN$", 12
@@ -3242,7 +3242,7 @@ gTrainers:: @ 81F04FC
 
 @ WINONA
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WINONA
 	.string "WINONA$", 12
@@ -3254,7 +3254,7 @@ gTrainers:: @ 81F04FC
 
 @ TATE_AND_LIZA
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_TATE_AND_LIZA
 	.string "TATE&LIZA$", 12
@@ -3266,7 +3266,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLACE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_LEADER
+	.byte TRAINER_CLASS_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLACE
 	.string "WALLACE$", 12
@@ -3278,7 +3278,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "JERRY$", 12
@@ -3290,7 +3290,7 @@ gTrainers:: @ 81F04FC
 
 @ TED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "TED$", 12
@@ -3302,7 +3302,7 @@ gTrainers:: @ 81F04FC
 
 @ PAUL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "PAUL$", 12
@@ -3314,7 +3314,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "JERRY$", 12
@@ -3326,7 +3326,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "JERRY$", 12
@@ -3338,7 +3338,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "JERRY$", 12
@@ -3350,7 +3350,7 @@ gTrainers:: @ 81F04FC
 
 @ JERRY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.string "JERRY$", 12
@@ -3362,7 +3362,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KAREN$", 12
@@ -3374,7 +3374,7 @@ gTrainers:: @ 81F04FC
 
 @ GEORGIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "GEORGIA$", 12
@@ -3386,7 +3386,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KAREN$", 12
@@ -3398,7 +3398,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KAREN$", 12
@@ -3410,7 +3410,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KAREN$", 12
@@ -3422,7 +3422,7 @@ gTrainers:: @ 81F04FC
 
 @ KAREN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SCHOOL_KID
+	.byte TRAINER_CLASS_SCHOOL_KID
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.string "KAREN$", 12
@@ -3434,7 +3434,7 @@ gTrainers:: @ 81F04FC
 
 @ KATE_AND_JOY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "KATE & JOY$", 12
@@ -3446,7 +3446,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "ANNA & MEG$", 12
@@ -3458,7 +3458,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "ANNA & MEG$", 12
@@ -3470,7 +3470,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "ANNA & MEG$", 12
@@ -3482,7 +3482,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "ANNA & MEG$", 12
@@ -3494,7 +3494,7 @@ gTrainers:: @ 81F04FC
 
 @ ANNA_AND_MEG_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "ANNA & MEG$", 12
@@ -3506,7 +3506,7 @@ gTrainers:: @ 81F04FC
 
 @ VICTOR
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_WINSTRATE
+	.byte TRAINER_CLASS_WINSTRATE
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "VICTOR$", 12
@@ -3518,7 +3518,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_1
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3530,7 +3530,7 @@ gTrainers:: @ 81F04FC
 
 @ COLTON
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "COLTON$", 12
@@ -3542,7 +3542,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_2
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3554,7 +3554,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_3
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3566,7 +3566,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_4
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3578,7 +3578,7 @@ gTrainers:: @ 81F04FC
 
 @ MIGUEL_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_M
 	.string "MIGUEL$", 12
@@ -3590,7 +3590,7 @@ gTrainers:: @ 81F04FC
 
 @ VICTORIA
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_WINSTRATE
+	.byte TRAINER_CLASS_WINSTRATE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "VICTORIA$", 12
@@ -3602,7 +3602,7 @@ gTrainers:: @ 81F04FC
 
 @ VANESSA
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "VANESSA$", 12
@@ -3614,7 +3614,7 @@ gTrainers:: @ 81F04FC
 
 @ MARISSA
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "MARISSA$", 12
@@ -3626,7 +3626,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_1
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3638,7 +3638,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_2
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3650,7 +3650,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_3
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3662,7 +3662,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_4
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3674,7 +3674,7 @@ gTrainers:: @ 81F04FC
 
 @ ISABEL_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEFAN
+	.byte TRAINER_CLASS_POKEFAN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEFAN_F
 	.string "ISABEL$", 12
@@ -3686,7 +3686,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "TIMOTHY$", 12
@@ -3698,7 +3698,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "TIMOTHY$", 12
@@ -3710,7 +3710,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "TIMOTHY$", 12
@@ -3722,7 +3722,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "TIMOTHY$", 12
@@ -3734,7 +3734,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMOTHY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.string "TIMOTHY$", 12
@@ -3746,7 +3746,7 @@ gTrainers:: @ 81F04FC
 
 @ VICKY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_WINSTRATE
+	.byte TRAINER_CLASS_WINSTRATE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "VICKY$", 12
@@ -3758,7 +3758,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "SHELBY$", 12
@@ -3770,7 +3770,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "SHELBY$", 12
@@ -3782,7 +3782,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "SHELBY$", 12
@@ -3794,7 +3794,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "SHELBY$", 12
@@ -3806,7 +3806,7 @@ gTrainers:: @ 81F04FC
 
 @ SHELBY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_EXPERT
+	.byte TRAINER_CLASS_EXPERT
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.string "SHELBY$", 12
@@ -3818,7 +3818,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "CALVIN$", 12
@@ -3830,7 +3830,7 @@ gTrainers:: @ 81F04FC
 
 @ BILLY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "BILLY$", 12
@@ -3842,7 +3842,7 @@ gTrainers:: @ 81F04FC
 
 @ JOSH
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "JOSH$", 12
@@ -3854,7 +3854,7 @@ gTrainers:: @ 81F04FC
 
 @ TOMMY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "TOMMY$", 12
@@ -3866,7 +3866,7 @@ gTrainers:: @ 81F04FC
 
 @ JOEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "JOEY$", 12
@@ -3878,7 +3878,7 @@ gTrainers:: @ 81F04FC
 
 @ BEN
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "BEN$", 12
@@ -3890,7 +3890,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "$", 12
@@ -3902,7 +3902,7 @@ gTrainers:: @ 81F04FC
 
 @ KEVIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "KEVIN$", 12
@@ -3914,7 +3914,7 @@ gTrainers:: @ 81F04FC
 
 @ NEAL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "NEAL$", 12
@@ -3926,7 +3926,7 @@ gTrainers:: @ 81F04FC
 
 @ DILLON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "DILLON$", 12
@@ -3938,7 +3938,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "CALVIN$", 12
@@ -3950,7 +3950,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "CALVIN$", 12
@@ -3962,7 +3962,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "CALVIN$", 12
@@ -3974,7 +3974,7 @@ gTrainers:: @ 81F04FC
 
 @ CALVIN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "CALVIN$", 12
@@ -3986,7 +3986,7 @@ gTrainers:: @ 81F04FC
 
 @ EDDIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "EDDIE$", 12
@@ -3998,7 +3998,7 @@ gTrainers:: @ 81F04FC
 
 @ ALLEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "ALLEN$", 12
@@ -4010,7 +4010,7 @@ gTrainers:: @ 81F04FC
 
 @ TIMMY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNGSTER
+	.byte TRAINER_CLASS_YOUNGSTER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "TIMMY$", 12
@@ -4022,7 +4022,7 @@ gTrainers:: @ 81F04FC
 
 @ STEVEN
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_CHAMPION
+	.byte TRAINER_CLASS_CHAMPION
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_STEVEN
 	.string "STEVEN$", 12
@@ -4034,7 +4034,7 @@ gTrainers:: @ 81F04FC
 
 @ ANDREW
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ANDREW$", 12
@@ -4046,7 +4046,7 @@ gTrainers:: @ 81F04FC
 
 @ IVAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "IVAN$", 12
@@ -4058,7 +4058,7 @@ gTrainers:: @ 81F04FC
 
 @ CLAUDE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "CLAUDE$", 12
@@ -4070,7 +4070,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ELLIOT$", 12
@@ -4082,7 +4082,7 @@ gTrainers:: @ 81F04FC
 
 @ NED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "NED$", 12
@@ -4094,7 +4094,7 @@ gTrainers:: @ 81F04FC
 
 @ DALE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "DALE$", 12
@@ -4106,7 +4106,7 @@ gTrainers:: @ 81F04FC
 
 @ NOLAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "NOLAN$", 12
@@ -4118,7 +4118,7 @@ gTrainers:: @ 81F04FC
 
 @ BARNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "BARNY$", 12
@@ -4130,7 +4130,7 @@ gTrainers:: @ 81F04FC
 
 @ WADE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "WADE$", 12
@@ -4142,7 +4142,7 @@ gTrainers:: @ 81F04FC
 
 @ CARTER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "CARTER$", 12
@@ -4154,7 +4154,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ELLIOT$", 12
@@ -4166,7 +4166,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ELLIOT$", 12
@@ -4178,7 +4178,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ELLIOT$", 12
@@ -4190,7 +4190,7 @@ gTrainers:: @ 81F04FC
 
 @ ELLIOT_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ELLIOT$", 12
@@ -4202,7 +4202,7 @@ gTrainers:: @ 81F04FC
 
 @ RONALD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "RONALD$", 12
@@ -4214,7 +4214,7 @@ gTrainers:: @ 81F04FC
 
 @ JACOB
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "JACOB$", 12
@@ -4226,7 +4226,7 @@ gTrainers:: @ 81F04FC
 
 @ ANTHONY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "ANTHONY$", 12
@@ -4238,7 +4238,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "BENJAMIN$", 12
@@ -4250,7 +4250,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "BENJAMIN$", 12
@@ -4262,7 +4262,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "BENJAMIN$", 12
@@ -4274,7 +4274,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "BENJAMIN$", 12
@@ -4286,7 +4286,7 @@ gTrainers:: @ 81F04FC
 
 @ BENJAMIN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.string "BENJAMIN$", 12
@@ -4298,7 +4298,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "ABIGAIL$", 12
@@ -4310,7 +4310,7 @@ gTrainers:: @ 81F04FC
 
 @ JASMINE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "JASMINE$", 12
@@ -4322,7 +4322,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "ABIGAIL$", 12
@@ -4334,7 +4334,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "ABIGAIL$", 12
@@ -4346,7 +4346,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "ABIGAIL$", 12
@@ -4358,7 +4358,7 @@ gTrainers:: @ 81F04FC
 
 @ ABIGAIL_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.string "ABIGAIL$", 12
@@ -4370,7 +4370,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "DYLAN$", 12
@@ -4382,7 +4382,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "DYLAN$", 12
@@ -4394,7 +4394,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "DYLAN$", 12
@@ -4406,7 +4406,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "DYLAN$", 12
@@ -4418,7 +4418,7 @@ gTrainers:: @ 81F04FC
 
 @ DYLAN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.string "DYLAN$", 12
@@ -4430,7 +4430,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "MARIA$", 12
@@ -4442,7 +4442,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "MARIA$", 12
@@ -4454,7 +4454,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "MARIA$", 12
@@ -4466,7 +4466,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "MARIA$", 12
@@ -4478,7 +4478,7 @@ gTrainers:: @ 81F04FC
 
 @ MARIA_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.string "MARIA$", 12
@@ -4490,7 +4490,7 @@ gTrainers:: @ 81F04FC
 
 @ CALEB
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "CALEB$", 12
@@ -4502,7 +4502,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_6
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "$", 12
@@ -4514,7 +4514,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "ISAIAH$", 12
@@ -4526,7 +4526,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_7
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "$", 12
@@ -4538,7 +4538,7 @@ gTrainers:: @ 81F04FC
 
 @ CHASE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "CHASE$", 12
@@ -4550,7 +4550,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "ISAIAH$", 12
@@ -4562,7 +4562,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "ISAIAH$", 12
@@ -4574,7 +4574,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "ISAIAH$", 12
@@ -4586,7 +4586,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAIAH_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.string "ISAIAH$", 12
@@ -4598,7 +4598,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_8
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "$", 12
@@ -4610,7 +4610,7 @@ gTrainers:: @ 81F04FC
 
 @ CONNOR
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "CONNOR$", 12
@@ -4622,7 +4622,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_9
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "$", 12
@@ -4634,7 +4634,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "KATELYN$", 12
@@ -4646,7 +4646,7 @@ gTrainers:: @ 81F04FC
 
 @ ALLISON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "ALLISON$", 12
@@ -4658,7 +4658,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "KATELYN$", 12
@@ -4670,7 +4670,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "KATELYN$", 12
@@ -4682,7 +4682,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "KATELYN$", 12
@@ -4694,7 +4694,7 @@ gTrainers:: @ 81F04FC
 
 @ KATELYN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TRIATHLETE
+	.byte TRAINER_CLASS_TRIATHLETE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.string "KATELYN$", 12
@@ -4706,7 +4706,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "NICOLAS$", 12
@@ -4718,7 +4718,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "NICOLAS$", 12
@@ -4730,7 +4730,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "NICOLAS$", 12
@@ -4742,7 +4742,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "NICOLAS$", 12
@@ -4754,7 +4754,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLAS_5
 	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "NICOLAS$", 12
@@ -4766,7 +4766,7 @@ gTrainers:: @ 81F04FC
 
 @ AARON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
+	.byte TRAINER_CLASS_DRAGON_TAMER
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.string "AARON$", 12
@@ -4778,7 +4778,7 @@ gTrainers:: @ 81F04FC
 
 @ PERRY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "PERRY$", 12
@@ -4790,7 +4790,7 @@ gTrainers:: @ 81F04FC
 
 @ HUGH
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "HUGH$", 12
@@ -4802,7 +4802,7 @@ gTrainers:: @ 81F04FC
 
 @ PHIL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "PHIL$", 12
@@ -4814,7 +4814,7 @@ gTrainers:: @ 81F04FC
 
 @ JARED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "JARED$", 12
@@ -4826,7 +4826,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_10
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "$", 12
@@ -4838,7 +4838,7 @@ gTrainers:: @ 81F04FC
 
 @ TANNER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "TANNER$", 12
@@ -4850,7 +4850,7 @@ gTrainers:: @ 81F04FC
 
 @ WILL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "WILL$", 12
@@ -4862,7 +4862,7 @@ gTrainers:: @ 81F04FC
 
 @ COLIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "COLIN$", 12
@@ -4874,7 +4874,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ROBERT$", 12
@@ -4886,7 +4886,7 @@ gTrainers:: @ 81F04FC
 
 @ BENNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "BENNY$", 12
@@ -4898,7 +4898,7 @@ gTrainers:: @ 81F04FC
 
 @ CHESTER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "CHESTER$", 12
@@ -4910,7 +4910,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ROBERT$", 12
@@ -4922,7 +4922,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ROBERT$", 12
@@ -4934,7 +4934,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ROBERT$", 12
@@ -4946,7 +4946,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBERT_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ROBERT$", 12
@@ -4958,7 +4958,7 @@ gTrainers:: @ 81F04FC
 
 @ ALEX
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "ALEX$", 12
@@ -4970,7 +4970,7 @@ gTrainers:: @ 81F04FC
 
 @ BECK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "BECK$", 12
@@ -4982,7 +4982,7 @@ gTrainers:: @ 81F04FC
 
 @ YASU
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "YASU$", 12
@@ -4994,7 +4994,7 @@ gTrainers:: @ 81F04FC
 
 @ TAKASHI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "TAKASHI$", 12
@@ -5006,7 +5006,7 @@ gTrainers:: @ 81F04FC
 
 @ MAKOTO
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "MAKOTO$", 12
@@ -5018,7 +5018,7 @@ gTrainers:: @ 81F04FC
 
 @ HIDEO_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "HIDEO$", 12
@@ -5030,7 +5030,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "LAO$", 12
@@ -5042,7 +5042,7 @@ gTrainers:: @ 81F04FC
 
 @ LUNG
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "LUNG$", 12
@@ -5054,7 +5054,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "LAO$", 12
@@ -5066,7 +5066,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "LAO$", 12
@@ -5078,7 +5078,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "LAO$", 12
@@ -5090,7 +5090,7 @@ gTrainers:: @ 81F04FC
 
 @ LAO_5
 	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "LAO$", 12
@@ -5102,7 +5102,7 @@ gTrainers:: @ 81F04FC
 
 @ TESSA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "TESSA$", 12
@@ -5114,7 +5114,7 @@ gTrainers:: @ 81F04FC
 
 @ LAURA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "LAURA$", 12
@@ -5126,7 +5126,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "CYNDY$", 12
@@ -5138,7 +5138,7 @@ gTrainers:: @ 81F04FC
 
 @ CORA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "CORA$", 12
@@ -5150,7 +5150,7 @@ gTrainers:: @ 81F04FC
 
 @ JILL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "JILL$", 12
@@ -5162,7 +5162,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "CYNDY$", 12
@@ -5174,7 +5174,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "CYNDY$", 12
@@ -5186,7 +5186,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "CYNDY$", 12
@@ -5198,7 +5198,7 @@ gTrainers:: @ 81F04FC
 
 @ CYNDY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "CYNDY$", 12
@@ -5210,7 +5210,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "MADELINE$", 12
@@ -5222,7 +5222,7 @@ gTrainers:: @ 81F04FC
 
 @ CLARISSA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "CLARISSA$", 12
@@ -5234,7 +5234,7 @@ gTrainers:: @ 81F04FC
 
 @ ANGELICA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "ANGELICA$", 12
@@ -5246,7 +5246,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "MADELINE$", 12
@@ -5258,7 +5258,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "MADELINE$", 12
@@ -5270,7 +5270,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "MADELINE$", 12
@@ -5282,7 +5282,7 @@ gTrainers:: @ 81F04FC
 
 @ MADELINE_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PARASOL_LADY
+	.byte TRAINER_CLASS_PARASOL_LADY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.string "MADELINE$", 12
@@ -5294,7 +5294,7 @@ gTrainers:: @ 81F04FC
 
 @ BEVERLY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "BEVERLY$", 12
@@ -5306,7 +5306,7 @@ gTrainers:: @ 81F04FC
 
 @ DAWN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "DAWN$", 12
@@ -5318,7 +5318,7 @@ gTrainers:: @ 81F04FC
 
 @ NICOLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "NICOLE$", 12
@@ -5330,7 +5330,7 @@ gTrainers:: @ 81F04FC
 
 @ DENISE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "DENISE$", 12
@@ -5342,7 +5342,7 @@ gTrainers:: @ 81F04FC
 
 @ BETH
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "BETH$", 12
@@ -5354,7 +5354,7 @@ gTrainers:: @ 81F04FC
 
 @ TARA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "TARA$", 12
@@ -5366,7 +5366,7 @@ gTrainers:: @ 81F04FC
 
 @ MISSY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "MISSY$", 12
@@ -5378,7 +5378,7 @@ gTrainers:: @ 81F04FC
 
 @ ALICE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "ALICE$", 12
@@ -5390,7 +5390,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "JENNY$", 12
@@ -5402,7 +5402,7 @@ gTrainers:: @ 81F04FC
 
 @ GRACE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "GRACE$", 12
@@ -5414,7 +5414,7 @@ gTrainers:: @ 81F04FC
 
 @ TANYA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "TANYA$", 12
@@ -5426,7 +5426,7 @@ gTrainers:: @ 81F04FC
 
 @ SHARON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "SHARON$", 12
@@ -5438,7 +5438,7 @@ gTrainers:: @ 81F04FC
 
 @ NIKKI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "NIKKI$", 12
@@ -5450,7 +5450,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "BRENDA$", 12
@@ -5462,7 +5462,7 @@ gTrainers:: @ 81F04FC
 
 @ KATIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "KATIE$", 12
@@ -5474,7 +5474,7 @@ gTrainers:: @ 81F04FC
 
 @ SUSIE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "SUSIE$", 12
@@ -5486,7 +5486,7 @@ gTrainers:: @ 81F04FC
 
 @ KARA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "KARA$", 12
@@ -5498,7 +5498,7 @@ gTrainers:: @ 81F04FC
 
 @ DANA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "DANA$", 12
@@ -5510,7 +5510,7 @@ gTrainers:: @ 81F04FC
 
 @ ERIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "ERIN$", 12
@@ -5522,7 +5522,7 @@ gTrainers:: @ 81F04FC
 
 @ DEBRA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "DEBRA$", 12
@@ -5534,7 +5534,7 @@ gTrainers:: @ 81F04FC
 
 @ LINDA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "LINDA$", 12
@@ -5546,7 +5546,7 @@ gTrainers:: @ 81F04FC
 
 @ KAYLEE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "KAYLEE$", 12
@@ -5558,7 +5558,7 @@ gTrainers:: @ 81F04FC
 
 @ LAUREL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "LAUREL$", 12
@@ -5570,7 +5570,7 @@ gTrainers:: @ 81F04FC
 
 @ DARCY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "DARCY$", 12
@@ -5582,7 +5582,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "JENNY$", 12
@@ -5594,7 +5594,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "JENNY$", 12
@@ -5606,7 +5606,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "JENNY$", 12
@@ -5618,7 +5618,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "JENNY$", 12
@@ -5630,7 +5630,7 @@ gTrainers:: @ 81F04FC
 
 @ HEIDI
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "HEIDI$", 12
@@ -5642,7 +5642,7 @@ gTrainers:: @ 81F04FC
 
 @ BECKY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "BECKY$", 12
@@ -5654,7 +5654,7 @@ gTrainers:: @ 81F04FC
 
 @ CAROL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "CAROL$", 12
@@ -5666,7 +5666,7 @@ gTrainers:: @ 81F04FC
 
 @ NANCY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "NANCY$", 12
@@ -5678,7 +5678,7 @@ gTrainers:: @ 81F04FC
 
 @ MARTHA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "MARTHA$", 12
@@ -5690,7 +5690,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "DIANA$", 12
@@ -5702,7 +5702,7 @@ gTrainers:: @ 81F04FC
 
 @ NINA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "NINA$", 12
@@ -5714,7 +5714,7 @@ gTrainers:: @ 81F04FC
 
 @ IRENE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "IRENE$", 12
@@ -5726,7 +5726,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "DIANA$", 12
@@ -5738,7 +5738,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "DIANA$", 12
@@ -5750,7 +5750,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "DIANA$", 12
@@ -5762,7 +5762,7 @@ gTrainers:: @ 81F04FC
 
 @ DIANA_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "DIANA$", 12
@@ -5774,7 +5774,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "AMY & LIV$", 12
@@ -5786,7 +5786,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "AMY & LIV$", 12
@@ -5798,7 +5798,7 @@ gTrainers:: @ 81F04FC
 
 @ GINA_AND_MIA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "GINA & MIA$", 12
@@ -5810,7 +5810,7 @@ gTrainers:: @ 81F04FC
 
 @ MIU_AND_YUKI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "MIU & YUKI$", 12
@@ -5822,7 +5822,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "AMY & LIV$", 12
@@ -5834,7 +5834,7 @@ gTrainers:: @ 81F04FC
 
 @ GINA_AND_MIA_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "GINA & MIA$", 12
@@ -5846,7 +5846,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "AMY & LIV$", 12
@@ -5858,7 +5858,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "AMY & LIV$", 12
@@ -5870,7 +5870,7 @@ gTrainers:: @ 81F04FC
 
 @ AMY_AND_LIV_6
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "AMY & LIV$", 12
@@ -5882,7 +5882,7 @@ gTrainers:: @ 81F04FC
 
 @ HUEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "HUEY$", 12
@@ -5894,7 +5894,7 @@ gTrainers:: @ 81F04FC
 
 @ EDMOND
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "EDMOND$", 12
@@ -5906,7 +5906,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ERNEST$", 12
@@ -5918,7 +5918,7 @@ gTrainers:: @ 81F04FC
 
 @ DWAYNE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "DWAYNE$", 12
@@ -5930,7 +5930,7 @@ gTrainers:: @ 81F04FC
 
 @ PHILLIP
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "PHILLIP$", 12
@@ -5942,7 +5942,7 @@ gTrainers:: @ 81F04FC
 
 @ LEONARD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "LEONARD$", 12
@@ -5954,7 +5954,7 @@ gTrainers:: @ 81F04FC
 
 @ DUNCAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "DUNCAN$", 12
@@ -5966,7 +5966,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ERNEST$", 12
@@ -5978,7 +5978,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ERNEST$", 12
@@ -5990,7 +5990,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ERNEST$", 12
@@ -6002,7 +6002,7 @@ gTrainers:: @ 81F04FC
 
 @ ERNEST_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SAILOR
+	.byte TRAINER_CLASS_SAILOR
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.string "ERNEST$", 12
@@ -6014,7 +6014,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_11
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "$", 12
@@ -6026,7 +6026,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_12
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "$", 12
@@ -6038,7 +6038,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_13
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "$", 12
@@ -6050,7 +6050,7 @@ gTrainers:: @ 81F04FC
 
 @ SONNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "SONNY$", 12
@@ -6062,7 +6062,7 @@ gTrainers:: @ 81F04FC
 
 @ DONOVAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "DONOVAN$", 12
@@ -6074,7 +6074,7 @@ gTrainers:: @ 81F04FC
 
 @ GERALD
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "GERALD$", 12
@@ -6086,7 +6086,7 @@ gTrainers:: @ 81F04FC
 
 @ KELVIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "KELVIN$", 12
@@ -6098,7 +6098,7 @@ gTrainers:: @ 81F04FC
 
 @ KODY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "KODY$", 12
@@ -6110,7 +6110,7 @@ gTrainers:: @ 81F04FC
 
 @ TEVIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "TEVIN$", 12
@@ -6122,7 +6122,7 @@ gTrainers:: @ 81F04FC
 
 @ DAMON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "DAMON$", 12
@@ -6134,7 +6134,7 @@ gTrainers:: @ 81F04FC
 
 @ PABLO
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BOARDER
+	.byte TRAINER_CLASS_BOARDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.string "PABLO$", 12
@@ -6146,7 +6146,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6158,7 +6158,7 @@ gTrainers:: @ 81F04FC
 
 @ HECTOR_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "HECTOR$", 12
@@ -6170,7 +6170,7 @@ gTrainers:: @ 81F04FC
 
 @ HECTOR_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "HECTOR$", 12
@@ -6182,7 +6182,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6194,7 +6194,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6206,7 +6206,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6218,7 +6218,7 @@ gTrainers:: @ 81F04FC
 
 @ EDWIN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COLLECTOR
+	.byte TRAINER_CLASS_COLLECTOR
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.string "EDWIN$", 12
@@ -6230,7 +6230,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "WALLY$", 12
@@ -6242,7 +6242,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6254,7 +6254,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6266,7 +6266,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6278,7 +6278,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6290,7 +6290,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6302,7 +6302,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_6
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6314,7 +6314,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_7
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6326,7 +6326,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_8
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6338,7 +6338,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_9
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -6350,7 +6350,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6362,7 +6362,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6374,7 +6374,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6386,7 +6386,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6398,7 +6398,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6410,7 +6410,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_6
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6422,7 +6422,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_7
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6434,7 +6434,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_8
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6446,7 +6446,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_9
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -6458,7 +6458,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "ISAAC$", 12
@@ -6470,7 +6470,7 @@ gTrainers:: @ 81F04FC
 
 @ RILEY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "RILEY$", 12
@@ -6482,7 +6482,7 @@ gTrainers:: @ 81F04FC
 
 @ AIDAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "AIDAN$", 12
@@ -6494,7 +6494,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "ISAAC$", 12
@@ -6506,7 +6506,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "ISAAC$", 12
@@ -6518,7 +6518,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "ISAAC$", 12
@@ -6530,7 +6530,7 @@ gTrainers:: @ 81F04FC
 
 @ ISAAC_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.string "ISAAC$", 12
@@ -6542,7 +6542,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6554,7 +6554,7 @@ gTrainers:: @ 81F04FC
 
 @ ALEXIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "ALEXIA$", 12
@@ -6566,7 +6566,7 @@ gTrainers:: @ 81F04FC
 
 @ DANIELLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "DANIELLE$", 12
@@ -6578,7 +6578,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6590,7 +6590,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6602,7 +6602,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6614,7 +6614,7 @@ gTrainers:: @ 81F04FC
 
 @ LYDIA_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_BREEDER
+	.byte TRAINER_CLASS_POKEMON_BREEDER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.string "LYDIA$", 12
@@ -6626,7 +6626,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "JACKSON$", 12
@@ -6638,7 +6638,7 @@ gTrainers:: @ 81F04FC
 
 @ CARLOS
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "CARLOS$", 12
@@ -6650,7 +6650,7 @@ gTrainers:: @ 81F04FC
 
 @ SEBASTIAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "SEBASTIAN$", 12
@@ -6662,7 +6662,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "JACKSON$", 12
@@ -6674,7 +6674,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "JACKSON$", 12
@@ -6686,7 +6686,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "JACKSON$", 12
@@ -6698,7 +6698,7 @@ gTrainers:: @ 81F04FC
 
 @ JACKSON_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.string "JACKSON$", 12
@@ -6710,7 +6710,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "CATHERINE$", 12
@@ -6722,7 +6722,7 @@ gTrainers:: @ 81F04FC
 
 @ JENNA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "JENNA$", 12
@@ -6734,7 +6734,7 @@ gTrainers:: @ 81F04FC
 
 @ SOPHIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "SOPHIA$", 12
@@ -6746,7 +6746,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "CATHERINE$", 12
@@ -6758,7 +6758,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "CATHERINE$", 12
@@ -6770,7 +6770,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "CATHERINE$", 12
@@ -6782,7 +6782,7 @@ gTrainers:: @ 81F04FC
 
 @ CATHERINE_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_RANGER
+	.byte TRAINER_CLASS_POKEMON_RANGER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.string "CATHERINE$", 12
@@ -6794,7 +6794,7 @@ gTrainers:: @ 81F04FC
 
 @ MAXIE_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
+	.byte TRAINER_CLASS_MAGMA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAXIE
 	.string "MAXIE$", 12
@@ -6806,7 +6806,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_28
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6818,7 +6818,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_29
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6830,7 +6830,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_30
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6842,7 +6842,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_31
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6854,7 +6854,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_32
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6866,7 +6866,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_33
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6878,7 +6878,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_34
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6890,7 +6890,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_35
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6902,7 +6902,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_36
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6914,7 +6914,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_37
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6926,7 +6926,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_38
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6938,7 +6938,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_39
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6950,7 +6950,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_40
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6962,7 +6962,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_41
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6974,7 +6974,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_42
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6986,7 +6986,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_43
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -6998,7 +6998,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_44
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -7010,7 +7010,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_45
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -7022,7 +7022,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_46
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -7034,7 +7034,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_47
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -7046,7 +7046,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_48
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -7058,7 +7058,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_49
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -7070,7 +7070,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_50
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -7082,7 +7082,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_51
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.string "GRUNT$", 12
@@ -7094,7 +7094,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_52
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.string "GRUNT$", 12
@@ -7106,7 +7106,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_53
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.string "GRUNT$", 12
@@ -7118,7 +7118,7 @@ gTrainers:: @ 81F04FC
 
 @ GRUNT_54
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
+	.byte TRAINER_CLASS_TEAM_MAGMA
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.string "GRUNT$", 12
@@ -7130,7 +7130,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_14
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "$", 12
@@ -7142,7 +7142,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_15
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_M
 	.string "$", 12
@@ -7154,7 +7154,7 @@ gTrainers:: @ 81F04FC
 
 @ TABITHA_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_M
 	.string "TABITHA$", 12
@@ -7166,7 +7166,7 @@ gTrainers:: @ 81F04FC
 
 @ TABITHA_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_M
 	.string "TABITHA$", 12
@@ -7178,7 +7178,7 @@ gTrainers:: @ 81F04FC
 
 @ ANONYMOUS_16
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_M
 	.string "$", 12
@@ -7190,7 +7190,7 @@ gTrainers:: @ 81F04FC
 
 @ COURTNEY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_F
 	.string "COURTNEY$", 12
@@ -7202,7 +7202,7 @@ gTrainers:: @ 81F04FC
 
 @ COURTNEY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
+	.byte TRAINER_CLASS_MAGMA_ADMIN
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN_F
 	.string "COURTNEY$", 12
@@ -7214,7 +7214,7 @@ gTrainers:: @ 81F04FC
 
 @ MAXIE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
+	.byte TRAINER_CLASS_MAGMA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAXIE
 	.string "MAXIE$", 12
@@ -7226,7 +7226,7 @@ gTrainers:: @ 81F04FC
 
 @ MAXIE_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
+	.byte TRAINER_CLASS_MAGMA_LEADER
 	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAXIE
 	.string "MAXIE$", 12
@@ -7238,7 +7238,7 @@ gTrainers:: @ 81F04FC
 
 @ TIANA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "TIANA$", 12
@@ -7250,7 +7250,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "HALEY$", 12
@@ -7262,7 +7262,7 @@ gTrainers:: @ 81F04FC
 
 @ JANICE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "JANICE$", 12
@@ -7274,7 +7274,7 @@ gTrainers:: @ 81F04FC
 
 @ VIVI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_WINSTRATE
+	.byte TRAINER_CLASS_WINSTRATE
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "VIVI$", 12
@@ -7286,7 +7286,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "HALEY$", 12
@@ -7298,7 +7298,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "HALEY$", 12
@@ -7310,7 +7310,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "HALEY$", 12
@@ -7322,7 +7322,7 @@ gTrainers:: @ 81F04FC
 
 @ HALEY_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "HALEY$", 12
@@ -7334,7 +7334,7 @@ gTrainers:: @ 81F04FC
 
 @ SALLY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "SALLY$", 12
@@ -7346,7 +7346,7 @@ gTrainers:: @ 81F04FC
 
 @ ROBIN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ROBIN$", 12
@@ -7358,7 +7358,7 @@ gTrainers:: @ 81F04FC
 
 @ ANDREA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "ANDREA$", 12
@@ -7370,7 +7370,7 @@ gTrainers:: @ 81F04FC
 
 @ CRISSY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_LASS
+	.byte TRAINER_CLASS_LASS
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.string "CRISSY$", 12
@@ -7382,7 +7382,7 @@ gTrainers:: @ 81F04FC
 
 @ RICK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "RICK$", 12
@@ -7394,7 +7394,7 @@ gTrainers:: @ 81F04FC
 
 @ LYLE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "LYLE$", 12
@@ -7406,7 +7406,7 @@ gTrainers:: @ 81F04FC
 
 @ JOSE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "JOSE$", 12
@@ -7418,7 +7418,7 @@ gTrainers:: @ 81F04FC
 
 @ DOUG
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "DOUG$", 12
@@ -7430,7 +7430,7 @@ gTrainers:: @ 81F04FC
 
 @ GREG
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "GREG$", 12
@@ -7442,7 +7442,7 @@ gTrainers:: @ 81F04FC
 
 @ KENT
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "KENT$", 12
@@ -7454,7 +7454,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "JAMES$", 12
@@ -7466,7 +7466,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "JAMES$", 12
@@ -7478,7 +7478,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "JAMES$", 12
@@ -7490,7 +7490,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "JAMES$", 12
@@ -7502,7 +7502,7 @@ gTrainers:: @ 81F04FC
 
 @ JAMES_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BUG_CATCHER
+	.byte TRAINER_CLASS_BUG_CATCHER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.string "JAMES$", 12
@@ -7514,7 +7514,7 @@ gTrainers:: @ 81F04FC
 
 @ BRICE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "BRICE$", 12
@@ -7526,7 +7526,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "TRENT$", 12
@@ -7538,7 +7538,7 @@ gTrainers:: @ 81F04FC
 
 @ LENNY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "LENNY$", 12
@@ -7550,7 +7550,7 @@ gTrainers:: @ 81F04FC
 
 @ LUCAS_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "LUCAS$", 12
@@ -7562,7 +7562,7 @@ gTrainers:: @ 81F04FC
 
 @ ALAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "ALAN$", 12
@@ -7574,7 +7574,7 @@ gTrainers:: @ 81F04FC
 
 @ CLARK
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "CLARK$", 12
@@ -7586,7 +7586,7 @@ gTrainers:: @ 81F04FC
 
 @ ERIC
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "ERIC$", 12
@@ -7598,7 +7598,7 @@ gTrainers:: @ 81F04FC
 
 @ LUCAS_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "LUCAS$", 12
@@ -7610,7 +7610,7 @@ gTrainers:: @ 81F04FC
 
 @ MIKE_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "MIKE$", 12
@@ -7622,7 +7622,7 @@ gTrainers:: @ 81F04FC
 
 @ MIKE_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "MIKE$", 12
@@ -7634,7 +7634,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "TRENT$", 12
@@ -7646,7 +7646,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "TRENT$", 12
@@ -7658,7 +7658,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "TRENT$", 12
@@ -7670,7 +7670,7 @@ gTrainers:: @ 81F04FC
 
 @ TRENT_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_HIKER
+	.byte TRAINER_CLASS_HIKER
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.string "TRENT$", 12
@@ -7682,7 +7682,7 @@ gTrainers:: @ 81F04FC
 
 @ DEZ_AND_LUKE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "DEZ & LUKE$", 12
@@ -7694,7 +7694,7 @@ gTrainers:: @ 81F04FC
 
 @ LEA_AND_JED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "LEA & JED$", 12
@@ -7706,7 +7706,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "LOIS & HAL$", 12
@@ -7718,7 +7718,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "LOIS & HAL$", 12
@@ -7730,7 +7730,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "LOIS & HAL$", 12
@@ -7742,7 +7742,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "LOIS & HAL$", 12
@@ -7754,7 +7754,7 @@ gTrainers:: @ 81F04FC
 
 @ LOIS_AND_HAL_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "LOIS & HAL$", 12
@@ -7766,7 +7766,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHANNA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BEAUTY
+	.byte TRAINER_CLASS_BEAUTY
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.string "JOHANNA$", 12
@@ -7778,7 +7778,7 @@ gTrainers:: @ 81F04FC
 
 @ ZANE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "ZANE$", 12
@@ -7790,7 +7790,7 @@ gTrainers:: @ 81F04FC
 
 @ VIVIAN
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "VIVIAN$", 12
@@ -7802,7 +7802,7 @@ gTrainers:: @ 81F04FC
 
 @ SADIE
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
+	.byte TRAINER_CLASS_BATTLE_GIRL
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.string "SADIE$", 12
@@ -7814,7 +7814,7 @@ gTrainers:: @ 81F04FC
 
 @ HIDEO_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "HIDEO$", 12
@@ -7826,7 +7826,7 @@ gTrainers:: @ 81F04FC
 
 @ KEIGO
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "KEIGO$", 12
@@ -7838,7 +7838,7 @@ gTrainers:: @ 81F04FC
 
 @ TSUNAO
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_NINJA_BOY
+	.byte TRAINER_CLASS_NINJA_BOY
 	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.string "TSUNAO$", 12
@@ -7850,7 +7850,7 @@ gTrainers:: @ 81F04FC
 
 @ TERRELL
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_CAMPER
+	.byte TRAINER_CLASS_CAMPER
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.string "TERRELL$", 12
@@ -7862,7 +7862,7 @@ gTrainers:: @ 81F04FC
 
 @ KYLEE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_PICNICKER
+	.byte TRAINER_CLASS_PICNICKER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.string "KYLEE$", 12
@@ -7874,7 +7874,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "WALLY$", 12
@@ -7886,7 +7886,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "WALLY$", 12
@@ -7898,7 +7898,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "WALLY$", 12
@@ -7910,7 +7910,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "WALLY$", 12
@@ -7922,7 +7922,7 @@ gTrainers:: @ 81F04FC
 
 @ WALLY_6
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.string "WALLY$", 12
@@ -7934,7 +7934,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_10
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -7946,7 +7946,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_11
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -7958,7 +7958,7 @@ gTrainers:: @ 81F04FC
 
 @ BRENDAN_12
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.string "BRENDAN$", 12
@@ -7970,7 +7970,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_10
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -7982,7 +7982,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_11
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -7994,7 +7994,7 @@ gTrainers:: @ 81F04FC
 
 @ MAY_12
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3
+	.byte TRAINER_CLASS_POKEMON_TRAINER_3
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.string "MAY$", 12
@@ -8006,7 +8006,7 @@ gTrainers:: @ 81F04FC
 
 @ JONAH
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "JONAH$", 12
@@ -8018,7 +8018,7 @@ gTrainers:: @ 81F04FC
 
 @ HENRY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "HENRY$", 12
@@ -8030,7 +8030,7 @@ gTrainers:: @ 81F04FC
 
 @ ROGER
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "ROGER$", 12
@@ -8042,7 +8042,7 @@ gTrainers:: @ 81F04FC
 
 @ ALEXA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.string "ALEXA$", 12
@@ -8054,7 +8054,7 @@ gTrainers:: @ 81F04FC
 
 @ RUBEN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_COOL_TRAINER
+	.byte TRAINER_CLASS_COOL_TRAINER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.string "RUBEN$", 12
@@ -8066,7 +8066,7 @@ gTrainers:: @ 81F04FC
 
 @ KOJI
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BLACK_BELT
+	.byte TRAINER_CLASS_BLACK_BELT
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.string "KOJI$", 12
@@ -8078,7 +8078,7 @@ gTrainers:: @ 81F04FC
 
 @ WAYNE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "WAYNE$", 12
@@ -8090,7 +8090,7 @@ gTrainers:: @ 81F04FC
 
 @ BYRON
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
+	.byte TRAINER_CLASS_BIRD_KEEPER
 	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.string "BYRON$", 12
@@ -8102,7 +8102,7 @@ gTrainers:: @ 81F04FC
 
 @ REED
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_M
+	.byte TRAINER_CLASS_SWIMMER_M
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.string "REED$", 12
@@ -8114,7 +8114,7 @@ gTrainers:: @ 81F04FC
 
 @ TISHA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SWIMMER_F
+	.byte TRAINER_CLASS_SWIMMER_F
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.string "TISHA$", 12
@@ -8126,7 +8126,7 @@ gTrainers:: @ 81F04FC
 
 @ TORI_AND_TIA
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_TWINS
+	.byte TRAINER_CLASS_TWINS
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.string "TORI & TIA$", 12
@@ -8138,7 +8138,7 @@ gTrainers:: @ 81F04FC
 
 @ KIM_AND_IRIS
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "KIM & IRIS$", 12
@@ -8150,7 +8150,7 @@ gTrainers:: @ 81F04FC
 
 @ TYRA_AND_IVY
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_SR_AND_JR
+	.byte TRAINER_CLASS_SR_AND_JR
 	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.string "TYRA & IVY$", 12
@@ -8162,7 +8162,7 @@ gTrainers:: @ 81F04FC
 
 @ MEL_AND_PAUL
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
+	.byte TRAINER_CLASS_YOUNG_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.string "MEL & PAUL$", 12
@@ -8174,7 +8174,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_1
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "JOHN & JAY$", 12
@@ -8186,7 +8186,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_2
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "JOHN & JAY$", 12
@@ -8198,7 +8198,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_3
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "JOHN & JAY$", 12
@@ -8210,7 +8210,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_4
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "JOHN & JAY$", 12
@@ -8222,7 +8222,7 @@ gTrainers:: @ 81F04FC
 
 @ JOHN_AND_JAY_5
 	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NAME_OLD_COUPLE
+	.byte TRAINER_CLASS_OLD_COUPLE
 	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.string "JOHN & JAY$", 12
@@ -8234,7 +8234,7 @@ gTrainers:: @ 81F04FC
 
 @ RELI_AND_IAN
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "RELI & IAN$", 12
@@ -8246,7 +8246,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_1
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "RITA & SAM$", 12
@@ -8258,7 +8258,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_2
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "RITA & SAM$", 12
@@ -8270,7 +8270,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_3
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "RITA & SAM$", 12
@@ -8282,7 +8282,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_4
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "RITA & SAM$", 12
@@ -8294,7 +8294,7 @@ gTrainers:: @ 81F04FC
 
 @ RITA_AND_SAM_5
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "RITA & SAM$", 12
@@ -8306,7 +8306,7 @@ gTrainers:: @ 81F04FC
 
 @ LISA_AND_RAY
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
+	.byte TRAINER_CLASS_SIS_AND_BRO
 	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.string "LISA & RAY$", 12
@@ -8318,7 +8318,7 @@ gTrainers:: @ 81F04FC
 
 @ EUGENE
 	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NAME_FISHERMAN
+	.byte TRAINER_CLASS_FISHERMAN
 	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.string "EUGENE$", 12
diff --git a/de_after.sh b/de_after.sh
index 8c39f765a..8c39f765a 100644..100755
--- a/de_after.sh
+++ b/de_after.sh
diff --git a/de_before.sh b/de_before.sh
index a68790143..392726948 100644..100755
--- a/de_before.sh
+++ b/de_before.sh
@@ -1,4 +1,3 @@
-cp override-de.mk
-rsync -avhI asm-de/ asm/
+cp override-de.mk override.mk
 rsync -avhI data-de/ data/
 rsync -avhI graphics-de/ graphics/
diff --git a/include/battle.h b/include/battle.h
index 0881cf82c..27ed57045 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -227,10 +227,8 @@ struct BattleStruct /* 0x2000000 */
     /*0x160D5*/ u8 unk160D5;
     /*0x160D6*/ u8 unk160D6;
     /*0x160D7*/ u8 unk160D7;
-    /*0x160D8*/ u8 unk160D8;
-    /*0x160D9*/ u8 unk160D9;
-    /*0x160DA*/ u8 unk160DA;
-    /*0x160DB*/ u8 unk160DB;
+    /*0x160D8*/ u8 unk160D8[2];
+    /*0x160DA*/ u8 unk160DA[2];
     /*0x160DC*/ u8 unk160DC;
     /*0x160DD*/ u8 intimidateBank;
     /*0x160DE*/ u8 unk160DE;
@@ -368,16 +366,6 @@ struct Struct2017100
     u32 arr[4];
 };
 
-struct Struct2019348
-{
-    u16 unk0;
-    u16 unk2;
-    u8 unk4;
-    u32 unk8;
-    u32 unkC;
-    u32 unk10;
-};
-
 struct Struct2017800
 {
     u8 invisible:1;
@@ -511,7 +499,7 @@ extern struct DisableStruct gDisableStructs[MAX_BANKS_BATTLE];
 extern struct BattleResults gBattleResults;
 extern struct ProtectStruct gProtectStructs[MAX_BANKS_BATTLE];
 extern struct SpecialStatus gSpecialStatuses[MAX_BANKS_BATTLE];
-extern struct sideTimer gSideTimer[2];
+extern struct sideTimer gSideTimers[2];
 extern struct WishFutureKnock gWishFutureKnock;
 extern struct AI_ThinkingStruct gAIThinkingSpace;
 extern struct Struct20238C8 gUnknown_020238C8;
@@ -561,7 +549,7 @@ extern u8 gBattleTextBuff1[];
 //function declarations of buffer emits
 void EmitGetAttributes(u8 buffID, u8 request, u8 c);    //0x0
 void Emitcmd1(u8 a, u8 b, u8 c); //0x1
-void EmitSetAttributes(u8 a, u8 request, u8 c, u8 bytes, void *data);  //0x2
+void EmitSetMonData(u8 a, u8 request, u8 c, u8 bytes, void *data);  //0x2
 void EmitSendOutPoke(u8 a, u8 b, u8 c); //0x5
 void EmitReturnPokeToBall(u8 a, u8 b); //0x6
 void EmitTrainerSlide(u8 a); //0x8
@@ -616,7 +604,7 @@ void InitBattle(void);
 void sub_800EC9C(void);
 void sub_800F104(void);
 void sub_800F298(void);
-void sub_800F808(void);
+void BattleMainCB2(void);
 void sub_800F838(struct Sprite *);
 u8 CreateNPCTrainerParty(struct Pokemon *, u16);
 void sub_800FCFC(void);
@@ -648,32 +636,28 @@ void sub_8011970(void);
 void sub_80119B4(void);
 void BattleBeginFirstTurn(void);
 void BattleTurnPassed(void);
+void RunBattleScriptCommands_PopCallbacksStack(void);
+void RunBattleScriptCommands(void);
+bool8 TryRunFromBattle(u8 bank);
 
 // asm/battle_2.o
 void sub_8012324(void);
-void sub_8012FBC(u8, u8);
+void SwapTurnOrder(u8, u8);
 u8 GetWhoStrikesFirst(u8, u8, u8);
-void TurnValuesCleanUp(u8);
-void SpecialStatusesClear(void);
-void sub_80138F0(void);
-void sub_80155A4();
-void CancelMultiTurnMoves(u8 bank);
-void PrepareStringBattle();
-void sub_80156DC();
-void sub_80157C4(u8 index);
 
 // asm/battle_3.o
 u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
 u8 UpdateTurnCounters(void);
 u8 TurnBasedEffects(void);
-u8 sub_80170DC();
-u8 sub_80173A4();
+u8 HandleFaintedMonActions();
 u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 move);
 u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn);
+u8 GetMoveTarget(u16 move, u8 useMoveTarget);
 
 // asm/battle_4.o
 void AI_CalcDmg(u8, u8);
 u8 TypeCalc(u16 move, u8 bank_atk, u8 bank_def);
+u8 BankGetTurnOrder(u8 bank);
 
 // asm/battle_5.o
 void nullsub_91(void);
@@ -696,6 +680,7 @@ void sub_80324F8(struct Pokemon *, u8);
 void sub_8032638();
 void sub_8032AA8(u8, u8);
 void SetBankFuncToOpponentBufferRunCommand(void);
+void BattleMusicStop(void);
 
 // asm/battle_9.o
 void SetBankFuncToLinkOpponentBufferRunCommand(void);
diff --git a/include/battle_ai.h b/include/battle_ai.h
index 60ca5d000..c22ca8633 100644
--- a/include/battle_ai.h
+++ b/include/battle_ai.h
@@ -24,5 +24,6 @@ void sub_810745C(void);
 void AIStackPushVar(u8 *);
 u8 AIStackPop(void);
 void BattleAI_HandleItemUseBeforeAISetup(void);
+void RecordAbilityBattle(u8 a, u8 b);
 
 #endif
diff --git a/include/battle_message.h b/include/battle_message.h
index 3e37a1ccd..9c27994ee 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -16,6 +16,143 @@ struct StringInfoBattle
     u8 textBuffs[3][0x10];
 };
 
+// for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3
+
+#define B_BUFF_STRING                   0
+#define B_BUFF_NUMBER                   1
+#define B_BUFF_MOVE                     2
+#define B_BUFF_TYPE                     3
+#define B_BUFF_MON_NICK_WITH_PREFIX     4
+#define B_BUFF_STAT                     5
+#define B_BUFF_SPECIES                  6
+#define B_BUFF_MON_NICK                 7
+#define B_BUFF_NEGATIVE_FLAVOR          8
+#define B_BUFF_ABILITY                  9
+#define B_BUFF_ITEM                     10
+
+#define B_BUFF_PLACEHOLDER_BEGIN        0xFD
+#define B_BUFF_EOS                      0xFF
+
+#define PREPARE_FLAVOR_BUFFER(textVar, flavorId)                            \
+{                                                                           \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                                  \
+    textVar[1] = B_BUFF_NEGATIVE_FLAVOR;                                    \
+    textVar[2] = flavorId;                                                  \
+    textVar[3] = B_BUFF_EOS;                                                \
+}
+
+#define PREPARE_STAT_BUFFER(textVar, statId)                                \
+{                                                                           \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                                  \
+    textVar[1] = B_BUFF_STAT;                                               \
+    textVar[2] = statId;                                                    \
+    textVar[3] = B_BUFF_EOS;                                                \
+}
+
+#define PREPARE_ABILITY_BUFFER(textVar, abilityId)                          \
+{                                                                           \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                                  \
+    textVar[1] = B_BUFF_ABILITY;                                            \
+    textVar[2] = abilityId;                                                 \
+    textVar[3] = B_BUFF_EOS;                                                \
+}
+
+#define PREPARE_TYPE_BUFFER(textVar, typeId)                                \
+{                                                                           \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                                  \
+    textVar[1] = B_BUFF_TYPE;                                               \
+    textVar[2] = typeId;                                                    \
+    textVar[3] = B_BUFF_EOS;                                                \
+}
+
+#define PREPARE_BYTE_NUMBER_BUFFER(textVar, maxDigits, number)  \
+{                                                               \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                      \
+    textVar[1] = B_BUFF_NUMBER;                                 \
+    textVar[2] = 1;                                             \
+    textVar[3] = maxDigits;                                     \
+    textVar[4] = (number);                                      \
+    textVar[5] = B_BUFF_EOS;                                    \
+}
+
+#define PREPARE_HWORD_NUMBER_BUFFER(textVar, maxDigits, number)             \
+{                                                                           \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                                  \
+    textVar[1] = B_BUFF_NUMBER;                                             \
+    textVar[2] = 2;                                                         \
+    textVar[3] = maxDigits;                                                 \
+    textVar[4] = (number);                                                  \
+    textVar[5] = (number & 0x0000FF00) >> 8;                                \
+    textVar[6] = B_BUFF_EOS;                                                \
+}
+
+#define PREPARE_WORD_NUMBER_BUFFER(textVar, maxDigits, number)  \
+{                                                               \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                      \
+    textVar[1] = B_BUFF_NUMBER;                                 \
+    textVar[2] = 4;                                             \
+    textVar[3] = maxDigits;                                     \
+    textVar[4] = (number);                                      \
+    textVar[5] = (number & 0x0000FF00) >> 8;                    \
+    textVar[6] = (number & 0x00FF0000) >> 16;                   \
+    textVar[7] = (number & 0xFF000000) >> 24;                   \
+    textVar[8] = B_BUFF_EOS;                                    \
+}
+
+#define PREPARE_STRING_BUFFER(textVar, stringId)                \
+{                                                               \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                      \
+    textVar[1] = B_BUFF_STRING;                                 \
+    textVar[2] = stringId;                                      \
+    textVar[3] = (stringId & 0xFF00) >> 8;                      \
+    textVar[4] = B_BUFF_EOS;                                    \
+}
+
+#define PREPARE_MOVE_BUFFER(textVar, move)                      \
+{                                                               \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                      \
+    textVar[1] = B_BUFF_MOVE;                                   \
+    textVar[2] = move;                                          \
+    textVar[3] = (move & 0xFF00) >> 8;                          \
+    textVar[4] = B_BUFF_EOS;                                    \
+}
+
+#define PREPARE_ITEM_BUFFER(textVar, item)                      \
+{                                                               \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                      \
+    textVar[1] = B_BUFF_ITEM;                                   \
+    textVar[2] = item;                                          \
+    textVar[3] = (item & 0xFF00) >> 8;                          \
+    textVar[4] = B_BUFF_EOS;                                    \
+}
+
+#define PREPARE_SPECIES_BUFFER(textVar, species)                \
+{                                                               \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                      \
+    textVar[1] = B_BUFF_SPECIES;                                \
+    textVar[2] = species;                                       \
+    textVar[3] = (species & 0xFF00) >> 8;                       \
+    textVar[4] = B_BUFF_EOS;                                    \
+}
+
+#define PREPARE_MON_NICK_WITH_PREFIX_BUFFER(textVar, bank, partyId)         \
+{                                                                           \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                                  \
+    textVar[1] = B_BUFF_MON_NICK_WITH_PREFIX;                               \
+    textVar[2] = bank;                                                      \
+    textVar[3] = partyId;                                                   \
+    textVar[4] = B_BUFF_EOS;                                                \
+}
+
+#define PREPARE_MON_NICK_BUFFER(textVar, bank, partyId)         \
+{                                                               \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                      \
+    textVar[1] = B_BUFF_MON_NICK;                               \
+    textVar[2] = bank;                                          \
+    textVar[3] = partyId;                                       \
+    textVar[4] = B_BUFF_EOS;                                    \
+}
+
 void BufferStringBattle(u16 stringID);
 u32 StrCpyDecodeToDisplayedStringBattle(const u8* src);
 u32 StrCpyDecodeBattle(const u8* src, u8* dst);
diff --git a/include/battle_util.h b/include/battle_util.h
new file mode 100644
index 000000000..f47b00b2c
--- /dev/null
+++ b/include/battle_util.h
@@ -0,0 +1,29 @@
+#ifndef GUARD_BATTLE_UTIL_H
+#define GUARD_BATTLE_UTIL_H
+
+#define BS_GET_TARGET                   0
+#define BS_GET_ATTACKER                 1
+#define BS_GET_EFFECT_BANK              2
+#define BS_GET_SCRIPTING_BANK           10
+#define BS_GET_PLAYER1                  11
+#define BS_GET_OPPONENT1                12
+#define BS_GET_PLAYER2                  13
+#define BS_GET_OPPONENT2                14
+
+void TryClearRageStatuses(void);
+void BattleScriptPush(u8* BS_ptr);
+void PressurePPLoseOnUsingImprision(u8 bankAtk);
+void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
+void sub_80155A4(u8);
+void CancelMultiTurnMoves(u8 bank);
+bool8 WasUnableToUseMove(u8 bank);
+void PrepareStringBattle(u16 stringId, u8 bank);
+void ResetSentPokesToOpponentValue(void);
+void sub_8015740(u8 bank);
+void sub_80157C4(u8 bank);
+bool8 HandleWishPerishSongOnTurnEnd(void);
+void BattleScriptExecute(u8* BS_ptr);
+void BattleScriptPushCursorAndCallback(u8* BS_ptr);
+u8 IsMonDisobedient(void);
+
+#endif // GUARD_BATTLE_UTIL_H
diff --git a/include/cable_car_util.h b/include/cable_car_util.h
new file mode 100644
index 000000000..7126331a1
--- /dev/null
+++ b/include/cable_car_util.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_CABLE_CAR_UTIL_H
+#define GUARD_CABLE_CAR_UTIL_H
+
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+
+void CableCarUtil_FillWrapped(void *dest, u16 value, u8 x, u8 y, u8 width, u8 height);
+void CableCarUtil_CopyWrapped(void *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height);
+
+#endif //GUARD_CABLE_CAR_UTIL_H
diff --git a/include/constants/battle_constants.h b/include/constants/battle_constants.h
index f7efb0dfd..49768f33e 100644
--- a/include/constants/battle_constants.h
+++ b/include/constants/battle_constants.h
@@ -1,6 +1,13 @@
 #ifndef GUARD_CONSTANTS_BATTLE_CONSTANTS_H
 #define GUARD_CONSTANTS_BATTLE_CONSTANTS_H
 
+// Bank sides
+#define SIDE_PLAYER     0x0
+#define SIDE_OPPONENT   0x1
+
+#define BIT_SIDE        0x1
+#define BIT_MON         0x2
+
 #define STATUS_SLEEP            0x7
 #define STATUS_POISON           0x8
 #define STATUS_BURN             0x10
@@ -65,6 +72,7 @@
 #define HITMARKER_PURSUIT_TRAP          0x00001000
 #define HITMARKER_IGNORE_SAFEGUARD      0x00002000
 #define HITMARKER_SYNCHRONISE_EFFECT    0x00004000
+#define HITMARKER_RUN                   0x00008000
 #define HITMARKER_IGNORE_ON_AIR         0x00010000
 #define HITMARKER_IGNORE_UNDERGROUND    0x00020000
 #define HITMARKER_IGNORE_UNDERWATER     0x00040000
@@ -75,6 +83,7 @@
 #define HITMARKER_x800000               0x00800000
 #define HITMARKER_GRUDGE                0x01000000
 #define HITMARKER_OBEYS                 0x02000000
+#define HITMARKER_x4000000              0x04000000
 #define HITMARKER_x8000000              0x08000000
 #define HITMARKER_FAINTED(bank)         ((gBitTable[bank] << 0x1C))
 #define HITMARKER_UNK(bank)             ((0x10000000 << bank))
@@ -88,6 +97,11 @@
 #define MOVESTATUS_ENDURED            (1 << 6)
 #define MOVESTATUS_HUNGON             (1 << 7)
 
+#define IDENTITY_PLAYER_MON1        0
+#define IDENTITY_OPPONENT_MON1      1
+#define IDENTITY_PLAYER_MON2        2
+#define IDENTITY_OPPONENT_MON2      3
+
 #define BATTLE_TYPE_DOUBLE          0x0001
 #define BATTLE_TYPE_LINK            0x0002
 #define BATTLE_TYPE_WILD            0x0004
@@ -117,6 +131,8 @@
 #define BATTLE_OUT_OF_BALLS         0x8
 #define BATTLE_OPPONENT_TELEPORTED  0xA
 
+#define OUTCOME_LINK_BATTLE_RUN      0x80
+
 #define SIDE_STATUS_REFLECT          (1 << 0)
 #define SIDE_STATUS_LIGHTSCREEN      (1 << 1)
 #define SIDE_STATUS_X4               (1 << 2)
@@ -126,6 +142,22 @@
 #define SIDE_STATUS_MIST             (1 << 8)
 #define SIDE_STATUS_SPIKES_DAMAGED   (1 << 9)
 
+#define ACTION_USE_MOVE             0
+#define ACTION_USE_ITEM             1
+#define ACTION_SWITCH               2
+#define ACTION_RUN                  3
+#define ACTION_WATCHES_CAREFULLY    4
+#define ACTION_SAFARI_ZONE_BALL     5
+#define ACTION_POKEBLOCK_CASE       6
+#define ACTION_GO_NEAR              7
+#define ACTION_SAFARI_ZONE_RUN      8
+#define ACTION_9                    9
+#define ACTION_RUN_BATTLESCRIPT     10 // when executing an action
+#define ACTION_CANCEL_PARTNER       12 // when choosing an action
+#define ACTION_FINISHED             12 // when executing an action
+#define ACTION_NOTHING_FAINTED      13 // when choosing an action
+#define ACTION_INIT_VALUE           0xFF
+
 #define TARGET_SELECTED_POKEMON 0
 #define TARGET_SPECIAL          (1 << 0)
 #define TARGET_UNK2             (1 << 1)
@@ -192,6 +224,40 @@
 #define WEATHER_SUN_ANY ((WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT))
 #define WEATHER_HAIL                (1 << 7)
 
+#define MOVE_TARGET_SELECTED        0x0
+#define MOVE_TARGET_DEPENDS         0x1
+#define MOVE_TARGET_USER            0x2
+#define MOVE_TARGET_RANDOM          0x4
+#define MOVE_TARGET_x10             0x10
+#define MOVE_TARGET_BOTH            0x8
+#define MOVE_TARGET_FOES_AND_ALLY   0x20
+#define MOVE_TARGET_OPPONENTS_FIELD 0x40
+
+// array entries for battle communication
+#define MULTIUSE_STATE          0x0
+#define CURSOR_POSITION         0x1
+#define TASK_ID                 0x1 // task Id and cursor position share the same field
+#define SPRITES_INIT_STATE1     0x1 // shares the Id as well
+#define SPRITES_INIT_STATE2     0x2
+#define MOVE_EFFECT_BYTE        0x3
+#define ACTIONS_CONFIRMED_COUNT 0x4
+#define MULTISTRING_CHOOSER     0x5
+#define MSG_DISPLAY             0x7
+#define BATTLE_COMMUNICATION_ENTRIES_COUNT  0x8
+
+#define BS_GET_TARGET                   0
+#define BS_GET_ATTACKER                 1
+#define BS_GET_EFFECT_BANK              2
+#define BS_GET_gBank1   3
+#define BS_GET_BANK_0   7
+#define BS_ATTACKER_WITH_PARTNER        4 // for atk98_status_icon_update
+#define BS_GET_ATTACKER_SIDE            8 // for atk1E_jumpifability
+#define BS_GET_NOT_ATTACKER_SIDE        9 // for atk1E_jumpifability
+#define BS_GET_SCRIPTING_BANK           10
+#define BS_GET_OPPONENT1                12
+#define BS_GET_PLAYER2                  13
+#define BS_GET_OPPONENT2                14
+
 // status animation table
 #define B_ANIM_STATUS_PSN               0x0
 #define B_ANIM_STATUS_CONFUSION         0x1
@@ -238,4 +304,12 @@
 #define B_ANIM_SUBSTITUTE_TO_MON        0x5
 #define B_ANIM_MON_TO_SUBSTITUTE        0x6
 
+// AI switch items
+#define AI_ITEM_FULL_RESTORE     1
+#define AI_ITEM_HEAL_HP          2
+#define AI_ITEM_CURE_CONDITION   3
+#define AI_ITEM_X_STAT           4
+#define AI_ITEM_GUARD_SPECS      5
+#define AI_ITEM_NOT_RECOGNIZABLE 6
+
 #endif // GUARD_CONSTANTS_BATTLE_CONSTANTS_H
diff --git a/include/contest.h b/include/contest.h
index 10392c00e..6e71358a2 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -87,4 +87,171 @@ bool8 Contest_SaveWinner(u8);
 u8 sub_80B2C4C(u8, u8);
 void Contest_ResetWinners(void);
 
+// Contest Shared EWRAM
+
+struct Shared18000
+{
+    /*0x18000*/ u8 unk18000;
+    /*0x18001*/ u8 filler18001[3];
+    /*0x18004*/ u16 unk18004[16][16];
+    /*0x18204*/ u16 unk18204[0x200];
+    /*0x18604*/ u16 unk18604[0x200];
+    /*0x18A04*/ u8 unk18A04[0x800];
+};
+
+struct Contest
+{
+    /*0x19204*/ u8 playerMoveChoice;
+    /*0x19205*/ u8 turnNumber;
+    /*0x19206*/ u8 unk19206[4];    // seems to only be used by an unref function
+    /*0x1920A*/ u16 unk1920A_0:1;  // Task active flags?
+                u16 unk1920A_1:1;
+                u16 unk1920A_2:1;
+                u16 unk1920A_3:1;
+                u16 unk1920A_4:1;
+                u16 unk1920A_5:1;
+                u16 unk1920A_6:1;
+                u16 unk1920A_7:1;
+    /*0x1920B*/ u16 unk1920B_0:1;
+                u16 unk1920B_1:1;
+                u16 unk1920B_2:1;
+    /*0x1920C*/ u8 mainTaskId;
+    /*0x1920D*/ u8 unk1920D[4];
+    /*0x19211*/ u8 unk19211;
+    /*0x19212*/ u8 unk19212;
+    /*0x19213*/ u8 filler19213;
+    /*0x19214*/ u8 unk19214;
+    /*0x19215*/ u8 unk19215;
+    /*0x19216*/ u8 unk19216;    // sprite ID
+    /*0x19217*/ s8 applauseLevel;
+    /*0x19218*/ u8 unk19218[4];
+    /*0x1921C*/ u32 unk1921C;   // saved RNG value?
+                u16 unk19220[5][4];  // move history?
+                u8 unk19248[5][4];  // excitement history
+                u8 applauseMeterSpriteId;    // sprite ID
+    /*0x1925D*/ u8 unk1925D;
+    /*0x1925E*/ u8 unk1925E;
+};
+
+struct ContestantStatus
+{
+    s16 appeal1;  // move appeal?
+    s16 appeal2;  // final appeal after end of turn, maybe?
+    s16 unk4;
+    u16 currMove;
+    u16 prevMove;
+    u8 moveCategory;
+    u8 unkB_0:2;
+    u8 unkB_2:2;
+    u8 moveRepeatCount:3;
+    u8 unkB_7:1;  // used a one-time move?
+    u8 unkC_0:1;
+    u8 unkC_1:2;
+    s8 unkD;
+    u8 unkE;
+    u8 unkF;
+    u8 unk10_0:1;
+    u8 unk10_1:1;
+    u8 unk10_2:1;
+    u8 unk10_3:1;
+    u8 unk10_4:2;
+    u8 unk10_6:2;
+    u8 unk11_0:2;
+    u8 unk11_2:1;
+    u8 unk11_3:1;
+    u8 unk11_4:1;
+    u8 unk11_5:1;
+    u8 unk12;
+    u8 unk13;   // status action?
+    u8 unk14;
+    u8 disappointedRepeat:1;
+    u8 unk15_1:1;
+    u8 unk15_2:1;
+    u8 unk15_3:1;
+    u8 unk15_4:1;
+    u8 unk15_5:1;
+    u8 unk15_6:1;
+    u8 unk16;
+    u8 unk17;
+    u8 unk18;
+    u8 unk19;  // turn position
+    u8 attentionLevel;  // How much the Pokemon "stood out"
+    u8 unk1B;
+};
+
+struct UnknownContestStruct3
+{
+    u8 unk0;
+    u8 unk1;
+    //u8 unk2_0:1;
+    //u8 unk2_1:1;
+    u8 unk2;  // maybe a bitfield
+    u8 filler3;
+};
+
+// possibly the same as UnknownContestStruct3?
+struct UnknownContestStruct4
+{
+    u8 unk0;  // sprite ID
+    u8 unk1;  // sprite ID
+    u8 unk2_0:1;
+    u8 unk2_1:1;
+    u8 unk2_2:1;
+    u8 filler3;
+};
+
+struct UnknownContestStruct5
+{
+    s8 bits_0;  // current move excitement?
+    u8 bits_8:1;
+    u8 bits_9:3;
+    u8 bits_C:4;
+    s8 unk2;
+    u8 filler3;
+};
+
+struct UnknownContestStruct7
+{
+    u8 unk0[4];
+    u16 unk4;
+    u16 unk6;
+    u8 filler8[0xD-8];
+    u8 unkD[4];
+    u8 unk11;
+    u8 filler12[2];
+};
+
+struct UnknownContestStruct8
+{
+    u16 unk0;
+    u16 unk2;
+    u8 unk4_0:1;
+    u8 unk5;
+    u8 filler6[2];
+    u32 unk8;
+    u32 unkC;
+    u32 unk10;
+};
+
+struct UnknownContestStruct6
+{
+    s32 unk0;
+    s32 unk4;
+    s32 unk8;
+    s32 unkC;
+};
+
+#define shared15800 (gSharedMem + 0x15800)
+#define shared15DE0 (*(struct ContestWinner *)(gSharedMem + 0x15DE0))
+#define shared16800 (gSharedMem + 0x16800)
+#define shared18000 (*(struct Shared18000 *)(gSharedMem + 0x18000))
+#define shared18004 ((u16 *)(gSharedMem + 0x18004))
+#define sContest (*(struct Contest *)(gSharedMem + 0x19204))
+#define sContestantStatus ((struct ContestantStatus *)(gSharedMem + 0x19260))
+#define shared192D0 (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0))
+#define shared192E4 (gSharedMem + 0x192E4)
+#define shared19328 (*(struct UnknownContestStruct5 *)(gSharedMem + 0x19328))
+#define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338))
+#define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348))
+
 #endif // GUARD_CONTEST_H
diff --git a/include/ewram.h b/include/ewram.h
index 9a281368f..19e05134f 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -109,6 +109,7 @@ extern u8 gSharedMem[];
 #define ewram16010arr(bank)             (gSharedMem[0x16010 + bank])
 #define ewram1601B                      (gSharedMem[0x1601B])
 #define eDynamicMoveType                (gSharedMem[0x1601C])
+#define eFocusPunchBank                 (gSharedMem[0x1601D])
 #define eDmgMultiplier                  (gSharedMem[0x1601F])
 #define ewram16020                      ((u8 *)(gSharedMem + 0x16020))
 #define ewram16020arr(i)                (gSharedMem[0x16020 + i])
@@ -134,6 +135,8 @@ extern u8 gSharedMem[];
 #define ewram1608Carr(bank)             (gSharedMem[0x1608C + bank])
 #define EWRAM_1609D                     (gSharedMem[0x1609D])
 #define ewram160A1                      (gSharedMem[0x160A1])
+#define ewram160A4                      (gSharedMem[0x160A4])
+#define ewram160A5                      (gSharedMem[0x160A5])
 #define ewram160A6                      (gSharedMem[0x160A6])
 #define ewram160A8                      (gSharedMem[0x160A8])
 #define ewram160A9                      (gSharedMem[0x160A9])
@@ -156,9 +159,12 @@ extern u8 gSharedMem[];
 #define USED_HELD_ITEM(bank)            ((((u16*)(&gSharedMem[0x160CC + bank * 2]))))
 #define USED_HELD_ITEMS(bank)           (*(u16 *)&gSharedMem[0x160CC + 2 * (bank)])
 #define ewram160D4(bank)                (gSharedMem[0x160D4 + (bank / 2) * 2])
+#define ewram160D8(bank)                (gSharedMem[0x160D8 + (bank / 2)])
+#define ewram160DA(bank)                (gSharedMem[0x160DA + (bank / 2)])
 #define ewram160DD                      (gSharedMem[0x160DD])
 #define ewram160E0(i)                   (gSharedMem[0x160E0 + i])
 #define ewram160E6                      (gSharedMem[0x160E6])
+#define ewram160E7                      (gSharedMem[0x160E7])
 #define CHOICED_MOVE(bank)              (((u16*)(&gSharedMem[0x160E8 + bank * 2])))
 #define ewram160E8                      ((u8 *)(gSharedMem + 0x160E8))
 #define ewram160E8arr(i)                (gSharedMem[0x160E8 + i])
@@ -176,6 +182,7 @@ extern u8 gSharedMem[];
 #define ewram16108arr(i)                (gSharedMem[0x16108 + i])
 #define ewram16110                      (gSharedMem[0x16110])
 #define ewram16111                      (gSharedMem[0x16111])
+#define eMultihitMoveEffect             (gSharedMem[0x16112])
 #define ewram16113                      (gSharedMem[0x16113])
 #define ewram16400                      (gSharedMem + 0x16400)
 #define AI_THINKING_STRUCT              ((struct AI_ThinkingStruct *)(gSharedMem + 0x16800))
@@ -186,6 +193,7 @@ extern u8 gSharedMem[];
 #define ewram17000                      (&gSharedMem[0x17000])
 #define eLearnMoveStruct                (struct LearnMoveStruct *)(gSharedMem + 0x17000)
 #define eSecretBaseRecord               ((struct SecretBaseRecord *)(gSharedMem + 0x17000))
+#define eCableCar1                      ((struct CableCarEwramStruct1 *)(gSharedMem + 0x17000))
 #define ewram17002                      (&gSharedMem[0x17002])
 #define eFlashFireArr                   (*(struct Struct2017100 *)(gSharedMem + 0x17100))
 #define B_BATTLESCRIPTS_STACK           ((struct scriptsStack *)     (gSharedMem + 0x17110))
@@ -214,9 +222,9 @@ extern u8 gSharedMem[];
 #define ewram18800                      (&gSharedMem[0x18800])
 #define ePokedexView2                   (struct PokedexView *)(gSharedMem + 0x18800)
 #define ewram19000                      (&gSharedMem[0x19000])
+#define eCableCar2                      ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000))
 #define ePokedexView3                   (struct PokedexView *)(gSharedMem + 0x19000)
 #define EWRAM_19348                     (*(u16 *)(gSharedMem + 0x19348))
-#define ewram19348                      (*(struct Struct2019348 *)(gSharedMem + 0x19348))
 #define ewram19800                      (&gSharedMem[0x19800])
 #define ePokedexView4                   (struct PokedexView *)(gSharedMem + 0x19800)
 #define ewram1A000                      (&gSharedMem[0x1A000])
diff --git a/include/field_weather.h b/include/field_weather.h
index c96d4055e..267650a2a 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -163,4 +163,8 @@ bool8 sub_807DDFC(void);
 void SetWeather(u32);
 void UpdateWeatherPerDay(u16);
 
+extern struct Weather gWeather;
+
+extern struct Weather *const gWeatherPtr;
+
 #endif // GUARD_WEATHER_H
diff --git a/include/gba/macro.h b/include/gba/macro.h
index 540e08375..59b22758e 100644
--- a/include/gba/macro.h
+++ b/include/gba/macro.h
@@ -87,7 +87,7 @@
 #define DmaCopyLarge(dmaNum, src, dest, size, block, bit) \
 {                                                         \
     const void *_src = src;                               \
-    void *_dest = dest;                                   \
+    void *_dest = (void *)(dest);                         \
     u32 _size = size;                                     \
     while (1)                                             \
     {                                                     \
@@ -129,7 +129,7 @@
 #define DmaCopyDefvars(dmaNum, src, dest, size, bit) \
 {                                                    \
     const void *_src = src;                          \
-    void *_dest = dest;                              \
+    void *_dest = (void *)(dest);                    \
     u32 _size = size;                                \
     DmaCopy##bit(dmaNum, _src, _dest, _size);        \
 }
@@ -137,4 +137,34 @@
 #define DmaCopy16Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 16)
 #define DmaCopy32Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 32)
 
+#define DmaFillLarge(dmaNum, fillval, dest, size, block, bit) \
+{                                                             \
+    void *_dest = (void *)(dest);                             \
+    u32 _size = (u32)(size);                                  \
+    while (1)                                                 \
+    {                                                         \
+        DmaFill##bit(dmaNum, fillval, _dest, (block));        \
+        _dest += (block);                                     \
+        _size -= (block);                                     \
+        if (_size <= (block))                                 \
+        {                                                     \
+            DmaFill##bit(dmaNum, fillval, _dest, _size);      \
+            break;                                            \
+        }                                                     \
+    }                                                         \
+}
+
+#define DmaFill16Large(dmaNum, fillval, dest, size, block) DmaFillLarge(dmaNum, fillval, dest, size, block, 16)
+#define DmaFill32Large(dmaNum, fillval, dest, size, block) DmaFillLarge(dmaNum, fillval, dest, size, block, 32)
+
+#define DmaFillDefvars(dmaNum, fillval, dest, size, bit) \
+{                                                        \
+    void *_dest = (void *)(dest);                        \
+    u32 _size = (u##bit)(size);                          \
+    DmaFill##bit(dmaNum, fillval, _dest, _size);         \
+}
+
+#define DmaFill16Defvars(dmaNum, fillval, dest, size) DmaFillDefvars(dmaNum, fillval, dest, size, 16)
+#define DmaFill32Defvars(dmaNum, fillval, dest, size) DmaFillDefvars(dmaNum, fillval, dest, size, 32)
+
 #endif // GUARD_GBA_MACRO_H
diff --git a/include/global.h b/include/global.h
index 0764718ca..eea1574b7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -14,9 +14,9 @@
 #define INCBIN_S8 {0}
 #define INCBIN_S16 {0}
 #define INCBIN_S32 {0}
-void *     memcpy (void *, const void *, size_t);
-void *     memset (void *, int, size_t);
-int     strcmp (const char *, const char *);
+void *memcpy (void *, const void *, size_t);
+void *memset (void *, int, size_t);
+int strcmp (const char *, const char *);
 #endif
 
 // Prevent cross-jump optimization.
@@ -843,5 +843,6 @@ struct HallOfFame
 
 extern struct HallOfFame gHallOfFame;
 extern struct SaveBlock2 gSaveBlock2;
+extern u8 ewram[];
 
 #endif // GUARD_GLOBAL_H
diff --git a/include/graphics.h b/include/graphics.h
index 42e6fd5c6..00a210350 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2736,4 +2736,11 @@ extern const u8 gVersionTiles[];
 extern const u16 gUnknown_08E9F624[];
 extern const u8 gUnknown_08E9F7E4[];
 
+extern const u8 gCableCar_Gfx[];
+extern const u8 gCableCarDoor_Gfx[];
+extern const u8 gCableCarCord_Gfx[];
+extern const u16 gCableCar_Pal[];
+extern const u16 gCableCarBG_Pal[];
+extern const u8 gCableCarBG_Gfx[];
+
 #endif  // GUARD_GRAPHICS_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 7edd3395f..fd1709320 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -363,6 +363,16 @@ enum
     STAT_STAGE_EVASION,  // 7
 };
 
+enum
+{
+    STAT_HP,     // 0
+    STAT_ATK,    // 1
+    STAT_DEF,    // 2
+    STAT_SPD,    // 3
+    STAT_SPATK,  // 4
+    STAT_SPDEF,  // 5
+};
+
 struct BaseStats
 {
     /*0x00*/ u8 baseHP;
@@ -405,7 +415,7 @@ struct BattleMove
     u8 pp;
     u8 secondaryEffectChance;
     u8 target;
-    u8 priority;
+    s8 priority;
     u8 flags;
     u8 pad[3];
 };
@@ -613,6 +623,8 @@ bool8 IsPokeSpriteNotFlipped(u16);
 u8 GetLevelUpMovesBySpecies(u16, u16 *);
 u8 TryIncrementMonLevel(struct Pokemon *);
 bool8 IsShiny(struct Pokemon *mon);
+void RandomlyGivePartyPokerus(struct Pokemon *party);
+void PartySpreadPokerus(struct Pokemon *party);
 
 struct Sprite *sub_80F7920(u16, u16, const u16 *);
 
diff --git a/include/roamer.h b/include/roamer.h
index 9d5f3c4ed..86908bd00 100644
--- a/include/roamer.h
+++ b/include/roamer.h
@@ -7,5 +7,7 @@ void UpdateLocationHistoryForRoamer(void);
 void RoamerMoveToOtherLocationSet(void);
 void RoamerMove();
 u8 TryStartRoamerEncounter(void);
+void UpdateRoamerHPStatus(struct Pokemon *mon);
+void SetRoamerInactive(void);
 
 #endif
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index dda90c48f..21ec88a90 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -25,9 +25,9 @@ u8 GetBankSide(u8 slot);
 u8 GetBankSide(u8);
 u8 GetBankIdentity(u8);
 u8 GetBankIdentity(u8 slot);
-u8 GetBankByPlayerAI(u8);
-u8 GetBankByPlayerAI(u8);
-u8 GetBankByPlayerAI(u8 state);
+u8 GetBankByIdentity(u8);
+u8 GetBankByIdentity(u8);
+u8 GetBankByIdentity(u8 state);
 bool8 IsBankSpritePresent(u8);
 bool8 IsDoubleBattle();
 u8 IsDoubleBattle(void);
diff --git a/include/trainer.h b/include/trainer.h
index 2e0beb342..e8f2776d2 100644
--- a/include/trainer.h
+++ b/include/trainer.h
@@ -17,83 +17,83 @@
 #define TRAINER_ENCOUNTER_MUSIC_RICH        13 // Rich Boys and Gentlemen
 
 enum {
-    TRAINER_CLASS_AQUA_LEADER,
-    TRAINER_CLASS_TEAM_AQUA_M,
-    TRAINER_CLASS_TEAM_AQUA_F,
-    TRAINER_CLASS_AROMA_LADY,
-    TRAINER_CLASS_RUIN_MANIAC,
-    TRAINER_CLASS_INTERVIEWER,
-    TRAINER_CLASS_TUBER_F,
-    TRAINER_CLASS_TUBER_M,
-    TRAINER_CLASS_COOL_TRAINER_M,
-    TRAINER_CLASS_COOL_TRAINER_F,
-    TRAINER_CLASS_HEX_MANIAC,
-    TRAINER_CLASS_LADY,
-    TRAINER_CLASS_BEAUTY,
-    TRAINER_CLASS_RICH_BOY,
-    TRAINER_CLASS_POKEMANIAC,
-    TRAINER_CLASS_SWIMMER_M,
-    TRAINER_CLASS_BLACK_BELT,
-    TRAINER_CLASS_GUITARIST,
-    TRAINER_CLASS_KINDLER,
-    TRAINER_CLASS_CAMPER,
-    TRAINER_CLASS_BUG_MANIAC,
-    TRAINER_CLASS_PSYCHIC_M,
-    TRAINER_CLASS_PSYCHIC_F,
-    TRAINER_CLASS_GENTLEMAN,
-    TRAINER_CLASS_ELITE_FOUR_M,
-    TRAINER_CLASS_ELITE_FOUR_F,
-    TRAINER_CLASS_LEADER_F,
-    TRAINER_CLASS_LEADER_M,
-    TRAINER_CLASS_LEADER_MF,
-    TRAINER_CLASS_SCHOOL_KID_M,
-    TRAINER_CLASS_SCHOOL_KID_F,
-    TRAINER_CLASS_SR_AND_JR,
-    TRAINER_CLASS_POKEFAN_M,
-    TRAINER_CLASS_POKEFAN_F,
-    TRAINER_CLASS_EXPERT_M,
-    TRAINER_CLASS_EXPERT_F,
-    TRAINER_CLASS_YOUNGSTER,
-    TRAINER_CLASS_CHAMPION,
-    TRAINER_CLASS_FISHERMAN,
-    TRAINER_CLASS_CYCLING_TRIATHLETE_M,
-    TRAINER_CLASS_CYCLING_TRIATHLETE_F,
-    TRAINER_CLASS_RUNNING_TRIATHLETE_M,
-    TRAINER_CLASS_RUNNING_TRIATHLETE_F,
-    TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
-    TRAINER_CLASS_SWIMMING_TRIATHLETE_F,
-    TRAINER_CLASS_DRAGON_TAMER,
-    TRAINER_CLASS_BIRD_KEEPER,
-    TRAINER_CLASS_NINJA_BOY,
-    TRAINER_CLASS_BATTLE_GIRL,
-    TRAINER_CLASS_PARASOL_LADY,
-    TRAINER_CLASS_SWIMMER_F,
-    TRAINER_CLASS_PICNICKER,
-    TRAINER_CLASS_TWINS,
-    TRAINER_CLASS_SAILOR,
-    TRAINER_CLASS_BOARDER_1,
-    TRAINER_CLASS_BOARDER_2,
-    TRAINER_CLASS_COLLECTOR,
-    TRAINER_CLASS_WALLY,
-    TRAINER_CLASS_BRENDAN_1,
-    TRAINER_CLASS_BRENDAN_2,
-    TRAINER_CLASS_BRENDAN_3,
-    TRAINER_CLASS_MAY_1,
-    TRAINER_CLASS_MAY_2,
-    TRAINER_CLASS_MAY_3,
-    TRAINER_CLASS_POKEMON_BREEDER_M,
-    TRAINER_CLASS_POKEMON_BREEDER_F,
-    TRAINER_CLASS_POKEMON_RANGER_M,
-    TRAINER_CLASS_POKEMON_RANGER_F,
-    TRAINER_CLASS_MAGMA_LEADER,
-    TRAINER_CLASS_TEAM_MAGMA_M,
-    TRAINER_CLASS_TEAM_MAGMA_F,
-    TRAINER_CLASS_LASS,
-    TRAINER_CLASS_BUG_CATCHER,
-    TRAINER_CLASS_HIKER,
-    TRAINER_CLASS_YOUNG_COUPLE,
-    TRAINER_CLASS_OLD_COUPLE,
-    TRAINER_CLASS_SIS_AND_BRO
+    FACILITY_CLASS_AQUA_LEADER,
+    FACILITY_CLASS_TEAM_AQUA_M,
+    FACILITY_CLASS_TEAM_AQUA_F,
+    FACILITY_CLASS_AROMA_LADY,
+    FACILITY_CLASS_RUIN_MANIAC,
+    FACILITY_CLASS_INTERVIEWER,
+    FACILITY_CLASS_TUBER_F,
+    FACILITY_CLASS_TUBER_M,
+    FACILITY_CLASS_COOL_TRAINER_M,
+    FACILITY_CLASS_COOL_TRAINER_F,
+    FACILITY_CLASS_HEX_MANIAC,
+    FACILITY_CLASS_LADY,
+    FACILITY_CLASS_BEAUTY,
+    FACILITY_CLASS_RICH_BOY,
+    FACILITY_CLASS_POKEMANIAC,
+    FACILITY_CLASS_SWIMMER_M,
+    FACILITY_CLASS_BLACK_BELT,
+    FACILITY_CLASS_GUITARIST,
+    FACILITY_CLASS_KINDLER,
+    FACILITY_CLASS_CAMPER,
+    FACILITY_CLASS_BUG_MANIAC,
+    FACILITY_CLASS_PSYCHIC_M,
+    FACILITY_CLASS_PSYCHIC_F,
+    FACILITY_CLASS_GENTLEMAN,
+    FACILITY_CLASS_ELITE_FOUR_M,
+    FACILITY_CLASS_ELITE_FOUR_F,
+    FACILITY_CLASS_LEADER_F,
+    FACILITY_CLASS_LEADER_M,
+    FACILITY_CLASS_LEADER_MF,
+    FACILITY_CLASS_SCHOOL_KID_M,
+    FACILITY_CLASS_SCHOOL_KID_F,
+    FACILITY_CLASS_SR_AND_JR,
+    FACILITY_CLASS_POKEFAN_M,
+    FACILITY_CLASS_POKEFAN_F,
+    FACILITY_CLASS_EXPERT_M,
+    FACILITY_CLASS_EXPERT_F,
+    FACILITY_CLASS_YOUNGSTER,
+    FACILITY_CLASS_CHAMPION,
+    FACILITY_CLASS_FISHERMAN,
+    FACILITY_CLASS_CYCLING_TRIATHLETE_M,
+    FACILITY_CLASS_CYCLING_TRIATHLETE_F,
+    FACILITY_CLASS_RUNNING_TRIATHLETE_M,
+    FACILITY_CLASS_RUNNING_TRIATHLETE_F,
+    FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
+    FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
+    FACILITY_CLASS_DRAGON_TAMER,
+    FACILITY_CLASS_BIRD_KEEPER,
+    FACILITY_CLASS_NINJA_BOY,
+    FACILITY_CLASS_BATTLE_GIRL,
+    FACILITY_CLASS_PARASOL_LADY,
+    FACILITY_CLASS_SWIMMER_F,
+    FACILITY_CLASS_PICNICKER,
+    FACILITY_CLASS_TWINS,
+    FACILITY_CLASS_SAILOR,
+    FACILITY_CLASS_BOARDER_1,
+    FACILITY_CLASS_BOARDER_2,
+    FACILITY_CLASS_COLLECTOR,
+    FACILITY_CLASS_WALLY,
+    FACILITY_CLASS_BRENDAN_1,
+    FACILITY_CLASS_BRENDAN_2,
+    FACILITY_CLASS_BRENDAN_3,
+    FACILITY_CLASS_MAY_1,
+    FACILITY_CLASS_MAY_2,
+    FACILITY_CLASS_MAY_3,
+    FACILITY_CLASS_POKEMON_BREEDER_M,
+    FACILITY_CLASS_POKEMON_BREEDER_F,
+    FACILITY_CLASS_POKEMON_RANGER_M,
+    FACILITY_CLASS_POKEMON_RANGER_F,
+    FACILITY_CLASS_MAGMA_LEADER,
+    FACILITY_CLASS_TEAM_MAGMA_M,
+    FACILITY_CLASS_TEAM_MAGMA_F,
+    FACILITY_CLASS_LASS,
+    FACILITY_CLASS_BUG_CATCHER,
+    FACILITY_CLASS_HIKER,
+    FACILITY_CLASS_YOUNG_COUPLE,
+    FACILITY_CLASS_OLD_COUPLE,
+    FACILITY_CLASS_SIS_AND_BRO
 };
 
 enum {
@@ -183,64 +183,64 @@ enum {
 };
 
 enum {
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_1,
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_2,
-    TRAINER_CLASS_NAME_AQUA_LEADER,
-    TRAINER_CLASS_NAME_TEAM_AQUA,
-    TRAINER_CLASS_NAME_AQUA_ADMIN,
-    TRAINER_CLASS_NAME_AROMA_LADY,
-    TRAINER_CLASS_NAME_RUIN_MANIAC,
-    TRAINER_CLASS_NAME_INTERVIEWER,
-    TRAINER_CLASS_NAME_TUBER_F,
-    TRAINER_CLASS_NAME_TUBER_M,
-    TRAINER_CLASS_NAME_COOL_TRAINER,
-    TRAINER_CLASS_NAME_HEX_MANIAC,
-    TRAINER_CLASS_NAME_LADY,
-    TRAINER_CLASS_NAME_BEAUTY,
-    TRAINER_CLASS_NAME_RICH_BOY,
-    TRAINER_CLASS_NAME_POKEMANIAC,
-    TRAINER_CLASS_NAME_SWIMMER_M,
-    TRAINER_CLASS_NAME_BLACK_BELT,
-    TRAINER_CLASS_NAME_GUITARIST,
-    TRAINER_CLASS_NAME_KINDLER,
-    TRAINER_CLASS_NAME_CAMPER,
-    TRAINER_CLASS_NAME_BUG_MANIAC,
-    TRAINER_CLASS_NAME_PSYCHIC,
-    TRAINER_CLASS_NAME_GENTLEMAN,
-    TRAINER_CLASS_NAME_ELITE_FOUR,
-    TRAINER_CLASS_NAME_LEADER,
-    TRAINER_CLASS_NAME_SCHOOL_KID,
-    TRAINER_CLASS_NAME_SR_AND_JR,
-    TRAINER_CLASS_NAME_WINSTRATE,
-    TRAINER_CLASS_NAME_POKEFAN,
-    TRAINER_CLASS_NAME_EXPERT,
-    TRAINER_CLASS_NAME_YOUNGSTER,
-    TRAINER_CLASS_NAME_CHAMPION,
-    TRAINER_CLASS_NAME_FISHERMAN,
-    TRAINER_CLASS_NAME_TRIATHLETE,
-    TRAINER_CLASS_NAME_DRAGON_TAMER,
-    TRAINER_CLASS_NAME_BIRD_KEEPER,
-    TRAINER_CLASS_NAME_NINJA_BOY,
-    TRAINER_CLASS_NAME_BATTLE_GIRL,
-    TRAINER_CLASS_NAME_PARASOL_LADY,
-    TRAINER_CLASS_NAME_SWIMMER_F,
-    TRAINER_CLASS_NAME_PICNICKER,
-    TRAINER_CLASS_NAME_TWINS,
-    TRAINER_CLASS_NAME_SAILOR,
-    TRAINER_CLASS_NAME_BOARDER,
-    TRAINER_CLASS_NAME_COLLECTOR,
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3,
-    TRAINER_CLASS_NAME_POKEMON_BREEDER,
-    TRAINER_CLASS_NAME_POKEMON_RANGER,
-    TRAINER_CLASS_NAME_MAGMA_LEADER,
-    TRAINER_CLASS_NAME_TEAM_MAGMA,
-    TRAINER_CLASS_NAME_MAGMA_ADMIN,
-    TRAINER_CLASS_NAME_LASS,
-    TRAINER_CLASS_NAME_BUG_CATCHER,
-    TRAINER_CLASS_NAME_HIKER,
-    TRAINER_CLASS_NAME_YOUNG_COUPLE,
-    TRAINER_CLASS_NAME_OLD_COUPLE,
-    TRAINER_CLASS_NAME_SIS_AND_BRO
+    TRAINER_CLASS_POKEMON_TRAINER_1,
+    TRAINER_CLASS_POKEMON_TRAINER_2,
+    TRAINER_CLASS_AQUA_LEADER,
+    TRAINER_CLASS_TEAM_AQUA,
+    TRAINER_CLASS_AQUA_ADMIN,
+    TRAINER_CLASS_AROMA_LADY,
+    TRAINER_CLASS_RUIN_MANIAC,
+    TRAINER_CLASS_INTERVIEWER,
+    TRAINER_CLASS_TUBER_F,
+    TRAINER_CLASS_TUBER_M,
+    TRAINER_CLASS_COOL_TRAINER,
+    TRAINER_CLASS_HEX_MANIAC,
+    TRAINER_CLASS_LADY,
+    TRAINER_CLASS_BEAUTY,
+    TRAINER_CLASS_RICH_BOY,
+    TRAINER_CLASS_POKEMANIAC,
+    TRAINER_CLASS_SWIMMER_M,
+    TRAINER_CLASS_BLACK_BELT,
+    TRAINER_CLASS_GUITARIST,
+    TRAINER_CLASS_KINDLER,
+    TRAINER_CLASS_CAMPER,
+    TRAINER_CLASS_BUG_MANIAC,
+    TRAINER_CLASS_PSYCHIC,
+    TRAINER_CLASS_GENTLEMAN,
+    TRAINER_CLASS_ELITE_FOUR,
+    TRAINER_CLASS_LEADER,
+    TRAINER_CLASS_SCHOOL_KID,
+    TRAINER_CLASS_SR_AND_JR,
+    TRAINER_CLASS_WINSTRATE,
+    TRAINER_CLASS_POKEFAN,
+    TRAINER_CLASS_EXPERT,
+    TRAINER_CLASS_YOUNGSTER,
+    TRAINER_CLASS_CHAMPION,
+    TRAINER_CLASS_FISHERMAN,
+    TRAINER_CLASS_TRIATHLETE,
+    TRAINER_CLASS_DRAGON_TAMER,
+    TRAINER_CLASS_BIRD_KEEPER,
+    TRAINER_CLASS_NINJA_BOY,
+    TRAINER_CLASS_BATTLE_GIRL,
+    TRAINER_CLASS_PARASOL_LADY,
+    TRAINER_CLASS_SWIMMER_F,
+    TRAINER_CLASS_PICNICKER,
+    TRAINER_CLASS_TWINS,
+    TRAINER_CLASS_SAILOR,
+    TRAINER_CLASS_BOARDER,
+    TRAINER_CLASS_COLLECTOR,
+    TRAINER_CLASS_POKEMON_TRAINER_3,
+    TRAINER_CLASS_POKEMON_BREEDER,
+    TRAINER_CLASS_POKEMON_RANGER,
+    TRAINER_CLASS_MAGMA_LEADER,
+    TRAINER_CLASS_TEAM_MAGMA,
+    TRAINER_CLASS_MAGMA_ADMIN,
+    TRAINER_CLASS_LASS,
+    TRAINER_CLASS_BUG_CATCHER,
+    TRAINER_CLASS_HIKER,
+    TRAINER_CLASS_YOUNG_COUPLE,
+    TRAINER_CLASS_OLD_COUPLE,
+    TRAINER_CLASS_SIS_AND_BRO
 };
 
 #endif // GUARD_TRAINER_H
diff --git a/include/tv.h b/include/tv.h
index 91b871f71..2edccb365 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -107,5 +107,6 @@ void UpdateTVShowsPerDay(u16);
 void sub_80C045C();
 void sub_80BF088(u8, s32);
 void sub_80BFD20(void);
+void PutPokemonTodayCaughtOnAir(void);
 
 #endif // GUARD_TV_H
diff --git a/ld_script.txt b/ld_script.txt
index 4ac9ea4ee..4b28ff022 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -50,8 +50,7 @@ SECTIONS {
         src/rom_800D42C.o(.text);
         asm/battle_1.o(.text_800DC24);
         src/battle/battle_2.o(.text);
-        asm/battle_2.o(.text);
-        src/battle/battle_3.o(.text);
+        src/battle/battle_util.o(.text);
         src/battle/battle_4.o(.text);
         src/battle/battle_controller_player.o(.text);
         src/battle/battle_7.o(.text);
@@ -348,9 +347,9 @@ SECTIONS {
         src/battle/battle_controller_linkpartner.o(.text);
         src/battle/battle_message.o(.text);
         src/field/choose_party.o(.text);
-        asm/cable_car.o(.text);
+        src/scene/cable_car.o(.text);
         asm/roulette_util.o(.text);
-        asm/cable_car_util.o(.text);
+        src/engine/cable_car_util.o(.text);
         src/unused_8124F94.o(.text);
         src/engine/save.o(.text);
         src/engine/mystery_event_script.o(.text);
@@ -454,7 +453,7 @@ SECTIONS {
         src/battle/battle_controller_opponent.o(.rodata);
         src/battle/battle_controller_linkopponent.o(.rodata);
         data/battle_moves.o(.rodata);
-        src/battle/battle_3.o(.rodata);
+        src/battle/battle_util.o(.rodata);
         src/pokemon/pokemon_data.o(.rodata);
         . = ALIGN(4);
         src/engine/trig.o(.rodata);
@@ -574,7 +573,7 @@ SECTIONS {
         src/battle/battle_controller_linkpartner.o(.rodata);
         src/battle/battle_message.o(.rodata);
         src/field/choose_party.o(.rodata);
-        data/cable_car.o(.rodata);
+        src/scene/cable_car.o(.rodata);
         src/engine/save.o(.rodata);
         src/field/field_effect_helpers.o(.rodata);
         data/contest_ai.o(.rodata);
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c
index 6dc304232..4d577a765 100644
--- a/src/battle/anim/fire_2.c
+++ b/src/battle/anim/fire_2.c
@@ -23,8 +23,8 @@ void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3);
 void sub_80D51A8(struct Sprite *sprite)
 {
     if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)
-        && (gAnimBankAttacker == GetBankByPlayerAI(2)
-            || gAnimBankAttacker == GetBankByPlayerAI(3)))
+        && (gAnimBankAttacker == GetBankByIdentity(2)
+            || gAnimBankAttacker == GetBankByIdentity(3)))
             gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->callback = sub_8079534;
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index b0654950b..ae84e5585 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -1,12 +1,18 @@
 #include "global.h"
 #include "constants/abilities.h"
 #include "battle.h"
+#include "battle_ai.h"
 #include "battle_interface.h"
+#include "battle_message.h"
 #include "battle_setup.h"
+#include "battle_util.h"
 #include "data2.h"
+#include "event_data.h"
+#include "evolution_scene.h"
 #include "item.h"
 #include "link.h"
 #include "main.h"
+#include "m4a.h"
 #include "name_string_util.h"
 #include "palette.h"
 #include "party_menu.h"
@@ -14,6 +20,7 @@
 #include "pokedex.h"
 #include "pokemon.h"
 #include "random.h"
+#include "roamer.h"
 #include "rom3.h"
 #include "rom_8077ABC.h"
 #include "rom_8094928.h"
@@ -21,14 +28,18 @@
 #include "sound.h"
 #include "constants/species.h"
 #include "sprite.h"
+#include "string_util.h"
 #include "task.h"
 #include "text.h"
+#include "trainer.h"
 #include "trig.h"
+#include "tv.h"
 #include "unknown_task.h"
 #include "util.h"
+#include "constants/battle_move_effects.h"
 #include "constants/items.h"
 #include "constants/hold_effects.h"
-#include "constants/battle_move_effects.h"
+#include "constants/moves.h"
 #include "ewram.h"
 
 struct UnknownStruct7
@@ -56,14 +67,16 @@ struct UnknownStruct12
 extern const u16 gUnknown_08D004E0[];
 extern const struct MonCoords gCastformFrontSpriteCoords[];
 
+extern u8 gStatStageRatios[][2];
+extern u8 gActionsByTurnOrder[4];
 extern struct UnknownPokemonStruct2 gUnknown_02023A00[];
 extern u8 gBattleBufferB[][0x200];
 extern u8 gActiveBank;
 extern u32 gBattleExecBuffer;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[];
-extern u8 gFightStateTracker;
-extern u8 gTurnOrder[];
+extern u8 gCurrentActionFuncId;
+extern u8 gBanksByTurnOrder[];
 extern struct UnknownStruct12 gUnknown_02024AD0[];
 extern u8 gObjectBankIDs[];
 extern u16 gCurrentMove;
@@ -77,7 +90,7 @@ extern u16 gLastUsedMove[];
 extern u16 gMoveHitWith[];
 extern u16 gUnknown_02024C44[];
 extern u16 gUnknown_02024C4C[];
-extern u16 gLockedMove[];
+extern u16 gLockedMoves[];
 extern u8 gUnknown_02024C5C[];
 extern u16 gChosenMovesByBanks[];
 extern u32 gHitMarker;
@@ -107,8 +120,8 @@ extern u16 gBattle_WIN0V;
 extern u16 gBattle_BG2_Y;
 extern u32 gUnknown_03004284;
 extern u16 gBattle_BG2_X;
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_WIN0H;
 extern MainCallback gPreBattleCallback1;
@@ -129,8 +142,52 @@ extern u16 gBattleWeather;
 extern u32 gBattleMoveDamage;
 extern struct BattlePokemon gBattleMons[];
 extern u8 gBattleMoveFlags;
+extern u8 BattleScript_FocusPunchSetUp[];
+extern u16 gDynamicBasePower;
+extern u8 gCurrentTurnActionNumber;
+extern void (* const gUnknown_081FA640[])(void);
+extern void (* const gUnknown_081FA678[])(void);
+extern u8* gBattlescriptCurrInstr;
+extern u8 BattleScript_LinkBattleWonOrLost[];
+extern u8 BattleScript_PayDayMoneyAndPickUpItems[];
+extern u8 gUnknown_081D8E0D[];
+extern u8 BattleScript_LocalTrainerBattleWon[];
+extern u8 BattleScript_LocalBattleLost[];
+extern u8 BattleScript_GotAwaySafely[];
+extern u8 BattleScript_SmokeBallEscape[];
+extern u8 BattleScript_RanAwayUsingMonAbility[];
+extern u8 BattleScript_WildMonFled[];
+extern u8 BattleScript_ActionSwitch[];
+extern u8 BattleScript_PrintFailedToRunString[];
+extern const BattleCmdFunc gBattleScriptingCommandsTable[];
+extern u8 gCritMultiplier;
+extern u8 gCurrMovePos;
+extern u8 gUnknown_02024BE5;
+extern u16 gChosenMove;
+extern u8* gBattleScriptsForMoveEffects[];
+extern u16 gLastUsedItem;
+extern u8 * const gBattlescriptsForBallThrow[];
+extern u8 * const gBattlescriptsForRunningByItem[];
+extern u8 * const gBattlescriptsForUsingItem[];
+extern u8 * const gBattlescriptsForSafariActions[];
+extern u8 gBattleTextBuff2[];
+extern u8 gNumSafariBalls;
+extern u8 gUnknown_081FA70C[][3];
+extern u8 gUnknown_081FA71B[];
+extern u8 gUnknown_081FA71F[];
+
 
 static void BattlePrepIntroSlide(void);
+void CheckFocusPunch_ClearVarsBeforeTurnStarts(void);
+void SetActionsAndBanksTurnOrder(void);
+static void TurnValuesCleanUp(u8);
+void SpecialStatusesClear(void);
+static void RunTurnActionsFunctions(void);
+void HandleEndTurn_FinishBattle();
+static void FreeResetData_ReturnToOvOrDoEvolutions(void);
+void TryEvolvePokemon(void);
+static void ReturnFromBattleToOverworld(void);
+static void WaitForEvoSceneToFinish(void);
 
 void sub_800E7C4(void)
 {
@@ -179,8 +236,8 @@ void InitBattle(void)
     sub_80895F8(gUnknown_081F9674);
     SetUpWindowConfig(&gWindowConfig_81E6C58);
     ResetPaletteFade();
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = 0;
     gBattle_BG2_X = 0;
@@ -468,7 +525,7 @@ void sub_800EC9C(void)
         {
             gPreBattleCallback1 = gMain.callback1;
             gMain.callback1 = sub_8010824;
-            SetMainCallback2(sub_800F808);
+            SetMainCallback2(BattleMainCB2);
             if (gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
                 gTrainerBattleOpponent = 0x800;
@@ -826,7 +883,7 @@ void sub_800F298(void)
         {
             gPreBattleCallback1 = gMain.callback1;
             gMain.callback1 = sub_8010824;
-            SetMainCallback2(sub_800F808);
+            SetMainCallback2(BattleMainCB2);
             if (gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
                 gTrainerBattleOpponent = 0x800;
@@ -837,7 +894,7 @@ void sub_800F298(void)
     }
 }
 
-void sub_800F808(void)
+void BattleMainCB2(void)
 {
     AnimateSprites();
     BuildOamBuffer();
@@ -1001,8 +1058,8 @@ void sub_800FCD4(void)
 void sub_800FCFC(void)
 {
     Random();  // unused return value
-    REG_BG0HOFS = gUnknown_030042A4;
-    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG0HOFS = gBattle_BG0_X;
+    REG_BG0VOFS = gBattle_BG0_Y;
     REG_BG1HOFS = gBattle_BG1_X;
     REG_BG1VOFS = gBattle_BG1_Y;
     REG_BG2HOFS = gBattle_BG2_X;
@@ -1155,8 +1212,8 @@ void c2_8011A1C(void)
     }
     SetUpWindowConfig(&gWindowConfig_81E6C58);
     ResetPaletteFade();
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = 0;
     gBattle_BG2_X = 0;
@@ -1526,7 +1583,7 @@ void sub_8010874(void)
         gUnknown_02024C44[i] = 0;
         gUnknown_02024C4C[i] = 0;
         gUnknown_02024C5C[i] = 0xFF;
-        gLockedMove[i] = 0;
+        gLockedMoves[i] = 0;
         gUnknown_02024C2C[i] = 0;
         eFlashFireArr.arr[i] = 0;
     }
@@ -1534,7 +1591,7 @@ void sub_8010874(void)
     for (i = 0; i < 2; i++)
     {
         gSideAffecting[i] = 0;
-        MEMSET_ALT(&gSideTimer[i], 0, 12, j, r4);
+        MEMSET_ALT(&gSideTimers[i], 0, 12, j, r4);
     }
 
     gBankAttacker = 0;
@@ -1787,7 +1844,7 @@ static void BattlePrepIntroSlide(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByPlayerAI(0);
+        gActiveBank = GetBankByIdentity(0);
         EmitIntroSlide(0, gBattleTerrain);
         MarkBufferBankForExecution(gActiveBank);
         gBattleMainFunc = sub_8011384;
@@ -1891,7 +1948,7 @@ void bc_801333C(void)
                     hpStatus[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS);
                 }
             }
-            gActiveBank = GetBankByPlayerAI(1);
+            gActiveBank = GetBankByIdentity(1);
             EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
             MarkBufferBankForExecution(gActiveBank);
 
@@ -1909,7 +1966,7 @@ void bc_801333C(void)
                     hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
                 }
             }
-            gActiveBank = GetBankByPlayerAI(0);
+            gActiveBank = GetBankByIdentity(0);
             EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
             MarkBufferBankForExecution(gActiveBank);
 
@@ -1944,7 +2001,7 @@ void bc_battle_begin_message(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByPlayerAI(1);
+        gActiveBank = GetBankByIdentity(1);
         PrepareStringBattle(0, gActiveBank);
         gBattleMainFunc = sub_8011800;
     }
@@ -1963,7 +2020,7 @@ void sub_8011800(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        PrepareStringBattle(1, GetBankByPlayerAI(1));
+        PrepareStringBattle(1, GetBankByIdentity(1));
         gBattleMainFunc = sub_8011834;
     }
 }
@@ -2015,7 +2072,7 @@ void sub_8011970(void)
     if (gBattleExecBuffer == 0)
     {
         if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-            PrepareStringBattle(1, GetBankByPlayerAI(0));
+            PrepareStringBattle(1, GetBankByIdentity(0));
         gBattleMainFunc = sub_80119B4;
     }
 }
@@ -2075,13 +2132,13 @@ void BattleBeginFirstTurn(void)
         if (ewram16058 == 0)
         {
             for (i = 0; i < gNoOfAllBanks; i++)
-                gTurnOrder[i] = i;
+                gBanksByTurnOrder[i] = i;
             for (i = 0; i < gNoOfAllBanks - 1; i++)
             {
                 for (j = i + 1; j < gNoOfAllBanks; j++)
                 {
-                    if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 1) != 0)
-                        sub_8012FBC(i, j);
+                    if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 1) != 0)
+                        SwapTurnOrder(i, j);
                 }
             }
         }
@@ -2092,7 +2149,7 @@ void BattleBeginFirstTurn(void)
         }
         while (ewram16058 < gNoOfAllBanks)
         {
-            if (AbilityBattleEffects(0, gTurnOrder[ewram16058], 0, 0, 0) != 0)
+            if (AbilityBattleEffects(0, gBanksByTurnOrder[ewram16058], 0, 0, 0) != 0)
                 r9++;
             ewram16058++;
             if (r9 != 0)
@@ -2104,7 +2161,7 @@ void BattleBeginFirstTurn(void)
             return;
         while (ewram160F9 < gNoOfAllBanks)
         {
-            if (ItemBattleEffects(0, gTurnOrder[ewram160F9], 0) != 0)
+            if (ItemBattleEffects(0, gBanksByTurnOrder[ewram160F9], 0) != 0)
                 r9++;
             ewram160F9++;
             if (r9 != 0)
@@ -2123,7 +2180,7 @@ void BattleBeginFirstTurn(void)
         SpecialStatusesClear();
         ewram160A6 = gAbsentBankFlags;
         gBattleMainFunc = sub_8012324;
-        sub_80156DC();
+        ResetSentPokesToOpponentValue();
         for (i = 0; i < 8; i++)
             gBattleCommunication[i] = 0;
         for (i = 0; i < gNoOfAllBanks; i++)
@@ -2176,10 +2233,10 @@ void BattleTurnPassed(void)
         if (TurnBasedEffects() != 0)
             return;
     }
-    if (sub_80173A4() != 0)
+    if (HandleFaintedMonActions() != 0)
         return;
     ewram16059 = 0;
-    if (sub_80170DC() != 0)
+    if (HandleWishPerishSongOnTurnEnd() != 0)
         return;
     TurnValuesCleanUp(0);
     gHitMarker &= ~HITMARKER_NO_ATTACKSTRING;
@@ -2195,8 +2252,8 @@ void BattleTurnPassed(void)
         gBattleCommunication[i] = 0;
     if (gBattleOutcome != 0)
     {
-        gFightStateTracker = 12;
-        gBattleMainFunc = sub_80138F0;
+        gCurrentActionFuncId = 12;
+        gBattleMainFunc = RunTurnActionsFunctions;
         return;
     }
     if (gBattleResults.battleTurnCounter < 0xFF)
@@ -2319,8 +2376,8 @@ void sub_8012324(void)
             ewram16068arr(gActiveBank) = 6;
             if (!(gBattleTypeFlags & 0x40)
              && (r5 & 2)
-             && !(ewram160A6 & gBitTable[GetBankByPlayerAI(r5 ^ 2)])
-             && gBattleCommunication[GetBankByPlayerAI(r5)] != 4)
+             && !(ewram160A6 & gBitTable[GetBankByIdentity(r5 ^ 2)])
+             && gBattleCommunication[GetBankByIdentity(r5)] != 4)
                 break;
             //_080123F8
             if (ewram160A6 & gBitTable[gActiveBank])
@@ -2352,3 +2409,2982 @@ void sub_8012324(void)
     }
 }
 */
+__attribute__((naked))
+void sub_8012324(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x1C\n\
+    ldr r0, _08012340 @ =gBattleCommunication\n\
+    movs r1, 0\n\
+    strb r1, [r0, 0x4]\n\
+    ldr r0, _08012344 @ =gActiveBank\n\
+    strb r1, [r0]\n\
+    ldr r0, _08012348 @ =gNoOfAllBanks\n\
+    bl _08012F74\n\
+    .align 2, 0\n\
+_08012340: .4byte gBattleCommunication\n\
+_08012344: .4byte gActiveBank\n\
+_08012348: .4byte gNoOfAllBanks\n\
+_0801234C:\n\
+    ldr r4, _08012374 @ =gActiveBank\n\
+    ldrb r0, [r4]\n\
+    bl GetBankIdentity\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    ldr r1, _08012378 @ =gBattleCommunication\n\
+    ldrb r0, [r4]\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x6\n\
+    bls _08012368\n\
+    bl _08012F66\n\
+_08012368:\n\
+    lsls r0, 2\n\
+    ldr r1, _0801237C @ =_08012380\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_08012374: .4byte gActiveBank\n\
+_08012378: .4byte gBattleCommunication\n\
+_0801237C: .4byte _08012380\n\
+    .align 2, 0\n\
+_08012380:\n\
+    .4byte _0801239C\n\
+    .4byte _080124C8\n\
+    .4byte _08012A28\n\
+    .4byte _08012DA8\n\
+    .4byte _08012E50\n\
+    .4byte _08012E94\n\
+    .4byte _08012F38\n\
+_0801239C:\n\
+    ldr r4, _08012434 @ =gSharedMem\n\
+    ldr r0, _08012438 @ =gActiveBank\n\
+    ldrb r0, [r0]\n\
+    ldr r1, _0801243C @ =0x00016068\n\
+    adds r0, r1\n\
+    adds r0, r4\n\
+    movs r1, 0x6\n\
+    strb r1, [r0]\n\
+    ldr r0, _08012440 @ =gBattleTypeFlags\n\
+    ldrh r1, [r0]\n\
+    movs r0, 0x40\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _080123F8\n\
+    movs r1, 0x2\n\
+    movs r0, 0x2\n\
+    ands r0, r5\n\
+    cmp r0, 0\n\
+    beq _080123F8\n\
+    eors r5, r1\n\
+    adds r0, r5, 0\n\
+    bl GetBankByIdentity\n\
+    ldr r2, _08012444 @ =0x000160a6\n\
+    adds r1, r4, r2\n\
+    ldrb r1, [r1]\n\
+    ldr r2, _08012448 @ =gBitTable\n\
+    lsls r0, 24\n\
+    lsrs r0, 22\n\
+    adds r0, r2\n\
+    ldr r0, [r0]\n\
+    ands r1, r0\n\
+    cmp r1, 0\n\
+    bne _080123F8\n\
+    ldr r4, _0801244C @ =gBattleCommunication\n\
+    adds r0, r5, 0\n\
+    bl GetBankByIdentity\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r0, r4\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x4\n\
+    beq _080123F8\n\
+    bl _08012F66\n\
+_080123F8:\n\
+    ldr r0, _08012434 @ =gSharedMem\n\
+    ldr r3, _08012444 @ =0x000160a6\n\
+    adds r0, r3\n\
+    ldrb r3, [r0]\n\
+    ldr r1, _08012448 @ =gBitTable\n\
+    ldr r4, _08012438 @ =gActiveBank\n\
+    ldrb r2, [r4]\n\
+    lsls r0, r2, 2\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    ands r3, r0\n\
+    cmp r3, 0\n\
+    beq _08012468\n\
+    ldr r0, _08012450 @ =gActionForBanks\n\
+    adds r0, r2, r0\n\
+    movs r1, 0xD\n\
+    strb r1, [r0]\n\
+    ldr r0, _08012440 @ =gBattleTypeFlags\n\
+    ldrh r1, [r0]\n\
+    movs r0, 0x40\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08012454\n\
+    ldr r0, _0801244C @ =gBattleCommunication\n\
+    ldrb r1, [r4]\n\
+    adds r1, r0\n\
+    movs r0, 0x4\n\
+    strb r0, [r1]\n\
+    bl _08012F66\n\
+    .align 2, 0\n\
+_08012434: .4byte gSharedMem\n\
+_08012438: .4byte gActiveBank\n\
+_0801243C: .4byte 0x00016068\n\
+_08012440: .4byte gBattleTypeFlags\n\
+_08012444: .4byte 0x000160a6\n\
+_08012448: .4byte gBitTable\n\
+_0801244C: .4byte gBattleCommunication\n\
+_08012450: .4byte gActionForBanks\n\
+_08012454:\n\
+    ldr r0, _08012464 @ =gBattleCommunication\n\
+    ldrb r1, [r4]\n\
+    adds r1, r0\n\
+    movs r0, 0x3\n\
+    strb r0, [r1]\n\
+    bl _08012F66\n\
+    .align 2, 0\n\
+_08012464: .4byte gBattleCommunication\n\
+_08012468:\n\
+    ldr r1, _0801249C @ =gBattleMons\n\
+    movs r0, 0x58\n\
+    muls r0, r2\n\
+    adds r1, 0x50\n\
+    adds r0, r1\n\
+    ldr r1, [r0]\n\
+    movs r0, 0x80\n\
+    lsls r0, 5\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08012488\n\
+    movs r0, 0x80\n\
+    lsls r0, 15\n\
+    ands r1, r0\n\
+    cmp r1, 0\n\
+    beq _080124A8\n\
+_08012488:\n\
+    ldr r0, _080124A0 @ =gActionForBanks\n\
+    adds r0, r2, r0\n\
+    strb r3, [r0]\n\
+    ldr r1, _080124A4 @ =gBattleCommunication\n\
+    ldrb r0, [r4]\n\
+    adds r0, r1\n\
+    movs r1, 0x3\n\
+    strb r1, [r0]\n\
+    bl _08012F66\n\
+    .align 2, 0\n\
+_0801249C: .4byte gBattleMons\n\
+_080124A0: .4byte gActionForBanks\n\
+_080124A4: .4byte gBattleCommunication\n\
+_080124A8:\n\
+    ldr r0, _080124C0 @ =gActionForBanks\n\
+    ldrb r1, [r0]\n\
+    ldr r0, _080124C4 @ =gBattleBufferB\n\
+    ldrb r2, [r0, 0x1]\n\
+    ldrb r0, [r0, 0x2]\n\
+    lsls r0, 8\n\
+    orrs r2, r0\n\
+    movs r0, 0\n\
+    bl Emitcmd18\n\
+    bl _08012E32\n\
+    .align 2, 0\n\
+_080124C0: .4byte gActionForBanks\n\
+_080124C4: .4byte gBattleBufferB\n\
+_080124C8:\n\
+    ldr r4, _08012520 @ =gBattleExecBuffer\n\
+    ldr r1, _08012524 @ =gBitTable\n\
+    ldr r3, _08012528 @ =gActiveBank\n\
+    ldrb r5, [r3]\n\
+    lsls r0, r5, 2\n\
+    adds r0, r1\n\
+    ldr r2, [r0]\n\
+    lsls r0, r2, 4\n\
+    movs r1, 0xF0\n\
+    lsls r1, 24\n\
+    orrs r0, r1\n\
+    orrs r0, r2\n\
+    lsls r1, r2, 8\n\
+    orrs r0, r1\n\
+    lsls r2, 12\n\
+    orrs r0, r2\n\
+    ldr r1, [r4]\n\
+    ands r1, r0\n\
+    mov r8, r3\n\
+    cmp r1, 0\n\
+    beq _080124F6\n\
+    bl _08012F66\n\
+_080124F6:\n\
+    ldr r2, _0801252C @ =gActionForBanks\n\
+    adds r2, r5, r2\n\
+    ldr r1, _08012530 @ =gBattleBufferB\n\
+    lsls r0, r5, 9\n\
+    adds r1, 0x1\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r2]\n\
+    ldrb r0, [r3]\n\
+    lsls r0, 9\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0xC\n\
+    bls _08012514\n\
+    b _08012968\n\
+_08012514:\n\
+    lsls r0, 2\n\
+    ldr r1, _08012534 @ =_08012538\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_08012520: .4byte gBattleExecBuffer\n\
+_08012524: .4byte gBitTable\n\
+_08012528: .4byte gActiveBank\n\
+_0801252C: .4byte gActionForBanks\n\
+_08012530: .4byte gBattleBufferB\n\
+_08012534: .4byte _08012538\n\
+    .align 2, 0\n\
+_08012538:\n\
+    .4byte _0801256C\n\
+    .4byte _080126B4\n\
+    .4byte _080126E0\n\
+    .4byte _08012968\n\
+    .4byte _08012968\n\
+    .4byte _080128B0\n\
+    .4byte _08012908\n\
+    .4byte _08012968\n\
+    .4byte _08012968\n\
+    .4byte _08012968\n\
+    .4byte _08012968\n\
+    .4byte _08012968\n\
+    .4byte _0801292C\n\
+_0801256C:\n\
+    bl AreAllMovesUnusable\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080125D0\n\
+    ldr r0, _080125B4 @ =gBattleCommunication\n\
+    ldr r2, _080125B8 @ =gActiveBank\n\
+    ldrb r1, [r2]\n\
+    adds r1, r0\n\
+    movs r4, 0\n\
+    movs r0, 0x5\n\
+    strb r0, [r1]\n\
+    ldr r3, _080125BC @ =gSharedMem\n\
+    ldrb r0, [r2]\n\
+    ldr r1, _080125C0 @ =0x00016060\n\
+    adds r0, r1\n\
+    adds r0, r3\n\
+    strb r4, [r0]\n\
+    ldrb r0, [r2]\n\
+    ldr r4, _080125C4 @ =0x00016094\n\
+    adds r0, r4\n\
+    adds r0, r3\n\
+    movs r1, 0x3\n\
+    strb r1, [r0]\n\
+    ldrb r1, [r2]\n\
+    ldr r0, _080125C8 @ =0x00016010\n\
+    adds r2, r1, r0\n\
+    adds r2, r3\n\
+    ldr r0, _080125CC @ =gBattleBufferB\n\
+    lsls r1, 9\n\
+    adds r0, 0x3\n\
+    adds r1, r0\n\
+    ldrb r0, [r1]\n\
+    strb r0, [r2]\n\
+    bl _08012F90\n\
+    .align 2, 0\n\
+_080125B4: .4byte gBattleCommunication\n\
+_080125B8: .4byte gActiveBank\n\
+_080125BC: .4byte gSharedMem\n\
+_080125C0: .4byte 0x00016060\n\
+_080125C4: .4byte 0x00016094\n\
+_080125C8: .4byte 0x00016010\n\
+_080125CC: .4byte gBattleBufferB\n\
+_080125D0:\n\
+    ldr r1, _080125FC @ =gDisableStructs\n\
+    ldr r5, _08012600 @ =gActiveBank\n\
+    ldrb r4, [r5]\n\
+    lsls r0, r4, 3\n\
+    subs r0, r4\n\
+    lsls r0, 2\n\
+    adds r0, r1\n\
+    ldrh r2, [r0, 0x6]\n\
+    cmp r2, 0\n\
+    beq _0801260C\n\
+    ldr r1, _08012604 @ =gChosenMovesByBanks\n\
+    lsls r0, r4, 1\n\
+    adds r0, r1\n\
+    strh r2, [r0]\n\
+    ldr r1, _08012608 @ =gBattleCommunication\n\
+    ldrb r0, [r5]\n\
+    adds r0, r1\n\
+    movs r1, 0x3\n\
+    strb r1, [r0]\n\
+    bl _08012F90\n\
+    .align 2, 0\n\
+_080125FC: .4byte gDisableStructs\n\
+_08012600: .4byte gActiveBank\n\
+_08012604: .4byte gChosenMovesByBanks\n\
+_08012608: .4byte gBattleCommunication\n\
+_0801260C:\n\
+    add r2, sp, 0x4\n\
+    ldr r3, _080126AC @ =gBattleMons\n\
+    movs r1, 0x58\n\
+    adds r0, r4, 0\n\
+    muls r0, r1\n\
+    adds r0, r3\n\
+    ldrh r0, [r0]\n\
+    strh r0, [r2, 0x10]\n\
+    ldrb r0, [r5]\n\
+    muls r0, r1\n\
+    adds r0, r3\n\
+    adds r0, 0x21\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r2, 0x12]\n\
+    ldrb r0, [r5]\n\
+    muls r0, r1\n\
+    adds r0, r3\n\
+    adds r0, 0x22\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r2, 0x13]\n\
+    movs r4, 0\n\
+    mov r1, sp\n\
+    adds r1, 0xC\n\
+    str r1, [sp, 0x18]\n\
+    add r2, sp, 0x10\n\
+    mov r10, r2\n\
+    mov r8, r3\n\
+    adds r7, r5, 0\n\
+    movs r6, 0x58\n\
+    movs r3, 0xC\n\
+    add r3, r8\n\
+    mov r9, r3\n\
+    add r5, sp, 0x4\n\
+_0801264E:\n\
+    lsls r2, r4, 1\n\
+    ldrb r0, [r7]\n\
+    muls r0, r6\n\
+    adds r0, r2, r0\n\
+    add r0, r9\n\
+    ldrh r0, [r0]\n\
+    strh r0, [r5]\n\
+    ldr r0, [sp, 0x18]\n\
+    adds r3, r0, r4\n\
+    ldrb r0, [r7]\n\
+    muls r0, r6\n\
+    adds r0, r4, r0\n\
+    mov r1, r8\n\
+    adds r1, 0x24\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r3]\n\
+    ldrb r0, [r7]\n\
+    adds r1, r0, 0\n\
+    muls r1, r6\n\
+    adds r2, r1\n\
+    add r2, r9\n\
+    ldrh r0, [r2]\n\
+    add r1, r8\n\
+    adds r1, 0x3B\n\
+    ldrb r1, [r1]\n\
+    lsls r2, r4, 24\n\
+    lsrs r2, 24\n\
+    bl CalculatePPWithBonus\n\
+    mov r2, r10\n\
+    adds r1, r2, r4\n\
+    strb r0, [r1]\n\
+    adds r5, 0x2\n\
+    adds r4, 0x1\n\
+    cmp r4, 0x3\n\
+    ble _0801264E\n\
+    ldr r0, _080126B0 @ =gBattleTypeFlags\n\
+    ldrb r0, [r0]\n\
+    movs r1, 0x1\n\
+    ands r1, r0\n\
+    movs r0, 0\n\
+    movs r2, 0\n\
+    add r3, sp, 0x4\n\
+    bl Emitcmd20\n\
+    b _0801289E\n\
+    .align 2, 0\n\
+_080126AC: .4byte gBattleMons\n\
+_080126B0: .4byte gBattleTypeFlags\n\
+_080126B4:\n\
+    ldr r0, _080126D0 @ =gBattleTypeFlags\n\
+    ldrh r1, [r0]\n\
+    ldr r0, _080126D4 @ =0x00000902\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _080126C2\n\
+    b _08012908\n\
+_080126C2:\n\
+    ldr r1, _080126D8 @ =gUnknown_02024C1C\n\
+    mov r3, r8\n\
+    ldrb r0, [r3]\n\
+    lsls r0, 2\n\
+    adds r0, r1\n\
+    ldr r1, _080126DC @ =BattleScript_ActionSelectionItemsCantBeUsed\n\
+    b _080129CC\n\
+    .align 2, 0\n\
+_080126D0: .4byte gBattleTypeFlags\n\
+_080126D4: .4byte 0x00000902\n\
+_080126D8: .4byte gUnknown_02024C1C\n\
+_080126DC: .4byte BattleScript_ActionSelectionItemsCantBeUsed\n\
+_080126E0:\n\
+    ldr r3, _08012738 @ =gSharedMem\n\
+    ldr r5, _0801273C @ =gActiveBank\n\
+    ldrb r0, [r5]\n\
+    ldr r4, _08012740 @ =0x00016064\n\
+    adds r1, r0, r4\n\
+    adds r1, r3\n\
+    ldr r2, _08012744 @ =gBattlePartyID\n\
+    lsls r0, 1\n\
+    adds r0, r2\n\
+    ldrh r0, [r0]\n\
+    strb r0, [r1]\n\
+    ldr r7, _08012748 @ =gBattleMons\n\
+    ldrb r2, [r5]\n\
+    movs r6, 0x58\n\
+    adds r0, r2, 0\n\
+    muls r0, r6\n\
+    adds r1, r7, 0\n\
+    adds r1, 0x50\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    ldr r1, _0801274C @ =0x0400e000\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08012722\n\
+    ldr r0, _08012750 @ =gStatuses3\n\
+    lsls r1, r2, 2\n\
+    adds r1, r0\n\
+    ldr r1, [r1]\n\
+    movs r0, 0x80\n\
+    lsls r0, 3\n\
+    ands r1, r0\n\
+    cmp r1, 0\n\
+    beq _08012758\n\
+_08012722:\n\
+    lsls r0, r2, 1\n\
+    adds r0, r2\n\
+    ldr r2, _08012754 @ =0x0001606c\n\
+    adds r1, r3, r2\n\
+    adds r0, r1\n\
+    str r0, [sp]\n\
+    movs r0, 0\n\
+    movs r1, 0x2\n\
+    movs r2, 0x6\n\
+    b _0801286C\n\
+    .align 2, 0\n\
+_08012738: .4byte gSharedMem\n\
+_0801273C: .4byte gActiveBank\n\
+_08012740: .4byte 0x00016064\n\
+_08012744: .4byte gBattlePartyID\n\
+_08012748: .4byte gBattleMons\n\
+_0801274C: .4byte 0x0400e000\n\
+_08012750: .4byte gStatuses3\n\
+_08012754: .4byte 0x0001606c\n\
+_08012758:\n\
+    str r1, [sp]\n\
+    movs r0, 0xC\n\
+    adds r1, r2, 0\n\
+    movs r2, 0x17\n\
+    movs r3, 0\n\
+    bl AbilityBattleEffects\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    cmp r4, 0\n\
+    bne _080127E0\n\
+    ldrb r1, [r5]\n\
+    str r4, [sp]\n\
+    movs r0, 0xC\n\
+    movs r2, 0x47\n\
+    movs r3, 0\n\
+    bl AbilityBattleEffects\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    cmp r4, 0\n\
+    beq _080127A8\n\
+    ldrb r0, [r5]\n\
+    muls r0, r6\n\
+    adds r1, r0, r7\n\
+    adds r0, r1, 0\n\
+    adds r0, 0x21\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x2\n\
+    beq _080127A8\n\
+    adds r0, r1, 0\n\
+    adds r0, 0x22\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x2\n\
+    beq _080127A8\n\
+    adds r0, r1, 0\n\
+    adds r0, 0x20\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x1A\n\
+    bne _080127E0\n\
+_080127A8:\n\
+    ldr r5, _08012808 @ =gActiveBank\n\
+    ldrb r1, [r5]\n\
+    movs r0, 0\n\
+    str r0, [sp]\n\
+    movs r0, 0xF\n\
+    movs r2, 0x2A\n\
+    movs r3, 0\n\
+    bl AbilityBattleEffects\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    cmp r4, 0\n\
+    beq _08012818\n\
+    ldr r2, _0801280C @ =gBattleMons\n\
+    ldrb r1, [r5]\n\
+    movs r0, 0x58\n\
+    muls r0, r1\n\
+    adds r1, r0, r2\n\
+    adds r0, r1, 0\n\
+    adds r0, 0x21\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x8\n\
+    beq _080127E0\n\
+    adds r0, r1, 0\n\
+    adds r0, 0x22\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x8\n\
+    bne _08012818\n\
+_080127E0:\n\
+    subs r1, r4, 0x1\n\
+    lsls r1, 4\n\
+    movs r0, 0x4\n\
+    orrs r1, r0\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    ldr r0, _08012810 @ =gLastUsedAbility\n\
+    ldrb r3, [r0]\n\
+    ldr r0, _08012808 @ =gActiveBank\n\
+    ldrb r2, [r0]\n\
+    lsls r0, r2, 1\n\
+    adds r0, r2\n\
+    ldr r2, _08012814 @ =gSharedMem + 0x1606C\n\
+    adds r0, r2\n\
+    str r0, [sp]\n\
+    movs r0, 0\n\
+    movs r2, 0x6\n\
+    bl EmitChoosePokemon\n\
+    b _0801289E\n\
+    .align 2, 0\n\
+_08012808: .4byte gActiveBank\n\
+_0801280C: .4byte gBattleMons\n\
+_08012810: .4byte gLastUsedAbility\n\
+_08012814: .4byte gSharedMem + 0x1606C\n\
+_08012818:\n\
+    ldr r0, _08012830 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    mov r8, r0\n\
+    cmp r1, 0x2\n\
+    bne _08012840\n\
+    ldr r0, _08012834 @ =gActionForBanks\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x2\n\
+    bne _08012840\n\
+    ldr r3, _08012838 @ =gSharedMem\n\
+    ldr r4, _0801283C @ =0x00016068\n\
+    b _08012854\n\
+    .align 2, 0\n\
+_08012830: .4byte gActiveBank\n\
+_08012834: .4byte gActionForBanks\n\
+_08012838: .4byte gSharedMem\n\
+_0801283C: .4byte 0x00016068\n\
+_08012840:\n\
+    mov r2, r8\n\
+    ldrb r0, [r2]\n\
+    cmp r0, 0x3\n\
+    bne _08012884\n\
+    ldr r0, _08012874 @ =gActionForBanks\n\
+    ldrb r0, [r0, 0x1]\n\
+    cmp r0, 0x2\n\
+    bne _08012884\n\
+    ldr r3, _08012878 @ =gSharedMem\n\
+    ldr r4, _0801287C @ =0x00016069\n\
+_08012854:\n\
+    adds r0, r3, r4\n\
+    ldrb r2, [r0]\n\
+    mov r0, r8\n\
+    ldrb r1, [r0]\n\
+    lsls r0, r1, 1\n\
+    adds r0, r1\n\
+    ldr r1, _08012880 @ =0x0001606c\n\
+    adds r3, r1\n\
+    adds r0, r3\n\
+    str r0, [sp]\n\
+    movs r0, 0\n\
+    movs r1, 0\n\
+_0801286C:\n\
+    movs r3, 0\n\
+    bl EmitChoosePokemon\n\
+    b _0801289E\n\
+    .align 2, 0\n\
+_08012874: .4byte gActionForBanks\n\
+_08012878: .4byte gSharedMem\n\
+_0801287C: .4byte 0x00016069\n\
+_08012880: .4byte 0x0001606c\n\
+_08012884:\n\
+    ldr r0, _080128A8 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    lsls r0, r1, 1\n\
+    adds r0, r1\n\
+    ldr r1, _080128AC @ =gSharedMem + 0x1606C\n\
+    adds r0, r1\n\
+    str r0, [sp]\n\
+    movs r0, 0\n\
+    movs r1, 0\n\
+    movs r2, 0x6\n\
+    movs r3, 0\n\
+    bl EmitChoosePokemon\n\
+_0801289E:\n\
+    ldr r0, _080128A8 @ =gActiveBank\n\
+    ldrb r0, [r0]\n\
+    bl MarkBufferBankForExecution\n\
+    b _08012968\n\
+    .align 2, 0\n\
+_080128A8: .4byte gActiveBank\n\
+_080128AC: .4byte gSharedMem + 0x1606C\n\
+_080128B0:\n\
+    bl PlayerPartyAndPokemonStorageFull\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _08012968\n\
+    ldr r1, _080128EC @ =gUnknown_02024C1C\n\
+    ldr r2, _080128F0 @ =gActiveBank\n\
+    ldrb r0, [r2]\n\
+    lsls r0, 2\n\
+    adds r0, r1\n\
+    ldr r1, _080128F4 @ =BattleScript_PrintFullBox\n\
+    str r1, [r0]\n\
+    ldr r0, _080128F8 @ =gBattleCommunication\n\
+    ldrb r1, [r2]\n\
+    adds r1, r0\n\
+    movs r3, 0\n\
+    movs r0, 0x5\n\
+    strb r0, [r1]\n\
+    ldr r1, _080128FC @ =gSharedMem\n\
+    ldrb r0, [r2]\n\
+    ldr r4, _08012900 @ =0x00016060\n\
+    adds r0, r4\n\
+    adds r0, r1\n\
+    strb r3, [r0]\n\
+    ldrb r0, [r2]\n\
+    ldr r2, _08012904 @ =0x00016094\n\
+    adds r0, r2\n\
+    adds r0, r1\n\
+    strb r3, [r0]\n\
+    b _08012F90\n\
+    .align 2, 0\n\
+_080128EC: .4byte gUnknown_02024C1C\n\
+_080128F0: .4byte gActiveBank\n\
+_080128F4: .4byte BattleScript_PrintFullBox\n\
+_080128F8: .4byte gBattleCommunication\n\
+_080128FC: .4byte gSharedMem\n\
+_08012900: .4byte 0x00016060\n\
+_08012904: .4byte 0x00016094\n\
+_08012908:\n\
+    ldr r4, _08012924 @ =gActiveBank\n\
+    ldrb r0, [r4]\n\
+    lsls r1, r0, 1\n\
+    adds r1, r0\n\
+    ldr r0, _08012928 @ =gSharedMem + 0x1606C\n\
+    adds r1, r0\n\
+    movs r0, 0\n\
+    bl EmitOpenBag\n\
+    ldrb r0, [r4]\n\
+    bl MarkBufferBankForExecution\n\
+    b _08012968\n\
+    .align 2, 0\n\
+_08012924: .4byte gActiveBank\n\
+_08012928: .4byte gSharedMem + 0x1606C\n\
+_0801292C:\n\
+    ldr r4, _08012964 @ =gBattleCommunication\n\
+    mov r3, r8\n\
+    ldrb r1, [r3]\n\
+    adds r1, r4\n\
+    movs r5, 0\n\
+    movs r0, 0x6\n\
+    strb r0, [r1]\n\
+    ldrb r0, [r3]\n\
+    bl GetBankIdentity\n\
+    movs r1, 0x2\n\
+    eors r0, r1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    bl GetBankByIdentity\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r0, r4\n\
+    strb r5, [r0]\n\
+    movs r0, 0\n\
+    bl Emitcmd50\n\
+    mov r4, r8\n\
+    ldrb r0, [r4]\n\
+    bl MarkBufferBankForExecution\n\
+    b _08012F90\n\
+    .align 2, 0\n\
+_08012964: .4byte gBattleCommunication\n\
+_08012968:\n\
+    ldr r0, _08012994 @ =gBattleTypeFlags\n\
+    ldrh r1, [r0]\n\
+    movs r0, 0xA\n\
+    ands r0, r1\n\
+    cmp r0, 0x8\n\
+    bne _080129A8\n\
+    ldr r0, _08012998 @ =gBattleBufferB\n\
+    ldr r4, _0801299C @ =gActiveBank\n\
+    ldrb r1, [r4]\n\
+    lsls r1, 9\n\
+    adds r0, 0x1\n\
+    adds r1, r0\n\
+    ldrb r0, [r1]\n\
+    cmp r0, 0x3\n\
+    bne _080129A8\n\
+    ldr r0, _080129A0 @ =BattleScript_PrintCantRunFromTrainer\n\
+    bl BattleScriptExecute\n\
+    ldr r1, _080129A4 @ =gBattleCommunication\n\
+    ldrb r0, [r4]\n\
+    adds r0, r1\n\
+    b _08012BFE\n\
+    .align 2, 0\n\
+_08012994: .4byte gBattleTypeFlags\n\
+_08012998: .4byte gBattleBufferB\n\
+_0801299C: .4byte gActiveBank\n\
+_080129A0: .4byte BattleScript_PrintCantRunFromTrainer\n\
+_080129A4: .4byte gBattleCommunication\n\
+_080129A8:\n\
+    bl CanRunFromBattle\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _08012A14\n\
+    ldr r0, _080129F4 @ =gBattleBufferB\n\
+    ldr r3, _080129F8 @ =gActiveBank\n\
+    ldrb r2, [r3]\n\
+    lsls r1, r2, 9\n\
+    adds r0, 0x1\n\
+    adds r1, r0\n\
+    ldrb r0, [r1]\n\
+    cmp r0, 0x3\n\
+    bne _08012A14\n\
+    ldr r1, _080129FC @ =gUnknown_02024C1C\n\
+    lsls r0, r2, 2\n\
+    adds r0, r1\n\
+    ldr r1, _08012A00 @ =BattleScript_PrintCantEscapeFromBattle\n\
+_080129CC:\n\
+    str r1, [r0]\n\
+    ldr r0, _08012A04 @ =gBattleCommunication\n\
+    ldrb r1, [r3]\n\
+    adds r1, r0\n\
+    movs r2, 0\n\
+    movs r0, 0x5\n\
+    strb r0, [r1]\n\
+    ldr r1, _08012A08 @ =gSharedMem\n\
+    ldrb r0, [r3]\n\
+    ldr r4, _08012A0C @ =0x00016060\n\
+    adds r0, r4\n\
+    adds r0, r1\n\
+    strb r2, [r0]\n\
+    ldrb r0, [r3]\n\
+    ldr r3, _08012A10 @ =0x00016094\n\
+    adds r0, r3\n\
+    adds r0, r1\n\
+    strb r2, [r0]\n\
+    b _08012F90\n\
+    .align 2, 0\n\
+_080129F4: .4byte gBattleBufferB\n\
+_080129F8: .4byte gActiveBank\n\
+_080129FC: .4byte gUnknown_02024C1C\n\
+_08012A00: .4byte BattleScript_PrintCantEscapeFromBattle\n\
+_08012A04: .4byte gBattleCommunication\n\
+_08012A08: .4byte gSharedMem\n\
+_08012A0C: .4byte 0x00016060\n\
+_08012A10: .4byte 0x00016094\n\
+_08012A14:\n\
+    ldr r2, _08012A20 @ =gBattleCommunication\n\
+    ldr r0, _08012A24 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    adds r1, r2\n\
+    b _08012E3E\n\
+    .align 2, 0\n\
+_08012A20: .4byte gBattleCommunication\n\
+_08012A24: .4byte gActiveBank\n\
+_08012A28:\n\
+    ldr r4, _08012A6C @ =gBattleExecBuffer\n\
+    ldr r1, _08012A70 @ =gBitTable\n\
+    ldr r3, _08012A74 @ =gActiveBank\n\
+    ldrb r5, [r3]\n\
+    lsls r0, r5, 2\n\
+    adds r0, r1\n\
+    ldr r2, [r0]\n\
+    lsls r0, r2, 4\n\
+    movs r1, 0xF0\n\
+    lsls r1, 24\n\
+    orrs r0, r1\n\
+    orrs r0, r2\n\
+    lsls r1, r2, 8\n\
+    orrs r0, r1\n\
+    lsls r2, 12\n\
+    orrs r0, r2\n\
+    ldr r1, [r4]\n\
+    ands r1, r0\n\
+    mov r8, r3\n\
+    cmp r1, 0\n\
+    beq _08012A54\n\
+    b _08012F66\n\
+_08012A54:\n\
+    ldr r1, _08012A78 @ =gActionForBanks\n\
+    adds r0, r5, r1\n\
+    ldrb r0, [r0]\n\
+    adds r3, r1, 0\n\
+    cmp r0, 0x9\n\
+    bls _08012A62\n\
+    b _08012F66\n\
+_08012A62:\n\
+    lsls r0, 2\n\
+    ldr r1, _08012A7C @ =_08012A80\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_08012A6C: .4byte gBattleExecBuffer\n\
+_08012A70: .4byte gBitTable\n\
+_08012A74: .4byte gActiveBank\n\
+_08012A78: .4byte gActionForBanks\n\
+_08012A7C: .4byte _08012A80\n\
+    .align 2, 0\n\
+_08012A80:\n\
+    .4byte _08012AA8\n\
+    .4byte _08012BB0\n\
+    .4byte _08012BE8\n\
+    .4byte _08012CE0\n\
+    .4byte _08012D04\n\
+    .4byte _08012D18\n\
+    .4byte _08012D2C\n\
+    .4byte _08012D5C\n\
+    .4byte _08012D70\n\
+    .4byte _08012D94\n\
+_08012AA8:\n\
+    ldr r0, _08012AC8 @ =gBattleBufferB\n\
+    mov r1, r8\n\
+    ldrb r4, [r1]\n\
+    lsls r1, r4, 9\n\
+    adds r2, r0, 0x1\n\
+    adds r1, r2\n\
+    ldrb r1, [r1]\n\
+    adds r6, r0, 0\n\
+    cmp r1, 0x9\n\
+    bgt _08012ACC\n\
+    cmp r1, 0x3\n\
+    blt _08012ACC\n\
+    adds r0, r4, r3\n\
+    strb r1, [r0]\n\
+    b _08012F90\n\
+    .align 2, 0\n\
+_08012AC8: .4byte gBattleBufferB\n\
+_08012ACC:\n\
+    adds r3, r6, 0\n\
+    mov r5, r8\n\
+    ldrb r4, [r5]\n\
+    lsls r1, r4, 9\n\
+    adds r7, r3, 0x2\n\
+    adds r0, r1, r7\n\
+    ldrb r2, [r0]\n\
+    adds r3, 0x3\n\
+    mov r9, r3\n\
+    add r1, r9\n\
+    ldrb r0, [r1]\n\
+    lsls r0, 8\n\
+    orrs r2, r0\n\
+    ldr r0, _08012AF4 @ =0x0000ffff\n\
+    cmp r2, r0\n\
+    bne _08012AFC\n\
+    ldr r0, _08012AF8 @ =gBattleCommunication\n\
+    adds r0, r4, r0\n\
+    b _08012BFE\n\
+    .align 2, 0\n\
+_08012AF4: .4byte 0x0000ffff\n\
+_08012AF8: .4byte gBattleCommunication\n\
+_08012AFC:\n\
+    bl TrySetCantSelectMoveBattleScript\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _08012B48\n\
+    ldr r0, _08012B38 @ =gBattleCommunication\n\
+    ldrb r1, [r5]\n\
+    adds r1, r0\n\
+    movs r2, 0\n\
+    movs r0, 0x5\n\
+    strb r0, [r1]\n\
+    ldr r3, _08012B3C @ =gSharedMem\n\
+    ldrb r0, [r5]\n\
+    ldr r4, _08012B40 @ =0x00016060\n\
+    adds r0, r4\n\
+    adds r0, r3\n\
+    strb r2, [r0]\n\
+    ldrb r0, [r5]\n\
+    lsls r0, 9\n\
+    adds r1, r6, 0x1\n\
+    adds r0, r1\n\
+    strb r2, [r0]\n\
+    ldrb r0, [r5]\n\
+    ldr r1, _08012B44 @ =0x00016094\n\
+    adds r0, r1\n\
+    adds r0, r3\n\
+    movs r1, 0x1\n\
+    strb r1, [r0]\n\
+    b _08012F90\n\
+    .align 2, 0\n\
+_08012B38: .4byte gBattleCommunication\n\
+_08012B3C: .4byte gSharedMem\n\
+_08012B40: .4byte 0x00016060\n\
+_08012B44: .4byte 0x00016094\n\
+_08012B48:\n\
+    ldr r6, _08012B98 @ =gSharedMem\n\
+    mov r2, r8\n\
+    ldrb r0, [r2]\n\
+    ldr r2, _08012B9C @ =0x0001608c\n\
+    adds r1, r0, r2\n\
+    adds r1, r6\n\
+    lsls r0, 9\n\
+    adds r0, r7\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r1]\n\
+    ldr r0, _08012BA0 @ =gChosenMovesByBanks\n\
+    mov r4, r8\n\
+    ldrb r3, [r4]\n\
+    lsls r5, r3, 1\n\
+    adds r5, r0\n\
+    ldr r4, _08012BA4 @ =gBattleMons\n\
+    adds r2, r3, r2\n\
+    adds r2, r6\n\
+    ldrb r0, [r2]\n\
+    lsls r0, 1\n\
+    movs r1, 0x58\n\
+    muls r1, r3\n\
+    adds r0, r1\n\
+    adds r4, 0xC\n\
+    adds r0, r4\n\
+    ldrh r0, [r0]\n\
+    strh r0, [r5]\n\
+    mov r1, r8\n\
+    ldrb r0, [r1]\n\
+    ldr r2, _08012BA8 @ =0x00016010\n\
+    adds r1, r0, r2\n\
+    adds r1, r6\n\
+    lsls r0, 9\n\
+    add r0, r9\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r1]\n\
+    ldr r0, _08012BAC @ =gBattleCommunication\n\
+    mov r3, r8\n\
+    ldrb r1, [r3]\n\
+    b _08012E3C\n\
+    .align 2, 0\n\
+_08012B98: .4byte gSharedMem\n\
+_08012B9C: .4byte 0x0001608c\n\
+_08012BA0: .4byte gChosenMovesByBanks\n\
+_08012BA4: .4byte gBattleMons\n\
+_08012BA8: .4byte 0x00016010\n\
+_08012BAC: .4byte gBattleCommunication\n\
+_08012BB0:\n\
+    ldr r2, _08012BD8 @ =gBattleBufferB\n\
+    ldr r5, _08012BDC @ =gActiveBank\n\
+    ldrb r4, [r5]\n\
+    lsls r1, r4, 9\n\
+    adds r0, r2, 0x1\n\
+    adds r0, r1, r0\n\
+    ldrb r3, [r0]\n\
+    adds r2, 0x2\n\
+    adds r1, r2\n\
+    ldrb r0, [r1]\n\
+    lsls r0, 8\n\
+    orrs r3, r0\n\
+    cmp r3, 0\n\
+    bne _08012BCE\n\
+    b _08012F60\n\
+_08012BCE:\n\
+    ldr r0, _08012BE0 @ =gLastUsedItem\n\
+    strh r3, [r0]\n\
+    ldr r0, _08012BE4 @ =gBattleCommunication\n\
+    ldrb r1, [r5]\n\
+    b _08012E3C\n\
+    .align 2, 0\n\
+_08012BD8: .4byte gBattleBufferB\n\
+_08012BDC: .4byte gActiveBank\n\
+_08012BE0: .4byte gLastUsedItem\n\
+_08012BE4: .4byte gBattleCommunication\n\
+_08012BE8:\n\
+    ldr r4, _08012C04 @ =gBattleBufferB\n\
+    ldr r7, _08012C08 @ =gActiveBank\n\
+    ldrb r2, [r7]\n\
+    lsls r0, r2, 9\n\
+    adds r1, r4, 0x1\n\
+    adds r0, r1\n\
+    ldrb r1, [r0]\n\
+    cmp r1, 0x6\n\
+    bne _08012C10\n\
+    ldr r0, _08012C0C @ =gBattleCommunication\n\
+    adds r0, r2, r0\n\
+_08012BFE:\n\
+    movs r1, 0\n\
+    strb r1, [r0]\n\
+    b _08012F66\n\
+    .align 2, 0\n\
+_08012C04: .4byte gBattleBufferB\n\
+_08012C08: .4byte gActiveBank\n\
+_08012C0C: .4byte gBattleCommunication\n\
+_08012C10:\n\
+    ldr r0, _08012CC4 @ =gSharedMem\n\
+    mov r12, r0\n\
+    ldr r3, _08012CC8 @ =0x00016068\n\
+    adds r0, r2, r3\n\
+    add r0, r12\n\
+    strb r1, [r0]\n\
+    ldr r0, _08012CCC @ =gBattleTypeFlags\n\
+    ldrh r1, [r0]\n\
+    movs r0, 0x40\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08012CBE\n\
+    ldrb r0, [r7]\n\
+    lsls r1, r0, 1\n\
+    adds r1, r0\n\
+    ldr r5, _08012CD0 @ =0x0001606c\n\
+    adds r1, r5\n\
+    add r1, r12\n\
+    ldrb r2, [r1]\n\
+    movs r0, 0xF\n\
+    ands r0, r2\n\
+    strb r0, [r1]\n\
+    ldrb r0, [r7]\n\
+    lsls r2, r0, 1\n\
+    adds r2, r0\n\
+    adds r2, r5\n\
+    add r2, r12\n\
+    lsls r0, 9\n\
+    adds r6, r4, 0x2\n\
+    adds r0, r6\n\
+    ldrb r1, [r0]\n\
+    movs r3, 0xF0\n\
+    adds r0, r3, 0\n\
+    ands r0, r1\n\
+    ldrb r1, [r2]\n\
+    orrs r0, r1\n\
+    strb r0, [r2]\n\
+    ldrb r0, [r7]\n\
+    lsls r1, r0, 1\n\
+    adds r1, r0\n\
+    ldr r2, _08012CD4 @ =0x0001606d\n\
+    adds r1, r2\n\
+    add r1, r12\n\
+    lsls r0, 9\n\
+    adds r4, 0x3\n\
+    mov r8, r4\n\
+    add r0, r8\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r1]\n\
+    ldrb r0, [r7]\n\
+    movs r4, 0x2\n\
+    eors r0, r4\n\
+    lsls r1, r0, 1\n\
+    adds r1, r0\n\
+    adds r1, r5\n\
+    add r1, r12\n\
+    ldrb r2, [r1]\n\
+    adds r0, r3, 0\n\
+    ands r0, r2\n\
+    strb r0, [r1]\n\
+    ldrb r0, [r7]\n\
+    eors r0, r4\n\
+    lsls r1, r0, 1\n\
+    adds r1, r0\n\
+    adds r1, r5\n\
+    add r1, r12\n\
+    ldrb r0, [r7]\n\
+    lsls r0, 9\n\
+    adds r0, r6\n\
+    ldrb r0, [r0]\n\
+    ands r3, r0\n\
+    lsrs r3, 4\n\
+    ldrb r0, [r1]\n\
+    orrs r3, r0\n\
+    strb r3, [r1]\n\
+    ldrb r0, [r7]\n\
+    eors r4, r0\n\
+    lsls r1, r4, 1\n\
+    adds r1, r4\n\
+    ldr r3, _08012CD8 @ =0x0001606e\n\
+    adds r1, r3\n\
+    add r1, r12\n\
+    ldrb r0, [r7]\n\
+    lsls r0, 9\n\
+    add r0, r8\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r1]\n\
+_08012CBE:\n\
+    ldr r0, _08012CDC @ =gBattleCommunication\n\
+    ldrb r1, [r7]\n\
+    b _08012E3C\n\
+    .align 2, 0\n\
+_08012CC4: .4byte gSharedMem\n\
+_08012CC8: .4byte 0x00016068\n\
+_08012CCC: .4byte gBattleTypeFlags\n\
+_08012CD0: .4byte 0x0001606c\n\
+_08012CD4: .4byte 0x0001606d\n\
+_08012CD8: .4byte 0x0001606e\n\
+_08012CDC: .4byte gBattleCommunication\n\
+_08012CE0:\n\
+    ldr r2, _08012CF8 @ =gHitMarker\n\
+    ldr r0, [r2]\n\
+    movs r1, 0x80\n\
+    lsls r1, 8\n\
+    orrs r0, r1\n\
+    str r0, [r2]\n\
+    ldr r2, _08012CFC @ =gBattleCommunication\n\
+    ldr r0, _08012D00 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    adds r1, r2\n\
+    b _08012E3E\n\
+    .align 2, 0\n\
+_08012CF8: .4byte gHitMarker\n\
+_08012CFC: .4byte gBattleCommunication\n\
+_08012D00: .4byte gActiveBank\n\
+_08012D04:\n\
+    ldr r2, _08012D10 @ =gBattleCommunication\n\
+    ldr r0, _08012D14 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    adds r1, r2\n\
+    b _08012E3E\n\
+    .align 2, 0\n\
+_08012D10: .4byte gBattleCommunication\n\
+_08012D14: .4byte gActiveBank\n\
+_08012D18:\n\
+    ldr r2, _08012D24 @ =gBattleCommunication\n\
+    ldr r0, _08012D28 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    adds r1, r2\n\
+    b _08012E3E\n\
+    .align 2, 0\n\
+_08012D24: .4byte gBattleCommunication\n\
+_08012D28: .4byte gActiveBank\n\
+_08012D2C:\n\
+    ldr r2, _08012D50 @ =gBattleBufferB\n\
+    ldr r0, _08012D54 @ =gActiveBank\n\
+    ldrb r4, [r0]\n\
+    lsls r1, r4, 9\n\
+    adds r0, r2, 0x1\n\
+    adds r0, r1, r0\n\
+    ldrb r3, [r0]\n\
+    adds r2, 0x2\n\
+    adds r1, r2\n\
+    ldrb r0, [r1]\n\
+    lsls r0, 8\n\
+    orrs r3, r0\n\
+    cmp r3, 0\n\
+    bne _08012D4A\n\
+    b _08012F60\n\
+_08012D4A:\n\
+    ldr r1, _08012D58 @ =gBattleCommunication\n\
+    adds r1, r4, r1\n\
+    b _08012E3E\n\
+    .align 2, 0\n\
+_08012D50: .4byte gBattleBufferB\n\
+_08012D54: .4byte gActiveBank\n\
+_08012D58: .4byte gBattleCommunication\n\
+_08012D5C:\n\
+    ldr r2, _08012D68 @ =gBattleCommunication\n\
+    ldr r0, _08012D6C @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    adds r1, r2\n\
+    b _08012E3E\n\
+    .align 2, 0\n\
+_08012D68: .4byte gBattleCommunication\n\
+_08012D6C: .4byte gActiveBank\n\
+_08012D70:\n\
+    ldr r2, _08012D88 @ =gHitMarker\n\
+    ldr r0, [r2]\n\
+    movs r1, 0x80\n\
+    lsls r1, 8\n\
+    orrs r0, r1\n\
+    str r0, [r2]\n\
+    ldr r2, _08012D8C @ =gBattleCommunication\n\
+    ldr r0, _08012D90 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    adds r1, r2\n\
+    b _08012E3E\n\
+    .align 2, 0\n\
+_08012D88: .4byte gHitMarker\n\
+_08012D8C: .4byte gBattleCommunication\n\
+_08012D90: .4byte gActiveBank\n\
+_08012D94:\n\
+    ldr r2, _08012DA0 @ =gBattleCommunication\n\
+    ldr r0, _08012DA4 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    adds r1, r2\n\
+    b _08012E3E\n\
+    .align 2, 0\n\
+_08012DA0: .4byte gBattleCommunication\n\
+_08012DA4: .4byte gActiveBank\n\
+_08012DA8:\n\
+    ldr r3, _08012E10 @ =gBattleExecBuffer\n\
+    ldr r4, _08012E14 @ =gBitTable\n\
+    ldr r0, _08012E18 @ =gActiveBank\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 2\n\
+    adds r0, r4\n\
+    ldr r2, [r0]\n\
+    lsls r1, r2, 4\n\
+    movs r0, 0xF0\n\
+    lsls r0, 24\n\
+    orrs r1, r0\n\
+    orrs r1, r2\n\
+    lsls r0, r2, 8\n\
+    orrs r1, r0\n\
+    lsls r2, 12\n\
+    orrs r1, r2\n\
+    ldr r0, [r3]\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08012DD2\n\
+    b _08012F66\n\
+_08012DD2:\n\
+    ldr r0, _08012E1C @ =gBattleTypeFlags\n\
+    ldrh r1, [r0]\n\
+    movs r0, 0x41\n\
+    ands r0, r1\n\
+    cmp r0, 0x1\n\
+    bne _08012E06\n\
+    movs r1, 0x2\n\
+    movs r0, 0x2\n\
+    ands r0, r5\n\
+    cmp r0, 0\n\
+    bne _08012E06\n\
+    adds r0, r5, 0\n\
+    eors r0, r1\n\
+    bl GetBankByIdentity\n\
+    ldr r1, _08012E20 @ =gSharedMem\n\
+    ldr r2, _08012E24 @ =0x000160a6\n\
+    adds r1, r2\n\
+    ldrb r1, [r1]\n\
+    lsls r0, 24\n\
+    lsrs r0, 22\n\
+    adds r0, r4\n\
+    ldr r0, [r0]\n\
+    ands r1, r0\n\
+    cmp r1, 0\n\
+    beq _08012E28\n\
+_08012E06:\n\
+    movs r0, 0\n\
+    movs r1, 0\n\
+    bl EmitLinkStandbyMsg\n\
+    b _08012E30\n\
+    .align 2, 0\n\
+_08012E10: .4byte gBattleExecBuffer\n\
+_08012E14: .4byte gBitTable\n\
+_08012E18: .4byte gActiveBank\n\
+_08012E1C: .4byte gBattleTypeFlags\n\
+_08012E20: .4byte gSharedMem\n\
+_08012E24: .4byte 0x000160a6\n\
+_08012E28:\n\
+    movs r0, 0\n\
+    movs r1, 0x1\n\
+    bl EmitLinkStandbyMsg\n\
+_08012E30:\n\
+    ldr r4, _08012E48 @ =gActiveBank\n\
+_08012E32:\n\
+    ldrb r0, [r4]\n\
+    bl MarkBufferBankForExecution\n\
+    ldr r0, _08012E4C @ =gBattleCommunication\n\
+    ldrb r1, [r4]\n\
+_08012E3C:\n\
+    adds r1, r0\n\
+_08012E3E:\n\
+    ldrb r0, [r1]\n\
+    adds r0, 0x1\n\
+    strb r0, [r1]\n\
+    b _08012F66\n\
+    .align 2, 0\n\
+_08012E48: .4byte gActiveBank\n\
+_08012E4C: .4byte gBattleCommunication\n\
+_08012E50:\n\
+    ldr r3, _08012E84 @ =gBattleExecBuffer\n\
+    ldr r1, _08012E88 @ =gBitTable\n\
+    ldr r0, _08012E8C @ =gActiveBank\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 2\n\
+    adds r0, r1\n\
+    ldr r2, [r0]\n\
+    lsls r1, r2, 4\n\
+    movs r0, 0xF0\n\
+    lsls r0, 24\n\
+    orrs r1, r0\n\
+    orrs r1, r2\n\
+    lsls r0, r2, 8\n\
+    orrs r1, r0\n\
+    lsls r2, 12\n\
+    orrs r1, r2\n\
+    ldr r0, [r3]\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08012F66\n\
+    ldr r1, _08012E90 @ =gBattleCommunication\n\
+    ldrb r0, [r1, 0x4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r1, 0x4]\n\
+    b _08012F66\n\
+    .align 2, 0\n\
+_08012E84: .4byte gBattleExecBuffer\n\
+_08012E88: .4byte gBitTable\n\
+_08012E8C: .4byte gActiveBank\n\
+_08012E90: .4byte gBattleCommunication\n\
+_08012E94:\n\
+    ldr r2, _08012EB8 @ =gSharedMem\n\
+    ldr r5, _08012EBC @ =gActiveBank\n\
+    ldrb r1, [r5]\n\
+    ldr r3, _08012EC0 @ =0x00016060\n\
+    adds r0, r1, r3\n\
+    adds r0, r2\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _08012ECC\n\
+    ldr r0, _08012EC4 @ =gBattleCommunication\n\
+    adds r0, r1, r0\n\
+    ldr r4, _08012EC8 @ =0x00016094\n\
+    adds r1, r4\n\
+    adds r1, r2\n\
+    ldrb r1, [r1]\n\
+    strb r1, [r0]\n\
+    b _08012F66\n\
+    .align 2, 0\n\
+_08012EB8: .4byte gSharedMem\n\
+_08012EBC: .4byte gActiveBank\n\
+_08012EC0: .4byte 0x00016060\n\
+_08012EC4: .4byte gBattleCommunication\n\
+_08012EC8: .4byte 0x00016094\n\
+_08012ECC:\n\
+    ldr r0, _08012F20 @ =gBankAttacker\n\
+    strb r1, [r0]\n\
+    ldr r7, _08012F24 @ =gBattlescriptCurrInstr\n\
+    ldr r6, _08012F28 @ =gUnknown_02024C1C\n\
+    ldrb r0, [r5]\n\
+    lsls r0, 2\n\
+    adds r0, r6\n\
+    ldr r4, [r0]\n\
+    str r4, [r7]\n\
+    ldr r3, _08012F2C @ =gBattleExecBuffer\n\
+    ldr r1, _08012F30 @ =gBitTable\n\
+    ldrb r0, [r5]\n\
+    lsls r0, 2\n\
+    adds r0, r1\n\
+    ldr r2, [r0]\n\
+    lsls r1, r2, 4\n\
+    movs r0, 0xF0\n\
+    lsls r0, 24\n\
+    orrs r1, r0\n\
+    orrs r1, r2\n\
+    lsls r0, r2, 8\n\
+    orrs r1, r0\n\
+    lsls r2, 12\n\
+    orrs r1, r2\n\
+    ldr r0, [r3]\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08012F12\n\
+    ldr r0, _08012F34 @ =gBattleScriptingCommandsTable\n\
+    ldrb r1, [r4]\n\
+    lsls r1, 2\n\
+    adds r1, r0\n\
+    ldr r0, [r1]\n\
+    bl _call_via_r0\n\
+_08012F12:\n\
+    ldrb r0, [r5]\n\
+    lsls r0, 2\n\
+    adds r0, r6\n\
+    ldr r1, [r7]\n\
+    str r1, [r0]\n\
+    b _08012F66\n\
+    .align 2, 0\n\
+_08012F20: .4byte gBankAttacker\n\
+_08012F24: .4byte gBattlescriptCurrInstr\n\
+_08012F28: .4byte gUnknown_02024C1C\n\
+_08012F2C: .4byte gBattleExecBuffer\n\
+_08012F30: .4byte gBitTable\n\
+_08012F34: .4byte gBattleScriptingCommandsTable\n\
+_08012F38:\n\
+    ldr r3, _08012FA0 @ =gBattleExecBuffer\n\
+    ldr r1, _08012FA4 @ =gBitTable\n\
+    ldr r0, _08012FA8 @ =gActiveBank\n\
+    ldrb r4, [r0]\n\
+    lsls r0, r4, 2\n\
+    adds r0, r1\n\
+    ldr r2, [r0]\n\
+    lsls r0, r2, 4\n\
+    movs r1, 0xF0\n\
+    lsls r1, 24\n\
+    orrs r0, r1\n\
+    orrs r0, r2\n\
+    lsls r1, r2, 8\n\
+    orrs r0, r1\n\
+    lsls r2, 12\n\
+    orrs r0, r2\n\
+    ldr r3, [r3]\n\
+    ands r3, r0\n\
+    cmp r3, 0\n\
+    bne _08012F66\n\
+_08012F60:\n\
+    ldr r0, _08012FAC @ =gBattleCommunication\n\
+    adds r0, r4, r0\n\
+    strb r3, [r0]\n\
+_08012F66:\n\
+    ldr r0, _08012FA8 @ =gActiveBank\n\
+    ldrb r1, [r0]\n\
+    adds r1, 0x1\n\
+    strb r1, [r0]\n\
+    ldr r0, _08012FB0 @ =gNoOfAllBanks\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+_08012F74:\n\
+    adds r2, r0, 0\n\
+    ldrb r0, [r2]\n\
+    cmp r1, r0\n\
+    bcs _08012F80\n\
+    bl _0801234C\n\
+_08012F80:\n\
+    ldr r0, _08012FAC @ =gBattleCommunication\n\
+    ldrb r0, [r0, 0x4]\n\
+    ldrb r2, [r2]\n\
+    cmp r0, r2\n\
+    bne _08012F90\n\
+    ldr r1, _08012FB4 @ =gBattleMainFunc\n\
+    ldr r0, _08012FB8 @ =SetActionsAndBanksTurnOrder\n\
+    str r0, [r1]\n\
+_08012F90:\n\
+    add sp, 0x1C\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_08012FA0: .4byte gBattleExecBuffer\n\
+_08012FA4: .4byte gBitTable\n\
+_08012FA8: .4byte gActiveBank\n\
+_08012FAC: .4byte gBattleCommunication\n\
+_08012FB0: .4byte gNoOfAllBanks\n\
+_08012FB4: .4byte gBattleMainFunc\n\
+_08012FB8: .4byte SetActionsAndBanksTurnOrder\n\
+    .syntax divided\n");
+}
+
+void SwapTurnOrder(u8 a, u8 b)
+{
+    int temp;
+
+    temp = gActionsByTurnOrder[a];
+    gActionsByTurnOrder[a] = gActionsByTurnOrder[b];
+    gActionsByTurnOrder[b] = temp;
+
+    temp = gBanksByTurnOrder[a];
+    gBanksByTurnOrder[a] = gBanksByTurnOrder[b];
+    gBanksByTurnOrder[b] = temp;
+}
+
+// Determines which of the two given mons will strike first in a battle.
+// Returns:
+// 0 = first mon moves first
+// 1 = second mon moves first
+// 2 = second mon moves first because it won a 50/50 roll
+u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreMovePriorities)
+{
+    int bank1SpeedMultiplier, bank2SpeedMultiplier;
+    u32 bank1AdjustedSpeed, bank2AdjustedSpeed;
+    u8 heldItemEffect;
+    u8 heldItemEffectParam;
+    u16 bank1Move;
+    u16 bank2Move;
+    u8 strikesFirst = 0;
+
+    // Check for abilities that boost speed in weather.
+    if (WEATHER_HAS_EFFECT)
+    {
+        if ((gBattleMons[bank1].ability == ABILITY_SWIFT_SWIM && (gBattleWeather & WEATHER_RAIN_ANY))
+            || (gBattleMons[bank1].ability == ABILITY_CHLOROPHYLL && (gBattleWeather & WEATHER_SUN_ANY)))
+            bank1SpeedMultiplier = 2;
+        else
+            bank1SpeedMultiplier = 1;
+
+        if ((gBattleMons[bank2].ability == ABILITY_SWIFT_SWIM && (gBattleWeather & WEATHER_RAIN_ANY))
+            || (gBattleMons[bank2].ability == ABILITY_CHLOROPHYLL && (gBattleWeather & WEATHER_SUN_ANY)))
+            bank2SpeedMultiplier = 2;
+        else
+            bank2SpeedMultiplier = 1;
+    }
+    else
+    {
+        bank1SpeedMultiplier = 1;
+        bank2SpeedMultiplier = 1;
+    }
+
+    // Calculate adjusted speed for first mon.
+    bank1AdjustedSpeed = (gBattleMons[bank1].speed * bank1SpeedMultiplier)
+        * gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][0] / gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][1];
+
+    if (gBattleMons[bank1].item == ITEM_ENIGMA_BERRY)
+    {
+        heldItemEffect = gEnigmaBerries[bank1].holdEffect;
+        heldItemEffectParam = gEnigmaBerries[bank1].holdEffectParam;
+    }
+    else
+    {
+        heldItemEffect = ItemId_GetHoldEffect(gBattleMons[bank1].item);
+        heldItemEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank1].item);
+    }
+
+    // Only give badge speed boost to the player's mon.
+    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && FlagGet(FLAG_BADGE03_GET) && GetBankSide(bank1) == 0)
+        bank1AdjustedSpeed = (bank1AdjustedSpeed * 110) / 100;
+
+    if (heldItemEffect == HOLD_EFFECT_MACHO_BRACE)
+        bank1AdjustedSpeed /= 2;
+
+    if (gBattleMons[bank1].status1 & STATUS_PARALYSIS)
+        bank1AdjustedSpeed /= 4;
+
+    if (heldItemEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (heldItemEffectParam * 0xFFFF) / 100)
+        bank1AdjustedSpeed = UINT_MAX;
+
+    // Calculate adjusted speed for second mon.
+    bank2AdjustedSpeed = gBattleMons[bank2].speed * bank2SpeedMultiplier
+        * gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][0] / gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][1];
+
+    if (gBattleMons[bank2].item == ITEM_ENIGMA_BERRY)
+    {
+        heldItemEffect = gEnigmaBerries[bank2].holdEffect;
+        heldItemEffectParam = gEnigmaBerries[bank2].holdEffectParam;
+    }
+    else
+    {
+        heldItemEffect = ItemId_GetHoldEffect(gBattleMons[bank2].item);
+        heldItemEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank2].item);
+    }
+
+    // Only give badge speed boost to the player's mon.
+    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && FlagGet(FLAG_BADGE03_GET) && GetBankSide(bank2) == 0)
+    {
+        bank2AdjustedSpeed = (bank2AdjustedSpeed * 110) / 100;
+    }
+
+    if (heldItemEffect == HOLD_EFFECT_MACHO_BRACE)
+        bank2AdjustedSpeed /= 2;
+
+    if (gBattleMons[bank2].status1 & STATUS_PARALYSIS)
+        bank2AdjustedSpeed /= 4;
+
+    if (heldItemEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (heldItemEffectParam * 0xFFFF) / 100)
+        bank2AdjustedSpeed = UINT_MAX;
+
+    if (ignoreMovePriorities)
+    {
+        bank1Move = MOVE_NONE;
+        bank2Move = MOVE_NONE;
+    }
+    else
+    {
+        if (gActionForBanks[bank1] == 0)
+        {
+            if (gProtectStructs[bank1].onlyStruggle)
+                bank1Move = MOVE_STRUGGLE;
+            else
+                bank1Move = gBattleMons[bank1].moves[ewram1608Carr(bank1)];
+        }
+        else
+            bank1Move = MOVE_NONE;
+
+        if (gActionForBanks[bank2] == 0)
+        {
+            if (gProtectStructs[bank2].onlyStruggle)
+                bank2Move = MOVE_STRUGGLE;
+            else
+                bank2Move = gBattleMons[bank2].moves[ewram1608Carr(bank2)];
+        }
+        else
+            bank2Move = MOVE_NONE;
+    }
+
+    if (gBattleMoves[bank1Move].priority != 0 || gBattleMoves[bank2Move].priority != 0)
+    {
+        if (gBattleMoves[bank1Move].priority == gBattleMoves[bank2Move].priority)
+        {
+            if (bank1AdjustedSpeed == bank2AdjustedSpeed && (Random() & 1))
+                strikesFirst = 2;
+            else if (bank1AdjustedSpeed < bank2AdjustedSpeed)
+                strikesFirst = 1;
+        }
+        else if (gBattleMoves[bank1Move].priority < gBattleMoves[bank2Move].priority)
+            strikesFirst = 1;
+    }
+    else
+    {
+        if (bank1AdjustedSpeed == bank2AdjustedSpeed && (Random() & 1))
+            strikesFirst = 2;
+        else if (bank1AdjustedSpeed < bank2AdjustedSpeed)
+            strikesFirst = 1;
+    }
+
+    return strikesFirst;
+}
+
+void SetActionsAndBanksTurnOrder(void)
+{
+    s32 var = 0;
+    s32 i, j;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
+    {
+        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        {
+            gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+            gBanksByTurnOrder[var] = gActiveBank;
+            var++;
+        }
+    }
+    else
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                {
+                    var = 5;
+                    break;
+                }
+            }
+        }
+        else
+        {
+            if (gActionForBanks[0] == ACTION_RUN)
+            {
+                gActiveBank = 0;
+                var = 5;
+            }
+        }
+
+        if (var == 5)
+        {
+            gActionsByTurnOrder[0] = gActionForBanks[gActiveBank];
+            gBanksByTurnOrder[0] = gActiveBank;
+            var = 1;
+            for (i = 0; i < gNoOfAllBanks; i++)
+            {
+                if (i != gActiveBank)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[i];
+                    gBanksByTurnOrder[var] = i;
+                    var++;
+                }
+            }
+            gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
+            eFocusPunchBank = 0;
+            return;
+        }
+        else
+        {
+            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+                    gBanksByTurnOrder[var] = gActiveBank;
+                    var++;
+                }
+            }
+            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            {
+                if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+                    gBanksByTurnOrder[var] = gActiveBank;
+                    var++;
+                }
+            }
+            for (i = 0; i < gNoOfAllBanks - 1; i++)
+            {
+                for (j = i + 1; j < gNoOfAllBanks; j++)
+                {
+                    u8 bank1 = gBanksByTurnOrder[i];
+                    u8 bank2 = gBanksByTurnOrder[j];
+                    if (gActionsByTurnOrder[i] != ACTION_USE_ITEM
+                        && gActionsByTurnOrder[j] != ACTION_USE_ITEM
+                        && gActionsByTurnOrder[i] != ACTION_SWITCH
+                        && gActionsByTurnOrder[j] != ACTION_SWITCH)
+                    {
+                        if (GetWhoStrikesFirst(bank1, bank2, FALSE))
+                            SwapTurnOrder(i, j);
+                    }
+                }
+            }
+        }
+    }
+    gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
+    eFocusPunchBank = 0;
+}
+
+static void TurnValuesCleanUp(bool8 var0)
+{
+    s32 i;
+    u8 *dataPtr;
+
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    {
+        if (var0)
+        {
+            gProtectStructs[gActiveBank].protected = 0;
+            gProtectStructs[gActiveBank].endured = 0;
+        }
+        else
+        {
+            dataPtr = (u8*)(&gProtectStructs[gActiveBank]);
+            for (i = 0; i < sizeof(struct ProtectStruct); i++)
+                dataPtr[i] = 0;
+
+            if (gDisableStructs[gActiveBank].isFirstTurn)
+                gDisableStructs[gActiveBank].isFirstTurn--;
+
+            if (gDisableStructs[gActiveBank].rechargeCounter)
+            {
+                gDisableStructs[gActiveBank].rechargeCounter--;
+                if (gDisableStructs[gActiveBank].rechargeCounter == 0)
+                    gBattleMons[gActiveBank].status2 &= ~(STATUS2_RECHARGE);
+            }
+        }
+
+        if (gDisableStructs[gActiveBank].substituteHP == 0)
+                gBattleMons[gActiveBank].status2 &= ~(STATUS2_SUBSTITUTE);
+    }
+
+    gSideTimers[0].followmeTimer = 0;
+    gSideTimers[1].followmeTimer = 0;
+}
+
+void SpecialStatusesClear(void)
+{
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    {
+        s32 i;
+        u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBank]);
+
+        for (i = 0; i < sizeof(struct SpecialStatus); i++)
+            dataPtr[i] = 0;
+    }
+}
+
+void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
+{
+    if (!(gHitMarker & HITMARKER_RUN))
+    {
+        while (eFocusPunchBank < gNoOfAllBanks)
+        {
+            gActiveBank = gBankAttacker = eFocusPunchBank;
+            eFocusPunchBank++;
+            if (gChosenMovesByBanks[gActiveBank] == MOVE_FOCUS_PUNCH
+                && !(gBattleMons[gActiveBank].status1 & STATUS_SLEEP)
+                && !(gDisableStructs[gBankAttacker].truantCounter)
+                && !(gProtectStructs[gActiveBank].onlyStruggle))
+            {
+                BattleScriptExecute(BattleScript_FocusPunchSetUp);
+                return;
+            }
+        }
+    }
+
+    TryClearRageStatuses();
+    gCurrentTurnActionNumber = 0;
+    {
+        // something stupid needed to match
+        u8 zero;
+        gCurrentActionFuncId = gActionsByTurnOrder[(zero = 0)];
+    }
+
+    gDynamicBasePower = 0;
+    BATTLE_STRUCT->dynamicMoveType = 0;
+    gBattleMainFunc = RunTurnActionsFunctions;
+    gBattleCommunication[3] = 0;
+    gBattleCommunication[4] = 0;
+    eMultihitMoveEffect = 0;
+    ewram17130 = 0;
+}
+
+static void RunTurnActionsFunctions(void)
+{
+    if (gBattleOutcome != 0)
+        gCurrentActionFuncId = 12;
+
+    BATTLE_STRUCT->unk16057 = gCurrentTurnActionNumber;
+    gUnknown_081FA640[gCurrentActionFuncId]();
+
+    if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished
+    {
+        gHitMarker &= ~(HITMARKER_x100000);
+        gBattleMainFunc = gUnknown_081FA678[gBattleOutcome & 0x7F];
+    }
+    else
+    {
+        if (BATTLE_STRUCT->unk16057 != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank
+        {
+            gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
+            gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
+        }
+    }
+}
+
+void HandleEndTurn_BattleWon(void)
+{
+    gCurrentActionFuncId = 0;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        gBattleTextBuff1[0] = gBattleOutcome;
+        gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
+        gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
+    }
+    else if (gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))
+    {
+        gBattlescriptCurrInstr = gUnknown_081D8E0D;
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
+    {
+        BattleMusicStop();
+        gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon;
+
+        switch (gTrainers[gTrainerBattleOpponent].trainerClass)
+        {
+        case TRAINER_CLASS_ELITE_FOUR:
+        case TRAINER_CLASS_CHAMPION:
+            PlayBGM(BGM_KACHI5);
+            break;
+        case TRAINER_CLASS_TEAM_AQUA:
+        case TRAINER_CLASS_TEAM_MAGMA:
+        case TRAINER_CLASS_AQUA_ADMIN:
+        case TRAINER_CLASS_AQUA_LEADER:
+        case TRAINER_CLASS_MAGMA_ADMIN:
+        case TRAINER_CLASS_MAGMA_LEADER:
+            PlayBGM(BGM_KACHI4);
+            break;
+        case TRAINER_CLASS_LEADER:
+            PlayBGM(BGM_KACHI3);
+            break;
+        default:
+            PlayBGM(BGM_KACHI1);
+            break;
+        }
+    }
+    else
+    {
+        gBattlescriptCurrInstr = BattleScript_PayDayMoneyAndPickUpItems;
+    }
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+void HandleEndTurn_BattleLost(void)
+{
+    gCurrentActionFuncId = 0;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        gBattleTextBuff1[0] = gBattleOutcome;
+        gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
+        gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
+    }
+    else
+    {
+        gBattlescriptCurrInstr = BattleScript_LocalBattleLost;
+    }
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+void HandleEndTurn_RanFromBattle(void)
+{
+    gCurrentActionFuncId = 0;
+
+    switch (gProtectStructs[gBankAttacker].fleeFlag)
+    {
+    default:
+        gBattlescriptCurrInstr = BattleScript_GotAwaySafely;
+        break;
+    case 1:
+        gBattlescriptCurrInstr = BattleScript_SmokeBallEscape;
+        break;
+    case 2:
+        gBattlescriptCurrInstr = BattleScript_RanAwayUsingMonAbility;
+        break;
+    }
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+void HandleEndTurn_MonFled(void)
+{
+    gCurrentActionFuncId = 0;
+
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker]);
+    gBattlescriptCurrInstr = BattleScript_WildMonFled;
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+void HandleEndTurn_FinishBattle(void)
+{
+    if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC)
+    {
+        if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
+                                  | BATTLE_TYPE_FIRST_BATTLE
+                                  | BATTLE_TYPE_SAFARI
+                                  | BATTLE_TYPE_EREADER_TRAINER
+                                  | BATTLE_TYPE_WALLY_TUTORIAL
+                                  | BATTLE_TYPE_BATTLE_TOWER)))
+        {
+            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            {
+                if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+                {
+                    if (gBattleResults.poke1Species == SPECIES_NONE)
+                    {
+                        gBattleResults.poke1Species = gBattleMons[gActiveBank].species;
+                        StringCopy(gBattleResults.pokeString1, gBattleMons[gActiveBank].nickname);
+                    }
+                    else
+                    {
+                        gBattleResults.opponentSpecies = gBattleMons[gActiveBank].species;
+                        StringCopy(gBattleResults.pokeString2, gBattleMons[gActiveBank].nickname);
+                    }
+                }
+            }
+            PutPokemonTodayCaughtOnAir();
+        }
+
+        BeginFastPaletteFade(3);
+        FadeOutMapMusic(5);
+        gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions;
+        gCB2_AfterEvolution = BattleMainCB2;
+    }
+    else
+    {
+        if (gBattleExecBuffer == 0)
+            gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+    }
+}
+
+static void FreeResetData_ReturnToOvOrDoEvolutions(void)
+{
+    if (!gPaletteFade.active)
+    {
+        ResetSpriteData();
+        if (gLeveledUpInBattle == 0 || gBattleOutcome != BATTLE_WON)
+        {
+            gBattleMainFunc = ReturnFromBattleToOverworld;
+            return;
+        }
+        else
+        {
+            gBattleMainFunc = TryEvolvePokemon;
+        }
+    }
+}
+
+void TryEvolvePokemon(void)
+{
+    s32 i;
+
+    while (gLeveledUpInBattle != 0)
+    {
+        for (i = 0; i < 6; i++)
+        {
+            if (gLeveledUpInBattle & gBitTable[i])
+            {
+                u16 species;
+                u8 levelUpBits = gLeveledUpInBattle;
+
+                levelUpBits &= ~(gBitTable[i]);
+                gLeveledUpInBattle = levelUpBits;
+
+                species = GetEvolutionTargetSpecies(&gPlayerParty[i], 0, levelUpBits);
+                if (species != SPECIES_NONE)
+                {
+                    gBattleMainFunc = WaitForEvoSceneToFinish;
+                    EvolutionScene(&gPlayerParty[i], species, 0x81, i);
+                    return;
+                }
+            }
+        }
+    }
+
+    gBattleMainFunc = ReturnFromBattleToOverworld;
+}
+
+static void WaitForEvoSceneToFinish(void)
+{
+    if (gMain.callback2 == BattleMainCB2)
+        gBattleMainFunc = TryEvolvePokemon;
+}
+
+static void ReturnFromBattleToOverworld(void)
+{
+    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
+    {
+        RandomlyGivePartyPokerus(gPlayerParty);
+        PartySpreadPokerus(gPlayerParty);
+    }
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK && gReceivedRemoteLinkPlayers != 0)
+        return;
+
+    gSpecialVar_Result = gBattleOutcome;
+    gMain.inBattle = 0;
+    gMain.callback1 = gPreBattleCallback1;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
+    {
+        UpdateRoamerHPStatus(&gEnemyParty[0]);
+        if (gBattleOutcome == BATTLE_WON || gBattleOutcome == BATTLE_CAUGHT)
+            SetRoamerInactive();
+    }
+
+    m4aSongNumStop(0x5A);
+    SetMainCallback2(gMain.savedCallback);
+}
+
+void RunBattleScriptCommands_PopCallbacksStack(void)
+{
+    if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC)
+    {
+        if (B_FUNCTION_STACK->size != 0)
+            B_FUNCTION_STACK->size--;
+        gBattleMainFunc = B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size];
+    }
+    else
+    {
+        if (gBattleExecBuffer == 0)
+            gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+    }
+}
+
+void RunBattleScriptCommands(void)
+{
+    if (gBattleExecBuffer == 0)
+        gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+}
+
+void HandleAction_UseMove(void)
+{
+    u8 side;
+    u8 var = 4;
+
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+
+    if (ewram160A6 & gBitTable[gBankAttacker])
+    {
+        gCurrentActionFuncId = ACTION_FINISHED;
+        return;
+    }
+
+    gCritMultiplier = 1;
+    eDmgMultiplier = 1;
+    ewram160E7 = 0;
+    gBattleMoveFlags = 0;
+    gMultiHitCounter = 0;
+    gBattleCommunication[6] = 0;
+    gCurrMovePos = gUnknown_02024BE5 = ewram1608Carr(gBankAttacker);
+
+    // choose move
+    if (gProtectStructs[gBankAttacker].onlyStruggle)
+    {
+        gProtectStructs[gBankAttacker].onlyStruggle = 0;
+        gCurrentMove = gChosenMove = MOVE_STRUGGLE;
+        gHitMarker |= HITMARKER_NO_PPDEDUCT;
+        ewram16010arr(gBankAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
+    }
+    else if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE)
+    {
+        gCurrentMove = gChosenMove = gLockedMoves[gBankAttacker];
+    }
+    // encore forces you to use the same move
+    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBankAttacker].encoredMove == gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
+    {
+        gCurrentMove = gChosenMove = gDisableStructs[gBankAttacker].encoredMove;
+        gCurrMovePos = gUnknown_02024BE5 = gDisableStructs[gBankAttacker].encoredMovePos;
+        ewram16010arr(gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+    }
+    // check if the encored move wasn't overwritten
+    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBankAttacker].encoredMove != gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
+    {
+        gCurrMovePos = gUnknown_02024BE5 = gDisableStructs[gBankAttacker].encoredMovePos;
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gDisableStructs[gBankAttacker].encoredMove = MOVE_NONE;
+        gDisableStructs[gBankAttacker].encoredMovePos = 0;
+        gDisableStructs[gBankAttacker].encoreTimer1 = 0;
+        ewram16010arr(gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+    }
+    else if (gBattleMons[gBankAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBankAttacker])
+    {
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        ewram16010arr(gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+    }
+    else
+    {
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+    }
+
+    if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        gBattleResults.lastUsedMove = gCurrentMove;
+    else
+        gBattleResults.opponentMove = gCurrentMove;
+
+    // choose target
+    side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+    if (gSideTimers[side].followmeTimer != 0
+        && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED
+        && GetBankSide(gBankAttacker) != GetBankSide(gSideTimers[side].followmeTarget)
+        && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
+    {
+        gBankTarget = gSideTimers[side].followmeTarget;
+    }
+    else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+             && gSideTimers[side].followmeTimer == 0
+             && (gBattleMoves[gCurrentMove].power != 0
+                 || gBattleMoves[gCurrentMove].target != MOVE_TARGET_x10)
+             && gBattleMons[ewram16010arr(gBankAttacker)].ability != ABILITY_LIGHTNING_ROD
+             && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
+    {
+        side = GetBankSide(gBankAttacker);
+        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        {
+            if (side != GetBankSide(gActiveBank)
+                && ewram16010arr(gBankAttacker) != gActiveBank
+                && gBattleMons[gActiveBank].ability == ABILITY_LIGHTNING_ROD
+                && BankGetTurnOrder(gActiveBank) < var)
+            {
+                var = BankGetTurnOrder(gActiveBank);
+            }
+        }
+        if (var == 4)
+        {
+            if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
+            {
+                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+                {
+                    if (Random() & 1)
+                        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+                    else
+                        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+                }
+                else
+                {
+                    if (Random() & 1)
+                        gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+                    else
+                        gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+                }
+            }
+            else
+            {
+                gBankTarget = ewram16010arr(gBankAttacker);
+            }
+
+            if (gAbsentBankFlags & gBitTable[gBankTarget])
+            {
+                if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+                {
+                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                }
+                else
+                {
+                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_SIDE);
+                    if (gAbsentBankFlags & gBitTable[gBankTarget])
+                        gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                }
+            }
+        }
+        else
+        {
+            gActiveBank = gBanksByTurnOrder[var];
+            RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
+            gSpecialStatuses[gActiveBank].lightningRodRedirected = 1;
+            gBankTarget = gActiveBank;
+        }
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
+             && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
+    {
+        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        {
+            if (Random() & 1)
+                gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            else
+                gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+        }
+        else
+        {
+            if (Random() & 1)
+                gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            else
+                gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        }
+
+        if (gAbsentBankFlags & gBitTable[gBankTarget]
+            && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+        {
+            gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+        }
+    }
+    else
+    {
+        gBankTarget = ewram16010arr(gBankAttacker);
+        if (gAbsentBankFlags & gBitTable[gBankTarget])
+        {
+            if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+            {
+                gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+            }
+            else
+            {
+                gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_SIDE);
+                if (gAbsentBankFlags & gBitTable[gBankTarget])
+                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+            }
+        }
+    }
+
+    gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+void HandleAction_Switch(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gActionSelectionCursor[gBankAttacker] = 0;
+    gMoveSelectionCursor[gBankAttacker] = 0;
+
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, ewram16064arr(gBankAttacker))
+
+    ewram16003 = gBankAttacker;
+    gBattlescriptCurrInstr = BattleScript_ActionSwitch;
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+
+    if (gBattleResults.unk2 < 255)
+        gBattleResults.unk2++;
+}
+
+#ifdef NONMATCHING
+void HandleAction_UseItem(void)
+{
+    gBankAttacker = gBankTarget = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gDisableStructs[gBankAttacker].furyCutterCounter = 0;
+    gLastUsedItem = gBattleBufferB[gBankAttacker][1] | (gBattleBufferB[gBankAttacker][2] << 8);
+
+    if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball
+    {
+        gBattlescriptCurrInstr = gBattlescriptsForBallThrow[gLastUsedItem];
+    }
+    else if (gLastUsedItem == ITEM_POKE_DOLL || gLastUsedItem == ITEM_FLUFFY_TAIL)
+    {
+        gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0];
+    }
+    else if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+    {
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
+    }
+    else
+    {
+        ewram16003 = gBankAttacker;
+
+        switch (ewram160D8(gBankAttacker))
+        {
+        case AI_ITEM_FULL_RESTORE:
+        case AI_ITEM_HEAL_HP:
+            break;
+        case AI_ITEM_CURE_CONDITION:
+            gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+            if (ewram160DA(gBankAttacker) & 1)
+            {
+                if (ewram160DA(gBankAttacker) & 0x3E)
+                    gBattleCommunication[MULTISTRING_CHOOSER] = 5;
+            }
+            else
+            {
+                while (!(ewram160DA(gBankAttacker) & 1))
+                {
+                    ewram160DA(gBankAttacker) /= 2;
+                    gBattleCommunication[MULTISTRING_CHOOSER]++;
+                }
+            }
+            break;
+        case AI_ITEM_X_STAT:
+            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
+            if (ewram160DA(gBankAttacker) & 0x80)
+            {
+                gBattleCommunication[MULTISTRING_CHOOSER] = 5;
+            }
+            else
+            {
+                PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
+                PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2)
+
+                while (!(ewram160DA(gBankAttacker) & 1))
+                {
+                    ewram160DA(gBankAttacker) /= 2;
+                    gBattleTextBuff1[2]++;
+                }
+
+                ewram160A4 = gBattleTextBuff1[2] + 14;
+                ewram160A5 = 0;
+            }
+            break;
+        case AI_ITEM_GUARD_SPECS:
+            if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+                gBattleCommunication[MULTISTRING_CHOOSER] = 2;
+            else
+                gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+            break;
+        }
+
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[ewram160D8(gBankAttacker)];
+    }
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+#else
+__attribute__((naked))
+void HandleAction_UseItem(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    ldr r4, _08014804 @ =gBankAttacker\n\
+    ldr r2, _08014808 @ =gBankTarget\n\
+    ldr r1, _0801480C @ =gBanksByTurnOrder\n\
+    ldr r0, _08014810 @ =gCurrentTurnActionNumber\n\
+    ldrb r0, [r0]\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r2]\n\
+    strb r0, [r4]\n\
+    ldr r0, _08014814 @ =gBattle_BG0_X\n\
+    movs r2, 0\n\
+    strh r2, [r0]\n\
+    ldr r0, _08014818 @ =gBattle_BG0_Y\n\
+    strh r2, [r0]\n\
+    ldr r3, _0801481C @ =gDisableStructs\n\
+    ldrb r1, [r4]\n\
+    lsls r0, r1, 3\n\
+    subs r0, r1\n\
+    lsls r0, 2\n\
+    adds r0, r3\n\
+    strb r2, [r0, 0x10]\n\
+    ldr r5, _08014820 @ =gLastUsedItem\n\
+    ldr r2, _08014824 @ =gBattleBufferB\n\
+    ldrb r1, [r4]\n\
+    lsls r1, 9\n\
+    adds r0, r2, 0x1\n\
+    adds r0, r1, r0\n\
+    ldrb r3, [r0]\n\
+    adds r2, 0x2\n\
+    adds r1, r2\n\
+    ldrb r0, [r1]\n\
+    lsls r0, 8\n\
+    orrs r3, r0\n\
+    strh r3, [r5]\n\
+    cmp r3, 0xC\n\
+    bhi _08014830\n\
+    ldr r2, _08014828 @ =gBattlescriptCurrInstr\n\
+    ldr r1, _0801482C @ =gBattlescriptsForBallThrow\n\
+    ldrh r0, [r5]\n\
+    lsls r0, 2\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    str r0, [r2]\n\
+    b _08014A8C\n\
+    .align 2, 0\n\
+_08014804: .4byte gBankAttacker\n\
+_08014808: .4byte gBankTarget\n\
+_0801480C: .4byte gBanksByTurnOrder\n\
+_08014810: .4byte gCurrentTurnActionNumber\n\
+_08014814: .4byte gBattle_BG0_X\n\
+_08014818: .4byte gBattle_BG0_Y\n\
+_0801481C: .4byte gDisableStructs\n\
+_08014820: .4byte gLastUsedItem\n\
+_08014824: .4byte gBattleBufferB\n\
+_08014828: .4byte gBattlescriptCurrInstr\n\
+_0801482C: .4byte gBattlescriptsForBallThrow\n\
+_08014830:\n\
+    adds r0, r3, 0\n\
+    subs r0, 0x50\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, 0x1\n\
+    bhi _0801484C\n\
+    ldr r0, _08014844 @ =gBattlescriptCurrInstr\n\
+    ldr r1, _08014848 @ =gBattlescriptsForRunningByItem\n\
+    b _0801485C\n\
+    .align 2, 0\n\
+_08014844: .4byte gBattlescriptCurrInstr\n\
+_08014848: .4byte gBattlescriptsForRunningByItem\n\
+_0801484C:\n\
+    ldrb r0, [r4]\n\
+    bl GetBankSide\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _0801486C\n\
+    ldr r0, _08014864 @ =gBattlescriptCurrInstr\n\
+    ldr r1, _08014868 @ =gBattlescriptsForUsingItem\n\
+_0801485C:\n\
+    ldr r1, [r1]\n\
+    str r1, [r0]\n\
+    b _08014A8C\n\
+    .align 2, 0\n\
+_08014864: .4byte gBattlescriptCurrInstr\n\
+_08014868: .4byte gBattlescriptsForUsingItem\n\
+_0801486C:\n\
+    ldr r2, _080148A0 @ =gSharedMem\n\
+    ldrb r0, [r4]\n\
+    ldr r3, _080148A4 @ =0x00016003\n\
+    adds r1, r2, r3\n\
+    strb r0, [r1]\n\
+    lsls r0, 24\n\
+    lsrs r0, 25\n\
+    ldr r1, _080148A8 @ =0x000160d8\n\
+    adds r0, r1\n\
+    adds r0, r2\n\
+    ldrb r0, [r0]\n\
+    subs r0, 0x1\n\
+    mov r8, r4\n\
+    ldr r3, _080148AC @ =gBattlescriptCurrInstr\n\
+    mov r9, r3\n\
+    ldr r1, _080148B0 @ =gBattlescriptsForUsingItem\n\
+    mov r10, r1\n\
+    adds r7, r2, 0\n\
+    cmp r0, 0x4\n\
+    bls _08014896\n\
+    b _08014A74\n\
+_08014896:\n\
+    lsls r0, 2\n\
+    ldr r1, _080148B4 @ =_080148B8\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_080148A0: .4byte gSharedMem\n\
+_080148A4: .4byte 0x00016003\n\
+_080148A8: .4byte 0x000160d8\n\
+_080148AC: .4byte gBattlescriptCurrInstr\n\
+_080148B0: .4byte gBattlescriptsForUsingItem\n\
+_080148B4: .4byte _080148B8\n\
+    .align 2, 0\n\
+_080148B8:\n\
+    .4byte _08014A74\n\
+    .4byte _08014A74\n\
+    .4byte _080148CC\n\
+    .4byte _08014958\n\
+    .4byte _08014A30\n\
+_080148CC:\n\
+    ldr r2, _08014904 @ =gBattleCommunication\n\
+    movs r0, 0\n\
+    strb r0, [r2, 0x5]\n\
+    ldr r1, _08014908 @ =gBankAttacker\n\
+    ldrb r0, [r1]\n\
+    lsrs r0, 1\n\
+    ldr r6, _0801490C @ =0x000160da\n\
+    adds r0, r6\n\
+    adds r0, r7\n\
+    ldrb r3, [r0]\n\
+    movs r0, 0x1\n\
+    ands r0, r3\n\
+    mov r8, r1\n\
+    cmp r0, 0\n\
+    beq _08014918\n\
+    movs r0, 0x3E\n\
+    ands r0, r3\n\
+    ldr r3, _08014910 @ =gBattlescriptCurrInstr\n\
+    mov r9, r3\n\
+    ldr r1, _08014914 @ =gBattlescriptsForUsingItem\n\
+    mov r10, r1\n\
+    cmp r0, 0\n\
+    bne _080148FC\n\
+    b _08014A74\n\
+_080148FC:\n\
+    movs r0, 0x5\n\
+    strb r0, [r2, 0x5]\n\
+    b _08014A74\n\
+    .align 2, 0\n\
+_08014904: .4byte gBattleCommunication\n\
+_08014908: .4byte gBankAttacker\n\
+_0801490C: .4byte 0x000160da\n\
+_08014910: .4byte gBattlescriptCurrInstr\n\
+_08014914: .4byte gBattlescriptsForUsingItem\n\
+_08014918:\n\
+    ldr r3, _08014950 @ =gBattlescriptCurrInstr\n\
+    mov r9, r3\n\
+    ldr r0, _08014954 @ =gBattlescriptsForUsingItem\n\
+    mov r10, r0\n\
+    adds r5, r7, 0\n\
+    mov r4, r8\n\
+    adds r3, r6, 0\n\
+_08014926:\n\
+    ldrb r0, [r4]\n\
+    lsrs r0, 1\n\
+    adds r0, r3\n\
+    adds r0, r5\n\
+    ldrb r1, [r0]\n\
+    lsrs r1, 1\n\
+    strb r1, [r0]\n\
+    ldrb r0, [r2, 0x5]\n\
+    adds r0, 0x1\n\
+    strb r0, [r2, 0x5]\n\
+    ldrb r0, [r4]\n\
+    lsrs r0, 1\n\
+    adds r0, r3\n\
+    adds r0, r5\n\
+    ldrb r1, [r0]\n\
+    movs r0, 0x1\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08014926\n\
+    b _08014A74\n\
+    .align 2, 0\n\
+_08014950: .4byte gBattlescriptCurrInstr\n\
+_08014954: .4byte gBattlescriptsForUsingItem\n\
+_08014958:\n\
+    ldr r3, _0801498C @ =gBattleCommunication\n\
+    movs r0, 0x4\n\
+    strb r0, [r3, 0x5]\n\
+    ldr r2, _08014990 @ =gBankAttacker\n\
+    ldrb r0, [r2]\n\
+    lsrs r0, 1\n\
+    ldr r1, _08014994 @ =0x000160da\n\
+    mov r12, r1\n\
+    add r0, r12\n\
+    adds r6, r0, r7\n\
+    ldrb r1, [r6]\n\
+    movs r0, 0x80\n\
+    ands r0, r1\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    mov r8, r2\n\
+    cmp r5, 0\n\
+    beq _080149A0\n\
+    movs r0, 0x5\n\
+    strb r0, [r3, 0x5]\n\
+    ldr r2, _08014998 @ =gBattlescriptCurrInstr\n\
+    mov r9, r2\n\
+    ldr r3, _0801499C @ =gBattlescriptsForUsingItem\n\
+    mov r10, r3\n\
+    b _08014A74\n\
+    .align 2, 0\n\
+_0801498C: .4byte gBattleCommunication\n\
+_08014990: .4byte gBankAttacker\n\
+_08014994: .4byte 0x000160da\n\
+_08014998: .4byte gBattlescriptCurrInstr\n\
+_0801499C: .4byte gBattlescriptsForUsingItem\n\
+_080149A0:\n\
+    ldr r3, _08014A18 @ =gBattleTextBuff1\n\
+    movs r4, 0xFD\n\
+    strb r4, [r3]\n\
+    movs r0, 0x5\n\
+    strb r0, [r3, 0x1]\n\
+    movs r2, 0x1\n\
+    strb r2, [r3, 0x2]\n\
+    movs r0, 0xFF\n\
+    strb r0, [r3, 0x3]\n\
+    ldr r1, _08014A1C @ =gBattleTextBuff2\n\
+    strb r4, [r1]\n\
+    strb r5, [r1, 0x1]\n\
+    movs r0, 0xD2\n\
+    strb r0, [r1, 0x2]\n\
+    strb r5, [r1, 0x3]\n\
+    subs r0, 0xD3\n\
+    strb r0, [r1, 0x4]\n\
+    ldrb r0, [r6]\n\
+    ands r2, r0\n\
+    ldr r0, _08014A20 @ =gBattlescriptCurrInstr\n\
+    mov r9, r0\n\
+    ldr r1, _08014A24 @ =gBattlescriptsForUsingItem\n\
+    mov r10, r1\n\
+    adds r6, r3, 0\n\
+    cmp r2, 0\n\
+    bne _08014A02\n\
+    adds r3, r7, 0\n\
+    mov r5, r8\n\
+    mov r4, r12\n\
+    adds r2, r6, 0\n\
+_080149DC:\n\
+    ldrb r0, [r5]\n\
+    lsrs r0, 1\n\
+    adds r0, r4\n\
+    adds r0, r3\n\
+    ldrb r1, [r0]\n\
+    lsrs r1, 1\n\
+    strb r1, [r0]\n\
+    ldrb r0, [r2, 0x2]\n\
+    adds r0, 0x1\n\
+    strb r0, [r2, 0x2]\n\
+    ldrb r0, [r5]\n\
+    lsrs r0, 1\n\
+    adds r0, r4\n\
+    adds r0, r3\n\
+    ldrb r1, [r0]\n\
+    movs r0, 0x1\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _080149DC\n\
+_08014A02:\n\
+    ldrb r0, [r6, 0x2]\n\
+    adds r0, 0xE\n\
+    ldr r2, _08014A28 @ =0x000160a4\n\
+    adds r1, r7, r2\n\
+    movs r2, 0\n\
+    strb r0, [r1]\n\
+    ldr r3, _08014A2C @ =0x000160a5\n\
+    adds r0, r7, r3\n\
+    strb r2, [r0]\n\
+    b _08014A74\n\
+    .align 2, 0\n\
+_08014A18: .4byte gBattleTextBuff1\n\
+_08014A1C: .4byte gBattleTextBuff2\n\
+_08014A20: .4byte gBattlescriptCurrInstr\n\
+_08014A24: .4byte gBattlescriptsForUsingItem\n\
+_08014A28: .4byte 0x000160a4\n\
+_08014A2C: .4byte 0x000160a5\n\
+_08014A30:\n\
+    ldr r0, _08014A50 @ =gBattleTypeFlags\n\
+    ldrh r0, [r0]\n\
+    movs r1, 0x1\n\
+    ands r1, r0\n\
+    cmp r1, 0\n\
+    beq _08014A64\n\
+    ldr r1, _08014A54 @ =gBattleCommunication\n\
+    movs r0, 0x2\n\
+    strb r0, [r1, 0x5]\n\
+    ldr r0, _08014A58 @ =gBankAttacker\n\
+    mov r8, r0\n\
+    ldr r1, _08014A5C @ =gBattlescriptCurrInstr\n\
+    mov r9, r1\n\
+    ldr r2, _08014A60 @ =gBattlescriptsForUsingItem\n\
+    mov r10, r2\n\
+    b _08014A74\n\
+    .align 2, 0\n\
+_08014A50: .4byte gBattleTypeFlags\n\
+_08014A54: .4byte gBattleCommunication\n\
+_08014A58: .4byte gBankAttacker\n\
+_08014A5C: .4byte gBattlescriptCurrInstr\n\
+_08014A60: .4byte gBattlescriptsForUsingItem\n\
+_08014A64:\n\
+    ldr r0, _08014AA0 @ =gBattleCommunication\n\
+    strb r1, [r0, 0x5]\n\
+    ldr r3, _08014AA4 @ =gBankAttacker\n\
+    mov r8, r3\n\
+    ldr r0, _08014AA8 @ =gBattlescriptCurrInstr\n\
+    mov r9, r0\n\
+    ldr r1, _08014AAC @ =gBattlescriptsForUsingItem\n\
+    mov r10, r1\n\
+_08014A74:\n\
+    mov r2, r8\n\
+    ldrb r0, [r2]\n\
+    lsrs r0, 1\n\
+    ldr r3, _08014AB0 @ =0x000160d8\n\
+    adds r0, r3\n\
+    adds r0, r7\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 2\n\
+    add r0, r10\n\
+    ldr r0, [r0]\n\
+    mov r1, r9\n\
+    str r0, [r1]\n\
+_08014A8C:\n\
+    movs r0, 0xA\n\
+    ldr r2, _08014AB4 @ =gCurrentActionFuncId\n\
+    strb r0, [r2]\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_08014AA0: .4byte gBattleCommunication\n\
+_08014AA4: .4byte gBankAttacker\n\
+_08014AA8: .4byte gBattlescriptCurrInstr\n\
+_08014AAC: .4byte gBattlescriptsForUsingItem\n\
+_08014AB0: .4byte 0x000160d8\n\
+_08014AB4: .4byte gCurrentActionFuncId\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING
+
+bool8 TryRunFromBattle(u8 bank)
+{
+    bool8 effect = FALSE;
+    u8 holdEffect;
+    u8 speedVar;
+
+    if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
+        holdEffect = gEnigmaBerries[bank].holdEffect;
+    else
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item);
+
+    gStringBank = bank;
+
+    if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
+    {
+        gLastUsedItem = gBattleMons[bank].item ;
+        gProtectStructs[bank].fleeFlag = 1;
+        effect++;
+    }
+    else if (gBattleMons[bank].ability == ABILITY_RUN_AWAY)
+    {
+        gLastUsedAbility = ABILITY_RUN_AWAY;
+        gProtectStructs[bank].fleeFlag = 2;
+        effect++;
+    }
+    else
+    {
+        if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
+        {
+            if (gBattleMons[bank].speed < gBattleMons[bank ^ BIT_SIDE].speed)
+            {
+                speedVar = (gBattleMons[bank].speed * 128) / (gBattleMons[bank ^ BIT_SIDE].speed) + (ewram16078 * 30);
+                if (speedVar > (Random() & 0xFF))
+                    effect++;
+            }
+            else // same speed or faster
+            {
+                effect++;
+            }
+        }
+
+        ewram16078++;
+    }
+
+    if (effect)
+    {
+        gCurrentTurnActionNumber = gNoOfAllBanks;
+        gBattleOutcome = BATTLE_RAN;
+    }
+
+    return effect;
+}
+
+void HandleAction_Run(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        gCurrentTurnActionNumber = gNoOfAllBanks;
+
+        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        {
+            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                    gBattleOutcome |= BATTLE_LOST;
+            }
+            else
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                    gBattleOutcome |= BATTLE_WON;
+            }
+        }
+
+        gBattleOutcome |= OUTCOME_LINK_BATTLE_RUN;
+    }
+    else
+    {
+        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        {
+            if (!TryRunFromBattle(gBankAttacker)) // failed to run away
+            {
+                gBattleMons[gBankAttacker].status2 &= ~STATUS2_DESTINY_BOND;
+                gBattleCommunication[MULTISTRING_CHOOSER] = 3;
+                gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
+                gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+            }
+        }
+        else
+        {
+            if (gBattleMons[gBankAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
+            {
+                gBattleCommunication[MULTISTRING_CHOOSER] = 4;
+                gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
+                gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+            }
+            else
+            {
+                gCurrentTurnActionNumber = gNoOfAllBanks;
+                gBattleOutcome = BATTLE_POKE_FLED;
+            }
+        }
+    }
+}
+
+void HandleAction_WatchesCarefully(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+void HandleAction_SafariZoneBallThrow(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gNumSafariBalls--;
+    gLastUsedItem = ITEM_SAFARI_BALL;
+    gBattlescriptCurrInstr = gBattlescriptsForBallThrow[ITEM_SAFARI_BALL];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+void HandleAction_ThrowPokeblock(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBankAttacker][1] - 1;
+    gLastUsedItem = gBattleBufferB[gBankAttacker][2];
+
+    if (ewram16087 < 3)
+        ewram16087++;
+    if (ewram16088 > 1)
+    {
+        if (ewram16088 < gUnknown_081FA70C[ewram16087][gBattleCommunication[MULTISTRING_CHOOSER]])
+            ewram16088 = 1;
+        else
+            ewram16088 -= gUnknown_081FA70C[ewram16087][gBattleCommunication[MULTISTRING_CHOOSER]];
+    }
+
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+void HandleAction_GoNear(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+
+    ewram16089 += gUnknown_081FA71B[ewram16086];
+    if (ewram16089 > 20)
+        ewram16089 = 20;
+
+    ewram16088 += gUnknown_081FA71F[ewram16086];
+    if (ewram16088 > 20)
+        ewram16088 = 20;
+
+    if (ewram16086 < 3)
+    {
+        ewram16086++;
+        gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+    }
+    else
+    {
+        gBattleCommunication[MULTISTRING_CHOOSER] = 1;
+    }
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[1];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+void HandleAction_SafriZoneRun(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    PlaySE(SE_NIGERU);
+    gCurrentTurnActionNumber = gNoOfAllBanks;
+    gBattleOutcome = BATTLE_RAN;
+}
+
+void HandleAction_Action9(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker])
+
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[3];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gActionsByTurnOrder[1] = ACTION_FINISHED;
+}
+
+void HandleAction_Action11(void)
+{
+    if (!HandleFaintedMonActions())
+    {
+        ewram16059 = 0;
+        gCurrentActionFuncId = ACTION_FINISHED;
+    }
+}
+
+void HandleAction_NothingIsFainted(void)
+{
+    gCurrentTurnActionNumber++;
+    gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
+    gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
+                    | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR
+                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000
+                    | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
+                    | HITMARKER_x8000000 | HITMARKER_x4000000);
+}
+
+void HandleAction_ActionFinished(void)
+{
+    gCurrentTurnActionNumber++;
+    gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
+    SpecialStatusesClear();
+    gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
+                    | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR
+                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000
+                    | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
+                    | HITMARKER_x8000000 | HITMARKER_x4000000);
+
+    gBattleMoveDamage = 0;
+    ewram16002 = 0;
+    ewram160A1 = 0;
+    gMoveHitWith[gBankAttacker] = 0;
+    gUnknown_02024C44[gBankAttacker] = 0;
+    eDynamicMoveType = 0;
+    gDynamicBasePower = 0;
+    ewram1600C = 0;
+    gBattleCommunication[3] = 0;
+    gBattleCommunication[4] = 0;
+    eMultihitMoveEffect = 0;
+    ewram17130 = 0;
+}
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 0c147e471..5a20a8324 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_util.h"
 #include "constants/battle_move_effects.h"
 #include "constants/moves.h"
 #include "constants/abilities.h"
@@ -35,8 +36,8 @@ extern u8 gActiveBank;
 extern u32 gBattleExecBuffer;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[4];
-extern u8 gTurnOrder[4];
-extern u8 gUnknown_02024A76[4];
+extern u8 gBanksByTurnOrder[4];
+extern u8 gActionsByTurnOrder[4];
 extern u16 gCurrentMove;
 extern u8 gLastUsedAbility;
 extern u16 gBattleWeather;
@@ -45,7 +46,7 @@ extern u8 gEffectBank;
 extern u8 gAbsentBankFlags;
 extern u8 gMultiHitCounter;
 extern u16 gLastUsedMove[4];
-extern u16 gLockedMove[4];
+extern u16 gLockedMoves[4];
 extern u16 gChosenMovesByBanks[4];
 extern u16 gSideAffecting[2];
 extern u16 gPauseCounterBattle;
@@ -58,7 +59,7 @@ extern u8 gBankAttacker;
 extern u8 gBankTarget;
 extern u8* gBattlescriptCurrInstr;
 extern u8 gCurrMovePos;
-extern u8 gFightStateTracker;
+extern u8 gCurrentActionFuncId;
 extern u32 gHitMarker;
 extern u8 gBattleMoveFlags;
 extern u8 gBattleCommunication[];
@@ -94,18 +95,17 @@ extern u8 gActionForBanks[4];
 extern u16 gUnknown_02024C2C[4]; //last used moves 2, used by sketch
 extern u16 gUnknown_030041B0;
 extern u16 gUnknown_02024C4C[4]; //last used moves by banks, another one
-extern u8 gCurrentMoveTurn;
+extern u8 gCurrentTurnActionNumber;
 extern u16 gTrappingMoves[];
 
 //extern functions
 u8 AtkCanceller_UnableToUseMove(void);
 void PressurePPLose(u8 bank_atk, u8 bank_def, u16 move);
 void CancelMultiTurnMoves(u8 bank);
-void b_movescr_stack_push(u8* BS_ptr);
-void b_movescr_stack_push_cursor(void);
+void BattleScriptPush(u8* BS_ptr);
+void BattleScriptPushCursor(void);
 void RecordAbilityBattle(u8 bank, u8 ability);
 void RecordItemBattle(u8 bank, u8 holdEffect);
-int IsPokeDisobedient(void);
 static bool8 IsTwoTurnsMove(u16 move);
 static void DestinyBondFlagUpdate(void);
 static void b_wonderguard_and_levitate(void);
@@ -122,16 +122,15 @@ extern u8 gBattleBufferB[4][0x200];
 void sub_80324F8(struct Pokemon*, u8 bank);
 void AdjustFriendship(struct Pokemon*, u8 value);
 bool8 IsTradedMon(struct Pokemon*);
-void b_movescr_stack_pop_cursor(void);
+void BattleScriptPop(void);
 void SwitchInClearStructs(void);
 u8* ConvertIntToDecimalStringN(u8*, s32, u8, u8);
 u8 GetSetPokedexFlag(u16 nationalNum, u8 caseID);
 u16 SpeciesToNationalPokedexNum(u16 species);
 u8 sub_803FC34(u8 bank);
 u16 sub_803FBFC(u8 a);
-u8 GetBankByPlayerAI(u8 ID);
+u8 GetBankByIdentity(u8 ID);
 void sub_8012258(u8);
-void sub_80157C4(u8 bank); //update sent pokes in battle
 //MonTryLearningNewMove teach poke a move
 u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move);
 void IncrementGameStat(u8 index);
@@ -145,24 +144,19 @@ bool32 IsHMMove2(u16 move);
 void sub_802BBD4(u8 r0, u8 r1, u8 r2, u8 r3, u8 sp0);
 void nullsub_6(void);
 void ReshowBattleScreenAfterMenu(void);
-void sub_800F808(void);
+void BattleMainCB2(void);
 void AddMoney(u32* moneySaveblock, u32 to_give);
-void sub_80156DC(void); //set sentpokes value
-bool8 sub_8014AB8(u8 bank); //can run from battle
 u8 CountAliveMons(u8 caseID);
 void sub_803E1B0(struct Pokemon*, u16 item, u8 partyID, u8 r3, u8 sp);
 u8 CanRunFromBattle(void);
 u8 GetMoveTarget(u16 move, u8 targetbyte); //get target of move
-void sub_80153D0(u8 atk); //pressure perish song pp decrement
 u8 CastformDataTypeChange(u8 bank);
-void b_push_move_exec(u8* bs_ptr);
 u8 Overworld_GetMapTypeOfSaveblockLocation(void);
 u8 CalculatePlayerPartyCount(void);
 u16 Sqrt(u32 num);
 u8 sub_809070C(u16 nationalNum, u32 TiD, u32 PiD); //task prepare poke dex display
 void sub_814A880(u8 a1, u8 a2);
 u8 CheckMoveLimitations(u8 bank, u8 unusable_moves, u8 flags);
-void sub_801529C(u8 bank);
 bool8 IsLinkDoubleBattle(void);
 void sub_8094B6C(u8 bank, u8 partyID, u8 r2);
 
@@ -1028,7 +1022,7 @@ static void atk00_attackcanceler(void)
     int i;
     if (gBattleOutcome)
     {
-        gFightStateTracker = 0xC;
+        gCurrentActionFuncId = 0xC;
         return;
     }
     if (gBattleMons[gBankAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
@@ -1051,7 +1045,7 @@ static void atk00_attackcanceler(void)
     gHitMarker &= ~(HITMARKER_x800000);
     if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
-        u8 disobedient = IsPokeDisobedient();
+        u8 disobedient = IsMonDisobedient();
         asm("":::"r0"); //It's impossible to match
         asm("":::"r1");
         if ((disobedient))
@@ -1068,18 +1062,18 @@ static void atk00_attackcanceler(void)
     {
         PressurePPLose(gBankAttacker, gBankTarget, MOVE_MAGIC_COAT);
         gProtectStructs[gBankTarget].bounceMove = 0;
-        b_movescr_stack_push_cursor();
+        BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_MagicCoatBounce;
         return;
     }
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        if ((gProtectStructs[gTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
+        if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
         {
-            PressurePPLose(gBankAttacker, gTurnOrder[i], MOVE_SNATCH);
-            gProtectStructs[gTurnOrder[i]].stealMove = 0;
-            BATTLE_STRUCT->scriptingActive = gTurnOrder[i];
-            b_movescr_stack_push_cursor();
+            PressurePPLose(gBankAttacker, gBanksByTurnOrder[i], MOVE_SNATCH);
+            gProtectStructs[gBanksByTurnOrder[i]].stealMove = 0;
+            BATTLE_STRUCT->scriptingActive = gBanksByTurnOrder[i];
+            BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_SnatchedMove;
             return;
         }
@@ -1088,7 +1082,7 @@ static void atk00_attackcanceler(void)
     {
         gSpecialStatuses[gBankTarget].lightningRodRedirected = 0;
         gLastUsedAbility = ABILITY_LIGHTNING_ROD;
-        b_movescr_stack_push_cursor();
+        BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_TookAttack;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
@@ -1326,7 +1320,7 @@ static void atk03_ppreduce(void)
             && !((gDisableStructs[gBankAttacker].unk18_b) & gBitTable[gCurrMovePos]))
         {
             gActiveBank = gBankAttacker;
-            EmitSetAttributes(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBankAttacker].pp[gCurrMovePos]);
+            EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBankAttacker].pp[gCurrMovePos]);
             MarkBufferBankForExecution(gBankAttacker);
         }
     }
@@ -1845,7 +1839,7 @@ static void atk09_attackanimation(void)
 
     if ((gHitMarker & HITMARKER_NO_ANIMATIONS) && (gCurrentMove != MOVE_TRANSFORM && gCurrentMove != MOVE_SUBSTITUTE))
     {
-        b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+        BattleScriptPush(gBattlescriptCurrInstr + 1);
         gBattlescriptCurrInstr = BattleScript_Pausex20;
         BATTLE_STRUCT->animTurn += 1;
         BATTLE_STRUCT->animTargetsHit += 1;
@@ -1869,7 +1863,7 @@ static void atk09_attackanimation(void)
         }
         else
         {
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = BattleScript_Pausex20;
         }
     }
@@ -1948,7 +1942,7 @@ static void atk0C_datahpupdate(void)
             if (gDisableStructs[gActiveBank].substituteHP == 0)
             {
                 gBattlescriptCurrInstr += 2;
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SubstituteFade;
                 return;
             }
@@ -2024,7 +2018,7 @@ static void atk0C_datahpupdate(void)
                 }
             }
             gHitMarker &= ~(HITMARKER_x100000);
-            EmitSetAttributes(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp);
+            EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp);
             MarkBufferBankForExecution(gActiveBank);
         }
     }
@@ -2133,7 +2127,7 @@ static void atk0F_resultmessage(void)
             gLastUsedItem = gBattleMons[gBankTarget].item;
             gStringBank = gBankTarget;
             gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON);
-            b_movescr_stack_push_cursor();
+            BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
             return;
         default:
@@ -2145,14 +2139,14 @@ static void atk0F_resultmessage(void)
                 gBattleMoveFlags &= ~(MOVESTATUS_ONEHITKO);
                 gBattleMoveFlags &= ~(MOVESTATUS_SUPEREFFECTIVE);
                 gBattleMoveFlags &= ~(MOVESTATUS_NOTVERYEFFECTIVE);
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_OneHitKOMsg;
                 return;
             }
             else if (gBattleMoveFlags & MOVESTATUS_ENDURED)
             {
                 gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON);
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_EnduredMsg;
                 return;
             }
@@ -2161,7 +2155,7 @@ static void atk0F_resultmessage(void)
                 gLastUsedItem = gBattleMons[gBankTarget].item;
                 gStringBank = gBankTarget;
                 gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON);
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
                 return;
             }
@@ -2253,7 +2247,7 @@ u8 BankGetTurnOrder(u8 bank)
     int i;
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        if (gTurnOrder[i] == bank)
+        if (gBanksByTurnOrder[i] == bank)
             break;
     }
     return i;
@@ -2322,7 +2316,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             {
                 gLastUsedAbility = ABILITY_IMMUNITY;
                 RecordAbilityBattle(gEffectBank, ABILITY_IMMUNITY);
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
             //_0801E664:
                 gBattlescriptCurrInstr = BattleScript_PSNPrevention;
                 if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
@@ -2337,7 +2331,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             if ((gBattleMons[gEffectBank].type1 == TYPE_POISON || gBattleMons[gEffectBank].type2 == TYPE_POISON || gBattleMons[gEffectBank].type1 == TYPE_STEEL || gBattleMons[gEffectBank].type2 == TYPE_STEEL)
                 && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && (primary == 1 || certain == 0x80))
             {
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_PSNPrevention;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
                 return;
@@ -2356,7 +2350,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             {
                 gLastUsedAbility = ABILITY_WATER_VEIL;
                 RecordAbilityBattle(gEffectBank, ABILITY_WATER_VEIL);
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
             //_0801E664:
                 gBattlescriptCurrInstr = BattleScript_BRNPrevention;
                 if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
@@ -2371,7 +2365,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             if ((gBattleMons[gEffectBank].type1 == TYPE_FIRE || gBattleMons[gEffectBank].type2 == TYPE_FIRE)
                 && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && (primary == 1 || certain == 0x80))
             {
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_BRNPrevention;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
                 return;
@@ -2400,7 +2394,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                 {
                     gLastUsedAbility = ABILITY_LIMBER;
                     RecordAbilityBattle(gEffectBank, ABILITY_LIMBER);
-                    b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                    BattleScriptPush(gBattlescriptCurrInstr + 1);
                 //_0801E664:
                     gBattlescriptCurrInstr = BattleScript_PRLZPrevention;
                     if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
@@ -2422,7 +2416,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             {
                 gLastUsedAbility = ABILITY_IMMUNITY;
                 RecordAbilityBattle(gEffectBank, ABILITY_IMMUNITY);
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
             //_0801E664:
                 gBattlescriptCurrInstr = BattleScript_PSNPrevention;
                 if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
@@ -2437,7 +2431,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             if ((gBattleMons[gEffectBank].type1 == TYPE_POISON || gBattleMons[gEffectBank].type2 == TYPE_POISON || gBattleMons[gEffectBank].type1 == TYPE_STEEL || gBattleMons[gEffectBank].type2 == TYPE_STEEL)
                 && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && (primary == 1 || certain == 0x80))
             {
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_PSNPrevention;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
                 return;
@@ -2459,14 +2453,14 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
         }
         if (StatusChanged == 1)
         {
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             if (gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS_SLEEP)
                 gBattleMons[gEffectBank].status1 |= ((Random() & 3) + 2);
             else
                 gBattleMons[gEffectBank].status1 |= gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
             gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
             gActiveBank = gEffectBank;
-            EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1);
+            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1);
             MarkBufferBankForExecution(gActiveBank);
             if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
             {
@@ -2500,7 +2494,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             if (gBattleMons[gEffectBank].status2 & STATUS2_CONFUSION)
                 {gBattlescriptCurrInstr++; return;}
             gBattleMons[gEffectBank].status2 |= (((Random()) % 0x4)) + 2;
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
             break;
         case 8: //flinch
@@ -2518,7 +2512,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             }
             else
             {
-                if (BankGetTurnOrder(gEffectBank) > gCurrentMoveTurn)
+                if (BankGetTurnOrder(gEffectBank) > gCurrentTurnActionNumber)
                     gBattleMons[gEffectBank].status2 |= gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
                 gBattlescriptCurrInstr++; return;
             }
@@ -2527,9 +2521,9 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             if (gBattleMons[gEffectBank].status2 & STATUS2_UPROAR)
                 {gBattlescriptCurrInstr++; return;}
             gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS;
-            gLockedMove[gEffectBank] = gCurrentMove;
+            gLockedMoves[gEffectBank] = gCurrentMove;
             gBattleMons[gEffectBank].status2 |= ((Random() & 3) + 2) << 4;
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
             break;
         case 11: //pay day
@@ -2540,7 +2534,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                 if (PayDay > gPaydayMoney)
                     gPaydayMoney = 0xFFFF;
             }
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
             break;
         case 9: //tri attack
@@ -2551,7 +2545,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             break;
         case 12: //charging move
             gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS;
-            gLockedMove[gEffectBank] = gCurrentMove;
+            gLockedMoves[gEffectBank] = gCurrentMove;
             gProtectStructs[gEffectBank].chargingTurn = 1;
             gBattlescriptCurrInstr++;
             break;
@@ -2562,7 +2556,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             BATTLE_STRUCT->wrappedMove[gEffectBank*2] = (u8)gCurrentMove;
             (1 + BATTLE_STRUCT->wrappedMove)[gEffectBank*2] = gCurrentMove >> 8; //don't ask.
             BATTLE_STRUCT->wrappedBy[gEffectBank] = gBankAttacker;
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             while (gBattleCommunication[MULTISTRING_CHOOSER] <= 4
@@ -2573,7 +2567,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             gBattleMoveDamage = (gHP_dealt) / 4;
             if (gBattleMoveDamage == 0)
                 gBattleMoveDamage = 1;
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
             break;
         case 15 ... 21: //stat + 1
@@ -2582,7 +2576,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             {
                 BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; //TODO: the arg ptr is wrong by one
                 BATTLE_STRUCT->animArg2 = 0;
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_StatUp;
             }
             break;
@@ -2592,7 +2586,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             {
                 BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F;
                 BATTLE_STRUCT->animArg2 = 0;
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_StatDown;
             }
             break;
@@ -2602,7 +2596,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             {
                 BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F;
                 BATTLE_STRUCT->animArg2 = 0;
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_StatUp;
             }
             break;
@@ -2612,14 +2606,14 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             {
                 BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F;
                 BATTLE_STRUCT->animArg2 = 0;
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_StatDown;
             }
             break;
         case 29: //recharge
             gBattleMons[gEffectBank].status2 |= STATUS2_RECHARGE;
             gDisableStructs[gEffectBank].rechargeCounter = 2;
-            gLockedMove[gEffectBank] = gCurrentMove;
+            gLockedMoves[gEffectBank] = gCurrentMove;
             gBattlescriptCurrInstr++;
             break;
         case 30: //rage
@@ -2635,7 +2629,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                         {gBattlescriptCurrInstr++; return;}
                 if (gBattleMons[gBankTarget].item && gBattleMons[gBankTarget].ability == ABILITY_STICKY_HOLD)
                 {
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_NoItemSteal;
                     gLastUsedAbility = gBattleMons[gBankTarget].ability;
                     RecordAbilityBattle(gBankTarget, gLastUsedAbility);
@@ -2653,14 +2647,14 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                 gBattleMons[gBankTarget].item = 0;
 
                 gActiveBank = gBankAttacker;
-                EmitSetAttributes(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem);
+                EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem);
                 MarkBufferBankForExecution(gBankAttacker);
 
                 gActiveBank = gBankTarget;
-                EmitSetAttributes(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankTarget].item);
+                EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankTarget].item);
                 MarkBufferBankForExecution(gBankTarget);
 
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_ItemSteal;
 
 				CHOICED_MOVE(gBankTarget) = 0;
@@ -2676,11 +2670,11 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             gBattlescriptCurrInstr++;
             break;
         case 34: //ancientpower
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = BattleScript_AllStatsUp;
             return;
         case 35: //break free rapidspin
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = BattleScript_RapidSpinAway;
             return;
         case 36: //paralysis removal
@@ -2688,30 +2682,30 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             {
                 gBattleMons[gBankTarget].status1 &= ~(STATUS_PARALYSIS);
                 gActiveBank = gBankTarget;
-                EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1);
+                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1);
                 MarkBufferBankForExecution(gActiveBank);
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_TargetPRLZHeal;
             }
             else
                 {gBattlescriptCurrInstr++; return;}
             break;
         case 37: //superpower
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = BattleScript_AtkDefDown;
             return;
         case 38: //33% recoil
             gBattleMoveDamage = gHP_dealt / 3;
             if (gBattleMoveDamage == 0)
                 gBattleMoveDamage = 1;
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
             break;
         case 53: //thrash
             if (!(gBattleMons[gEffectBank].status2 & STATUS2_LOCK_CONFUSE))
             {
                 gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS;
-                gLockedMove[gEffectBank] = gCurrentMove;
+                gLockedMoves[gEffectBank] = gCurrentMove;
                 gBattleMons[gEffectBank].status2 |= (((Random() & 1) + 2) << 0xA);
             }
             else
@@ -2735,14 +2729,14 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                 gLastUsedItem = gBattleMons[gEffectBank].item;
                 gBattleMons[gEffectBank].item = 0;
                 gWishFutureKnock.knockedOffPokes[side] |= gBitTable[gBattlePartyID[gEffectBank]];
-                b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+                BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_KnockedOff;
 
                 CHOICED_MOVE(gEffectBank) = 0;
             }
             break;
         case 59: //overheat
-            b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+            BattleScriptPush(gBattlescriptCurrInstr + 1);
             gBattlescriptCurrInstr = BattleScript_SAtkDown2;
             return;
         }
@@ -3066,7 +3060,7 @@ _0801E64A:\n\
     ldr r4, _0801E67C @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801E680 @ =BattleScript_PSNPrevention\n\
 _0801E664:\n\
     str r0, [r4]\n\
@@ -3189,7 +3183,7 @@ _0801E72E:\n\
     ldr r4, _0801E750 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801E754 @ =BattleScript_BRNPrevention\n\
     b _0801E664\n\
     .align 2, 0\n\
@@ -3229,7 +3223,7 @@ _0801E78E:\n\
     ldr r4, _0801E7A0 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801E7A4 @ =BattleScript_BRNPrevention\n\
     b _0801E998\n\
     .align 2, 0\n\
@@ -3380,7 +3374,7 @@ _0801E8A6:\n\
     ldr r4, _0801E8C8 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801E8CC @ =BattleScript_PRLZPrevention\n\
     b _0801E664\n\
     .align 2, 0\n\
@@ -3423,7 +3417,7 @@ _0801E8FE:\n\
     ldr r4, _0801E93C @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801E940 @ =BattleScript_PSNPrevention\n\
     str r0, [r4]\n\
     ldr r2, _0801E944 @ =gHitMarker\n\
@@ -3484,7 +3478,7 @@ _0801E98C:\n\
     ldr r4, _0801E9A8 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801E9AC @ =BattleScript_PSNPrevention\n\
 _0801E998:\n\
     str r0, [r4]\n\
@@ -3557,7 +3551,7 @@ _0801EA1C:\n\
     ldr r0, _0801EA5C @ =gBattlescriptCurrInstr\n\
     ldr r0, [r0]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r1, _0801EA60 @ =gStatusFlagsForMoveEffects\n\
     ldr r0, _0801EA64 @ =gBattleCommunication\n\
     ldrb r0, [r0, 0x3]\n\
@@ -3622,7 +3616,7 @@ _0801EA84:\n\
     movs r1, 0x28\n\
     movs r2, 0\n\
     movs r3, 0x4\n\
-    bl EmitSetAttributes\n\
+    bl EmitSetMonData\n\
     ldrb r0, [r4]\n\
     bl MarkBufferBankForExecution\n\
     ldr r2, _0801EAF0 @ =gHitMarker\n\
@@ -3815,7 +3809,7 @@ _0801EC8E:\n\
     ldr r4, _0801ECC8 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r1, _0801ECCC @ =gMoveEffectBS_Ptrs\n\
     ldr r0, _0801ECD0 @ =gBattleCommunication\n\
     ldrb r0, [r0, 0x3]\n\
@@ -3861,7 +3855,7 @@ _0801ED14: .4byte BattleScript_FlinchPrevention\n\
 _0801ED18:\n\
     adds r0, r2, 0\n\
     bl BankGetTurnOrder\n\
-    ldr r1, _0801ED54 @ =gCurrentMoveTurn\n\
+    ldr r1, _0801ED54 @ =gCurrentTurnActionNumber\n\
     lsls r0, 24\n\
     lsrs r0, 24\n\
     ldrb r1, [r1]\n\
@@ -3887,7 +3881,7 @@ _0801ED2E:\n\
     str r1, [r2]\n\
     bl _0801F5DC\n\
     .align 2, 0\n\
-_0801ED54: .4byte gCurrentMoveTurn\n\
+_0801ED54: .4byte gCurrentTurnActionNumber\n\
 _0801ED58: .4byte gStatusFlagsForMoveEffects\n\
 _0801ED5C: .4byte gBattleCommunication\n\
 _0801ED60:\n\
@@ -3909,7 +3903,7 @@ _0801ED7C:\n\
     lsls r0, 5\n\
     orrs r1, r0\n\
     str r1, [r2]\n\
-    ldr r1, _0801EDC8 @ =gLockedMove\n\
+    ldr r1, _0801EDC8 @ =gLockedMoves\n\
     ldrb r0, [r3]\n\
     lsls r0, 1\n\
     adds r0, r1\n\
@@ -3932,7 +3926,7 @@ _0801ED7C:\n\
     ldr r4, _0801EDD0 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r1, _0801EDD4 @ =gMoveEffectBS_Ptrs\n\
     ldr r0, _0801EDD8 @ =gBattleCommunication\n\
     ldrb r0, [r0, 0x3]\n\
@@ -3941,7 +3935,7 @@ _0801ED7C:\n\
     ldr r0, [r0]\n\
     bl _0801F5F8\n\
     .align 2, 0\n\
-_0801EDC8: .4byte gLockedMove\n\
+_0801EDC8: .4byte gLockedMoves\n\
 _0801EDCC: .4byte gCurrentMove\n\
 _0801EDD0: .4byte gBattlescriptCurrInstr\n\
 _0801EDD4: .4byte gMoveEffectBS_Ptrs\n\
@@ -3978,7 +3972,7 @@ _0801EE14:\n\
     ldr r4, _0801EE40 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r1, _0801EE44 @ =gMoveEffectBS_Ptrs\n\
     ldr r0, _0801EE48 @ =gBattleCommunication\n\
     ldrb r0, [r0, 0x3]\n\
@@ -4035,7 +4029,7 @@ _0801EE84:\n\
     lsls r1, 5\n\
     orrs r0, r1\n\
     str r0, [r2]\n\
-    ldr r1, _0801EEC0 @ =gLockedMove\n\
+    ldr r1, _0801EEC0 @ =gLockedMoves\n\
     mov r2, r8\n\
     ldrb r0, [r2]\n\
     lsls r0, 1\n\
@@ -4053,7 +4047,7 @@ _0801EE84:\n\
     strb r0, [r1, 0x1]\n\
     b _0801F5DC\n\
     .align 2, 0\n\
-_0801EEC0: .4byte gLockedMove\n\
+_0801EEC0: .4byte gLockedMoves\n\
 _0801EEC4: .4byte gCurrentMove\n\
 _0801EEC8: .4byte gProtectStructs\n\
 _0801EECC:\n\
@@ -4113,7 +4107,7 @@ _0801EEE8:\n\
     ldr r4, _0801EF98 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r1, _0801EF9C @ =gMoveEffectBS_Ptrs\n\
     ldr r2, _0801EFA0 @ =gBattleCommunication\n\
     ldrb r0, [r2, 0x3]\n\
@@ -4178,7 +4172,7 @@ _0801EFC0:\n\
     ldr r4, _0801EFE0 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r1, _0801EFE4 @ =gMoveEffectBS_Ptrs\n\
     ldr r0, _0801EFE8 @ =gBattleCommunication\n\
     ldrb r0, [r0, 0x3]\n\
@@ -4220,7 +4214,7 @@ _0801F008:\n\
     ldr r4, _0801F038 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F03C @ =BattleScript_StatUp\n\
     b _0801F5F8\n\
     .align 2, 0\n\
@@ -4258,7 +4252,7 @@ _0801F05E:\n\
     ldr r4, _0801F08C @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F090 @ =BattleScript_StatDown\n\
     b _0801F5F8\n\
     .align 2, 0\n\
@@ -4295,7 +4289,7 @@ _0801F0B0:\n\
     ldr r4, _0801F0E0 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F0E4 @ =BattleScript_StatUp\n\
     b _0801F5F8\n\
     .align 2, 0\n\
@@ -4333,7 +4327,7 @@ _0801F106:\n\
     ldr r4, _0801F134 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F138 @ =BattleScript_StatDown\n\
     b _0801F5F8\n\
     .align 2, 0\n\
@@ -4365,7 +4359,7 @@ _0801F13C:\n\
     adds r0, r2\n\
     movs r1, 0x2\n\
     strb r1, [r0, 0x19]\n\
-    ldr r1, _0801F17C @ =gLockedMove\n\
+    ldr r1, _0801F17C @ =gLockedMoves\n\
     ldrb r0, [r3]\n\
     lsls r0, 1\n\
     adds r0, r1\n\
@@ -4375,7 +4369,7 @@ _0801F13C:\n\
     b _0801F5DC\n\
     .align 2, 0\n\
 _0801F178: .4byte gDisableStructs\n\
-_0801F17C: .4byte gLockedMove\n\
+_0801F17C: .4byte gLockedMoves\n\
 _0801F180: .4byte gCurrentMove\n\
 _0801F184:\n\
     ldr r0, _0801F1A0 @ =gBankAttacker\n\
@@ -4546,7 +4540,7 @@ _0801F2B6:\n\
     movs r1, 0x2\n\
     movs r2, 0\n\
     movs r3, 0x2\n\
-    bl EmitSetAttributes\n\
+    bl EmitSetMonData\n\
     mov r3, r10\n\
     ldrb r0, [r3]\n\
     bl MarkBufferBankForExecution\n\
@@ -4564,13 +4558,13 @@ _0801F2B6:\n\
     movs r1, 0x2\n\
     movs r2, 0\n\
     movs r3, 0x2\n\
-    bl EmitSetAttributes\n\
+    bl EmitSetMonData\n\
     ldrb r0, [r7]\n\
     bl MarkBufferBankForExecution\n\
     ldr r4, _0801F350 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F354 @ =BattleScript_ItemSteal\n\
     str r0, [r4]\n\
     ldr r0, _0801F358 @ =0xfffe9f10\n\
@@ -4645,7 +4639,7 @@ _0801F3BC:\n\
     ldr r4, _0801F3CC @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F3D0 @ =BattleScript_AllStatsUp\n\
     b _0801F5F8\n\
     .align 2, 0\n\
@@ -4655,7 +4649,7 @@ _0801F3D4:\n\
     ldr r4, _0801F3E4 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F3E8 @ =BattleScript_RapidSpinAway\n\
     b _0801F5F8\n\
     .align 2, 0\n\
@@ -4691,13 +4685,13 @@ _0801F406:\n\
     movs r1, 0x28\n\
     movs r2, 0\n\
     movs r3, 0x4\n\
-    bl EmitSetAttributes\n\
+    bl EmitSetMonData\n\
     ldrb r0, [r4]\n\
     bl MarkBufferBankForExecution\n\
     ldr r4, _0801F444 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F448 @ =BattleScript_TargetPRLZHeal\n\
     b _0801F5F8\n\
     .align 2, 0\n\
@@ -4709,7 +4703,7 @@ _0801F44C:\n\
     ldr r4, _0801F45C @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F460 @ =BattleScript_AtkDefDown\n\
     b _0801F5F8\n\
     .align 2, 0\n\
@@ -4730,7 +4724,7 @@ _0801F47A:\n\
     ldr r4, _0801F49C @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r1, _0801F4A0 @ =gMoveEffectBS_Ptrs\n\
     ldr r0, _0801F4A4 @ =gBattleCommunication\n\
     ldrb r0, [r0, 0x3]\n\
@@ -4764,7 +4758,7 @@ _0801F4C4:\n\
     lsls r0, 5\n\
     orrs r1, r0\n\
     str r1, [r2]\n\
-    ldr r1, _0801F4F8 @ =gLockedMove\n\
+    ldr r1, _0801F4F8 @ =gLockedMoves\n\
     ldrb r0, [r3]\n\
     lsls r0, 1\n\
     adds r0, r1\n\
@@ -4787,7 +4781,7 @@ _0801F4F2:\n\
     str r0, [r2]\n\
     b _0801F5FA\n\
     .align 2, 0\n\
-_0801F4F8: .4byte gLockedMove\n\
+_0801F4F8: .4byte gLockedMoves\n\
 _0801F4FC: .4byte gCurrentMove\n\
 _0801F500:\n\
     mov r5, r8\n\
@@ -4858,7 +4852,7 @@ _0801F540:\n\
     ldr r4, _0801F5C8 @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F5CC @ =BattleScript_KnockedOff\n\
     str r0, [r4]\n\
     ldr r1, _0801F5D0 @ =gSharedMem\n\
@@ -4898,7 +4892,7 @@ _0801F5EC:\n\
     ldr r4, _0801F60C @ =gBattlescriptCurrInstr\n\
     ldr r0, [r4]\n\
     adds r0, 0x1\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _0801F610 @ =BattleScript_SAtkDown2\n\
 _0801F5F8:\n\
     str r0, [r4]\n\
@@ -4978,7 +4972,7 @@ static void atk19_tryfaintmon(void)
         {
             r4 = T1_READ_PTR(gBattlescriptCurrInstr + 3);
 
-            b_movescr_stack_pop_cursor();
+            BattleScriptPop();
             gBattlescriptCurrInstr = r4;
             gSideAffecting[GetBankSide(gActiveBank)] &= ~SIDE_STATUS_SPIKES_DAMAGED;
         }
@@ -5014,7 +5008,7 @@ static void atk19_tryfaintmon(void)
             ewram16100arr2(3, bank) = 0;
 
             gHitMarker |= HITMARKER_FAINTED(gActiveBank);
-            b_movescr_stack_push(gBattlescriptCurrInstr + 7);
+            BattleScriptPush(gBattlescriptCurrInstr + 7);
             gBattlescriptCurrInstr = r4;
             if (GetBankSide(gActiveBank) == 0)
             {
@@ -5037,7 +5031,7 @@ static void atk19_tryfaintmon(void)
             }
             if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBankAttacker].hp != 0)
             {
-                b_movescr_stack_push(gBattlescriptCurrInstr);
+                BattleScriptPush(gBattlescriptCurrInstr);
                 gBattleMoveDamage = gBattleMons[bank].hp;
                 gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife;
             }
@@ -5050,10 +5044,10 @@ static void atk19_tryfaintmon(void)
                 u8 moveIndex = ewram1608Carr(gBankAttacker);
 
                 gBattleMons[gBankAttacker].pp[moveIndex] = 0;
-                b_movescr_stack_push(gBattlescriptCurrInstr);
+                BattleScriptPush(gBattlescriptCurrInstr);
                 gBattlescriptCurrInstr = BattleScript_SelectingImprisionedMoveInPalace;
                 gActiveBank = gBankAttacker;
-                EmitSetAttributes(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBank].pp[moveIndex]);
+                EmitSetMonData(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBank].pp[moveIndex]);
                 MarkBufferBankForExecution(gActiveBank);
 
                 gBattleTextBuff1[0] = 0xFD;
@@ -5088,7 +5082,7 @@ static void atk1B_cleareffectsonfaint(void)
     {
         gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
         gBattleMons[gActiveBank].status1 = 0;
-        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBank].status1);
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBank].status1);
         MarkBufferBankForExecution(gActiveBank);
         UndoEffectsAfterFainting();
         gBattlescriptCurrInstr += 2;
@@ -5477,7 +5471,7 @@ static void atk23_getexp(void)
                 gBattleTextBuff2[4] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL);
                 gBattleTextBuff2[5] = 0xFF;
 
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gLeveledUpInBattle |= gBitTable[BATTLE_STRUCT->expGetterID];
                 gBattlescriptCurrInstr = BattleScript_LevelUp;
                 gBattleMoveDamage = (gBattleBufferB[gActiveBank][2] | (gBattleBufferB[gActiveBank][3] << 8));
@@ -6354,7 +6348,7 @@ _080206A8:\n\
     movs r0, 0x1\n\
     negs r0, r0\n\
     strb r0, [r4, 0x5]\n\
-    bl b_movescr_stack_push_cursor\n\
+    bl BattleScriptPushCursor\n\
     ldr r2, _080208D8 @ =gLeveledUpInBattle\n\
     ldr r1, _080208DC @ =gBitTable\n\
     ldrb r0, [r6]\n\
@@ -7283,26 +7277,26 @@ static void atk3B_healthbar_update(void)
 
 static void atk3C_return(void)
 {
-    b_movescr_stack_pop_cursor();
+    BattleScriptPop();
 }
 
 static void atk3D_end(void)
 {
     gBattleMoveFlags = 0;
     gActiveBank = 0;
-    gFightStateTracker = 0xB;
+    gCurrentActionFuncId = 0xB;
 }
 
 static void atk3E_end2(void)
 {
     //not much difference between this and 3D. It's more apparent in Emerald
     gActiveBank = 0;
-    gFightStateTracker = 0xB;
+    gCurrentActionFuncId = 0xB;
 }
 
 static void atk3F_end3(void) //pops the main function stack
 {
-    b_movescr_stack_pop_cursor();
+    BattleScriptPop();
     if (B_FUNCTION_STACK->size)
         B_FUNCTION_STACK->size--;
     gBattleMainFunc = B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size];
@@ -7310,7 +7304,7 @@ static void atk3F_end3(void) //pops the main function stack
 
 static void atk41_call(void)
 {
-    b_movescr_stack_push(gBattlescriptCurrInstr + 5);
+    BattleScriptPush(gBattlescriptCurrInstr + 5);
     gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
@@ -7354,7 +7348,7 @@ static void atk45_playanimation(void)
     }
     else if (gHitMarker & HITMARKER_NO_ANIMATIONS)
     {
-        b_movescr_stack_push(gBattlescriptCurrInstr + 7);
+        BattleScriptPush(gBattlescriptCurrInstr + 7);
         gBattlescriptCurrInstr = BattleScript_Pausex20;
     }
     else if (gBattlescriptCurrInstr[2] == B_ANIM_RAIN_CONTINUES
@@ -7467,7 +7461,7 @@ static void atk48_playstatchangeanimation(void)
             if (!(T2_READ_8(gBattlescriptCurrInstr + 3)))
             {
                 u8 ability;
-                if (gSideTimer[GetBankIdentity(gActiveBank) & 1].mistTimer)
+                if (gSideTimers[GetBankIdentity(gActiveBank) & 1].mistTimer)
                     continue;
                 ability = gBattleMons[gActiveBank].ability;
                 if (ability == ABILITY_CLEAR_BODY || ability == ABILITY_WHITE_SMOKE || (ability == ABILITY_KEEN_EYE && curr_stat == 6) || (ability == ABILITY_HYPER_CUTTER && curr_stat == 1))
@@ -7602,7 +7596,7 @@ _0802167C:\n\
     lsls r0, r1, 1\n\
     adds r0, r1\n\
     lsls r0, 2\n\
-    ldr r1, _08021704 @ =gSideTimer\n\
+    ldr r1, _08021704 @ =gSideTimers\n\
     adds r0, r1\n\
     ldrb r0, [r0, 0x2]\n\
     ldr r3, [sp]\n\
@@ -7665,7 +7659,7 @@ _080216E4:\n\
     b _08021770\n\
     .align 2, 0\n\
 _08021700: .4byte gActiveBank\n\
-_08021704: .4byte gSideTimer\n\
+_08021704: .4byte gSideTimers\n\
 _08021708: .4byte gBattleMons\n\
 _0802170C: .4byte gBattlescriptCurrInstr\n\
 _08021710:\n\
@@ -7830,7 +7824,7 @@ static void atk49_moveend(void)
                 && gBattleMoves[gCurrentMove].power && gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK] <= 0xB)
             {
                 gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK]++;
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
                 effect = 1;
             }
@@ -7844,9 +7838,9 @@ static void atk49_moveend(void)
             {
                 gBattleMons[gBankTarget].status1 &= ~(STATUS_FREEZE);
                 gActiveBank = gBankTarget;
-                EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1);
+                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1);
                 MarkBufferBankForExecution(gActiveBank);
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
                 effect = 1;
             }
@@ -7904,10 +7898,9 @@ static void atk49_moveend(void)
             }
             BATTLE_STRUCT->cmd49StateTracker++;
             break;
-        //sub_8015660 CheckIfMoveFailed
         case 9: //semi-invlurneable attacker make visible
             if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) || !(gStatuses3[gBankAttacker] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
-                || sub_8015660(gBankAttacker))
+                || WasUnableToUseMove(gBankAttacker))
                 {
                     gActiveBank = gBankAttacker;
                     EmitSpriteInvisibility(0, 0);
@@ -7919,7 +7912,7 @@ static void atk49_moveend(void)
             break;
         case 10: //semi-invlurneable target make visible
             if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) || !(gStatuses3[gBankTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
-                || sub_8015660(gBankTarget))
+                || WasUnableToUseMove(gBankTarget))
                 {
                     gActiveBank = gBankTarget;
                     EmitSpriteInvisibility(0, 0);
@@ -8019,7 +8012,7 @@ _08021874:\n\
     lsls r0, 2\n\
     adds r0, r2\n\
     ldr r0, [r0]\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r1, _080218B8 @ =gBattlescriptCurrInstr\n\
     ldr r0, _080218BC @ =gUnknown_081D9B2D\n\
     bl _0802229C\n\
@@ -8164,7 +8157,7 @@ _080219C8:\n\
     bgt _080219FE\n\
     adds r0, r2, 0x1\n\
     strb r0, [r1, 0x19]\n\
-    bl b_movescr_stack_push_cursor\n\
+    bl BattleScriptPushCursor\n\
     ldr r1, _08021A24 @ =gBattlescriptCurrInstr\n\
     ldr r0, _08021A28 @ =BattleScript_RageIsBuilding\n\
     str r0, [r1]\n\
@@ -8259,10 +8252,10 @@ _08021A92:\n\
     movs r1, 0x28\n\
     movs r2, 0\n\
     movs r3, 0x4\n\
-    bl EmitSetAttributes\n\
+    bl EmitSetMonData\n\
     ldrb r0, [r4]\n\
     bl MarkBufferBankForExecution\n\
-    bl b_movescr_stack_push_cursor\n\
+    bl BattleScriptPushCursor\n\
     ldr r1, _08021AE8 @ =gBattlescriptCurrInstr\n\
     ldr r0, _08021AEC @ =BattleScript_DefrostedViaFireMove\n\
     str r0, [r1]\n\
@@ -8572,7 +8565,7 @@ _08021D18:\n\
     cmp r0, 0\n\
     beq _08021D44\n\
     adds r0, r2, 0\n\
-    bl sub_8015660\n\
+    bl WasUnableToUseMove\n\
     lsls r0, 24\n\
     cmp r0, 0\n\
     beq _08021D7E\n\
@@ -9154,7 +9147,7 @@ _080221C0:\n\
     eors r0, r1\n\
     lsls r0, 24\n\
     lsrs r0, 24\n\
-    bl GetBankByPlayerAI\n\
+    bl GetBankByIdentity\n\
     lsls r0, 24\n\
     lsrs r2, r0, 24\n\
     ldr r1, _080222CC @ =gBattleMons\n\
@@ -9457,18 +9450,18 @@ static void atk4F_jumpifcantswitch(void)
     {
         if (GetBankSide(gActiveBank) == 1)
         {
-            r7 = GetBankByPlayerAI(1);
+            r7 = GetBankByIdentity(1);
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                to_cmp = GetBankByPlayerAI(3);
+                to_cmp = GetBankByIdentity(3);
             else
                 to_cmp = r7;
             party = gEnemyParty;
         }
         else
         {
-            r7 = GetBankByPlayerAI(0);
+            r7 = GetBankByIdentity(0);
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                to_cmp = GetBankByPlayerAI(2);
+                to_cmp = GetBankByIdentity(2);
             else
                 to_cmp = r7;
             party = gPlayerParty;
@@ -10528,7 +10521,7 @@ _080232C4:\n\
     eors r0, r1\n\
     lsls r0, 24\n\
     lsrs r0, 24\n\
-    bl GetBankByPlayerAI\n\
+    bl GetBankByIdentity\n\
     ldr r4, _08023310 @ =gActiveBank\n\
     strb r0, [r4]\n\
     ldr r0, _08023314 @ =gAbsentBankFlags\n\
@@ -10632,13 +10625,13 @@ static void atk52_switchineffects(void)
 
         gSideAffecting[GetBankSide(gActiveBank)] |= SIDE_STATUS_SPIKES_DAMAGED;
 
-        spikesDmg = (5 - gSideTimer[GetBankSide(gActiveBank)].spikesAmount) * 2;
+        spikesDmg = (5 - gSideTimers[GetBankSide(gActiveBank)].spikesAmount) * 2;
         gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / (spikesDmg);
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
         BATTLE_STRUCT->scriptingActive = gActiveBank;
-        b_movescr_stack_push_cursor();
+        BattleScriptPushCursor();
 
         if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0)
             gBattlescriptCurrInstr = BattleScript_SpikesOnTarget;
@@ -10660,8 +10653,8 @@ static void atk52_switchineffects(void)
 
             for (i = 0; i < gNoOfAllBanks; i++)
             {
-                if (gTurnOrder[i] == gActiveBank)
-                    gUnknown_02024A76[i] = 0xC;
+                if (gBanksByTurnOrder[i] == gActiveBank)
+                    gActionsByTurnOrder[i] = 0xC;
             }
 
             for (i = 0; i < gNoOfAllBanks; i++)
@@ -10690,9 +10683,9 @@ static void atk52_switchineffects(void)
 static void atk53_trainerslidein(void)
 {
     if (!T2_READ_8(gBattlescriptCurrInstr + 1))
-        gActiveBank = GetBankByPlayerAI(0);
+        gActiveBank = GetBankByIdentity(0);
     else
-        gActiveBank = GetBankByPlayerAI(1);
+        gActiveBank = GetBankByIdentity(1);
 
     EmitTrainerSlide(0);
     MarkBufferBankForExecution(gActiveBank);
@@ -10725,7 +10718,7 @@ static void atk56_playfaintcry(void)
 
 static void atk57(void)
 {
-    gActiveBank = GetBankByPlayerAI(0);
+    gActiveBank = GetBankByIdentity(0);
     Emitcmd55(0, gBattleOutcome);
     MarkBufferBankForExecution(gActiveBank);
     gBattlescriptCurrInstr += 1;
@@ -10758,12 +10751,12 @@ void atk59_handlelearnnewmove(void)
     }
     else
     {
-        gActiveBank = GetBankByPlayerAI(0);
+        gActiveBank = GetBankByIdentity(0);
         if (gBattlePartyID[gActiveBank] == BATTLE_STRUCT->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
             GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) //what is else if
         {
-            gActiveBank = GetBankByPlayerAI(2);
+            gActiveBank = GetBankByIdentity(2);
             if (gBattlePartyID[gActiveBank] == BATTLE_STRUCT->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
                 GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret);
         }
@@ -10838,7 +10831,7 @@ static void atk5A_yesnoboxlearnmove(void)
         }
         break;
     case 3:
-        if (!gPaletteFade.active && gMain.callback2 == sub_800F808)
+        if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2)
         {
             u8 move_pos = sub_809FA30();
             if (move_pos == 4)
@@ -11404,7 +11397,7 @@ static void atk68_cancelallactions(void)
     int i;
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        gUnknown_02024A76[i] = 0xC;
+        gActionsByTurnOrder[i] = 0xC;
     }
     gBattlescriptCurrInstr++;
 }
@@ -11458,7 +11451,7 @@ void atk6A_removeitem(void)
     USED_HELD_ITEMS(gActiveBank) = gBattleMons[gActiveBank].item;
 
     gBattleMons[gActiveBank].item = 0;
-    EmitSetAttributes(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item);
+    EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item);
     MarkBufferBankForExecution(gActiveBank);
     gBattlescriptCurrInstr += 2;
 }
@@ -11901,13 +11894,13 @@ _08024C48: .4byte gBattlescriptCurrInstr\n\
 
 static void atk6D_resetsentmonsvalue(void)
 {
-    sub_80156DC();
+    ResetSentPokesToOpponentValue();
     gBattlescriptCurrInstr++;
 }
 
 static void atk6E_setatktoplayer0(void)
 {
-    gBankAttacker = GetBankByPlayerAI(0);
+    gBankAttacker = GetBankByIdentity(0);
     gBattlescriptCurrInstr++;
 }
 
@@ -11943,7 +11936,7 @@ static void atk71_buffermovetolearn(void)
 
 static void atk72_jumpifplayerran(void)
 {
-    if (sub_8014AB8(gBank1))
+    if (TryRunFromBattle(gBank1))
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -12020,8 +12013,8 @@ static void atk76_various(void)
             u8 side;
             gBankAttacker = gBankTarget;
             side = GetBankSide(gBankAttacker) ^ 1;
-            if (gSideTimer[side].followmeTimer && gBattleMons[gSideTimer[side].followmeTarget].hp)
-                gBankTarget = gSideTimer[side].followmeTarget;
+            if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
+                gBankTarget = gSideTimers[side].followmeTarget;
             else
                 gBankTarget = gActiveBank;
         }
@@ -12080,7 +12073,7 @@ static void atk77_setprotectlike(void) //protect and endure
 
     if (last_move != MOVE_PROTECT && last_move != MOVE_DETECT && last_move != MOVE_ENDURE)
         gDisableStructs[gBankAttacker].protectUses = 0;
-    if (gCurrentMoveTurn == (gNoOfAllBanks - 1))
+    if (gCurrentTurnActionNumber == (gNoOfAllBanks - 1))
         not_last_turn = 0;
 
     if (sProtectSuccessRates[gDisableStructs[gBankAttacker].protectUses] > Random() && not_last_turn)
@@ -12149,7 +12142,7 @@ static void atk79_setatkhptozero(void)
 
     gActiveBank = gBankAttacker;
     gBattleMons[gActiveBank].hp = 0;
-    EmitSetAttributes(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp);
+    EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp);
     MarkBufferBankForExecution(gActiveBank);
 
     gBattlescriptCurrInstr++;
@@ -12266,7 +12259,7 @@ static void atk7E_setreflect(void)
     else
     {
         gSideAffecting[GetBankIdentity(gBankAttacker) & 1] |= SIDE_STATUS_REFLECT;
-        gSideTimer[GetBankIdentity(gBankAttacker) & 1].reflectTimer = 5;
+        gSideTimers[GetBankIdentity(gBankAttacker) & 1].reflectTimer = 5;
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMons(1) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         else
@@ -12334,7 +12327,7 @@ static void atk81_trysetrest(void)
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
         gBattleMons[gBankTarget].status1 = 3;
-        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
         MarkBufferBankForExecution(gActiveBank);
         gBattlescriptCurrInstr += 5;
     }
@@ -12502,7 +12495,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr)
 
     if ((statchanger << 0x18) < 0) //stat decrease
     {
-        if (gSideTimer[GetBankIdentity(gActiveBank) & 1].mistTimer && !r9 && gCurrentMove != MOVE_CURSE)
+        if (gSideTimers[GetBankIdentity(gActiveBank) & 1].mistTimer && !r9 && gCurrentMove != MOVE_CURSE)
         {
             if (flags == 1)
             {
@@ -12510,7 +12503,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr)
                     gBattlescriptCurrInstr = bs_ptr;
                 else
                 {
-                    b_movescr_stack_push(bs_ptr);
+                    BattleScriptPush(bs_ptr);
                     BATTLE_STRUCT->scriptingActive = gActiveBank;
                     gBattlescriptCurrInstr = BattleScript_MistProtected;
                     gSpecialStatuses[gActiveBank].statloweringflag = 1;
@@ -12531,7 +12524,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr)
                     gBattlescriptCurrInstr = bs_ptr;
                 else
                 {
-                    b_movescr_stack_push(bs_ptr);
+                    BattleScriptPush(bs_ptr);
                     BATTLE_STRUCT->scriptingActive = gActiveBank;
                     gBattlescriptCurrInstr = BattleScript_AbilityNoStatLoss;
                     gLastUsedAbility = gBattleMons[gActiveBank].ability;
@@ -12545,7 +12538,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr)
         {
             if (flags == 1)
             {
-                b_movescr_stack_push(bs_ptr);
+                BattleScriptPush(bs_ptr);
                 BATTLE_STRUCT->scriptingActive = gActiveBank;
                 gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss;
                 gLastUsedAbility = gBattleMons[gActiveBank].ability;
@@ -12557,7 +12550,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr)
         {
             if (flags == 1)
             {
-                b_movescr_stack_push(bs_ptr);
+                BattleScriptPush(bs_ptr);
                 BATTLE_STRUCT->scriptingActive = gActiveBank;
                 gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss;
                 gLastUsedAbility = gBattleMons[gActiveBank].ability;
@@ -12728,7 +12721,7 @@ _08025E88:\n\
     blt _08025EAC\n\
     b _080261B0\n\
 _08025EAC:\n\
-    ldr r4, _08025F04 @ =gSideTimer\n\
+    ldr r4, _08025F04 @ =gSideTimers\n\
     ldr r1, _08025EF8 @ =gActiveBank\n\
     ldrb r0, [r1]\n\
     bl GetBankIdentity\n\
@@ -12769,13 +12762,13 @@ _08025EAC:\n\
 _08025EF8: .4byte gActiveBank\n\
 _08025EFC: .4byte gBankTarget\n\
 _08025F00: .4byte gBattleTextBuff1\n\
-_08025F04: .4byte gSideTimer\n\
+_08025F04: .4byte gSideTimers\n\
 _08025F08: .4byte gCurrentMove\n\
 _08025F0C: .4byte gSpecialStatuses\n\
 _08025F10: .4byte gBattlescriptCurrInstr\n\
 _08025F14:\n\
     mov r0, r8\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _08025F40 @ =gSharedMem\n\
     ldr r6, _08025F44 @ =gActiveBank\n\
     ldrb r1, [r6]\n\
@@ -12870,7 +12863,7 @@ _08025FD8: .4byte gSpecialStatuses\n\
 _08025FDC: .4byte gBattlescriptCurrInstr\n\
 _08025FE0:\n\
     mov r0, r8\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _08026028 @ =gSharedMem\n\
     ldr r2, _0802602C @ =gActiveBank\n\
     ldrb r1, [r2]\n\
@@ -12927,7 +12920,7 @@ _08026040:\n\
     cmp r5, 0x1\n\
     bne _08025F74\n\
     mov r0, r8\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _08026094 @ =gSharedMem\n\
     ldr r3, _08026090 @ =gActiveBank\n\
     ldrb r1, [r3]\n\
@@ -12975,7 +12968,7 @@ _080260A8:\n\
     b _08025F74\n\
 _080260CA:\n\
     mov r0, r8\n\
-    bl b_movescr_stack_push\n\
+    bl BattleScriptPush\n\
     ldr r0, _08026100 @ =gSharedMem\n\
     ldr r3, _080260FC @ =gActiveBank\n\
     ldrb r1, [r3]\n\
@@ -13251,7 +13244,7 @@ static void atk8A_normalisebuffs(void) //haze
 static void atk8B_setbide(void)
 {
     gBattleMons[gBankAttacker].status2 |= STATUS2_MULTIPLETURNS;
-    gLockedMove[gBankAttacker] = gCurrentMove;
+    gLockedMoves[gBankAttacker] = gCurrentMove;
     gTakenDmg[gBankAttacker] = 0;
     gBattleMons[gBankAttacker].status2 |= (STATUS2_BIDE - 0x100); //2 turns
     gBattlescriptCurrInstr++;
@@ -13471,7 +13464,7 @@ static void atk91_givepaydaymoney(void)
         gBattleTextBuff1[4] = gPaydayMoney;
         gBattleTextBuff1[5] = uBYTE1_16(gPaydayMoney);
         gBattleTextBuff1[6] = 0xFF;
-        b_movescr_stack_push(gBattlescriptCurrInstr + 1);
+        BattleScriptPush(gBattlescriptCurrInstr + 1);
         gBattlescriptCurrInstr = BattleScript_PrintPayDayMoneyString;
     }
     else
@@ -13488,7 +13481,7 @@ static void atk92_setlightscreen(void)
     else
     {
         gSideAffecting[GetBankIdentity(gBankAttacker) & 1] |= SIDE_STATUS_LIGHTSCREEN;
-        gSideTimer[GetBankIdentity(gBankAttacker) & 1].lightscreenTimer = 5;
+        gSideTimers[GetBankIdentity(gBankAttacker) & 1].lightscreenTimer = 5;
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMons(1) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
         else
@@ -14034,7 +14027,7 @@ static void atk98_updatestatusicon(void)
         }
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            gActiveBank = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2);
+            gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
             if (!(gAbsentBankFlags & gBitTable[gActiveBank]))
             {
                 EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
@@ -14047,14 +14040,14 @@ static void atk98_updatestatusicon(void)
 
 static void atk99_setmist(void)
 {
-    if (gSideTimer[GetBankIdentity(gBankAttacker) & 1].mistTimer)
+    if (gSideTimers[GetBankIdentity(gBankAttacker) & 1].mistTimer)
     {
         gBattleMoveFlags |= MOVESTATUS_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gSideTimer[GetBankIdentity(gBankAttacker) & 1].mistTimer = 5;
+        gSideTimers[GetBankIdentity(gBankAttacker) & 1].mistTimer = 5;
         gSideAffecting[GetBankIdentity(gBankAttacker) & 1] |= SIDE_STATUS_MIST;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
@@ -14315,8 +14308,8 @@ static void atkA1_counterdamagecalculator(void)
     if (gProtectStructs[gBankAttacker].physicalDmg && atk_side != def_side && gBattleMons[gProtectStructs[gBankAttacker].physicalBank].hp)
     {
         gBattleMoveDamage = gProtectStructs[gBankAttacker].physicalDmg * 2;
-        if (gSideTimer[def_side].followmeTimer && gBattleMons[gSideTimer[def_side].followmeTarget].hp)
-            gBankTarget = gSideTimer[def_side].followmeTarget;
+        if (gSideTimers[def_side].followmeTimer && gBattleMons[gSideTimers[def_side].followmeTarget].hp)
+            gBankTarget = gSideTimers[def_side].followmeTarget;
         else
             gBankTarget = gProtectStructs[gBankAttacker].physicalBank;
         gBattlescriptCurrInstr += 5;
@@ -14335,8 +14328,8 @@ static void atkA2_mirrorcoatdamagecalculator(void) //a copy of atkA1 with the ph
     if (gProtectStructs[gBankAttacker].specialDmg && atk_side != def_side && gBattleMons[gProtectStructs[gBankAttacker].specialBank].hp)
     {
         gBattleMoveDamage = gProtectStructs[gBankAttacker].specialDmg * 2;
-        if (gSideTimer[def_side].followmeTimer && gBattleMons[gSideTimer[def_side].followmeTarget].hp)
-            gBankTarget = gSideTimer[def_side].followmeTarget;
+        if (gSideTimers[def_side].followmeTimer && gBattleMons[gSideTimers[def_side].followmeTarget].hp)
+            gBankTarget = gSideTimers[def_side].followmeTarget;
         else
             gBankTarget = gProtectStructs[gBankAttacker].specialBank;
         gBattlescriptCurrInstr += 5;
@@ -14767,7 +14760,7 @@ static void atkA8_copymovepermanently(void)
                 moves_data.pp[i] = gBattleMons[gBankAttacker].pp[i];
             }
             moves_data.ppBonuses = gBattleMons[gBankAttacker].ppBonuses;
-            EmitSetAttributes(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct move_pp), &moves_data);
+            EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct move_pp), &moves_data);
             MarkBufferBankForExecution(gActiveBank);
             gBattleTextBuff1[0] = 0xFD;
             gBattleTextBuff1[1] = 2;
@@ -14910,7 +14903,7 @@ static void atkAD_tryspiteppreduce(void)
             if (!(gDisableStructs[gActiveBank].unk18_b & gBitTable[i])
                 && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
             {
-                EmitSetAttributes(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]);
+                EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]);
                 MarkBufferBankForExecution(gActiveBank);
             }
             gBattlescriptCurrInstr += 5;
@@ -14948,7 +14941,7 @@ static void atkAE_healpartystatus(void)
             gBattleCommunication[MULTISTRING_CHOOSER] |= 1;
         }
 
-        gActiveBank = BATTLE_STRUCT->scriptingActive = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2);
+        gActiveBank = BATTLE_STRUCT->scriptingActive = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]))
         {
             if (gBattleMons[gActiveBank].ability != ABILITY_SOUNDPROOF)
@@ -14986,14 +14979,14 @@ static void atkAE_healpartystatus(void)
         to_heal = 0x3F;
         gBattleMons[gBankAttacker].status1 = zero2;
 
-        gActiveBank = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2);
+        gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]))
             gBattleMons[gActiveBank].status1 = 0;
 
     }
     //missing check?
     gActiveBank = gBankAttacker;
-    EmitSetAttributes(0, REQUEST_STATUS_BATTLE, to_heal, 4, &zero);
+    EmitSetMonData(0, REQUEST_STATUS_BATTLE, to_heal, 4, &zero);
     MarkBufferBankForExecution(gActiveBank);
 
     gBattlescriptCurrInstr++;
@@ -15018,7 +15011,7 @@ static void atkAF_cursetarget(void)
 static void atkB0_trysetspikes(void)
 {
     u8 side = GetBankSide(gBankAttacker) ^ 1;
-    if (gSideTimer[side].spikesAmount == 3)
+    if (gSideTimers[side].spikesAmount == 3)
     {
         gSpecialStatuses[gBankAttacker].flag20 = 1;
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -15026,7 +15019,7 @@ static void atkB0_trysetspikes(void)
     else
     {
         gSideAffecting[side] |= SIDE_STATUS_SPIKES;
-        gSideTimer[side].spikesAmount++;
+        gSideTimers[side].spikesAmount++;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -15053,7 +15046,7 @@ static void atkB2_trysetperishsong(void)
         }
     }
 
-    sub_80153D0(gBankAttacker);
+    PressurePPLoseOnUsingPerishSong(gBankAttacker);
     if (not_affected_pokes == gNoOfAllBanks)
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
@@ -15075,7 +15068,7 @@ static void atkB3_rolloutdamagecalculation(void)
             gDisableStructs[gBankAttacker].rolloutTimer1 = 5;
             gDisableStructs[gBankAttacker].rolloutTimer2 = 5;
             gBattleMons[gBankAttacker].status2 |= STATUS2_MULTIPLETURNS;
-            gLockedMove[gBankAttacker] = gCurrentMove;
+            gLockedMoves[gBankAttacker] = gCurrentMove;
         }
         if (--gDisableStructs[gBankAttacker].rolloutTimer1 == 0)
             gBattleMons[gBankAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
@@ -15167,7 +15160,7 @@ static void atkB8_setsafeguard(void)
     else
     {
         gSideAffecting[GetBankIdentity(gBankAttacker) & 1] |= SIDE_STATUS_SAFEGUARD;
-        gSideTimer[GetBankIdentity(gBankAttacker) & 1].safeguardTimer = 5;
+        gSideTimers[GetBankIdentity(gBankAttacker) & 1].safeguardTimer = 5;
         gBattleCommunication[MULTISTRING_CHOOSER] = 5;
     }
     gBattlescriptCurrInstr++;
@@ -15234,16 +15227,16 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
     if (gMultiHitCounter == 1)
     {
         if (GetBankSide(gBankAttacker) == 0)
-            gBankTarget = GetBankByPlayerAI(1);
+            gBankTarget = GetBankByIdentity(1);
         else
-            gBankTarget = GetBankByPlayerAI(0);
+            gBankTarget = GetBankByIdentity(0);
     }
     else
     {
         if (GetBankSide(gBankAttacker) == 0)
-            gBankTarget = GetBankByPlayerAI(3);
+            gBankTarget = GetBankByIdentity(3);
         else
-            gBankTarget = GetBankByPlayerAI(2);
+            gBankTarget = GetBankByIdentity(2);
     }
 
     if (gActionForBanks[gBankTarget] == 0 && gBankAttacker == ewram16010arr(gBankTarget) && !(gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE))
@@ -15252,8 +15245,8 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
         int i;
         for (i = 0; i < gNoOfAllBanks; i++)
         {
-            if (gTurnOrder[i] == gBankTarget)
-                gUnknown_02024A76[i] = 11;
+            if (gBanksByTurnOrder[i] == gBankTarget)
+                gActionsByTurnOrder[i] = 11;
         }
         gCurrentMove = MOVE_PURSUIT;
         gBattlescriptCurrInstr += 5;
@@ -15321,21 +15314,21 @@ static void atkBE_rapidspinfree(void) //rapid spin
         gBattleTextBuff1[2] = ewram16004arr(0, gBankAttacker);
         gBattleTextBuff1[3] = ewram16004arr(1, gBankAttacker);
         gBattleTextBuff1[4] = 0xFF;
-        b_movescr_stack_push_cursor();
+        BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_WrapFree;
     }
     else if (gStatuses3[gBankAttacker] & STATUS3_LEECHSEED)
     {
         gStatuses3[gBankAttacker] &= ~(STATUS3_LEECHSEED);
         gStatuses3[gBankAttacker] &= ~(STATUS3_LEECHSEED_BANK);
-        b_movescr_stack_push_cursor();
+        BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_LeechSeedFree;
     }
     else if (gSideAffecting[GetBankSide(gBankAttacker)] & SIDE_STATUS_SPIKES)
     {
         gSideAffecting[GetBankSide(gBankAttacker)] &= ~(SIDE_STATUS_SPIKES);
-        gSideTimer[GetBankSide(gBankAttacker)].spikesAmount = 0;
-        b_movescr_stack_push_cursor();
+        gSideTimers[GetBankSide(gBankAttacker)].spikesAmount = 0;
+        BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_SpikesFree;
     }
     else
@@ -15935,8 +15928,8 @@ static void atkC9_jumpifattackandspecialattackcannotfall(void) //memento
 
 static void atkCA_setforcedtarget(void) //follow me
 {
-    gSideTimer[GetBankSide(gBankAttacker)].followmeTimer = 1;
-    gSideTimer[GetBankSide(gBankAttacker)].followmeTarget = gBankAttacker;
+    gSideTimers[GetBankSide(gBankAttacker)].followmeTimer = 1;
+    gSideTimers[GetBankSide(gBankAttacker)].followmeTarget = gBankAttacker;
     gBattlescriptCurrInstr++;
 }
 
@@ -15953,7 +15946,7 @@ static void atkCC_callterrainattack(void) //nature power
     gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
     gCurrentMove = sNaturePowerMoves[gBattleTerrain];
     gBankTarget = GetMoveTarget(gCurrentMove, 0);
-    b_movescr_stack_push(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
+    BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
     gBattlescriptCurrInstr++;
 }
 
@@ -15964,7 +15957,7 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) //refresh
         gBattleMons[gBankAttacker].status1 = 0;
         gBattlescriptCurrInstr += 5;
         gActiveBank = gBankAttacker;
-        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
         MarkBufferBankForExecution(gActiveBank);
     }
     else
@@ -16004,7 +15997,7 @@ static void atkD0_settaunt(void)
 
 static void atkD1_trysethelpinghand(void)
 {
-    gBankTarget = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2);
+    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gBankTarget])
         && !gProtectStructs[gBankAttacker].helpingHand && !gProtectStructs[gBankTarget].helpingHand)
     {
@@ -16223,7 +16216,7 @@ _0802A36C:\n\
     movs r1, 0x2\n\
     movs r2, 0\n\
     movs r3, 0x2\n\
-    bl EmitSetAttributes\n\
+    bl EmitSetMonData\n\
     ldr r2, _0802A45C @ =gBankAttacker\n\
     ldrb r0, [r2]\n\
     bl MarkBufferBankForExecution\n\
@@ -16241,7 +16234,7 @@ _0802A36C:\n\
     movs r1, 0x2\n\
     movs r2, 0\n\
     movs r3, 0x2\n\
-    bl EmitSetAttributes\n\
+    bl EmitSetMonData\n\
     ldrb r0, [r7]\n\
     bl MarkBufferBankForExecution\n\
     ldr r0, _0802A464 @ =0xfffe9f10\n\
@@ -16472,7 +16465,7 @@ static void atkDB_tryimprision(void)
     else
     {
         u8 bank;
-        sub_801529C(gBankAttacker);
+        PressurePPLoseOnUsingImprision(gBankAttacker);
         for (bank = 0; bank < gNoOfAllBanks; bank++)
         {
             if (r8 != GetBankSide(bank))
@@ -16774,7 +16767,7 @@ static void atkDF_trysetmagiccoat(void)
 {
     gBankTarget = gBankAttacker;
     gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentMoveTurn == gNoOfAllBanks - 1) //last turn
+    if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) //last turn
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
     {
@@ -16786,7 +16779,7 @@ static void atkDF_trysetmagiccoat(void)
 static void atkE0_trysetsnatch(void)
 {
     gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentMoveTurn == gNoOfAllBanks - 1) //last turn
+    if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) //last turn
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
     {
@@ -16827,7 +16820,7 @@ static void atkE2_switchoutabilities(void)
     {
     case ABILITY_NATURAL_CURE:
         gBattleMons[gActiveBank].status1 = 0;
-        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, gBitTable[ewram16064arr(gActiveBank)], 4, &gBattleMons[gActiveBank].status1);
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[ewram16064arr(gActiveBank)], 4, &gBattleMons[gActiveBank].status1);
         MarkBufferBankForExecution(gActiveBank);
         break;
     }
@@ -16923,7 +16916,7 @@ static void atkE7_trycastformdatachange(void)
     form = CastformDataTypeChange(BATTLE_STRUCT->scriptingActive);
     if (form)
     {
-        b_push_move_exec(BattleScript_CastformChange);
+        BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
         BATTLE_STRUCT->castformToChangeInto = form - 1;
     }
 }
@@ -16985,7 +16978,7 @@ static void atkEA_tryrecycleitem(void)
         gLastUsedItem = *used_item;
         *used_item = 0;
         gBattleMons[gActiveBank].item = gLastUsedItem;
-        EmitSetAttributes(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item);
+        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item);
         MarkBufferBankForExecution(gActiveBank);
         gBattlescriptCurrInstr += 5;
     }
@@ -17011,10 +17004,10 @@ static void atkEB_settypetoterrain(void)
 
 static void atkEC_pursuitrelated(void)
 {
-    gActiveBank = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2);
+    gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]) && gActionForBanks[gActiveBank] == 0 && gChosenMovesByBanks[gActiveBank] == MOVE_PURSUIT)
     {
-        gUnknown_02024A76[gActiveBank] = 11;
+        gActionsByTurnOrder[gActiveBank] = 11;
         gCurrentMove = MOVE_PURSUIT;
         gBattlescriptCurrInstr += 5;
         BATTLE_STRUCT->animTurn = 1;
@@ -17039,12 +17032,12 @@ static void atkED_snatchsetbanks(void)
 static void atkEE_removelightscreenreflect(void) //brick break
 {
     u8 side = GetBankSide(gBankAttacker) ^ 1;
-    if (gSideTimer[side].reflectTimer || gSideTimer[side].lightscreenTimer)
+    if (gSideTimers[side].reflectTimer || gSideTimers[side].lightscreenTimer)
     {
         gSideAffecting[side] &= ~(SIDE_STATUS_REFLECT);
         gSideAffecting[side] &= ~(SIDE_STATUS_LIGHTSCREEN);
-        gSideTimer[side].reflectTimer = 0;
-        gSideTimer[side].lightscreenTimer = 0;
+        gSideTimers[side].reflectTimer = 0;
+        gSideTimers[side].lightscreenTimer = 0;
         BATTLE_STRUCT->animTurn = 1;
         BATTLE_STRUCT->animTargetsHit = 1;
     }
@@ -17230,7 +17223,7 @@ static void atkF2_displaydexinfo(void)
         }
         break;
     case 2:
-        if (!gPaletteFade.active && gMain.callback2 == sub_800F808 && !gTasks[gBattleCommunication[1]].isActive)
+        if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2 && !gTasks[gBattleCommunication[1]].isActive)
         {
             LZDecompressVram(gBattleTerrainTiles_Building, (void*)(0x06008000));
             LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(0x0600d000));
@@ -17394,12 +17387,12 @@ static void atkF3_trygivecaughtmonnick(void)
         if (!gPaletteFade.active)
         {
             GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_NICKNAME, BATTLE_STRUCT->caughtNick);
-            DoNamingScreen(2, BATTLE_STRUCT->caughtNick, GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_SPECIES), GetMonGender(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]]), GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_PERSONALITY, 0), sub_800F808);
+            DoNamingScreen(2, BATTLE_STRUCT->caughtNick, GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_SPECIES), GetMonGender(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]]), GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_PERSONALITY, 0), BattleMainCB2);
             gBattleCommunication[0]++;
         }
         break;
     case 3:
-        if (gMain.callback2 == sub_800F808 && !gPaletteFade.active )
+        if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active )
         {
             SetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_NICKNAME, BATTLE_STRUCT->caughtNick);
             gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -17428,11 +17421,11 @@ static void atkF5_removeattackerstatus1(void)
 
 static void atkF6_finishaction(void)
 {
-    gFightStateTracker = 0xC;
+    gCurrentActionFuncId = 0xC;
 }
 
 static void atkF7_finishturn(void)
 {
-    gFightStateTracker = 0xC;
-    gCurrentMoveTurn = gNoOfAllBanks;
+    gCurrentActionFuncId = 0xC;
+    gCurrentTurnActionNumber = gNoOfAllBanks;
 }
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 7ca9ac3c4..1c79d7ebf 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -3,6 +3,7 @@
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "blend_palette.h"
+#include "contest.h"
 #include "data2.h"
 #include "decompress.h"
 #include "main.h"
@@ -629,9 +630,9 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
         if (IsContest())
         {
             r10 = 0;
-            species = ewram19348.unk2;
-            personalityValue = ewram19348.unk8;
-            otId = ewram19348.unkC;
+            species = shared19348.unk2;
+            personalityValue = shared19348.unk8;
+            otId = shared19348.unkC;
             HandleLoadSpecialPokePic(
               &gMonBackPicTable[species],
               gMonBackPicCoords[species].coords,
@@ -639,7 +640,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
               eVoidSharedArr2,
               gUnknown_081FAF4C[0],
               species,
-              ewram19348.unk10);
+              shared19348.unk10);
         }
         else
         {
@@ -794,7 +795,7 @@ void sub_80324F8(struct Pokemon *pkmn, u8 b)
 
 void BattleMusicStop(void)
 {
-    u8 r4 = GetBankByPlayerAI(0);
+    u8 r4 = GetBankByIdentity(0);
 
     ewram17800[r4].unk0_1 = 0;
     if (IsDoubleBattle())
@@ -814,8 +815,8 @@ void sub_8032638(void)
 {
     if (gMain.inBattle)
     {
-        u8 r8 = GetBankByPlayerAI(0);
-        u8 r9 = GetBankByPlayerAI(2);
+        u8 r8 = GetBankByIdentity(0);
+        u8 r9 = GetBankByIdentity(2);
         u8 r4 = pokemon_order_func(gBattlePartyID[r8]);
         u8 r5 = pokemon_order_func(gBattlePartyID[r9]);
 
@@ -856,12 +857,12 @@ void sub_80327CC(void)
     u8 r5;
 
     LoadCompressedObjectPic(&gUnknown_081FAF24);
-    r5 = GetBankByPlayerAI(1);
+    r5 = GetBankByIdentity(1);
     ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
     gSprites[ewram17810[r5].unk7].data[0] = r5;
     if (IsDoubleBattle())
     {
-        r5 = GetBankByPlayerAI(3);
+        r5 = GetBankByIdentity(3);
         ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
         gSprites[ewram17810[r5].unk7].data[0] = r5;
     }
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 1fa7a2ed2..977e91f5c 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -1275,7 +1275,7 @@ static void BattleAICmd_if_arg_not_equal(void)
 
 static void BattleAICmd_if_would_go_first(void)
 {
-    if (GetWhoStrikesFirst(gBankAttacker, gBankTarget, 1) == gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(gBankAttacker, gBankTarget, TRUE) == gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1283,7 +1283,7 @@ static void BattleAICmd_if_would_go_first(void)
 
 static void BattleAICmd_if_would_not_go_first(void)
 {
-    if (GetWhoStrikesFirst(gBankAttacker, gBankTarget, 1) != gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(gBankAttacker, gBankTarget, TRUE) != gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1321,7 +1321,7 @@ static void BattleAICmd_count_alive_pokemon(void)
         u32 status;
         var = gBattlePartyID[index];
         status = GetBankIdentity(index) ^ 2;
-        var2 = gBattlePartyID[GetBankByPlayerAI(status)];
+        var2 = gBattlePartyID[GetBankByIdentity(status)];
     }
     else
     {
diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index 3097f1a0e..c35434df0 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
@@ -108,17 +108,17 @@ void sub_80A7FA0(u8 taskId)
         switch (gBattleAnimArgs[0])
         {
         case 4:
-            side = GetBankByPlayerAI(0);
+            side = GetBankByIdentity(0);
             break;
         case 5:
-            side = GetBankByPlayerAI(2);
+            side = GetBankByIdentity(2);
             break;
         case 6:
-            side = GetBankByPlayerAI(1);
+            side = GetBankByIdentity(1);
             break;
         case 7:
         default:
-            side = GetBankByPlayerAI(3);
+            side = GetBankByIdentity(3);
             break;
         }
         if (IsAnimBankSpriteVisible(side) == FALSE)
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 35d8f33c8..54181bc21 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -48,8 +48,8 @@ extern u8 gUnknown_02024E68[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u8 gAnimMoveTurn;
 extern struct Window gUnknown_03004210;
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern u8 gUnknown_0300434C[];
 extern u32 gBattleExecBuffer;
 extern MainCallback gPreBattleCallback1;
@@ -1410,8 +1410,8 @@ void sub_8039B64(void)
 
 void LinkOpponentHandlePrintString(void)
 {
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
     sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
     gBattleBankFunc[gActiveBank] = sub_8037C2C;
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index adc3c1c85..2c78d4a82 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -48,8 +48,8 @@ extern u8 gAnimFriendship;
 extern u16 gWeatherMoveAnim;
 extern u8 gAnimMoveTurn;
 extern struct Window gUnknown_03004210;
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern MainCallback gPreBattleCallback1;
 extern void (*gBattleBankFunc[])(void);
 extern u8 gHealthboxIDs[];
@@ -1355,8 +1355,8 @@ void sub_811FF30(void)
 
 void LinkPartnerHandlePrintString(void)
 {
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
     sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
     gBattleBankFunc[gActiveBank] = sub_811DFA0;
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 54bb9d7f9..ab7b6944b 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -50,8 +50,8 @@ extern u8 gAnimMoveTurn;
 extern u8 gAnimScriptActive;
 extern void (*gAnimScriptCallback)(void);
 extern struct Window gUnknown_03004210;
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern u8 gDisplayedStringBattle[];
 extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
@@ -98,7 +98,7 @@ extern void sub_80324BC();
 extern void BufferStringBattle();
 extern void sub_80331D0(void);
 extern void sub_8036B0C(void);
-extern u8 GetBankByPlayerAI(u8);
+extern u8 GetBankByIdentity(u8);
 extern u8 sub_8036CD4(void);
 extern void sub_80330C8(void);
 extern void sub_8043D84();
@@ -1404,8 +1404,8 @@ void sub_8035238(void)
 
 void OpponentHandlePrintString(void)
 {
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
     sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
     gBattleBankFunc[gActiveBank] = sub_80331D0;
@@ -1451,9 +1451,9 @@ void OpponentHandlecmd20(void)
                 gBankTarget = gActiveBank;
             if (gBattleMoves[r5->moves[r4]].target & 8)
             {
-                gBankTarget = GetBankByPlayerAI(0);
+                gBankTarget = GetBankByIdentity(0);
                 if (gAbsentBankFlags & gBitTable[gBankTarget])
-                    gBankTarget = GetBankByPlayerAI(2);
+                    gBankTarget = GetBankByIdentity(2);
             }
             r4 |= gBankTarget << 8;
             Emitcmd33(1, 10, r4);
@@ -1479,13 +1479,13 @@ void OpponentHandlecmd20(void)
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
-            u16 r2 = GetBankByPlayerAI(Random() & 2) << 8;
+            u16 r2 = GetBankByIdentity(Random() & 2) << 8;
 
             Emitcmd33(1, 10, r4 | r2);
         }
         else
         {
-            u16 r2 = GetBankByPlayerAI(0) << 8;
+            u16 r2 = GetBankByIdentity(0) << 8;
 
             Emitcmd33(1, 10, r4 | r2);
         }
@@ -1561,7 +1561,7 @@ _08035494:\n\
     cmp r0, 0\n\
     beq _080354CE\n\
     movs r0, 0\n\
-    bl GetBankByPlayerAI\n\
+    bl GetBankByIdentity\n\
     ldr r5, _080354EC @ =gBankTarget\n\
     strb r0, [r5]\n\
     ldr r0, _080354F0 @ =gAbsentBankFlags\n\
@@ -1575,7 +1575,7 @@ _08035494:\n\
     cmp r1, 0\n\
     beq _080354CE\n\
     movs r0, 0x2\n\
-    bl GetBankByPlayerAI\n\
+    bl GetBankByIdentity\n\
     strb r0, [r5]\n\
 _080354CE:\n\
     ldr r0, _080354EC @ =gBankTarget\n\
@@ -1640,7 +1640,7 @@ _0803553C:\n\
     lsls r1, 24\n\
     lsrs r1, 24\n\
     adds r0, r1, 0\n\
-    bl GetBankByPlayerAI\n\
+    bl GetBankByIdentity\n\
     adds r2, r0, 0\n\
     lsls r2, 24\n\
     lsrs r2, 16\n\
@@ -1653,7 +1653,7 @@ _0803553C:\n\
 _0803556C: .4byte gBattleTypeFlags\n\
 _08035570:\n\
     movs r0, 0\n\
-    bl GetBankByPlayerAI\n\
+    bl GetBankByIdentity\n\
     adds r2, r0, 0\n\
     lsls r2, 24\n\
     lsrs r2, 16\n\
@@ -1692,13 +1692,13 @@ void OpponentHandlecmd22(void)
         {
             if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
             {
-                r5 = GetBankByPlayerAI(1);
+                r5 = GetBankByIdentity(1);
                 r6 = r5;
             }
             else
             {
-                r6 = GetBankByPlayerAI(1);
-                r5 = GetBankByPlayerAI(3);
+                r6 = GetBankByIdentity(1);
+                r5 = GetBankByIdentity(3);
             }
             for (r4 = 0; r4 < 6; r4++)
             {
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 70773473d..f992e3e51 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -35,8 +35,8 @@ struct MovePpInfo
 #define SUB_803037C_TILE_DATA_OFFSET 444
 #endif
 
-extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042A0;
+extern u16 gBattle_BG0_X;
+extern u16 gBattle_BG0_Y;
 
 extern struct Window gUnknown_03004210;
 
@@ -72,7 +72,7 @@ extern u16 gBattle_BG1_Y;
 extern u16 gUnknown_030041B8;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG2_X;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG1_X;
 extern u8 gUnknown_03004344;
 extern u8 gUnknown_0300434C[];
@@ -118,7 +118,7 @@ extern void sub_8031F24(void);
 extern void sub_80324BC();
 extern u8 sub_8031720();
 extern void bx_wait_t1(void);
-extern u8 GetBankByPlayerAI(u8);
+extern u8 GetBankByIdentity(u8);
 extern void sub_802DE10(void);
 extern void sub_80105EC(struct Sprite *);
 extern void sub_802D274(void);
@@ -148,8 +148,8 @@ extern u8 gAbsentBankFlags;
 extern u8 gUnknown_03004344;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[];
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern struct Window gUnknown_03004210;
 extern const u8 BattleText_SwitchWhich[];
 extern u8 gUnknown_03004348;
@@ -167,7 +167,7 @@ extern const u8 BattleText_LinkStandby[];
 
 extern void dp11b_obj_instanciate(u8, u8, s8, s8);
 extern u8 GetBankIdentity(u8);
-extern u8 GetBankByPlayerAI(u8);
+extern u8 GetBankByIdentity(u8);
 extern void dp11b_obj_free(u8, u8);
 extern void sub_8010520(struct Sprite *);
 extern void sub_8010574(struct Sprite *);
@@ -445,7 +445,7 @@ void sub_802C098(void)
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
          && GetBankIdentity(gActiveBank) == 2
-         && !(gAbsentBankFlags & gBitTable[GetBankByPlayerAI(0)])
+         && !(gAbsentBankFlags & gBitTable[GetBankByIdentity(0)])
          && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
             if (gBattleBufferA[gActiveBank][1] == 1)
@@ -529,7 +529,7 @@ void sub_802C2EC(void)
                 i--;
                 if (i < 0)
                     i = 3;
-                gUnknown_03004344 = GetBankByPlayerAI(arr[i]);
+                gUnknown_03004344 = GetBankByIdentity(arr[i]);
             } while(gUnknown_03004344 == gNoOfAllBanks);
             i = 0;
             switch (GetBankIdentity(gUnknown_03004344))
@@ -576,7 +576,7 @@ void sub_802C2EC(void)
                 i++;
                 if (i > 3)
                     i = 0;
-                gUnknown_03004344 = GetBankByPlayerAI(arr[i]);
+                gUnknown_03004344 = GetBankByIdentity(arr[i]);
             } while (gUnknown_03004344 == gNoOfAllBanks);
             i = 0;
             switch (GetBankIdentity(gUnknown_03004344))
@@ -636,7 +636,7 @@ void sub_802C68C(void)
         if (r4 & 0x10)
             gUnknown_03004344 = gActiveBank;
         else
-            gUnknown_03004344 = GetBankByPlayerAI((GetBankIdentity(gActiveBank) & 1) ^ 1);
+            gUnknown_03004344 = GetBankByIdentity((GetBankIdentity(gActiveBank) & 1) ^ 1);
 
         if (gBattleBufferA[gActiveBank][1] == 0)
         {
@@ -668,10 +668,10 @@ void sub_802C68C(void)
             gBattleBankFunc[gActiveBank] = sub_802C2EC;
             if (r4 & 0x12)
                 gUnknown_03004344 = gActiveBank;
-            else if (gAbsentBankFlags & gBitTable[GetBankByPlayerAI(1)])
-                gUnknown_03004344 = GetBankByPlayerAI(3);
+            else if (gAbsentBankFlags & gBitTable[GetBankByIdentity(1)])
+                gUnknown_03004344 = GetBankByIdentity(3);
             else
-                gUnknown_03004344 = GetBankByPlayerAI(1);
+                gUnknown_03004344 = GetBankByIdentity(1);
             gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010520;
         }
     }
@@ -679,8 +679,8 @@ void sub_802C68C(void)
     {
         DestroyMenuCursor();
         PlaySE(SE_SELECT);
-        gUnknown_030042A4 = 0;
-        gUnknown_030042A0 = 320;
+        gBattle_BG0_X = 0;
+        gBattle_BG0_Y = 320;
         Emitcmd33(1, 10, 0xFFFF);
         PlayerBufferExecCompleted();
     }
@@ -1495,7 +1495,7 @@ void sub_802DF30(void)
 
 void sub_802DF88(void)
 {
-    if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
+    if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
         if (gUnknown_0202E8F4 == 1)
             Emitcmd34(1, gUnknown_0202E8F5, gUnknown_02038470);
@@ -1519,7 +1519,7 @@ void sub_802E004(void)
 
 void sub_802E03C(void)
 {
-    if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
+    if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
         Emitcmd35(1, gSpecialVar_ItemId);
         PlayerBufferExecCompleted();
@@ -1695,8 +1695,8 @@ void b_link_standby_message(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
-        gUnknown_030042A4 = 0;
-        gUnknown_030042A0 = 0;
+        gBattle_BG0_X = 0;
+        gBattle_BG0_Y = 0;
         sub_8002EB0(&gUnknown_03004210, BattleText_LinkStandby, 0x90, 2, 15);
     }
 }
@@ -2458,7 +2458,7 @@ void PlayerHandlecmd12(void)
 {
     ewram17840.unk8 = 4;
     gDoingBattleAnim = 1;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 3);
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 3);
     gBattleBankFunc[gActiveBank] = bx_wait_t1;
 }
 
@@ -2468,7 +2468,7 @@ void PlayerHandleBallThrow(void)
 
     ewram17840.unk8 = var;
     gDoingBattleAnim = 1;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 3);
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 3);
     gBattleBankFunc[gActiveBank] = bx_wait_t1;
 }
 
@@ -2559,8 +2559,8 @@ void sub_8030190(void)
 
 void PlayerHandlePrintString(void)
 {
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
     sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15);
     gBattleBankFunc[gActiveBank] = sub_802DF18;
@@ -2578,8 +2578,8 @@ void PlayerHandlecmd18(void)
 {
     int r4;
 
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 160;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 160;
     FillWindowRect(&gUnknown_03004210, 10, 2, 15, 27, 18);
     FillWindowRect(&gUnknown_03004210, 10, 2, 35, 16, 38);
 
@@ -2612,8 +2612,8 @@ void PlayerHandlecmd20(void)
 
 void sub_80304A8(void)
 {
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 320;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 320;
     sub_802E1B0();
     gUnknown_03004344 = 0xFF;
     sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 6f6286945..0a629ba4d 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -23,8 +23,8 @@ extern u8 gActiveBank;
 extern const u8 BattleText_MenuOptionsSafari[];
 
 extern void *gBattleBankFunc[];
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern u8 gBattleBufferA[][0x200];
 extern bool8 gDoingBattleAnim;
 extern u8 gObjectBankIDs[];
@@ -40,7 +40,7 @@ extern u16 gUnknown_02024DE8;
 extern u8 gBattleOutcome;
 
 extern u8 GetBankSide(u8);
-extern u8 GetBankByPlayerAI(u8);
+extern u8 GetBankByIdentity(u8);
 extern u8 GetBankIdentity(u8);
 extern void LoadPlayerTrainerBankSprite();
 extern u8 sub_8079E90();
@@ -313,7 +313,7 @@ void sub_812B724(void)
 
 void sub_812B758(void)
 {
-    if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
+    if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
         Emitcmd35(1, gSpecialVar_ItemId);
         SafariBufferExecCompleted();
@@ -423,7 +423,7 @@ void SafariHandlecmd12(void)
 {
     ewram17840.unk8 = 4;
     gDoingBattleAnim = 1;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4);
     gBattleBankFunc[gActiveBank] = bx_wait_t6;
 }
 
@@ -433,7 +433,7 @@ void SafariHandleBallThrow(void)
 
     ewram17840.unk8 = var;
     gDoingBattleAnim = 1;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4);
     gBattleBankFunc[gActiveBank] = bx_wait_t6;
 }
 
@@ -450,8 +450,8 @@ void SafariHandleMoveAnimation(void)
 
 void SafariHandlePrintString(void)
 {
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
     sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
     gBattleBankFunc[gActiveBank] = sub_812B694;
@@ -469,8 +469,8 @@ void SafariHandlecmd18(void)
 {
     int i;
 
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 160;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 160;
     gUnknown_03004210.paletteNum = 0;
     FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18);
     FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36);
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 8ace11fc1..bd2b4a45b 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -53,8 +53,8 @@ extern u8 gUnknown_02024E68[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u8 gAnimMoveTurn;
 extern struct Window gUnknown_03004210;
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern u8 gUnknown_0300434C[];
 extern const u8 BattleText_WallyMenu[];
 extern const u8 BattleText_MenuOptions[];
@@ -75,7 +75,7 @@ extern void PlayerHandlecmd1(void);
 extern void LoadPlayerTrainerBankSprite();
 extern u8 GetBankIdentity(u8);
 extern void sub_80313A0(struct Sprite *);
-extern u8 GetBankByPlayerAI(u8);
+extern u8 GetBankByIdentity(u8);
 extern u8 sub_8031720();
 extern void DoMoveAnim();
 extern void sub_80326EC();
@@ -363,7 +363,7 @@ void sub_81374C4(void)
 
 void sub_81374FC(void)
 {
-    if (gMain.callback2 == sub_800F808
+    if (gMain.callback2 == BattleMainCB2
      && !gPaletteFade.active)
     {
         Emitcmd35(1, gSpecialVar_ItemId);
@@ -1149,7 +1149,7 @@ void WallyHandlecmd12(void)
 {
     ewram17840.unk8 = 4;
     gDoingBattleAnim = TRUE;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4);
     gBattleBankFunc[gActiveBank] = bx_wait_t5;
 }
 
@@ -1159,7 +1159,7 @@ void WallyHandleBallThrow(void)
 
     ewram17840.unk8 = val;
     gDoingBattleAnim = TRUE;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4);
     gBattleBankFunc[gActiveBank] = bx_wait_t5;
 }
 
@@ -1240,8 +1240,8 @@ void WallyHandlePrintString(void)
 {
     u16 *ptr;
 
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     ptr = (u16 *)&gBattleBufferA[gActiveBank][2];
     if (*ptr == 2)
         DestroyMenuCursor();
@@ -1262,8 +1262,8 @@ void WallyHandlecmd18(void)
 {
     s32 i;
 
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 160;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 160;
     gUnknown_03004210.paletteNum = 0;
     FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18);
     FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36);
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index 4ac8c7a6f..d8efc09c5 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -199,7 +199,7 @@ s32 sub_803FC34(u16);
 void get_trainer_name(u8* dst);
 u8 get_trainer_class_name_index(void);
 u8 GetMultiplayerId(void);
-u8 GetBankByPlayerAI(u8 ID);
+u8 GetBankByIdentity(u8 ID);
 u8 GetBankSide(u8 bank);
 u8 GetBankIdentity(u8 bank);
 #ifdef GERMAN
@@ -572,22 +572,22 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                     toCpy = gBattleTextBuff3;
                 break;
             case 2: // first player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPlayerAI(0)]], MON_DATA_NICKNAME, text);
+                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(0)]], MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case 3: // first enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPlayerAI(1)]], MON_DATA_NICKNAME, text);
+                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(1)]], MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case 4: // second player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPlayerAI(2)]], MON_DATA_NICKNAME, text);
+                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(2)]], MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case 5: // second enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPlayerAI(3)]], MON_DATA_NICKNAME, text);
+                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(3)]], MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
@@ -612,13 +612,13 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                 toCpy = text;
                 break;
             case 10: // attacker name with prefix, only bank 0/1
-                HANDLE_NICKNAME_STRING_CASE(gBankAttacker, gBattlePartyID[GetBankByPlayerAI(GetBankIdentity(gBankAttacker) & 1)])
+                HANDLE_NICKNAME_STRING_CASE(gBankAttacker, gBattlePartyID[GetBankByIdentity(GetBankIdentity(gBankAttacker) & 1)])
                 break;
             case 11: // attacker partner name, only bank 0/1
                 if (GetBankSide(gBankAttacker) == 0)
-                    GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPlayerAI(GetBankIdentity(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text);
+                    GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(GetBankIdentity(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text);
                 else
-                    GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPlayerAI(GetBankIdentity(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text);
+                    GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(GetBankIdentity(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text);
 
                 StringGetEnd10(text);
                 toCpy = text;
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index d4dcae0ca..7bce00d82 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -122,7 +122,7 @@ static void sub_8094998(u8 arg[3], u8 player_number)
         if (!IsDoubleBattle())
         {
             pos = 1;
-            *temp = gBattlePartyID[GetBankByPlayerAI(0)];
+            *temp = gBattlePartyID[GetBankByIdentity(0)];
             for (i = 0; i <= 5; i++)
                 if (i != *temp)
                     temp[pos++] = i;
@@ -130,8 +130,8 @@ static void sub_8094998(u8 arg[3], u8 player_number)
         else
         {
             pos = 2;
-            *temp = gBattlePartyID[GetBankByPlayerAI(0)];
-            temp[1] = gBattlePartyID[GetBankByPlayerAI(2)];
+            *temp = gBattlePartyID[GetBankByIdentity(0)];
+            temp[1] = gBattlePartyID[GetBankByIdentity(2)];
             for (i = 0; i <= 5; i++)
                 if ((i != *temp) && (i != temp[1]))
                     temp[pos++] = i;
@@ -147,13 +147,13 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3)
     u8 temp[6];
     if (!GetBankSide(arg3))
     {
-        i = GetBankByPlayerAI(0);
-        j = GetBankByPlayerAI(2);
+        i = GetBankByIdentity(0);
+        j = GetBankByIdentity(2);
     }
     else
     {
-        i = GetBankByPlayerAI(1);
-        j = GetBankByPlayerAI(3);
+        i = GetBankByIdentity(1);
+        j = GetBankByIdentity(3);
     }
     if (IsLinkDoubleBattle() == TRUE)
     {
diff --git a/src/battle/battle_3.c b/src/battle/battle_util.c
index e5a730598..9dc030a1a 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_util.c
@@ -1,21 +1,25 @@
 #include "global.h"
-#include "constants/abilities.h"
 #include "battle.h"
-#include "constants/moves.h"
-#include "item.h"
-#include "constants/items.h"
+#include "battle_util.h"
+#include "data2.h"
 #include "event_data.h"
-#include "constants/hold_effects.h"
-#include "constants/species.h"
-#include "constants/weather.h"
+#include "ewram.h"
+#include "item.h"
+#include "link.h"
 #include "pokemon.h"
-#include "data2.h"
 #include "random.h"
+#include "rom_8077ABC.h"
+#include "string_util.h"
 #include "text.h"
+#include "util.h"
+#include "constants/abilities.h"
 #include "constants/battle_move_effects.h"
-#include "string_util.h"
 #include "constants/flags.h"
-#include "ewram.h"
+#include "constants/hold_effects.h"
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/species.h"
+#include "constants/weather.h"
 
 extern u8* gBattlescriptCurrInstr;
 extern u8 gActiveBank;
@@ -33,7 +37,7 @@ extern u8 gNoOfAllBanks;
 extern u32 gStatuses3[4];
 extern u8 gBankAttacker;
 extern u8 gBankTarget;
-extern u8 gTurnOrder[4];
+extern u8 gBanksByTurnOrder[4];
 extern u16 gSideAffecting[2];
 extern u16 gBattleWeather;
 extern void (*gBattleMainFunc)(void);
@@ -50,7 +54,7 @@ extern u8 gTakenDmgBanks[4];
 extern u8 gBattleMoveFlags;
 extern u8 gLastUsedAbility;
 extern u8 gBattleTextBuff2[];
-extern u8 gFightStateTracker;
+extern u8 gCurrentActionFuncId;
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
 extern u8 gUnknown_02024BE5;
 extern u8 gCurrMovePos;
@@ -58,6 +62,7 @@ extern u16 gRandomMove;
 extern s32 gBattleMoveDamage;
 extern u16 gDynamicBasePower;
 extern u32 gBattleExecBuffer;
+extern u8 gSentPokesToOpponent[2];
 extern const u16 gSoundMovesTable[];
 extern const u8 gStatusConditionString_PoisonJpn[];
 extern const u8 gStatusConditionString_SleepJpn[];
@@ -69,26 +74,20 @@ extern const u8 gStatusConditionString_LoveJpn[];
 extern const BattleCmdFunc gBattleScriptingCommandsTable[];
 
 u8 IsImprisoned(u8 bank, u16 move);
-u8 GetBankByPlayerAI(u8 ID);
+u8 GetBankByIdentity(u8 ID);
 u8 GetBankIdentity(u8 bank);
 u8 GetBankSide(u8 bank);
-void b_call_bc_move_exec(u8* BS_ptr);
-bool8 sub_8015660(u8 bank); //check if a move failed
 void SetMoveEffect(bool8 primary, u8 certainArg);
 bool8 UproarWakeUpCheck(u8 bank);
 bool8 sub_8018018(u8 bank, u8, u8);
-void sub_8015740(u8 bank);
 s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 a4, u16 powerOverride, u8 typeOverride, u8 bank_atk, u8 bank_def);
 u8 CountTrailingZeroBits(u32 a);
 u8 GetMoveTarget(u16 move, u8 useMoveTarget);
 u8 sub_803FC34(u8 bank);
 u16 sub_803FBFC(u8 a);
 u8 weather_get_current(void);
-void b_push_move_exec(u8* BS_ptr);
 void RecordAbilityBattle(u8 bank, u8 ability);
 void RecordItemBattle(u8 bank, u8 holdEffect);
-void sub_8013F54(void);
-void sub_8013FBC(void);
 s8 GetPokeFlavourRelation(u32 pid, u8 flavor);
 
 extern u8 BattleScript_MoveSelectionDisabledMove[];
@@ -206,22 +205,271 @@ extern u8 gUnknown_081D99A0[]; //disobedient, hits itself
 #define MULTISTRING_CHOOSER 0x5
 #define MSG_DISPLAY         0x7
 
-void b_movescr_stack_push(u8* BS_ptr)
+u8 GetBattleBank(u8 caseId)
+{
+    u8 ret = 0;
+    switch (caseId)
+    {
+    case BS_GET_TARGET:
+        ret = gBankTarget;
+        break;
+    case BS_GET_ATTACKER:
+        ret = gBankAttacker;
+        break;
+    case BS_GET_EFFECT_BANK:
+        ret = gEffectBank;
+        break;
+    case BS_GET_BANK_0:
+        ret = 0;
+        break;
+    case BS_GET_SCRIPTING_BANK:
+        ret = ewram16003;
+        break;
+    case BS_GET_gBank1:
+        ret = gBank1;
+        break;
+    case 5:
+        ret = gBank1;
+        break;
+    }
+    return ret;
+}
+
+void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move)
+{
+    s32 i;
+
+    if (gBattleMons[bankDef].ability != ABILITY_PRESSURE)
+        return;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (gBattleMons[bankAtk].moves[i] == move)
+            break;
+    }
+
+    if (i == 4) // mons don't share any moves
+        return;
+
+    if (gBattleMons[bankAtk].pp[i] != 0)
+        gBattleMons[bankAtk].pp[i]--;
+
+    if (!(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[i]))
+    {
+        gActiveBank = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]);
+        MarkBufferBankForExecution(gActiveBank);
+    }
+}
+
+void PressurePPLoseOnUsingImprision(u8 bankAtk)
+{
+    s32 i, j;
+    s32 imprisionPos = 4;
+    u8 atkSide = GetBankSide(bankAtk);
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+    {
+        if (atkSide != GetBankSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE)
+        {
+            for (j = 0; j < 4; j++)
+            {
+                if (gBattleMons[bankAtk].moves[j] == MOVE_IMPRISON)
+                    break;
+            }
+            if (j != 4)
+            {
+                imprisionPos = j;
+                if (gBattleMons[bankAtk].pp[j] != 0)
+                    gBattleMons[bankAtk].pp[j]--;
+            }
+        }
+    }
+
+    if (imprisionPos != 4
+        && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[imprisionPos]))
+    {
+        gActiveBank = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBank].pp[imprisionPos]);
+        MarkBufferBankForExecution(gActiveBank);
+    }
+}
+
+void PressurePPLoseOnUsingPerishSong(u8 bankAtk)
+{
+    s32 i, j;
+    s32 perishSongPos = 4;
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+    {
+        if (gBattleMons[i].ability == ABILITY_PRESSURE && i != bankAtk)
+        {
+            for (j = 0; j < 4; j++)
+            {
+                if (gBattleMons[bankAtk].moves[j] == MOVE_PERISH_SONG)
+                    break;
+            }
+            if (j != 4)
+            {
+                perishSongPos = j;
+                if (gBattleMons[bankAtk].pp[j] != 0)
+                    gBattleMons[bankAtk].pp[j]--;
+            }
+        }
+    }
+
+    if (perishSongPos != 4
+        && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[perishSongPos]))
+    {
+        gActiveBank = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBank].pp[perishSongPos]);
+        MarkBufferBankForExecution(gActiveBank);
+    }
+}
+
+
+void MarkAllBufferBanksForExecution(void) // unused
+{
+    s32 i;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        for (i = 0; i < gNoOfAllBanks; i++)
+            gBattleExecBuffer |= gBitTable[i] << 0x1C;
+    }
+    else
+    {
+        for (i = 0; i < gNoOfAllBanks; i++)
+            gBattleExecBuffer |= gBitTable[i];
+    }
+}
+
+void MarkBufferBankForExecution(u8 bank)
+{
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        gBattleExecBuffer |= gBitTable[bank] << 0x1C;
+    }
+    else
+    {
+        gBattleExecBuffer |= gBitTable[bank];
+    }
+}
+
+void sub_80155A4(u8 arg0)
+{
+    s32 i;
+
+    for (i = 0; i < GetLinkPlayerCount(); i++)
+        gBattleExecBuffer |= gBitTable[arg0] << (i << 2);
+
+    gBattleExecBuffer &= ~(0x10000000 << arg0);
+}
+
+void CancelMultiTurnMoves(u8 bank)
+{
+    gBattleMons[bank].status2 &= ~(STATUS2_MULTIPLETURNS);
+    gBattleMons[bank].status2 &= ~(STATUS2_LOCK_CONFUSE);
+    gBattleMons[bank].status2 &= ~(STATUS2_UPROAR);
+    gBattleMons[bank].status2 &= ~(STATUS2_BIDE);
+
+    gStatuses3[bank] &= ~(STATUS3_SEMI_INVULNERABLE);
+
+    gDisableStructs[bank].rolloutTimer1 = 0;
+    gDisableStructs[bank].furyCutterCounter = 0;
+}
+
+bool8 WasUnableToUseMove(u8 bank)
+{
+    if (gProtectStructs[bank].prlzImmobility
+        || gProtectStructs[bank].notEffective
+        || gProtectStructs[bank].usedImprisionedMove
+        || gProtectStructs[bank].loveImmobility
+        || gProtectStructs[bank].usedDisabledMove
+        || gProtectStructs[bank].usedTauntedMove
+        || gProtectStructs[bank].flag2Unknown
+        || gProtectStructs[bank].flinchImmobility
+        || gProtectStructs[bank].confusionSelfDmg)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void PrepareStringBattle(u16 stringId, u8 bank)
+{
+    gActiveBank = bank;
+    EmitPrintString(0, stringId);
+    MarkBufferBankForExecution(gActiveBank);
+}
+
+void ResetSentPokesToOpponentValue(void)
+{
+    s32 i;
+    u32 bits = 0;
+
+    gSentPokesToOpponent[0] = 0;
+    gSentPokesToOpponent[1] = 0;
+
+    for (i = 0; i < gNoOfAllBanks; i += 2)
+        bits |= gBitTable[gBattlePartyID[i]];
+
+    for (i = 1; i < gNoOfAllBanks; i += 2)
+        gSentPokesToOpponent[(i & BIT_MON) >> 1] = bits;
+}
+
+void sub_8015740(u8 bank)
+{
+    s32 i = 0;
+    u32 bits = 0;
+
+    if (GetBankSide(bank) == SIDE_OPPONENT)
+    {
+        u8 id = ((bank & BIT_MON) >> 1);
+        gSentPokesToOpponent[id] = 0;
+
+        for (i = 0; i < gNoOfAllBanks; i += 2)
+        {
+            if (!(gAbsentBankFlags & gBitTable[i]))
+                bits |= gBitTable[gBattlePartyID[i]];
+        }
+
+        gSentPokesToOpponent[id] = bits;
+    }
+}
+
+void sub_80157C4(u8 bank)
+{
+    if (GetBankSide(bank) == SIDE_OPPONENT)
+    {
+        sub_8015740(bank);
+    }
+    else
+    {
+        s32 i;
+        for (i = 1; i < gNoOfAllBanks; i++)
+            gSentPokesToOpponent[(i & BIT_MON) >> 1] |= gBitTable[gBattlePartyID[bank]];
+    }
+}
+
+void BattleScriptPush(u8* BS_ptr)
 {
     B_BATTLESCRIPTS_STACK->ptr[B_BATTLESCRIPTS_STACK->size++] = BS_ptr;
 }
 
-void b_movescr_stack_push_cursor(void)
+void BattleScriptPushCursor(void)
 {
     B_BATTLESCRIPTS_STACK->ptr[B_BATTLESCRIPTS_STACK->size++] = gBattlescriptCurrInstr;
 }
 
-void b_movescr_stack_pop_cursor(void)
+void BattleScriptPop(void)
 {
     gBattlescriptCurrInstr = B_BATTLESCRIPTS_STACK->ptr[--B_BATTLESCRIPTS_STACK->size];
 }
 
-u8 sub_8015894(void) //msg can't select a move
+u8 TrySetCantSelectMoveBattleScript(void) //msg can't select a move
 {
     u8 limitations = 0;
     u16 move = gBattleMons[gActiveBank].moves[gBattleBufferB[gActiveBank][2]];
@@ -320,9 +568,9 @@ bool8 AreAllMovesUnusable(void)
         gProtectStructs[gActiveBank].onlyStruggle = 1;
         gUnknown_02024C1C[gActiveBank] = BattleScript_NoMovesLeft;
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-            gBattleBufferB[gActiveBank][3] = GetBankByPlayerAI((GetBankIdentity(gActiveBank) ^ 1) | (Random() & 2));
+            gBattleBufferB[gActiveBank][3] = GetBankByIdentity((GetBankIdentity(gActiveBank) ^ 1) | (Random() & 2));
         else
-            gBattleBufferB[gActiveBank][3] = GetBankByPlayerAI(GetBankIdentity(gActiveBank) ^ 1);
+            gBattleBufferB[gActiveBank][3] = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ 1);
     }
     else
         gProtectStructs[gActiveBank].onlyStruggle = 0;
@@ -372,15 +620,15 @@ u8 UpdateTurnCounters(void)
         case 0:
             for (i = 0; i < gNoOfAllBanks; i++)
             {
-                gTurnOrder[i] = i;
+                gBanksByTurnOrder[i] = i;
             }
             for (i = 0; i < gNoOfAllBanks - 1; i++)
             {
                 s32 j;
                 for (j = i + 1; j < gNoOfAllBanks; j++)
                 {
-                    if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 0))
-                        sub_8012FBC(i, j);
+                    if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0))
+                        SwapTurnOrder(i, j);
                 }
             }
             BATTLE_STRUCT->turncountersTracker++;
@@ -392,11 +640,11 @@ u8 UpdateTurnCounters(void)
 
                 if (gSideAffecting[sideBank] & SIDE_STATUS_REFLECT)
                 {
-                    if (--gSideTimer[sideBank].reflectTimer == 0)
+                    if (--gSideTimers[sideBank].reflectTimer == 0)
                     {
 
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT;
-                        b_call_bc_move_exec(BattleScript_SideStatusWoreOff);
+                        BattleScriptExecute(BattleScript_SideStatusWoreOff);
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 2;
                         gBattleTextBuff1[2] = MOVE_REFLECT;
@@ -421,10 +669,10 @@ u8 UpdateTurnCounters(void)
                 gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker;
                 if (gSideAffecting[sideBank] & SIDE_STATUS_LIGHTSCREEN)
                 {
-                    if (--gSideTimer[sideBank].lightscreenTimer == 0)
+                    if (--gSideTimers[sideBank].lightscreenTimer == 0)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN;
-                        b_call_bc_move_exec(BattleScript_SideStatusWoreOff);
+                        BattleScriptExecute(BattleScript_SideStatusWoreOff);
                         gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 2;
@@ -448,10 +696,10 @@ u8 UpdateTurnCounters(void)
             while (BATTLE_STRUCT->turnSideTracker < 2)
             {
                 gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker;
-                if (gSideTimer[sideBank].mistTimer && --gSideTimer[sideBank].mistTimer == 0)
+                if (gSideTimers[sideBank].mistTimer && --gSideTimers[sideBank].mistTimer == 0)
                 {
                     gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST;
-                    b_call_bc_move_exec(BattleScript_SideStatusWoreOff);
+                    BattleScriptExecute(BattleScript_SideStatusWoreOff);
                     gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
                     gBattleTextBuff1[0] = 0xFD;
                     gBattleTextBuff1[1] = 2;
@@ -476,10 +724,10 @@ u8 UpdateTurnCounters(void)
                 gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker;
                 if (gSideAffecting[sideBank] & SIDE_STATUS_SAFEGUARD)
                 {
-                    if (--gSideTimer[sideBank].safeguardTimer == 0)
+                    if (--gSideTimers[sideBank].safeguardTimer == 0)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD;
-                        b_call_bc_move_exec(BattleScript_SafeguardEnds);
+                        BattleScriptExecute(BattleScript_SafeguardEnds);
                         effect++;
                     }
                 }
@@ -496,11 +744,11 @@ u8 UpdateTurnCounters(void)
         case 5:
             while (BATTLE_STRUCT->turnSideTracker < gNoOfAllBanks)
             {
-                gActiveBank = gTurnOrder[BATTLE_STRUCT->turnSideTracker];
+                gActiveBank = gBanksByTurnOrder[BATTLE_STRUCT->turnSideTracker];
                 if (gWishFutureKnock.wishCounter[gActiveBank] && --gWishFutureKnock.wishCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp)
                 {
                     gBankTarget = gActiveBank;
-                    b_call_bc_move_exec(BattleScript_WishComesTrue);
+                    BattleScriptExecute(BattleScript_WishComesTrue);
                     effect++;
                 }
                 BATTLE_STRUCT->turnSideTracker++;
@@ -532,7 +780,7 @@ u8 UpdateTurnCounters(void)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                 else
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                b_call_bc_move_exec(BattleScript_RainContinuesOrEnds);
+                BattleScriptExecute(BattleScript_RainContinuesOrEnds);
                 effect++;
             }
             BATTLE_STRUCT->turncountersTracker++;
@@ -550,7 +798,7 @@ u8 UpdateTurnCounters(void)
 
                 BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                b_call_bc_move_exec(gBattlescriptCurrInstr);
+                BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
             }
             BATTLE_STRUCT->turncountersTracker++;
@@ -566,7 +814,7 @@ u8 UpdateTurnCounters(void)
                 else
                     gBattlescriptCurrInstr = BattleScript_SunlightContinues;
 
-                b_call_bc_move_exec(gBattlescriptCurrInstr);
+                BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
             }
             BATTLE_STRUCT->turncountersTracker++;
@@ -584,7 +832,7 @@ u8 UpdateTurnCounters(void)
 
                 BATTLE_STRUCT->animArg1 = B_ANIM_HAIL_CONTINUES;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                b_call_bc_move_exec(gBattlescriptCurrInstr);
+                BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
             }
             BATTLE_STRUCT->turncountersTracker++;
@@ -606,7 +854,7 @@ u8 TurnBasedEffects(void)
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
     while (BATTLE_STRUCT->turnEffectsBank < gNoOfAllBanks && BATTLE_STRUCT->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
-        gActiveBank = gBankAttacker = gTurnOrder[BATTLE_STRUCT->turnEffectsBank];
+        gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->turnEffectsBank];
         if (gAbsentBankFlags & gBitTable[gActiveBank])
         {
             BATTLE_STRUCT->turnEffectsBank++;
@@ -624,7 +872,7 @@ u8 TurnBasedEffects(void)
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     gBattleMoveDamage *= -1;
-                    b_call_bc_move_exec(BattleScript_IngrainTurnHeal);
+                    BattleScriptExecute(BattleScript_IngrainTurnHeal);
                     effect++;
                 }
                 BATTLE_STRUCT->turnEffectsTracker++;
@@ -653,7 +901,7 @@ u8 TurnBasedEffects(void)
                         gBattleMoveDamage = 1;
                     BATTLE_STRUCT->animArg1 = gBankTarget;
                     BATTLE_STRUCT->animArg2 = gBankAttacker;
-                    b_call_bc_move_exec(BattleScript_LeechSeedTurnDrain);
+                    BattleScriptExecute(BattleScript_LeechSeedTurnDrain);
                     effect++;
                 }
                 BATTLE_STRUCT->turnEffectsTracker++;
@@ -664,7 +912,7 @@ u8 TurnBasedEffects(void)
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    b_call_bc_move_exec(BattleScript_PoisonTurnDmg);
+                    BattleScriptExecute(BattleScript_PoisonTurnDmg);
                     effect++;
                 }
                 BATTLE_STRUCT->turnEffectsTracker++;
@@ -678,7 +926,7 @@ u8 TurnBasedEffects(void)
                     if ((gBattleMons[gActiveBank].status1 & 0xF00) != 0xF00) //not 16 turns
                         gBattleMons[gActiveBank].status1 += 0x100;
                     gBattleMoveDamage *= (gBattleMons[gActiveBank].status1 & 0xF00) >> 8;
-                    b_call_bc_move_exec(BattleScript_PoisonTurnDmg);
+                    BattleScriptExecute(BattleScript_PoisonTurnDmg);
                     effect++;
                 }
                 BATTLE_STRUCT->turnEffectsTracker++;
@@ -689,7 +937,7 @@ u8 TurnBasedEffects(void)
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    b_call_bc_move_exec(BattleScript_BurnTurnDmg);
+                    BattleScriptExecute(BattleScript_BurnTurnDmg);
                     effect++;
                 }
                 BATTLE_STRUCT->turnEffectsTracker++;
@@ -701,7 +949,7 @@ u8 TurnBasedEffects(void)
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    b_call_bc_move_exec(BattleScript_NightmareTurnDmg);
+                    BattleScriptExecute(BattleScript_NightmareTurnDmg);
                     effect++;
                 }
                 BATTLE_STRUCT->turnEffectsTracker++;
@@ -712,7 +960,7 @@ u8 TurnBasedEffects(void)
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    b_call_bc_move_exec(BattleScript_CurseTurnDmg);
+                    BattleScriptExecute(BattleScript_CurseTurnDmg);
                     effect++;
                 }
                 BATTLE_STRUCT->turnEffectsTracker++;
@@ -744,7 +992,7 @@ u8 TurnBasedEffects(void)
                         gBattleTextBuff1[4] = EOS;
                         gBattlescriptCurrInstr = BattleScript_WrapEnds;
                     }
-                    b_call_bc_move_exec(gBattlescriptCurrInstr);
+                    BattleScriptExecute(gBattlescriptCurrInstr);
                     effect++;
                 }
                 BATTLE_STRUCT->turnEffectsTracker++;
@@ -760,9 +1008,9 @@ u8 TurnBasedEffects(void)
                             gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP);
                             gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                            b_call_bc_move_exec(BattleScript_MonWokeUpInUproar);
+                            BattleScriptExecute(BattleScript_MonWokeUpInUproar);
                             gActiveBank = gBankAttacker;
-                            EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+                            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
                             MarkBufferBankForExecution(gActiveBank);
                             break;
                         }
@@ -776,7 +1024,7 @@ u8 TurnBasedEffects(void)
                     {
                         gBankAttacker = gActiveBank;
                         gBattleMons[gActiveBank].status2 -= 0x10;  // uproar timer goes down
-                        if (sub_8015660(gActiveBank))
+                        if (WasUnableToUseMove(gActiveBank))
                         {
                             CancelMultiTurnMoves(gActiveBank);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -791,7 +1039,7 @@ u8 TurnBasedEffects(void)
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                             CancelMultiTurnMoves(gActiveBank);
                         }
-                        b_call_bc_move_exec(BattleScript_PrintUproarOverTurns);
+                        BattleScriptExecute(BattleScript_PrintUproarOverTurns);
                         effect = 1;
                     }
                 }
@@ -802,7 +1050,7 @@ u8 TurnBasedEffects(void)
                 if (gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE)
                 {
                     gBattleMons[gActiveBank].status2 -= 0x400;
-                    if (sub_8015660(gActiveBank))
+                    if (WasUnableToUseMove(gActiveBank))
                         CancelMultiTurnMoves(gActiveBank);
                     else if (!(gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE)
                      && (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS))
@@ -813,7 +1061,7 @@ u8 TurnBasedEffects(void)
                             gBattleCommunication[MOVE_EFFECT_BYTE] = 0x47;
                             SetMoveEffect(1, 0);
                             if (gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION)
-                                b_call_bc_move_exec(BattleScript_ThrashConfuses);
+                                BattleScriptExecute(BattleScript_ThrashConfuses);
                             effect++;
                         }
                     }
@@ -837,7 +1085,7 @@ u8 TurnBasedEffects(void)
                     else if (--gDisableStructs[gActiveBank].disableTimer1 == 0)  // disable ends
                     {
                         gDisableStructs[gActiveBank].disabledMove = 0;
-                        b_call_bc_move_exec(BattleScript_DisabledNoMore);
+                        BattleScriptExecute(BattleScript_DisabledNoMore);
                         effect++;
                     }
                 }
@@ -856,7 +1104,7 @@ u8 TurnBasedEffects(void)
                     {
                         gDisableStructs[gActiveBank].encoredMove = 0;
                         gDisableStructs[gActiveBank].encoreTimer1 = 0;
-                        b_call_bc_move_exec(BattleScript_EncoredNoMore);
+                        BattleScriptExecute(BattleScript_EncoredNoMore);
                         effect++;
                     }
                 }
@@ -887,10 +1135,10 @@ u8 TurnBasedEffects(void)
                     {
                         CancelMultiTurnMoves(gActiveBank);
                         gBattleMons[gActiveBank].status1 |= (Random() & 3) + 2;
-                        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
                         MarkBufferBankForExecution(gActiveBank);
                         gEffectBank = gActiveBank;
-                        b_call_bc_move_exec(BattleScript_YawnMakesAsleep);
+                        BattleScriptExecute(BattleScript_YawnMakesAsleep);
                         effect++;
                     }
                 }
@@ -909,7 +1157,7 @@ u8 TurnBasedEffects(void)
     return 0;
 }
 
-bool8 sub_80170DC(void) // handle future sight and perish song
+bool8 HandleWishPerishSongOnTurnEnd(void)
 {
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
     switch (BATTLE_STRUCT->sub80170DC_Tracker)
@@ -938,7 +1186,7 @@ bool8 sub_80170DC(void) // handle future sight and perish song
                     gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank];
                     gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank];
                     gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF;
-                    b_call_bc_move_exec(BattleScript_MonTookFutureAttack);
+                    BattleScriptExecute(BattleScript_MonTookFutureAttack);
                     return 1;
                 }
             }
@@ -948,7 +1196,7 @@ bool8 sub_80170DC(void) // handle future sight and perish song
     case 1: // perish song
         while (BATTLE_STRUCT->sub80170DC_Bank < gNoOfAllBanks)
         {
-            gActiveBank = gBankAttacker = gTurnOrder[BATTLE_STRUCT->sub80170DC_Bank];
+            gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->sub80170DC_Bank];
             if (gAbsentBankFlags & gBitTable[gActiveBank])
                 BATTLE_STRUCT->sub80170DC_Bank++;
             else
@@ -973,7 +1221,7 @@ bool8 sub_80170DC(void) // handle future sight and perish song
                         gDisableStructs[gActiveBank].perishSong1--;
                         gBattlescriptCurrInstr = BattleScript_PerishSongTimerGoesDown;
                     }
-                    b_call_bc_move_exec(gBattlescriptCurrInstr);
+                    BattleScriptExecute(gBattlescriptCurrInstr);
                     return 1;
                 }
             }
@@ -984,9 +1232,9 @@ bool8 sub_80170DC(void) // handle future sight and perish song
     return 0;
 }
 
-#define sub_80173A4_MAX_CASE 7
+#define HandleFaintedMonActions_MAX_CASE 7
 
-bool8 sub_80173A4(void)
+bool8 HandleFaintedMonActions(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
         return 0;
@@ -1009,7 +1257,7 @@ bool8 sub_80173A4(void)
                 gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A;
                 if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(BATTLE_STRUCT->unk16113 & gBitTable[gBattlePartyID[BATTLE_STRUCT->unk1605A]]) && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A]))
                 {
-                    b_call_bc_move_exec(BattleScript_GiveExp);
+                    BattleScriptExecute(BattleScript_GiveExp);
                     BATTLE_STRUCT->sub80173A4_Tracker = 2;
                     return 1;
                 }
@@ -1032,7 +1280,7 @@ bool8 sub_80173A4(void)
                 gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; //or should banks be switched?
                 if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A]))
                 {
-                    b_call_bc_move_exec(BattleScript_HandleFaintedMon);
+                    BattleScriptExecute(BattleScript_HandleFaintedMon);
                     BATTLE_STRUCT->sub80173A4_Tracker = 5;
                     return 1;
                 }
@@ -1053,11 +1301,11 @@ bool8 sub_80173A4(void)
         case 7:
             break;
         }
-    } while (BATTLE_STRUCT->sub80173A4_Tracker != sub_80173A4_MAX_CASE);
+    } while (BATTLE_STRUCT->sub80173A4_Tracker != HandleFaintedMonActions_MAX_CASE);
     return 0;
 }
 
-void b_clear_atk_up_if_hit_flag_unless_enraged(void)
+void TryClearRageStatuses(void)
 {
     int i;
     for (i = 0; i < gNoOfAllBanks; i++)
@@ -1089,7 +1337,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 {
                     gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP);
                     gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                     gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
                     effect = 2;
@@ -1117,7 +1365,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                     else
                     {
                         gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
-                        b_movescr_stack_push_cursor();
+                        BattleScriptPushCursor();
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                         gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
                         effect = 2;
@@ -1145,7 +1393,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 else // unfreeze
                 {
                     gBattleMons[gBankAttacker].status1 &= ~(STATUS_FREEZE);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                 }
@@ -1232,7 +1480,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                     if (Random() & 1)
                     {
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                        b_movescr_stack_push_cursor();
+                        BattleScriptPushCursor();
                     }
                     else // confusion dmg
                     {
@@ -1246,7 +1494,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 }
                 else // snapped out of confusion
                 {
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfusedNoMore;
                 }
                 effect = 1;
@@ -1269,10 +1517,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             {
                 BATTLE_STRUCT->scriptingActive = CountTrailingZeroBits((gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) >> 0x10);
                 if (Random() & 1)
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                 else
                 {
-                    b_movescr_stack_push(BattleScript_MoveUsedIsParalyzedCantAttack);
+                    BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack);
                     gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                     gProtectStructs[gBankAttacker].loveImmobility = 1;
                     CancelMultiTurnMoves(gBankAttacker);
@@ -1313,7 +1561,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT)
                 {
                     gBattleMons[gBankAttacker].status1 &= ~(STATUS_FREEZE);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                 }
@@ -1330,7 +1578,7 @@ u8 AtkCanceller_UnableToUseMove(void)
     if (effect == 2)
     {
         gActiveBank = gBankAttacker;
-        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
         MarkBufferBankForExecution(gActiveBank);
     }
     return effect;
@@ -1363,14 +1611,14 @@ bool8 sub_8018018(u8 bank, u8 r1, u8 r2)
     {
         if (GetBankSide(bank) == 1)
         {
-            r7 = GetBankByPlayerAI(1);
-            r6 = GetBankByPlayerAI(3);
+            r7 = GetBankByIdentity(1);
+            r6 = GetBankByIdentity(3);
             party = gEnemyParty;
         }
         else
         {
-            r7 = GetBankByPlayerAI(0);
-            r6 = GetBankByPlayerAI(2);
+            r7 = GetBankByIdentity(0);
+            r6 = GetBankByIdentity(2);
             party = gPlayerParty;
         }
         if (r1 == 6)
@@ -1534,7 +1782,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 if (effect)
                 {
                     gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current();
-                    b_push_move_exec(BattleScript_OverworldWeatherStarts);
+                    BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts);
                 }
                 break;
             case ABILITY_DRIZZLE:
@@ -1542,7 +1790,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 if (!(gBattleWeather & WEATHER_RAIN_PERMANENT))
                 {
                     gBattleWeather = (WEATHER_RAIN_PERMANENT | WEATHER_RAIN_TEMPORARY);
-                    b_push_move_exec(BattleScript_DrizzleActivates);
+                    BattleScriptPushCursorAndCallback(BattleScript_DrizzleActivates);
                     BATTLE_STRUCT->scriptingActive = bank;
                     effect++;
                 }
@@ -1552,7 +1800,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT))
                 {
                     gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY);
-                    b_push_move_exec(BattleScript_SandstreamActivates);
+                    BattleScriptPushCursorAndCallback(BattleScript_SandstreamActivates);
                     BATTLE_STRUCT->scriptingActive = bank;
                     effect++;
                 }
@@ -1562,7 +1810,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 if (!(gBattleWeather & WEATHER_SUN_PERMANENT))
                 {
                     gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY);
-                    b_push_move_exec(BattleScript_DroughtActivates);
+                    BattleScriptPushCursorAndCallback(BattleScript_DroughtActivates);
                     BATTLE_STRUCT->scriptingActive = bank;
                     effect++;
                 }
@@ -1580,7 +1828,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 effect = CastformDataTypeChange(bank);
                 if (effect != 0)
                 {
-                    b_push_move_exec(BattleScript_CastformChange);
+                    BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
                     BATTLE_STRUCT->scriptingActive = bank;
                     BATTLE_STRUCT->castformToChangeInto = effect - 1;
                 }
@@ -1603,7 +1851,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         effect = CastformDataTypeChange(target1);
                         if (effect != 0)
                         {
-                            b_push_move_exec(BattleScript_CastformChange);
+                            BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
                             BATTLE_STRUCT->scriptingActive = target1;
                             BATTLE_STRUCT->castformToChangeInto = effect - 1;
                             break;
@@ -1625,7 +1873,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                      && gBattleMons[bank].maxHP > gBattleMons[bank].hp)
                     {
                         gLastUsedAbility = ABILITY_RAIN_DISH; // why
-                        b_push_move_exec(BattleScript_RainDishActivates);
+                        BattleScriptPushCursorAndCallback(BattleScript_RainDishActivates);
                         gBattleMoveDamage = gBattleMons[bank].maxHP / 16;
                         if (gBattleMoveDamage == 0)
                             gBattleMoveDamage = 1;
@@ -1650,8 +1898,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         // BUG: The nightmare status does not get cleared here. This was fixed in Emerald.
                         //gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
                         BATTLE_STRUCT->scriptingActive = gActiveBank = bank;
-                        b_push_move_exec(BattleScript_ShedSkinActivates);
-                        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
+                        BattleScriptPushCursorAndCallback(BattleScript_ShedSkinActivates);
+                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
                         MarkBufferBankForExecution(gActiveBank);
                         effect++;
                     }
@@ -1662,7 +1910,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         gBattleMons[bank].statStages[STAT_STAGE_SPEED]++;
                         BATTLE_STRUCT->animArg1 = 0x11;
                         BATTLE_STRUCT->animArg2 = 0;
-                        b_push_move_exec(BattleScript_SpeedBoostActivates);
+                        BattleScriptPushCursorAndCallback(BattleScript_SpeedBoostActivates);
                         BATTLE_STRUCT->scriptingActive = bank;
                         effect++;
                     }
@@ -1781,7 +2029,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     gBattleTextBuff1[1] = 3;
                     gBattleTextBuff1[2] = moveType;
                     gBattleTextBuff1[3] = 0xFF;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ColorChangeActivates;
                     effect++;
                 }
@@ -1797,7 +2045,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_RoughSkinActivates;
                     effect++;
                 }
@@ -1818,7 +2066,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     if (gBattleCommunication[MOVE_EFFECT_BYTE] == 3)
                         gBattleCommunication[MOVE_EFFECT_BYTE] += 2;
                     gBattleCommunication[MOVE_EFFECT_BYTE] += 0x40;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect;
                     gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
                     effect++;
@@ -1834,7 +2082,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                  && (Random() % 3) == 0)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = 0x42;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect;
                     gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
                     effect++;
@@ -1850,7 +2098,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                  && (Random() % 3) == 0)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = 0x45;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect;
                     gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
                     effect++;
@@ -1866,7 +2114,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                  && (Random() % 3) == 0)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = 0x43;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect;
                     gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
                     effect++;
@@ -1888,7 +2136,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                  && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != 0xFF)
                 {
                     gBattleMons[gBankAttacker].status2 |= (gBitTable[gBankTarget] << 0x10);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_CuteCharmActivates;
                     effect++;
                 }
@@ -1968,11 +2216,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                             gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
                             break;
                         }
-                        b_movescr_stack_push_cursor();
+                        BattleScriptPushCursor();
                         gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus;
                         BATTLE_STRUCT->scriptingActive = bank;
                         gActiveBank = bank;
-                        EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
                         MarkBufferBankForExecution(gActiveBank);
                         return effect;
                     }
@@ -1989,7 +2237,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         effect = CastformDataTypeChange(bank);
                         if (effect)
                         {
-                            b_push_move_exec(BattleScript_CastformChange);
+                            BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
                             BATTLE_STRUCT->scriptingActive = bank;
                             BATTLE_STRUCT->castformToChangeInto = effect - 1;
                             return effect;
@@ -2008,7 +2256,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     BATTLE_STRUCT->synchroniseEffect = 2;
                 gBattleCommunication[MOVE_EFFECT_BYTE] = BATTLE_STRUCT->synchroniseEffect + 0x40;
                 BATTLE_STRUCT->scriptingActive = gBankTarget;
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
                 effect++;
@@ -2024,7 +2272,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     BATTLE_STRUCT->synchroniseEffect = 2;
                 gBattleCommunication[MOVE_EFFECT_BYTE] = BATTLE_STRUCT->synchroniseEffect;
                 BATTLE_STRUCT->scriptingActive = gBankAttacker;
-                b_movescr_stack_push_cursor();
+                BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
                 effect++;
@@ -2038,7 +2286,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 {
                     gLastUsedAbility = ABILITY_INTIMIDATE;
                     gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES);
-                    b_push_move_exec(gUnknown_081D978C);
+                    BattleScriptPushCursorAndCallback(gUnknown_081D978C);
                     BATTLE_STRUCT->intimidateBank = i;
                     effect++;
                     break;
@@ -2053,15 +2301,15 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 {
                     u8 target2;
                     side = (GetBankIdentity(i) ^ 1) & 1;
-                    target1 = GetBankByPlayerAI(side);
-                    target2 = GetBankByPlayerAI(side + 2);
+                    target1 = GetBankByIdentity(side);
+                    target2 = GetBankByIdentity(side + 2);
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                     {
                         if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0
                          && gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0)
                         {
                             //_080199AE
-                            gActiveBank = GetBankByPlayerAI(((Random() & 1) * 2) | side);
+                            gActiveBank = GetBankByIdentity(((Random() & 1) * 2) | side);
                             gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
                             gLastUsedAbility = gBattleMons[gActiveBank].ability;
                             effect++;
@@ -2096,7 +2344,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     }
                     if (effect)
                     {
-                        b_push_move_exec(BattleScript_TraceActivates);
+                        BattleScriptPushCursorAndCallback(BattleScript_TraceActivates);
                         gStatuses3[i] &= ~(STATUS3_TRACE);
                         BATTLE_STRUCT->scriptingActive = i;
 
@@ -2123,7 +2371,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 {
                     gLastUsedAbility = ABILITY_INTIMIDATE;
                     gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = gUnknown_081D9795;
                     BATTLE_STRUCT->intimidateBank = i;
                     effect++;
@@ -2251,20 +2499,20 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
     return effect;
 }
 
-void b_call_bc_move_exec(u8* BS_ptr)
+void BattleScriptExecute(u8* BS_ptr)
 {
     gBattlescriptCurrInstr = BS_ptr;
     B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc;
-    gBattleMainFunc = sub_8013F54;
-    gFightStateTracker = 0;
+    gBattleMainFunc = RunBattleScriptCommands_PopCallbacksStack;
+    gCurrentActionFuncId = 0;
 }
 
-void b_push_move_exec(u8* BS_ptr)
+void BattleScriptPushCursorAndCallback(u8* BS_ptr)
 {
-    b_movescr_stack_push_cursor();
+    BattleScriptPushCursor();
     gBattlescriptCurrInstr = BS_ptr;
     B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc;
-    gBattleMainFunc = sub_8013FBC;
+    gBattleMainFunc = RunBattleScriptCommands;
 }
 
 enum
@@ -2354,7 +2602,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 BATTLE_STRUCT->scriptingActive = bank;
                 gStringBank = bank;
                 gActiveBank = gBankAttacker = bank;
-                b_call_bc_move_exec(BattleScript_WhiteHerbEnd2);
+                BattleScriptExecute(BattleScript_WhiteHerbEnd2);
             }
             break;
         }
@@ -2371,7 +2619,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     if (gBattleMons[bank].hp + bankQuality > gBattleMons[bank].maxHP)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
-                    b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem);
+                    BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
                     effect = 4;
                 }
                 break;
@@ -2406,8 +2654,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleTextBuff1[2] = move;
                         gBattleTextBuff1[3] = move >> 8;
                         gBattleTextBuff1[4] = 0xFF;
-                        b_call_bc_move_exec(BattleScript_BerryPPHealEnd2);
-                        EmitSetAttributes(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
+                        BattleScriptExecute(BattleScript_BerryPPHealEnd2);
+                        EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
                         MarkBufferBankForExecution(gActiveBank);
                         effect = ITEM_PP_CHANGE;
                     }
@@ -2427,7 +2675,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     BATTLE_STRUCT->scriptingActive = bank;
                     gStringBank = bank;
                     gActiveBank = gBankAttacker = bank;
-                    b_call_bc_move_exec(BattleScript_WhiteHerbEnd2);
+                    BattleScriptExecute(BattleScript_WhiteHerbEnd2);
                 }
                 break;
             case HOLD_EFFECT_LEFTOVERS:
@@ -2439,7 +2687,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
-                    b_call_bc_move_exec(BattleScript_ItemHealHP_End2);
+                    BattleScriptExecute(BattleScript_ItemHealHP_End2);
                     effect = ITEM_HP_CHANGE;
                     RecordItemBattle(bank, bankHoldEffect);
                 }
@@ -2459,9 +2707,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
                     if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SPICY) < 0)
-                        b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2);
+                        BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
-                        b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem);
+                        BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
                     effect = ITEM_HP_CHANGE;
                 }
                 break;
@@ -2479,9 +2727,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
                     if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_DRY) < 0)
-                        b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2);
+                        BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
-                        b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem);
+                        BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
                     effect = ITEM_HP_CHANGE;
                 }
                 break;
@@ -2499,9 +2747,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
                     if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SWEET) < 0)
-                        b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2);
+                        BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
-                        b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem);
+                        BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
                     effect = ITEM_HP_CHANGE;
                 }
                 break;
@@ -2519,9 +2767,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
                     if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_BITTER) < 0)
-                        b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2);
+                        BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
-                        b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem);
+                        BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
                     effect = ITEM_HP_CHANGE;
                 }
                 break;
@@ -2539,9 +2787,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
                     if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SOUR) < 0)
-                        b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2);
+                        BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
-                        b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem);
+                        BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
                     effect = ITEM_HP_CHANGE;
                 }
                 break;
@@ -2564,7 +2812,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_ATK;
                     BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_ATK;
                     BATTLE_STRUCT->animArg2 = 0;
-                    b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2);
+                    BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
@@ -2580,7 +2828,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_DEF;
                     BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_DEF;
                     BATTLE_STRUCT->animArg2 = 0;
-                    b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2);
+                    BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
@@ -2596,7 +2844,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPEED;
                     BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPEED;
                     BATTLE_STRUCT->animArg2 = 0;
-                    b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2);
+                    BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
@@ -2612,7 +2860,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPATK;
                     BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPATK;
                     BATTLE_STRUCT->animArg2 = 0;
-                    b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2);
+                    BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
@@ -2628,7 +2876,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPDEF;
                     BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPDEF;
                     BATTLE_STRUCT->animArg2 = 0;
-                    b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2);
+                    BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
@@ -2636,7 +2884,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && !(gBattleMons[bank].status2 & STATUS2_FOCUS_ENERGY))
                 {
                     gBattleMons[bank].status2 |= STATUS2_FOCUS_ENERGY;
-                    b_call_bc_move_exec(BattleScript_BerryFocusEnergyEnd2);
+                    BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2);
                     effect = ITEM_EFFECT_OTHER;
                 }
                 break;
@@ -2673,7 +2921,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         BATTLE_STRUCT->statChanger = 0x21 + i;
                         BATTLE_STRUCT->animArg1 = 0x21 + i + 6;
                         BATTLE_STRUCT->animArg2 = 0;
-                        b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2);
+                        BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                         effect = ITEM_STATS_CHANGE;
                     }
                 }
@@ -2682,7 +2930,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS);
-                    b_call_bc_move_exec(BattleScript_BerryCurePrlzEnd2);
+                    BattleScriptExecute(BattleScript_BerryCurePrlzEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
@@ -2690,7 +2938,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status1 & STATUS_PSN_ANY)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER);
-                    b_call_bc_move_exec(BattleScript_BerryCurePsnEnd2);
+                    BattleScriptExecute(BattleScript_BerryCurePsnEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
@@ -2698,7 +2946,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status1 & STATUS_BURN)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_BURN);
-                    b_call_bc_move_exec(BattleScript_BerryCureBrnEnd2);
+                    BattleScriptExecute(BattleScript_BerryCureBrnEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
@@ -2706,7 +2954,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status1 & STATUS_FREEZE)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_FREEZE);
-                    b_call_bc_move_exec(BattleScript_BerryCureFrzEnd2);
+                    BattleScriptExecute(BattleScript_BerryCureFrzEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
@@ -2715,7 +2963,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_SLEEP);
                     gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
-                    b_call_bc_move_exec(BattleScript_BerryCureSlpEnd2);
+                    BattleScriptExecute(BattleScript_BerryCureSlpEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
@@ -2723,7 +2971,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
                 {
                     gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
-                    b_call_bc_move_exec(BattleScript_BerryCureConfusionEnd2);
+                    BattleScriptExecute(BattleScript_BerryCureConfusionEnd2);
                     effect = ITEM_EFFECT_OTHER;
                 }
                 break;
@@ -2768,7 +3016,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                     gBattleMons[bank].status1 = 0;
                     gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
-                    b_call_bc_move_exec(BattleScript_BerryCureChosenStatusEnd2);
+                    BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
@@ -2777,7 +3025,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 {
                     gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
                     StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
-                    b_call_bc_move_exec(BattleScript_BerryCureChosenStatusEnd2);
+                    BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2);
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                     effect = ITEM_EFFECT_OTHER;
                 }
@@ -2791,7 +3039,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 switch (effect)
                 {
                 case ITEM_STATUS_CHANGE:
-                    EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
+                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
                     MarkBufferBankForExecution(gActiveBank);
                     break;
                 case ITEM_PP_CHANGE:
@@ -2824,7 +3072,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureParRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
@@ -2833,7 +3081,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status1 & STATUS_PSN_ANY)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCurePsnRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
@@ -2842,7 +3090,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status1 & STATUS_BURN)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_BURN);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureBrnRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
@@ -2851,7 +3099,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status1 & STATUS_FREEZE)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_FREEZE);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureFrzRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
@@ -2861,7 +3109,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 {
                     gBattleMons[bank].status1 &= ~(STATUS_SLEEP);
                     gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureSlpRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
@@ -2870,7 +3118,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
                 {
                     gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureConfusionRet;
                     effect = ITEM_EFFECT_OTHER;
                 }
@@ -2880,7 +3128,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 {
                     gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
                     StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                     gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet;
                     effect = ITEM_EFFECT_OTHER;
@@ -2916,7 +3164,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     }
                     gBattleMons[bank].status1 = 0;
                     gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                     gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet;
                     effect = ITEM_STATUS_CHANGE;
@@ -2935,7 +3183,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 {
                     BATTLE_STRUCT->scriptingActive = bank;
                     gStringBank = bank;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_WhiteHerbRet;
                     return effect; // unnecessary return
                 }
@@ -2946,7 +3194,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 BATTLE_STRUCT->scriptingActive = bank;
                 gStringBank = bank;
                 gActiveBank = bank;
-                EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
                 MarkBufferBankForExecution(gActiveBank);
                 break;
             }
@@ -2965,9 +3213,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     && gBattleMons[gBankTarget].hp)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = 8;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     SetMoveEffect(0, 0);
-                    b_movescr_stack_pop_cursor();
+                    BattleScriptPop();
                 }
                 break;
             case HOLD_EFFECT_SHELL_BELL:
@@ -2985,7 +3233,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = -1;
                     gSpecialStatuses[gBankTarget].moveturnLostHP = 0;
-                    b_movescr_stack_push_cursor();
+                    BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret;
                     effect++;
                 }
@@ -3028,14 +3276,14 @@ void unref_sub_801B40C(void)
                 {
                     if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank + 2])
                     {
-                        gSideTimer[GetBankIdentity(bank) & 1].field3 = (bank) | ((bank + 2) << 4);
-                        gSideTimer[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove;
+                        gSideTimers[GetBankIdentity(bank) & 1].field3 = (bank) | ((bank + 2) << 4);
+                        gSideTimers[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove;
                         gSideAffecting[GetBankIdentity(bank) & 1] |= SIDE_STATUS_X4;
                     }
                     if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank + 2] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank])
                     {
-                        gSideTimer[GetBankIdentity(bank) & 1].field3 = (bank + 2) | ((bank) << 4);
-                        gSideTimer[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove;
+                        gSideTimers[GetBankIdentity(bank) & 1].field3 = (bank + 2) | ((bank) << 4);
+                        gSideTimers[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove;
                         gSideAffecting[GetBankIdentity(bank) & 1] |= SIDE_STATUS_X4;
                     }
                     bank++;
@@ -3067,8 +3315,8 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target
     {
     case 0:
         side = GetBankSide(gBankAttacker) ^ 1;
-        if (gSideTimer[side].followmeTimer && gBattleMons[gSideTimer[side].followmeTarget].hp)
-            targetBank = gSideTimer[side].followmeTarget;
+        if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
+            targetBank = gSideTimers[side].followmeTarget;
         else
         {
             side = GetBankSide(gBankAttacker);
@@ -3090,35 +3338,35 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target
     case 8:
     case 32:
     case 64:
-        targetBank = GetBankByPlayerAI((GetBankIdentity(gBankAttacker) & 1) ^ 1);
+        targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1);
         if (gAbsentBankFlags & gBitTable[targetBank])
             targetBank ^= 2;
         break;
     case 4:
         side = GetBankSide(gBankAttacker) ^ 1;
-        if (gSideTimer[side].followmeTimer && gBattleMons[gSideTimer[side].followmeTarget].hp)
-            targetBank = gSideTimer[side].followmeTarget;
+        if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
+            targetBank = gSideTimers[side].followmeTarget;
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & 4)
         {
             if (GetBankSide(gBankAttacker) == 0)
             {
                 if (Random() & 1)
-                    targetBank = GetBankByPlayerAI(1);
+                    targetBank = GetBankByIdentity(1);
                 else
-                    targetBank = GetBankByPlayerAI(3);
+                    targetBank = GetBankByIdentity(3);
             }
             else
             {
                 if (Random() & 1)
-                    targetBank = GetBankByPlayerAI(0);
+                    targetBank = GetBankByIdentity(0);
                 else
-                    targetBank = GetBankByPlayerAI(2);
+                    targetBank = GetBankByIdentity(2);
             }
             if (gAbsentBankFlags & gBitTable[targetBank])
                 targetBank ^= 2;
         }
         else
-            targetBank = GetBankByPlayerAI((GetBankIdentity(gBankAttacker) & 1) ^ 1);
+            targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1);
         break;
     case 2:
     case 16:
@@ -3129,7 +3377,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target
     return targetBank;
 }
 
-u8 IsPokeDisobedient(void)
+u8 IsMonDisobedient(void)
 {
     u8 obedienceLevel;
     s32 rnd;
diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 0ae98af09..616a72d27 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -3,52 +3,33 @@
 
 #if GERMAN
 
-void de_sub_80C9274(bool32 arg0) {
-    if (deUnkValue2 != 1)
-    {
-        return;
-    }
-
-    if (arg0)
-    {
-        deUnkValue2 = 3;
-    }
-    else
+void de_sub_80C9274(bool32 arg0)
+{
+    if (deUnkValue2 == 1)
     {
-        deUnkValue2 = 2;
+        if (arg0)
+            deUnkValue2 = 3;
+        else
+            deUnkValue2 = 2;
     }
 }
 
-void de_sub_80C9294(bool32 arg0) {
+void de_sub_80C9294(bool32 arg0)
+{
     if (deUnkValue2 == 1)
     {
         if (arg0)
-        {
             deUnkValue2 = 3;
-        }
         else
-        {
             deUnkValue2 = 2;
-        }
-
-        return;
     }
-
-
-    if (deUnkValue2 == 2)
+    else if (deUnkValue2 == 2)
     {
         SendBlock(0, sBlockRequestLookupTable[deUnkValue1].address, sBlockRequestLookupTable[deUnkValue1].size);
-
         if (arg0)
-        {
             deUnkValue2 = 0;
-        }
         else
-        {
             deUnkValue2 = 1;
-        }
-
-        return;
     }
 }
 
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index bcaaebcda..6f27469ce 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -383,7 +383,7 @@ static void sub_8046464(u8 taskId)
         gSprites[spriteId].callback = sub_8047254;
         break;
     default:
-        gBankTarget = GetBankByPlayerAI(1);
+        gBankTarget = GetBankByIdentity(1);
         sp0 = TRUE;
         break;
     }
@@ -722,7 +722,7 @@ static void sub_8046C78(struct Sprite *sprite)
             r8 = -25;
         }
         species = GetMonData(pkmn, MON_DATA_SPECIES);
-        if ((r5 == GetBankByPlayerAI(0) || r5 == GetBankByPlayerAI(1))
+        if ((r5 == GetBankByIdentity(0) || r5 == GetBankByIdentity(1))
          && IsDoubleBattle() && ewram17840.unk9_0)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
@@ -737,7 +737,7 @@ static void sub_8046C78(struct Sprite *sprite)
         }
         if (!IsDoubleBattle() || !ewram17840.unk9_0)
             r4_2 = 0;
-        else if (r5 == GetBankByPlayerAI(0) || r5 == GetBankByPlayerAI(1))
+        else if (r5 == GetBankByIdentity(0) || r5 == GetBankByIdentity(1))
             r4_2 = 1;
         else
             r4_2 = 2;
@@ -885,7 +885,7 @@ static void sub_80470C4(struct Sprite *sprite)
             sprite->data[6] = sprite->oam.affineParam & 0xFF;
             sprite->data[0] = 0;
             if (IsDoubleBattle() && ewram17840.unk9_0
-             && sprite->data[6] == GetBankByPlayerAI(2))
+             && sprite->data[6] == GetBankByIdentity(2))
                 sprite->callback = sub_8047230;
             else
                 sprite->callback = sub_8046C78;
@@ -910,7 +910,7 @@ static void sub_8047254(struct Sprite *sprite)
     {
         sprite->data[0] = 0;
         if (IsDoubleBattle() && ewram17840.unk9_0
-         && sprite->data[6] == GetBankByPlayerAI(3))
+         && sprite->data[6] == GetBankByIdentity(3))
             sprite->callback = sub_8047230;
         else
             sprite->callback = sub_8046C78;
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index 49b0854cc..6a6d7a137 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -13,12 +13,12 @@ extern struct SpriteTemplate gUnknown_02024E8C;
 extern struct Window gUnknown_03004210;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG2_X;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG1_X;
 extern u16 gUnknown_030041B0;
 extern u16 gBattle_BG1_Y;
 extern u16 gUnknown_030041B8;
-extern u16 gUnknown_030042A0;
+extern u16 gBattle_BG0_Y;
 extern u8 gReservedSpritePaletteCount;
 extern u8 gActionSelectionCursor[4];
 extern u8 gBankInMenu;
@@ -81,8 +81,8 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
         SetUpWindowConfig(&gWindowConfig_81E6C58);
         ResetPaletteFade();
         InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
-        gUnknown_030042A4 = 0;
-        gUnknown_030042A0 = 0;
+        gBattle_BG0_X = 0;
+        gBattle_BG0_Y = 0;
         gBattle_BG1_X = 0;
         gBattle_BG1_Y = 0;
         gBattle_BG2_X = 0;
@@ -171,13 +171,13 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
 
             sub_80327CC();
 
-            opponentBank = GetBankByPlayerAI(1);
+            opponentBank = GetBankByIdentity(1);
             species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
             sub_8032984(opponentBank, species);
 
             if (IsDoubleBattle())
             {
-                opponentBank = GetBankByPlayerAI(3);
+                opponentBank = GetBankByIdentity(3);
                 species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
                 sub_8032984(opponentBank, species);
             }
@@ -190,7 +190,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
         sub_807B06C();
         BeginHardwarePaletteFade(0xFF, 0, 0x10, 0, 1);
         gPaletteFade.bufferTransferDisabled = 0;
-        SetMainCallback2(sub_800F808);
+        SetMainCallback2(BattleMainCB2);
         break;
     }
     gReshowState++;
diff --git a/src/contest.c b/src/contest.c
index f5aab709d..c32719648 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -39,171 +39,6 @@ extern void sub_80C8C80(u8);
 extern void sub_81288F4();
 extern u8 sub_8128944(void);
 
-struct Shared18000
-{
-    /*0x18000*/ u8 unk18000;
-    /*0x18001*/ u8 filler18001[3];
-    /*0x18004*/ u16 unk18004[16][16];
-    /*0x18204*/ u16 unk18204[0x200];
-    /*0x18604*/ u16 unk18604[0x200];
-    /*0x18A04*/ u8 unk18A04[0x800];
-};
-
-struct Contest
-{
-    /*0x19204*/ u8 playerMoveChoice;
-    /*0x19205*/ u8 turnNumber;
-    /*0x19206*/ u8 unk19206[4];    // seems to only be used by an unref function
-    /*0x1920A*/ u16 unk1920A_0:1;  // Task active flags?
-                u16 unk1920A_1:1;
-                u16 unk1920A_2:1;
-                u16 unk1920A_3:1;
-                u16 unk1920A_4:1;
-                u16 unk1920A_5:1;
-                u16 unk1920A_6:1;
-                u16 unk1920A_7:1;
-    /*0x1920B*/ u16 unk1920B_0:1;
-                u16 unk1920B_1:1;
-                u16 unk1920B_2:1;
-    /*0x1920C*/ u8 mainTaskId;
-    /*0x1920D*/ u8 unk1920D[4];
-    /*0x19211*/ u8 unk19211;
-    /*0x19212*/ u8 unk19212;
-    /*0x19213*/ u8 filler19213;
-    /*0x19214*/ u8 unk19214;
-    /*0x19215*/ u8 unk19215;
-    /*0x19216*/ u8 unk19216;    // sprite ID
-    /*0x19217*/ s8 applauseLevel;
-    /*0x19218*/ u8 unk19218[4];
-    /*0x1921C*/ u32 unk1921C;   // saved RNG value?
-                u16 unk19220[5][4];  // move history?
-                u8 unk19248[5][4];  // excitement history
-                u8 applauseMeterSpriteId;    // sprite ID
-    /*0x1925D*/ u8 unk1925D;
-    /*0x1925E*/ u8 unk1925E;
-};
-
-struct ContestantStatus
-{
-    s16 appeal1;  // move appeal?
-    s16 appeal2;  // final appeal after end of turn, maybe?
-    s16 unk4;
-    u16 currMove;
-    u16 prevMove;
-    u8 moveCategory;
-    u8 unkB_0:2;
-    u8 unkB_2:2;
-    u8 moveRepeatCount:3;
-    u8 unkB_7:1;  // used a one-time move?
-    u8 unkC_0:1;
-    u8 unkC_1:2;
-    s8 unkD;
-    u8 unkE;
-    u8 unkF;
-    u8 unk10_0:1;
-    u8 unk10_1:1;
-    u8 unk10_2:1;
-    u8 unk10_3:1;
-    u8 unk10_4:2;
-    u8 unk10_6:2;
-    u8 unk11_0:2;
-    u8 unk11_2:1;
-    u8 unk11_3:1;
-    u8 unk11_4:1;
-    u8 unk11_5:1;
-    u8 unk12;
-    u8 unk13;   // status action?
-    u8 unk14;
-    u8 disappointedRepeat:1;
-    u8 unk15_1:1;
-    u8 unk15_2:1;
-    u8 unk15_3:1;
-    u8 unk15_4:1;
-    u8 unk15_5:1;
-    u8 unk15_6:1;
-    u8 unk16;
-    u8 unk17;
-    u8 unk18;
-    u8 unk19;  // turn position
-    u8 attentionLevel;  // How much the Pokemon "stood out"
-    u8 unk1B;
-};
-
-struct UnknownContestStruct3
-{
-    u8 unk0;
-    u8 unk1;
-    //u8 unk2_0:1;
-    //u8 unk2_1:1;
-    u8 unk2;  // maybe a bitfield
-    u8 filler3;
-};
-
-// possibly the same as UnknownContestStruct3?
-struct UnknownContestStruct4
-{
-    u8 unk0;  // sprite ID
-    u8 unk1;  // sprite ID
-    u8 unk2_0:1;
-    u8 unk2_1:1;
-    u8 unk2_2:1;
-    u8 filler3;
-};
-
-struct UnknownContestStruct5
-{
-    s8 bits_0;  // current move excitement?
-    u8 bits_8:1;
-    u8 bits_9:3;
-    u8 bits_C:4;
-    s8 unk2;
-    u8 filler3;
-};
-
-struct UnknownContestStruct7
-{
-    u8 unk0[4];
-    u16 unk4;
-    u16 unk6;
-    u8 filler8[0xD-8];
-    u8 unkD[4];
-    u8 unk11;
-    u8 filler12[2];
-};
-
-struct UnknownContestStruct8
-{
-    u16 unk0;
-    u16 unk2;
-    u8 unk4_0:1;
-    u8 unk5;
-    u8 filler6[2];
-    u32 unk8;
-    u32 unkC;
-    u32 unk10;
-};
-
-struct UnknownContestStruct6
-{
-    s32 unk0;
-    s32 unk4;
-    s32 unk8;
-    s32 unkC;
-};
-
-#define shared15800 (gSharedMem + 0x15800)
-#define shared15DE0 (*(struct ContestWinner *)(gSharedMem + 0x15DE0))
-#define shared16800 (gSharedMem + 0x16800)
-#define shared18000 (*(struct Shared18000 *)(gSharedMem + 0x18000))
-#define shared18004 ((u16 *)(gSharedMem + 0x18004))
-#define sContest (*(struct Contest *)(gSharedMem + 0x19204))
-#define sContestantStatus ((struct ContestantStatus *)(gSharedMem + 0x19260))
-#define shared192D0_ (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0))
-#define shared192E4 (gSharedMem + 0x192E4)
-#define shared19328 (*(struct UnknownContestStruct5 *)(gSharedMem + 0x19328))
-#define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338))
-#define shared19348_ (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348))
-
 extern struct MusicPlayerInfo gMPlay_SE1;
 extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
@@ -225,8 +60,8 @@ extern u16 gBattle_WIN0V;
 extern u16 gBattle_WIN1V;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG2_X;
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_WIN0H;
 extern u32 gUnknown_03005D28;  // saved RNG value
@@ -489,8 +324,8 @@ void ResetContestGpuRegs(void)
     REG_WINOUT = 0x3F3F;
     REG_DISPCNT |= 0x7F00;
 
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = 0;
     gBattle_BG2_X = 0;
@@ -555,7 +390,7 @@ void ClearContestVars(void)
         sContestantStatus[i].unk14 = 0xFF;
     }
 
-    memset(&shared192D0_, 0, sizeof(shared192D0_));
+    memset(&shared192D0, 0, sizeof(shared192D0));
     memset(shared192E4, 0, 0x44 * sizeof(*shared192E4));
     memset(&shared19328, 0, sizeof(shared19328));
     memset(shared19338, 0, 4 * sizeof(*shared19338));
@@ -785,8 +620,8 @@ void ContestMainCallback2(void)
 
 void ContestVBlankCallback(void)
 {
-    REG_BG0HOFS = gUnknown_030042A4;
-    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG0HOFS = gBattle_BG0_X;
+    REG_BG0VOFS = gBattle_BG0_Y;
     REG_BG1HOFS = gBattle_BG1_X;
     REG_BG1VOFS = gBattle_BG1_Y;
     REG_BG2HOFS = gBattle_BG2_X;
@@ -805,7 +640,7 @@ void ContestVBlankCallback(void)
 
 void sub_80ABB70(u8 taskId)
 {
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG2_Y = 0;
     sub_80B0D7C();
     DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18204, 0x400);
@@ -849,7 +684,7 @@ void sub_80ABCDC(u8 taskId)
     u8 i;
     u8 sp8[32];
 
-    gUnknown_030042A0 = 0xA0;
+    gBattle_BG0_Y = 0xA0;
     gBattle_BG2_Y = 0xA0;
     FillWindowRect_DefaultPalette(
       &gUnknown_03004210,
@@ -937,7 +772,7 @@ void sub_80ABEA0(u8 taskId)
             sub_80AF138();
             StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
             sub_8003460(&gMenuWindow, gStringVar4, 776, 1, 15);
-            gUnknown_030042A0 = 0;
+            gBattle_BG0_Y = 0;
             gBattle_BG2_Y = 0;
             gTasks[taskId].func = sub_80ABC70;
             break;
@@ -1011,7 +846,7 @@ void sub_80AC15C(u8 taskId)
 void sub_80AC188(u8 taskId)
 {
     sub_80AF138();
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG2_Y = 0;
     sub_80AFFE0(FALSE);
     DmaCopy32Defvars(3, gPlttBufferFaded, shared18000.unk18604, 0x400);
@@ -1063,7 +898,7 @@ void sub_80AC2CC(u8 taskId)
     {
     case 0:
         sub_80B0D7C();
-        for (i = 0; sContest.unk19214 != shared192D0_.unk0[i]; i++)
+        for (i = 0; sContest.unk19214 != shared192D0.unk0[i]; i++)
             ;
         sContest.unk19215 = i;
         r7 = sContest.unk19215;
@@ -1106,7 +941,7 @@ void sub_80AC2CC(u8 taskId)
     case 3:
         for (i = 0; i < 4; i++)
             gBattleMonForms[i] = 0;
-        memset(&shared19348_, 0, sizeof(shared19348_));
+        memset(&shared19348, 0, sizeof(shared19348));
         sub_80B28F0(sContest.unk19215);
         spriteId = sub_80AE9FC(
           gContestMons[sContest.unk19215].species,
@@ -1969,7 +1804,7 @@ void sub_80ADDA4(u8 taskId)
 {
     s32 i;
 
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG2_Y = 0;
     for (i = 0; i < 4; i++)
         gUnknown_02038680[i] = sContestantStatus[i].unk4;
@@ -3115,7 +2950,7 @@ bool8 sub_80AF828(s32 a, s32 b, struct UnknownContestStruct6 *c)
 
 void sub_80AF860(void)
 {
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG2_Y = 0;
     sub_80AF138();
     sub_8003460(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15);
@@ -4528,13 +4363,13 @@ void sub_80B114C(u8 contestant)
         }
         sContestantStatus[contestant].appeal1 = gContestEffects[effect].appeal;
         sContestantStatus[contestant].appeal2 = gContestEffects[effect].appeal;
-        shared192D0_.unk4 = gContestEffects[effect].jam;
-        shared192D0_.unk6 = gContestEffects[effect].jam;
-        shared192D0_.unk11 = contestant;
+        shared192D0.unk4 = gContestEffects[effect].jam;
+        shared192D0.unk6 = gContestEffects[effect].jam;
+        shared192D0.unk11 = contestant;
         for (i = 0; i < 4; i++)
         {
             sContestantStatus[i].unkE = 0;
-            shared192D0_.unkD[i] = 0;
+            shared192D0.unkD[i] = 0;
         }
         if (sContestantStatus[contestant].unk15_4 && AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove) == 0)
             sContestantStatus[contestant].unk15_4 = 0;
@@ -4637,13 +4472,13 @@ void sub_80B146C(u8 a, u8 b)
 {
     StringCopy(gStringVar1, gContestMons[a].nickname);
     StringCopy(gStringVar2, gMoveNames[sContestantStatus[a].currMove]);
-    if      (gContestMoves[sContestantStatus[shared192D0_.unk11].currMove].contestCategory == CONTEST_CATEGORY_COOL)
+    if      (gContestMoves[sContestantStatus[shared192D0.unk11].currMove].contestCategory == CONTEST_CATEGORY_COOL)
         StringCopy(gStringVar3, gText_Contest_Shyness);
-    else if (gContestMoves[sContestantStatus[shared192D0_.unk11].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY)
+    else if (gContestMoves[sContestantStatus[shared192D0.unk11].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY)
         StringCopy(gStringVar3, gText_Contest_Anxiety);
-    else if (gContestMoves[sContestantStatus[shared192D0_.unk11].currMove].contestCategory == CONTEST_CATEGORY_CUTE)
+    else if (gContestMoves[sContestantStatus[shared192D0.unk11].currMove].contestCategory == CONTEST_CATEGORY_CUTE)
         StringCopy(gStringVar3, gText_Contest_Laziness);
-    else if (gContestMoves[sContestantStatus[shared192D0_.unk11].currMove].contestCategory == CONTEST_CATEGORY_SMART)
+    else if (gContestMoves[sContestantStatus[shared192D0.unk11].currMove].contestCategory == CONTEST_CATEGORY_SMART)
         StringCopy(gStringVar3, gText_Contest_Hesitancy);
     else
         StringCopy(gStringVar3, gText_Contest_Fear);
@@ -4708,7 +4543,7 @@ void sub_80B159C(void)
 
     for (i = 0; i < 4; i++)
     {
-        shared192D0_.unk0[i] = sp0[i];
+        shared192D0.unk0[i] = sp0[i];
         sContestantStatus[i].unk19 = 0xFF;
         sContestantStatus[i].unk10_6 = 0;
         gUnknown_02038696[i] = sp0[i];
@@ -5083,7 +4918,7 @@ void sub_80B20C4(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (shared192D0_.unkD[i] != 0 && !Contest_IsMonsTurnDisabled(i))
+        if (shared192D0.unkD[i] != 0 && !Contest_IsMonsTurnDisabled(i))
         {
             u8 r4 = gUnknown_02038696[i] * 5 + 2;
             u16 r0 = sub_80AEFE8(i, 3);
@@ -5339,7 +5174,7 @@ void sub_80B2790(u8 a)
     u16 species = SanitizeSpecies(gContestMons[a].species);
     u8 r5_2;
 
-    memset(&shared19348_, 0, sizeof(shared19348_));
+    memset(&shared19348, 0, sizeof(shared19348));
     ClearBattleAnimationVars();
     for (i = 0; i < 4; i++)
         gBattleMonForms[i] = 0;
@@ -5354,9 +5189,9 @@ void sub_80B2790(u8 a)
     case MOVE_TRANSFORM:
     case MOVE_ROLE_PLAY:
         r5_2 = sContestantStatus[a].unk1B;
-        shared19348_.unk2 = SanitizeSpecies(gContestMons[r5_2].species);
-        shared19348_.unk10 = gContestMons[r5_2].personality;
-        shared19348_.unk4_0 = 1;
+        shared19348.unk2 = SanitizeSpecies(gContestMons[r5_2].species);
+        shared19348.unk10 = gContestMons[r5_2].personality;
+        shared19348.unk4_0 = 1;
         break;
     case MOVE_RETURN:
         gAnimFriendship = 0xFF;
@@ -5384,17 +5219,17 @@ void sub_80B2790(u8 a)
 
 void sub_80B28CC(int unused)
 {
-    memset(&shared19348_, 0, sizeof(shared19348_));
+    memset(&shared19348, 0, sizeof(shared19348));
     if (sContest.unk1925E != 0)
         sContest.unk1925E--;
 }
 
 void sub_80B28F0(u8 a)
 {
-    shared19348_.unk5 = a;
-    shared19348_.unk0 = SanitizeSpecies(gContestMons[a].species);
-    shared19348_.unk8 = gContestMons[a].personality;
-    shared19348_.unkC = gContestMons[a].otId;
+    shared19348.unk5 = a;
+    shared19348.unk0 = SanitizeSpecies(gContestMons[a].species);
+    shared19348.unk8 = gContestMons[a].personality;
+    shared19348.unkC = gContestMons[a].otId;
 }
 
 void sub_80B292C(void)
diff --git a/src/data/battle_tower/trainers.h b/src/data/battle_tower/trainers.h
index b5eb3da7a..ae204f8ea 100644
--- a/src/data/battle_tower/trainers.h
+++ b/src/data/battle_tower/trainers.h
@@ -1,7 +1,7 @@
 const struct BattleTowerTrainer gBattleTowerTrainers[] =
 {
 	{
-		.trainerClass = TRAINER_CLASS_YOUNGSTER,
+		.trainerClass = FACILITY_CLASS_YOUNGSTER,
 		.name = _("ALVIN"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -16,7 +16,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
+		.trainerClass = FACILITY_CLASS_BIRD_KEEPER,
 		.name = _("DIRK"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -31,7 +31,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_LADY,
+		.trainerClass = FACILITY_CLASS_LADY,
 		.name = _("CYBIL"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -46,7 +46,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BLACK_BELT,
+		.trainerClass = FACILITY_CLASS_BLACK_BELT,
 		.name = _("CHEN"),
 		.teamFlags = 0x05,
 		.greeting = {
@@ -61,7 +61,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_NINJA_BOY,
+		.trainerClass = FACILITY_CLASS_NINJA_BOY,
 		.name = _("YOSHI"),
 		.teamFlags = 0x05,
 		.greeting = {
@@ -76,7 +76,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SCHOOL_KID_F,
+		.trainerClass = FACILITY_CLASS_SCHOOL_KID_F,
 		.name = _("TINA"),
 		.teamFlags = 0x0A,
 		.greeting = {
@@ -91,7 +91,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BUG_MANIAC,
+		.trainerClass = FACILITY_CLASS_BUG_MANIAC,
 		.name = _("COREY"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -106,7 +106,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_FISHERMAN,
+		.trainerClass = FACILITY_CLASS_FISHERMAN,
 		.name = _("GORDON"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -121,7 +121,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_TUBER_F,
+		.trainerClass = FACILITY_CLASS_TUBER_F,
 		.name = _("ANN"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -136,7 +136,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEFAN_F,
+		.trainerClass = FACILITY_CLASS_POKEFAN_F,
 		.name = _("JULIA"),
 		.teamFlags = 0x42,
 		.greeting = {
@@ -151,7 +151,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GENTLEMAN,
+		.trainerClass = FACILITY_CLASS_GENTLEMAN,
 		.name = _("GREGORY"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -166,7 +166,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CAMPER,
+		.trainerClass = FACILITY_CLASS_CAMPER,
 		.name = _("KEITH"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -181,7 +181,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
 		.name = _("KENDRA"),
 		.teamFlags = 0x0A,
 		.greeting = {
@@ -196,7 +196,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_HIKER,
+		.trainerClass = FACILITY_CLASS_HIKER,
 		.name = _("DEV"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -211,7 +211,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
+		.trainerClass = FACILITY_CLASS_BATTLE_GIRL,
 		.name = _("CASSIE"),
 		.teamFlags = 0x0A,
 		.greeting = {
@@ -226,7 +226,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PSYCHIC_M,
+		.trainerClass = FACILITY_CLASS_PSYCHIC_M,
 		.name = _("JULIAN"),
 		.teamFlags = 0x05,
 		.greeting = {
@@ -241,7 +241,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_LASS,
+		.trainerClass = FACILITY_CLASS_LASS,
 		.name = _("JOYCE"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -256,7 +256,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GUITARIST,
+		.trainerClass = FACILITY_CLASS_GUITARIST,
 		.name = _("LES"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -271,7 +271,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RICH_BOY,
+		.trainerClass = FACILITY_CLASS_RICH_BOY,
 		.name = _("CLINTON"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -286,7 +286,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BUG_CATCHER,
+		.trainerClass = FACILITY_CLASS_BUG_CATCHER,
 		.name = _("LEWIS"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -301,7 +301,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PICNICKER,
+		.trainerClass = FACILITY_CLASS_PICNICKER,
 		.name = _("RACHAEL"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -316,7 +316,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COLLECTOR,
+		.trainerClass = FACILITY_CLASS_COLLECTOR,
 		.name = _("HAROLD"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -331,7 +331,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_TUBER_M,
+		.trainerClass = FACILITY_CLASS_TUBER_M,
 		.name = _("KIPP"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -346,7 +346,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_KINDLER,
+		.trainerClass = FACILITY_CLASS_KINDLER,
 		.name = _("IRWIN"),
 		.teamFlags = 0x05,
 		.greeting = {
@@ -361,7 +361,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PSYCHIC_F,
+		.trainerClass = FACILITY_CLASS_PSYCHIC_F,
 		.name = _("EILEEN"),
 		.teamFlags = 0x0A,
 		.greeting = {
@@ -376,7 +376,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMER_F,
+		.trainerClass = FACILITY_CLASS_SWIMMER_F,
 		.name = _("ANNE"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -391,7 +391,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
 		.name = _("RUTH"),
 		.teamFlags = 0x06,
 		.greeting = {
@@ -406,7 +406,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMANIAC,
+		.trainerClass = FACILITY_CLASS_POKEMANIAC,
 		.name = _("JEREMY"),
 		.teamFlags = 0x40,
 		.greeting = {
@@ -421,7 +421,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SAILOR,
+		.trainerClass = FACILITY_CLASS_SAILOR,
 		.name = _("TREVOR"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -436,7 +436,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_BREEDER_F,
+		.trainerClass = FACILITY_CLASS_POKEMON_BREEDER_F,
 		.name = _("COLETTE"),
 		.teamFlags = 0x06,
 		.greeting = {
@@ -451,7 +451,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_HEX_MANIAC,
+		.trainerClass = FACILITY_CLASS_HEX_MANIAC,
 		.name = _("PAULA"),
 		.teamFlags = 0x42,
 		.greeting = {
@@ -466,7 +466,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
+		.trainerClass = FACILITY_CLASS_RUIN_MANIAC,
 		.name = _("STANLY"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -481,7 +481,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
 		.name = _("TROY"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -496,7 +496,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SCHOOL_KID_M,
+		.trainerClass = FACILITY_CLASS_SCHOOL_KID_M,
 		.name = _("ED"),
 		.teamFlags = 0x08,
 		.greeting = {
@@ -511,7 +511,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_RANGER_F,
+		.trainerClass = FACILITY_CLASS_POKEMON_RANGER_F,
 		.name = _("ELLEN"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -526,7 +526,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMER_M,
+		.trainerClass = FACILITY_CLASS_SWIMMER_M,
 		.name = _("ARNIE"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -541,7 +541,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
 		.name = _("HAL"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -556,7 +556,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BEAUTY,
+		.trainerClass = FACILITY_CLASS_BEAUTY,
 		.name = _("LAUREN"),
 		.teamFlags = 0x06,
 		.greeting = {
@@ -571,7 +571,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_AROMA_LADY,
+		.trainerClass = FACILITY_CLASS_AROMA_LADY,
 		.name = _("STACY"),
 		.teamFlags = 0x06,
 		.greeting = {
@@ -586,7 +586,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COLLECTOR,
+		.trainerClass = FACILITY_CLASS_COLLECTOR,
 		.name = _("DARYL"),
 		.teamFlags = 0x81,
 		.greeting = {
@@ -601,7 +601,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
 		.name = _("KATHY"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -616,7 +616,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_RANGER_M,
+		.trainerClass = FACILITY_CLASS_POKEMON_RANGER_M,
 		.name = _("HARRIS"),
 		.teamFlags = 0x0C,
 		.greeting = {
@@ -631,7 +631,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEFAN_M,
+		.trainerClass = FACILITY_CLASS_POKEFAN_M,
 		.name = _("GLENN"),
 		.teamFlags = 0x80,
 		.greeting = {
@@ -646,7 +646,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
 		.name = _("NICO"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -661,7 +661,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_BREEDER_M,
+		.trainerClass = FACILITY_CLASS_POKEMON_BREEDER_M,
 		.name = _("BAILEY"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -676,7 +676,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PARASOL_LADY,
+		.trainerClass = FACILITY_CLASS_PARASOL_LADY,
 		.name = _("ABBIE"),
 		.teamFlags = 0x08,
 		.greeting = {
@@ -691,7 +691,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CAMPER,
+		.trainerClass = FACILITY_CLASS_CAMPER,
 		.name = _("AL"),
 		.teamFlags = 0x0C,
 		.greeting = {
@@ -706,7 +706,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SCHOOL_KID_F,
+		.trainerClass = FACILITY_CLASS_SCHOOL_KID_F,
 		.name = _("PEGGY"),
 		.teamFlags = 0x42,
 		.greeting = {
@@ -721,7 +721,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BEAUTY,
+		.trainerClass = FACILITY_CLASS_BEAUTY,
 		.name = _("NAOMI"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -736,7 +736,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_NINJA_BOY,
+		.trainerClass = FACILITY_CLASS_NINJA_BOY,
 		.name = _("KENJI"),
 		.teamFlags = 0x0C,
 		.greeting = {
@@ -751,7 +751,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
 		.name = _("ROSS"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -766,7 +766,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_RANGER_F,
+		.trainerClass = FACILITY_CLASS_POKEMON_RANGER_F,
 		.name = _("EDNA"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -781,7 +781,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
+		.trainerClass = FACILITY_CLASS_RUIN_MANIAC,
 		.name = _("ANTON"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -796,7 +796,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMER_M,
+		.trainerClass = FACILITY_CLASS_SWIMMER_M,
 		.name = _("MITCH"),
 		.teamFlags = 0x81,
 		.greeting = {
@@ -811,7 +811,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_HEX_MANIAC,
+		.trainerClass = FACILITY_CLASS_HEX_MANIAC,
 		.name = _("ROD"),
 		.teamFlags = 0x42,
 		.greeting = {
@@ -826,7 +826,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
 		.name = _("RICH"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -841,7 +841,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEFAN_M,
+		.trainerClass = FACILITY_CLASS_POKEFAN_M,
 		.name = _("DANIEL"),
 		.teamFlags = 0x80,
 		.greeting = {
@@ -856,7 +856,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PSYCHIC_F,
+		.trainerClass = FACILITY_CLASS_PSYCHIC_F,
 		.name = _("GLORIA"),
 		.teamFlags = 0x82,
 		.greeting = {
@@ -871,7 +871,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GUITARIST,
+		.trainerClass = FACILITY_CLASS_GUITARIST,
 		.name = _("NELSON"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -886,7 +886,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_KINDLER,
+		.trainerClass = FACILITY_CLASS_KINDLER,
 		.name = _("FERRIS"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -901,7 +901,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_AROMA_LADY,
+		.trainerClass = FACILITY_CLASS_AROMA_LADY,
 		.name = _("AMANDA"),
 		.teamFlags = 0x82,
 		.greeting = {
@@ -916,7 +916,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
 		.name = _("MASON"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -931,7 +931,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
+		.trainerClass = FACILITY_CLASS_DRAGON_TAMER,
 		.name = _("NATE"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -946,7 +946,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_LASS,
+		.trainerClass = FACILITY_CLASS_LASS,
 		.name = _("MIRIAM"),
 		.teamFlags = 0x82,
 		.greeting = {
@@ -961,7 +961,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMANIAC,
+		.trainerClass = FACILITY_CLASS_POKEMANIAC,
 		.name = _("THEO"),
 		.teamFlags = 0x40,
 		.greeting = {
@@ -976,7 +976,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
 		.name = _("PAMELA"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -991,7 +991,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEFAN_F,
+		.trainerClass = FACILITY_CLASS_POKEFAN_F,
 		.name = _("ALISSA"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1006,7 +1006,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GENTLEMAN,
+		.trainerClass = FACILITY_CLASS_GENTLEMAN,
 		.name = _("ARTHUR"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1021,7 +1021,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMER_F,
+		.trainerClass = FACILITY_CLASS_SWIMMER_F,
 		.name = _("MARCY"),
 		.teamFlags = 0x82,
 		.greeting = {
@@ -1036,7 +1036,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COOL_TRAINER_M,
+		.trainerClass = FACILITY_CLASS_COOL_TRAINER_M,
 		.name = _("MILLER"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1051,7 +1051,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
+		.trainerClass = FACILITY_CLASS_BIRD_KEEPER,
 		.name = _("OLIVER"),
 		.teamFlags = 0x11,
 		.greeting = {
@@ -1066,7 +1066,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
 		.name = _("MOLLY"),
 		.teamFlags = 0x12,
 		.greeting = {
@@ -1081,7 +1081,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BUG_MANIAC,
+		.trainerClass = FACILITY_CLASS_BUG_MANIAC,
 		.name = _("JASON"),
 		.teamFlags = 0x40,
 		.greeting = {
@@ -1096,7 +1096,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
+		.trainerClass = FACILITY_CLASS_BATTLE_GIRL,
 		.name = _("AVA"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1111,7 +1111,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_FISHERMAN,
+		.trainerClass = FACILITY_CLASS_FISHERMAN,
 		.name = _("HANK"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1126,7 +1126,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SAILOR,
+		.trainerClass = FACILITY_CLASS_SAILOR,
 		.name = _("PETER"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1141,7 +1141,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_EXPERT_F,
+		.trainerClass = FACILITY_CLASS_EXPERT_F,
 		.name = _("MINDY"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1156,7 +1156,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BUG_MANIAC,
+		.trainerClass = FACILITY_CLASS_BUG_MANIAC,
 		.name = _("DWIGHT"),
 		.teamFlags = 0x11,
 		.greeting = {
@@ -1171,7 +1171,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_BREEDER_F,
+		.trainerClass = FACILITY_CLASS_POKEMON_BREEDER_F,
 		.name = _("REENA"),
 		.teamFlags = 0x12,
 		.greeting = {
@@ -1186,7 +1186,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PARASOL_LADY,
+		.trainerClass = FACILITY_CLASS_PARASOL_LADY,
 		.name = _("MEGAN"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1201,7 +1201,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
 		.name = _("SIERRA"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -1216,7 +1216,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_RANGER_M,
+		.trainerClass = FACILITY_CLASS_POKEMON_RANGER_M,
 		.name = _("ARNOLD"),
 		.teamFlags = 0x08,
 		.greeting = {
@@ -1231,7 +1231,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BLACK_BELT,
+		.trainerClass = FACILITY_CLASS_BLACK_BELT,
 		.name = _("XIN"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -1246,7 +1246,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COOL_TRAINER_F,
+		.trainerClass = FACILITY_CLASS_COOL_TRAINER_F,
 		.name = _("KELLY"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -1261,7 +1261,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COLLECTOR,
+		.trainerClass = FACILITY_CLASS_COLLECTOR,
 		.name = _("VANCE"),
 		.teamFlags = 0x80,
 		.greeting = {
@@ -1276,7 +1276,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
 		.name = _("TOBY"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -1291,7 +1291,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GENTLEMAN,
+		.trainerClass = FACILITY_CLASS_GENTLEMAN,
 		.name = _("NORTON"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1306,7 +1306,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
+		.trainerClass = FACILITY_CLASS_BATTLE_GIRL,
 		.name = _("ZOE"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -1321,7 +1321,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BEAUTY,
+		.trainerClass = FACILITY_CLASS_BEAUTY,
 		.name = _("EMMA"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1336,7 +1336,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_HIKER,
+		.trainerClass = FACILITY_CLASS_HIKER,
 		.name = _("VINCE"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -1351,7 +1351,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_EXPERT_M,
+		.trainerClass = FACILITY_CLASS_EXPERT_M,
 		.name = _("MARV"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1366,7 +1366,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_BREEDER_M,
+		.trainerClass = FACILITY_CLASS_POKEMON_BREEDER_M,
 		.name = _("TODD"),
 		.teamFlags = 0x40,
 		.greeting = {
@@ -1381,7 +1381,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GUITARIST,
+		.trainerClass = FACILITY_CLASS_GUITARIST,
 		.name = _("GAVIN"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -1396,7 +1396,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PSYCHIC_M,
+		.trainerClass = FACILITY_CLASS_PSYCHIC_M,
 		.name = _("QUINN"),
 		.teamFlags = 0x08,
 		.greeting = {
@@ -1411,7 +1411,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COOL_TRAINER_F,
+		.trainerClass = FACILITY_CLASS_COOL_TRAINER_F,
 		.name = _("JENN"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -1426,7 +1426,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_EXPERT_M,
+		.trainerClass = FACILITY_CLASS_EXPERT_M,
 		.name = _("JOEL"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1441,7 +1441,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
+		.trainerClass = FACILITY_CLASS_DRAGON_TAMER,
 		.name = _("KYLE"),
 		.teamFlags = 0x0C,
 		.greeting = {
@@ -1456,7 +1456,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COOL_TRAINER_M,
+		.trainerClass = FACILITY_CLASS_COOL_TRAINER_M,
 		.name = _("BRET"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -1471,7 +1471,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_EXPERT_F,
+		.trainerClass = FACILITY_CLASS_EXPERT_F,
 		.name = _("CARRIE"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1486,7 +1486,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_LADY,
+		.trainerClass = FACILITY_CLASS_LADY,
 		.name = _("GILLIAN"),
 		.teamFlags = 0x02,
 		.greeting = {
diff --git a/src/data/battle_tower/trainers_de.h b/src/data/battle_tower/trainers_de.h
index 86182da9d..db226c6a6 100644
--- a/src/data/battle_tower/trainers_de.h
+++ b/src/data/battle_tower/trainers_de.h
@@ -1,7 +1,7 @@
 const struct BattleTowerTrainer gBattleTowerTrainers[] = 
 {
 	{
-		.trainerClass = TRAINER_CLASS_YOUNGSTER,
+		.trainerClass = FACILITY_CLASS_YOUNGSTER,
 		.name = _("ALWIN"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -16,7 +16,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
+		.trainerClass = FACILITY_CLASS_BIRD_KEEPER,
 		.name = _("DIRK"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -31,7 +31,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_LADY,
+		.trainerClass = FACILITY_CLASS_LADY,
 		.name = _("SIBILLE"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -46,7 +46,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BLACK_BELT,
+		.trainerClass = FACILITY_CLASS_BLACK_BELT,
 		.name = _("OLAF"),
 		.teamFlags = 0x05,
 		.greeting = {
@@ -61,7 +61,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_NINJA_BOY,
+		.trainerClass = FACILITY_CLASS_NINJA_BOY,
 		.name = _("JOST"),
 		.teamFlags = 0x05,
 		.greeting = {
@@ -76,7 +76,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SCHOOL_KID_F,
+		.trainerClass = FACILITY_CLASS_SCHOOL_KID_F,
 		.name = _("TINA"),
 		.teamFlags = 0x0A,
 		.greeting = {
@@ -91,7 +91,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BUG_MANIAC,
+		.trainerClass = FACILITY_CLASS_BUG_MANIAC,
 		.name = _("HAJO"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -106,7 +106,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_FISHERMAN,
+		.trainerClass = FACILITY_CLASS_FISHERMAN,
 		.name = _("GEORG"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -121,7 +121,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_TUBER_F,
+		.trainerClass = FACILITY_CLASS_TUBER_F,
 		.name = _("ANNE"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -136,7 +136,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEFAN_F,
+		.trainerClass = FACILITY_CLASS_POKEFAN_F,
 		.name = _("JULIA"),
 		.teamFlags = 0x42,
 		.greeting = {
@@ -151,7 +151,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GENTLEMAN,
+		.trainerClass = FACILITY_CLASS_GENTLEMAN,
 		.name = _("JOHANN"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -166,7 +166,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CAMPER,
+		.trainerClass = FACILITY_CLASS_CAMPER,
 		.name = _("KARL"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -181,7 +181,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
 		.name = _("KENDRA"),
 		.teamFlags = 0x0A,
 		.greeting = {
@@ -196,7 +196,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_HIKER,
+		.trainerClass = FACILITY_CLASS_HIKER,
 		.name = _("DAVID"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -211,7 +211,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
+		.trainerClass = FACILITY_CLASS_BATTLE_GIRL,
 		.name = _("KEA"),
 		.teamFlags = 0x0A,
 		.greeting = {
@@ -226,7 +226,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PSYCHIC_M,
+		.trainerClass = FACILITY_CLASS_PSYCHIC_M,
 		.name = _("JULIAN"),
 		.teamFlags = 0x05,
 		.greeting = {
@@ -241,7 +241,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_LASS,
+		.trainerClass = FACILITY_CLASS_LASS,
 		.name = _("JOSI"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -256,7 +256,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GUITARIST,
+		.trainerClass = FACILITY_CLASS_GUITARIST,
 		.name = _("LEIF"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -271,7 +271,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RICH_BOY,
+		.trainerClass = FACILITY_CLASS_RICH_BOY,
 		.name = _("INGO"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -286,7 +286,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BUG_CATCHER,
+		.trainerClass = FACILITY_CLASS_BUG_CATCHER,
 		.name = _("LUDWIG"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -301,7 +301,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PICNICKER,
+		.trainerClass = FACILITY_CLASS_PICNICKER,
 		.name = _("RAJA"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -316,7 +316,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COLLECTOR,
+		.trainerClass = FACILITY_CLASS_COLLECTOR,
 		.name = _("HARALD"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -331,7 +331,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_TUBER_M,
+		.trainerClass = FACILITY_CLASS_TUBER_M,
 		.name = _("KIM"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -346,7 +346,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_KINDLER,
+		.trainerClass = FACILITY_CLASS_KINDLER,
 		.name = _("ERWIN"),
 		.teamFlags = 0x05,
 		.greeting = {
@@ -361,7 +361,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PSYCHIC_F,
+		.trainerClass = FACILITY_CLASS_PSYCHIC_F,
 		.name = _("EIKA"),
 		.teamFlags = 0x0A,
 		.greeting = {
@@ -376,7 +376,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMER_F,
+		.trainerClass = FACILITY_CLASS_SWIMMER_F,
 		.name = _("ANNINA"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -391,7 +391,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
 		.name = _("RUTH"),
 		.teamFlags = 0x06,
 		.greeting = {
@@ -406,7 +406,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMANIAC,
+		.trainerClass = FACILITY_CLASS_POKEMANIAC,
 		.name = _("JENS"),
 		.teamFlags = 0x40,
 		.greeting = {
@@ -421,7 +421,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SAILOR,
+		.trainerClass = FACILITY_CLASS_SAILOR,
 		.name = _("TITUS"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -436,7 +436,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_BREEDER_F,
+		.trainerClass = FACILITY_CLASS_POKEMON_BREEDER_F,
 		.name = _("NICOLA"),
 		.teamFlags = 0x06,
 		.greeting = {
@@ -451,7 +451,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_HEX_MANIAC,
+		.trainerClass = FACILITY_CLASS_HEX_MANIAC,
 		.name = _("PAULA"),
 		.teamFlags = 0x42,
 		.greeting = {
@@ -466,7 +466,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
+		.trainerClass = FACILITY_CLASS_RUIN_MANIAC,
 		.name = _("SÖREN"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -481,7 +481,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
 		.name = _("RAINER"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -496,7 +496,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SCHOOL_KID_M,
+		.trainerClass = FACILITY_CLASS_SCHOOL_KID_M,
 		.name = _("FABIAN"),
 		.teamFlags = 0x08,
 		.greeting = {
@@ -511,7 +511,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_RANGER_F,
+		.trainerClass = FACILITY_CLASS_POKEMON_RANGER_F,
 		.name = _("ELLEN"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -526,7 +526,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMER_M,
+		.trainerClass = FACILITY_CLASS_SWIMMER_M,
 		.name = _("ARNIE"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -541,7 +541,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
 		.name = _("HARDI"),
 		.teamFlags = 0x09,
 		.greeting = {
@@ -556,7 +556,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BEAUTY,
+		.trainerClass = FACILITY_CLASS_BEAUTY,
 		.name = _("LINA"),
 		.teamFlags = 0x06,
 		.greeting = {
@@ -571,7 +571,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_AROMA_LADY,
+		.trainerClass = FACILITY_CLASS_AROMA_LADY,
 		.name = _("SELINA"),
 		.teamFlags = 0x06,
 		.greeting = {
@@ -586,7 +586,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COLLECTOR,
+		.trainerClass = FACILITY_CLASS_COLLECTOR,
 		.name = _("DANTE"),
 		.teamFlags = 0x81,
 		.greeting = {
@@ -601,7 +601,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
 		.name = _("KATJA"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -616,7 +616,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_RANGER_M,
+		.trainerClass = FACILITY_CLASS_POKEMON_RANGER_M,
 		.name = _("HORST"),
 		.teamFlags = 0x0C,
 		.greeting = {
@@ -631,7 +631,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEFAN_M,
+		.trainerClass = FACILITY_CLASS_POKEFAN_M,
 		.name = _("GERRIT"),
 		.teamFlags = 0x80,
 		.greeting = {
@@ -646,7 +646,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
 		.name = _("NIKO"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -661,7 +661,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_BREEDER_M,
+		.trainerClass = FACILITY_CLASS_POKEMON_BREEDER_M,
 		.name = _("BALDO"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -676,7 +676,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PARASOL_LADY,
+		.trainerClass = FACILITY_CLASS_PARASOL_LADY,
 		.name = _("ALMA"),
 		.teamFlags = 0x08,
 		.greeting = {
@@ -691,7 +691,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CAMPER,
+		.trainerClass = FACILITY_CLASS_CAMPER,
 		.name = _("ADAM"),
 		.teamFlags = 0x0C,
 		.greeting = {
@@ -706,7 +706,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SCHOOL_KID_F,
+		.trainerClass = FACILITY_CLASS_SCHOOL_KID_F,
 		.name = _("GRETE"),
 		.teamFlags = 0x42,
 		.greeting = {
@@ -721,7 +721,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BEAUTY,
+		.trainerClass = FACILITY_CLASS_BEAUTY,
 		.name = _("NAOMI"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -736,7 +736,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_NINJA_BOY,
+		.trainerClass = FACILITY_CLASS_NINJA_BOY,
 		.name = _("KENO"),
 		.teamFlags = 0x0C,
 		.greeting = {
@@ -751,7 +751,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
 		.name = _("REMUS"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -766,7 +766,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_RANGER_F,
+		.trainerClass = FACILITY_CLASS_POKEMON_RANGER_F,
 		.name = _("EDITH"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -781,7 +781,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
+		.trainerClass = FACILITY_CLASS_RUIN_MANIAC,
 		.name = _("ANTON"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -796,7 +796,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMER_M,
+		.trainerClass = FACILITY_CLASS_SWIMMER_M,
 		.name = _("MALTE"),
 		.teamFlags = 0x81,
 		.greeting = {
@@ -811,7 +811,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_HEX_MANIAC,
+		.trainerClass = FACILITY_CLASS_HEX_MANIAC,
 		.name = _("RAOUL"),
 		.teamFlags = 0x42,
 		.greeting = {
@@ -826,7 +826,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
 		.name = _("RICK"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -841,7 +841,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEFAN_M,
+		.trainerClass = FACILITY_CLASS_POKEFAN_M,
 		.name = _("DENNIS"),
 		.teamFlags = 0x80,
 		.greeting = {
@@ -856,7 +856,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PSYCHIC_F,
+		.trainerClass = FACILITY_CLASS_PSYCHIC_F,
 		.name = _("GLORIA"),
 		.teamFlags = 0x82,
 		.greeting = {
@@ -871,7 +871,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GUITARIST,
+		.trainerClass = FACILITY_CLASS_GUITARIST,
 		.name = _("NINO"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -886,7 +886,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_KINDLER,
+		.trainerClass = FACILITY_CLASS_KINDLER,
 		.name = _("FIETE"),
 		.teamFlags = 0x41,
 		.greeting = {
@@ -901,7 +901,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_AROMA_LADY,
+		.trainerClass = FACILITY_CLASS_AROMA_LADY,
 		.name = _("AMANDA"),
 		.teamFlags = 0x82,
 		.greeting = {
@@ -916,7 +916,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
 		.name = _("MAREK"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -931,7 +931,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
+		.trainerClass = FACILITY_CLASS_DRAGON_TAMER,
 		.name = _("NATHAN"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -946,7 +946,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_LASS,
+		.trainerClass = FACILITY_CLASS_LASS,
 		.name = _("MIRIAM"),
 		.teamFlags = 0x82,
 		.greeting = {
@@ -961,7 +961,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMANIAC,
+		.trainerClass = FACILITY_CLASS_POKEMANIAC,
 		.name = _("THEO"),
 		.teamFlags = 0x40,
 		.greeting = {
@@ -976,7 +976,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
 		.name = _("PIA"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -991,7 +991,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEFAN_F,
+		.trainerClass = FACILITY_CLASS_POKEFAN_F,
 		.name = _("ALISSA"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1006,7 +1006,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GENTLEMAN,
+		.trainerClass = FACILITY_CLASS_GENTLEMAN,
 		.name = _("ARTUR"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1021,7 +1021,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMER_F,
+		.trainerClass = FACILITY_CLASS_SWIMMER_F,
 		.name = _("MAJA"),
 		.teamFlags = 0x82,
 		.greeting = {
@@ -1036,7 +1036,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COOL_TRAINER_M,
+		.trainerClass = FACILITY_CLASS_COOL_TRAINER_M,
 		.name = _("MARIUS"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1051,7 +1051,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
+		.trainerClass = FACILITY_CLASS_BIRD_KEEPER,
 		.name = _("OLIVER"),
 		.teamFlags = 0x11,
 		.greeting = {
@@ -1066,7 +1066,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
 		.name = _("MOLLY"),
 		.teamFlags = 0x12,
 		.greeting = {
@@ -1081,7 +1081,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BUG_MANIAC,
+		.trainerClass = FACILITY_CLASS_BUG_MANIAC,
 		.name = _("JÖRG"),
 		.teamFlags = 0x40,
 		.greeting = {
@@ -1096,7 +1096,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
+		.trainerClass = FACILITY_CLASS_BATTLE_GIRL,
 		.name = _("ANKE"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1111,7 +1111,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_FISHERMAN,
+		.trainerClass = FACILITY_CLASS_FISHERMAN,
 		.name = _("HANS"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1126,7 +1126,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SAILOR,
+		.trainerClass = FACILITY_CLASS_SAILOR,
 		.name = _("PETER"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1141,7 +1141,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_EXPERT_F,
+		.trainerClass = FACILITY_CLASS_EXPERT_F,
 		.name = _("MARA"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1156,7 +1156,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BUG_MANIAC,
+		.trainerClass = FACILITY_CLASS_BUG_MANIAC,
 		.name = _("DARIUS"),
 		.teamFlags = 0x11,
 		.greeting = {
@@ -1171,7 +1171,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_BREEDER_F,
+		.trainerClass = FACILITY_CLASS_POKEMON_BREEDER_F,
 		.name = _("REGINA"),
 		.teamFlags = 0x12,
 		.greeting = {
@@ -1186,7 +1186,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PARASOL_LADY,
+		.trainerClass = FACILITY_CLASS_PARASOL_LADY,
 		.name = _("MAIKE"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1201,7 +1201,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_F,
+		.trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
 		.name = _("SANDRA"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -1216,7 +1216,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_RANGER_M,
+		.trainerClass = FACILITY_CLASS_POKEMON_RANGER_M,
 		.name = _("ARNOLD"),
 		.teamFlags = 0x08,
 		.greeting = {
@@ -1231,7 +1231,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BLACK_BELT,
+		.trainerClass = FACILITY_CLASS_BLACK_BELT,
 		.name = _("XENO"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -1246,7 +1246,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COOL_TRAINER_F,
+		.trainerClass = FACILITY_CLASS_COOL_TRAINER_F,
 		.name = _("KARLA"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -1261,7 +1261,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COLLECTOR,
+		.trainerClass = FACILITY_CLASS_COLLECTOR,
 		.name = _("VOLKER"),
 		.teamFlags = 0x80,
 		.greeting = {
@@ -1276,7 +1276,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
+		.trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
 		.name = _("TOBIAS"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -1291,7 +1291,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GENTLEMAN,
+		.trainerClass = FACILITY_CLASS_GENTLEMAN,
 		.name = _("NORBERT"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1306,7 +1306,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
+		.trainerClass = FACILITY_CLASS_BATTLE_GIRL,
 		.name = _("ZITA"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -1321,7 +1321,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_BEAUTY,
+		.trainerClass = FACILITY_CLASS_BEAUTY,
 		.name = _("ELKE"),
 		.teamFlags = 0x20,
 		.greeting = {
@@ -1336,7 +1336,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_HIKER,
+		.trainerClass = FACILITY_CLASS_HIKER,
 		.name = _("VITUS"),
 		.teamFlags = 0x04,
 		.greeting = {
@@ -1351,7 +1351,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_EXPERT_M,
+		.trainerClass = FACILITY_CLASS_EXPERT_M,
 		.name = _("MALTE"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1366,7 +1366,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_POKEMON_BREEDER_M,
+		.trainerClass = FACILITY_CLASS_POKEMON_BREEDER_M,
 		.name = _("TIM"),
 		.teamFlags = 0x40,
 		.greeting = {
@@ -1381,7 +1381,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_GUITARIST,
+		.trainerClass = FACILITY_CLASS_GUITARIST,
 		.name = _("GAVIN"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -1396,7 +1396,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_PSYCHIC_M,
+		.trainerClass = FACILITY_CLASS_PSYCHIC_M,
 		.name = _("RALF"),
 		.teamFlags = 0x08,
 		.greeting = {
@@ -1411,7 +1411,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COOL_TRAINER_F,
+		.trainerClass = FACILITY_CLASS_COOL_TRAINER_F,
 		.name = _("JENNY"),
 		.teamFlags = 0x02,
 		.greeting = {
@@ -1426,7 +1426,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_EXPERT_M,
+		.trainerClass = FACILITY_CLASS_EXPERT_M,
 		.name = _("JOEL"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1441,7 +1441,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
+		.trainerClass = FACILITY_CLASS_DRAGON_TAMER,
 		.name = _("KOLJA"),
 		.teamFlags = 0x0C,
 		.greeting = {
@@ -1456,7 +1456,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_COOL_TRAINER_M,
+		.trainerClass = FACILITY_CLASS_COOL_TRAINER_M,
 		.name = _("BILL"),
 		.teamFlags = 0x01,
 		.greeting = {
@@ -1471,7 +1471,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_EXPERT_F,
+		.trainerClass = FACILITY_CLASS_EXPERT_F,
 		.name = _("CALLA"),
 		.teamFlags = 0x10,
 		.greeting = {
@@ -1486,7 +1486,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] =
 		},
 	},
 	{
-		.trainerClass = TRAINER_CLASS_LADY,
+		.trainerClass = FACILITY_CLASS_LADY,
 		.name = _("GESA"),
 		.teamFlags = 0x02,
 		.greeting = {
diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h
index c86e795c4..9cffca632 100644
--- a/src/data/pokemon/trainer_class_lookups.h
+++ b/src/data/pokemon/trainer_class_lookups.h
@@ -1,7 +1,3 @@
-//
-
-//
-
 #ifndef POKERUBY_TRAINER_CLASS_LOOKUPS_H
 #define POKERUBY_TRAINER_CLASS_LOOKUPS_H
 
@@ -86,83 +82,83 @@ const u8 gTrainerClassToPicIndex[] = {
 };
 
 const u8 gTrainerClassToNameIndex[] = {
-    TRAINER_CLASS_NAME_AQUA_LEADER,       // AQUA_LEADER
-    TRAINER_CLASS_NAME_TEAM_AQUA,         // TEAM_AQUA_M
-    TRAINER_CLASS_NAME_TEAM_AQUA,         // TEAM_AQUA_F
-    TRAINER_CLASS_NAME_AROMA_LADY,        // AROMA_LADY
-    TRAINER_CLASS_NAME_RUIN_MANIAC,       // RUIN_MANIAC
-    TRAINER_CLASS_NAME_INTERVIEWER,       // INTERVIEWER
-    TRAINER_CLASS_NAME_TUBER_F,           // TUBER_F
-    TRAINER_CLASS_NAME_TUBER_M,           // TUBER_M
-    TRAINER_CLASS_NAME_COOL_TRAINER,      // COOL_TRAINER_M
-    TRAINER_CLASS_NAME_COOL_TRAINER,      // COOL_TRAINER_F
-    TRAINER_CLASS_NAME_HEX_MANIAC,        // HEX_MANIAC
-    TRAINER_CLASS_NAME_LADY,              // LADY
-    TRAINER_CLASS_NAME_BEAUTY,            // BEAUTY
-    TRAINER_CLASS_NAME_RICH_BOY,          // RICH_BOY
-    TRAINER_CLASS_NAME_POKEMANIAC,        // POKEMANIAC
-    TRAINER_CLASS_NAME_SWIMMER_M,         // SWIMMER_M
-    TRAINER_CLASS_NAME_BLACK_BELT,        // BLACK_BELT
-    TRAINER_CLASS_NAME_GUITARIST,         // GUITARIST
-    TRAINER_CLASS_NAME_KINDLER,           // KINDLER
-    TRAINER_CLASS_NAME_CAMPER,            // CAMPER
-    TRAINER_CLASS_NAME_BUG_MANIAC,        // BUG_MANIAC
-    TRAINER_CLASS_NAME_PSYCHIC,           // PSYCHIC_M
-    TRAINER_CLASS_NAME_PSYCHIC,           // PSYCHIC_F
-    TRAINER_CLASS_NAME_GENTLEMAN,         // GENTLEMAN
-    TRAINER_CLASS_NAME_ELITE_FOUR,        // ELITE_FOUR_M
-    TRAINER_CLASS_NAME_ELITE_FOUR,        // ELITE_FOUR_F
-    TRAINER_CLASS_NAME_LEADER,            // LEADER_F
-    TRAINER_CLASS_NAME_LEADER,            // LEADER_M
-    TRAINER_CLASS_NAME_LEADER,            // LEADER_MF
-    TRAINER_CLASS_NAME_SCHOOL_KID,        // SCHOOL_KID_M
-    TRAINER_CLASS_NAME_SCHOOL_KID,        // SCHOOL_KID_F
-    TRAINER_CLASS_NAME_SR_AND_JR,         // SR_AND_JR
-    TRAINER_CLASS_NAME_POKEFAN,           // POKEFAN_M
-    TRAINER_CLASS_NAME_POKEFAN,           // POKEFAN_F
-    TRAINER_CLASS_NAME_EXPERT,            // EXPERT_M
-    TRAINER_CLASS_NAME_EXPERT,            // EXPERT_F
-    TRAINER_CLASS_NAME_YOUNGSTER,         // YOUNGSTER
-    TRAINER_CLASS_NAME_CHAMPION,          // CHAMPION
-    TRAINER_CLASS_NAME_FISHERMAN,         // FISHERMAN
-    TRAINER_CLASS_NAME_TRIATHLETE,        // CYCLING_TRIATHLETE_M
-    TRAINER_CLASS_NAME_TRIATHLETE,        // CYCLING_TRIATHLETE_F
-    TRAINER_CLASS_NAME_TRIATHLETE,        // RUNNING_TRIATHLETE_M
-    TRAINER_CLASS_NAME_TRIATHLETE,        // RUNNING_TRIATHLETE_F
-    TRAINER_CLASS_NAME_TRIATHLETE,        // SWIMMING_TRIATHLETE_M
-    TRAINER_CLASS_NAME_TRIATHLETE,        // SWIMMING_TRIATHLETE_F
-    TRAINER_CLASS_NAME_DRAGON_TAMER,      // DRAGON_TAMER
-    TRAINER_CLASS_NAME_BIRD_KEEPER,       // BIRD_KEEPER
-    TRAINER_CLASS_NAME_NINJA_BOY,         // NINJA_BOY
-    TRAINER_CLASS_NAME_BATTLE_GIRL,       // BATTLE_GIRL
-    TRAINER_CLASS_NAME_PARASOL_LADY,      // PARASOL_LADY
-    TRAINER_CLASS_NAME_SWIMMER_F,         // SWIMMER_F
-    TRAINER_CLASS_NAME_PICNICKER,         // PICNICKER
-    TRAINER_CLASS_NAME_TWINS,             // TWINS
-    TRAINER_CLASS_NAME_SAILOR,            // SAILOR
-    TRAINER_CLASS_NAME_BOARDER,           // BOARDER_1
-    TRAINER_CLASS_NAME_BOARDER,           // BOARDER_2
-    TRAINER_CLASS_NAME_COLLECTOR,         // COLLECTOR
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // WALLY
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // BRENDAN_1
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // BRENDAN_2
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // BRENDAN_3
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // MAY_1
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // MAY_2
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // MAY_3
-    TRAINER_CLASS_NAME_POKEMON_BREEDER,   // POKEMON_BREEDER_M
-    TRAINER_CLASS_NAME_POKEMON_BREEDER,   // POKEMON_BREEDER_F
-    TRAINER_CLASS_NAME_POKEMON_RANGER,    // POKEMON_RANGER_M
-    TRAINER_CLASS_NAME_POKEMON_RANGER,    // POKEMON_RANGER_F
-    TRAINER_CLASS_NAME_MAGMA_LEADER,      // MAGMA_LEADER
-    TRAINER_CLASS_NAME_TEAM_MAGMA,        // TEAM_MAGMA_M
-    TRAINER_CLASS_NAME_TEAM_MAGMA,        // TEAM_MAGMA_F
-    TRAINER_CLASS_NAME_LASS,              // LASS
-    TRAINER_CLASS_NAME_BUG_CATCHER,       // BUG_CATCHER
-    TRAINER_CLASS_NAME_HIKER,             // HIKER
-    TRAINER_CLASS_NAME_YOUNG_COUPLE,      // YOUNG_COUPLE
-    TRAINER_CLASS_NAME_OLD_COUPLE,        // OLD_COUPLE
-    TRAINER_CLASS_NAME_SIS_AND_BRO        // SIS_AND_BRO
+    TRAINER_CLASS_AQUA_LEADER,       // AQUA_LEADER
+    TRAINER_CLASS_TEAM_AQUA,         // TEAM_AQUA_M
+    TRAINER_CLASS_TEAM_AQUA,         // TEAM_AQUA_F
+    TRAINER_CLASS_AROMA_LADY,        // AROMA_LADY
+    TRAINER_CLASS_RUIN_MANIAC,       // RUIN_MANIAC
+    TRAINER_CLASS_INTERVIEWER,       // INTERVIEWER
+    TRAINER_CLASS_TUBER_F,           // TUBER_F
+    TRAINER_CLASS_TUBER_M,           // TUBER_M
+    TRAINER_CLASS_COOL_TRAINER,      // COOL_TRAINER_M
+    TRAINER_CLASS_COOL_TRAINER,      // COOL_TRAINER_F
+    TRAINER_CLASS_HEX_MANIAC,        // HEX_MANIAC
+    TRAINER_CLASS_LADY,              // LADY
+    TRAINER_CLASS_BEAUTY,            // BEAUTY
+    TRAINER_CLASS_RICH_BOY,          // RICH_BOY
+    TRAINER_CLASS_POKEMANIAC,        // POKEMANIAC
+    TRAINER_CLASS_SWIMMER_M,         // SWIMMER_M
+    TRAINER_CLASS_BLACK_BELT,        // BLACK_BELT
+    TRAINER_CLASS_GUITARIST,         // GUITARIST
+    TRAINER_CLASS_KINDLER,           // KINDLER
+    TRAINER_CLASS_CAMPER,            // CAMPER
+    TRAINER_CLASS_BUG_MANIAC,        // BUG_MANIAC
+    TRAINER_CLASS_PSYCHIC,           // PSYCHIC_M
+    TRAINER_CLASS_PSYCHIC,           // PSYCHIC_F
+    TRAINER_CLASS_GENTLEMAN,         // GENTLEMAN
+    TRAINER_CLASS_ELITE_FOUR,        // ELITE_FOUR_M
+    TRAINER_CLASS_ELITE_FOUR,        // ELITE_FOUR_F
+    TRAINER_CLASS_LEADER,            // LEADER_F
+    TRAINER_CLASS_LEADER,            // LEADER_M
+    TRAINER_CLASS_LEADER,            // LEADER_MF
+    TRAINER_CLASS_SCHOOL_KID,        // SCHOOL_KID_M
+    TRAINER_CLASS_SCHOOL_KID,        // SCHOOL_KID_F
+    TRAINER_CLASS_SR_AND_JR,         // SR_AND_JR
+    TRAINER_CLASS_POKEFAN,           // POKEFAN_M
+    TRAINER_CLASS_POKEFAN,           // POKEFAN_F
+    TRAINER_CLASS_EXPERT,            // EXPERT_M
+    TRAINER_CLASS_EXPERT,            // EXPERT_F
+    TRAINER_CLASS_YOUNGSTER,         // YOUNGSTER
+    TRAINER_CLASS_CHAMPION,          // CHAMPION
+    TRAINER_CLASS_FISHERMAN,         // FISHERMAN
+    TRAINER_CLASS_TRIATHLETE,        // CYCLING_TRIATHLETE_M
+    TRAINER_CLASS_TRIATHLETE,        // CYCLING_TRIATHLETE_F
+    TRAINER_CLASS_TRIATHLETE,        // RUNNING_TRIATHLETE_M
+    TRAINER_CLASS_TRIATHLETE,        // RUNNING_TRIATHLETE_F
+    TRAINER_CLASS_TRIATHLETE,        // SWIMMING_TRIATHLETE_M
+    TRAINER_CLASS_TRIATHLETE,        // SWIMMING_TRIATHLETE_F
+    TRAINER_CLASS_DRAGON_TAMER,      // DRAGON_TAMER
+    TRAINER_CLASS_BIRD_KEEPER,       // BIRD_KEEPER
+    TRAINER_CLASS_NINJA_BOY,         // NINJA_BOY
+    TRAINER_CLASS_BATTLE_GIRL,       // BATTLE_GIRL
+    TRAINER_CLASS_PARASOL_LADY,      // PARASOL_LADY
+    TRAINER_CLASS_SWIMMER_F,         // SWIMMER_F
+    TRAINER_CLASS_PICNICKER,         // PICNICKER
+    TRAINER_CLASS_TWINS,             // TWINS
+    TRAINER_CLASS_SAILOR,            // SAILOR
+    TRAINER_CLASS_BOARDER,           // BOARDER_1
+    TRAINER_CLASS_BOARDER,           // BOARDER_2
+    TRAINER_CLASS_COLLECTOR,         // COLLECTOR
+    TRAINER_CLASS_POKEMON_TRAINER_3, // WALLY
+    TRAINER_CLASS_POKEMON_TRAINER_3, // BRENDAN_1
+    TRAINER_CLASS_POKEMON_TRAINER_3, // BRENDAN_2
+    TRAINER_CLASS_POKEMON_TRAINER_3, // BRENDAN_3
+    TRAINER_CLASS_POKEMON_TRAINER_3, // MAY_1
+    TRAINER_CLASS_POKEMON_TRAINER_3, // MAY_2
+    TRAINER_CLASS_POKEMON_TRAINER_3, // MAY_3
+    TRAINER_CLASS_POKEMON_BREEDER,   // POKEMON_BREEDER_M
+    TRAINER_CLASS_POKEMON_BREEDER,   // POKEMON_BREEDER_F
+    TRAINER_CLASS_POKEMON_RANGER,    // POKEMON_RANGER_M
+    TRAINER_CLASS_POKEMON_RANGER,    // POKEMON_RANGER_F
+    TRAINER_CLASS_MAGMA_LEADER,      // MAGMA_LEADER
+    TRAINER_CLASS_TEAM_MAGMA,        // TEAM_MAGMA_M
+    TRAINER_CLASS_TEAM_MAGMA,        // TEAM_MAGMA_F
+    TRAINER_CLASS_LASS,              // LASS
+    TRAINER_CLASS_BUG_CATCHER,       // BUG_CATCHER
+    TRAINER_CLASS_HIKER,             // HIKER
+    TRAINER_CLASS_YOUNG_COUPLE,      // YOUNG_COUPLE
+    TRAINER_CLASS_OLD_COUPLE,        // OLD_COUPLE
+    TRAINER_CLASS_SIS_AND_BRO        // SIS_AND_BRO
 };
 
 #endif //POKERUBY_TRAINER_CLASS_LOOKUPS_H
diff --git a/src/de_rom_8040FE0.c b/src/de_rom_8040FE0.c
index 53ad4a806..c93ef74cd 100644
--- a/src/de_rom_8040FE0.c
+++ b/src/de_rom_8040FE0.c
@@ -2,55 +2,34 @@
 #include "battle.h"
 #include "battle_tower.h"
 #include "ewram.h"
+#include "trainer.h"
 
 #if GERMAN
 
-enum {
-    TRAINER_CLASS_NAME_LEADER = 25,
-    TRAINER_CLASS_NAME_SCHOOL_KID = 26,
-    TRAINER_CLASS_NAME_EXPERT = 30,
-    TRAINER_CLASS_NAME_POKEMON_TRAINER_3 = 46,
-};
-
-enum {
-    TRAINER_CLASS_LEADER_F = 26,
-    TRAINER_CLASS_ELITE_FOUR_F = 25,
-    TRAINER_CLASS_SCHOOL_KID_F = 30,
-    TRAINER_CLASS_BIRD_KEEPER = 46,
-    TRAINER_CLASS_MAY_1 = 61,
-    TRAINER_CLASS_MAY_2 = 62,
-    TRAINER_CLASS_MAY_3 = 63,
-};
-
 extern u8 gTrainerClassNames[][13];
 extern struct Trainer gTrainers[];
 
-u8 *de_sub_8040FE0(u8 gender) {
+u8 *de_sub_8040FE0(u8 gender)
+{
     if (gender)
-    {
         gender++;
-
-    }
-
-    gender = TRAINER_CLASS_NAME_SCHOOL_KID;
+    gender = TRAINER_CLASS_SCHOOL_KID;
     return gTrainerClassNames[gender];
 }
 
-u8 *de_sub_8040FF4(u8 gender) {
-    if (gender) {
+u8 *de_sub_8040FF4(u8 gender)
+{
+    if (gender)
         gender++;
-    }
-
-    gender = TRAINER_CLASS_NAME_POKEMON_TRAINER_3;
+    gender = TRAINER_CLASS_POKEMON_TRAINER_3;
     return gTrainerClassNames[gender];
 }
 
-u8 *de_sub_804100C(u8 gender) {
-    if (gender) {
+u8 *de_sub_804100C(u8 gender)
+{
+    if (gender)
         gender++;
-    }
-
-    gender = TRAINER_CLASS_NAME_LEADER;
+    gender = TRAINER_CLASS_LEADER;
     return gTrainerClassNames[gender];
 }
 
@@ -60,7 +39,8 @@ u8 de_sub_81364AC(void);
 u8 get_trainer_class_name_index(void);
 u8 de_sub_81364F8(void);
 
-u8 *de_sub_8041024(s32 arg0, u32 arg1) {
+u8 *de_sub_8041024(s32 arg0, u32 arg1)
+{
     u8 nameIndex, trainerClass, gender;
     struct Trainer *trainer;
     u8 local2;
@@ -70,69 +50,40 @@ u8 *de_sub_8041024(s32 arg0, u32 arg1) {
     case 0x400:
         nameIndex = GetSecretBaseTrainerNameIndex();
         gender = eSecretBaseRecord.gender;
-        if (nameIndex == TRAINER_CLASS_NAME_SCHOOL_KID)
-        {
+        if (nameIndex == TRAINER_CLASS_SCHOOL_KID)
             return de_sub_8040FE0(gender);
-        }
-
         return gTrainerClassNames[nameIndex];
-
     case 0x100:
         trainerClass = de_sub_81364AC();
         nameIndex = get_trainer_class_name_index();
-        if (trainerClass == TRAINER_CLASS_SCHOOL_KID_F)
-        {
+        if (trainerClass == FACILITY_CLASS_SCHOOL_KID_F)
             return de_sub_8040FE0(FEMALE);
-        }
-        if (trainerClass == TRAINER_CLASS_MAY_1 || trainerClass == TRAINER_CLASS_MAY_2 || trainerClass == TRAINER_CLASS_MAY_3)
-        {
+        if (trainerClass == FACILITY_CLASS_MAY_1 || trainerClass == FACILITY_CLASS_MAY_2 || trainerClass == FACILITY_CLASS_MAY_3)
             return de_sub_8040FF4(FEMALE);
-        }
-
         return gTrainerClassNames[nameIndex];
-
     case 0x800:
         trainerClass = de_sub_81364F8();
         nameIndex = GetEReaderTrainerClassNameIndex();
-        if (trainerClass == TRAINER_CLASS_SCHOOL_KID_F)
-        {
+        if (trainerClass == FACILITY_CLASS_SCHOOL_KID_F)
             return de_sub_8040FE0(FEMALE);
-        }
-        if (trainerClass == TRAINER_CLASS_MAY_1 || trainerClass == TRAINER_CLASS_MAY_2 || trainerClass == TRAINER_CLASS_MAY_3)
-        {
+        if (trainerClass == FACILITY_CLASS_MAY_1 || trainerClass == FACILITY_CLASS_MAY_2 || trainerClass == FACILITY_CLASS_MAY_3)
             return de_sub_8040FF4(FEMALE);
-        }
-
         return gTrainerClassNames[nameIndex];
-
     default:
         trainer = &gTrainers[arg1];
         trainerClass = trainer->trainerClass;
         local2 = sub_803FC58(arg1);
-
-        if (trainerClass == TRAINER_CLASS_LEADER_F)
-        {
+        if (trainerClass == FACILITY_CLASS_LEADER_F)
             return de_sub_8040FE0(local2);
-        }
-
-        if (trainerClass == TRAINER_CLASS_BIRD_KEEPER && local2 == FEMALE)
-        {
+        if (trainerClass == FACILITY_CLASS_BIRD_KEEPER && local2 == FEMALE)
             return de_sub_8040FF4(FEMALE);
-        }
-
-        if (trainerClass == TRAINER_CLASS_ELITE_FOUR_F)
+        if (trainerClass == FACILITY_CLASS_ELITE_FOUR_F)
         {
             if (gTrainers[arg1].doubleBattle == TRUE)
-            {
                 return de_sub_804100C(FEMALE);
-            }
             else
-            {
                 return de_sub_804100C(MALE);
-            }
         }
-
-
         return gTrainerClassNames[trainerClass];
     }
 }
@@ -264,7 +215,8 @@ _08041108: .4byte gTrainerClassNames\n\
 }
 #endif
 
-u32 de_sub_804110C(u32 arg0, u32 arg1) {
+u32 de_sub_804110C(u32 arg0, u32 arg1)
+{
     return arg1;
 }
 
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index bb80de6fe..49fe6864b 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -29,8 +29,8 @@ extern u8 gContestPlayerMonIndex;
 extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
 
-extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042A0;
+extern u16 gBattle_BG0_X;
+extern u16 gBattle_BG0_Y;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
@@ -457,8 +457,8 @@ static void sub_80A9F50(void)
     REG_BLDY = 0;
     REG_BG0HOFS = 0;
     REG_BG0VOFS = 0;
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = 0;
     gBattle_BG2_X = 0;
@@ -505,8 +505,8 @@ static void sub_80AA064(void)
 
 static void sub_80AA090(void)
 {
-    REG_BG0HOFS = gUnknown_030042A4;
-    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG0HOFS = gBattle_BG0_X;
+    REG_BG0VOFS = gBattle_BG0_Y;
     REG_BG1HOFS = gBattle_BG1_X;
     REG_BG1VOFS = gBattle_BG1_Y;
     REG_BG2HOFS = gBattle_BG2_X;
diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c
index a1a67152e..e5b6cf7c3 100644
--- a/src/easy_chat_1.c
+++ b/src/easy_chat_1.c
@@ -91,19 +91,19 @@ const struct EasyChatPrompt gUnknown_083DB6F4[] =
 
 const u8 gUnknown_083DB7C0[][2] =
 {
-	{ 0,  6},
-	{ 1,  7},
-	{ 1,  8},
-	{ 1,  9},
-	{ 2, 10},
-	{16, 13},
-	{ 4, 12},
-	{ 3, 13},
-	{ 3, 13},
-	{ 5, 14},
-	{ 3, 13},
-	{ 3, 13},
-	{ 3, 13},
+    { 0,  6},
+    { 1,  7},
+    { 1,  8},
+    { 1,  9},
+    { 2, 10},
+    {16, 13},
+    { 4, 12},
+    { 3, 13},
+    { 3, 13},
+    { 5, 14},
+    { 3, 13},
+    { 3, 13},
+    { 3, 13},
     {15, 13},
 };
 
diff --git a/src/engine/cable_car_util.c b/src/engine/cable_car_util.c
new file mode 100644
index 000000000..02bfbc195
--- /dev/null
+++ b/src/engine/cable_car_util.c
@@ -0,0 +1,47 @@
+#include "global.h"
+#include "cable_car_util.h"
+
+// static types
+
+// static declarations
+
+// rodata
+
+// text
+
+void CableCarUtil_FillWrapped(void *dest, u16 value, u8 left, u8 top, u8 width, u8 height)
+{
+    u8 i;
+    u8 j;
+    u8 x;
+    u8 y;
+
+    for (i = 0, y = top; i < height; i++)
+    {
+        for (x = left, j = 0; j < width; j++)
+        {
+            *(u16 *)&((u8 *)dest)[y * 64 + x * 2] = value;
+            x = (x + 1) % 32;
+        }
+        y = (y + 1) % 32;
+    }
+}
+
+void CableCarUtil_CopyWrapped(void *dest, const u16 *src, u8 left, u8 top, u8 width, u8 height)
+{
+    u8 i;
+    u8 j;
+    u8 x;
+    u8 y;
+    const u16 *_src;
+
+    for (i = 0, _src = src, y = top; i < height; i++)
+    {
+        for (x = left, j = 0; j < width; j++)
+        {
+            *(u16 *)&((u8 *)dest)[y * 64 + x * 2] = *_src++;
+            x = (x + 1) % 32;
+        }
+        y = (y + 1) % 32;
+    }
+}
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index caebc6a7b..11c05e478 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -103,59 +103,59 @@ static const u16 sBattleTowerHeldItems[] = {
 #include "../data/battle_tower/level_100_mons.h"
 
 static const u8 sMaleTrainerClasses[] = {
-    TRAINER_CLASS_RUIN_MANIAC,
-    TRAINER_CLASS_TUBER_M,
-    TRAINER_CLASS_COOL_TRAINER_M,
-    TRAINER_CLASS_RICH_BOY,
-    TRAINER_CLASS_POKEMANIAC,
-    TRAINER_CLASS_SWIMMER_M,
-    TRAINER_CLASS_BLACK_BELT,
-    TRAINER_CLASS_GUITARIST,
-    TRAINER_CLASS_KINDLER,
-    TRAINER_CLASS_CAMPER,
-    TRAINER_CLASS_BUG_MANIAC,
-    TRAINER_CLASS_PSYCHIC_M,
-    TRAINER_CLASS_GENTLEMAN,
-    TRAINER_CLASS_SCHOOL_KID_M,
-    TRAINER_CLASS_POKEFAN_M,
-    TRAINER_CLASS_EXPERT_M,
-    TRAINER_CLASS_YOUNGSTER,
-    TRAINER_CLASS_FISHERMAN,
-    TRAINER_CLASS_CYCLING_TRIATHLETE_M,
-    TRAINER_CLASS_RUNNING_TRIATHLETE_M,
-    TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
-    TRAINER_CLASS_DRAGON_TAMER,
-    TRAINER_CLASS_BIRD_KEEPER,
-    TRAINER_CLASS_NINJA_BOY,
-    TRAINER_CLASS_SAILOR,
-    TRAINER_CLASS_COLLECTOR,
-    TRAINER_CLASS_POKEMON_BREEDER_M,
-    TRAINER_CLASS_POKEMON_RANGER_M,
-    TRAINER_CLASS_BUG_CATCHER,
-    TRAINER_CLASS_HIKER, 
+    FACILITY_CLASS_RUIN_MANIAC,
+    FACILITY_CLASS_TUBER_M,
+    FACILITY_CLASS_COOL_TRAINER_M,
+    FACILITY_CLASS_RICH_BOY,
+    FACILITY_CLASS_POKEMANIAC,
+    FACILITY_CLASS_SWIMMER_M,
+    FACILITY_CLASS_BLACK_BELT,
+    FACILITY_CLASS_GUITARIST,
+    FACILITY_CLASS_KINDLER,
+    FACILITY_CLASS_CAMPER,
+    FACILITY_CLASS_BUG_MANIAC,
+    FACILITY_CLASS_PSYCHIC_M,
+    FACILITY_CLASS_GENTLEMAN,
+    FACILITY_CLASS_SCHOOL_KID_M,
+    FACILITY_CLASS_POKEFAN_M,
+    FACILITY_CLASS_EXPERT_M,
+    FACILITY_CLASS_YOUNGSTER,
+    FACILITY_CLASS_FISHERMAN,
+    FACILITY_CLASS_CYCLING_TRIATHLETE_M,
+    FACILITY_CLASS_RUNNING_TRIATHLETE_M,
+    FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
+    FACILITY_CLASS_DRAGON_TAMER,
+    FACILITY_CLASS_BIRD_KEEPER,
+    FACILITY_CLASS_NINJA_BOY,
+    FACILITY_CLASS_SAILOR,
+    FACILITY_CLASS_COLLECTOR,
+    FACILITY_CLASS_POKEMON_BREEDER_M,
+    FACILITY_CLASS_POKEMON_RANGER_M,
+    FACILITY_CLASS_BUG_CATCHER,
+    FACILITY_CLASS_HIKER,
 };
 
 static const u8 sFemaleTrainerClasses[] = {
-    TRAINER_CLASS_AROMA_LADY,
-    TRAINER_CLASS_TUBER_F,
-    TRAINER_CLASS_COOL_TRAINER_F,
-    TRAINER_CLASS_HEX_MANIAC,
-    TRAINER_CLASS_LADY,
-    TRAINER_CLASS_BEAUTY,
-    TRAINER_CLASS_PSYCHIC_F,
-    TRAINER_CLASS_SCHOOL_KID_F,
-    TRAINER_CLASS_POKEFAN_F,
-    TRAINER_CLASS_EXPERT_F,
-    TRAINER_CLASS_CYCLING_TRIATHLETE_F,
-    TRAINER_CLASS_RUNNING_TRIATHLETE_F,
-    TRAINER_CLASS_SWIMMING_TRIATHLETE_F,
-    TRAINER_CLASS_BATTLE_GIRL,
-    TRAINER_CLASS_PARASOL_LADY,
-    TRAINER_CLASS_SWIMMER_F,
-    TRAINER_CLASS_PICNICKER,
-    TRAINER_CLASS_POKEMON_BREEDER_F,
-    TRAINER_CLASS_POKEMON_RANGER_F,
-    TRAINER_CLASS_LASS,
+    FACILITY_CLASS_AROMA_LADY,
+    FACILITY_CLASS_TUBER_F,
+    FACILITY_CLASS_COOL_TRAINER_F,
+    FACILITY_CLASS_HEX_MANIAC,
+    FACILITY_CLASS_LADY,
+    FACILITY_CLASS_BEAUTY,
+    FACILITY_CLASS_PSYCHIC_F,
+    FACILITY_CLASS_SCHOOL_KID_F,
+    FACILITY_CLASS_POKEFAN_F,
+    FACILITY_CLASS_EXPERT_F,
+    FACILITY_CLASS_CYCLING_TRIATHLETE_F,
+    FACILITY_CLASS_RUNNING_TRIATHLETE_F,
+    FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
+    FACILITY_CLASS_BATTLE_GIRL,
+    FACILITY_CLASS_PARASOL_LADY,
+    FACILITY_CLASS_SWIMMER_F,
+    FACILITY_CLASS_PICNICKER,
+    FACILITY_CLASS_POKEMON_BREEDER_F,
+    FACILITY_CLASS_POKEMON_RANGER_F,
+    FACILITY_CLASS_LASS,
 };
 
 static const u8 sMaleTrainerGfxIds[] = {
@@ -255,7 +255,7 @@ static void ResetBattleTowerStreak(u8 levelType);
 static void ValidateBattleTowerRecordChecksums(void);
 static void PrintEReaderTrainerFarewellMessage(void);
 extern void SetBattleTowerTrainerGfxId(u8);
-extern void sub_8135A3C(void);
+static void SaveCurrentWinStreak(void);
 static void sub_8135CFC(void);
 static void CheckMonBattleTowerBanlist(u16, u16, u16, u8, u8, u16 *, u16 *, u8 *);
 static void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *);
@@ -1538,7 +1538,7 @@ void CheckPartyBattleTowerBanlist(void)
             StringAppend(gStringVar1, BattleText_Format8);
             return;
         }
-        
+
         if (1 & counter)
             StringAppend(gStringVar1, BattleText_Format6);
         else
@@ -1699,7 +1699,7 @@ void SetBattleTowerProperty(void)
         }
 
         gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType]++;
-        sub_8135A3C();
+        SaveCurrentWinStreak();
         gSpecialVar_Result = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType];
 
         gStringVar1[0] = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType] + 0xA1;
@@ -1711,7 +1711,7 @@ void SetBattleTowerProperty(void)
             gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType]++;
         }
 
-        sub_8135A3C();
+        SaveCurrentWinStreak();
         gSpecialVar_Result = gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType];
         break;
     case 8:
@@ -1801,118 +1801,35 @@ void SetBattleTowerParty(void)
     ReducePlayerPartyToThree();
 }
 
-#ifdef NONMATCHING
-void sub_8135A3C(void)
+static void SaveCurrentWinStreak(void)
 {
-    u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType;
-    u16 winStreak = GetCurrentBattleTowerWinStreak(battleTowerLevelType);
+    u8 levelType = gSaveBlock2.battleTower.battleTowerLevelType;
+    u16 streak = GetCurrentBattleTowerWinStreak(levelType);
 
-    if (gSaveBlock2.battleTower.recordWinStreaks[battleTowerLevelType] < winStreak)
-    {
-        gSaveBlock2.battleTower.recordWinStreaks[battleTowerLevelType] = winStreak;
-    }
+    if (gSaveBlock2.battleTower.recordWinStreaks[levelType] < streak)
+        gSaveBlock2.battleTower.recordWinStreaks[levelType] = streak;
 
     if (gSaveBlock2.battleTower.recordWinStreaks[0] > gSaveBlock2.battleTower.recordWinStreaks[1])
     {
-        u16 streak = gSaveBlock2.battleTower.recordWinStreaks[0];
+        streak = gSaveBlock2.battleTower.recordWinStreaks[0];
         SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, streak);
+
         if (streak > 9999)
-        {
             gSaveBlock2.battleTower.bestBattleTowerWinStreak = 9999;
-        }
         else
-        {
             gSaveBlock2.battleTower.bestBattleTowerWinStreak = streak;
-        }
     }
     else
     {
-        u16 streak = gSaveBlock2.battleTower.recordWinStreaks[1];
+        streak = gSaveBlock2.battleTower.recordWinStreaks[1];
         SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, streak);
+
         if (streak > 9999)
-        {
             gSaveBlock2.battleTower.bestBattleTowerWinStreak = 9999;
-        }
         else
-        {
             gSaveBlock2.battleTower.bestBattleTowerWinStreak = streak;
-        }
     }
 }
-#else
-__attribute__((naked))
-void sub_8135A3C(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    ldr r6, _08135A84 @ =gSaveBlock2\n\
-    ldr r1, _08135A88 @ =0x00000554\n\
-    adds r0, r6, r1\n\
-    ldrb r4, [r0]\n\
-    lsls r4, 31\n\
-    lsrs r4, 31\n\
-    adds r0, r4, 0\n\
-    bl GetCurrentBattleTowerWinStreak\n\
-    lsls r0, 16\n\
-    lsrs r5, r0, 16\n\
-    lsls r4, 1\n\
-    movs r3, 0xAC\n\
-    lsls r3, 3\n\
-    adds r2, r6, r3\n\
-    adds r4, r2\n\
-    ldrh r0, [r4]\n\
-    cmp r0, r5\n\
-    bcs _08135A66\n\
-    strh r5, [r4]\n\
-_08135A66:\n\
-    ldr r0, _08135A8C @ =0x00000562\n\
-    adds r1, r6, r0\n\
-    ldrh r0, [r2]\n\
-    ldrh r3, [r1]\n\
-    cmp r0, r3\n\
-    bls _08135A94\n\
-    adds r5, r0, 0\n\
-    movs r0, 0x20\n\
-    adds r1, r5, 0\n\
-    bl SetGameStat\n\
-    ldr r1, _08135A90 @ =0x0000270f\n\
-    cmp r5, r1\n\
-    bhi _08135AA4\n\
-    b _08135AB4\n\
-    .align 2, 0\n\
-_08135A84: .4byte gSaveBlock2\n\
-_08135A88: .4byte 0x00000554\n\
-_08135A8C: .4byte 0x00000562\n\
-_08135A90: .4byte 0x0000270f\n\
-_08135A94:\n\
-    ldrh r5, [r1]\n\
-    movs r0, 0x20\n\
-    adds r1, r5, 0\n\
-    bl SetGameStat\n\
-    ldr r1, _08135AAC @ =0x0000270f\n\
-    cmp r5, r1\n\
-    bls _08135AB4\n\
-_08135AA4:\n\
-    ldr r2, _08135AB0 @ =0x00000572\n\
-    adds r0, r6, r2\n\
-    strh r1, [r0]\n\
-    b _08135ABA\n\
-    .align 2, 0\n\
-_08135AAC: .4byte 0x0000270f\n\
-_08135AB0: .4byte 0x00000572\n\
-_08135AB4:\n\
-    ldr r3, _08135AC0 @ =0x00000572\n\
-    adds r0, r6, r3\n\
-    strh r5, [r0]\n\
-_08135ABA:\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08135AC0: .4byte 0x00000572\n\
-    .syntax divided\n");
-}
-#endif // NONMATCHING
 
 void sub_8135AC4(void)
 {
@@ -1951,7 +1868,7 @@ void sub_8135AC4(void)
     }
 
     SetBattleTowerRecordChecksum(&gSaveBlock2.battleTower.playerRecord);
-    sub_8135A3C();
+    SaveCurrentWinStreak();
 }
 
 void SaveBattleTowerProgress(void)
@@ -2068,79 +1985,15 @@ u16 GetCurrentBattleTowerWinStreak(u8 battleTowerLevelType)
     return winStreak;
 }
 
-#ifdef NONMATCHING
 void DetermineBattleTowerPrize(void)
 {
-    u16 prizeItem;
-    struct SaveBlock2 *saveBlock = &gSaveBlock2;
-    u8 battleTowerLevelType = saveBlock->battleTower.battleTowerLevelType;
+    u8 levelType = gSaveBlock2.battleTower.battleTowerLevelType;
 
-    if (saveBlock->battleTower.curStreakChallengesNum[battleTowerLevelType] - 1 > 5)
-    {
-        prizeItem = sLongStreakPrizes[Random() % ARRAY_COUNT(sLongStreakPrizes)];
-    }
+    if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1 > 5)
+        gSaveBlock2.battleTower.prizeItem = sLongStreakPrizes[Random() % ARRAY_COUNT(sLongStreakPrizes)];
     else
-    {
-        prizeItem = sShortStreakPrizes[Random() % ARRAY_COUNT(sShortStreakPrizes)];
-    }
-
-    saveBlock->battleTower.prizeItem = prizeItem;
-}
-#else
-__attribute__((naked))
-void DetermineBattleTowerPrize(void)
-{
-    asm(".syntax unified\n\
-    push {r4,r5,lr}\n\
-    ldr r5, _08135DB0 @ =gSaveBlock2\n\
-    ldr r1, _08135DB4 @ =0x00000554\n\
-    adds r0, r5, r1\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 31\n\
-    lsrs r0, 31\n\
-    lsls r0, 1\n\
-    ldr r2, _08135DB8 @ =0x0000055c\n\
-    adds r1, r5, r2\n\
-    adds r0, r1\n\
-    ldrh r0, [r0]\n\
-    subs r0, 0x1\n\
-    cmp r0, 0x5\n\
-    ble _08135DC0\n\
-    bl Random\n\
-    ldr r4, _08135DBC @ =sLongStreakPrizes\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    movs r1, 0x9\n\
-    b _08135DCC\n\
-    .align 2, 0\n\
-_08135DB0: .4byte gSaveBlock2\n\
-_08135DB4: .4byte 0x00000554\n\
-_08135DB8: .4byte 0x0000055c\n\
-_08135DBC: .4byte sLongStreakPrizes\n\
-_08135DC0:\n\
-    bl Random\n\
-    ldr r4, _08135DE8 @ =sShortStreakPrizes\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    movs r1, 0x6\n\
-_08135DCC:\n\
-    bl __umodsi3\n\
-    lsls r0, 16\n\
-    lsrs r0, 15\n\
-    adds r0, r4\n\
-    ldrh r1, [r0]\n\
-    movs r2, 0xAD\n\
-    lsls r2, 3\n\
-    adds r0, r5, r2\n\
-    strh r1, [r0]\n\
-    pop {r4,r5}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08135DE8: .4byte sShortStreakPrizes\n\
-    .syntax divided\n");
+        gSaveBlock2.battleTower.prizeItem = sShortStreakPrizes[Random() % ARRAY_COUNT(sShortStreakPrizes)];
 }
-#endif // NONMATCHING
 
 void GiveBattleTowerPrize(void)
 {
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index 4a819bddf..c954242a1 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -46,6 +46,7 @@ const u8 DroughtPaletteData_2[] = INCBIN_U8("graphics/weather/drought2.bin.lz");
 const u8 DroughtPaletteData_3[] = INCBIN_U8("graphics/weather/drought3.bin.lz");
 const u8 DroughtPaletteData_4[] = INCBIN_U8("graphics/weather/drought4.bin.lz");
 const u8 DroughtPaletteData_5[] = INCBIN_U8("graphics/weather/drought5.bin.lz");
+
 extern u8 (*gUnknown_0202FC48)[32];
 extern u8 gUnknown_0202F9E8[32];
 
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 9c1150515..790aede60 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -490,9 +490,6 @@ extern const u8 gStatusPal_Icons[];
 #define WINDOW_RIGHT (29)
 #endif
 
-
-#ifdef NONMATCHING
-// Main handler for the party menu.
 void CB2_PartyMenuMain(void)
 {
     const struct PartyMonTextSettingsStruct *textSettings;
@@ -506,62 +503,17 @@ void CB2_PartyMenuMain(void)
     {
         // Draw mon name, level, and hp sprites
         DrawPartyMenuMonText(
-            textSettings[i].xOffset * 8,
-            textSettings[i].yOffset * 8,
-            textSettings[i].oamSettings,
+            textSettings->xOffset * 8,
+            textSettings->yOffset * 8,
+            textSettings->oamSettings,
             0,
             (i << 5) | 0x200);
+        textSettings++;
     }
 
     RunTasks();
     UpdatePaletteFade();
 }
-#else
-__attribute__((naked))
-void CB2_PartyMenuMain(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    sub sp, 0x4\n\
-    bl AnimateSprites\n\
-    bl BuildOamBuffer\n\
-    ldr r0, _0806AF2C @ =gPartyMenuType\n\
-    ldrb r1, [r0]\n\
-    lsls r0, r1, 1\n\
-    adds r0, r1\n\
-    lsls r0, 4\n\
-    ldr r1, _0806AF30 @ =PartyMonTextSettings\n\
-    adds r5, r0, r1\n\
-    movs r6, 0\n\
-_0806AEF8:\n\
-    ldrb r0, [r5]\n\
-    lsls r0, 3\n\
-    ldrb r1, [r5, 0x1]\n\
-    lsls r1, 3\n\
-    ldr r2, [r5, 0x4]\n\
-    lsls r3, r6, 5\n\
-    movs r4, 0x80\n\
-    lsls r4, 2\n\
-    orrs r3, r4\n\
-    str r3, [sp]\n\
-    movs r3, 0\n\
-    bl DrawPartyMenuMonText\n\
-    adds r5, 0x8\n\
-    adds r6, 0x1\n\
-    cmp r6, 0x5\n\
-    ble _0806AEF8\n\
-    bl RunTasks\n\
-    bl UpdatePaletteFade\n\
-    add sp, 0x4\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_0806AF2C: .4byte gPartyMenuType\n\
-_0806AF30: .4byte PartyMonTextSettings\n\
-    .syntax divided\n");
-}
-#endif // NONMATCHING
 
 void VBlankCB_PartyMenu(void)
 {
@@ -1226,8 +1178,6 @@ void sub_806BBEC(u8 a)
     }
 }
 
-#ifdef NONMATCHING
-// The original THUMB is preserving r8 for seemingly no reason. Unsure how to match.
 void sub_806BC3C(u8 monIndex, u8 b)
 {
     u16 *vramPtr = gUnknown_08376918[IsDoubleBattle()][monIndex];
@@ -1240,74 +1190,10 @@ void sub_806BC3C(u8 monIndex, u8 b)
         vramPtr[i] = gUnknown_08E9A300[offset] + 0x10C;
         vramPtr[i + 0x20] = gUnknown_08E9A300[offset + 0x20] + 0x10C;
     }
+
+    // Some dead code was likely optimized out, but the compiler still think r8 was used.
+    asm("":::"r8");
 }
-#else
-__attribute__((naked))
-void sub_806BC3C(u8 monIndex, u8 b)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r8\n\
-    push {r7}\n\
-    adds r4, r0, 0\n\
-    adds r5, r1, 0\n\
-    lsls r4, 24\n\
-    lsrs r4, 24\n\
-    lsls r5, 24\n\
-    lsrs r5, 24\n\
-    ldr r6, _0806BCB0 @ =gUnknown_08376918\n\
-    bl IsDoubleBattle\n\
-    lsls r4, 2\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    lsls r1, r0, 1\n\
-    adds r1, r0\n\
-    lsls r1, 3\n\
-    adds r4, r1\n\
-    adds r4, r6\n\
-    ldr r7, [r4]\n\
-    movs r6, 0\n\
-    adds r0, r5, 0\n\
-    movs r1, 0x7\n\
-    bl __udivsi3\n\
-    lsls r0, 24\n\
-    lsrs r4, r0, 19\n\
-    ldr r5, _0806BCB4 @ =gUnknown_08E9A300\n\
-    movs r0, 0x86\n\
-    lsls r0, 1\n\
-    adds r3, r0, 0\n\
-_0806BC7C:\n\
-    adds r1, r6, r4\n\
-    lsls r2, r6, 1\n\
-    adds r2, r7\n\
-    lsls r0, r1, 1\n\
-    adds r0, r5\n\
-    ldrh r0, [r0]\n\
-    adds r0, r3, r0\n\
-    strh r0, [r2]\n\
-    adds r2, 0x40\n\
-    adds r1, 0x20\n\
-    lsls r1, 1\n\
-    adds r1, r5\n\
-    ldrh r1, [r1]\n\
-    adds r0, r3, r1\n\
-    strh r0, [r2]\n\
-    adds r0, r6, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r6, r0, 24\n\
-    cmp r6, 0x6\n\
-    bls _0806BC7C\n\
-    pop {r3}\n\
-    mov r8, r3\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_0806BCB0: .4byte gUnknown_08376918\n\
-_0806BCB4: .4byte gUnknown_08E9A300\n\
-    .syntax divided\n");
-}
-#endif // NONMATCHING
 
 void unref_sub_806BCB8(u8 a)
 {
diff --git a/src/field/tv.c b/src/field/tv.c
index d7a75a709..e88e3c72b 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -811,7 +811,7 @@ u8 sub_80BDEAC(u8 *a0)
     return lang;
 }
 
-void sub_80BDEC8(void)
+void PutPokemonTodayCaughtOnAir(void)
 {
     u8 i;
     u16 total;
diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c
index 37bc2e0ad..eb56974cd 100644
--- a/src/pokemon/pokemon_2.c
+++ b/src/pokemon/pokemon_2.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_util.h"
 #include "data2.h"
 #include "event_data.h"
 #include "main.h"
@@ -84,7 +85,7 @@ u8 sub_803C434(u8 a1)
 
     status ^= 1;
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
-        return GetBankByPlayerAI(status);
+        return GetBankByIdentity(status);
     if (CountAliveMons(0) > 1)
     {
         u8 val;
@@ -93,14 +94,14 @@ u8 sub_803C434(u8 a1)
             val = status ^ 2;
         else
             val = status;
-        return GetBankByPlayerAI(val);
+        return GetBankByIdentity(val);
     }
     else
     {
         if ((gAbsentBankFlags & gBitTable[status]))
-            return GetBankByPlayerAI(status ^ 2);
+            return GetBankByIdentity(status ^ 2);
         else
-            return GetBankByPlayerAI(status);
+            return GetBankByIdentity(status);
     }
 }
 
diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c
index 82e452158..031f2ea24 100644
--- a/src/pokemon/pokemon_data.c
+++ b/src/pokemon/pokemon_data.c
@@ -84,9 +84,9 @@ const struct SpriteTemplate gSpriteTemplate_8208288[] = {
 
 const u8 gSecretBaseTrainerClasses[][5] = {
     // male
-    {TRAINER_CLASS_YOUNGSTER, TRAINER_CLASS_BUG_CATCHER,  TRAINER_CLASS_RICH_BOY, TRAINER_CLASS_CAMPER,    TRAINER_CLASS_COOL_TRAINER_M},
+    {FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_BUG_CATCHER,  FACILITY_CLASS_RICH_BOY, FACILITY_CLASS_CAMPER,    FACILITY_CLASS_COOL_TRAINER_M},
     // female
-    {TRAINER_CLASS_LASS,      TRAINER_CLASS_SCHOOL_KID_F, TRAINER_CLASS_LADY,     TRAINER_CLASS_PICNICKER, TRAINER_CLASS_COOL_TRAINER_F}
+    {FACILITY_CLASS_LASS,      FACILITY_CLASS_SCHOOL_KID_F, FACILITY_CLASS_LADY,     FACILITY_CLASS_PICNICKER, FACILITY_CLASS_COOL_TRAINER_F}
 };
 
 const u8 gUnknown_082082F2[] = {
diff --git a/src/pokenav_after.c b/src/pokenav_after.c
index 84ed7b14b..330305ea3 100644
--- a/src/pokenav_after.c
+++ b/src/pokenav_after.c
@@ -6,16 +6,10 @@
 #include "de_rom_8040FE0.h"
 #include "string_util.h"
 
-void sub_80F700C(u8 *arg0, u16 arg1) {
-    struct Trainer *trainer;
-    u8 *ptr;
-
-#if ENGLISH
-    trainer = (struct Trainer *) &gTrainers[gUnknown_083DFEC4->unkCEE8[arg1].unk0];
-#elif GERMAN
-    const u16 trainerIndex = gUnknown_083DFEC4->unkCEE8[arg1].unk0;
-    trainer = (struct Trainer *) &gTrainers[trainerIndex];
-#endif
+void sub_80F700C(u8 *arg0, u16 arg1)
+{
+    const struct Trainer *trainer = &gTrainers[gUnknown_083DFEC4->unkCEE8[arg1].unk0];
+    u8 *ptr = arg0;
 
     ptr = arg0;
     if (arg1 < gUnknown_083DFEC4->unkD158)
@@ -23,7 +17,7 @@ void sub_80F700C(u8 *arg0, u16 arg1) {
 #if ENGLISH
         ptr = StringCopy(ptr, gTrainerClassNames[trainer->trainerClass]);
 #elif GERMAN
-        ptr = StringCopy(ptr, de_sub_8041024(0, trainerIndex));
+        ptr = StringCopy(ptr, de_sub_8041024(0, gUnknown_083DFEC4->unkCEE8[arg1].unk0));
 #endif
 
         ptr[0] = 0xFC;
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index 53f17b211..8a67390ad 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -22,69 +22,70 @@
 
 extern u8 ewram[];
 
-struct UnknownPokenav0 {
-	/* 0x0000 */ u8 var0[0x0300];
-	/* 0x0300 */ void (*var300)(void);
-	/* 0x0304 */ u16 var304;
-	/* 0x0306 */ u16 var306;
-	/* 0x0308 */ u32 var308;
-	/* 0x030C */ u8 fill030C[0x6a9f];
-	/* 0x6dab */ u8 var6dab;
-	/* 0x6dac */ u8 var6dac;
-	/* 0x6dad */ u8 var6dad;
-	/* 0x6dae */ u8 var6dae;
-	/* 0x6daf */ u8 fill6daf[0x3];
-	/* 0x6db2 */ u8 var6db2[5];
-	/* 0x6db7 */ u8 fill6db7[0x25];
-	/* 0x6ddc */ s8 var6ddc;
-	/* 0x6ddd */ u8 fill6ddd[0x13];
-	/* 0x6df0 */ s8 var6df0;
-	/* 0x6df1 */ u8 fill6df1[0xB];
-	/* 0x6dfc */ u8 var6dfc;
-	/* 0x6dfd */ u8 fill6dfd[0x17];
-	/* 0x6e14 */ u8 var6e14;
-	/* 0x6e15 */ u8 var6e15;
-	/* 0x6e16 */ u8 var6e16;
-	/* 0x6e17 */ u8 var6e17;
-	/* 0x6e18 */ u8 fill6e18[0x78];
-	/* 0x6e90 */ u8 var6e90;
-	/* 0x6e91 */ u8 fill6e91[0x4];
-	/* 0x6e95 */ u8 var6e95;
-	/* 0x6e96 */ u8 var6e96[0x814];
-	/* 0x76AA */ u8 var76aa;
-	/* 0x76AB */ u8 fill76AB[0x10BD];
-	/* 0x8768 */ u32 var8768;
-	/* 0x876C */ u8 fill876C[0x2];
-	/* 0x876E */ u8 var876E;
-	/* 0x876F */ u8 fill876F[0x5];
-	/* 0x8774 */ s16 var8774;
-	/* 0x8776 */ u8 fill8776[0x55];
-	/* 0x87CB */ u8 var87CB;
-	/* 0x87CC */ u8 fill87CC[0xC];
-	/* 0x87D8 */ u8 var87D8;
-	/* 0x87D9 */ u8 fill87D9[0x1];
-	/* 0x87DA */ s16 var87DA;
-	/* 0x87DC */ s16 var87DC;
-	/* 0x87DE */ u8 fill87DE[0x4a];
-	/* 0x8828 */ u8 playerPartyCount;
-	/* 0x8829 */ u8 fill8829[0x07bf];
-	/* 0x8FE8 */ s8 var8fe8;
-	/* 0x8FE9 */ u8 fill8FE9[0x16];
-	/* 0x8FFF */ u8 var8fff[5];
-	/* 0x9004 */ u8 fill9004[0x340];
-	/* 0x9344 */ u8 var9344;
-	/* 0x9345 */ u8 fill9345[0x3b8b];
-	/* 0xced0 */ u32 varCED0;
-	/* 0xced4 */ u8 fillCED4[0x284];
-	/* 0xD158 */ u16 varD158;
-	/* 0xD15A */ u8 fillD15A[0x8];
-	/* 0xD162 */ u8 varD162;
+struct UnknownPokenav0
+{
+    /* 0x0000 */ u8 var0[0x0300];
+    /* 0x0300 */ void (*var300)(void);
+    /* 0x0304 */ u16 var304;
+    /* 0x0306 */ u16 var306;
+    /* 0x0308 */ u32 var308;
+    /* 0x030C */ u8 fill030C[0x6a9f];
+    /* 0x6dab */ u8 var6dab;
+    /* 0x6dac */ u8 var6dac;
+    /* 0x6dad */ u8 var6dad;
+    /* 0x6dae */ u8 var6dae;
+    /* 0x6daf */ u8 fill6daf[0x3];
+    /* 0x6db2 */ u8 var6db2[5];
+    /* 0x6db7 */ u8 fill6db7[0x25];
+    /* 0x6ddc */ s8 var6ddc;
+    /* 0x6ddd */ u8 fill6ddd[0x13];
+    /* 0x6df0 */ s8 var6df0;
+    /* 0x6df1 */ u8 fill6df1[0xB];
+    /* 0x6dfc */ u8 var6dfc;
+    /* 0x6dfd */ u8 fill6dfd[0x17];
+    /* 0x6e14 */ u8 var6e14;
+    /* 0x6e15 */ u8 var6e15;
+    /* 0x6e16 */ u8 var6e16;
+    /* 0x6e17 */ u8 var6e17;
+    /* 0x6e18 */ u8 fill6e18[0x78];
+    /* 0x6e90 */ u8 var6e90;
+    /* 0x6e91 */ u8 fill6e91[0x4];
+    /* 0x6e95 */ u8 var6e95;
+    /* 0x6e96 */ u8 var6e96[0x814];
+    /* 0x76AA */ u8 var76aa;
+    /* 0x76AB */ u8 fill76AB[0x10BD];
+    /* 0x8768 */ u32 var8768;
+    /* 0x876C */ u8 fill876C[0x2];
+    /* 0x876E */ u8 var876E;
+    /* 0x876F */ u8 fill876F[0x5];
+    /* 0x8774 */ s16 var8774;
+    /* 0x8776 */ u8 fill8776[0x55];
+    /* 0x87CB */ u8 var87CB;
+    /* 0x87CC */ u8 fill87CC[0xC];
+    /* 0x87D8 */ u8 var87D8;
+    /* 0x87D9 */ u8 fill87D9[0x1];
+    /* 0x87DA */ s16 var87DA;
+    /* 0x87DC */ s16 var87DC;
+    /* 0x87DE */ u8 fill87DE[0x4a];
+    /* 0x8828 */ u8 playerPartyCount;
+    /* 0x8829 */ u8 fill8829[0x07bf];
+    /* 0x8FE8 */ s8 var8fe8;
+    /* 0x8FE9 */ u8 fill8FE9[0x16];
+    /* 0x8FFF */ u8 var8fff[5];
+    /* 0x9004 */ u8 fill9004[0x340];
+    /* 0x9344 */ u8 var9344;
+    /* 0x9345 */ u8 fill9345[0x3b8b];
+    /* 0xced0 */ u32 varCED0;
+    /* 0xced4 */ u8 fillCED4[0x284];
+    /* 0xD158 */ u16 varD158;
+    /* 0xD15A */ u8 fillD15A[0x8];
+    /* 0xD162 */ u8 varD162;
 };
 
 struct UnknownPokenav0_1 {
-	u8 fill6dad[0x6dad];
-	s8 var6dad;
-	s8 var6dae;
+    u8 fill6dad[0x6dad];
+    s8 var6dad;
+    s8 var6dae;
 };
 
 IWRAM_DATA void (*gUnknown_03000744)(void);
@@ -294,1140 +295,1283 @@ extern void sub_80F5BF0();
 extern void sub_80F6F64();
 extern void sub_80F19FC();
 
-void sub_80EBA5C() {
-	switch (gMain.state) {
-		default:
-			gMain.state = 0;
-		case 0:
-			ewram0_10.var6dac = is_c1_link_related_active();
-			if (!ewram0_10.var6dac) {
-				ewram0_10.var6dab = 0;
-				gMain.state++;
-				SetMainCallback2(&sub_80EBBE8);
-				break;
-			}
-			break;
-		case 1:
-			SetVBlankCallback(NULL);
-			break;
-		case 2:
-			ResetPaletteFade();
-			break;
-		case 3:
-			ResetSpriteData();
-			break;
-		case 4:
-			FreeAllSpritePalettes();
-			break;
-		case 5:
-			ResetTasks();
-			break;
-		case 6:
-			remove_some_task();
-			break;
-		case 7:
-			sub_80F1A90();
-			gMain.state++;
-		case 8:
-			if (sub_80F1AC4()) return;
-			break;
-		case 9:
-			sub_80F2688();
-			gMain.state++;
-
-		case 10:
-			if (sub_80F26BC()) return;
-			break;
-		case 11:
-			sub_80F36F0();
-			gMain.state++;
-		case 12:
-			if (sub_80F3724()) return;
-			break;
-		case 13:
-			sub_80EBC10();
-			sub_80EBDBC(&sub_80EBDD8);
-			break;
-		case 14:
-			ewram0_10.var6dab = 1;
-			PlaySE(SE_PN_ON);
-			SetMainCallback2(&sub_80EBD90);
-			SetVBlankCallback(&sub_80EBD18);
-			sub_80F1A74();
-			break;
-	}
-
-	gMain.state++;
+extern u16 gKeyRepeatStartDelay;
+
+
+void sub_80EBA5C()
+{
+    switch (gMain.state)
+    {
+    default:
+        gMain.state = 0;
+    case 0:
+        ewram0_10.var6dac = is_c1_link_related_active();
+        if (!ewram0_10.var6dac)
+        {
+            ewram0_10.var6dab = 0;
+            gMain.state++;
+            SetMainCallback2(&sub_80EBBE8);
+        }
+        break;
+    case 1:
+        SetVBlankCallback(NULL);
+        break;
+    case 2:
+        ResetPaletteFade();
+        break;
+    case 3:
+        ResetSpriteData();
+        break;
+    case 4:
+        FreeAllSpritePalettes();
+        break;
+    case 5:
+        ResetTasks();
+        break;
+    case 6:
+        remove_some_task();
+        break;
+    case 7:
+        sub_80F1A90();
+        gMain.state++;
+    case 8:
+        if (sub_80F1AC4())
+            return;
+        break;
+    case 9:
+        sub_80F2688();
+        gMain.state++;
+        // fall through
+    case 10:
+        if (sub_80F26BC())
+            return;
+        break;
+    case 11:
+        sub_80F36F0();
+        gMain.state++;
+    case 12:
+        if (sub_80F3724())
+            return;
+        break;
+    case 13:
+        sub_80EBC10();
+        sub_80EBDBC(&sub_80EBDD8);
+        break;
+    case 14:
+        ewram0_10.var6dab = 1;
+        PlaySE(SE_PN_ON);
+        SetMainCallback2(&sub_80EBD90);
+        SetVBlankCallback(&sub_80EBD18);
+        sub_80F1A74();
+        break;
+    }
+
+    gMain.state++;
 }
 
-void sub_80EBBE8() {
-	u8 var1;
-	if (!ewram0_10.var6dab) {
-		var1 = ewram0_10.var6dab;
-		do {
-			sub_80EBA5C();
-			var1 = ewram0_10.var6dab;
-		} while (!var1);
-	}
+void sub_80EBBE8()
+{
+    while (!ewram0_10.var6dab)
+        sub_80EBA5C();
 }
 
-void sub_80EBC10() {
-	u16 i;
-	u16 *var1;
-
-	gKeyRepeatStartDelay = 20;
-	ewram0_10.playerPartyCount = CalculatePlayerPartyCount();
-	ewram0_10.var6ddc = 0;
-	ewram0_10.var9344 = 0;
-	ewram0_10.var8768 = 0;
-	ewram0_10.varCED0 = 0;
-
-	for (i = 0; i < 5; ++i) {
-		ewram0_10.var8fff[i] = 0;
-		var1 = (u16 *)ewram0_10.var0;
-		var1[i*2 + 0x4820] = 0x9B;
-		var1[i*2 + 0x4821] = 0x5B;
-	}
-
-	ewram0_10.var6e95 = 0;
-	sub_80EBCA8();
+void sub_80EBC10()
+{
+    u16 i;
+    u16 *var1;
+
+    gKeyRepeatStartDelay = 0x14;
+    ewram0_10.playerPartyCount = CalculatePlayerPartyCount();
+    ewram0_10.var6ddc = 0;
+    ewram0_10.var9344 = 0;
+    ewram0_10.var8768 = 0;
+    ewram0_10.varCED0 = 0;
+
+    for (i = 0; i < 5; ++i)
+    {
+        ewram0_10.var8fff[i] = 0;
+        var1 = (u16 *)ewram0_10.var0;
+        var1[i*2 + 0x4820] = 0x9B;
+        var1[i*2 + 0x4821] = 0x5B;
+    }
+
+    ewram0_10.var6e95 = 0;
+    sub_80EBCA8();
 }
 
-void sub_80EBCA8() {
-	ewram0_10.var6db2[0] = 1;
-	ewram0_10.var6db2[1] = 2;
-	ewram0_10.var6db2[2] = 3;
+void sub_80EBCA8()
+{
+    ewram0_10.var6db2[0] = 1;
+    ewram0_10.var6db2[1] = 2;
+    ewram0_10.var6db2[2] = 3;
 
-	if (FlagGet(FLAG_SYS_RIBBON_GET)) {
-		ewram0_10.var6db2[3] = 4;
-	}
-	else {
-		ewram0_10.var6db2[3] = 0;
-	}
+    if (FlagGet(FLAG_SYS_RIBBON_GET))
+        ewram0_10.var6db2[3] = 4;
+    else
+        ewram0_10.var6db2[3] = 0;
 
-	ewram0_10.var6db2[4] = 5;
+    ewram0_10.var6db2[4] = 5;
 }
 
-void sub_80EBD18() {
-	LoadOam();
-	ProcessSpriteCopyRequests();
-	TransferPlttBuffer();
-	sub_80F1FF0();
+void sub_80EBD18()
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_80F1FF0();
 }
 
-void sub_80EBD30() {
-	LoadOam();
-	ProcessSpriteCopyRequests();
-	TransferPlttBuffer();
-	UpdateRegionMapVideoRegs();
-	sub_80EFE7C();
+void sub_80EBD30()
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    UpdateRegionMapVideoRegs();
+    sub_80EFE7C();
 }
 
-void sub_80EBD4C() {
-	LoadOam();
-	ProcessSpriteCopyRequests();
-	TransferPlttBuffer();
-	sub_80F5BF0();
-	sub_8089668();
+void sub_80EBD4C()
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_80F5BF0();
+    sub_8089668();
 }
 
-void sub_80EBD68() {
-	LoadOam();
-	ProcessSpriteCopyRequests();
-	TransferPlttBuffer();
-	sub_80F6F64();
+void sub_80EBD68()
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_80F6F64();
 }
 
-void sub_80EBD80() {
-	LoadOam();
-	ProcessSpriteCopyRequests();
+void sub_80EBD80()
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
 }
 
-void sub_80EBD90() {
-	ewram0_10.var300();
-	AnimateSprites();
-	BuildOamBuffer();
-	RunTasks();
-	UpdatePaletteFade();
-	sub_80F19FC();
+void sub_80EBD90()
+{
+    ewram0_10.var300();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTasks();
+    UpdatePaletteFade();
+    sub_80F19FC();
 }
 
-void sub_80EBDBC(void (*func)(void)) {
-	ewram0_10.var300 = func;
-	ewram0_10.var304 = 0;
+void sub_80EBDBC(void (*func)(void))
+{
+    ewram0_10.var300 = func;
+    ewram0_10.var304 = 0;
 }
 
-void sub_80EBDD8() {
-	switch (ewram0_10.var304) {
-	case 0:
-		SetVBlankCallback(NULL);
-		REG_DISPCNT = 0;
-		ewram0_10.var6dad = ewram0_10.var6ddc;
-		ewram0_10.var6dae = 5;
-		ewram0_10.var304++;
-		break;
-	case 1:
-		sub_80F3FF0();
-		ewram0_10.var304++;
-	case 2:
-		if (sub_80F4024()) return;
-		ewram0_10.var304++;
-		break;
-	case 3:
-		sub_80F2598();
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80EEE20();
-		ewram0_10.var304++;
-	case 5:
-		if (sub_80EEE54()) return;
-		sub_80EEE08();
-		ewram0_10.var304++;
-		return;
-	case 6:
-		sub_80EF248(0);
-		ewram0_10.var304++;
-	case 7:
-		if (sub_80EF284(0)) return;
-		ewram0_10.var304++;
-		break;
-	case 8:
-		sub_80F1B8C(0);
-		ewram0_10.var304++;
-	case 9:
-		if (sub_80F1BC8(0)) return;
-		ewram0_10.var304++;
-		break;
-	case 10:
-		SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 11:
-		BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-		ewram0_10.var304++;
-		return;
-	case 12:
-		sub_80EED2C(0);
-		ewram0_10.var304++;
-		return;
-	case 13:
-		if (gPaletteFade.active) return;
-		ewram0_10.var304++;
-		return;
-	case 14:
-		sub_80F2C80(0);
-		ewram0_10.var304++;
-	case 15:
-		if (sub_80F2CBC(0)) return;
-		ewram0_10.var304++;
-		break;
-	case 16:
-		sub_80F1DF0();
-		ewram0_10.var304++;
-		return;
-	case 17:
-		if (!sub_80F1E50()) {
-			sub_80EF428(0, 0);
-			sub_80EBDBC(&sub_80EC268);
+void sub_80EBDD8()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        SetVBlankCallback(NULL);
+        REG_DISPCNT = 0;
+        ewram0_10.var6dad = ewram0_10.var6ddc;
+        ewram0_10.var6dae = 5;
+        ewram0_10.var304++;
+        break;
+    case 1:
+        sub_80F3FF0();
+        ewram0_10.var304++;
+        // fall through
+    case 2:
+        if (!sub_80F4024())
+			ewram0_10.var304++;
+        break;
+    case 3:
+        sub_80F2598();
+        ewram0_10.var304++;
+        break;
+    case 4:
+        sub_80EEE20();
+        ewram0_10.var304++;
+        // fall through
+    case 5:
+        if (!sub_80EEE54())
+		{
+			sub_80EEE08();
+			ewram0_10.var304++;
 		}
-		return;
-
-	}
-
+        break;
+    case 6:
+        sub_80EF248(0);
+        ewram0_10.var304++;
+        // fall through
+    case 7:
+        if (!sub_80EF284(0))
+			ewram0_10.var304++;
+        break;
+    case 8:
+        sub_80F1B8C(0);
+        ewram0_10.var304++;
+		// fall through
+    case 9:
+        if (!sub_80F1BC8(0))
+			ewram0_10.var304++;
+        break;
+    case 10:
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 11:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        ewram0_10.var304++;
+        break;
+    case 12:
+        sub_80EED2C(0);
+        ewram0_10.var304++;
+        break;
+    case 13:
+        if (!gPaletteFade.active)
+			ewram0_10.var304++;
+        break;
+    case 14:
+        sub_80F2C80(0);
+        ewram0_10.var304++;
+        // fall through
+    case 15:
+        if (!sub_80F2CBC(0))
+			ewram0_10.var304++;
+        break;
+    case 16:
+        sub_80F1DF0();
+        ewram0_10.var304++;
+        break;
+    case 17:
+        if (!sub_80F1E50())
+        {
+            sub_80EF428(0, 0);
+            sub_80EBDBC(&sub_80EC268);
+        }
+        break;
+    }
 }
 
-void sub_80EC00C() {
-	switch (ewram0_10.var304) {
-	case 0:
-		if (!sub_80EEF78()) {
-			SetVBlankCallback(&sub_80EBD80);
-			sub_80EED1C();
-			ewram0_10.var6dad = ewram0_10.var6ddc;
-			ewram0_10.var6dae = 5;
-			sub_80EEE08();
+void sub_80EC00C()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        if (!sub_80EEF78())
+        {
+            SetVBlankCallback(&sub_80EBD80);
+            sub_80EED1C();
+            ewram0_10.var6dad = ewram0_10.var6ddc;
+            ewram0_10.var6dae = 5;
+            sub_80EEE08();
+            ewram0_10.var304++;
+        }
+        break;
+    case 1:
+        sub_80EF248(0);
+        ewram0_10.var304++;
+        // fall through
+    case 2:
+        if (!sub_80EF284(0))
+			ewram0_10.var304++;
+        break;
+    case 3:
+        sub_80F1B8C(0);
+        ewram0_10.var304++;
+        // fall through
+    case 4:
+        if (!sub_80F1BC8(0))
+			ewram0_10.var304++;
+        break;
+    case 5:
+        if (!sub_8055870())
 			ewram0_10.var304++;
+        break;
+    case 6:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 7:
+        sub_80EED2C(0);
+        ewram0_10.var304++;
+        break;
+    case 8:
+        if (!gPaletteFade.active)
+			ewram0_10.var304++;
+        break;
+    case 9:
+        sub_80F2598();
+        ewram0_10.var304++;
+        break;
+    case 10:
+        sub_80F2C80(0);
+        ewram0_10.var304++;
+        // fall through
+    case 11:
+        if (!sub_80F2CBC(0))
+			ewram0_10.var304++;
+        break;
+    case 12:
+        sub_80F1DF0();
+        ewram0_10.var304++;
+        break;
+    case 13:
+        if (!sub_80F1E50())
+        {
+            sub_80EF428(0, ewram0_10.var6dad);
+			sub_80EBDBC(&sub_80EC268);
 		}
 		break;
-	case 1:
-		sub_80EF248(0);
-		ewram0_10.var304++;
-	case 2:
-		if (sub_80EF284(0)) return;
-		ewram0_10.var304++;
-		break;
-	case 3:
-		sub_80F1B8C(0);
-		ewram0_10.var304++;
-	case 4:
-		if (sub_80F1BC8(0)) return;
-		ewram0_10.var304++;
-		break;
-	case 5:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 6:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-	        SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 7:
-		sub_80EED2C(0);
-		ewram0_10.var304++;
-		break;
-	case 8:
-		if (gPaletteFade.active) return;
-		ewram0_10.var304++;
-		return;
-	case 9:
-		sub_80F2598();
-		ewram0_10.var304++;
-		break;
-	case 10:
-		sub_80F2C80(0);
-		ewram0_10.var304++;
-	case 11:
-		if (sub_80F2CBC(0)) return;
-		ewram0_10.var304++;
-		return;
-	case 12:
-		sub_80F1DF0();
-		ewram0_10.var304++;
-		return;
-        case 13:
-		if (sub_80F1E50()) return;
-                sub_80EF428(0, ewram0_10.var6dad);
-		sub_80EBDBC(&sub_80EC268);
-	}
+    }
 }
 
-void sub_80EC210() {
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F2D04(1);
-		sub_80EE9C0(0, ewram0_10.var6ddc, 0);
-		ewram0_10.var304++;
+void sub_80EC210()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F2D04(1);
+        sub_80EE9C0(0, ewram0_10.var6ddc, 0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80EEA0C())
+			sub_80EBDBC(&sub_80EC268);
 		break;
-	case 1:
-		if (sub_80EEA0C()) return;
-		sub_80EBDBC(&sub_80EC268);
-	}
+    }
 }
 
-void sub_80EC268() {
-	u8 var1;
-	switch (ewram0_10.var304) {
-	case 0:
-		if (sub_80EEC10() != 0) {
-			PlaySE(0x5);
-			sub_80EF428(0, ewram0_10.var6dad);
-			sub_80EED9C();
-			break;
-		}
-		else {
-			if (gMain.newKeys & A_BUTTON) {
-				ewram0_10.var6ddc = ewram0_10.var6dad;
-				switch (ewram0_10.var6db2[ewram0_10.var6ddc] - 1) {
-				case 0:
-					PlaySE(5);
-					sub_80EBDBC(&sub_80EC4A0);
-					break;
-				case 1:
-					PlaySE(5);
-					sub_80EBDBC(&sub_80EC81C);
-					break;
-				case 4:
-					ewram0_10.var304 = 1;
-					break;
-				case 3:
-					ewram0_10.var304 = 2;
-					break;
-				case 2:
-					ewram0_10.var304 = 6;
-					break;
-				}
+void sub_80EC268()
+{
+    u8 var1;
+
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        if (sub_80EEC10() != 0)
+        {
+            PlaySE(SE_SELECT);
+            sub_80EF428(0, ewram0_10.var6dad);
+            sub_80EED9C();
+        }
+        else
+        {
+            if (gMain.newKeys & A_BUTTON)
+            {
+                ewram0_10.var6ddc = ewram0_10.var6dad;
+                switch (ewram0_10.var6db2[ewram0_10.var6ddc] - 1)
+                {
+                case 0:
+                    PlaySE(SE_SELECT);
+                    sub_80EBDBC(&sub_80EC4A0);
+                    break;
+                case 1:
+                    PlaySE(SE_SELECT);
+                    sub_80EBDBC(&sub_80EC81C);
+                    break;
+                case 4:
+                    ewram0_10.var304 = 1;
+                    break;
+                case 3:
+                    ewram0_10.var304 = 2;
+                    break;
+                case 2:
+                    ewram0_10.var304 = 6;
+                    break;
+                }
+            }
+            else if (gMain.newKeys & B_BUTTON)
+            {
+                ewram0_10.var304 = 1;
+            }
+        }
+        break;
+    case 1:
+        sub_80F208C();
+        sub_80EBDBC(&sub_80EE96C);
+        break;
+    case 2:
+        sub_80F6208();
+        ewram0_10.var304++;
+        // fall through
+    case 3:
+        if (!sub_80F6250())
+			ewram0_10.var304++;
+        break;
+    case 4:
+        if (!sub_8055870())
+        {
+			if (ewram0_10.var8fe8 != 0)
+			{
+				PlaySE(SE_SELECT);
+				sub_80EBDBC(&sub_80EDB88);
 			}
-			else if (gMain.newKeys & B_BUTTON) {
-				ewram0_10.var304 = 1;
+			else
+			{
+				PlaySE(0x20);
+				sub_80EF428(0, 5);
+				ewram0_10.var304 = 0xFF;
 			}
-			break;
 		}
-	case 1:
-		sub_80F208C();
-		sub_80EBDBC(&sub_80EE96C);
 		break;
-	case 2:
-		sub_80F6208();
-		ewram0_10.var304++;
-	case 3:
-		if (sub_80F6250()) return;
-		ewram0_10.var304++;
-		break;
-	case 4:
-		if (sub_8055870()) return;
-		if (ewram0_10.var8fe8 != 0) {
-			PlaySE(0x5);
-			sub_80EBDBC(&sub_80EDB88);
-			break;
-		}
-		else {
-			PlaySE(0x20);
-			sub_80EF428(0, 5);
-			ewram0_10.var304 = 0xFF;
-			break;
-		}
-	case 6:
-		sub_80F6C20();
-		if (ewram0_10.varD158 != 0) {
-			PlaySE(0x5);
-			sub_80EBDBC(&sub_80EE3D8);
-			break;
-		}
-		else {
-			PlaySE(0x20);
-			sub_80EF428(0, 6);
-			ewram0_10.var304 = 0xFF;
-			break;
-		}
-	case 0xFF:
-		if ((var1 = sub_80EEC10()) != 0) {
-			PlaySE(0x5);
-			sub_80EF428(0, ewram0_10.var6dad);
-			ewram0_10.var304 = 0;
-			sub_80EED9C();
-		}
-		else {
-			if (!(gMain.newKeys & (A_BUTTON | B_BUTTON))) return;
+    case 6:
+        sub_80F6C20();
+        if (ewram0_10.varD158 != 0)
+        {
+            PlaySE(SE_SELECT);
+            sub_80EBDBC(&sub_80EE3D8);
+        }
+        else
+        {
+            PlaySE(0x20);
+            sub_80EF428(0, 6);
+            ewram0_10.var304 = 0xFF;
+        }
+        break;
+    case 0xFF:
+        if ((var1 = sub_80EEC10()) != 0)
+        {
+            PlaySE(SE_SELECT);
+            sub_80EF428(0, ewram0_10.var6dad);
+            ewram0_10.var304 = 0;
+            sub_80EED9C();
+        }
+        else if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+		{
 			sub_80EF428(0, ewram0_10.var6dad);
 			ewram0_10.var304 = var1;
-			break;
 		}
-	}
+        break;
+    }
 }
 
-void sub_80EC4A0() {
-	u32 var1;
-	u32 var2;
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F1E84();
-		sub_80F2D04(0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (!sub_80F1F10()) {
-			if (gSaveBlock2.regionMapZoom) {
-				var1 = 0x7;
-			}
-			else var1 = 0x8;
-			sub_80EEFBC(var1);
+void sub_80EC4A0()
+{
+    u32 var1;
+
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F1E84();
+        sub_80F2D04(0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80F1F10())
+        {
+            if (gSaveBlock2.regionMapZoom)
+                var1 = 0x7;
+            else
+				var1 = 0x8;
+            sub_80EEFBC(var1);
+            ewram0_10.var304++;
+        }
+        break;
+    case 2:
+        if (!sub_80EEF34())
+        {
+            BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+            ewram0_10.var304++;
+        }
+        break;
+    case 3:
+        if (!gPaletteFade.active)
+        {
+			SetVBlankCallback(NULL);
+			sub_80EED0C();
 			ewram0_10.var304++;
 		}
-		break;
-	case 2:
-		if (!(var2 = sub_80EEF34())) {
-			BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var2);
+        break;
+    case 4:
+        sub_80F2620();
+        ewram0_10.var304++;
+        break;
+    case 5:
+        sub_80EF814();
+        ewram0_10.var304++;
+        break;
+    case 6:
+        sub_80EF840();
+        ewram0_10.var304++;
+        // fall through
+    case 7:
+        if (!sub_80EF874())
 			ewram0_10.var304++;
-		}
-		break;
-	case 3:
-		if (gPaletteFade.active) return;
-		SetVBlankCallback(NULL);
-		sub_80EED0C();
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80F2620();
-		ewram0_10.var304++;
-		break;
-	case 5:
-		sub_80EF814();
-		ewram0_10.var304++;
-		break;
-	case 6:
-		sub_80EF840();
-		ewram0_10.var304++;
-	case 7:
-		if (sub_80EF874()) return;
-		ewram0_10.var304++;
-		break;
-	case 8:
-		sub_80F2C80(0x4);
-		ewram0_10.var304++;
-	case 9:
-		if (sub_80F2CBC(0x4)) return;
-		ewram0_10.var304++;
-		break;
-	case 0xA:
-		sub_80F2DD8();
-		SetVBlankCallback(&sub_80EBD30);
-		ewram0_10.var304++;
-		break;
-	case 0xB:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 0xC:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		ewram0_10.var304++;
-		break;
-        case 0xD:
-		sub_80EED2C(0x1);
-		ewram0_10.var304++;
+        break;
+    case 8:
+        sub_80F2C80(0x4);
+        ewram0_10.var304++;
+        // fall through
+    case 9:
+        if (!sub_80F2CBC(0x4))
+			ewram0_10.var304++;
+        break;
+    case 0xA:
+        sub_80F2DD8();
+        SetVBlankCallback(&sub_80EBD30);
+        ewram0_10.var304++;
+        break;
+    case 0xB:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 0xC:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        ewram0_10.var304++;
+        break;
+    case 0xD:
+        sub_80EED2C(0x1);
+        ewram0_10.var304++;
+        break;
+    case 0xE:
+        if (!gPaletteFade.active)
+			sub_80EBDBC(&sub_80EC67C);
 		break;
-	case 0xE:
-		if (gPaletteFade.active) return;
-		sub_80EBDBC(&sub_80EC67C);
-	}
+    }
 }
 
-void sub_80EC67C() {
-	u32 var1;
-	u32 var2;
-	switch (ewram0_10.var304) {
-	case 0:
-		switch (sub_80FAB60()) {
-		case 1:
-			sub_80EED9C();
-			break;
-		case 3:
-			sub_80EF9F8();
-			break;
-		case 4:
-			PlaySE(0x5);
-			ewram0_10.var304 = 1;
-			break;
-		case 5:
-			PlaySE(0x5);
-			ewram0_10.var304 = 4;
-			break;
-		}
-		break;
-	case 1:
-		if (!ewram0_10.var6e90) {
+void sub_80EC67C()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        switch (sub_80FAB60())
+        {
+        case 1:
+            sub_80EED9C();
+            break;
+        case 3:
+            sub_80EF9F8();
+            break;
+        case 4:
+            PlaySE(SE_SELECT);
+            ewram0_10.var304 = 1;
+            break;
+        case 5:
+            PlaySE(SE_SELECT);
+            ewram0_10.var304 = 4;
+            break;
+        }
+        break;
+    case 1:
+        if (!ewram0_10.var6e90)
+        {
+            sub_80FAEC4();
+            ewram0_10.var304++;
+        }
+        else if (!sub_80EFBDC(1))
+        {
 			sub_80FAEC4();
 			ewram0_10.var304++;
-			break;
 		}
-		if (sub_80EFBDC(1)) return;
-		sub_80FAEC4();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if ((var2 = sub_80FAFC0())) return;
-		if (!ewram0_10.var6e90) {
+        break;
+    case 2:
+        if (!sub_80FAFC0())
+        {
+			if (!ewram0_10.var6e90)
+			{
+				sub_80EFBB0();
+				ewram0_10.var304 = 0;
+			}
+			else
+			{
+				ewram0_10.var304++;
+			}
+		}
+        break;
+    case 3:
+        if (!sub_80EFBDC(0))
+        {
 			sub_80EFBB0();
-			ewram0_10.var304 = var2;
-			break;
+			ewram0_10.var304 = 0;
+		}
+        break;
+    case 4:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+        ewram0_10.var304++;
+        break;
+    case 5:
+        if (!gPaletteFade.active)
+        {
+			sub_80F2DF4();
+			sub_80F2D04(0x4);
+			gSaveBlock2.regionMapZoom = (ewram0_10.var6e90 == 1) ? 1 : 0;
+			sub_80EBDBC(&sub_80EC00C);
 		}
-		ewram0_10.var304++;
-		break;
-	case 3:
-		if ((var1 = sub_80EFBDC(0))) return;
-		sub_80EFBB0();
-		ewram0_10.var304 = var1;
-		break;
-	case 4:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
-		ewram0_10.var304++;
 		break;
-	case 5:
-		if (gPaletteFade.active) return;
-		sub_80F2DF4();
-		sub_80F2D04(0x4);
-		gSaveBlock2.regionMapZoom = (ewram0_10.var6e90 == 1) ? 1 : 0;
-		sub_80EBDBC(&sub_80EC00C);
-	}
+    }
 }
 
-void sub_80EC81C() {
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F2D04(0);
-		sub_80EE9C0(1, 0, 1);
-		ewram0_10.var304++;
+void sub_80EC81C()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F2D04(0);
+        sub_80EE9C0(1, 0, 1);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80EEA0C())
+			sub_80EBDBC(&sub_80EC86C);
 		break;
-	case 1:
-		if (sub_80EEA0C()) return;
-		sub_80EBDBC(&sub_80EC86C);
-	}
+    }
 }
 
-void sub_80EC86C() {
-	switch (ewram0_10.var304) {
-	case 0:
-		if (sub_80EEC90()) {
-			PlaySE(0x5);
-			sub_80EF428(1, ewram0_10.var6dad);
-			sub_80EED9C();
-			break;
-		}
-		if (gMain.newKeys & A_BUTTON) {
-			PlaySE(0x5);
-			ewram0_10.var6df0 = ewram0_10.var6dad;
-			switch (ewram0_10.var6df0) {
-			case 0:
-				sub_80EBDBC(&sub_80ED620);
-				break;
-			case 1:
-				sub_80EBDBC(&sub_80EC960);
-				break;
-			case 2:
-				sub_80EBDBC(&sub_80EC210);
-				break;
-			}
-			break;
-		}
-		else if (gMain.newKeys & B_BUTTON) {
-			PlaySE(0x5);
-			ewram0_10.var6df0 = 0x2;
-			ewram0_10.var6dad = 0x2;
-			ewram0_10.var304++;
-			break;
-		}
+void sub_80EC86C()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        if (sub_80EEC90())
+        {
+            PlaySE(SE_SELECT);
+            sub_80EF428(1, ewram0_10.var6dad);
+            sub_80EED9C();
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            ewram0_10.var6df0 = ewram0_10.var6dad;
+            switch (ewram0_10.var6df0)
+            {
+            case 0:
+                sub_80EBDBC(&sub_80ED620);
+                break;
+            case 1:
+                sub_80EBDBC(&sub_80EC960);
+                break;
+            case 2:
+                sub_80EBDBC(&sub_80EC210);
+                break;
+            }
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            ewram0_10.var6df0 = 0x2;
+            ewram0_10.var6dad = 0x2;
+            ewram0_10.var304++;
+        }
+        break;
+    case 1:
+        if (!sub_80F1E6C())
+			sub_80EBDBC(&sub_80EC210);
 		break;
-	case 1:
-		if (sub_80F1E6C()) return;
-		sub_80EBDBC(&sub_80EC210);
-	}
+    }
 }
 
-void sub_80EC960() {
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80EE9C0(2, 0, 5);
-		ewram0_10.var304++;
+void sub_80EC960()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80EE9C0(2, 0, 5);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80EEA0C())
+			sub_80EBDBC(&sub_80ECC08);
 		break;
-	case 1:
-		if (sub_80EEA0C()) return;
-		sub_80EBDBC(&sub_80ECC08);
-	}
+    }
 }
 
-void sub_80EC9A8() {
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F2D04(5);
-		sub_80EE9C0(1, ewram0_10.var6df0, 0xC);
-		ewram0_10.var304++;
+void sub_80EC9A8()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F2D04(5);
+        sub_80EE9C0(1, ewram0_10.var6df0, 0xC);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80EEA0C())
+        {
+			sub_80EBDBC(&sub_80EC86C);
+			sub_80EF428(1, ewram0_10.var6dad);
+		}
 		break;
-	case 1:
-		if (sub_80EEA0C()) return;
-		sub_80EBDBC(&sub_80EC86C);
-		sub_80EF428(1, ewram0_10.var6dad);
-	}
+    }
 }
 
-void sub_80ECA10() {
-	switch (ewram0_10.var304) {
-	case 0:
-		if (sub_80EEF78()) return;
-		SetVBlankCallback(&sub_80EBD80);
-		sub_80EED1C();
-		ewram0_10.var6dad = ewram0_10.var6df0;
-		ewram0_10.var6dae = 0x3;
-		sub_80EEE08();
-		ewram0_10.var304++;
-		break;
-	case 1:
-		sub_80EF248(0x1);
-		ewram0_10.var304++;
-	case 2:
-		if (sub_80EF284(0x1)) return;
-		ewram0_10.var304++;
-		break;
-	case 3:
-		sub_80F1B8C(0x1);
-		ewram0_10.var304++;
-	case 4:
-		if (sub_80F1BC8(0x1)) return;
-		ewram0_10.var304++;
-		break;
-	case 5:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 6:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 7:
-		sub_80EED2C(0);
-		ewram0_10.var304++;
-		break;
-	case 8:
-		sub_80F2598();
-		ewram0_10.var304++;
-		break;
-	case 9:
-		if (gPaletteFade.active) return;
-		ewram0_10.var304++;
-		break;
-	case 0xA:
-		sub_80F2C80(0x1);
-		ewram0_10.var304++;
-
-	case 0xB:
-		if (sub_80F2CBC(0x1)) return;
-		ewram0_10.var304++;
-		break;
-	case 0xC:
-		sub_80F1DF0();
-		ewram0_10.var304++;
+void sub_80ECA10()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        if (!sub_80EEF78())
+        {
+			SetVBlankCallback(&sub_80EBD80);
+			sub_80EED1C();
+			ewram0_10.var6dad = ewram0_10.var6df0;
+			ewram0_10.var6dae = 0x3;
+			sub_80EEE08();
+			ewram0_10.var304++;
+		}
+        break;
+    case 1:
+        sub_80EF248(0x1);
+        ewram0_10.var304++;
+    case 2:
+        if (!sub_80EF284(0x1))
+			ewram0_10.var304++;
+        break;
+    case 3:
+        sub_80F1B8C(0x1);
+        ewram0_10.var304++;
+    case 4:
+        if (!sub_80F1BC8(0x1))
+			ewram0_10.var304++;
+        break;
+    case 5:
+        if (sub_8055870()) return;
+        ewram0_10.var304++;
+        break;
+    case 6:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 7:
+        sub_80EED2C(0);
+        ewram0_10.var304++;
+        break;
+    case 8:
+        sub_80F2598();
+        ewram0_10.var304++;
+        break;
+    case 9:
+        if (!gPaletteFade.active)
+			ewram0_10.var304++;
+        break;
+    case 0xA:
+        sub_80F2C80(0x1);
+        ewram0_10.var304++;
+		// fall through
+    case 0xB:
+        if (!sub_80F2CBC(0x1))
+			ewram0_10.var304++;
+        break;
+    case 0xC:
+        sub_80F1DF0();
+        ewram0_10.var304++;
+        break;
+    case 0xD:
+        if (!sub_80F1E50())
+        {
+			sub_80EF428(1, ewram0_10.var6dad);
+			sub_80EBDBC(&sub_80EC86C);
+		}
 		break;
-	case 0xD:
-		if (sub_80F1E50()) return;
-		sub_80EF428(1, ewram0_10.var6dad);
-		sub_80EBDBC(&sub_80EC86C);
-	}
+    }
 }
 
-void sub_80ECC08() {
-	switch (ewram0_10.var304) {
-	case 0:
-		if (sub_80EEC90()) {
-			PlaySE(0x5);
-			sub_80EF428(2, ewram0_10.var6dad);
-			sub_80EED9C();
-			break;
-		}
+void sub_80ECC08()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        if (sub_80EEC90())
+        {
+            PlaySE(SE_SELECT);
+            sub_80EF428(2, ewram0_10.var6dad);
+            sub_80EED9C();
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            switch ((s8)ewram0_10.var6dad)
+            {
+            case 0:
+                ewram0_10.var87D8 = 22;
+                break;
+            case 1:
+                ewram0_10.var87D8 = 23;
+                break;
+            case 2:
+                ewram0_10.var87D8 = 24;
+                break;
+            case 3:
+                ewram0_10.var87D8 = 33;
+                break;
+            case 4:
+                ewram0_10.var87D8 = 47;
+                break;
+            case 5:
+                sub_80EBDBC(&sub_80EC9A8);
+                return;
+            }
 
-		if (gMain.newKeys & A_BUTTON) {
-			PlaySE(0x5);
-			switch ((s8)ewram0_10.var6dad) {
-			case 0:
-				ewram0_10.var87D8 = 22;
-				break;
-			case 1:
-				ewram0_10.var87D8 = 23;
-				break;
-			case 2:
-				ewram0_10.var87D8 = 24;
-				break;
-			case 3:
-				ewram0_10.var87D8 = 33;
-				break;
-			case 4:
-				ewram0_10.var87D8 = 47;
-				break;
-			case 5:
-				sub_80EBDBC(&sub_80EC9A8);
-				return;
-			}
+            ewram0_10.var6dfc = ewram0_10.var6dad;
+            ewram0_10.var76aa = 1;
+            sub_80EBDBC(&sub_80ED01C);
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            ewram0_10.var6dad = 0x5;
+            ewram0_10.var304++;
+        }
+        break;
+    case 1:
+        if (!sub_80F1E6C())
+			sub_80EBDBC(&sub_80EC9A8);
+        break;
+    }
+}
 
-			ewram0_10.var6dfc = ewram0_10.var6dad;
-			ewram0_10.var76aa = 1;
-			sub_80EBDBC(&sub_80ED01C);
+void sub_80ECD80()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+			ewram0_10.var304++;
+        break;
+    case 2:
+        if (!sub_80EEF78())
+        {
+			SetVBlankCallback(&sub_80EBD80);
+			ewram0_10.var304++;
 		}
-		else if (gMain.newKeys & B_BUTTON) {
-			PlaySE(0x5);
-			ewram0_10.var6dad = 0x5;
+        break;
+    case 3:
+        sub_80EED1C();
+        sub_80F3130();
+        ewram0_10.var304++;
+        break;
+    case 4:
+        sub_80F2D6C(0x1);
+        ewram0_10.var304++;
+        break;
+    case 5:
+        sub_80F2D6C(0x5);
+        ewram0_10.var304++;
+        break;
+    case 6:
+        ewram0_10.var6dad = ewram0_10.var6dfc;
+        ewram0_10.var6dae = 0x6;
+        sub_80EEE08();
+        ewram0_10.var304++;
+        break;
+    case 7:
+        sub_80EF248(0x2);
+        ewram0_10.var304++;
+        // fall through
+    case 8:
+        if (!sub_80EF284(0x2))
+			ewram0_10.var304++;
+        break;
+    case 9:
+        sub_80F1B8C(0x2);
+        ewram0_10.var304++;
+        // fall through
+    case 10:
+        if (!sub_80F1BC8(0x2))
+			ewram0_10.var304++;
+        break;
+    case 11:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 12:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 13:
+        sub_80EED2C(0);
+        ewram0_10.var304++;
+        break;
+    case 14:
+        sub_80F2598();
+        ewram0_10.var304++;
+        break;
+    case 15:
+        if (!gPaletteFade.active)
+			ewram0_10.var304++;
+        break;
+    case 16:
+        sub_80F2C80(0x1);
+        ewram0_10.var304++;
+        // fall through
+    case 17:
+        if (!sub_80F2CBC(0x1))
+        {
+			ewram0_10.var306 = 0;
 			ewram0_10.var304++;
 		}
+        break;
+    case 18:
+        sub_80F2C80(0x5);
+        ewram0_10.var304++;
+        // fall through
+    case 19:
+        if (!sub_80F2CBC(0x5))
+        {
+			sub_80F1DF0();
+			ewram0_10.var304++;
+		}
+        break;
+    case 20:
+        if (!sub_80F1E50())
+		{
+			sub_80EF428(2, ewram0_10.var6dad);
+			sub_80EBDBC(&sub_80ECC08);
+		}
 		break;
-	case 1:
-		if (sub_80F1E6C()) return;;
-		sub_80EBDBC(&sub_80EC9A8);
-		break;
-	}
-}
-
-void sub_80ECD80() {
-	u16 var1;
-	switch (ewram0_10.var304) {
-	case 0:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (gPaletteFade.active) return;
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if (sub_80EEF78()) return;
-		SetVBlankCallback(&sub_80EBD80);
-		ewram0_10.var304++;
-		break;
-	case 3:
-		sub_80EED1C();
-		sub_80F3130();
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80F2D6C(0x1);
-		ewram0_10.var304++;
-		break;
-	case 5:
-		sub_80F2D6C(0x5);
-		ewram0_10.var304++;
-		break;
-	case 6:
-		ewram0_10.var6dad = ewram0_10.var6dfc;
-		ewram0_10.var6dae = 0x6;
-		sub_80EEE08();
-		ewram0_10.var304++;
-		break;
-	case 7:
-		sub_80EF248(0x2);
-		ewram0_10.var304++;
-	case 8:
-		if (sub_80EF284(0x2)) return;
-		ewram0_10.var304++;
-		break;
-	case 9:
-		sub_80F1B8C(0x2);
-		ewram0_10.var304++;
-	case 10:
-		if (sub_80F1BC8(0x2)) return;
-		ewram0_10.var304++;
-		break;
-	case 11:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 12:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 13:
-		sub_80EED2C(0);
-		ewram0_10.var304++;
-		break;
-	case 14:
-		sub_80F2598();
-		ewram0_10.var304++;
-		break;
-	case 15:
-		if (gPaletteFade.active) return;
-		ewram0_10.var304++;
-		break;
-	case 16:
-		sub_80F2C80(0x1);
-		ewram0_10.var304++;
-	case 17:
-		if ((var1 = sub_80F2CBC(0x1))) return;
-		ewram0_10.var306 = var1;
-		ewram0_10.var304++;
-		break;
-	case 18:
-		sub_80F2C80(0x5);
-		ewram0_10.var304++;
-	case 19:
-		if (sub_80F2CBC(0x5)) return;
-		sub_80F1DF0();
-		ewram0_10.var304++;
-		break;
-	case 20:
-		if (sub_80F1E50()) return;
-		sub_80EF428(2, ewram0_10.var6dad);
-		sub_80EBDBC(&sub_80ECC08);
-	}
+    }
 }
 
-void sub_80ED01C() {
-	u16 var1;
-	u16 var3;
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F1E84();
-		sub_80F2D04(0x1);
-		sub_80F2D04(0x5);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (sub_80F1F10()) return;
-		sub_80EEFBC(0);
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if ((var1 = sub_80EEF34())) return;
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1);
-		ewram0_10.var304++;
-		break;
-	case 3:
-		if (gPaletteFade.active) return;
-		SetVBlankCallback(NULL);
-		sub_80EED0C();
-		sub_80EF814();
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80F2620();
-		ewram0_10.var304++;
-		break;
-	case 5:
-		sub_80F4D44();
-		ewram0_10.var304++;
-	case 6:
-		if (!sub_80F4D88()) {
-			ewram0_10.var304 += 2;
-			break;
+void sub_80ED01C()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F1E84();
+        sub_80F2D04(0x1);
+        sub_80F2D04(0x5);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80F1F10())
+        {
+			sub_80EEFBC(0);
+			ewram0_10.var304++;
 		}
-		ewram0_10.var304++;
-		break;
-	case 7:
-		if (sub_8055870()) return;
-		ewram0_10.var304--;
-		break;
-	case 8:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 9:
-		sub_80F0264(0);
-		ewram0_10.var304++;
-	case 10:
-		if (sub_80F02A0()) return;
-		ewram0_10.var304++;
-		break;
-	case 11:
-		sub_80F3008(0);
-		ewram0_10.var304++;
-		break;
-	case 12:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 13:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 14:
-		sub_80EED2C(0x4);
-		ewram0_10.var304++;
-		break;
-	case 15:
-		if (gPaletteFade.active) return;
-		ewram0_10.var306 = (u8)(gPaletteFade.active << 24);
-		ewram0_10.var304++;
-		break;
-	case 16:
-		sub_80F2C80(0x1);
-		ewram0_10.var304++;
-	case 17:
-		if ((var3 = sub_80F2CBC(0x1))) return;
-		ewram0_10.var306 = var3;
-		ewram0_10.var304++;
-		break;
-	case 18:
-		sub_80F2C80(ewram0_10.var6dfc + 7);
-		ewram0_10.var304++;
-	case 19:
-		if (sub_80F2CBC(ewram0_10.var6dfc + 7)) return;
-		sub_80EBDBC(&sub_80ED31C);
-		break;
-	}
+        break;
+    case 2:
+        if (!sub_80EEF34())
+        {
+			BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+			ewram0_10.var304++;
+		}
+        break;
+    case 3:
+        if (!gPaletteFade.active)
+        {
+			SetVBlankCallback(NULL);
+			sub_80EED0C();
+			sub_80EF814();
+			ewram0_10.var304++;
+		}
+        break;
+    case 4:
+        sub_80F2620();
+        ewram0_10.var304++;
+        break;
+    case 5:
+        sub_80F4D44();
+        ewram0_10.var304++;
+        // fall through
+    case 6:
+        if (!sub_80F4D88())
+            ewram0_10.var304 += 2;
+        else
+			ewram0_10.var304 += 1;
+        break;
+    case 7:
+        if (!sub_8055870())
+			ewram0_10.var304--;
+        break;
+    case 8:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 9:
+        sub_80F0264(0);
+        ewram0_10.var304++;
+        // fall through
+    case 10:
+        if (!sub_80F02A0())
+			ewram0_10.var304++;
+        break;
+    case 11:
+        sub_80F3008(0);
+        ewram0_10.var304++;
+        break;
+    case 12:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 13:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 14:
+        sub_80EED2C(0x4);
+        ewram0_10.var304++;
+        break;
+    case 15:
+        if (!gPaletteFade.active)
+        {
+			ewram0_10.var306 = 0;
+			ewram0_10.var304++;
+		}
+        break;
+    case 16:
+        sub_80F2C80(0x1);
+        ewram0_10.var304++;
+        // fall through
+    case 17:
+        if (!sub_80F2CBC(0x1))
+        {
+			ewram0_10.var306 = 0;
+			ewram0_10.var304++;
+		}
+        break;
+    case 18:
+        sub_80F2C80(ewram0_10.var6dfc + 7);
+        ewram0_10.var304++;
+        // fall through
+    case 19:
+        if (!sub_80F2CBC(ewram0_10.var6dfc + 7))
+			sub_80EBDBC(&sub_80ED31C);
+        break;
+    }
 }
 
-void sub_80ED31C() {
-	switch (ewram0_10.var304) {
-	case 0:
-		switch (sub_80F5DD4()) {
-		case 1:
-			PlaySE(0x5);
+void sub_80ED31C()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        switch (sub_80F5DD4())
+        {
+        case 1:
+            PlaySE(SE_SELECT);
+            ShowMapNamePopUpWindow();
+            break;
+        case 2:
+            PlaySE(SE_SELECT);
+            ewram0_10.var304++;
+            break;
+        default:
+            if (gMain.newKeys & A_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                sub_80EBDBC(&sub_80ED4D8);
+            }
+            else if (gMain.newKeys & B_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                sub_80EBDBC(&sub_80ECD80);
+            }
+            break;
+        }
+        break;
+    case 1:
+        if (!sub_80F0718())
+        {
 			ShowMapNamePopUpWindow();
-			break;
-		case 2:
-			PlaySE(0x5);
+			sub_80F3264();
 			ewram0_10.var304++;
-			break;
-		default:
-			if (gMain.newKeys & A_BUTTON) {
-				PlaySE(0x5);
-				sub_80EBDBC(&sub_80ED4D8);
-			}
-			else if (gMain.newKeys & B_BUTTON) {
-				PlaySE(0x5);
-				sub_80EBDBC(&sub_80ECD80);
-			}
-			break;
 		}
-		break;
-	case 1:
-		if (sub_80F0718()) return;
-		ShowMapNamePopUpWindow();
-		sub_80F3264();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if (sub_8055870()) return;
-		ewram0_10.var304 = 0;
-		break;
-	}
+        break;
+    case 2:
+        if (!sub_8055870())
+			ewram0_10.var304 = 0;
+        break;
+    }
 }
 
-void sub_80ED3D0() {
-	switch (ewram0_10.var304) {
-	case 0:
-		SetVBlankCallback(NULL);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		sub_80EED0C();
-		sub_80F6134();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		sub_80EEFBC(0);
-		ewram0_10.var304++;
-		break;
-	case 3:
-		sub_80F0264(0);
-		ewram0_10.var304++;
-	case 4:
-		if (sub_80F02A0()) return;
-		ewram0_10.var304++;
-		break;
-	case 5:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 6:
-		sub_80F3008(0);
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 7:
-		sub_80EED2C(0x4);
-		ewram0_10.var304++;
+void sub_80ED3D0()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        SetVBlankCallback(NULL);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        sub_80EED0C();
+        sub_80F6134();
+        ewram0_10.var304++;
+        break;
+    case 2:
+        sub_80EEFBC(0);
+        ewram0_10.var304++;
+        break;
+    case 3:
+        sub_80F0264(0);
+        ewram0_10.var304++;
+        // fall through
+    case 4:
+        if (!sub_80F02A0())
+			ewram0_10.var304++;
+        break;
+    case 5:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 6:
+        sub_80F3008(0);
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 7:
+        sub_80EED2C(0x4);
+        ewram0_10.var304++;
+        break;
+    case 8:
+        if (!gPaletteFade.active)
+			sub_80EBDBC(&sub_80ED31C);
 		break;
-	case 8:
-		if (gPaletteFade.active) return;
-		sub_80EBDBC(&sub_80ED31C);
-	}
+    }
 }
 
-void sub_80ED4D8() {
-	switch (ewram0_10.var304) {
-	case 0:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (gPaletteFade.active) return;
-		SetVBlankCallback(NULL);
-		sub_80EED0C();
-		sub_80F3130();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 3:
-		sub_80F4CF0();
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80EFF34();
-		ewram0_10.var304++;
-	case 5:
-		if (sub_80EFF68()) return;
-		ewram0_10.var304++;
-		break;
-	case 6:
-		sub_80F35B4();
-		sub_80EEFBC(0x2);
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(sub_80EBD4C);
-		ewram0_10.var304++;
-		break;
-	case 7:
-		sub_80EED2C(0x2);
-		ewram0_10.var304++;
-		break;
-	case 8:
-		if (gPaletteFade.active) return;
-		sub_80EBDBC(&sub_80ED858);
-		break;
-	}
+void sub_80ED4D8()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+			SetVBlankCallback(NULL);
+			sub_80EED0C();
+			sub_80F3130();
+			ewram0_10.var304++;
+		}
+        break;
+    case 2:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 3:
+        sub_80F4CF0();
+        ewram0_10.var304++;
+        break;
+    case 4:
+        sub_80EFF34();
+        ewram0_10.var304++;
+        // fall through
+    case 5:
+        if (!sub_80EFF68())
+			ewram0_10.var304++;
+        break;
+    case 6:
+        sub_80F35B4();
+        sub_80EEFBC(0x2);
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(sub_80EBD4C);
+        ewram0_10.var304++;
+        break;
+    case 7:
+        sub_80EED2C(0x2);
+        ewram0_10.var304++;
+        break;
+    case 8:
+        if (!gPaletteFade.active)
+			sub_80EBDBC(&sub_80ED858);
+        break;
+    }
 }
 
-void sub_80ED620() {
-	u8 var1;
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F1E84();
-		sub_80F2D04(0x1);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (sub_80F1F10()) return;
-		sub_80EEFBC(0x1);
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if (!(var1 = sub_80EEF34())) {
-			BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1);
+void sub_80ED620()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F1E84();
+        sub_80F2D04(0x1);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80F1F10())
+        {
+			sub_80EEFBC(0x1);
 			ewram0_10.var304++;
 		}
-		break;
-	case 3:
-		if (gPaletteFade.active) return;
-		SetVBlankCallback(NULL);
-		sub_80EED0C();
-		sub_80EF814();
-		ewram0_10.var76aa = (u8)(gPaletteFade.active << 24);
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80F2620();
-		ewram0_10.var304++;
-		break;
-	case 5:
-		ewram0_10.varD162 = 0x2;
-		sub_80F4BD0();
-		ewram0_10.var304++;
-		break;
-	case 6:
-		sub_80EFF34();
-		ewram0_10.var304++;
-	case 7:
-		if (sub_80EFF68()) return;
-		ewram0_10.var304++;
-		break;
-	case 8:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 9:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 10:
-		sub_80F33A8();
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(&sub_80EBD4C);
-		ewram0_10.var304++;
-		break;
-	case 11:
-		sub_80EED2C(0x2);
-		ewram0_10.var304++;
-		break;
-	case 12:
-		if (gPaletteFade.active) return;
-		ewram0_10.var304++;
-		break;
-	case 13:
-		sub_80F2C80(0x1);
-		ewram0_10.var304++;
-	case 14:
-		if (sub_80F2CBC(0x1)) return;
-		ewram0_10.var304++;
-		break;
-	case 15:
-		sub_80F2C80(0x6);
-		ewram0_10.var304++;
-	case 16:
-		if (sub_80F2CBC(0x6)) return;
-		sub_80EBDBC(&sub_80ED858);
-		break;
-	}
+        break;
+    case 2:
+        if (!sub_80EEF34())
+        {
+            BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+            ewram0_10.var304++;
+        }
+        break;
+    case 3:
+        if (!gPaletteFade.active)
+        {
+			SetVBlankCallback(NULL);
+			sub_80EED0C();
+			sub_80EF814();
+			ewram0_10.var76aa = 0;
+			ewram0_10.var304++;
+		}
+        break;
+    case 4:
+        sub_80F2620();
+        ewram0_10.var304++;
+        break;
+    case 5:
+        ewram0_10.varD162 = 0x2;
+        sub_80F4BD0();
+        ewram0_10.var304++;
+        break;
+    case 6:
+        sub_80EFF34();
+        ewram0_10.var304++;
+        // fall through
+    case 7:
+        if (!sub_80EFF68())
+			ewram0_10.var304++;
+        break;
+    case 8:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 9:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 10:
+        sub_80F33A8();
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD4C);
+        ewram0_10.var304++;
+        break;
+    case 11:
+        sub_80EED2C(0x2);
+        ewram0_10.var304++;
+        break;
+    case 12:
+        if (!gPaletteFade.active)
+			ewram0_10.var304++;
+        break;
+    case 13:
+        sub_80F2C80(0x1);
+        ewram0_10.var304++;
+    case 14:
+        if (!sub_80F2CBC(0x1))
+			ewram0_10.var304++;
+        break;
+    case 15:
+        sub_80F2C80(0x6);
+        ewram0_10.var304++;
+        // fall through
+    case 16:
+        if (!sub_80F2CBC(0x6))
+			sub_80EBDBC(&sub_80ED858);
+        break;
+    }
 }
 
 #if 0
@@ -1445,1834 +1589,1869 @@ void sub_80F357C();
 void sub_80F4FDC();
 
 void sub_80ED858() {
-	u8 var1;
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F4F78();
-		sub_80F5B38();
-		ewram0_10.var304 = 0x1;
-		break;
-	case 1:
-		if (sub_80F5B50()) return;
-		ewram0_10.var304 = 0x2;
-		break;
-	case 2:
-		sub_80F0174(0x1);
-		ewram0_10.var304 = 0x3;
-		break;
-	case 3:
-		if (sub_80F4FB4()) return;
-		sub_80F3C94();
-		sub_80F3D00();
-		ewram0_10.var304 = 0x4;
-		break;
-	case 4:
-		if ( (gMain.heldKeys & 0x40) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var87DC)) ) {
-			PlaySE(0x5);
-			sub_80F5060(0x1);
-			move_anim_execute();
-			ewram0_10.var304 = 0x5;
-		}
-		else if ( (gMain.heldKeys & 0x80) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var76aa >= ewram0_10.var87DC)) ) {
-			PlaySE(0x5);
-			sub_80F5060(0);
-			move_anim_execute();
-			ewram0_10.var304 = 0x5;
-		}
-		if (gMain.newKeys & B_BUTTON) {
-			PlaySE(0x5);
-			sub_80F4FDC();
-			move_anim_execute();
-			ewram0_10.var304 = 0x9;
-		}
-		else if (gMain.newKeys & A_BUTTON) {
-			if (ewram0_10.var76aa) {
-				if (ewram0_10.var6dac) {
-					PlaySE(0x5);
-					ewram0_10.var304 = 0x7;
-				}
-			}
-			else if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) {
-				PlaySE(0x5);
-				ewram0_10.var304 = 0x9;
-			}
-		}
+    u8 var1;
+    switch (ewram0_10.var304) {
+    case 0:
+        sub_80F4F78();
+        sub_80F5B38();
+        ewram0_10.var304 = 0x1;
+        break;
+    case 1:
+        if (sub_80F5B50()) return;
+        ewram0_10.var304 = 0x2;
+        break;
+    case 2:
+        sub_80F0174(0x1);
+        ewram0_10.var304 = 0x3;
+        break;
+    case 3:
+        if (sub_80F4FB4()) return;
+        sub_80F3C94();
+        sub_80F3D00();
+        ewram0_10.var304 = 0x4;
+        break;
+    case 4:
+        if ( (gMain.heldKeys & 0x40) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var87DC)) ) {
+            PlaySE(SE_SELECT);
+            sub_80F5060(0x1);
+            move_anim_execute();
+            ewram0_10.var304 = 0x5;
+        }
+        else if ( (gMain.heldKeys & 0x80) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var76aa >= ewram0_10.var87DC)) ) {
+            PlaySE(SE_SELECT);
+            sub_80F5060(0);
+            move_anim_execute();
+            ewram0_10.var304 = 0x5;
+        }
+        if (gMain.newKeys & B_BUTTON) {
+            PlaySE(SE_SELECT);
+            sub_80F4FDC();
+            move_anim_execute();
+            ewram0_10.var304 = 0x9;
+        }
+        else if (gMain.newKeys & A_BUTTON) {
+            if (ewram0_10.var76aa) {
+                if (ewram0_10.var6dac) {
+                    PlaySE(SE_SELECT);
+                    ewram0_10.var304 = 0x7;
+                }
+            }
+            else if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) {
+                PlaySE(SE_SELECT);
+                ewram0_10.var304 = 0x9;
+            }
+        }
 
 /*
-		if (gMain.heldKeys & 0x40) {
-			if (ewram0_10.var87CB) {
-				if (ewram0_10.var76aa) {
-					if (!ewram0_10.var87DC) goto label1;
-				}
-				PlaySE(0x5);
-				sub_80F5060(0x1);
-				move_anim_execute();
-				ewram0_10.var304 = 0x5;
+        if (gMain.heldKeys & 0x40) {
+            if (ewram0_10.var87CB) {
+                if (ewram0_10.var76aa) {
+                    if (!ewram0_10.var87DC) goto label1;
+                }
+                PlaySE(SE_SELECT);
+                sub_80F5060(0x1);
+                move_anim_execute();
+                ewram0_10.var304 = 0x5;
 
-			}
-			else goto label1;
-		}
-		else goto label1;
-		break;
+            }
+            else goto label1;
+        }
+        else goto label1;
+        break;
 label1:
-		if (gMain.heldKeys & 0x80) {
-			if (ewram0_10.var87CB) {
-				if (ewram0_10.var76aa) {
-					if (!(ewram0_10.var76aa < ewram0_10.var87DC)) goto label2;
-				}
-				PlaySE(0x5);
-				sub_80F5060(0x1);
-				move_anim_execute();
-				ewram0_10.var304 = 0x5;
-			}
-			else goto label2;
-		}
-		else goto label2;
-		break;
+        if (gMain.heldKeys & 0x80) {
+            if (ewram0_10.var87CB) {
+                if (ewram0_10.var76aa) {
+                    if (!(ewram0_10.var76aa < ewram0_10.var87DC)) goto label2;
+                }
+                PlaySE(SE_SELECT);
+                sub_80F5060(0x1);
+                move_anim_execute();
+                ewram0_10.var304 = 0x5;
+            }
+            else goto label2;
+        }
+        else goto label2;
+        break;
 label2:
-		if (gMain.newKeys & B_BUTTON) {
-			PlaySE(0x5);
-			sub_80F4FDC();
-			move_anim_execute();
-			ewram0_10.var304 = 0x9;
-		}
-		else if (gMain.newKeys & A_BUTTON) {
-			if (!ewram0_10.var76aa) {
-				if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) {
-					PlaySE(0x5);
-					ewram0_10.var304 = 0x9;
-				}
-			}
-			else {
-				PlaySE(0x5);
-				ewram0_10.var304 = 0x9;
-			}
-		}
+        if (gMain.newKeys & B_BUTTON) {
+            PlaySE(SE_SELECT);
+            sub_80F4FDC();
+            move_anim_execute();
+            ewram0_10.var304 = 0x9;
+        }
+        else if (gMain.newKeys & A_BUTTON) {
+            if (!ewram0_10.var76aa) {
+                if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) {
+                    PlaySE(SE_SELECT);
+                    ewram0_10.var304 = 0x9;
+                }
+            }
+            else {
+                PlaySE(SE_SELECT);
+                ewram0_10.var304 = 0x9;
+            }
+        }
 */
-		break;
+        break;
 
-	case 5:
-		if (gpu_sync_bg_show()) return;
-		sub_80F3D00();
-		ewram0_10.var304 = 0x6;
-		break;
-	case 6:
-		if (sub_8055870()) return;
-		ewram0_10.var304 = 0x4;
-		break;
-	case 7:
-		sub_80EEFBC(0x3);
-		sub_80F3668();
-		ewram0_10.var304 = 0x8;
-		break;
-	case 8:
-		if (sub_80F7500()) return;
-		sub_80EEFBC(0x2);
-		sub_80F3698();
-		ewram0_10.var304 = 0x4;
-		break;
-	case 9:
-		if (!(var1 = sub_80F5038())) {
-			sub_80F0174(0);
-			sub_80F2F48();
-			BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1);
-			ewram0_10.var304 = 0xB;
-		}
-		break;
-	case 0xA:
-		if (gPaletteFade.active) return;
-		sub_80F3CE8();
-		sub_80F5BDC();
-		if (!ewram0_10.var76aa) {
-			sub_80F357C();
-			sub_80F2D6C(0x1);
-			sub_80F2D6C(0x6);
-			sub_80EBDBC(&sub_80ECA10);
-		}
-		else {
-			sub_80F3614();
-			sub_80EBDBC(&sub_80ED3D0);
-		}
-		break;
-	}
+    case 5:
+        if (gpu_sync_bg_show()) return;
+        sub_80F3D00();
+        ewram0_10.var304 = 0x6;
+        break;
+    case 6:
+        if (sub_8055870()) return;
+        ewram0_10.var304 = 0x4;
+        break;
+    case 7:
+        sub_80EEFBC(0x3);
+        sub_80F3668();
+        ewram0_10.var304 = 0x8;
+        break;
+    case 8:
+        if (sub_80F7500()) return;
+        sub_80EEFBC(0x2);
+        sub_80F3698();
+        ewram0_10.var304 = 0x4;
+        break;
+    case 9:
+        if (!(var1 = sub_80F5038())) {
+            sub_80F0174(0);
+            sub_80F2F48();
+            BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1);
+            ewram0_10.var304 = 0xB;
+        }
+        break;
+    case 0xA:
+        if (gPaletteFade.active) return;
+        sub_80F3CE8();
+        sub_80F5BDC();
+        if (!ewram0_10.var76aa) {
+            sub_80F357C();
+            sub_80F2D6C(0x1);
+            sub_80F2D6C(0x6);
+            sub_80EBDBC(&sub_80ECA10);
+        }
+        else {
+            sub_80F3614();
+            sub_80EBDBC(&sub_80ED3D0);
+        }
+        break;
+    }
 
 }
 #else
 __attribute__((naked))
 void sub_80ED858() {
-	asm_unified("push {r4,r5,lr}\n\
-	sub sp, 0x4\n\
-	ldr r1, _080ED878 @ =gSharedMem\n\
-	movs r2, 0xC1\n\
-	lsls r2, 2\n\
-	adds r0, r1, r2\n\
-	ldrh r0, [r0]\n\
-	adds r5, r1, 0\n\
-	cmp r0, 0xB\n\
-	bls _080ED86E\n\
-	b _080EDB7A\n\
+    asm_unified("push {r4,r5,lr}\n\
+    sub sp, 0x4\n\
+    ldr r1, _080ED878 @ =gSharedMem\n\
+    movs r2, 0xC1\n\
+    lsls r2, 2\n\
+    adds r0, r1, r2\n\
+    ldrh r0, [r0]\n\
+    adds r5, r1, 0\n\
+    cmp r0, 0xB\n\
+    bls _080ED86E\n\
+    b _080EDB7A\n\
 _080ED86E:\n\
-	lsls r0, 2\n\
-	ldr r1, _080ED87C @ =_080ED880\n\
-	adds r0, r1\n\
-	ldr r0, [r0]\n\
-	mov pc, r0\n\
-	.align 2, 0\n\
+    lsls r0, 2\n\
+    ldr r1, _080ED87C @ =_080ED880\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
 _080ED878: .4byte gSharedMem\n\
 _080ED87C: .4byte _080ED880\n\
-	.align 2, 0\n\
+    .align 2, 0\n\
 _080ED880:\n\
-	.4byte _080ED8B0\n\
-	.4byte _080ED8CC\n\
-	.4byte _080ED8EC\n\
-	.4byte _080ED904\n\
-	.4byte _080ED91A\n\
-	.4byte _080EDA68\n\
-	.4byte _080EDA8C\n\
-	.4byte _080EDAA4\n\
-	.4byte _080EDAC0\n\
-	.4byte _080EDAE8\n\
-	.4byte _080EDB7A\n\
-	.4byte _080EDB28\n\
+    .4byte _080ED8B0\n\
+    .4byte _080ED8CC\n\
+    .4byte _080ED8EC\n\
+    .4byte _080ED904\n\
+    .4byte _080ED91A\n\
+    .4byte _080EDA68\n\
+    .4byte _080EDA8C\n\
+    .4byte _080EDAA4\n\
+    .4byte _080EDAC0\n\
+    .4byte _080EDAE8\n\
+    .4byte _080EDB7A\n\
+    .4byte _080EDB28\n\
 _080ED8B0:\n\
-	bl sub_80F4F78\n\
-	bl sub_80F5B38\n\
-	ldr r0, _080ED8C8 @ =gSharedMem\n\
-	movs r4, 0xC1\n\
-	lsls r4, 2\n\
-	adds r0, r4\n\
-	movs r1, 0x1\n\
-	strh r1, [r0]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    bl sub_80F4F78\n\
+    bl sub_80F5B38\n\
+    ldr r0, _080ED8C8 @ =gSharedMem\n\
+    movs r4, 0xC1\n\
+    lsls r4, 2\n\
+    adds r0, r4\n\
+    movs r1, 0x1\n\
+    strh r1, [r0]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080ED8C8: .4byte gSharedMem\n\
 _080ED8CC:\n\
-	bl sub_80F5B50\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080ED8D8\n\
-	b _080EDB7A\n\
+    bl sub_80F5B50\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080ED8D8\n\
+    b _080EDB7A\n\
 _080ED8D8:\n\
-	ldr r0, _080ED8E8 @ =gSharedMem\n\
-	movs r1, 0xC1\n\
-	lsls r1, 2\n\
-	adds r0, r1\n\
-	movs r1, 0x2\n\
-	strh r1, [r0]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    ldr r0, _080ED8E8 @ =gSharedMem\n\
+    movs r1, 0xC1\n\
+    lsls r1, 2\n\
+    adds r0, r1\n\
+    movs r1, 0x2\n\
+    strh r1, [r0]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080ED8E8: .4byte gSharedMem\n\
 _080ED8EC:\n\
-	movs r0, 0x1\n\
-	bl sub_80F0174\n\
-	ldr r0, _080ED900 @ =gSharedMem\n\
-	movs r2, 0xC1\n\
-	lsls r2, 2\n\
-	adds r0, r2\n\
-	movs r1, 0x3\n\
-	strh r1, [r0]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    movs r0, 0x1\n\
+    bl sub_80F0174\n\
+    ldr r0, _080ED900 @ =gSharedMem\n\
+    movs r2, 0xC1\n\
+    lsls r2, 2\n\
+    adds r0, r2\n\
+    movs r1, 0x3\n\
+    strh r1, [r0]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080ED900: .4byte gSharedMem\n\
 _080ED904:\n\
-	bl sub_80F4FB4\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080ED910\n\
-	b _080EDB7A\n\
+    bl sub_80F4FB4\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080ED910\n\
+    b _080EDB7A\n\
 _080ED910:\n\
-	bl sub_80F3C94\n\
-	bl sub_80F3D00\n\
-	b _080EDAD4\n\
+    bl sub_80F3C94\n\
+    bl sub_80F3D00\n\
+    b _080EDAD4\n\
 _080ED91A:\n\
-	ldr r2, _080ED960 @ =gMain\n\
-	ldrh r1, [r2, 0x2C]\n\
-	movs r0, 0x40\n\
-	ands r0, r1\n\
-	adds r3, r2, 0\n\
-	cmp r0, 0\n\
-	beq _080ED970\n\
-	ldr r1, _080ED964 @ =0x000087cb\n\
-	adds r0, r5, r1\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	beq _080ED970\n\
-	ldr r2, _080ED968 @ =0x000076aa\n\
-	adds r0, r5, r2\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	beq _080ED948\n\
-	ldr r4, _080ED96C @ =0x000087dc\n\
-	adds r0, r5, r4\n\
-	movs r1, 0\n\
-	ldrsh r0, [r0, r1]\n\
-	cmp r0, 0\n\
-	beq _080ED970\n\
+    ldr r2, _080ED960 @ =gMain\n\
+    ldrh r1, [r2, 0x2C]\n\
+    movs r0, 0x40\n\
+    ands r0, r1\n\
+    adds r3, r2, 0\n\
+    cmp r0, 0\n\
+    beq _080ED970\n\
+    ldr r1, _080ED964 @ =0x000087cb\n\
+    adds r0, r5, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _080ED970\n\
+    ldr r2, _080ED968 @ =0x000076aa\n\
+    adds r0, r5, r2\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _080ED948\n\
+    ldr r4, _080ED96C @ =0x000087dc\n\
+    adds r0, r5, r4\n\
+    movs r1, 0\n\
+    ldrsh r0, [r0, r1]\n\
+    cmp r0, 0\n\
+    beq _080ED970\n\
 _080ED948:\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	movs r0, 0x1\n\
-	bl sub_80F5060\n\
-	bl move_anim_execute\n\
-	movs r2, 0xC1\n\
-	lsls r2, 2\n\
-	adds r1, r5, r2\n\
-	b _080ED9B8\n\
-	.align 2, 0\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0x1\n\
+    bl sub_80F5060\n\
+    bl move_anim_execute\n\
+    movs r2, 0xC1\n\
+    lsls r2, 2\n\
+    adds r1, r5, r2\n\
+    b _080ED9B8\n\
+    .align 2, 0\n\
 _080ED960: .4byte gMain\n\
 _080ED964: .4byte 0x000087cb\n\
 _080ED968: .4byte 0x000076aa\n\
 _080ED96C: .4byte 0x000087dc\n\
 _080ED970:\n\
-	ldrh r1, [r3, 0x2C]\n\
-	movs r0, 0x80\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	beq _080ED9CC\n\
-	ldr r4, _080ED9C0 @ =0x000087cb\n\
-	adds r0, r5, r4\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	beq _080ED9CC\n\
-	ldr r1, _080ED9C4 @ =0x000076aa\n\
-	adds r0, r5, r1\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	beq _080ED9A2\n\
-	ldr r2, _080ED9C8 @ =0x000087dc\n\
-	adds r0, r5, r2\n\
-	subs r4, 0x57\n\
-	adds r1, r5, r4\n\
-	movs r4, 0\n\
-	ldrsh r2, [r0, r4]\n\
-	movs r4, 0\n\
-	ldrsh r0, [r1, r4]\n\
-	cmp r2, r0\n\
-	bge _080ED9CC\n\
+    ldrh r1, [r3, 0x2C]\n\
+    movs r0, 0x80\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _080ED9CC\n\
+    ldr r4, _080ED9C0 @ =0x000087cb\n\
+    adds r0, r5, r4\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _080ED9CC\n\
+    ldr r1, _080ED9C4 @ =0x000076aa\n\
+    adds r0, r5, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _080ED9A2\n\
+    ldr r2, _080ED9C8 @ =0x000087dc\n\
+    adds r0, r5, r2\n\
+    subs r4, 0x57\n\
+    adds r1, r5, r4\n\
+    movs r4, 0\n\
+    ldrsh r2, [r0, r4]\n\
+    movs r4, 0\n\
+    ldrsh r0, [r1, r4]\n\
+    cmp r2, r0\n\
+    bge _080ED9CC\n\
 _080ED9A2:\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	movs r0, 0\n\
-	bl sub_80F5060\n\
-	bl move_anim_execute\n\
-	movs r0, 0xC1\n\
-	lsls r0, 2\n\
-	adds r1, r5, r0\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0\n\
+    bl sub_80F5060\n\
+    bl move_anim_execute\n\
+    movs r0, 0xC1\n\
+    lsls r0, 2\n\
+    adds r1, r5, r0\n\
 _080ED9B8:\n\
-	movs r0, 0x5\n\
-	strh r0, [r1]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    movs r0, 0x5\n\
+    strh r0, [r1]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080ED9C0: .4byte 0x000087cb\n\
 _080ED9C4: .4byte 0x000076aa\n\
 _080ED9C8: .4byte 0x000087dc\n\
 _080ED9CC:\n\
-	ldrh r2, [r3, 0x2E]\n\
-	movs r0, 0x2\n\
-	ands r0, r2\n\
-	cmp r0, 0\n\
-	beq _080ED9F8\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	bl sub_80F4FDC\n\
-	bl move_anim_execute\n\
-	ldr r0, _080ED9F4 @ =gSharedMem\n\
-	movs r1, 0xC1\n\
-	lsls r1, 2\n\
-	adds r0, r1\n\
-	movs r1, 0x9\n\
-	strh r1, [r0]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    ldrh r2, [r3, 0x2E]\n\
+    movs r0, 0x2\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    beq _080ED9F8\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    bl sub_80F4FDC\n\
+    bl move_anim_execute\n\
+    ldr r0, _080ED9F4 @ =gSharedMem\n\
+    movs r1, 0xC1\n\
+    lsls r1, 2\n\
+    adds r0, r1\n\
+    movs r1, 0x9\n\
+    strh r1, [r0]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080ED9F4: .4byte gSharedMem\n\
 _080ED9F8:\n\
-	movs r0, 0x1\n\
-	ands r0, r2\n\
-	cmp r0, 0\n\
-	bne _080EDA02\n\
-	b _080EDB7A\n\
+    movs r0, 0x1\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    bne _080EDA02\n\
+    b _080EDB7A\n\
 _080EDA02:\n\
-	adds r4, r5, 0\n\
-	ldr r2, _080EDA38 @ =0x000076aa\n\
-	adds r0, r4, r2\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	bne _080EDA44\n\
-	ldr r1, _080EDA3C @ =0x000087dc\n\
-	adds r0, r4, r1\n\
-	movs r2, 0\n\
-	ldrsh r1, [r0, r2]\n\
-	ldr r2, _080EDA40 @ =0x000087da\n\
-	adds r0, r4, r2\n\
-	movs r2, 0\n\
-	ldrsh r0, [r0, r2]\n\
-	subs r0, 0x1\n\
-	cmp r1, r0\n\
-	beq _080EDA26\n\
-	b _080EDB7A\n\
+    adds r4, r5, 0\n\
+    ldr r2, _080EDA38 @ =0x000076aa\n\
+    adds r0, r4, r2\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _080EDA44\n\
+    ldr r1, _080EDA3C @ =0x000087dc\n\
+    adds r0, r4, r1\n\
+    movs r2, 0\n\
+    ldrsh r1, [r0, r2]\n\
+    ldr r2, _080EDA40 @ =0x000087da\n\
+    adds r0, r4, r2\n\
+    movs r2, 0\n\
+    ldrsh r0, [r0, r2]\n\
+    subs r0, 0x1\n\
+    cmp r1, r0\n\
+    beq _080EDA26\n\
+    b _080EDB7A\n\
 _080EDA26:\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	movs r0, 0xC1\n\
-	lsls r0, 2\n\
-	adds r1, r4, r0\n\
-	movs r0, 0x9\n\
-	strh r0, [r1]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0xC1\n\
+    lsls r0, 2\n\
+    adds r1, r4, r0\n\
+    movs r0, 0x9\n\
+    strh r0, [r1]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080EDA38: .4byte 0x000076aa\n\
 _080EDA3C: .4byte 0x000087dc\n\
 _080EDA40: .4byte 0x000087da\n\
 _080EDA44:\n\
-	ldr r1, _080EDA64 @ =0x00006dac\n\
-	adds r0, r5, r1\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	beq _080EDA50\n\
-	b _080EDB7A\n\
+    ldr r1, _080EDA64 @ =0x00006dac\n\
+    adds r0, r5, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _080EDA50\n\
+    b _080EDB7A\n\
 _080EDA50:\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	movs r2, 0xC1\n\
-	lsls r2, 2\n\
-	adds r1, r5, r2\n\
-	movs r0, 0x7\n\
-	strh r0, [r1]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r2, 0xC1\n\
+    lsls r2, 2\n\
+    adds r1, r5, r2\n\
+    movs r0, 0x7\n\
+    strh r0, [r1]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080EDA64: .4byte 0x00006dac\n\
 _080EDA68:\n\
-	bl gpu_sync_bg_show\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080EDA74\n\
-	b _080EDB7A\n\
+    bl gpu_sync_bg_show\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080EDA74\n\
+    b _080EDB7A\n\
 _080EDA74:\n\
-	bl sub_80F3D00\n\
-	ldr r0, _080EDA88 @ =gSharedMem\n\
-	movs r4, 0xC1\n\
-	lsls r4, 2\n\
-	adds r0, r4\n\
-	movs r1, 0x6\n\
-	strh r1, [r0]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    bl sub_80F3D00\n\
+    ldr r0, _080EDA88 @ =gSharedMem\n\
+    movs r4, 0xC1\n\
+    lsls r4, 2\n\
+    adds r0, r4\n\
+    movs r1, 0x6\n\
+    strh r1, [r0]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080EDA88: .4byte gSharedMem\n\
 _080EDA8C:\n\
-	bl sub_8055870\n\
-	cmp r0, 0\n\
-	bne _080EDB7A\n\
-	ldr r0, _080EDAA0 @ =gSharedMem\n\
-	movs r1, 0xC1\n\
-	lsls r1, 2\n\
-	adds r0, r1\n\
-	b _080EDADC\n\
-	.align 2, 0\n\
+    bl sub_8055870\n\
+    cmp r0, 0\n\
+    bne _080EDB7A\n\
+    ldr r0, _080EDAA0 @ =gSharedMem\n\
+    movs r1, 0xC1\n\
+    lsls r1, 2\n\
+    adds r0, r1\n\
+    b _080EDADC\n\
+    .align 2, 0\n\
 _080EDAA0: .4byte gSharedMem\n\
 _080EDAA4:\n\
-	movs r0, 0x3\n\
-	bl sub_80EEFBC\n\
-	bl sub_80F3668\n\
-	ldr r0, _080EDABC @ =gSharedMem\n\
-	movs r2, 0xC1\n\
-	lsls r2, 2\n\
-	adds r0, r2\n\
-	movs r1, 0x8\n\
-	strh r1, [r0]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    movs r0, 0x3\n\
+    bl sub_80EEFBC\n\
+    bl sub_80F3668\n\
+    ldr r0, _080EDABC @ =gSharedMem\n\
+    movs r2, 0xC1\n\
+    lsls r2, 2\n\
+    adds r0, r2\n\
+    movs r1, 0x8\n\
+    strh r1, [r0]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080EDABC: .4byte gSharedMem\n\
 _080EDAC0:\n\
-	bl sub_80F7500\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	bne _080EDB7A\n\
-	movs r0, 0x2\n\
-	bl sub_80EEFBC\n\
-	bl sub_80F3698\n\
+    bl sub_80F7500\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080EDB7A\n\
+    movs r0, 0x2\n\
+    bl sub_80EEFBC\n\
+    bl sub_80F3698\n\
 _080EDAD4:\n\
-	ldr r0, _080EDAE4 @ =gSharedMem\n\
-	movs r4, 0xC1\n\
-	lsls r4, 2\n\
-	adds r0, r4\n\
+    ldr r0, _080EDAE4 @ =gSharedMem\n\
+    movs r4, 0xC1\n\
+    lsls r4, 2\n\
+    adds r0, r4\n\
 _080EDADC:\n\
-	movs r1, 0x4\n\
-	strh r1, [r0]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    movs r1, 0x4\n\
+    strh r1, [r0]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080EDAE4: .4byte gSharedMem\n\
 _080EDAE8:\n\
-	bl sub_80F5038\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	cmp r4, 0\n\
-	bne _080EDB7A\n\
-	movs r0, 0\n\
-	bl sub_80F0174\n\
-	bl sub_80F2F48\n\
-	ldr r5, _080EDB24 @ =gSharedMem\n\
-	movs r1, 0xC2\n\
-	lsls r1, 2\n\
-	adds r0, r5, r1\n\
-	ldr r0, [r0]\n\
-	movs r1, 0x1\n\
-	negs r1, r1\n\
-	str r4, [sp]\n\
-	movs r2, 0\n\
-	movs r3, 0x10\n\
-	bl BeginNormalPaletteFade\n\
-	movs r2, 0xC1\n\
-	lsls r2, 2\n\
-	adds r1, r5, r2\n\
-	movs r0, 0xB\n\
-	strh r0, [r1]\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    bl sub_80F5038\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    cmp r4, 0\n\
+    bne _080EDB7A\n\
+    movs r0, 0\n\
+    bl sub_80F0174\n\
+    bl sub_80F2F48\n\
+    ldr r5, _080EDB24 @ =gSharedMem\n\
+    movs r1, 0xC2\n\
+    lsls r1, 2\n\
+    adds r0, r5, r1\n\
+    ldr r0, [r0]\n\
+    movs r1, 0x1\n\
+    negs r1, r1\n\
+    str r4, [sp]\n\
+    movs r2, 0\n\
+    movs r3, 0x10\n\
+    bl BeginNormalPaletteFade\n\
+    movs r2, 0xC1\n\
+    lsls r2, 2\n\
+    adds r1, r5, r2\n\
+    movs r0, 0xB\n\
+    strh r0, [r1]\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080EDB24: .4byte gSharedMem\n\
 _080EDB28:\n\
-	ldr r0, _080EDB60 @ =gPaletteFade\n\
-	ldrb r1, [r0, 0x7]\n\
-	movs r0, 0x80\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _080EDB7A\n\
-	bl sub_80F3CE8\n\
-	bl sub_80F5BDC\n\
-	ldr r0, _080EDB64 @ =gSharedMem\n\
-	ldr r4, _080EDB68 @ =0x000076aa\n\
-	adds r0, r4\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	bne _080EDB70\n\
-	bl sub_80F357C\n\
-	movs r0, 0x1\n\
-	bl sub_80F2D6C\n\
-	movs r0, 0x6\n\
-	bl sub_80F2D6C\n\
-	ldr r0, _080EDB6C @ =sub_80ECA10\n\
-	bl sub_80EBDBC\n\
-	b _080EDB7A\n\
-	.align 2, 0\n\
+    ldr r0, _080EDB60 @ =gPaletteFade\n\
+    ldrb r1, [r0, 0x7]\n\
+    movs r0, 0x80\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _080EDB7A\n\
+    bl sub_80F3CE8\n\
+    bl sub_80F5BDC\n\
+    ldr r0, _080EDB64 @ =gSharedMem\n\
+    ldr r4, _080EDB68 @ =0x000076aa\n\
+    adds r0, r4\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _080EDB70\n\
+    bl sub_80F357C\n\
+    movs r0, 0x1\n\
+    bl sub_80F2D6C\n\
+    movs r0, 0x6\n\
+    bl sub_80F2D6C\n\
+    ldr r0, _080EDB6C @ =sub_80ECA10\n\
+    bl sub_80EBDBC\n\
+    b _080EDB7A\n\
+    .align 2, 0\n\
 _080EDB60: .4byte gPaletteFade\n\
 _080EDB64: .4byte gSharedMem\n\
 _080EDB68: .4byte 0x000076aa\n\
 _080EDB6C: .4byte sub_80ECA10\n\
 _080EDB70:\n\
-	bl sub_80F3614\n\
-	ldr r0, _080EDB84 @ =sub_80ED3D0\n\
-	bl sub_80EBDBC\n\
+    bl sub_80F3614\n\
+    ldr r0, _080EDB84 @ =sub_80ED3D0\n\
+    bl sub_80EBDBC\n\
 _080EDB7A:\n\
-	add sp, 0x4\n\
-	pop {r4,r5}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    add sp, 0x4\n\
+    pop {r4,r5}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _080EDB84: .4byte sub_80ED3D0\n");
 }
 #endif
 
-void sub_80EDB88() {
-	u8 var1;
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F1E84();
-		sub_80F2D04(0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (sub_80F1F10()) return;
-		sub_80EEFBC(0x4);
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if (!(var1 = sub_80EEF34())) {
-			BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1);
+void sub_80EDB88()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F1E84();
+        sub_80F2D04(0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80F1F10())
+        {
+			sub_80EEFBC(0x4);
 			ewram0_10.var304++;
 		}
-		break;
-	case 3:
-		if (gPaletteFade.active) return;
-		SetVBlankCallback(0);
-		sub_80EED0C();
-		sub_80EF814();
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80F2620();
-		ewram0_10.var304++;
-		break;
-	case 5:
-		sub_80F638C();
-		ewram0_10.var304++;
-	case 6:
-		if (!sub_80F63D0()) {
-			ewram0_10.var304 += 0x2;
-			break;
+        break;
+    case 2:
+        if (!sub_80EEF34())
+        {
+            BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+            ewram0_10.var304++;
+        }
+        break;
+    case 3:
+        if (!gPaletteFade.active)
+        {
+			SetVBlankCallback(NULL);
+			sub_80EED0C();
+			sub_80EF814();
+			ewram0_10.var304++;
 		}
-		ewram0_10.var304++;
-		break;
-	case 7:
-		if (sub_8055870()) return;
-		ewram0_10.var304--;
-		break;
-	case 8:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 9:
-		sub_80F0264(0x1);
-		ewram0_10.var304++;
-	case 10:
-		if (sub_80F02A0()) return;
-		ewram0_10.var304++;
-		break;
-	case 11:
-		sub_80F2C80(0x2);
-		ewram0_10.var304++;
-	case 12:
-		if (sub_80F2CBC(0x2)) return;
-		ewram0_10.var304++;
-		break;
-	case 13:
-		sub_80F3008(0x1);
-		ewram0_10.var304++;
-		break;
-	case 14:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 15:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 16:
-		sub_80EED2C(0x4);
-		ewram0_10.var304++;
-		break;
-	case 17:
-		if (gPaletteFade.active) return;
-		sub_80EBDBC(&sub_80EDDBC);
-		break;
-	}
+        break;
+    case 4:
+        sub_80F2620();
+        ewram0_10.var304++;
+        break;
+    case 5:
+        sub_80F638C();
+        ewram0_10.var304++;
+    case 6:
+        if (!sub_80F63D0())
+            ewram0_10.var304 += 2;
+        else
+			ewram0_10.var304 += 1;
+        break;
+    case 7:
+        if (!sub_8055870())
+			ewram0_10.var304--;
+        break;
+    case 8:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 9:
+        sub_80F0264(0x1);
+        ewram0_10.var304++;
+    case 10:
+        if (!sub_80F02A0())
+			ewram0_10.var304++;
+        break;
+    case 11:
+        sub_80F2C80(0x2);
+        ewram0_10.var304++;
+    case 12:
+        if (!sub_80F2CBC(0x2))
+			ewram0_10.var304++;
+        break;
+    case 13:
+        sub_80F3008(0x1);
+        ewram0_10.var304++;
+        break;
+    case 14:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 15:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 16:
+        sub_80EED2C(0x4);
+        ewram0_10.var304++;
+        break;
+    case 17:
+        if (!gPaletteFade.active)
+			sub_80EBDBC(&sub_80EDDBC);
+        break;
+    }
 }
 
-void sub_80EDDBC() {
-	switch (ewram0_10.var304) {
-	case 0:
-		switch (sub_80F5DD4()) {
-		case 1:
-			PlaySE(0x5);
+void sub_80EDDBC()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        switch (sub_80F5DD4())
+        {
+        case 1:
+            PlaySE(SE_SELECT);
+            ShowMapNamePopUpWindow();
+            break;
+        case 2:
+            PlaySE(SE_SELECT);
+            ewram0_10.var304++;
+            break;
+        default:
+            if (gMain.newKeys & A_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                sub_80EBDBC(&sub_80EDEE4);
+            }
+            else if (gMain.newKeys & B_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                sub_80EBDBC(&sub_80EDE70);
+            }
+            break;
+        }
+        break;
+    case 1:
+        if (!sub_80F0718())
+        {
 			ShowMapNamePopUpWindow();
-			break;
-		case 2:
-			PlaySE(0x5);
+			sub_80F3264();
 			ewram0_10.var304++;
-			break;
-		default:
-			if (gMain.newKeys & A_BUTTON) {
-				PlaySE(0x5);
-				sub_80EBDBC(&sub_80EDEE4);
-			}
-			else if (gMain.newKeys & B_BUTTON) {
-				PlaySE(0x5);
-				sub_80EBDBC(&sub_80EDE70);
-			}
-			break;
 		}
-		break;
-	case 1:
-		if (sub_80F0718()) return;
-		ShowMapNamePopUpWindow();
-		sub_80F3264();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if (sub_8055870()) return;
-		ewram0_10.var304 = 0;
-		break;
+        break;
+    case 2:
+        if (!sub_8055870())
+			ewram0_10.var304 = 0;
+        break;
 
-	}
+    }
 }
 
-void sub_80EDE70() {
-	switch (ewram0_10.var304) {
-	case 0:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (gPaletteFade.active) return;
-		sub_80F3130();
-		sub_80F2D6C(0x2);
-		ewram0_10.var304++;
-		break;
-	case 2:
-		sub_80EBDBC(&sub_80EC00C);
-		break;
-	}
+void sub_80EDE70()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+			sub_80F3130();
+			sub_80F2D6C(0x2);
+			ewram0_10.var304++;
+		}
+        break;
+    case 2:
+        sub_80EBDBC(&sub_80EC00C);
+        break;
+    }
 
 }
 
-void sub_80EDEE4() {
-	switch (ewram0_10.var304) {
-	case 0:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (gPaletteFade.active) return;
-		SetVBlankCallback(NULL);
-		sub_80EED0C();
-		sub_80F3130();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		sub_80F66E0();
-		sub_80EEE08();
-		ewram0_10.var304++;
-		break;
-	case 3:
-		if (sub_80F1080()) return;
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80EEFBC(0x5);
-		sub_80F38B8();
-		ewram0_10.var304++;
-	case 5:
-		if (sub_80F38EC()) return;
-		ewram0_10.var304++;
-		break;
-	case 6:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 7:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 8:
-		sub_80EED2C(0x3);
-		ewram0_10.var304++;
-		break;
-	case 9:
-		if (gPaletteFade.active) return;
-		ewram0_10.var304++;
-		break;
-	case 10:
-		if (sub_80F170C()) return;
-		sub_80EBDBC(&sub_80EE06C);
-		break;
-	}
+void sub_80EDEE4()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+			SetVBlankCallback(NULL);
+			sub_80EED0C();
+			sub_80F3130();
+			ewram0_10.var304++;
+		}
+        break;
+    case 2:
+        sub_80F66E0();
+        sub_80EEE08();
+        ewram0_10.var304++;
+        break;
+    case 3:
+        if (!sub_80F1080())
+			ewram0_10.var304++;
+        break;
+    case 4:
+        sub_80EEFBC(0x5);
+        sub_80F38B8();
+        ewram0_10.var304++;
+    case 5:
+        if (!sub_80F38EC())
+			ewram0_10.var304++;
+        break;
+    case 6:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 7:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 8:
+        sub_80EED2C(0x3);
+        ewram0_10.var304++;
+        break;
+    case 9:
+        if (!gPaletteFade.active)
+			ewram0_10.var304++;
+        break;
+    case 10:
+        if (!sub_80F170C())
+			sub_80EBDBC(&sub_80EE06C);
+        break;
+    }
 }
 
-void sub_80EE06C() {
-	u32 var1;
-	u16 var2;
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F15A8();
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (gMain.newAndRepeatedKeys & 0x40) {
-			if (ewram0_10.var87DC) {
-				PlaySE(0x5);
-				sub_80F6A4C(-1);
-				ewram0_10.var304++;
-			}
-			else goto label1;
-		}
-		else goto label1;
-		break;
-label1:
-		if (gMain.newAndRepeatedKeys & 0x80) {
-			if (ewram0_10.var87DC < ewram0_10.var8774) {
-				PlaySE(0x5);
-				sub_80F6A4C(1);
-				ewram0_10.var304++;
-			}
-			else goto label2;
+void sub_80EE06C()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F15A8();
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if ((gMain.newAndRepeatedKeys & 0x40) && (ewram0_10.var87DC))
+        {
+			PlaySE(SE_SELECT);
+			sub_80F6A4C(-1);
+			ewram0_10.var304++;
+        }
+		else if ((gMain.newAndRepeatedKeys & 0x80) && ewram0_10.var87DC < ewram0_10.var8774)
+		{
+            PlaySE(SE_SELECT);
+            sub_80F6A4C(1);
+            ewram0_10.var304++;
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sub_80EEFBC(0xB);
+            ewram0_10.var304 = 0x4;
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sub_80EBDBC(&sub_80EE294);
+        }
+        break;
+    case 2:
+        if (!sub_80F6AF0())
+			ewram0_10.var304++;
+        break;
+    case 3:
+        if (!sub_8055870())
+			ewram0_10.var304 = 0;
+        break;
+    case 4:
+        sub_80F3B00();
+        ewram0_10.var304++;
+        break;
+    case 5:
+        if (!sub_80F3B58())
+		{
+			sub_80F1494();
+			ewram0_10.var304++;
+			sub_80EED9C();
 		}
-		else goto label2;
-		break;
-label2:
-		if (gMain.newKeys & A_BUTTON) {
-			PlaySE(0x5);
-			sub_80EEFBC(0xB);
+        break;
+    case 6:
+        switch (sub_80F68E8())
+        {
+        case 1:
+            PlaySE(SE_SELECT);
+            sub_80F3B94();
+            ewram0_10.var304 = 0x7;
+            break;
+        default:
+        case 0:
+            if (gMain.newKeys & B_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                sub_80F3B94();
+                ewram0_10.var304 = 0x8;
+            }
+            break;
+        }
+        break;
+    case 7:
+        if (!sub_80F3BD4())
 			ewram0_10.var304 = 0x4;
+        break;
+    case 8:
+        if (!sub_80F3BD4())
+		{
+			sub_80EEFBC(0x5);
+			ewram0_10.var304 = 0;
 		}
-		else if (gMain.newKeys & B_BUTTON) {
-			PlaySE(0x5);
-			sub_80EBDBC(&sub_80EE294);
-		}
-		break;
-	case 2:
-		if (sub_80F6AF0()) return;
-		ewram0_10.var304++;
-		break;
-	case 3:
-		var1 = sub_8055870();
-		if (var1) return;
-		ewram0_10.var304 = var1;
-		break;
-	case 4:
-		sub_80F3B00();
-		ewram0_10.var304++;
-		break;
-	case 5:
-		if (sub_80F3B58()) return;
-		sub_80F1494();
-		ewram0_10.var304++;
-		sub_80EED9C();
-		break;
-	case 6:
-		switch (sub_80F68E8()) {
-		case 1:
-			PlaySE(0x5);
-			sub_80F3B94();
-			ewram0_10.var304 = 0x7;
-			break;
-		default:
-		case 0:
-			if (gMain.newKeys & B_BUTTON) {
-				PlaySE(0x5);
-				sub_80F3B94();
-				ewram0_10.var304 = 0x8;
-			}
-			break;
-		}
-		break;
-	case 7:
-		if (sub_80F3BD4()) return;
-		ewram0_10.var304 = 0x4;
-		break;
-	case 8:
-		var2 = sub_80F3BD4();
-		if (var2) return;
-		sub_80EEFBC(0x5);
-		ewram0_10.var304 = var2;
-		break;
-	}
+        break;
+    }
 }
 
-void sub_80EE294() {
-	switch (ewram0_10.var304) {
-	case 0:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (gPaletteFade.active) return;
-		SetVBlankCallback(NULL);
-		sub_80EED0C();
-		sub_80F3C2C();
-		sub_80EEE08();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		sub_80F6134();
-		sub_80F0264(0x1);
-		ewram0_10.var304++;
-	case 3:
-		if (sub_80F02A0()) return;
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80EEFBC(0x4);
-		sub_80F3008(0x1);
-		SetVBlankCallback(&sub_80EBD18);
-		ewram0_10.var304++;
-		break;
-	case 5:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 6:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		ewram0_10.var304++;
-		break;
-	case 7:
-		sub_80EED2C(0x4);
-		ewram0_10.var304++;
-		break;
-	case 8:
-		if (gPaletteFade.active) return;
-		sub_80EBDBC(&sub_80EDDBC);
-		break;
-	}
+void sub_80EE294()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+			SetVBlankCallback(NULL);
+			sub_80EED0C();
+			sub_80F3C2C();
+			sub_80EEE08();
+			ewram0_10.var304++;
+		}
+        break;
+    case 2:
+        sub_80F6134();
+        sub_80F0264(0x1);
+        ewram0_10.var304++;
+    case 3:
+        if (!sub_80F02A0())
+			ewram0_10.var304++;
+        break;
+    case 4:
+        sub_80EEFBC(0x4);
+        sub_80F3008(0x1);
+        SetVBlankCallback(&sub_80EBD18);
+        ewram0_10.var304++;
+        break;
+    case 5:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 6:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        ewram0_10.var304++;
+        break;
+    case 7:
+        sub_80EED2C(0x4);
+        ewram0_10.var304++;
+        break;
+    case 8:
+        if (!gPaletteFade.active)
+			sub_80EBDBC(&sub_80EDDBC);
+        break;
+    }
 }
 
-void sub_80EE3D8() {
-	u8 var1;
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F1E84();
-		sub_80F2D04(0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (sub_80F1F10()) return;
-		sub_80EEFBC(0x9);
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if (!(var1 = sub_80EEF34())) {
-			BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1);
+void sub_80EE3D8()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F1E84();
+        sub_80F2D04(0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80F1F10())
+        {
+			sub_80EEFBC(0x9);
 			ewram0_10.var304++;
 		}
-		break;
-	case 3:
-		if (gPaletteFade.active) return;
-		SetVBlankCallback(NULL);
-		sub_80EED0C();
-		sub_80EF814();
-		sub_80EEE08();
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80F2620();
-		ewram0_10.var304++;
-		break;
-	case 5:
-		sub_80F0264(0x2);
-		ewram0_10.var304++;
-	case 6:
-		if (sub_80F02A0()) return;
-		ewram0_10.var304++;
-		break;
-	case 7:
-		sub_80F2C80(0x3);
-		ewram0_10.var304++;
-	case 8:
-		if (sub_80F2CBC(0x3)) return;
-		ewram0_10.var304++;
-		break;
-	case 9:
-		sub_80F3008(0x2);
-		ewram0_10.var304++;
-		break;
-	case 10:
-		if (sub_8055870()) return;
-		ewram0_10.var304++;
-		break;
-	case 11:
-		sub_80F6F10();
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
-		SetVBlankCallback(&sub_80EBD68);
-		ewram0_10.var304++;
-		break;
-	case 12:
-		sub_80EED2C(0x5);
-		ewram0_10.var304++;
-		break;
-	case 13:
-		if (gPaletteFade.active) return;
-		sub_80EBDBC(&sub_80EE58C);
-		break;
-	}
+        break;
+    case 2:
+        if (!sub_80EEF34())
+        {
+            BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+            ewram0_10.var304++;
+        }
+        break;
+    case 3:
+        if (!gPaletteFade.active)
+        {
+			SetVBlankCallback(NULL);
+			sub_80EED0C();
+			sub_80EF814();
+			sub_80EEE08();
+			ewram0_10.var304++;
+		}
+        break;
+    case 4:
+        sub_80F2620();
+        ewram0_10.var304++;
+        break;
+    case 5:
+        sub_80F0264(0x2);
+        ewram0_10.var304++;
+    case 6:
+        if (!sub_80F02A0())
+			ewram0_10.var304++;
+        break;
+    case 7:
+        sub_80F2C80(0x3);
+        ewram0_10.var304++;
+    case 8:
+        if (!sub_80F2CBC(0x3))
+			ewram0_10.var304++;
+        break;
+    case 9:
+        sub_80F3008(0x2);
+        ewram0_10.var304++;
+        break;
+    case 10:
+        if (!sub_8055870())
+			ewram0_10.var304++;
+        break;
+    case 11:
+        sub_80F6F10();
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+        SetVBlankCallback(&sub_80EBD68);
+        ewram0_10.var304++;
+        break;
+    case 12:
+        sub_80EED2C(0x5);
+        ewram0_10.var304++;
+        break;
+    case 13:
+        if (!gPaletteFade.active)
+			sub_80EBDBC(&sub_80EE58C);
+        break;
+    }
 }
 
-void sub_80EE58C() {
-	switch (ewram0_10.var304) {
-	case 0:
-		switch (sub_80F5DD4()) {
-		case 1:
-			PlaySE(0x5);
+void sub_80EE58C()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        switch (sub_80F5DD4())
+        {
+        case 1:
+            PlaySE(SE_SELECT);
+            sub_80F0FFC(ewram0_10.var876E);
+            break;
+        case 2:
+            PlaySE(SE_SELECT);
+            ewram0_10.var304++;
+            break;
+        default:
+            if (gMain.newKeys & A_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                sub_80EBDBC(&sub_80EE658);
+            }
+            else if (gMain.newKeys & B_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                sub_80EBDBC(&sub_80EE8F4);
+            }
+            break;
+        }
+        break;
+    case 1:
+        if (!sub_80F0718())
+        {
 			sub_80F0FFC(ewram0_10.var876E);
-			break;
-		case 2:
-			PlaySE(0x5);
+			sub_80F3264();
 			ewram0_10.var304++;
-			break;
-		default:
-			if (gMain.newKeys & A_BUTTON) {
-				PlaySE(0x5);
-				sub_80EBDBC(&sub_80EE658);
-			}
-			else if (gMain.newKeys & B_BUTTON) {
-				PlaySE(0x5);
-				sub_80EBDBC(&sub_80EE8F4);
-			}
-			break;
 		}
-		break;
-	case 1:
-		if (sub_80F0718()) return;
-		sub_80F0FFC(ewram0_10.var876E);
-		sub_80F3264();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		if (sub_8055870()) return;
-		ewram0_10.var304 = 0;
-		break;
-	}
+        break;
+    case 2:
+        if (!sub_8055870())
+			ewram0_10.var304 = 0;
+        break;
+    }
 }
 
-void sub_80EE658() {
-	switch (ewram0_10.var304) {
-	case 0:
-		sub_80F3294(0x1);
-		sub_80EEFBC(0xA);
-		sub_80F0B24();
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (sub_80F0B44()) return;
-		ewram0_10.var304++;
-		break;
-	case 2:
-		sub_80F0F64();
-		ewram0_10.var304++;
-		break;
-	case 3:
-		if (sub_80F0FEC()) return;
-		sub_80F6FB8(0x1);
-		ewram0_10.var304++;
-		break;
-	case 4:
-		sub_80F6DB8();
-		ewram0_10.var304++;
-		break;
-	case 5:
-		sub_80F700C((u8 *)(gSharedMem + 0x8788), *(u16 *)(gSharedMem + 0x8788 - 0x1A));
-		sub_80F42C4((u8 *)(gSharedMem + 0x8788));
-		ewram0_10.var304++;
-		break;
-	case 6:
-		sub_80F0CD8();
-		ewram0_10.var304++;
-	case 7:
-		if (sub_80F6E9C()) return;
-		if (sub_80F0D5C()) return;
-		ewram0_10.var304++;
-		break;
-	case 8:
-		if (gMain.heldKeys & 0x40) {
-			if (ewram0_10.var87DC) {
-				PlaySE(0x5);
-				sub_80F708C(-1);
-				ewram0_10.var304 = 0x10;
-			}
-			else goto label1;
-		}
-		else goto label1;
-		break;
-label1:
-		if (gMain.heldKeys & 0x80) {
-			if (ewram0_10.var87DC < ewram0_10.var8774) {
-				PlaySE(0x5);
-				sub_80F708C(1);
-				ewram0_10.var304 = 0x10;
-			}
-			else goto label2;
+void sub_80EE658()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        sub_80F3294(0x1);
+        sub_80EEFBC(0xA);
+        sub_80F0B24();
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!sub_80F0B44())
+			ewram0_10.var304++;
+        break;
+    case 2:
+        sub_80F0F64();
+        ewram0_10.var304++;
+        break;
+    case 3:
+        if (!sub_80F0FEC())
+        {
+			sub_80F6FB8(0x1);
+			ewram0_10.var304++;
 		}
-		else goto label2;
-		break;
-label2:
-		if (gMain.newKeys & B_BUTTON) {
-			PlaySE(0x5);
-			sub_80F4394();
-			sub_80F0EC0();
+        break;
+    case 4:
+        sub_80F6DB8();
+        ewram0_10.var304++;
+        break;
+    case 5:
+        sub_80F700C((u8 *)(gSharedMem + 0x8788), *(u16 *)(gSharedMem + 0x8788 - 0x1A));
+        sub_80F42C4((u8 *)(gSharedMem + 0x8788));
+        ewram0_10.var304++;
+        break;
+    case 6:
+        sub_80F0CD8();
+        ewram0_10.var304++;
+    case 7:
+        if (!sub_80F6E9C() && !sub_80F0D5C())
+			ewram0_10.var304++;
+        break;
+    case 8:
+        if ((gMain.heldKeys & 0x40) && ewram0_10.var87DC)
+        {
+			PlaySE(SE_SELECT);
+			sub_80F708C(-1);
+			ewram0_10.var304 = 0x10;
+        }
+        else if ((gMain.heldKeys & 0x80) && ewram0_10.var87DC < ewram0_10.var8774)
+        {
+			PlaySE(SE_SELECT);
+			sub_80F708C(1);
+			ewram0_10.var304 = 0x10;
+        }
+		else if (gMain.newKeys & B_BUTTON)
+		{
+            PlaySE(SE_SELECT);
+            sub_80F4394();
+            sub_80F0EC0();
+            ewram0_10.var304++;
+        }
+        break;
+    case 9:
+        if (!sub_80F6ED4() && !sub_80F0EF4())
+        {
+			sub_80F6FB8(0);
+			sub_80F2FB0();
 			ewram0_10.var304++;
 		}
-		break;
-	case 9:
-		if (sub_80F6ED4()) return;
-		if (sub_80F0EF4()) return;
-		sub_80F6FB8(0);
-		sub_80F2FB0();
-		ewram0_10.var304++;
-		break;
-	case 10:
-		sub_80F6134();
-		ewram0_10.var304++;
-		break;
-	case 11:
-		sub_80F0FA0();
-		ewram0_10.var304++;
-		break;
-	case 12:
-		if (sub_80F0FEC()) return;
-		ewram0_10.var304++;
-		break;
-	case 13:
-		sub_80F0C28();
-		ewram0_10.var304++;
-		break;
-	case 14:
-		if (sub_80F0C48()) return;
-		ewram0_10.var304++;
-		break;
-	case 15:
-		sub_80EEFBC(0x9);
-		sub_80F3294(0);
-		sub_80EBDBC(&sub_80EE58C);
-		sub_80EED9C();
-		break;
-	case 16:
-		if (sub_80F70FC()) return;
-		ewram0_10.var304++;
-		break;
-	case 17:
-		if (sub_8055870()) return;
-		ewram0_10.var304 = 0x8;
-		break;
-	}
+        break;
+    case 10:
+        sub_80F6134();
+        ewram0_10.var304++;
+        break;
+    case 11:
+        sub_80F0FA0();
+        ewram0_10.var304++;
+        break;
+    case 12:
+        if (!sub_80F0FEC())
+			ewram0_10.var304++;
+        break;
+    case 13:
+        sub_80F0C28();
+        ewram0_10.var304++;
+        break;
+    case 14:
+        if (!sub_80F0C48())
+			ewram0_10.var304++;
+        break;
+    case 15:
+        sub_80EEFBC(0x9);
+        sub_80F3294(0);
+        sub_80EBDBC(&sub_80EE58C);
+        sub_80EED9C();
+        break;
+    case 16:
+        if (!sub_80F70FC())
+			ewram0_10.var304++;
+        break;
+    case 17:
+        if (!sub_8055870())
+			ewram0_10.var304 = 0x8;
+        break;
+    }
 }
 
-void sub_80EE8F4() {
-	switch (ewram0_10.var304) {
-	case 0:
-		BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
-		ewram0_10.var304++;
-		break;
-	case 1:
-		if (gPaletteFade.active) return;
-		sub_80F3130();
-		sub_80F2D6C(0x2);
-		sub_80F6FFC();
-		ewram0_10.var304++;
-		break;
-	case 2:
-		sub_80EBDBC(&sub_80EC00C);
-		break;
-	}
+void sub_80EE8F4()
+{
+    switch (ewram0_10.var304)
+    {
+    case 0:
+        BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+        ewram0_10.var304++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+			sub_80F3130();
+			sub_80F2D6C(0x2);
+			sub_80F6FFC();
+			ewram0_10.var304++;
+		}
+        break;
+    case 2:
+        sub_80EBDBC(&sub_80EC00C);
+        break;
+    }
 }
 
-void sub_80EE96C() {
-	u16 var1 = ewram0_10.var304;
-	if (!var1) {
-		PlaySE(0x6F);
-		BeginNormalPaletteFade(-1, 0, 0, 0x10, var1);
-		ewram0_10.var304++;
-	}
-	else {
-		if (gPaletteFade.active) return;
-		sub_80F5BDC();
-		sub_805469C();
-	}
+void sub_80EE96C()
+{
+    if (!ewram0_10.var304)
+    {
+        PlaySE(0x6F);
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        ewram0_10.var304++;
+    }
+    else
+    {
+        if (!gPaletteFade.active)
+        {
+			sub_80F5BDC();
+			sub_805469C();
+		}
+    }
 }
 
-void sub_80EE9C0(u8 param1, u8 param2, u8 param3) {
-	sub_80F1E84();
-	ewram0_10.var6e14 = param1;
-	ewram0_10.var6e15 = param2;
-	ewram0_10.var6e16 = 0;
-	ewram0_10.var6e17 = param3;
+void sub_80EE9C0(u8 param1, u8 param2, u8 param3)
+{
+    sub_80F1E84();
+    ewram0_10.var6e14 = param1;
+    ewram0_10.var6e15 = param2;
+    ewram0_10.var6e16 = 0;
+    ewram0_10.var6e17 = param3;
 }
 
 #if 0
 bool8 sub_80EEA0C() {
-	switch (ewram0_10.var6e16) {
-	case 0:
-		if (sub_80F1F10()) return 1;
-		if (ewram0_10.var6e17 != 0xC) {
-			ewram0_10.var6e16 = 0x1;
-			return 1;
-		}
-		else {
-			ewram0_10.var6e16 = 0x3;
-			return 1;
-		}
-	case 1:
-		sub_80F2C80(ewram0_10.var6e17);
-		ewram0_10.var6e16++;
-	case 2:
-		if (sub_80F2CBC(ewram0_10.var6e17)) return 1;
-		ewram0_10.var6e16++;
-	case 3:
-
-	}
+    switch (ewram0_10.var6e16) {
+    case 0:
+        if (sub_80F1F10()) return 1;
+        if (ewram0_10.var6e17 != 0xC) {
+            ewram0_10.var6e16 = 0x1;
+            return 1;
+        }
+        else {
+            ewram0_10.var6e16 = 0x3;
+            return 1;
+        }
+    case 1:
+        sub_80F2C80(ewram0_10.var6e17);
+        ewram0_10.var6e16++;
+    case 2:
+        if (sub_80F2CBC(ewram0_10.var6e17)) return 1;
+        ewram0_10.var6e16++;
+    case 3:
+
+    }
 }
 #else
 __attribute__((naked))
 bool8 sub_80EEA0C() {
-	asm_unified(
-	"push {r4,lr}\n\
-	ldr r1, _080EEA28 @ =gSharedMem\n\
-	ldr r2, _080EEA2C @ =0x00006e16\n\
-	adds r0, r1, r2\n\
-	ldrb r0, [r0]\n\
-	adds r3, r1, 0\n\
-	cmp r0, 0x8\n\
-	bls _080EEA1E\n\
-	b _080EEBFA\n\
+    asm_unified(
+    "push {r4,lr}\n\
+    ldr r1, _080EEA28 @ =gSharedMem\n\
+    ldr r2, _080EEA2C @ =0x00006e16\n\
+    adds r0, r1, r2\n\
+    ldrb r0, [r0]\n\
+    adds r3, r1, 0\n\
+    cmp r0, 0x8\n\
+    bls _080EEA1E\n\
+    b _080EEBFA\n\
 _080EEA1E:\n\
-	lsls r0, 2\n\
-	ldr r1, _080EEA30 @ =_080EEA34\n\
-	adds r0, r1\n\
-	ldr r0, [r0]\n\
-	mov pc, r0\n\
-	.align 2, 0\n\
+    lsls r0, 2\n\
+    ldr r1, _080EEA30 @ =_080EEA34\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
 _080EEA28: .4byte gSharedMem\n\
 _080EEA2C: .4byte 0x00006e16\n\
 _080EEA30: .4byte _080EEA34\n\
-	.align 2, 0\n\
+    .align 2, 0\n\
 _080EEA34:\n\
-	.4byte _080EEA58\n\
-	.4byte _080EEA98\n\
-	.4byte _080EEAAE\n\
-	.4byte _080EEAD4\n\
-	.4byte _080EEB3E\n\
-	.4byte _080EEB68\n\
-	.4byte _080EEB88\n\
-	.4byte _080EEBAC\n\
-	.4byte _080EEBE4\n\
+    .4byte _080EEA58\n\
+    .4byte _080EEA98\n\
+    .4byte _080EEAAE\n\
+    .4byte _080EEAD4\n\
+    .4byte _080EEB3E\n\
+    .4byte _080EEB68\n\
+    .4byte _080EEB88\n\
+    .4byte _080EEBAC\n\
+    .4byte _080EEBE4\n\
 _080EEA58:\n\
-	bl sub_80F1F10\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080EEA64\n\
-	b _080EEC08\n\
+    bl sub_80F1F10\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080EEA64\n\
+    b _080EEC08\n\
 _080EEA64:\n\
-	ldr r1, _080EEA7C @ =gSharedMem\n\
-	ldr r4, _080EEA80 @ =0x00006e17\n\
-	adds r0, r1, r4\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0xC\n\
-	beq _080EEA88\n\
-	ldr r0, _080EEA84 @ =0x00006e16\n\
-	adds r1, r0\n\
-	movs r0, 0x1\n\
-	strb r0, [r1]\n\
-	b _080EEC08\n\
-	.align 2, 0\n\
+    ldr r1, _080EEA7C @ =gSharedMem\n\
+    ldr r4, _080EEA80 @ =0x00006e17\n\
+    adds r0, r1, r4\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0xC\n\
+    beq _080EEA88\n\
+    ldr r0, _080EEA84 @ =0x00006e16\n\
+    adds r1, r0\n\
+    movs r0, 0x1\n\
+    strb r0, [r1]\n\
+    b _080EEC08\n\
+    .align 2, 0\n\
 _080EEA7C: .4byte gSharedMem\n\
 _080EEA80: .4byte 0x00006e17\n\
 _080EEA84: .4byte 0x00006e16\n\
 _080EEA88:\n\
-	ldr r2, _080EEA94 @ =0x00006e16\n\
-	adds r1, r2\n\
-	movs r0, 0x3\n\
-	strb r0, [r1]\n\
-	b _080EEC08\n\
-	.align 2, 0\n\
+    ldr r2, _080EEA94 @ =0x00006e16\n\
+    adds r1, r2\n\
+    movs r0, 0x3\n\
+    strb r0, [r1]\n\
+    b _080EEC08\n\
+    .align 2, 0\n\
 _080EEA94: .4byte 0x00006e16\n\
 _080EEA98:\n\
-	ldr r4, _080EEAC8 @ =gSharedMem\n\
-	ldr r1, _080EEACC @ =0x00006e17\n\
-	adds r0, r4, r1\n\
-	ldrb r0, [r0]\n\
-	bl sub_80F2C80\n\
-	ldr r2, _080EEAD0 @ =0x00006e16\n\
-	adds r4, r2\n\
-	ldrb r0, [r4]\n\
-	adds r0, 0x1\n\
-	strb r0, [r4]\n\
+    ldr r4, _080EEAC8 @ =gSharedMem\n\
+    ldr r1, _080EEACC @ =0x00006e17\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    bl sub_80F2C80\n\
+    ldr r2, _080EEAD0 @ =0x00006e16\n\
+    adds r4, r2\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
 _080EEAAE:\n\
-	ldr r4, _080EEAC8 @ =gSharedMem\n\
-	ldr r1, _080EEACC @ =0x00006e17\n\
-	adds r0, r4, r1\n\
-	ldrb r0, [r0]\n\
-	bl sub_80F2CBC\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080EEAC2\n\
-	b _080EEC08\n\
+    ldr r4, _080EEAC8 @ =gSharedMem\n\
+    ldr r1, _080EEACC @ =0x00006e17\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    bl sub_80F2CBC\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080EEAC2\n\
+    b _080EEC08\n\
 _080EEAC2:\n\
-	ldr r2, _080EEAD0 @ =0x00006e16\n\
-	adds r1, r4, r2\n\
-	b _080EEB76\n\
-	.align 2, 0\n\
+    ldr r2, _080EEAD0 @ =0x00006e16\n\
+    adds r1, r4, r2\n\
+    b _080EEB76\n\
+    .align 2, 0\n\
 _080EEAC8: .4byte gSharedMem\n\
 _080EEACC: .4byte 0x00006e17\n\
 _080EEAD0: .4byte 0x00006e16\n\
 _080EEAD4:\n\
-	adds r2, r3, 0\n\
-	ldr r4, _080EEAF8 @ =0x00006e15\n\
-	adds r0, r2, r4\n\
-	ldrb r1, [r0]\n\
-	subs r4, 0x68\n\
-	adds r0, r2, r4\n\
-	strb r1, [r0]\n\
-	ldr r1, _080EEAFC @ =0x00006e14\n\
-	adds r0, r2, r1\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0x1\n\
-	beq _080EEB14\n\
-	cmp r0, 0x1\n\
-	bgt _080EEB00\n\
-	cmp r0, 0\n\
-	beq _080EEB06\n\
-	b _080EEB28\n\
-	.align 2, 0\n\
+    adds r2, r3, 0\n\
+    ldr r4, _080EEAF8 @ =0x00006e15\n\
+    adds r0, r2, r4\n\
+    ldrb r1, [r0]\n\
+    subs r4, 0x68\n\
+    adds r0, r2, r4\n\
+    strb r1, [r0]\n\
+    ldr r1, _080EEAFC @ =0x00006e14\n\
+    adds r0, r2, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x1\n\
+    beq _080EEB14\n\
+    cmp r0, 0x1\n\
+    bgt _080EEB00\n\
+    cmp r0, 0\n\
+    beq _080EEB06\n\
+    b _080EEB28\n\
+    .align 2, 0\n\
 _080EEAF8: .4byte 0x00006e15\n\
 _080EEAFC: .4byte 0x00006e14\n\
 _080EEB00:\n\
-	cmp r0, 0x2\n\
-	beq _080EEB20\n\
-	b _080EEB28\n\
+    cmp r0, 0x2\n\
+    beq _080EEB20\n\
+    b _080EEB28\n\
 _080EEB06:\n\
-	ldr r4, _080EEB10 @ =0x00006dae\n\
-	adds r1, r2, r4\n\
-	movs r0, 0x5\n\
-	b _080EEB26\n\
-	.align 2, 0\n\
+    ldr r4, _080EEB10 @ =0x00006dae\n\
+    adds r1, r2, r4\n\
+    movs r0, 0x5\n\
+    b _080EEB26\n\
+    .align 2, 0\n\
 _080EEB10: .4byte 0x00006dae\n\
 _080EEB14:\n\
-	ldr r0, _080EEB1C @ =0x00006dae\n\
-	adds r1, r2, r0\n\
-	movs r0, 0x3\n\
-	b _080EEB26\n\
-	.align 2, 0\n\
+    ldr r0, _080EEB1C @ =0x00006dae\n\
+    adds r1, r2, r0\n\
+    movs r0, 0x3\n\
+    b _080EEB26\n\
+    .align 2, 0\n\
 _080EEB1C: .4byte 0x00006dae\n\
 _080EEB20:\n\
-	ldr r2, _080EEB58 @ =0x00006dae\n\
-	adds r1, r3, r2\n\
-	movs r0, 0x6\n\
+    ldr r2, _080EEB58 @ =0x00006dae\n\
+    adds r1, r3, r2\n\
+    movs r0, 0x6\n\
 _080EEB26:\n\
-	strb r0, [r1]\n\
+    strb r0, [r1]\n\
 _080EEB28:\n\
-	ldr r4, _080EEB5C @ =gSharedMem\n\
-	ldr r1, _080EEB60 @ =0x00006e14\n\
-	adds r0, r4, r1\n\
-	ldrb r0, [r0]\n\
-	bl sub_80F1B8C\n\
-	ldr r2, _080EEB64 @ =0x00006e16\n\
-	adds r4, r2\n\
-	ldrb r0, [r4]\n\
-	adds r0, 0x1\n\
-	strb r0, [r4]\n\
+    ldr r4, _080EEB5C @ =gSharedMem\n\
+    ldr r1, _080EEB60 @ =0x00006e14\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    bl sub_80F1B8C\n\
+    ldr r2, _080EEB64 @ =0x00006e16\n\
+    adds r4, r2\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
 _080EEB3E:\n\
-	ldr r4, _080EEB5C @ =gSharedMem\n\
-	ldr r1, _080EEB60 @ =0x00006e14\n\
-	adds r0, r4, r1\n\
-	ldrb r0, [r0]\n\
-	bl sub_80F1BC8\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	bne _080EEC08\n\
-	ldr r2, _080EEB64 @ =0x00006e16\n\
-	adds r1, r4, r2\n\
-	b _080EEB76\n\
-	.align 2, 0\n\
+    ldr r4, _080EEB5C @ =gSharedMem\n\
+    ldr r1, _080EEB60 @ =0x00006e14\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    bl sub_80F1BC8\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080EEC08\n\
+    ldr r2, _080EEB64 @ =0x00006e16\n\
+    adds r1, r4, r2\n\
+    b _080EEB76\n\
+    .align 2, 0\n\
 _080EEB58: .4byte 0x00006dae\n\
 _080EEB5C: .4byte gSharedMem\n\
 _080EEB60: .4byte 0x00006e14\n\
 _080EEB64: .4byte 0x00006e16\n\
 _080EEB68:\n\
-	bl sub_8055870\n\
-	cmp r0, 0\n\
-	bne _080EEC08\n\
-	ldr r1, _080EEB80 @ =gSharedMem\n\
-	ldr r4, _080EEB84 @ =0x00006e16\n\
-	adds r1, r4\n\
+    bl sub_8055870\n\
+    cmp r0, 0\n\
+    bne _080EEC08\n\
+    ldr r1, _080EEB80 @ =gSharedMem\n\
+    ldr r4, _080EEB84 @ =0x00006e16\n\
+    adds r1, r4\n\
 _080EEB76:\n\
-	ldrb r0, [r1]\n\
-	adds r0, 0x1\n\
-	strb r0, [r1]\n\
-	b _080EEC08\n\
-	.align 2, 0\n\
+    ldrb r0, [r1]\n\
+    adds r0, 0x1\n\
+    strb r0, [r1]\n\
+    b _080EEC08\n\
+    .align 2, 0\n\
 _080EEB80: .4byte gSharedMem\n\
 _080EEB84: .4byte 0x00006e16\n\
 _080EEB88:\n\
-	bl sub_80F1DF0\n\
-	ldr r4, _080EEBA0 @ =gSharedMem\n\
-	ldr r1, _080EEBA4 @ =0x00006e14\n\
-	adds r0, r4, r1\n\
-	ldrb r0, [r0]\n\
-	bl sub_80EF490\n\
-	ldr r2, _080EEBA8 @ =0x00006e16\n\
-	adds r4, r2\n\
-	b _080EEBCC\n\
-	.align 2, 0\n\
+    bl sub_80F1DF0\n\
+    ldr r4, _080EEBA0 @ =gSharedMem\n\
+    ldr r1, _080EEBA4 @ =0x00006e14\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    bl sub_80EF490\n\
+    ldr r2, _080EEBA8 @ =0x00006e16\n\
+    adds r4, r2\n\
+    b _080EEBCC\n\
+    .align 2, 0\n\
 _080EEBA0: .4byte gSharedMem\n\
 _080EEBA4: .4byte 0x00006e14\n\
 _080EEBA8: .4byte 0x00006e16\n\
 _080EEBAC:\n\
-	bl sub_80F1E50\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	bne _080EEC08\n\
-	ldr r4, _080EEBD4 @ =gSharedMem\n\
-	ldr r1, _080EEBD8 @ =0x00006e14\n\
-	adds r0, r4, r1\n\
-	ldrb r0, [r0]\n\
-	ldr r2, _080EEBDC @ =0x00006dad\n\
-	adds r1, r4, r2\n\
-	ldrb r1, [r1]\n\
-	bl sub_80EF428\n\
-	ldr r0, _080EEBE0 @ =0x00006e16\n\
-	adds r4, r0\n\
+    bl sub_80F1E50\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080EEC08\n\
+    ldr r4, _080EEBD4 @ =gSharedMem\n\
+    ldr r1, _080EEBD8 @ =0x00006e14\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    ldr r2, _080EEBDC @ =0x00006dad\n\
+    adds r1, r4, r2\n\
+    ldrb r1, [r1]\n\
+    bl sub_80EF428\n\
+    ldr r0, _080EEBE0 @ =0x00006e16\n\
+    adds r4, r0\n\
 _080EEBCC:\n\
-	ldrb r0, [r4]\n\
-	adds r0, 0x1\n\
-	strb r0, [r4]\n\
-	b _080EEC08\n\
-	.align 2, 0\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    b _080EEC08\n\
+    .align 2, 0\n\
 _080EEBD4: .4byte gSharedMem\n\
 _080EEBD8: .4byte 0x00006e14\n\
 _080EEBDC: .4byte 0x00006dad\n\
 _080EEBE0: .4byte 0x00006e16\n\
 _080EEBE4:\n\
-	bl sub_80EF4F8\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	bne _080EEC08\n\
-	ldr r1, _080EEC00 @ =gSharedMem\n\
-	ldr r2, _080EEC04 @ =0x00006e16\n\
-	adds r1, r2\n\
-	ldrb r0, [r1]\n\
-	adds r0, 0x1\n\
-	strb r0, [r1]\n\
+    bl sub_80EF4F8\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080EEC08\n\
+    ldr r1, _080EEC00 @ =gSharedMem\n\
+    ldr r2, _080EEC04 @ =0x00006e16\n\
+    adds r1, r2\n\
+    ldrb r0, [r1]\n\
+    adds r0, 0x1\n\
+    strb r0, [r1]\n\
 _080EEBFA:\n\
-	movs r0, 0\n\
-	b _080EEC0A\n\
-	.align 2, 0\n\
+    movs r0, 0\n\
+    b _080EEC0A\n\
+    .align 2, 0\n\
 _080EEC00: .4byte gSharedMem\n\
 _080EEC04: .4byte 0x00006e16\n\
 _080EEC08:\n\
-	movs r0, 0x1\n\
+    movs r0, 0x1\n\
 _080EEC0A:\n\
-	pop {r4}\n\
-	pop {r1}\n\
-	bx r1\n"
+    pop {r4}\n\
+    pop {r1}\n\
+    bx r1\n"
 
-	);
+    );
 }
 #endif
 
 // var6dad and var6dae must be s8 in this func
-bool8 sub_80EEC10() {
-	if (gMain.newKeys & 0x40) {
-		do {
-			if (--ewram0_11.var6dad < 0) {
-				ewram0_11.var6dad = ewram0_11.var6dae - 1;
-			}
-
-		} while (!ewram0_10.var6db2[ewram0_11.var6dad]);
-		return 1;
-	}
-	if (gMain.newKeys & 0x80) {
-		do {
-			if (++ewram0_11.var6dad >= ewram0_11.var6dae) {
-				ewram0_11.var6dad = 0;
-			}
-		} while (!ewram0_10.var6db2[ewram0_11.var6dad]);
-		return 1;
-	}
-	return 0;
+bool8 sub_80EEC10()
+{
+    if (gMain.newKeys & 0x40)
+    {
+        do
+        {
+            if (--ewram0_11.var6dad < 0)
+                ewram0_11.var6dad = ewram0_11.var6dae - 1;
+        } while (!ewram0_10.var6db2[ewram0_11.var6dad]);
+        return TRUE;
+    }
+    if (gMain.newKeys & 0x80)
+    {
+        do
+        {
+            if (++ewram0_11.var6dad >= ewram0_11.var6dae)
+                ewram0_11.var6dad = 0;
+        } while (!ewram0_10.var6db2[ewram0_11.var6dad]);
+        return TRUE;
+    }
+    return FALSE;
 }
 
-bool8 sub_80EEC90() {
-	if (gMain.newKeys & 0x40) {
-		if (--ewram0_11.var6dad < 0) {
-			ewram0_11.var6dad = ewram0_11.var6dae - 1;
-		}
-		return 1;
-	}
-	if (gMain.newKeys & 0x80) {
-		if (++ewram0_11.var6dad >= ewram0_11.var6dae) {
-			ewram0_11.var6dad = 0;
-		}
-		return 1;
-	}
-	return 0;
+bool8 sub_80EEC90()
+{
+    if (gMain.newKeys & 0x40)
+    {
+        if (--ewram0_11.var6dad < 0)
+            ewram0_11.var6dad = ewram0_11.var6dae - 1;
+        return TRUE;
+    }
+    if (gMain.newKeys & 0x80)
+    {
+        if (++ewram0_11.var6dad >= ewram0_11.var6dae)
+            ewram0_11.var6dad = 0;
+        return TRUE;
+    }
+    return FALSE;
 }
 
-void sub_80EED0C() {
-	REG_DISPCNT = 512;
+void sub_80EED0C()
+{
+    REG_DISPCNT = 512;
 }
 
-void sub_80EED1C() {
-	REG_DISPCNT = 0x92 << 5;
+void sub_80EED1C()
+{
+    REG_DISPCNT = 0x92 << 5;
 }
 
-void sub_80EED2C(u8 param1) {
-	switch (param1) {
-	case 0:
-		REG_DISPCNT = 0xFA << 5;
-		break;
-	case 1:
-		REG_DISPCNT = 0x1741;
-		break;
-	case 3:
-	case 4:
-		REG_DISPCNT = 0xFA << 5;
-		break;
-	case 2:
-		REG_DISPCNT = 0x7b40;
-		break;
-	case 5:
-		REG_DISPCNT = 0xFD << 6;
-		break;
-	}
+void sub_80EED2C(u8 param1)
+{
+    switch (param1) {
+    case 0:
+        REG_DISPCNT = 0xFA << 5;
+        break;
+    case 1:
+        REG_DISPCNT = 0x1741;
+        break;
+    case 3:
+    case 4:
+        REG_DISPCNT = 0xFA << 5;
+        break;
+    case 2:
+        REG_DISPCNT = 0x7b40;
+        break;
+    case 5:
+        REG_DISPCNT = 0xFD << 6;
+        break;
+    }
 }
 
-void sub_80EED9C(void) {
-	gUnknown_03000744 = ewram0_10.var300;
-	ewram0_10.var300 = &sub_80EEDC4;
-	ewram0_10.var300();
+void sub_80EED9C(void)
+{
+    gUnknown_03000744 = ewram0_10.var300;
+    ewram0_10.var300 = &sub_80EEDC4;
+    ewram0_10.var300();
 }
 
-void sub_80EEDC4(void) {
-	if (sub_8055870() != 0x1) {
-		ewram0_10.var300 = gUnknown_03000744;
-	}
+void sub_80EEDC4(void)
+{
+    if (sub_8055870() != 0x1)
+        ewram0_10.var300 = gUnknown_03000744;
 }
 
-void sub_80EEDE8(void) {
-	REG_BG0HOFS = 0;
-	REG_BG0VOFS = 0;
-	REG_BG2VOFS = 0;
-	REG_BG2HOFS = 0;
-	REG_BG3HOFS = 0;
-	REG_BG3VOFS = 0;
+void sub_80EEDE8(void)
+{
+    REG_BG0HOFS = 0;
+    REG_BG0VOFS = 0;
+    REG_BG2VOFS = 0;
+    REG_BG2HOFS = 0;
+    REG_BG3HOFS = 0;
+    REG_BG3VOFS = 0;
 }
 
-void sub_80EEE08(void) {
-	gUnknown_083DFEC4->unkD160 = 0;
+void sub_80EEE08(void)
+{
+    gUnknown_083DFEC4->unkD160 = 0;
 }
 
-void sub_80EEE20(void) {
-	gUnknown_083DFEC4->unkD160 = 0;
-	if (!gUnknown_083DFEC4->unk6DAC) {
-		while (sub_80EEE54());
-	}
+void sub_80EEE20(void)
+{
+    gUnknown_083DFEC4->unkD160 = 0;
+    if (!gUnknown_083DFEC4->unk6DAC)
+    {
+        while (sub_80EEE54())
+			;
+    }
 }
 
-bool8 sub_80EEE54(void) {
-	switch (gUnknown_083DFEC4->unkD160) {
-	case 0:
-		LZ77UnCompVram(gPokenavHoennMapMisc_Gfx, (void *)VRAM + 0xC000);
-		break;
-	case 1:
-		LZ77UnCompVram(gUnknown_08E99FB0, (void *)VRAM + 0xD800);
-		break;
-	case 2:
-		LoadPalette(gPokenavHoennMap1_Pal, 0x10, 0x20);
-		break;
-	case 3:
-		sub_80EF58C(0);
-		sub_80EF58C(1);
-		sub_80EF58C(2);
-		break;
-	case 4:
-		gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0;
-		REG_BG1HOFS = 0;
-		REG_BG1VOFS = 0;
-		REG_BG1CNT = 0x1B0C;
-		gUnknown_083DFEC4->unkD160++;
-	default:
-		return 0;
-	}
-	gUnknown_083DFEC4->unkD160++;
-	return 1;
+bool8 sub_80EEE54(void)
+{
+    switch (gUnknown_083DFEC4->unkD160)
+    {
+    case 0:
+        LZ77UnCompVram(gPokenavHoennMapMisc_Gfx, (void *)VRAM + 0xC000);
+        break;
+    case 1:
+        LZ77UnCompVram(gUnknown_08E99FB0, (void *)VRAM + 0xD800);
+        break;
+    case 2:
+        LoadPalette(gPokenavHoennMap1_Pal, 0x10, 0x20);
+        break;
+    case 3:
+        sub_80EF58C(0);
+        sub_80EF58C(1);
+        sub_80EF58C(2);
+        break;
+    case 4:
+        gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0;
+        REG_BG1HOFS = 0;
+        REG_BG1VOFS = 0;
+        REG_BG1CNT = 0x1B0C;
+        gUnknown_083DFEC4->unkD160++;
+    default:
+        return FALSE;
+    }
+    gUnknown_083DFEC4->unkD160++;
+    return TRUE;
 }
 
-bool8 sub_80EEF34(void) {
-	bool8 retVal = TRUE;
+bool8 sub_80EEF34(void)
+{
+    bool8 retVal = TRUE;
 
-	if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 32)
-	{
-		return FALSE;
-	}
+    if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 32)
+        return FALSE;
 
-	gUnknown_083DFEC4->unk030C.unk030C.unk0 += 2;
-	if (gUnknown_083DFEC4->unk030C.unk030C.unk0 > 31)
-	{
-		gUnknown_083DFEC4->unk030C.unk030C.unk0 = 32;
-		retVal = FALSE;
-	}
+    gUnknown_083DFEC4->unk030C.unk030C.unk0 += 2;
+    if (gUnknown_083DFEC4->unk030C.unk030C.unk0 > 31)
+    {
+        gUnknown_083DFEC4->unk030C.unk030C.unk0 = 32;
+        retVal = FALSE;
+    }
 
-	REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0;
-	return retVal;
+    REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0;
+    return retVal;
 }
 
 bool8 sub_80EEF78(void)
 {
-	bool8 retVal = TRUE;
-
-	if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 0)
-	{
-		return FALSE;
-	}
-
-	gUnknown_083DFEC4->unk030C.unk030C.unk0 -= 2;
-	if (gUnknown_083DFEC4->unk030C.unk030C.unk0 <= 0)
-	{
-		gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0;
-		retVal = FALSE;
-	}
-
-	REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0;
-	return retVal;
+    bool8 retVal = TRUE;
+
+    if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 0)
+        return FALSE;
+
+    gUnknown_083DFEC4->unk030C.unk030C.unk0 -= 2;
+    if (gUnknown_083DFEC4->unk030C.unk030C.unk0 <= 0)
+    {
+        gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0;
+        retVal = FALSE;
+    }
+
+    REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0;
+    return retVal;
 }
 
 void sub_80EEFBC(u8 a)
 {
-	u8 var1;
+    u8 var1;
 
-	sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 0, 17, 2);
+    sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 0, 17, 2);
 
-	switch (a)
-	{
-	case 0:
-		sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 17, 0, 10, 2);
-		sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		break;
-	case 11:
-		sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		break;
-	case 2:
-		var1 = gUnknown_083DFEC4->unk6DAC;
-		if (!var1)
-		{
-			sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 2, 10, 2);
-			sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, var1, 6, 7, 2);
-		}
-		else
-		{
-			sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		}
-		break;
-	case 3:
-		sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 4, 10, 2);
-		sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		break;
-	case 4:
-		sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 20, 2, 10, 2);
-		sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		break;
-	case 7:
-		sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 4, 10, 2);
-		sub_809D104((void *)VRAM + 0xD800, 7, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		break;
-	case 8:
-		sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 20, 4, 10, 2);
-		sub_809D104((void *)VRAM + 0xD800, 7, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		break;
-	case 5:
-	case 9:
-		sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 2, 10, 2);
-		sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		break;
-	case 10:
-		sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2);
-		break;
-	}
+    switch (a)
+    {
+    case 0:
+        sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 17, 0, 10, 2);
+        sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        break;
+    case 11:
+        sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        break;
+    case 2:
+        var1 = gUnknown_083DFEC4->unk6DAC;
+        if (!var1)
+        {
+            sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 2, 10, 2);
+            sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, var1, 6, 7, 2);
+        }
+        else
+        {
+            sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        }
+        break;
+    case 3:
+        sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 4, 10, 2);
+        sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        break;
+    case 4:
+        sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 20, 2, 10, 2);
+        sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        break;
+    case 7:
+        sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 4, 10, 2);
+        sub_809D104((void *)VRAM + 0xD800, 7, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        break;
+    case 8:
+        sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 20, 4, 10, 2);
+        sub_809D104((void *)VRAM + 0xD800, 7, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        break;
+    case 5:
+    case 9:
+        sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 2, 10, 2);
+        sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        break;
+    case 10:
+        sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2);
+        break;
+    }
 }
 
 void sub_80EF248(u8 a)
 {
-	gUnknown_083DFEC4->unkD160 = 0;
+    gUnknown_083DFEC4->unkD160 = 0;
 
-	if (!gUnknown_083DFEC4->unk6DAC)
-	{
-		while (sub_80EF284(a));
-	}
+    if (!gUnknown_083DFEC4->unk6DAC)
+    {
+        while (sub_80EF284(a))
+			;
+    }
 }
 
 bool8 sub_80EF284(u8 a)
 {
-	switch (gUnknown_083DFEC4->unkD160)
-	{
-	case 0:
-		sub_80EEDE8();
-		break;
-	case 1:
-		SetUpWindowConfig(&gWindowConfig_81E7224);
-		break;
-	case 2:
-		MultistepInitMenuWindowBegin(&gWindowConfig_81E7224);
-		break;
-	case 3:
-		if (!MultistepInitMenuWindowContinue())
-		{
-			return TRUE;
-		}
-		break;
-	case 4:
-		DmaCopy16Defvars(3, gUnknown_083DFEEC, (void *)VRAM + 0x5000, 0xA0);
-		break;
-	case 5:
-		LZ77UnCompVram(gUnknown_083DFF8C, (void *)VRAM + 0xF800);
-		break;
-	case 6:
-		DmaCopy16Defvars(3, gUnknown_083E005C, (void *)VRAM + 0x8000, 0x20);
-		break;
-	case 7:
-		LZ77UnCompVram(gUnknown_083E007C, (void *)VRAM + 0xE000);
-		break;
-	case 8:
-		LZ77UnCompVram(gPokenavOutlineTilemap, (void *)VRAM + 0xE800);
-		break;
-	case 9:
-		LZ77UnCompVram(gPokenavOutlineTiles, (void *)VRAM + 0x8020);
-		break;
-	case 10:
-		sub_80EF54C(a);
-		LoadPalette(gUnknown_083DFECC, 0xF0, 0x20);
-		LoadPalette(gPokenavOutlinePalette, 0x40, 0x20);
-		sub_80EF7D4();
-		break;
-	case 11:
-		REG_BG0CNT = 0x1F01;
-		REG_BG2CNT = 0x1D0A;
-		REG_BG3CNT = 0x1C0B;
-		REG_BLDCNT = 0;
-
-		gUnknown_083DFEC4->unkD160++;
-		return FALSE;
-	default:
-		return FALSE;
-	}
-
-	gUnknown_083DFEC4->unkD160++;
-	return TRUE;
+    switch (gUnknown_083DFEC4->unkD160)
+    {
+    case 0:
+        sub_80EEDE8();
+        break;
+    case 1:
+        SetUpWindowConfig(&gWindowConfig_81E7224);
+        break;
+    case 2:
+        MultistepInitMenuWindowBegin(&gWindowConfig_81E7224);
+        break;
+    case 3:
+        if (!MultistepInitMenuWindowContinue())
+            return TRUE;
+        break;
+    case 4:
+        DmaCopy16Defvars(3, gUnknown_083DFEEC, (void *)VRAM + 0x5000, 0xA0);
+        break;
+    case 5:
+        LZ77UnCompVram(gUnknown_083DFF8C, (void *)VRAM + 0xF800);
+        break;
+    case 6:
+        DmaCopy16Defvars(3, gUnknown_083E005C, (void *)VRAM + 0x8000, 0x20);
+        break;
+    case 7:
+        LZ77UnCompVram(gUnknown_083E007C, (void *)VRAM + 0xE000);
+        break;
+    case 8:
+        LZ77UnCompVram(gPokenavOutlineTilemap, (void *)VRAM + 0xE800);
+        break;
+    case 9:
+        LZ77UnCompVram(gPokenavOutlineTiles, (void *)VRAM + 0x8020);
+        break;
+    case 10:
+        sub_80EF54C(a);
+        LoadPalette(gUnknown_083DFECC, 0xF0, 0x20);
+        LoadPalette(gPokenavOutlinePalette, 0x40, 0x20);
+        sub_80EF7D4();
+        break;
+    case 11:
+        REG_BG0CNT = 0x1F01;
+        REG_BG2CNT = 0x1D0A;
+        REG_BG3CNT = 0x1C0B;
+        REG_BLDCNT = 0;
+
+        gUnknown_083DFEC4->unkD160++;
+        return FALSE;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unkD160++;
+    return TRUE;
 }
 
 void sub_80EF428(u8 a, u8 b)
 {
-	u8 *tileBuffer;
-	const u8 *pcText = 0;
+    u8 *tileBuffer;
+    const u8 *pcText = 0;
 
-	switch (a)
-	{
-	case 0:
-		pcText = gUnknown_083E31B0[b];
-		break;
-	case 1:
-		pcText = gUnknown_083E31CC[b];
-		break;
-	case 2:
-		pcText = gUnknown_083E31D8[b];
-		break;
-	}
+    switch (a)
+    {
+    case 0:
+        pcText = gUnknown_083E31B0[b];
+        break;
+    case 1:
+        pcText = gUnknown_083E31CC[b];
+        break;
+    case 2:
+        pcText = gUnknown_083E31D8[b];
+        break;
+    }
 
-	tileBuffer = gUnknown_083DFEC8;
-	sub_8072C74(&tileBuffer[0x800], pcText, 0xC0, 2);
-	MenuPrint(&tileBuffer[0x800], 3, 17);
+    tileBuffer = gUnknown_083DFEC8;
+    sub_8072C74(&tileBuffer[0x800], pcText, 0xC0, 2);
+    MenuPrint(&tileBuffer[0x800], 3, 17);
 }
 
 void sub_80EF490(u8 a)
 {
-	u16 var1, var2;
-
-	if (a == 2)
-	{
-		a = 1;
-	}
-
-	gUnknown_083DFEC4->unkCE4E = a * 30;
-	var1 = gUnknown_083DFEC4->unkCE4C;
-	var2 = a * 30;
-	if (var1 < var2)
-	{
-		gUnknown_083DFEC4->unkCE50 = 2;
-	}
-	else if (var1 > var2)
-	{
-		gUnknown_083DFEC4->unkCE50 = -2;
-	}
-	else
-	{
-		gUnknown_083DFEC4->unkCE50 = 0;
-	}
+    u16 var1, var2;
+
+    if (a == 2)
+        a = 1;
+
+    gUnknown_083DFEC4->unkCE4E = a * 30;
+    var1 = gUnknown_083DFEC4->unkCE4C;
+    var2 = a * 30;
+    if (var1 < var2)
+        gUnknown_083DFEC4->unkCE50 = 2;
+    else if (var1 > var2)
+        gUnknown_083DFEC4->unkCE50 = -2;
+    else
+        gUnknown_083DFEC4->unkCE50 = 0;
 }
 
 bool8 sub_80EF4F8(void)
 {
-	u16 *palettes;
+    u16 *palettes;
 
-	if (gUnknown_083DFEC4->unkCE4C == gUnknown_083DFEC4->unkCE4E)
-	{
-		return FALSE;
-	}
-	else
-	{
-		gUnknown_083DFEC4->unkCE4C = gUnknown_083DFEC4->unkCE50 + gUnknown_083DFEC4->unkCE4C;
+    if (gUnknown_083DFEC4->unkCE4C == gUnknown_083DFEC4->unkCE4E)
+    {
+        return FALSE;
+    }
+    else
+    {
+        gUnknown_083DFEC4->unkCE4C = gUnknown_083DFEC4->unkCE50 + gUnknown_083DFEC4->unkCE4C;
 
-		palettes = gUnknown_083DFEC4->palettesCE52;
-		LoadPalette(&palettes[gUnknown_083DFEC4->unkCE4C], 0x31, 4);
-		return TRUE;
-	}
+        palettes = gUnknown_083DFEC4->palettesCE52;
+        LoadPalette(&palettes[gUnknown_083DFEC4->unkCE4C], 0x31, 4);
+        return TRUE;
+    }
 
 }
 
 void sub_80EF54C(u8 a)
 {
-	if (a == 2)
-	{
-		a = 1;
-	}
+    if (a == 2)
+        a = 1;
 
-	gUnknown_083DFEC4->unkCE4C = a * 30;
-	LoadPalette(&gUnknown_083DFEC4->palettesCE52[gUnknown_083DFEC4->unkCE4C], 0x31, 4);
+    gUnknown_083DFEC4->unkCE4C = a * 30;
+    LoadPalette(&gUnknown_083DFEC4->palettesCE52[gUnknown_083DFEC4->unkCE4C], 0x31, 4);
 }
 
 void sub_80EF58C(u8 a)
 {
-	u16 i;
-	u16 * palettes;
-	const u16 *var1;
-
-	switch (a)
-	{
-	case 0:
-		for (i = 0; i < 62; i++)
-		{
-			gUnknown_083DFEC4->palettesCE52[i] = 0;
-		}
-		break;
-	case 1:
-		palettes = gUnknown_083DFEC4->palettesCE52;
-		var1 = gUnknown_083E003C;
-		sub_80EF624(&var1[1], &var1[3], 16, 2, palettes);
-		break;
-	case 2:
-		palettes = gUnknown_083DFEC4->palettesCE8E;
-		var1 = gUnknown_083E003C;
-		sub_80EF624(&var1[3], &var1[7], 16, 2, palettes);
-		break;
-	}
+    u16 i;
+    u16 * palettes;
+    const u16 *var1;
+
+    switch (a)
+    {
+    case 0:
+        for (i = 0; i < 62; i++)
+            gUnknown_083DFEC4->palettesCE52[i] = 0;
+        break;
+    case 1:
+        palettes = gUnknown_083DFEC4->palettesCE52;
+        var1 = gUnknown_083E003C;
+        sub_80EF624(&var1[1], &var1[3], 16, 2, palettes);
+        break;
+    case 2:
+        palettes = gUnknown_083DFEC4->palettesCE8E;
+        var1 = gUnknown_083E003C;
+        sub_80EF624(&var1[3], &var1[7], 16, 2, palettes);
+        break;
+    }
 }
 
 #ifdef NONMATCHING
 void sub_80EF624(const u16 *a, const u16 *b, u8 c, u8 d, u16 *palettes)
 {
-	u16 red1, green1, blue1;
-	u16 red2, green2, blue2;
-	s32 redDiv, greenDiv, blueDiv;
-	u16 *palettes2;
-	u16 i, j;
-
-	i = 0;
-	while (i < d)
-	{
-		red1 = (*a & 0x1F) << 8;
-		green1 = ((*a >> 5) & 0x1F) << 8;
-		blue1 = ((*a >> 10) & 0x1F) << 8;
-
-		red2 = (*b & 0x1F) << 8;
-		green2 = ((*b >> 5) & 0x1F) << 8;
-		blue2 = ((*b >> 10) & 0x1F) << 8;
-
-		redDiv = (red2 - red1) / c;
-		greenDiv = (green2 - green1) / c;
-		blueDiv = (blue2 - blue1) / c;
-
-		palettes2 = palettes;
-		for (j = 0; j < c - 1; j++)
-		{
-			*palettes2 = (((blue1 << 8) >> 16) << 10) | (((green1 << 8) >> 16) << 5) | ((red1 << 8) >> 16);
-			palettes2 += d;
-			red1 += redDiv;
-			green1 += greenDiv;
-			blue1 += blueDiv;
-		}
+    u16 red1, green1, blue1;
+    u16 red2, green2, blue2;
+    s32 redDiv, greenDiv, blueDiv;
+    u16 *palettes2;
+    u16 i, j;
+
+    i = 0;
+    while (i < d)
+    {
+        red1 = (*a & 0x1F) << 8;
+        green1 = ((*a >> 5) & 0x1F) << 8;
+        blue1 = ((*a >> 10) & 0x1F) << 8;
+
+        red2 = (*b & 0x1F) << 8;
+        green2 = ((*b >> 5) & 0x1F) << 8;
+        blue2 = ((*b >> 10) & 0x1F) << 8;
+
+        redDiv = (red2 - red1) / c;
+        greenDiv = (green2 - green1) / c;
+        blueDiv = (blue2 - blue1) / c;
+
+        palettes2 = palettes;
+        for (j = 0; j < c - 1; j++)
+        {
+            *palettes2 = (((blue1 << 8) >> 16) << 10) | (((green1 << 8) >> 16) << 5) | ((red1 << 8) >> 16);
+            palettes2 += d;
+            red1 += redDiv;
+            green1 += greenDiv;
+            blue1 += blueDiv;
+        }
 
-		*palettes2 = (red2 >> 8) | (blue2 << 2) | (green2 >> 3);
-		palettes++;
+        *palettes2 = (red2 >> 8) | (blue2 << 2) | (green2 >> 3);
+        palettes++;
 
-		a++;
-		b++;
-		i++;
-	}
+        a++;
+        b++;
+        i++;
+    }
 }
 #else
 __attribute__((naked))
@@ -3427,151 +3606,142 @@ _080EF72E:\n\
 
 void sub_80EF740(void)
 {
-	gUnknown_083DFEC4->unk6DA0 = (gUnknown_083DFEC4->unk6DA0 + 1) & 1;
-	if (gUnknown_083DFEC4->unk6DA0)
-	{
-		gUnknown_083DFEC4->unk6DA2++;
-	}
+    gUnknown_083DFEC4->unk6DA0 = (gUnknown_083DFEC4->unk6DA0 + 1) & 1;
+    if (gUnknown_083DFEC4->unk6DA0)
+        gUnknown_083DFEC4->unk6DA2++;
 
-	REG_BG3HOFS = gUnknown_083DFEC4->unk6DA2;
+    REG_BG3HOFS = gUnknown_083DFEC4->unk6DA2;
 }
 
 void sub_80EF780(u8 taskId)
 {
-	if (gTasks[taskId].data[0] == 0 || (gUnknown_083DFEC4->unk6DA2 & 0x7) != 0)
-	{
-		sub_80EF740();
-	}
-	else
-	{
-		u16 value = gUnknown_083DFEC4->unk6DA2 & 0x7;
-		gUnknown_083DFEC4->unk6DA2 = value;
-		gUnknown_083DFEC4->unk6DA0 = value;
-		REG_BG3HOFS = value;
-	}
+    if (gTasks[taskId].data[0] == 0 || (gUnknown_083DFEC4->unk6DA2 & 0x7) != 0)
+    {
+        sub_80EF740();
+    }
+    else
+    {
+        u16 value = gUnknown_083DFEC4->unk6DA2 & 0x7;
+        gUnknown_083DFEC4->unk6DA2 = value;
+        gUnknown_083DFEC4->unk6DA0 = value;
+        REG_BG3HOFS = value;
+    }
 }
 
 void sub_80EF7D4(void)
 {
-	gUnknown_083DFEC4->unk6DA2 = 0;
-	gUnknown_083DFEC4->unk6DA0 = 0;
-	gUnknown_083DFEC4->taskId6DA4 = CreateTask(sub_80EF780, 80);
+    gUnknown_083DFEC4->unk6DA2 = 0;
+    gUnknown_083DFEC4->unk6DA0 = 0;
+    gUnknown_083DFEC4->taskId6DA4 = CreateTask(sub_80EF780, 80);
 }
 
 void sub_80EF814(void)
 {
-	if (FuncIsActiveTask(sub_80EF780))
-	{
-		DestroyTask(gUnknown_083DFEC4->taskId6DA4);
-	}
+    if (FuncIsActiveTask(sub_80EF780))
+        DestroyTask(gUnknown_083DFEC4->taskId6DA4);
 }
 
 void sub_80EF840(void)
 {
-	gUnknown_083DFEC4->unkD160 = 0;
+    gUnknown_083DFEC4->unkD160 = 0;
 
-	if (gUnknown_083DFEC4->unk6DAC == 0)
-	{
-		while (sub_80EF874() != 0);
-	}
+    if (gUnknown_083DFEC4->unk6DAC == 0)
+    {
+        while (sub_80EF874() != 0)
+			;
+    }
 }
 
 bool8 sub_80EF874(void)
 {
-	switch (gUnknown_083DFEC4->unkD160)
-	{
-	case 0:
-		sub_80EEDE8();
-		break;
-	case 1:
-		SetUpWindowConfig(&gWindowConfig_81E7224);
-		break;
-	case 2:
-		MultistepInitMenuWindowBegin(&gWindowConfig_81E7224);
-		break;
-	case 3:
-		if (!MultistepInitMenuWindowContinue())
-		{
-			return TRUE;
-		}
-		break;
-	case 4:
-		MenuZeroFillScreen();
-		break;
-	case 5:
-		sub_80FA904(&gUnknown_083DFEC4->regionMap, gSaveBlock2.regionMapZoom ? TRUE : FALSE);
-		break;
-	case 6:
-		if (sub_80FA940())
-		{
-			return TRUE;
-		}
-		break;
-	case 7:
-		LZ77UnCompVram(gPokenavHoennMapSquares_Gfx, (void *)VRAM + 0x5000);
-		break;
-	case 8:
-		LoadPalette(gPokenavHoennMapSquares_Pal, 0x30, 0x20);
-		sub_80EFC3C();
-		break;
-	case 9:
-		if (sub_80EFC64())
-		{
-			return TRUE;
-		}
-		break;
-	case 10:
-		MenuDrawTextWindow(13, 3, 29, 17);
-		sub_80EF9F8();
-		break;
-	case 11:
-		if (!gUnknown_083DFEC4->regionMap.zoomed)
-		{
-			gUnknown_083DFEC4->unk7698 = 160;
-			REG_BG0VOFS = 160;
-		}
-		else
-		{
-			gUnknown_083DFEC4->unk7698 = 256;
-			REG_BG0VOFS = 0;
-		}
+    switch (gUnknown_083DFEC4->unkD160)
+    {
+    case 0:
+        sub_80EEDE8();
+        break;
+    case 1:
+        SetUpWindowConfig(&gWindowConfig_81E7224);
+        break;
+    case 2:
+        MultistepInitMenuWindowBegin(&gWindowConfig_81E7224);
+        break;
+    case 3:
+        if (!MultistepInitMenuWindowContinue())
+            return TRUE;
+        break;
+    case 4:
+        MenuZeroFillScreen();
+        break;
+    case 5:
+        sub_80FA904(&gUnknown_083DFEC4->regionMap, gSaveBlock2.regionMapZoom ? TRUE : FALSE);
+        break;
+    case 6:
+        if (sub_80FA940())
+            return TRUE;
+        break;
+    case 7:
+        LZ77UnCompVram(gPokenavHoennMapSquares_Gfx, (void *)VRAM + 0x5000);
+        break;
+    case 8:
+        LoadPalette(gPokenavHoennMapSquares_Pal, 0x30, 0x20);
+        sub_80EFC3C();
+        break;
+    case 9:
+        if (sub_80EFC64())
+            return TRUE;
+        break;
+    case 10:
+        MenuDrawTextWindow(13, 3, 29, 17);
+        sub_80EF9F8();
+        break;
+    case 11:
+        if (!gUnknown_083DFEC4->regionMap.zoomed)
+        {
+            gUnknown_083DFEC4->unk7698 = 160;
+            REG_BG0VOFS = 160;
+        }
+        else
+        {
+            gUnknown_083DFEC4->unk7698 = 256;
+            REG_BG0VOFS = 0;
+        }
 
-		REG_BG0CNT = REG_BG0CNT;
-		REG_BG0CNT |= 1;
-		REG_BLDCNT = 0;
-		break;
-	default:
-		return FALSE;
-	}
+        REG_BG0CNT = REG_BG0CNT;
+        REG_BG0CNT |= 1;
+        REG_BLDCNT = 0;
+        break;
+    default:
+        return FALSE;
+    }
 
-	gUnknown_083DFEC4->unkD160++;
-	return TRUE;
+    gUnknown_083DFEC4->unkD160++;
+    return TRUE;
 }
 
 asm(".include \"constants/gba_constants.inc\"\n");
 
 void sub_80EF9F8(void)
 {
-	bool8 someBool = FALSE;
+    bool8 someBool = FALSE;
     u16 top = 4;
-	u16 mapSectionId;
-	u8 b;
+    u16 mapSectionId;
+    u8 b;
 
-	switch (gUnknown_083DFEC4->regionMap.unk16)
-	{
+    switch (gUnknown_083DFEC4->regionMap.unk16)
+    {
     case 0:
         break;
-	case 1:
-	case 4:
-		sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1);
-		top += 2;
-		if (gLinkOpen == TRUE)
-		{
-			sub_80F1A80();
+    case 1:
+    case 4:
+        sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1);
+        top += 2;
+        if (gLinkOpen == TRUE)
+        {
+            sub_80F1A80();
             someBool = TRUE;
-		}
-		else
-		{
+        }
+        else
+        {
             u16 i;
 
             for (i = 0; i < 4; i++)
@@ -3586,99 +3756,95 @@ void sub_80EF9F8(void)
                 sub_8072A18(secName, 0x70, top * 8, 0x78, 1);
                 top += 2;
             }
-		}
-		break;
-	case 2:
-		sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1);
-		top += 2;
-		mapSectionId = gUnknown_083DFEC4->regionMap.mapSectionId;
+        }
+        break;
+    case 2:
+        sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1);
+        top += 2;
+        mapSectionId = gUnknown_083DFEC4->regionMap.mapSectionId;
         b = gUnknown_083DFEC4->regionMap.everGrandeCityArea;
         if (gUnknown_083DFEC4->unkCDCC[mapSectionId][b] != NULL)
-		{
-			MenuFillWindowRectWithBlankTile(14, top, 15, 15);
-			MenuFillWindowRectWithBlankTile(26, top, 28, 15);
-			sub_8095C8C((void *)(VRAM + 0xF800), 16, 6, gUnknown_083DFEC4->unkCDCC[mapSectionId][b], 0, 0, 10, 10, 10);
-			top += 11;
-		}
-		break;
-	case 3:
-		sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1);
-		top += 2;
-		break;
-	}
+        {
+            MenuFillWindowRectWithBlankTile(14, top, 15, 15);
+            MenuFillWindowRectWithBlankTile(26, top, 28, 15);
+            sub_8095C8C((void *)(VRAM + 0xF800), 16, 6, gUnknown_083DFEC4->unkCDCC[mapSectionId][b], 0, 0, 10, 10, 10);
+            top += 11;
+        }
+        break;
+    case 3:
+        sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1);
+        top += 2;
+        break;
+    }
 
     // Epic fail by the compiler at optimizing this.
     if (!someBool && top < 16)
         MenuFillWindowRectWithBlankTile(14, top, 28, 15);
 
-	if (gUnknown_083DFEC4->regionMap.unk16 == 2)
-		sub_80EFD74();
-	else
-		sub_80EFDA0();
+    if (gUnknown_083DFEC4->regionMap.unk16 == 2)
+        sub_80EFD74();
+    else
+        sub_80EFDA0();
 }
 
 void sub_80EFBB0(void)
 {
-	if (!gUnknown_083DFEC4->regionMap.zoomed)
-	{
-		sub_80EEFBC(8);
-	}
-	else
-	{
-		sub_80EEFBC(7);
-	}
+    if (!gUnknown_083DFEC4->regionMap.zoomed)
+        sub_80EEFBC(8);
+    else
+        sub_80EEFBC(7);
 }
 
 bool8 sub_80EFBDC(bool8 a)
 {
-	bool8 retVal = TRUE;
-	u16 var1 = gUnknown_083DFEC4->unk7698;
+    bool8 retVal = TRUE;
+    u16 var1 = gUnknown_083DFEC4->unk7698;
 
-	if (a)
-	{
-		if (var1 > 168)
-		{
-			var1 = var1 - 8;
-		}
-		else
-		{
-			var1 = 160;
-			retVal = FALSE;
-		}
-	}
-	else
-	{
-		if (var1 < 248)
-		{
-			var1 = var1 + 8;
-		}
-		else
-		{
-			var1 = 256;
-			retVal = FALSE;
-		}
-	}
+    if (a)
+    {
+        if (var1 > 168)
+        {
+            var1 = var1 - 8;
+        }
+        else
+        {
+            var1 = 160;
+            retVal = FALSE;
+        }
+    }
+    else
+    {
+        if (var1 < 248)
+        {
+            var1 = var1 + 8;
+        }
+        else
+        {
+            var1 = 256;
+            retVal = FALSE;
+        }
+    }
 
-	gUnknown_083DFEC4->unk7698 = var1;
-	REG_BG0VOFS = var1 & 0xFF;
+    gUnknown_083DFEC4->unk7698 = var1;
+    REG_BG0VOFS = var1 & 0xFF;
 
-	return retVal;
+    return retVal;
 }
 
 void sub_80EFC3C(void)
 {
-	gUnknown_083DFEC4->unkBC9A = 0;
-	gUnknown_083DFEC4->unkBC9B = 0;
-	sub_80EFD3C();
+    gUnknown_083DFEC4->unkBC9A = 0;
+    gUnknown_083DFEC4->unkBC9B = 0;
+    sub_80EFD3C();
 }
 
 bool8 sub_80EFC64(void)
 {
-	u16 i;
-	u8 var1;
-	u16 var2;
+    u16 i;
+    u8 var1;
+    u16 var2;
 
-	if (gUnknown_083DFEC4->unkBC9A >= 16)
+    if (gUnknown_083DFEC4->unkBC9A >= 16)
         return FALSE;
 
     var1 = gUnknown_083DFEC4->unkBC9A;
@@ -3706,345 +3872,330 @@ bool8 sub_80EFC64(void)
 
 void sub_80EFD3C(void)
 {
-	gUnknown_083DFEC4->unk769E = 0;
-	gUnknown_083DFEC4->unk769C = 47;
-	gUnknown_083DFEC4->unk769D = 0;
-	gUnknown_083DFEC4->unk769A = 0;
+    gUnknown_083DFEC4->unk769E = 0;
+    gUnknown_083DFEC4->unk769C = 47;
+    gUnknown_083DFEC4->unk769D = 0;
+    gUnknown_083DFEC4->unk769A = 0;
 }
 
 void sub_80EFD74(void)
 {
-	gUnknown_083DFEC4->unk769E = 1;
-
-	if (gUnknown_083DFEC4->unk769D == 1)
-	{
-		gUnknown_083DFEC4->unk769D = 2;
-	}
+    gUnknown_083DFEC4->unk769E = 1;
+    if (gUnknown_083DFEC4->unk769D == 1)
+        gUnknown_083DFEC4->unk769D = 2;
 }
 
 void sub_80EFDA0(void)
 {
-	sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9AC2C, 0, 0, 15, 1, 15);
-	gUnknown_083DFEC4->unk769E = 0;
+    sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9AC2C, 0, 0, 15, 1, 15);
+    gUnknown_083DFEC4->unk769E = 0;
 }
 
 void sub_80EFDE4(u8 param0)
 {
-	u16 var1 = 60 - gUnknown_083DFEC4->unk769C;
+    u16 var1 = 60 - gUnknown_083DFEC4->unk769C;
 
-	if (var1 > 15)
-	{
-		var1 = 15;
-	}
+    if (var1 > 15)
+        var1 = 15;
 
-	if (gUnknown_083DFEC4->unk769E != 0)
-	{
-		sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9ABB4, gUnknown_083DFEC4->unk769C, 0, var1, 1, 60);
+    if (gUnknown_083DFEC4->unk769E != 0)
+    {
+        sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9ABB4, gUnknown_083DFEC4->unk769C, 0, var1, 1, 60);
 
-		if (var1 < 15)
-		{
-			u16 var2 = var1 + 14;
+        if (var1 < 15)
+        {
+            u16 var2 = var1 + 14;
 
-			sub_8095C8C((void *)VRAM + 0xF800, var2, 16, gUnknown_08E9ABB4, 0, 0, (u16)(15 - var1), 1, 60);
-		}
-	}
+            sub_8095C8C((void *)VRAM + 0xF800, var2, 16, gUnknown_08E9ABB4, 0, 0, (u16)(15 - var1), 1, 60);
+        }
+    }
 }
 
 void sub_80EFE7C(void)
 {
-	u16 var1;
-	u8 var2 = gUnknown_083DFEC4->unk769D;
+    u16 var1;
+    u8 var2 = gUnknown_083DFEC4->unk769D;
 
-	switch (var2)
-	{
-	case 0:
-		var1 = ++gUnknown_083DFEC4->unk769C;
+    switch (var2)
+    {
+    case 0:
+        var1 = ++gUnknown_083DFEC4->unk769C;
 
-		if (var1 > 59)
-		{
-			gUnknown_083DFEC4->unk769C = var2;
-		}
+        if (var1 > 59)
+            gUnknown_083DFEC4->unk769C = var2;
 
-		sub_80EFDE4(gUnknown_083DFEC4->unk769E);
+        sub_80EFDE4(gUnknown_083DFEC4->unk769E);
 
-		switch (gUnknown_083DFEC4->unk769C)
-		{
-		case 0:
-		case 15:
-		case 30:
-		case 45:
-			gUnknown_083DFEC4->unk769D = 1;
-			gUnknown_083DFEC4->unk769A = 0;
-			break;
-		}
-		break;
-	case 1:
-		var1 = ++gUnknown_083DFEC4->unk769A;
-		if (var1 > 120)
-		{
-			gUnknown_083DFEC4->unk769A = 0;
-			gUnknown_083DFEC4->unk769D = 0;
-		}
-		break;
-	case 2:
-		sub_80EFDE4(1);
-		gUnknown_083DFEC4->unk769D = 1;
-		break;
-	}
+        switch (gUnknown_083DFEC4->unk769C)
+        {
+        case 0:
+        case 15:
+        case 30:
+        case 45:
+            gUnknown_083DFEC4->unk769D = 1;
+            gUnknown_083DFEC4->unk769A = 0;
+            break;
+        }
+        break;
+    case 1:
+        var1 = ++gUnknown_083DFEC4->unk769A;
+        if (var1 > 120)
+        {
+            gUnknown_083DFEC4->unk769A = 0;
+            gUnknown_083DFEC4->unk769D = 0;
+        }
+        break;
+    case 2:
+        sub_80EFDE4(1);
+        gUnknown_083DFEC4->unk769D = 1;
+        break;
+    }
 }
 
 void sub_80EFF34(void)
 {
-	gUnknown_083DFEC4->unkD160 = 0;
+    gUnknown_083DFEC4->unkD160 = 0;
 
-	if (gUnknown_083DFEC4->unk6DAC == 0)
-	{
-		while (sub_80EFF68());
-	}
+    if (gUnknown_083DFEC4->unk6DAC == 0)
+    {
+        while (sub_80EFF68())
+			;
+    }
 }
 
 bool8 sub_80EFF68(void)
 {
-	switch (gUnknown_083DFEC4->unkD160)
-	{
-	case 0:
-		sub_80EEDE8();
-		gUnknown_083DFEC4->unkD162[0] = 11;
-		break;
-	case 1:
-		SetUpWindowConfig(&gWindowConfig_81E7080);
-		break;
-	case 2:
-		MultistepInitMenuWindowBegin(&gWindowConfig_81E7080);
-		break;
-	case 3:
-		if (!MultistepInitMenuWindowContinue())
-		{
-			return TRUE;
-		}
-		break;
-	case 4:
-		MenuZeroFillScreen();
-		break;
-	case 5:
-		sub_80F1614();
-		break;
-	case 6:
-		if (sub_80F162C(0))
-		{
-			return TRUE;
-		}
-		break;
-	case 7:
-		LZ77UnCompVram(gPokenavConditionView_Gfx, (void *)VRAM + 0x5000);
-		break;
-	case 8:
-		LZ77UnCompVram(gUnknown_08E9AC4C, (void *)VRAM + 0xF000);
-		LoadPalette(gPokenavConditionMenu2_Pal, 0x20, 0x20);
-		break;
-	case 9:
-		if (gUnknown_083DFEC4->unk76AA == 1)
-		{
-			sub_8095C8C((void *)VRAM + 0xF000, 0, 5, gUnknown_083E01AC, 0, 0, 9, 4, 9);
-		}
-		break;
-	case 10:
-		LZ77UnCompVram(gUnknown_08E9FEB4, (void *)VRAM + 0xB800);
-		break;
-	case 11:
-		LoadPalette(gUnknown_083E0254, 0x30, 0x20);
-		LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20);
-		LoadPalette(&gPokenavConditionMenu2_Pal[2], 0xB1, 0x2);
-		LoadPalette(&gPokenavConditionMenu2_Pal[16], 0xB5, 0x2);
-		LoadPalette(&gPokenavConditionMenu2_Pal[30], 0xBF, 0x2);
-		sub_80F01A4();
-		break;
-	case 12:
-		sub_80F01E0((u16)gUnknown_083DFEC4->unk8fe9);
-		break;
-	case 13:
-		REG_BG3CNT = 0x1E03;
-		REG_BG2CNT = 0x1702;
-		REG_BLDCNT = 0x844;
-		REG_BLDALPHA = 0x40B;
-		break;
-	default:
-		return FALSE;
-	}
+    switch (gUnknown_083DFEC4->unkD160)
+    {
+    case 0:
+        sub_80EEDE8();
+        gUnknown_083DFEC4->unkD162[0] = 11;
+        break;
+    case 1:
+        SetUpWindowConfig(&gWindowConfig_81E7080);
+        break;
+    case 2:
+        MultistepInitMenuWindowBegin(&gWindowConfig_81E7080);
+        break;
+    case 3:
+        if (!MultistepInitMenuWindowContinue())
+            return TRUE;
+        break;
+    case 4:
+        MenuZeroFillScreen();
+        break;
+    case 5:
+        sub_80F1614();
+        break;
+    case 6:
+        if (sub_80F162C(0))
+            return TRUE;
+        break;
+    case 7:
+        LZ77UnCompVram(gPokenavConditionView_Gfx, (void *)VRAM + 0x5000);
+        break;
+    case 8:
+        LZ77UnCompVram(gUnknown_08E9AC4C, (void *)VRAM + 0xF000);
+        LoadPalette(gPokenavConditionMenu2_Pal, 0x20, 0x20);
+        break;
+    case 9:
+        if (gUnknown_083DFEC4->unk76AA == 1)
+            sub_8095C8C((void *)VRAM + 0xF000, 0, 5, gUnknown_083E01AC, 0, 0, 9, 4, 9);
+        break;
+    case 10:
+        LZ77UnCompVram(gUnknown_08E9FEB4, (void *)VRAM + 0xB800);
+        break;
+    case 11:
+        LoadPalette(gUnknown_083E0254, 0x30, 0x20);
+        LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20);
+        LoadPalette(&gPokenavConditionMenu2_Pal[2], 0xB1, 0x2);
+        LoadPalette(&gPokenavConditionMenu2_Pal[16], 0xB5, 0x2);
+        LoadPalette(&gPokenavConditionMenu2_Pal[30], 0xBF, 0x2);
+        sub_80F01A4();
+        break;
+    case 12:
+        sub_80F01E0((u16)gUnknown_083DFEC4->unk8fe9);
+        break;
+    case 13:
+        REG_BG3CNT = 0x1E03;
+        REG_BG2CNT = 0x1702;
+        REG_BLDCNT = 0x844;
+        REG_BLDALPHA = 0x40B;
+        break;
+    default:
+        return FALSE;
+    }
 
-	gUnknown_083DFEC4->unkD160++;
-	return TRUE;
+    gUnknown_083DFEC4->unkD160++;
+    return TRUE;
 }
 
-void sub_80F0174(bool8 a)
+void sub_80F0174(bool8 bg2on)
 {
-	if (a)
-	{
-		REG_DISPCNT |= DISPCNT_BG2_ON;
-	}
-	else
-	{
-		REG_DISPCNT &= ~DISPCNT_BG2_ON;
-	}
+    if (bg2on)
+        REG_DISPCNT |= DISPCNT_BG2_ON;
+    else
+        REG_DISPCNT &= ~DISPCNT_BG2_ON;
 }
 
 void sub_80F01A4(void)
 {
-	REG_WIN0H = WIN_RANGE(0, 240);
-	REG_WIN1H = WIN_RANGE(0, 155);
-	REG_WIN0V = WIN_RANGE(56, 121);
-	REG_WIN1V = WIN_RANGE(56, 121);
-	REG_WININ = 0x3F3F;
-	REG_WINOUT = 0x001B;
+    REG_WIN0H = WIN_RANGE(0, 240);
+    REG_WIN1H = WIN_RANGE(0, 155);
+    REG_WIN0V = WIN_RANGE(56, 121);
+    REG_WIN1V = WIN_RANGE(56, 121);
+    REG_WININ = 0x3F3F;
+    REG_WINOUT = 0x001B;
 }
 
 void sub_80F01E0(u16 a)
 {
-	MenuPrint(gUnknown_083DFEC4->unk8829[a], 13, 1);
-
-	if (gUnknown_083DFEC4->unk76AA == 1)
-	{
-		MenuPrint(gUnknown_083DFEC4->unk88E9[a], 13, 3);
-		sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk2);
-		MenuPrint(gUnknown_083DFEC4->unk8788, 1, 6);
-	}
+    MenuPrint(gUnknown_083DFEC4->unk8829[a], 13, 1);
+
+    if (gUnknown_083DFEC4->unk76AA == 1)
+    {
+        MenuPrint(gUnknown_083DFEC4->unk88E9[a], 13, 3);
+        sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk2);
+        MenuPrint(gUnknown_083DFEC4->unk8788, 1, 6);
+    }
 }
 
 void sub_80F0264(u8 a)
 {
-	gUnknown_083DFEC4->unk306 = 0;
-	gUnknown_083DFEC4->unk87CA = a;
+    gUnknown_083DFEC4->unk306 = 0;
+    gUnknown_083DFEC4->unk87CA = a;
 
-	if (gUnknown_083DFEC4->unk6DAC == 0)
-	{
-		while (sub_80F02A0());
-	}
+    if (gUnknown_083DFEC4->unk6DAC == 0)
+    {
+        while (sub_80F02A0())
+			;
+    }
 }
 
 #ifdef NONMATCHING // small nonmatching part is in the third else clause in case 7.
 bool8 sub_80F02A0(void)
 {
-	const u16 *pointer;
+    const u16 *pointer;
 
-	switch (gUnknown_083DFEC4->unk306)
-	{
-	case 0:
-		sub_80EEDE8();
+    switch (gUnknown_083DFEC4->unk306)
+    {
+    case 0:
+        sub_80EEDE8();
 
-		gUnknown_083DFEC4->unk87C8 = gUnknown_083DFEC4->unk87CA == 1;
-		gUnknown_083DFEC4->unkD162[0] = 11;
-		break;
-	case 1:
-		SetUpWindowConfig(&gWindowConfig_81E70D4);
-		break;
-	case 2:
-		MultistepInitMenuWindowBegin(&gWindowConfig_81E70D4);
-		break;
-	case 3:
-		if (!MultistepInitMenuWindowContinue())
-		{
-			return TRUE;
-		}
-		break;
-	case 4:
-		MenuZeroFillScreen();
-		break;
-	case 5:
-		LZ77UnCompVram(gUnknown_08E9FC64, (void *)VRAM + 0xE800);
-		break;
-	case 6:
-		LZ77UnCompVram(gPokenavConditionSearch2_Gfx, (void *)VRAM + 0x8000);
-		break;
-	case 7:
-		LoadPalette(gUnknown_083E02B4, 0xB0, 0x20);
-		LoadPalette(gUnknown_083E02B4, 0xF0, 0x20);
-		LoadPalette(gUnknown_083E0334, 0x40, 0x20);
+        gUnknown_083DFEC4->unk87C8 = gUnknown_083DFEC4->unk87CA == 1;
+        gUnknown_083DFEC4->unkD162[0] = 11;
+        break;
+    case 1:
+        SetUpWindowConfig(&gWindowConfig_81E70D4);
+        break;
+    case 2:
+        MultistepInitMenuWindowBegin(&gWindowConfig_81E70D4);
+        break;
+    case 3:
+        if (!MultistepInitMenuWindowContinue())
+        {
+            return TRUE;
+        }
+        break;
+    case 4:
+        MenuZeroFillScreen();
+        break;
+    case 5:
+        LZ77UnCompVram(gUnknown_08E9FC64, (void *)VRAM + 0xE800);
+        break;
+    case 6:
+        LZ77UnCompVram(gPokenavConditionSearch2_Gfx, (void *)VRAM + 0x8000);
+        break;
+    case 7:
+        LoadPalette(gUnknown_083E02B4, 0xB0, 0x20);
+        LoadPalette(gUnknown_083E02B4, 0xF0, 0x20);
+        LoadPalette(gUnknown_083E0334, 0x40, 0x20);
 
-		if (gUnknown_083DFEC4->unk87CA == 0)
-		{
-			LoadPalette(gPokenavConditionSearch2_Pal, 0x30, 0x20);
-			gPlttBufferUnfaded[0] = gPokenavConditionSearch2_Pal[5];
-			LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20);
-			LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2);
-			LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2);
-			LoadPalette(&gPokenavConditionSearch2_Pal[5], 0xBF, 0x2);
-		}
-		else if (gUnknown_083DFEC4->unk87CA == 1)
-		{
-			LoadPalette(gUnknown_083E0274, 0x30, 0x20);
-			gPlttBufferUnfaded[0] = gUnknown_083E0274[5];
-			LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20);
-			LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2);
-			LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2);
-			LoadPalette(&gUnknown_083E0274[5], 0xBF, 0x2);
-		}
-		else
-		{
-			LoadPalette(gUnknown_08E9F9E8, 0x30, 0x20);
-			pointer = &gUnknown_08E9F9E8[5];
-			gPlttBufferUnfaded[0] = gUnknown_08E9F9E8[5];
-			LoadPalette(gUnknown_083E0314, 0x50, 0x20);
-			LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2);
-			LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2);
-			LoadPalette(pointer, 0xBF, 0x2);
-			LoadPalette(pointer, 0x5F, 0x2);
-		}
-		break;
-	case 8:
-		if (gUnknown_083DFEC4->unk87CA != 2)
-		{
-			sub_8095C8C((void *)VRAM + 0xE800, 0, 5, gUnknown_08E9FD1C, 0, 0, 9, 4, 9);
-		}
-		else
-		{
-			sub_8095C8C((void *)VRAM + 0xE800, 0, 4, gUnknown_08E9FE54, 0, 0, 12, 10, 12);
-			sub_8095C8C((void *)VRAM + 0xE800, 0, 8, gUnknown_08E9FD64, 0, 0, 12, 10, 12);
-		}
-		break;
-	case 9:
-		LZ77UnCompVram(gUnknown_083E0354, (void *)VRAM + 0x5000);
-		break;
-	case 10:
-		DmaClear16(3, (void *)VRAM + 0xF800, 0x800);
-		break;
-	case 11:
-		sub_80F0900();
-		break;
-	case 12:
-		if (sub_80F0944())
-		{
-			return TRUE;
-		}
-		break;
-	case 13:
-		if (gUnknown_083DFEC4->unk87CA != 2)
-		{
-			ShowMapNamePopUpWindow();
-		}
-		else
-		{
-			sub_80F081C(0);
-			sub_80F0FFC(gUnknown_083DFEC4->unk876E);
-		}
-		break;
-	case 14:
-		REG_BG2CNT = 0x1D0A;
-		REG_BG3CNT = 0x1E03;
-		REG_BG0CNT = 0x1F01;
-		REG_BG3VOFS = 0xF8;
-
-		gUnknown_083DFEC4->unk8776 = 0xF8;
-		gUnknown_083DFEC4->unk8778 = 0;
-
-		REG_BLDCNT = 0;
-		gUnknown_083DFEC4->unkD160++;
-		return FALSE;
-	default:
-		return FALSE;
-	}
-
-	gUnknown_083DFEC4->unk306++;
-	return TRUE;
+        if (gUnknown_083DFEC4->unk87CA == 0)
+        {
+            LoadPalette(gPokenavConditionSearch2_Pal, 0x30, 0x20);
+            gPlttBufferUnfaded[0] = gPokenavConditionSearch2_Pal[5];
+            LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20);
+            LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2);
+            LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2);
+            LoadPalette(&gPokenavConditionSearch2_Pal[5], 0xBF, 0x2);
+        }
+        else if (gUnknown_083DFEC4->unk87CA == 1)
+        {
+            LoadPalette(gUnknown_083E0274, 0x30, 0x20);
+            gPlttBufferUnfaded[0] = gUnknown_083E0274[5];
+            LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20);
+            LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2);
+            LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2);
+            LoadPalette(&gUnknown_083E0274[5], 0xBF, 0x2);
+        }
+        else
+        {
+            LoadPalette(gUnknown_08E9F9E8, 0x30, 0x20);
+            pointer = &gUnknown_08E9F9E8[5];
+            gPlttBufferUnfaded[0] = gUnknown_08E9F9E8[5];
+            LoadPalette(gUnknown_083E0314, 0x50, 0x20);
+            LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2);
+            LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2);
+            LoadPalette(pointer, 0xBF, 0x2);
+            LoadPalette(pointer, 0x5F, 0x2);
+        }
+        break;
+    case 8:
+        if (gUnknown_083DFEC4->unk87CA != 2)
+        {
+            sub_8095C8C((void *)VRAM + 0xE800, 0, 5, gUnknown_08E9FD1C, 0, 0, 9, 4, 9);
+        }
+        else
+        {
+            sub_8095C8C((void *)VRAM + 0xE800, 0, 4, gUnknown_08E9FE54, 0, 0, 12, 10, 12);
+            sub_8095C8C((void *)VRAM + 0xE800, 0, 8, gUnknown_08E9FD64, 0, 0, 12, 10, 12);
+        }
+        break;
+    case 9:
+        LZ77UnCompVram(gUnknown_083E0354, (void *)VRAM + 0x5000);
+        break;
+    case 10:
+        DmaClear16(3, (void *)VRAM + 0xF800, 0x800);
+        break;
+    case 11:
+        sub_80F0900();
+        break;
+    case 12:
+        if (sub_80F0944())
+        {
+            return TRUE;
+        }
+        break;
+    case 13:
+        if (gUnknown_083DFEC4->unk87CA != 2)
+        {
+            ShowMapNamePopUpWindow();
+        }
+        else
+        {
+            sub_80F081C(0);
+            sub_80F0FFC(gUnknown_083DFEC4->unk876E);
+        }
+        break;
+    case 14:
+        REG_BG2CNT = 0x1D0A;
+        REG_BG3CNT = 0x1E03;
+        REG_BG0CNT = 0x1F01;
+        REG_BG3VOFS = 0xF8;
+
+        gUnknown_083DFEC4->unk8776 = 0xF8;
+        gUnknown_083DFEC4->unk8778 = 0;
+
+        REG_BLDCNT = 0;
+        gUnknown_083DFEC4->unkD160++;
+        return FALSE;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unk306++;
+    return TRUE;
 }
 #else
 __attribute__((naked))
diff --git a/src/rom3.c b/src/rom3.c
index cdc66989c..11239a681 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -5,6 +5,7 @@
 #include "battle_anim.h"
 #include "battle_anim_81258BC.h"
 #include "battle_anim_8137220.h"
+#include "battle_util.h"
 #include "cable_club.h"
 #include "constants/items.h"
 #include "link.h"
@@ -582,7 +583,7 @@ void Emitcmd1(u8 a, u8 b, u8 c)
     PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4);
 }
 
-void EmitSetAttributes(u8 a, u8 b, u8 c, u8 d, void *e)
+void EmitSetMonData(u8 a, u8 b, u8 c, u8 d, void *e)
 {
     int i;
 
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 9cf28a111..2691da859 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -1,13 +1,14 @@
 #include "global.h"
+#include "constants/species.h"
 #include "rom_8077ABC.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "blend_palette.h"
+#include "contest.h"
 #include "data2.h"
 #include "decompress.h"
 #include "palette.h"
 #include "pokemon_icon.h"
-#include "constants/species.h"
 #include "sprite.h"
 #include "task.h"
 #include "trig.h"
@@ -31,52 +32,28 @@
 #define gTransformPersonalities gTransformedPersonalities
 #define gBattleMonSprites gObjectBankIDs
 
-
-struct Struct_unk_2019348 {
-    u16 field_0;
-    u16 field_2;
-    u8 field_4;
-    u32 field_8;
-    u32 field_c;
-    u32 field_10;
-};
-
-struct TransformStatus {
+struct TransformStatus
+{
     u16 unknown;
     u16 species;
 };
 
-struct Struct_gUnknown_0837F578 {
+struct Struct_gUnknown_0837F578
+{
     u8 field_0;
     u8 field_1;
 };
 
-struct Struct_2017810 {
+struct Struct_2017810
+{
     u8 filler_0[6];
     u8 field_6;
     u8 filler_7[5];
 };
 
-struct Color {
-    u16 r:5;
-    u16 g:5;
-    u16 b:5;
-};
-
-struct BGCnt {
-    u16 priority:2;
-    u16 charBase:2;
-    u16 unused:2;
-    u16 mosaic:1;
-    u16 colorMode:1;
-    u16 screenBase:5;
-    u16 overflow:1;
-    u16 size:2;
-};
-
-#define BG1CNT (*(volatile struct BGCnt*)REG_ADDR_BG1CNT)
-#define BG2CNT (*(volatile struct BGCnt*)REG_ADDR_BG2CNT)
-#define BG3CNT (*(volatile struct BGCnt*)REG_ADDR_BG3CNT)
+#define BG1CNT (*(vBgCnt *)REG_ADDR_BG1CNT)
+#define BG2CNT (*(vBgCnt *)REG_ADDR_BG2CNT)
+#define BG3CNT (*(vBgCnt *)REG_ADDR_BG3CNT)
 
 extern struct OamData gOamData_837DF9C[];
 extern const union AnimCmd *const gDummySpriteAnimTable[];
@@ -102,7 +79,8 @@ extern u8 UpdateMonIconFrame(struct Sprite *sprite);
 EWRAM_DATA union AffineAnimCmd *gUnknown_0202F7D4 = NULL;
 EWRAM_DATA u32 filler_0202F7D8[3] = {0};
 
-const struct Struct_gUnknown_0837F578 gUnknown_0837F578[][4] = {
+const struct Struct_gUnknown_0837F578 gUnknown_0837F578[][4] =
+{
     {
         { 72, 80 },
         { 176, 40 },
@@ -120,14 +98,16 @@ const struct Struct_gUnknown_0837F578 gUnknown_0837F578[][4] = {
 // One entry for each of the four Castform forms.
 // Coords are probably front pic coords or back pic coords, but this data does not seem to be
 // used during battle, party summary, or pokedex screens.
-const struct MonCoords gCastformFrontSpriteCoords[] = {
+const struct MonCoords gCastformFrontSpriteCoords[] =
+{
     { 0x44, 17 }, // NORMAL
     { 0x66, 9 }, // SUN
     { 0x46, 9 }, // RAIN
     { 0x86, 8 }, // HAIL
 };
 
-const u8 gCastformElevations[] = {
+const u8 gCastformElevations[] =
+{
     13, // NORMAL
     14, // SUN
     13, // RAIN
@@ -135,14 +115,16 @@ const u8 gCastformElevations[] = {
 };
 
 // Y position of the backsprite for each of the four Castform forms.
-const u8 gCastformBackSpriteYCoords[] = {
+const u8 gCastformBackSpriteYCoords[] =
+{
     0, // NORMAL
     0, // SUN
     0, // RAIN
     0, // HAIL
 };
 
-const struct SpriteTemplate gSpriteTemplate_837F5B0[] = {
+const struct SpriteTemplate gSpriteTemplate_837F5B0[] =
+{
     {
         .tileTag = 55125,
         .paletteTag = 55125,
@@ -151,7 +133,8 @@ const struct SpriteTemplate gSpriteTemplate_837F5B0[] = {
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
-    }, {
+    },
+    {
         .tileTag = 55126,
         .paletteTag = 55126,
         .oam = gOamData_837DF9C,
@@ -162,23 +145,26 @@ const struct SpriteTemplate gSpriteTemplate_837F5B0[] = {
     }
 };
 
-const struct SpriteSheet gUnknown_0837F5E0[] = {
+const struct SpriteSheet gUnknown_0837F5E0[] =
+{
     { gMiscBlank_Gfx, 0x800, 55125, },
     { gMiscBlank_Gfx, 0x800, 55126, },
 };
 
 
-u8 GetBankPosition(u8 slot, u8 a2) {
+u8 GetBankPosition(u8 slot, u8 a2)
+{
     u8 var;
     u16 species;
     struct TransformStatus *transform;
 
-    if (IsContest()) {
-        if (a2 == 3 && slot == 3) {
+    if (IsContest())
+    {
+        if (a2 == 3 && slot == 3)
             a2 = 1;
-        }
     }
-    switch (a2) {
+    switch (a2)
+    {
     case 0:
     case 2:
         var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][GetBankIdentity(slot)].field_0;
@@ -189,339 +175,402 @@ u8 GetBankPosition(u8 slot, u8 a2) {
     case 3:
     case 4:
     default:
-        if (IsContest()) {
-            if (ewram19348.unk4 & 1) {
-                species = ewram19348.unk2;
-            } else {
-                species = ewram19348.unk0;
-            }
-        } else {
-            if (GetBankSide(slot)) {
+        if (IsContest())
+        {
+            if (shared19348.unk4_0)
+                species = shared19348.unk2;
+            else
+                species = shared19348.unk0;
+        }
+        else
+        {
+            if (GetBankSide(slot))
+            {
                 transform = &eTransformStatuses[slot];
-                if (!transform->species) {
+                if (!transform->species)
                     species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
-                } else {
+                else
                     species = transform->species;
-                }
-            } else {
+            }
+            else
+            {
                 transform = &eTransformStatuses[slot];
-                if (!transform->species) {
+                if (!transform->species)
                     species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
-                } else {
+                else
                     species = transform->species;
-                }
             }
         }
-        if (a2 == 3) {
+        if (a2 == 3)
             var = sub_8077E44(slot, species, 1);
-        } else {
+        else
             var = sub_8077E44(slot, species, 0);
-        }
         break;
     }
     return var;
 }
 
-u8 sub_8077BFC(u8 slot, u16 species) {
+u8 sub_8077BFC(u8 slot, u16 species)
+{
     u16 letter;
     u32 personality;
     struct TransformStatus *transform;
     u8 ret;
     u16 var;
 
-    if (!GetBankSide(slot) || IsContest()) {
-        if (species == SPECIES_UNOWN) {
-            if (IsContest()) {
-                if (ewram19348.unk4 & 1) {
-                    personality = ewram19348.unk10;
-                } else {
-                    personality = ewram19348.unk8;
-                }
-            } else {
+    if (GetBankSide(slot) == 0 || IsContest())
+    {
+        if (species == SPECIES_UNOWN)
+        {
+            if (IsContest())
+            {
+                if (shared19348.unk4_0)
+                    personality = shared19348.unk10;
+                else
+                    personality = shared19348.unk8;
+            }
+            else
+            {
                 transform = &eTransformStatuses[slot];
-                if (!transform->species) {
+                if (!transform->species)
                     personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY);
-                } else {
+                else
                     personality = gTransformPersonalities[slot];
-                }
             }
             letter = GET_UNOWN_LETTER(personality);
-            if (!letter) {
+            if (!letter)
                 var = species;
-            } else {
+            else
                 var = letter + SPECIES_UNOWN_B - 1;
-            }
             ret = gMonBackPicCoords[var].y_offset;
-        } else if (species == SPECIES_CASTFORM) {
+        }
+        else if (species == SPECIES_CASTFORM)
+        {
             ret = gCastformBackSpriteYCoords[gBattleMonForms[slot]];
-        } else if (species > NUM_SPECIES) {
+        }
+        else if (species > NUM_SPECIES)
+        {
             ret = gMonBackPicCoords[0].y_offset;
-        } else {
+        }
+        else
+        {
             ret = gMonBackPicCoords[species].y_offset;
         }
-    } else {
-        if (species == SPECIES_UNOWN) {
+    }
+    else
+    {
+        if (species == SPECIES_UNOWN)
+        {
             transform = &eTransformStatuses[slot];
-            if (!transform->species) {
+            if (!transform->species)
                 personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY);
-            } else {
+            else
                 personality = gTransformPersonalities[slot];
-            }
             letter = GET_UNOWN_LETTER(personality);
-            if (!letter) {
+            if (!letter)
                 var = species;
-            } else {
+            else
                 var = letter + SPECIES_UNOWN_B - 1;
-            }
             ret = gMonFrontPicCoords[var].y_offset;
-        } else if (species == SPECIES_CASTFORM) {
+        }
+        else if (species == SPECIES_CASTFORM)
+        {
             ret = gCastformFrontSpriteCoords[gBattleMonForms[slot]].y_offset;
-        } else if (species > NUM_SPECIES) {
+        }
+        else if (species > NUM_SPECIES)
+        {
             ret = gMonFrontPicCoords[0].y_offset;
-        } else {
+        }
+        else
+        {
             ret = gMonFrontPicCoords[species].y_offset;
         }
     }
     return ret;
 }
 
-u8 sub_8077DD8(u8 slot, u16 species) {
+u8 sub_8077DD8(u8 slot, u16 species)
+{
     u8 ret = 0;
-    if (GetBankSide(slot) == 1) {
-        if (!IsContest()) {
-            if (species == SPECIES_CASTFORM) {
+    if (GetBankSide(slot) == 1)
+    {
+        if (!IsContest())
+        {
+            if (species == SPECIES_CASTFORM)
                 ret = gCastformElevations[gBattleMonForms[slot]];
-            } else if (species > NUM_SPECIES) {
+            else if (species > NUM_SPECIES)
                 ret = gEnemyMonElevation[0];
-            } else {
+            else
                 ret = gEnemyMonElevation[species];
-            }
         }
     }
     return ret;
 }
 
-u8 sub_8077E44(u8 slot, u16 species, u8 a3) {
+u8 sub_8077E44(u8 slot, u16 species, u8 a3)
+{
     u16 offset;
     u8 y;
-    if (GetBankSide(slot) == 0 || IsContest()) {
+
+    if (GetBankSide(slot) == 0 || IsContest())
+    {
         offset = sub_8077BFC(slot, species);
-    } else {
+    }
+    else
+    {
         offset = sub_8077BFC(slot, species);
         offset -= sub_8077DD8(slot, species);
     }
     y = offset + gUnknown_0837F578[IS_DOUBLE_BATTLE()][GetBankIdentity(slot)].field_1;
-    if (a3) {
-        if (GetBankSide(slot) == 0) {
+    if (a3)
+    {
+        if (GetBankSide(slot) == 0)
             y += 8;
-        }
-        if (y > 104) y = 104;
+        if (y > 104)
+            y = 104;
     }
     return y;
 }
 
-u8 sub_8077EE4(u8 slot, u8 a2) {
+u8 sub_8077EE4(u8 slot, u8 a2)
+{
     u16 species;
     struct TransformStatus *transform;
-    if (a2 == 3 || a2 == 4) {
-        if (IsContest()) {
-            if (ewram19348.unk4 & 1) {
-                species = ewram19348.unk2;
-            } else {
-                species = ewram19348.unk0;
-            }
-        } else {
+    if (a2 == 3 || a2 == 4)
+    {
+        if (IsContest())
+        {
+            if (shared19348.unk4_0)
+                species = shared19348.unk2;
+            else
+                species = shared19348.unk0;
+        }
+        else
+        {
             transform = &eTransformStatuses[slot];
-            if (!transform->species) {
+            if (!transform->species)
                 species = gAnimSpeciesByBanks[slot];
-            } else {
+            else
                 species = transform->species;
-            }
         }
-        if (a2 == 3) {
+        if (a2 == 3)
             return sub_8077E44(slot, species, 1);
-        } else {
+        else
             return sub_8077E44(slot, species, 0);
-        }
-    } else {
+    }
+    else
+    {
         return GetBankPosition(slot, a2);
     }
 }
 
-u8 sub_8077F68(u8 slot) {
+u8 sub_8077F68(u8 slot)
+{
     return GetBankPosition(slot, 4);
 }
 
-u8 sub_8077F7C(u8 slot) {
+u8 sub_8077F7C(u8 slot)
+{
     u16 var;
-    if (GetBankSide(slot)) {
+    if (GetBankSide(slot) != 0)
         var = GetBankPosition(slot, 1) + 16;
-    } else {
+    else
         var = GetBankPosition(slot, 1) + 17;
-    }
     return var;
 }
 
-u8 sub_8077FC0(u8 slot) {
+u8 sub_8077FC0(u8 slot)
+{
     u16 var;
     u8 r6;
     struct TransformStatus *transform;
+
     r6 = GetBankPosition(slot, 1);
-    if (!IsContest()) {
-        if (GetBankSide(slot)) {
+    if (!IsContest())
+    {
+        if (GetBankSide(slot) != 0)
+        {
             transform = &eTransformStatuses[slot];
             if (!transform->species) {
                 var = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
             } else {
                 var = transform->species;
             }
-        } else {
+        }
+        else
+        {
             transform = &eTransformStatuses[slot];
-            if (!transform->species) {
+            if (!transform->species)
                 var = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
-            } else {
+            else
                 var = transform->species;
-            }
         }
-        if (GetBankSide(slot)) {
+        if (GetBankSide(slot) != 0)
             r6 -= sub_8077DD8(slot, var);
-        }
     }
     return r6;
 }
 
-u8 GetAnimBankSpriteId(u8 whichBank) {
+u8 GetAnimBankSpriteId(u8 whichBank)
+{
     u8 *sprites;
-    if (whichBank == ANIM_BANK_ATTACKER) {
-        if (IsBankSpritePresent(gAnimBankAttacker)) {
+
+    if (whichBank == ANIM_BANK_ATTACKER)
+    {
+        if (IsBankSpritePresent(gAnimBankAttacker))
+        {
             sprites = gBattleMonSprites;
             return sprites[gAnimBankAttacker];
-        } else {
+        }
+        else
+        {
             return 0xff;
         }
-    } else if (whichBank == ANIM_BANK_TARGET) {
-        if (IsBankSpritePresent(gAnimBankTarget)) {
+    }
+    else if (whichBank == ANIM_BANK_TARGET)
+    {
+        if (IsBankSpritePresent(gAnimBankTarget))
+        {
             sprites = gBattleMonSprites;
             return sprites[gAnimBankTarget];
-        } else {
+        }
+        else
+        {
             return 0xff;
         }
-    } else if (whichBank == ANIM_BANK_ATK_PARTNER) {
-        if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) {
+    }
+    else if (whichBank == ANIM_BANK_ATK_PARTNER)
+    {
+        if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
             return 0xff;
-        } else {
+        else
             return gBattleMonSprites[gAnimBankAttacker ^ 2];
-        }
-    } else {
-        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) {
+    }
+    else
+    {
+        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
             return gBattleMonSprites[gAnimBankTarget ^ 2];
-        } else {
+        else
             return 0xff;
-        }
     }
 }
 
-void StoreSpriteCallbackInData(struct Sprite *sprite, void (*callback)(struct Sprite*)) {
+void StoreSpriteCallbackInData(struct Sprite *sprite, void (*callback)(struct Sprite*))
+{
     sprite->data[6] = (u32)(callback) & 0xffff;
     sprite->data[7] = (u32)(callback) >> 16;
 }
 
-void SetCallbackToStoredInData(struct Sprite *sprite) {
+void SetCallbackToStoredInData(struct Sprite *sprite)
+{
     u32 callback = (u16)sprite->data[6] | (sprite->data[7] << 16);
     sprite->callback = (void (*)(struct Sprite *))callback;
 }
 
-void sub_8078114(struct Sprite *sprite) {
-    if (sprite->data[3]) {
+void sub_8078114(struct Sprite *sprite)
+{
+    if (sprite->data[3])
+    {
         sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
         sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]);
         sprite->data[0] += sprite->data[2];
-        if (sprite->data[0] >= 0x100) {
+        if (sprite->data[0] >= 0x100)
             sprite->data[0] -= 0x100;
-        } else if (sprite->data[0] < 0) {
+        else if (sprite->data[0] < 0)
             sprite->data[0] += 0x100;
-        }
         sprite->data[3]--;
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void sub_8078174(struct Sprite *sprite) {
-    if (sprite->data[3]) {
+void sub_8078174(struct Sprite *sprite)
+{
+    if (sprite->data[3])
+    {
         sprite->pos2.x = Sin(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]);
         sprite->pos2.y = Cos(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]);
         sprite->data[0] += sprite->data[2];
         sprite->data[5] += sprite->data[4];
-        if (sprite->data[0] >= 0x100) {
+        if (sprite->data[0] >= 0x100)
             sprite->data[0] -= 0x100;
-        } else if (sprite->data[0] < 0) {
+        else if (sprite->data[0] < 0)
             sprite->data[0] += 0x100;
-        }
         sprite->data[3]--;
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void unref_sub_80781F0(struct Sprite *sprite) {
-    if (sprite->data[3]) {
+void unref_sub_80781F0(struct Sprite *sprite)
+{
+    if (sprite->data[3])
+    {
         sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
         sprite->pos2.y = Cos(sprite->data[4], sprite->data[1]);
         sprite->data[0] += sprite->data[2];
         sprite->data[4] += sprite->data[5];
-        if (sprite->data[0] >= 0x100) {
+        if (sprite->data[0] >= 0x100)
             sprite->data[0] -= 0x100;
-        } else if (sprite->data[0] < 0) {
+        else if (sprite->data[0] < 0)
             sprite->data[0] += 0x100;
-        }
-        if (sprite->data[4] >= 0x100) {
+        if (sprite->data[4] >= 0x100)
             sprite->data[4] -= 0x100;
-        } else if (sprite->data[4] < 0) {
+        else if (sprite->data[4] < 0)
             sprite->data[4] += 0x100;
-        }
         sprite->data[3]--;
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void sub_8078278(struct Sprite *sprite) {
-    if (sprite->data[3]) {
+void sub_8078278(struct Sprite *sprite)
+{
+    if (sprite->data[3])
+    {
         sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
         sprite->pos2.y = Cos(sprite->data[0], sprite->data[4]);
         sprite->data[0] += sprite->data[2];
-        if (sprite->data[0] >= 0x100) {
+        if (sprite->data[0] >= 0x100)
             sprite->data[0] -= 0x100;
-        } else if (sprite->data[0] < 0) {
+        else if (sprite->data[0] < 0)
             sprite->data[0] += 0x100;
-        }
         sprite->data[3]--;
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void sub_80782D8(struct Sprite *sprite) {
-    if (sprite->data[0] > 0) {
+void sub_80782D8(struct Sprite *sprite)
+{
+    if (sprite->data[0] > 0)
         sprite->data[0]--;
-    } else {
+    else
         SetCallbackToStoredInData(sprite);
-    }
 }
 
-void sub_80782F8(struct Sprite *sprite) {
+void sub_80782F8(struct Sprite *sprite)
+{
     sub_8078314(sprite);
     sprite->callback = sub_8078364;
     sprite->callback(sprite);
 }
 
-void sub_8078314(struct Sprite *sprite) {
+void sub_8078314(struct Sprite *sprite)
+{
     s16 old;
     int v1;
-    if (sprite->data[1] > sprite->data[2]) {
+
+    if (sprite->data[1] > sprite->data[2])
         sprite->data[0] = -sprite->data[0];
-    }
     v1 = sprite->data[2] - sprite->data[1];
     old = sprite->data[0];
     sprite->data[0] = abs(v1 / sprite->data[0]);
@@ -529,42 +578,55 @@ void sub_8078314(struct Sprite *sprite) {
     sprite->data[1] = old;
 }
 
-void sub_8078364(struct Sprite *sprite) {
-    if (sprite->data[0] > 0) {
+void sub_8078364(struct Sprite *sprite)
+{
+    if (sprite->data[0] > 0)
+    {
         sprite->data[0]--;
         sprite->pos2.x += sprite->data[1];
         sprite->pos2.y += sprite->data[2];
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void sub_8078394(struct Sprite *sprite) {
-    if (sprite->data[0] > 0) {
+void sub_8078394(struct Sprite *sprite)
+{
+    if (sprite->data[0] > 0)
+    {
         sprite->data[0]--;
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
         sprite->pos2.x = sprite->data[3] >> 8;
         sprite->pos2.y = sprite->data[4] >> 8;
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void sub_80783D0(struct Sprite *sprite) {
-    if (sprite->data[0] > 0) {
+void sub_80783D0(struct Sprite *sprite)
+{
+    if (sprite->data[0] > 0)
+    {
         sprite->data[0]--;
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
         sprite->pos2.x = sprite->data[3] >> 8;
         sprite->pos2.y = sprite->data[4] >> 8;
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
     UpdateMonIconFrame(sprite);
 }
 
-void unref_sub_8078414(struct Sprite *sprite) {
+void unref_sub_8078414(struct Sprite *sprite)
+{
     sprite->data[1] = sprite->pos1.x + sprite->pos2.x;
     sprite->data[3] = sprite->pos1.y + sprite->pos2.y;
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
@@ -572,51 +634,65 @@ void unref_sub_8078414(struct Sprite *sprite) {
     sprite->callback = sub_80782F8;
 }
 
-void sub_8078458(struct Sprite *sprite) {
-    if (sprite->data[0] > 0) {
+void sub_8078458(struct Sprite *sprite)
+{
+    if (sprite->data[0] > 0)
+    {
         sprite->data[0]--;
         gSprites[sprite->data[3]].pos2.x += sprite->data[1];
         gSprites[sprite->data[3]].pos2.y += sprite->data[2];
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void sub_80784A8(struct Sprite *sprite) {
-    if (sprite->data[0] > 0) {
+void sub_80784A8(struct Sprite *sprite)
+{
+    if (sprite->data[0] > 0)
+    {
         sprite->data[0]--;
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
         gSprites[sprite->data[5]].pos2.x = sprite->data[3] >> 8;
         gSprites[sprite->data[5]].pos2.y = sprite->data[4] >> 8;
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void sub_8078504(struct Sprite *sprite) {
-    if (sprite->data[0] > 0) {
+void sub_8078504(struct Sprite *sprite)
+{
+    if (sprite->data[0] > 0)
+    {
         sprite->data[0]--;
         sprite->pos2.x = sprite->data[2] >> 8;
         sprite->data[2] += sprite->data[1];
         sprite->pos2.y = sprite->data[4] >> 8;
         sprite->data[4] += sprite->data[3];
-        if (sprite->data[0] % sprite->data[5] == 0) {
-            if (sprite->data[5]) {
+        if (sprite->data[0] % sprite->data[5] == 0)
+        {
+            if (sprite->data[5])
                 sprite->invisible ^= 1;
-            }
         }
-    } else {
+    }
+    else
+    {
         SetCallbackToStoredInData(sprite);
     }
 }
 
-void move_anim_8074EE0(struct Sprite *sprite) {
+void move_anim_8074EE0(struct Sprite *sprite)
+{
     FreeSpriteOamMatrix(sprite);
     DestroyAnimSprite(sprite);
 }
 
-void unref_sub_8078588(struct Sprite *sprite) {
+void unref_sub_8078588(struct Sprite *sprite)
+{
     sprite->data[1] = sprite->pos1.x + sprite->pos2.x;
     sprite->data[3] = sprite->pos1.y + sprite->pos2.y;
     sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
@@ -624,57 +700,68 @@ void unref_sub_8078588(struct Sprite *sprite) {
     sprite->callback = sub_80782F8;
 }
 
-void unref_sub_80785CC(struct Sprite *sprite) {
+void unref_sub_80785CC(struct Sprite *sprite)
+{
     ResetPaletteStructByUid(sprite->data[5]);
     move_anim_8074EE0(sprite);
 }
 
-void sub_80785E4(struct Sprite *sprite) {
-    if (sprite->affineAnimEnded) {
+void sub_80785E4(struct Sprite *sprite)
+{
+    if (sprite->affineAnimEnded)
         SetCallbackToStoredInData(sprite);
-    }
 }
 
-void sub_8078600(struct Sprite *sprite) {
-    if (sprite->animEnded) {
+void sub_8078600(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
         SetCallbackToStoredInData(sprite);
-    }
 }
 
-void sub_807861C(struct Sprite *sprite) {
+void sub_807861C(struct Sprite *sprite)
+{
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
     DestroyAnimSprite(sprite);
 }
 
-void sub_8078634(u8 task) {
+void sub_8078634(u8 task)
+{
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
     DestroyAnimVisualTask(task);
 }
 
-void sub_8078650(struct Sprite *sprite) {
+void sub_8078650(struct Sprite *sprite)
+{
     sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
     sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
 }
 
-void sub_807867C(struct Sprite *sprite, s16 a2) {
+void sub_807867C(struct Sprite *sprite, s16 a2)
+{
     u16 v1 = GetBankPosition(gAnimBankAttacker, 0);
     u16 v2 = GetBankPosition(gAnimBankTarget, 0);
-    if (v1 > v2) {
+
+    if (v1 > v2)
+    {
         sprite->pos1.x -= a2;
-    } else if (v1 < v2) {
+    }
+    else if (v1 < v2)
+    {
         sprite->pos1.x += a2;
-    } else {
-        if (GetBankSide(gAnimBankAttacker)) {
+    }
+    else
+    {
+        if (GetBankSide(gAnimBankAttacker) != 0)
             sprite->pos1.x -= a2;
-        } else {
+        else
             sprite->pos1.x += a2;
-        }
     }
 }
 
-void sub_80786EC(struct Sprite *sprite) {
+void sub_80786EC(struct Sprite *sprite)
+{
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     obj_translate_based_on_private_1_2_3_4(sprite);
@@ -682,24 +769,27 @@ void sub_80786EC(struct Sprite *sprite) {
     sprite->data[7] = 0;
 }
 
-bool8 sub_8078718(struct Sprite *sprite) {
-    if (sub_8078B5C(sprite)) {
+bool8 sub_8078718(struct Sprite *sprite)
+{
+    if (sub_8078B5C(sprite))
         return TRUE;
-    }
     sprite->data[7] += sprite->data[6];
     sprite->pos2.y += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]);
     return FALSE;
 }
 
-void oamt_add_pos2_onto_pos1(struct Sprite *sprite) {
+void oamt_add_pos2_onto_pos1(struct Sprite *sprite)
+{
     sprite->pos1.x += sprite->pos2.x;
     sprite->pos1.y += sprite->pos2.y;
     sprite->pos2.x = 0;
     sprite->pos2.y = 0;
 }
 
-void sub_8078764(struct Sprite *sprite, u8 a2) {
-    if (!a2) {
+void sub_8078764(struct Sprite *sprite, u8 a2)
+{
+    if (!a2)
+    {
         sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 0);
         sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 1);
     }
@@ -707,11 +797,15 @@ void sub_8078764(struct Sprite *sprite, u8 a2) {
     sprite->pos1.y += gBattleAnimArgs[1];
 }
 
-void sub_80787B0(struct Sprite *sprite, u8 a2) {
-    if (!a2) {
+void sub_80787B0(struct Sprite *sprite, u8 a2)
+{
+    if (!a2)
+    {
         sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0);
         sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1);
-    } else {
+    }
+    else
+    {
         sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 2);
         sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 3);
     }
@@ -719,103 +813,127 @@ void sub_80787B0(struct Sprite *sprite, u8 a2) {
     sprite->pos1.y += gBattleAnimArgs[1];
 }
 
-u8 GetBankSide(u8 slot) {
+u8 GetBankSide(u8 slot)
+{
     return gBanksBySide[slot] & 1;
 }
 
-u8 GetBankIdentity(u8 slot) {
+u8 GetBankIdentity(u8 slot)
+{
     return gBanksBySide[slot];
 }
 
-u8 GetBankByPlayerAI(u8 slot) {
+u8 GetBankByIdentity(u8 slot)
+{
     u8 i;
-    for (i = 0; i < gNoOfAllBanks; i++) {
-        if (gBanksBySide[i] == slot) {
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+    {
+        if (gBanksBySide[i] == slot)
             break;
-        }
     }
     return i;
 }
 
-bool8 IsBankSpritePresent(u8 slot) {
-    if (IsContest()) {
-        if (gAnimBankAttacker == slot) {
+bool8 IsBankSpritePresent(u8 slot)
+{
+    if (IsContest())
+    {
+        if (gAnimBankAttacker == slot)
             return TRUE;
-        }
-        if (gAnimBankTarget == slot) {
+        if (gAnimBankTarget == slot)
             return TRUE;
-        }
         return FALSE;
-    } else {
-        if (gBanksBySide[slot] == 0xff) {
+    }
+    else
+    {
+        if (gBanksBySide[slot] == 0xff)
             return FALSE;
-        }
-        if (GetBankSide(slot)) {
-            if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) {
+        if (GetBankSide(slot))
+        {
+            if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0)
                 return TRUE;
-            }
-        } else {
-            if (GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) {
+        }
+        else
+        {
+            if (GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0)
                 return TRUE;
-            }
         }
         return FALSE;
     }
 }
 
-bool8 IsDoubleBattle() {
+bool8 IsDoubleBattle()
+{
     return IS_DOUBLE_BATTLE();
 }
 
-void sub_8078914(struct Struct_sub_8078914 *unk) {
-    if (IsContest()) {
-        unk->field_0 = (u8 *)0x6008000;
-        unk->field_4 = (u8 *)0x600f000;
+void sub_8078914(struct Struct_sub_8078914 *unk)
+{
+    if (IsContest())
+    {
+        unk->field_0 = (u8 *)(VRAM + 0x8000);
+        unk->field_4 = (u8 *)(VRAM + 0xf000);
         unk->field_8 = 0xe;
-    } else {
-        unk->field_0 = (u8 *)0x6004000;
-        unk->field_4 = (u8 *)0x600e000;
+    }
+    else
+    {
+        unk->field_0 = (u8 *)(VRAM + 0x4000);
+        unk->field_4 = (u8 *)(VRAM + 0xe000);
         unk->field_8 = 0x8;
     }
 }
 
-void sub_8078954(struct Struct_sub_8078914 *unk) {
-    if (IsContest()) {
-        unk->field_0 = (u8 *)0x6008000;
-        unk->field_4 = (u8 *)0x600f000;
+void sub_8078954(struct Struct_sub_8078914 *unk)
+{
+    if (IsContest())
+    {
+        unk->field_0 = (u8 *)(VRAM + 0x8000);
+        unk->field_4 = (u8 *)(VRAM + 0xf000);
         unk->field_8 = 0xe;
-    } else if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) {
-        unk->field_0 = (u8 *)0x6004000;
-        unk->field_4 = (u8 *)0x600e000;
+    }
+    else if (GetBankIdentity_permutated(gAnimBankAttacker) == 1)
+    {
+        unk->field_0 = (u8 *)(VRAM + 0x4000);
+        unk->field_4 = (u8 *)(VRAM + 0xe000);
         unk->field_8 = 0x8;
-    } else {
-        unk->field_0 = (u8 *)0x6006000;
-        unk->field_4 = (u8 *)0x600f000;
+    }
+    else
+    {
+        unk->field_0 = (u8 *)(VRAM + 0x6000);
+        unk->field_4 = (u8 *)(VRAM + 0xf000);
         unk->field_8 = 0x9;
     }
 }
 
-u8 sub_80789BC() {
-    if (IsContest()) {
+u8 sub_80789BC()
+{
+    if (IsContest())
         return 1;
-    }
     return 2;
 }
 
-void sub_80789D4(bool8 a1) {
-    if (!a1) {
-        BG3CNT.size = 0;
-        BG3CNT.overflow = 1;
-    } else if (IsContest()) {
-        BG3CNT.size = 0;
-        BG3CNT.overflow = 1;
-    } else {
-        BG3CNT.size = 1;
-        BG3CNT.overflow = 0;
+void sub_80789D4(bool8 a1)
+{
+    if (!a1)
+    {
+        BG3CNT.screenSize = 0;
+        BG3CNT.areaOverflowMode = 1;
+    }
+    else if (IsContest())
+    {
+        BG3CNT.screenSize = 0;
+        BG3CNT.areaOverflowMode = 1;
+    }
+    else
+    {
+        BG3CNT.screenSize = 1;
+        BG3CNT.areaOverflowMode = 0;
     }
 }
 
-void sub_8078A34(struct Sprite *sprite) {
+void sub_8078A34(struct Sprite *sprite)
+{
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     sub_8078A5C(sprite);
@@ -823,7 +941,8 @@ void sub_8078A34(struct Sprite *sprite) {
     sprite->callback(sprite);
 }
 
-void sub_8078A5C(struct Sprite *sprite) {
+void sub_8078A5C(struct Sprite *sprite)
+{
     s16 x = (sprite->data[2] - sprite->data[1]) << 8;
     s16 y = (sprite->data[4] - sprite->data[3]) << 8;
     sprite->data[1] = x / sprite->data[0];
@@ -832,32 +951,36 @@ void sub_8078A5C(struct Sprite *sprite) {
     sprite->data[3] = 0;
 }
 
-void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite) {
+void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite)
+{
     int x = sprite->data[2] - sprite->data[1];
     int y = sprite->data[4] - sprite->data[3];
     bool8 r8 = x < 0;
     bool8 r9 = y < 0;
     u16 x2 = abs(x) << 8;
     u16 y2 = abs(y) << 8;
+
     x2 = x2 / sprite->data[0];
     y2 = y2 / sprite->data[0];
-    if (r8) {
+
+    if (r8)
         x2 |= 1;
-    } else {
+    else
         x2 &= ~1;
-    }
-    if (r9) {
+
+    if (r9)
         y2 |= 1;
-    } else {
+    else
         y2 &= ~1;
-    }
+
     sprite->data[1] = x2;
     sprite->data[2] = y2;
     sprite->data[4] = 0;
     sprite->data[3] = 0;
 }
 
-void sub_8078B34(struct Sprite *sprite) {
+void sub_8078B34(struct Sprite *sprite)
+{
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     obj_translate_based_on_private_1_2_3_4(sprite);
@@ -865,46 +988,51 @@ void sub_8078B34(struct Sprite *sprite) {
     sprite->callback(sprite);
 }
 
-bool8 sub_8078B5C(struct Sprite *sprite) {
+bool8 sub_8078B5C(struct Sprite *sprite)
+{
     u16 v1, v2, x, y;
-    if (!sprite->data[0]) {
+
+    if (!sprite->data[0])
         return TRUE;
-    }
+
     v1 = sprite->data[1];
     v2 = sprite->data[2];
     x = sprite->data[3];
     y = sprite->data[4];
     x += v1;
     y += v2;
-    if (v1 & 1) {
+
+    if (v1 & 1)
         sprite->pos2.x = -(x >> 8);
-    } else {
+    else
         sprite->pos2.x = x >> 8;
-    }
-    if (v2 & 1) {
+
+    if (v2 & 1)
         sprite->pos2.y = -(y >> 8);
-    } else {
+    else
         sprite->pos2.y = y >> 8;
-    }
+
     sprite->data[3] = x;
     sprite->data[4] = y;
     sprite->data[0]--;
     return FALSE;
 }
 
-void sub_8078BB8(struct Sprite *sprite) {
-    if (sub_8078B5C(sprite)) {
+void sub_8078BB8(struct Sprite *sprite)
+{
+    if (sub_8078B5C(sprite))
         SetCallbackToStoredInData(sprite);
-    }
 }
 
-void sub_8078BD4(struct Sprite *sprite) {
+void sub_8078BD4(struct Sprite *sprite)
+{
     int v1 = abs(sprite->data[2] - sprite->data[1]) << 8;
     sprite->data[0] = v1 / sprite->data[0];
     obj_translate_based_on_private_1_2_3_4(sprite);
 }
 
-void sub_8078C00(struct Sprite *sprite) {
+void sub_8078C00(struct Sprite *sprite)
+{
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     sub_8078BD4(sprite);
@@ -912,32 +1040,36 @@ void sub_8078C00(struct Sprite *sprite) {
     sprite->callback(sprite);
 }
 
-void sub_8078C28(struct Sprite *sprite) {
+void sub_8078C28(struct Sprite *sprite)
+{
     int x = sprite->data[2] - sprite->data[1];
     int y = sprite->data[4] - sprite->data[3];
     bool8 x_sign = x < 0;
     bool8 y_sign = y < 0;
     u16 x2 = abs(x) << 4;
     u16 y2 = abs(y) << 4;
+
     x2 /= sprite->data[0];
     y2 /= sprite->data[0];
-    if (x_sign) {
+
+    if (x_sign)
         x2 |= 1;
-    } else {
+    else
         x2 &= ~1;
-    }
-    if (y_sign) {
+
+    if (y_sign)
         y2 |= 1;
-    } else {
+    else
         y2 &= ~1;
-    }
+
     sprite->data[1] = x2;
     sprite->data[2] = y2;
     sprite->data[4] = 0;
     sprite->data[3] = 0;
 }
 
-void sub_8078CC0(struct Sprite *sprite) {
+void sub_8078CC0(struct Sprite *sprite)
+{
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     sub_8078C28(sprite);
@@ -945,46 +1077,51 @@ void sub_8078CC0(struct Sprite *sprite) {
     sprite->callback(sprite);
 }
 
-bool8 sub_8078CE8(struct Sprite *sprite) {
+bool8 sub_8078CE8(struct Sprite *sprite)
+{
     u16 v1, v2, x, y;
-    if (!sprite->data[0]) {
+
+    if (!sprite->data[0])
         return TRUE;
-    }
+
     v1 = sprite->data[1];
     v2 = sprite->data[2];
     x = sprite->data[3];
     y = sprite->data[4];
     x += v1;
     y += v2;
-    if (v1 & 1) {
+
+    if (v1 & 1)
         sprite->pos2.x = -(x >> 4);
-    } else {
+    else
         sprite->pos2.x = x >> 4;
-    }
-    if (v2 & 1) {
+
+    if (v2 & 1)
         sprite->pos2.y = -(y >> 4);
-    } else {
+    else
         sprite->pos2.y = y >> 4;
-    }
+
     sprite->data[3] = x;
     sprite->data[4] = y;
     sprite->data[0]--;
     return FALSE;
 }
 
-void sub_8078D44(struct Sprite *sprite) {
-    if (sub_8078CE8(sprite)) {
+void sub_8078D44(struct Sprite *sprite)
+{
+    if (sub_8078CE8(sprite))
         SetCallbackToStoredInData(sprite);
-    }
 }
 
-void sub_8078D60(struct Sprite *sprite) {
+void sub_8078D60(struct Sprite *sprite)
+{
     int v1 = abs(sprite->data[2] - sprite->data[1]) << 4;
     sprite->data[0] = v1 / sprite->data[0];
     sub_8078C28(sprite);
 }
 
-void sub_8078D8C(struct Sprite *sprite) {
+void sub_8078D8C(struct Sprite *sprite)
+{
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     sub_8078D60(sprite);
@@ -992,16 +1129,17 @@ void sub_8078D8C(struct Sprite *sprite) {
     sprite->callback(sprite);
 }
 
-void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) {
+void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation)
+{
     int i;
     struct ObjAffineSrcData src;
     struct OamMatrix matrix;
+
     src.xScale = xScale;
     src.yScale = yScale;
     src.rotation = rotation;
-    if (sub_8078E38()) {
+    if (sub_8078E38())
         src.xScale = -src.xScale;
-    }
     i = gSprites[sprite].oam.matrixNum;
     ObjAffineSet(&src, &matrix, 1, 2);
     gOamMatrices[i].a = matrix.a;
@@ -1010,31 +1148,33 @@ void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) {
     gOamMatrices[i].d = matrix.d;
 }
 
-bool8 sub_8078E38() {
-    if (IsContest()) {
-        if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */) {
+bool8 sub_8078E38()
+{
+    if (IsContest())
+    {
+        if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */)
             return FALSE;
-        }
         return TRUE;
     }
     return FALSE;
 }
 
-void sub_8078E70(u8 sprite, u8 a2) {
+void sub_8078E70(u8 sprite, u8 a2)
+{
     u8 r7 = gSprites[sprite].data[0];
-    if (IsContest() || IsAnimBankSpriteVisible(r7)) {
+
+    if (IsContest() || IsAnimBankSpriteVisible(r7))
         gSprites[sprite].invisible = FALSE;
-    }
     gSprites[sprite].oam.objMode = a2;
     gSprites[sprite].affineAnimPaused = TRUE;
-    if (!IsContest() && !gSprites[sprite].oam.affineMode) {
+    if (!IsContest() && !gSprites[sprite].oam.affineMode)
         gSprites[sprite].oam.matrixNum = ewram17810[r7].unk6;
-    }
     gSprites[sprite].oam.affineMode = 3;
     CalcCenterToCornerVec(&gSprites[sprite], gSprites[sprite].oam.shape, gSprites[sprite].oam.size, gSprites[sprite].oam.affineMode);
 }
 
-void sub_8078F40(u8 sprite) {
+void sub_8078F40(u8 sprite)
+{
     obj_id_set_rotscale(sprite, 0x100, 0x100, 0);
     gSprites[sprite].oam.affineMode = 1;
     gSprites[sprite].oam.objMode = 0;
@@ -1042,31 +1182,33 @@ void sub_8078F40(u8 sprite) {
     CalcCenterToCornerVec(&gSprites[sprite], gSprites[sprite].oam.shape, gSprites[sprite].oam.size, gSprites[sprite].oam.affineMode);
 }
 
-void sub_8078F9C(u8 sprite) {
+void sub_8078F9C(u8 sprite)
+{
     u16 matrix = gSprites[sprite].oam.matrixNum;
     s16 c = gOamMatrices[matrix].c;
-    if (c < 0) {
+
+    if (c < 0)
         c = -c;
-    }
     gSprites[sprite].pos2.y = c >> 3;
 }
 
 // related to obj_id_set_rotscale
-void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation) {
+void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation)
+{
     int i;
     struct ObjAffineSrcData src;
     struct OamMatrix matrix;
-    if (sprite->oam.affineMode & 1) {
+
+    if (sprite->oam.affineMode & 1)
+    {
         sprite->affineAnimPaused = TRUE;
-        if (a2) {
+        if (a2)
             CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
-        }
         src.xScale = xScale;
         src.yScale = yScale;
         src.rotation = rotation;
-        if (sub_8078E38()) {
+        if (sub_8078E38())
             src.xScale = -src.xScale;
-        }
         i = sprite->oam.matrixNum;
         ObjAffineSet(&src, &matrix, 1, 2);
         gOamMatrices[i].a = matrix.a;
@@ -1076,56 +1218,67 @@ void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 ro
     }
 }
 
-void sub_8079098(struct Sprite *sprite) {
+void sub_8079098(struct Sprite *sprite)
+{
     sub_8078FDC(sprite, TRUE, 0x100, 0x100, 0);
     sprite->affineAnimPaused = FALSE;
     CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
 }
 
-static u16 ArcTan2_(s16 a, s16 b) {
+static u16 ArcTan2_(s16 a, s16 b)
+{
     return ArcTan2(a, b);
 }
 
-u16 sub_80790F0(s16 a, s16 b) {
+u16 sub_80790F0(s16 a, s16 b)
+{
     u16 var = ArcTan2_(a, b);
     return -var;
 }
 
-void sub_8079108(u16 a1, bool8 a2) {
+void sub_8079108(u16 a1, bool8 a2)
+{
     int i;
-    struct Color *c;
-    struct Color *c2;
+    struct PlttData *c;
+    struct PlttData *c2;
     u16 average;
 
     a1 *= 0x10;
 
-    if (!a2) {
-        for (i = 0; i < 0x10; i++) {
-            c = (struct Color *)&gPlttBufferUnfaded[a1 + i];
+    if (!a2)
+    {
+        for (i = 0; i < 0x10; i++)
+        {
+            c = (struct PlttData *)&gPlttBufferUnfaded[a1 + i];
             average = c->r + c->g + c->b;
             average /= 3;
 
-            c2 = (struct Color *)&gPlttBufferFaded[a1 + i];
+            c2 = (struct PlttData *)&gPlttBufferFaded[a1 + i];
             c2->r = average;
             c2->g = average;
             c2->b = average;
         }
-    } else {
+    }
+    else
+    {
         CpuCopy32(&gPlttBufferUnfaded[a1], &gPlttBufferFaded[a1], 0x20);
     }
 }
 
-u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
+u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7)
+{
     u32 var = 0;
     u32 shift;
-    if (a1) {
-        if (!IsContest()) {
+
+    if (a1)
+    {
+        if (!IsContest())
             var = 0xe;
-        } else {
+        else
             var = 1 << sub_80789BC();
-        }
     }
-    if (a2) {
+    if (a2)
+    {
         shift = gAnimBankAttacker + 16;
         var |= 1 << shift;
     }
@@ -1133,62 +1286,70 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
         shift = gAnimBankTarget + 16;
         var |= 1 << shift;
     }
-    if (a4) {
-        if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) {
+    if (a4)
+    {
+        if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+        {
             shift = (gAnimBankAttacker ^ 2) + 16;
             var |= 1 << shift;
         }
     }
-    if (a5) {
-        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) {
+    if (a5)
+    {
+        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
+        {
             shift = (gAnimBankTarget ^ 2) + 16;
             var |= 1 << shift;
         }
     }
-    if (a6) {
-        if (!IsContest()) {
+    if (a6)
+    {
+        if (!IsContest())
             var |= 0x100;
-        } else {
+        else
             var |= 0x4000;
-        }
     }
-    if (a7) {
-        if (!IsContest()) {
+    if (a7)
+    {
+        if (!IsContest())
             var |= 0x200;
-        }
     }
     return var;
 }
 
-u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) {
+u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4)
+{
     u32 var = 0;
     u32 shift;
-    if (IsContest()) {
-        if (a1) {
+
+    if (IsContest())
+    {
+        if (a1)
+        {
             var |= 1 << 18;
             return var;
         }
     } else {
         if (a1) {
-            if (IsAnimBankSpriteVisible(GetBankByPlayerAI(0))) {
-                var |= 1 << (GetBankByPlayerAI(0) + 16);
+            if (IsAnimBankSpriteVisible(GetBankByIdentity(0))) {
+                var |= 1 << (GetBankByIdentity(0) + 16);
             }
         }
         if (a2) {
-            if (IsAnimBankSpriteVisible(GetBankByPlayerAI(2))) {
-                shift = GetBankByPlayerAI(2) + 16;
+            if (IsAnimBankSpriteVisible(GetBankByIdentity(2))) {
+                shift = GetBankByIdentity(2) + 16;
                 var |= 1 << shift;
             }
         }
         if (a3) {
-            if (IsAnimBankSpriteVisible(GetBankByPlayerAI(1))) {
-                shift = GetBankByPlayerAI(1) + 16;
+            if (IsAnimBankSpriteVisible(GetBankByIdentity(1))) {
+                shift = GetBankByIdentity(1) + 16;
                 var |= 1 << shift;
             }
         }
         if (a4) {
-            if (IsAnimBankSpriteVisible(GetBankByPlayerAI(3))) {
-                shift = GetBankByPlayerAI(3) + 16;
+            if (IsAnimBankSpriteVisible(GetBankByIdentity(3))) {
+                shift = GetBankByIdentity(3) + 16;
                 var |= 1 << shift;
             }
         }
@@ -1196,51 +1357,57 @@ u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) {
     return var;
 }
 
-u8 sub_80793A8(u8 a1) {
+u8 sub_80793A8(u8 a1)
+{
     return a1;
 }
 
-u8 unref_sub_80793B0(u8 a1) {
-    return GetBankByPlayerAI(a1);
+u8 unref_sub_80793B0(u8 a1)
+{
+    return GetBankByIdentity(a1);
 }
 
-void sub_80793C4(struct Sprite *sprite) {
+void sub_80793C4(struct Sprite *sprite)
+{
     bool8 var;
-    if (!sprite->data[0]) {
-        if (!gBattleAnimArgs[3]) {
+
+    if (!sprite->data[0])
+    {
+        if (!gBattleAnimArgs[3])
             var = TRUE;
-        } else {
+        else
             var = FALSE;
-        }
-        if (!gBattleAnimArgs[2]) {
+        if (!gBattleAnimArgs[2])
             sub_80787B0(sprite, var);
-        } else {
+        else
             sub_8078764(sprite, var);
-        }
         sprite->data[0]++;
 
-    } else if (sprite->animEnded || sprite->affineAnimEnded) {
+    }
+    else if (sprite->animEnded || sprite->affineAnimEnded)
+    {
         move_anim_8074EE0(sprite);
     }
 }
 
-void sub_807941C(struct Sprite *sprite) {
+void sub_807941C(struct Sprite *sprite)
+{
     bool8 v1;
     u8 v2;
-    if (!(gBattleAnimArgs[5] & 0xff00)) {
+
+    if (!(gBattleAnimArgs[5] & 0xff00))
         v1 = TRUE;
-    } else {
+    else
         v1 = FALSE;
-    }
-    if (!(gBattleAnimArgs[5] & 0xff)) {
+
+    if (!(gBattleAnimArgs[5] & 0xff))
         v2 = 3;
-    } else {
+    else
         v2 = 1;
-    }
+
     sub_80787B0(sprite, v1);
-    if (GetBankSide(gAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
-    }
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
     sprite->data[4] = GetBankPosition(gAnimBankTarget, v2) + gBattleAnimArgs[3];
@@ -1248,11 +1415,11 @@ void sub_807941C(struct Sprite *sprite) {
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
-void sub_80794A8(struct Sprite *sprite) {
+void sub_80794A8(struct Sprite *sprite)
+{
     sub_80787B0(sprite, 1);
-    if (GetBankSide(gAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
-    }
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
@@ -1261,31 +1428,38 @@ void sub_80794A8(struct Sprite *sprite) {
     sprite->callback = sub_8079518;
 }
 
-void sub_8079518(struct Sprite *sprite) {
-    if (sub_8078718(sprite)) {
+void sub_8079518(struct Sprite *sprite)
+{
+    if (sub_8078718(sprite))
         DestroyAnimSprite(sprite);
-    }
 }
 
-void sub_8079534(struct Sprite *sprite) {
+void sub_8079534(struct Sprite *sprite)
+{
     u8 r4, slot, r7;
-    if (!gBattleAnimArgs[6]) {
+
+    if (!gBattleAnimArgs[6])
+    {
         r4 = 1;
         r7 = 3;
-    } else {
+    }
+    else
+    {
         r4 = 0;
         r7 = 1;
     }
-    if (!gBattleAnimArgs[5]) {
+    if (!gBattleAnimArgs[5])
+    {
         sub_80787B0(sprite, r4);
         slot = gAnimBankAttacker;
-    } else {
+    }
+    else
+    {
         sub_8078764(sprite, r4);
         slot = gAnimBankTarget;
     }
-    if (GetBankSide(gAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
-    }
     sub_8078764(sprite, r4);
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = GetBankPosition(slot, 2) + gBattleAnimArgs[2];
@@ -1294,43 +1468,47 @@ void sub_8079534(struct Sprite *sprite) {
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
-s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1) {
+s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1)
+{
     u16 i;
     u8 sprite = GetAnimBankSpriteId(a1);
-    if (sprite != 0xff) {
-        for (i = 0; i < 0x40; i++) {
-            if (gSprites[i].inUse) {
-                continue;
+
+    if (sprite != 0xff)
+    {
+        for (i = 0; i < 0x40; i++)
+        {
+            if (!gSprites[i].inUse)
+            {
+                gSprites[i] = gSprites[sprite];
+                gSprites[i].oam.objMode = 1;
+                gSprites[i].invisible = FALSE;
+                return i;
             }
-            gSprites[i] = gSprites[sprite];
-            gSprites[i].oam.objMode = 1;
-            gSprites[i].invisible = FALSE;
-            return i;
         }
     }
     return -1;
 }
 
-void obj_delete_but_dont_free_vram(struct Sprite *sprite) {
+void obj_delete_but_dont_free_vram(struct Sprite *sprite)
+{
     sprite->usingSheet = TRUE;
     DestroySprite(sprite);
 }
 
-void sub_8079670(u8 task) {
+void sub_8079670(u8 task)
+{
     s16 v1 = 0;
     s16 v2 = 0;
-    if (gBattleAnimArgs[2] > gBattleAnimArgs[0]) {
+
+    if (gBattleAnimArgs[2] > gBattleAnimArgs[0])
         v2 = 1;
-    }
-    if (gBattleAnimArgs[2] < gBattleAnimArgs[0]) {
+    if (gBattleAnimArgs[2] < gBattleAnimArgs[0])
         v2 = -1;
-    }
-    if (gBattleAnimArgs[3] > gBattleAnimArgs[1]) {
+    if (gBattleAnimArgs[3] > gBattleAnimArgs[1])
         v1 = 1;
-    }
-    if (gBattleAnimArgs[3] < gBattleAnimArgs[1]) {
+    if (gBattleAnimArgs[3] < gBattleAnimArgs[1])
         v1 = -1;
-    }
+
     gTasks[task].data[0] = 0;
     gTasks[task].data[1] = gBattleAnimArgs[4];
     gTasks[task].data[2] = 0;
@@ -1344,30 +1522,38 @@ void sub_8079670(u8 task) {
     gTasks[task].func = sub_80796F8;
 }
 
-void sub_80796F8(u8 taskId) {
+void sub_80796F8(u8 taskId)
+{
     struct Task *task = &gTasks[taskId];
-    if (++task->data[0] > task->data[1]) {
+
+    if (++task->data[0] > task->data[1])
+    {
         task->data[0] = 0;
-        if (++task->data[2] & 1) {
-            if (task->data[3] != task->data[7]) {
+        if (++task->data[2] & 1)
+        {
+            if (task->data[3] != task->data[7])
                 task->data[3] += task->data[5];
-            }
-        } else {
-            if (task->data[4] != task->data[8]) {
+        }
+        else
+        {
+            if (task->data[4] != task->data[8])
                 task->data[4] += task->data[6];
-            }
         }
         REG_BLDALPHA = (task->data[4] << 8) | task->data[3];
-        if (task->data[3] == task->data[7] && task->data[4] == task->data[8]) {
+        if (task->data[3] == task->data[7] && task->data[4] == task->data[8])
+        {
             DestroyAnimVisualTask(taskId);
             return;
         }
     }
 }
 
-void sub_8079790(u8 task) {
+void sub_8079790(u8 task)
+{
     u8 sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
-    if (sprite == 0xff) {
+
+    if (sprite == 0xff)
+    {
         DestroyAnimVisualTask(task);
         return;
     }
@@ -1375,7 +1561,8 @@ void sub_8079790(u8 task) {
     sub_80797EC(&gTasks[task]);
 }
 
-void sub_80797EC(struct Task *task) {
+void sub_80797EC(struct Task *task)
+{
     task->data[1] = gBattleAnimArgs[1];
     task->data[2] = 0;
     task->data[3] = gBattleAnimArgs[2];
@@ -1386,24 +1573,33 @@ void sub_80797EC(struct Task *task) {
     task->func = sub_8079814;
 }
 
-void sub_8079814(u8 taskId) {
+void sub_8079814(u8 taskId)
+{
     struct Task *task = &gTasks[taskId];
-    if (++task->data[4] >= task->data[5]) {
+
+    if (++task->data[4] >= task->data[5])
+    {
         task->data[4] = 0;
-        if (!task->data[6]) {
+        if (!task->data[6])
+        {
             task->data[2]++;
             BlendPalette(task->data[0], 0xf, task->data[2], task->data[1]);
-            if (task->data[2] == task->data[3]) {
+            if (task->data[2] == task->data[3])
                 task->data[6] = 1;
-            }
-        } else {
+        }
+        else
+        {
             task->data[2]--;
             BlendPalette(task->data[0], 0xf, task->data[2], task->data[1]);
-            if (!task->data[2]) {
-                if (--task->data[7]) {
+            if (!task->data[2])
+            {
+                if (--task->data[7])
+                {
                     task->data[4] = 0;
                     task->data[6] = 0;
-                } else {
+                }
+                else
+                {
                     DestroyAnimVisualTask(taskId);
                     return;
                 }
@@ -1412,9 +1608,12 @@ void sub_8079814(u8 taskId) {
     }
 }
 
-void sub_80798AC(u8 task) {
+void sub_80798AC(u8 task)
+{
     u8 palette = IndexOfSpritePaletteTag(gBattleAnimArgs[0]);
-    if (palette == 0xff) {
+
+    if (palette == 0xff)
+    {
         DestroyAnimVisualTask(task);
         return;
     }
@@ -1422,7 +1621,8 @@ void sub_80798AC(u8 task) {
     sub_80797EC(&gTasks[task]);
 }
 
-void sub_80798F4(struct Task *task, u8 a2, const void *a3) {
+void sub_80798F4(struct Task *task, u8 a2, const void *a3)
+{
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[9] = 0;
@@ -1434,11 +1634,14 @@ void sub_80798F4(struct Task *task, u8 a2, const void *a3) {
     sub_8078E70(a2, 0);
 }
 
-bool8 sub_807992C(struct Task *task) {
+bool8 sub_807992C(struct Task *task)
+{
     gUnknown_0202F7D4 = sub_8079BFC(task->data[13], task->data[14]) + (task->data[7] << 3);
-    switch (gUnknown_0202F7D4->type) {
+    switch (gUnknown_0202F7D4->type)
+    {
     default:
-        if (!gUnknown_0202F7D4->frame.duration) {
+        if (!gUnknown_0202F7D4->frame.duration)
+        {
             task->data[10] = gUnknown_0202F7D4->frame.xScale;
             task->data[11] = gUnknown_0202F7D4->frame.yScale;
             task->data[12] = gUnknown_0202F7D4->frame.rotation;
@@ -1450,44 +1653,49 @@ bool8 sub_807992C(struct Task *task) {
         task->data[12] += gUnknown_0202F7D4->frame.rotation;
         obj_id_set_rotscale(task->data[15], task->data[10], task->data[11], task->data[12]);
         sub_8079A64(task->data[15]);
-        if (++task->data[8] >= gUnknown_0202F7D4->frame.duration) {
+        if (++task->data[8] >= gUnknown_0202F7D4->frame.duration)
+        {
             task->data[8] = 0;
             task->data[7]++;
         }
         break;
-
     case AFFINEANIMCMDTYPE_JUMP:
         task->data[7] = gUnknown_0202F7D4->jump.target;
         break;
-
     case AFFINEANIMCMDTYPE_LOOP:
-        if (gUnknown_0202F7D4->loop.count) {
-            if (task->data[9]) {
-                if (!--task->data[9]) {
+        if (gUnknown_0202F7D4->loop.count)
+        {
+            if (task->data[9])
+            {
+                if (!--task->data[9])
+                {
                     task->data[7]++;
                     break;
                 }
-            } else {
+            }
+            else
+            {
                 task->data[9] = gUnknown_0202F7D4->loop.count;
             }
-            if (!task->data[7]) {
+            if (!task->data[7])
+            {
                 break;
             }
-            for (;;) {
+            for (;;)
+            {
                 task->data[7]--;
                 gUnknown_0202F7D4--;
-                if (gUnknown_0202F7D4->type == AFFINEANIMCMDTYPE_LOOP) {
+                if (gUnknown_0202F7D4->type == AFFINEANIMCMDTYPE_LOOP)
+                {
                     task->data[7]++;
                     return TRUE;
                 }
-                if (!task->data[7]) {
+                if (!task->data[7])
                     return TRUE;
-                }
             }
         }
         task->data[7]++;
         break;
-
     case 0x7fff:
         gSprites[task->data[15]].pos2.y = 0;
         sub_8078F40(task->data[15]);
@@ -1497,52 +1705,62 @@ bool8 sub_807992C(struct Task *task) {
     return TRUE;
 }
 
-void sub_8079A64(u8 sprite) {
+void sub_8079A64(u8 sprite)
+{
     int var = 0x40 - sub_8079B10(sprite) * 2;
     u16 matrix = gSprites[sprite].oam.matrixNum;
     int var2 = (var << 8) / gOamMatrices[matrix].d;
-    if (var2 > 0x80) {
+
+    if (var2 > 0x80)
         var2 = 0x80;
-    }
     gSprites[sprite].pos2.y = (var - var2) / 2;
 }
 
-void sub_8079AB8(u8 sprite, u8 sprite2) {
+void sub_8079AB8(u8 sprite, u8 sprite2)
+{
     int var = 0x40 - sub_8079B10(sprite2) * 2;
     u16 matrix = gSprites[sprite].oam.matrixNum;
     int var2 = (var << 8) / gOamMatrices[matrix].d;
-    if (var2 > 0x80) {
+
+    if (var2 > 0x80)
         var2 = 0x80;
-    }
     gSprites[sprite].pos2.y = (var - var2) / 2;
 }
 
-u16 sub_8079B10(u8 sprite) {
+u16 sub_8079B10(u8 sprite)
+{
     struct TransformStatus *transform;
     u8 slot = gSprites[sprite].data[0];
     u16 species;
     u16 i;
-    for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) {
-        if (gBattleMonSprites[i] == sprite) {
-            if (IsContest()) {
-                species = ewram19348.unk0;
+
+    for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++)
+    {
+        if (gBattleMonSprites[i] == sprite)
+        {
+            if (IsContest())
+            {
+                species = shared19348.unk0;
                 return gMonBackPicCoords[species].y_offset;
-            } else {
-                if (!GetBankSide(i)) {
+            }
+            else
+            {
+                if (!GetBankSide(i))
+                {
                     transform = &eTransformStatuses[slot];
-                    if (!transform->species) {
+                    if (!transform->species)
                         species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES);
-                    } else {
+                    else
                         species = transform->species;
-                    }
                     return gMonBackPicCoords[species].y_offset;
-                } else {
+                }
+                else
+                {
                     transform = &eTransformStatuses[slot];
-                    if (!transform->species) {
+                    if (!transform->species)
                         species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES);
-                    } else {
+                    else
                         species = transform->species;
-                    }
                     return gMonFrontPicCoords[species].y_offset;
                 }
             }
@@ -1551,19 +1769,22 @@ u16 sub_8079B10(u8 sprite) {
     return 0x40;
 }
 
-void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr) {
+void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr)
+{
     *bottom = ((intptr_t) ptr) & 0xffff;
     *top = (((intptr_t) ptr) >> 16) & 0xffff;
 }
 
-void *sub_8079BFC(s16 bottom, s16 top) {
+void *sub_8079BFC(s16 bottom, s16 top)
+{
     return (void *)((u16)bottom | ((u16)top << 16));
 }
 
 
 // possible new file
 
-void sub_8079C08(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7) {
+void sub_8079C08(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7)
+{
     task->data[8] = a7;
     task->data[15] = a2; // spriteId
     task->data[9] = a3;
@@ -1574,124 +1795,133 @@ void sub_8079C08(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a
     task->data[12] = (a6 - a4) / a7;
 }
 
-u8 sub_8079C74(struct Task *task) {
-    if (!task->data[8]) {
+u8 sub_8079C74(struct Task *task)
+{
+    if (!task->data[8])
         return 0;
-    }
-    if (--task->data[8]) {
+        
+    if (--task->data[8] != 0)
+    {
         task->data[9] += task->data[11];
         task->data[10] += task->data[12];
-    } else {
+    }
+    else
+    {
         task->data[9] = task->data[13];
         task->data[10] = task->data[14];
     }
     obj_id_set_rotscale(task->data[15], task->data[9], task->data[10], 0);
-    if (task->data[8]) {
+    if (task->data[8])
         sub_8079A64(task->data[15]);
-    } else {
+    else
         gSprites[task->data[15]].pos2.y = 0;
-    }
     return task->data[8];
 }
 
-void sub_8079CEC(u8 task) {
+void sub_8079CEC(u8 task)
+{
     u16 v1;
-    if (gAnimFriendship <= 30) {
+
+    if (gAnimFriendship <= 30)
         v1 = 0;
-    } else if (gAnimFriendship <= 100) {
+    else if (gAnimFriendship <= 100)
         v1 = 1;
-    } else if (gAnimFriendship <= 200) {
+    else if (gAnimFriendship <= 200)
         v1 = 2;
-    } else {
+    else
         v1 = 3;
-    }
     gBattleAnimArgs[7] = v1;
     DestroyAnimVisualTask(task);
 }
 
-void unref_sub_8079D20(u8 priority) {
-    if (IsAnimBankSpriteVisible(gAnimBankTarget)) {
+void unref_sub_8079D20(u8 priority)
+{
+    if (IsAnimBankSpriteVisible(gAnimBankTarget))
         gSprites[gBattleMonSprites[gAnimBankTarget]].oam.priority = priority;
-    }
-    if (IsAnimBankSpriteVisible(gAnimBankAttacker)) {
+    if (IsAnimBankSpriteVisible(gAnimBankAttacker))
         gSprites[gBattleMonSprites[gAnimBankAttacker]].oam.priority = priority;
-    }
-    if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) {
+    if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
         gSprites[gBattleMonSprites[gAnimBankTarget ^ 2]].oam.priority = priority;
-    }
-    if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) {
+    if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
         gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority;
-    }
 }
 
-void sub_8079E24() {
+void sub_8079E24()
+{
     int i;
-    for (i = 0; i < gNoOfAllBanks; i++) {
-        if (IsAnimBankSpriteVisible(i)) {
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+    {
+        if (IsAnimBankSpriteVisible(i))
+        {
             gSprites[gBattleMonSprites[i]].subpriority = sub_8079E90(i);
             gSprites[gBattleMonSprites[i]].oam.priority = 2;
         }
     }
 }
 
-u8 sub_8079E90(u8 slot) {
+u8 sub_8079E90(u8 slot)
+{
     u8 status;
     u8 ret;
-    if (IsContest()) {
-        if (slot == 2) {
+
+    if (IsContest())
+    {
+        if (slot == 2)
             return 30;
-        } else {
+        else
             return 40;
-        }
-    } else {
+    }
+    else
+    {
         status = GetBankIdentity(slot);
-        if (status == 0) {
+        if (status == 0)
             ret = 30;
-        } else if (status == 2) {
+        else if (status == 2)
             ret = 20;
-        } else if (status == 1) {
+        else if (status == 1)
             ret = 40;
-        } else {
+        else
             ret = 50;
-        }
     }
     return ret;
 }
 
-u8 sub_8079ED4(u8 slot) {
+u8 sub_8079ED4(u8 slot)
+{
     u8 status = GetBankIdentity(slot);
-    if (IsContest()) {
+
+    if (IsContest())
         return 2;
-    }
-    if (status == 0 || status == 3) {
+    if (status == 0 || status == 3)
         return BG2CNT.priority;
-    } else {
+    else
         return BG1CNT.priority;
-    }
 }
 
-u8 GetBankIdentity_permutated(u8 slot) {
+u8 GetBankIdentity_permutated(u8 slot)
+{
     u8 status;
-    if (!IsContest()) {
+
+    if (!IsContest())
+    {
         status = GetBankIdentity(slot);
-        if (status == 0 || status == 3) {
+        if (status == 0 || status == 3)
             return 2;
-        } else {
+        else
             return 1;
-        }
     }
     return 1;
 }
 
-u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, u32 a8) {
-    void *src;
-    void *dest;
-    int size;
-
+u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, u32 a8)
+{
     u8 sprite;
     u16 sheet = LoadSpriteSheet(&gUnknown_0837F5E0[a3]);
     u16 palette = AllocSpritePalette(gSpriteTemplate_837F5B0[a3].paletteTag);
-    if (!isBackpic) {
+
+    if (!isBackpic)
+    {
         LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(species, a8, a7), (palette * 0x10) + 0x100, 0x20);
         LoadSpecialPokePic(
             &gMonFrontPicTable[species],
@@ -1703,9 +1933,10 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7,
             a7,
             1
         );
-    } else {
-        LoadCompressedPalette(
-            GetMonSpritePalFromOtIdPersonality(species, a8, a7), (palette * 0x10) + 0x100, 0x20);
+    }
+    else
+    {
+        LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(species, a8, a7), (palette * 0x10) + 0x100, 0x20);
         LoadSpecialPokePic(
             &gMonBackPicTable[species],
             gMonBackPicCoords[species].coords,
@@ -1718,28 +1949,28 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7,
         );
     }
 
-    src = (void *)0x2000000;
-    dest = (void *)(0x6010000 + (sheet * 0x20));
-    size = 0x800;
-    DmaCopy32(3, src, dest, size);
+    DmaCopy32Defvars(3, (void *)0x2000000, (void *)(VRAM + 0x10000 + (sheet * 0x20)), 0x800);
 
-    if (!isBackpic) {
+    if (!isBackpic)
         sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonFrontPicCoords[species].y_offset, a6);
-    } else {
+    else
         sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6);
-    }
-    if (IsContest()) {
+
+    if (IsContest())
+    {
         gSprites[sprite].affineAnims = gSpriteAffineAnimTable_81E7C18;
         StartSpriteAffineAnim(&gSprites[sprite], 0);
     }
     return sprite;
 }
 
-void sub_807A0F4(struct Sprite *sprite) {
+void sub_807A0F4(struct Sprite *sprite)
+{
     DestroySpriteAndFreeResources(sprite);
 }
 
-int sub_807A100(u8 slot, u8 a2) {
+int sub_807A100(u8 slot, u8 a2)
+{
     u16 species;
     u32 personality;
     u16 letter;
@@ -1747,80 +1978,113 @@ int sub_807A100(u8 slot, u8 a2) {
     int ret;
     const struct MonCoords *coords;
     struct TransformStatus *transform;
-    if (IsContest()) {
-        if (ewram19348.unk4 & 1) {
-            species = ewram19348.unk2;
-            personality = ewram19348.unk10;
-        } else {
-            species = ewram19348.unk0;
-            personality = ewram19348.unk8;
+
+    if (IsContest())
+    {
+        if (shared19348.unk4_0)
+        {
+            species = shared19348.unk2;
+            personality = shared19348.unk10;
         }
-        if (species == SPECIES_UNOWN) {
+        else
+        {
+            species = shared19348.unk0;
+            personality = shared19348.unk8;
+        }
+        if (species == SPECIES_UNOWN)
+        {
             letter = GET_UNOWN_LETTER(personality);
-            if (!letter) {
+            if (!letter)
                 var = SPECIES_UNOWN;
-            } else {
+            else
                 var = letter + SPECIES_UNOWN_B - 1;
-            }
             coords = &gMonBackPicCoords[var];
-        } else if (species == SPECIES_CASTFORM) {
+        }
+        else if (species == SPECIES_CASTFORM)
+        {
             coords = &gCastformFrontSpriteCoords[gBattleMonForms[slot]];
-        } else if (species <= SPECIES_EGG) {
+        }
+        else if (species <= SPECIES_EGG)
+        {
             coords = &gMonBackPicCoords[species];
-        } else {
+        }
+        else
+        {
             coords = &gMonBackPicCoords[0];
         }
-    } else {
-        if (!GetBankSide(slot)) {
+    }
+    else
+    {
+        if (!GetBankSide(slot))
+        {
             transform = &eTransformStatuses[slot];
-            if (!transform->species) {
+            if (!transform->species)
+            {
                 species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
                 personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY);
-            } else {
+            }
+            else
+            {
                 species = transform->species;
                 personality = gTransformPersonalities[slot];
             }
-            if (species == SPECIES_UNOWN) {
+            if (species == SPECIES_UNOWN)
+            {
                 letter = GET_UNOWN_LETTER(personality);
-                if (!letter) {
+                if (!letter)
                     var = SPECIES_UNOWN;
-                } else {
+                else
                     var = letter + SPECIES_UNOWN_B - 1;
-                }
                 coords = &gMonBackPicCoords[var];
-            } else if (species > SPECIES_EGG) {
+            }
+            else if (species > SPECIES_EGG)
+            {
                 coords = &gMonBackPicCoords[0];
-            } else {
+            }
+            else
+            {
                 coords = &gMonBackPicCoords[species];
             }
-        } else {
+        }
+        else
+        {
             transform = &eTransformStatuses[slot];
-            if (!transform->species) {
+            if (!transform->species)
+            {
                 species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
                 personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY);
-            } else {
+            }
+            else
+            {
                 species = transform->species;
                 personality = gTransformPersonalities[slot];
             }
-            if (species == SPECIES_UNOWN) {
+            if (species == SPECIES_UNOWN)
+            {
                 letter = GET_UNOWN_LETTER(personality);
-                if (!letter) {
+                if (!letter)
                     var = SPECIES_UNOWN;
-                } else {
+                else
                     var = letter + SPECIES_UNOWN_B - 1;
-                }
                 coords = &gMonFrontPicCoords[var];
-            } else if (species == SPECIES_CASTFORM) {
+            }
+            else if (species == SPECIES_CASTFORM)
+            {
                 coords = &gCastformFrontSpriteCoords[gBattleMonForms[slot]];
-            } else if (species > SPECIES_EGG) {
+            }
+            else if (species > SPECIES_EGG)
+            {
                 coords = &gMonFrontPicCoords[0];
-            } else {
+            }
+            else
+            {
                 coords = &gMonFrontPicCoords[species];
             }
         }
     }
 
-    switch (a2) {
+    switch (a2)
+    {
     case 0:
         return (coords->coords & 0xf) * 8;
     case 1:
@@ -1841,23 +2105,31 @@ int sub_807A100(u8 slot, u8 a2) {
     }
 }
 
-void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) {
+void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4)
+{
     u8 v1, v2;
     s16 v3, v4;
     s16 v5, v6;
-    if (!a2) {
+
+    if (!a2)
+    {
         v1 = 0;
         v2 = 1;
-    } else {
+    }
+    else
+    {
         v1 = 2;
         v2 = 3;
     }
     v3 = GetBankPosition(slot, v1);
     v4 = GetBankPosition(slot, v2);
-    if (IsDoubleBattle() && !IsContest()) {
+    if (IsDoubleBattle() && !IsContest())
+    {
         v5 = GetBankPosition(slot ^ 2, v1);
         v6 = GetBankPosition(slot ^ 2, v2);
-    } else {
+    }
+    else
+    {
         v5 = v3;
         v6 = v4;
     }
@@ -1865,7 +2137,8 @@ void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) {
     *a4 = (v4 + v6) / 2;
 }
 
-u8 sub_807A4A0(int a1, u8 sprite, int a3) {
+u8 sub_807A4A0(int a1, u8 sprite, int a3)
+{
     u8 new_sprite = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
     gSprites[new_sprite] = gSprites[sprite];
     gSprites[new_sprite].usingSheet = TRUE;
@@ -1876,13 +2149,17 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3) {
     return new_sprite;
 }
 
-void sub_807A544(struct Sprite *sprite) {
+void sub_807A544(struct Sprite *sprite)
+{
     sub_8078650(sprite);
-    if (GetBankSide(gAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker))
+    {
         sprite->pos1.x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
         sprite->hFlip = TRUE;
-    } else {
+    }
+    else
+    {
         sprite->pos1.x += gBattleAnimArgs[0];
     }
     sprite->pos1.y += gBattleAnimArgs[1];
@@ -1894,11 +2171,15 @@ void sub_807A544(struct Sprite *sprite) {
     sprite->callback = sub_8078504;
 }
 
-void sub_807A5C4(struct Sprite *sprite) {
-    if (GetBankSide(gAnimBankAttacker)) {
+void sub_807A5C4(struct Sprite *sprite)
+{
+    if (GetBankSide(gAnimBankAttacker))
+    {
         sprite->pos1.x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] *= -1;
-    } else {
+    }
+    else
+    {
         sprite->pos1.x += gBattleAnimArgs[0];
     }
     sprite->pos1.y += gBattleAnimArgs[1];
@@ -1911,19 +2192,20 @@ void sub_807A5C4(struct Sprite *sprite) {
     sprite->callback = sub_8078504;
 }
 
-void sub_807A63C(struct Sprite *sprite) {
+void sub_807A63C(struct Sprite *sprite)
+{
     sub_8078650(sprite);
-    if (GetBankSide(gAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker))
         sprite->pos1.x -= gBattleAnimArgs[0];
-    } else {
+    else
         sprite->pos1.x += gBattleAnimArgs[0];
-    }
     sprite->pos1.y += gBattleAnimArgs[1];
     sprite->callback = sub_8078600;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
-void sub_807A69C(u8 taskId) {
+void sub_807A69C(u8 taskId)
+{
     u16 src;
     u16 dest;
     struct Task *task = &gTasks[taskId];
@@ -1938,23 +2220,25 @@ void sub_807A69C(u8 taskId) {
     dest = (task->data[4] + 0x10) * 0x10;
     src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10;
     task->data[6] = sub_8079E90(gAnimBankAttacker);
-    if (task->data[6] == 20 || task->data[6] == 40) {
+    if (task->data[6] == 20 || task->data[6] == 40)
         task->data[6] = 2;
-    } else {
+    else
         task->data[6] = 3;
-    }
     CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], 0x20);
     BlendPalette(dest, 0x10, gBattleAnimArgs[1], gBattleAnimArgs[0]);
     task->func = sub_807A784;
 }
 
-void sub_807A784(u8 taskId) {
+void sub_807A784(u8 taskId)
+{
     struct Task *task = &gTasks[taskId];
-    switch (task->data[2]) {
+    switch (task->data[2])
+    {
     case 0:
         sub_807A850(task, taskId);
         gSprites[task->data[0]].pos2.x += task->data[1];
-        if (++task->data[3] == 5) {
+        if (++task->data[3] == 5)
+        {
             task->data[3]--;
             task->data[2]++;
         }
@@ -1962,13 +2246,15 @@ void sub_807A784(u8 taskId) {
     case 1:
         sub_807A850(task, taskId);
         gSprites[task->data[0]].pos2.x -= task->data[1];
-        if (--task->data[3] == 0) {
+        if (--task->data[3] == 0)
+        {
             gSprites[task->data[0]].pos2.x = 0;
             task->data[2]++;
         }
         break;
     case 2:
-        if (!task->data[5]) {
+        if (!task->data[5])
+        {
             FreeSpritePaletteByTag(10097);
             DestroyAnimVisualTask(taskId);
         }
@@ -1976,9 +2262,11 @@ void sub_807A784(u8 taskId) {
     }
 }
 
-void sub_807A850(struct Task *task, u8 taskId) {
+void sub_807A850(struct Task *task, u8 taskId)
+{
     s16 sprite = duplicate_obj_of_side_rel2move_in_transparent_mode(0);
-    if (sprite >= 0) {
+    if (sprite >= 0)
+    {
         gSprites[sprite].oam.priority = task->data[6];
         gSprites[sprite].oam.paletteNum = task->data[4];
         gSprites[sprite].data[0] = 8;
@@ -1990,8 +2278,10 @@ void sub_807A850(struct Task *task, u8 taskId) {
     }
 }
 
-void sub_807A8D4(struct Sprite *sprite) {
-    if (--sprite->data[0] == 0) {
+void sub_807A8D4(struct Sprite *sprite)
+{
+    if (--sprite->data[0] == 0)
+    {
         gTasks[sprite->data[1]].data[5]--;
         obj_delete_but_dont_free_vram(sprite);
     }
@@ -2000,38 +2290,40 @@ void sub_807A8D4(struct Sprite *sprite) {
 void sub_807A908(struct Sprite *sprite) {
     sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
     sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
-    if (!GetBankSide(gAnimBankAttacker)) {
+    if (!GetBankSide(gAnimBankAttacker))
         sprite->data[0] = 5;
-    } else {
+    else
         sprite->data[0] = -10;
-    }
     sprite->data[1] = -40;
     sprite->callback = sub_807A960;
 }
 
-void sub_807A960(struct Sprite *sprite) {
+void sub_807A960(struct Sprite *sprite)
+{
     sprite->data[2] += sprite->data[0];
     sprite->data[3] += sprite->data[1];
     sprite->pos2.x = sprite->data[2] / 10;
     sprite->pos2.y = sprite->data[3] / 10;
-    if (sprite->data[1] < -20) {
+    if (sprite->data[1] < -20)
         sprite->data[1]++;
-    }
-    if ((sprite->pos1.y + sprite->pos2.y) < -32) {
+    if (sprite->pos1.y + sprite->pos2.y < -32)
         DestroyAnimSprite(sprite);
-    }
 }
 
-void sub_807A9BC(struct Sprite *sprite) {
+void sub_807A9BC(struct Sprite *sprite)
+{
     int x;
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4];
     sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5];
-    if (!GetBankSide(gAnimBankTarget)) {
+    if (!GetBankSide(gAnimBankTarget))
+    {
         x = (u16)gBattleAnimArgs[4] + 30;
         sprite->pos1.x += x;
         sprite->pos1.y = gBattleAnimArgs[5] - 20;
-    } else {
+    }
+    else
+    {
         x = (u16)gBattleAnimArgs[4] - 30;
         sprite->pos1.x += x;
         sprite->pos1.y = gBattleAnimArgs[5] - 80;
diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c
new file mode 100644
index 000000000..52a0aeebf
--- /dev/null
+++ b/src/scene/cable_car.c
@@ -0,0 +1,979 @@
+
+// Includes
+#include "global.h"
+#include "ewram.h"
+#include "overworld.h"
+#include "palette.h"
+#include "random.h"
+#include "main.h"
+#include "script.h"
+#include "task.h"
+#include "sound.h"
+#include "graphics.h"
+#include "constants/songs.h"
+#include "decompress.h"
+#include "field_weather.h"
+#include "field_map_obj.h"
+#include "unknown_task.h"
+#include "event_data.h"
+#include "cable_car_util.h"
+#include "constants/map_objects.h"
+
+// Static type declarations
+
+// Credits to Made (dolphin emoji)
+#define S16TOPOSFLOAT(val)   \
+({                           \
+    s16 v = (val);           \
+    float f = (float)v;      \
+    if(v < 0) f += 65536.0f; \
+    f;                       \
+})
+
+struct CableCarEwramStruct1 {
+    u8 unk_0000;
+    u8 unk_0001;
+    u8 unk_0002;
+    u8 unk_0003;
+    u16 unk_0004;
+    u16 unk_0006;
+    u8 unk_0008;
+    u8 unk_0009;
+    u8 filler_000a[2];
+    u8 unk_000c;
+    u8 unk_000d;
+    u8 filler_0000e[6];
+    u8 unk_0014;
+    u8 unk_0015;
+    u8 unk_0016;
+    u8 unk_0017;
+    u8 unk_0018;
+    u8 unk_0019;
+    u8 unk_001a;
+    u8 unk_001b;
+    u8 unk_001c;
+    u8 unk_001d;
+    u8 unk_001e;
+    u8 unk_001f;
+    u8 unk_0020;
+    u16 unk_0022[9][12];
+    u8 filler_00fa[2];
+    u16 unk_00fc[0x20][0x20];
+    u16 unk_08fc[0x20][0x20];
+}; // size 0x10FC
+
+struct CableCarEwramStruct2 {
+    /* 0x000 */ u16 mtChimneyTilemap[0xb4];
+    /* 0x168 */ u16 treeTilemap[0x1e0];
+    /* 0x528 */ u16 mountainTilemap[0x258];
+    /* 0x9d8 */ u16 pylonStemTilemap[0x628]; // size not actually known
+};
+
+// Static RAM declarations
+
+EWRAM_DATA struct CableCarEwramStruct1 *sCableCarPtr = NULL;
+EWRAM_DATA u8 gUnknown_02039278 = 0;
+EWRAM_DATA u8 gUnknown_02039279 = 0;
+EWRAM_DATA u8 gUnknown_0203927A = 0;
+EWRAM_DATA u8 gUnknown_0203927B = 0;
+EWRAM_DATA u8 gUnknown_0203927C = 0;
+EWRAM_DATA u8 gUnknown_0203927D = 0;
+EWRAM_DATA u32 filler_02039280 = 0;
+
+// Static ROM declarations
+
+static void CableCarMainCallback_Setup(void);
+static void CableCarMainCallback_Run(void);
+static void sub_8123878(u8 taskId);
+static void sub_81239E4(u8 taskId);
+static void sub_8123AF8(u8 taskId);
+static void CableCarVblankCallback(void);
+static void nullsub_76(struct Sprite *sprite);
+static void sub_8123CB8(struct Sprite *sprite);
+static void sub_8123EB8(struct Sprite *sprite);
+static void sub_8123F44(struct Sprite *sprite);
+static void sub_8123FBC(u8);
+static void LoadSprites(void);
+static void sub_812453C(void);
+static void sub_8124598(void);
+static void sub_81245F4(void);
+static void sub_812476C(void);
+static void sub_81248AC(u8);
+
+// .rodata
+
+static const u8 gCableCarMtChimneyTilemap[] = INCBIN_U8("graphics/misc/cable_car_mt_chimney_map.bin.lz");
+
+static const u8 gCableCarTreeTilemap[] = INCBIN_U8("graphics/misc/cable_car_tree_map.bin.lz");
+
+static const u8 gCableCarMountainTilemap[] = INCBIN_U8("graphics/misc/cable_car_mountain_map.bin.lz");
+
+static const u16 gCableCarPylonHookTilemapEntries[] = {
+    0x3000,
+    0x3001,
+    0x3002,
+    0x3003,
+    0x3004,
+    0x3005,
+    0x3006,
+    0x3007,
+    0x3008,
+    0x3009
+};
+
+static const u8 gCableCarPylonStemTilemap[] = INCBIN_U8("graphics/misc/cable_car_pylon_stem_map.bin.lz");
+
+static const struct CompressedSpriteSheet gUnknown_08401CF8[] = {
+    { gCableCar_Gfx,     0x800, 1 },
+    { gCableCarDoor_Gfx,  0x40, 2 },
+    { gCableCarCord_Gfx,  0x80, 3 },
+    {                             }
+};
+static const struct SpritePalette gUnknown_08401D18[] = {
+    { gCableCar_Pal, 1 },
+    {                  }
+};
+
+static const struct OamData gOamData_8401D28 = {
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .size = 3,
+    .priority = 2
+};
+
+static const struct OamData gOamData_8401D30 = {
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .shape = ST_OAM_H_RECTANGLE,
+    .priority = 2
+};
+
+static const struct OamData gOamData_8401D38 = {
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .size = 1,
+    .priority = 2
+};
+
+static const struct SpriteTemplate gSpriteTemplate_8401D40[] = {
+    {
+        1,
+        1,
+        &gOamData_8401D28,
+        gDummySpriteAnimTable,
+        NULL,
+        gDummySpriteAffineAnimTable,
+        sub_8123CB8
+    }, {
+        2,
+        1,
+        &gOamData_8401D30,
+        gDummySpriteAnimTable,
+        NULL,
+        gDummySpriteAffineAnimTable,
+        sub_8123CB8
+    }, {
+        3,
+        1,
+        &gOamData_8401D38,
+        gDummySpriteAnimTable,
+        NULL,
+        gDummySpriteAffineAnimTable,
+        nullsub_76
+    }
+};
+
+// .text
+
+static void CableCarTask1(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(CableCarMainCallback_Setup);
+        DestroyTask(taskId);
+    }
+}
+
+void CableCar(void)
+{
+    ScriptContext2_Enable();
+    CreateTask(CableCarTask1, 1);
+    BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+}
+
+static void CableCarMainCallback_Setup(void)
+{
+    u8 i;
+    u16 imebak;
+
+    switch (gMain.state)
+    {
+        case 0:
+        default:
+            SetVBlankCallback(NULL);
+            remove_some_task();
+            DmaFill16Large(3, 0, VRAM, VRAM_SIZE, 0x1000);
+            DmaFill32Defvars(3, 0, OAM, OAM_SIZE);
+            DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE);
+            sCableCarPtr = eCableCar1;
+            DmaFill16Large(3, 0, eCableCar1, 0x10FC, 0x1000);
+            gMain.state++;
+            break;
+        case 1:
+            ResetSpriteData();
+            ResetTasks();
+            FreeAllSpritePalettes();
+            ResetPaletteFade();
+            StartWeather();
+            for (i = 0; i < 20; i++)
+            {
+                gWeatherPtr->sprites.s2.ashSprites[i] = NULL;
+            }
+            InitMapMusic();
+            ResetMapMusic();
+            gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0;
+            gMain.state++;
+            break;
+        case 2:
+            for (i = 0; i < 3; i++)
+            {
+                LoadCompressedObjectPic(&gUnknown_08401CF8[i]);
+            }
+            LoadSpritePalettes(gUnknown_08401D18);
+            LZDecompressWram(gCableCarMtChimneyTilemap, eCableCar2->mtChimneyTilemap);
+            LZDecompressWram(gCableCarTreeTilemap, eCableCar2->treeTilemap);
+            LZDecompressWram(gCableCarMountainTilemap, eCableCar2->mountainTilemap);
+            LZDecompressWram(gCableCarPylonStemTilemap, eCableCar2->pylonStemTilemap);
+            LoadPalette(gCableCarBG_Pal, 0, 0x80);
+            LZ77UnCompVram(gCableCarBG_Gfx, (u16 *)BG_VRAM);
+            gMain.state++;
+            break;
+        case 3:
+            LoadSprites();
+            RunTasks();
+            gMain.state++;
+            break;
+        case 4:
+            if (sCableCarPtr->unk_0002 == 7)
+            {
+                gMain.state++;
+            }
+            else if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL)
+            {
+                for (i = 0; i < 20; i++)
+                {
+                    if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL)
+                    {
+                        gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0;
+                    }
+                }
+                gMain.state++;
+            }
+            break;
+        case 5:
+            CableCarUtil_CopyWrapped((void *)BG_SCREEN_ADDR(29), eCableCar2->treeTilemap, 0, 17, 32, 15);
+            CableCarUtil_CopyWrapped((void *)BG_SCREEN_ADDR(30), eCableCar2->mountainTilemap, 0, 0, 30, 20);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 20);
+            gMain.state++;
+            break;
+        case 6:
+            sub_81248AC(gSpecialVar_0x8004);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x48, 0, 14, 12, 3);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x6C, 12, 17, 12, 3);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x90, 24, 20, 12, 3);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 0, 17, 12, 3);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0, 20, 12, 3);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 12, 20, 12, 3);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 12, 23, 12, 3);
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 24, 23, 12, 3);
+            gMain.state++;
+            break;
+        case 7:
+            BeginNormalPaletteFade(-1, 3, 16, 0, 0);
+            FadeInNewBGM(BGM_ROPEWAY, 1);
+            sub_8123FBC(1);
+            gMain.state++;
+            break;
+        case 8:
+            imebak = REG_IME;
+            REG_IME = 0;
+            REG_IE |= INTR_FLAG_VBLANK;
+            REG_IME = imebak;
+            SetVBlankCallback(CableCarVblankCallback);
+            SetMainCallback2(CableCarMainCallback_Run);
+            CreateTask(sub_8123878, 0);
+            if (gSpecialVar_0x8004 == 0)
+            {
+                sCableCarPtr->unk_0000 = CreateTask(sub_81239E4, 1);
+            }
+            else
+            {
+                sCableCarPtr->unk_0000 = CreateTask(sub_8123AF8, 1);
+            }
+            break;
+    }
+}
+
+static void CableCarMainCallback_Run(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+    MapMusicMain();
+}
+
+static void sub_8123740(void)
+{
+    u8 i;
+
+    i = 0;
+    sub_8123FBC(0);
+    gSpriteCoordOffsetX = 0;
+    sub_807C9B4(0);
+    for (; i < 20; i++)
+    {
+        gWeatherPtr->sprites.s2.ashSprites[i] = NULL;
+    }
+    ResetTasks();
+    ResetSpriteData();
+    ResetPaletteFade();
+    DmaFill32Large(3, 0, gSharedMem, 0x20000, 0x1000);
+    sCableCarPtr = NULL;
+    DmaFill16Large(3, 0, VRAM, VRAM_SIZE, 0x1000);
+    DmaFill32Defvars(3, 0, OAM, OAM_SIZE);
+    DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE);
+    warp_in();
+    gFieldCallback = NULL;
+    SetMainCallback2(CB2_LoadMap);
+}
+
+static void sub_8123878(u8 taskId)
+{
+    u8 i;
+
+    i = 0;
+    sCableCarPtr->unk_0006++;
+    switch (sCableCarPtr->unk_0001)
+    {
+        case 0:
+            if (sCableCarPtr->unk_0006 == sCableCarPtr->unk_0004)
+            {
+                DoWeatherEffect(sCableCarPtr->unk_0002);
+                sCableCarPtr->unk_0001 = 1;
+            }
+            break;
+        case 1:
+            switch (sCableCarPtr->unk_0002)
+            {
+                case 7:
+                    if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0)
+                    {
+                        for (; i < 20; i++)
+                        {
+                            if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL)
+                            {
+                                gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0;
+                            }
+                        }
+                        sCableCarPtr->unk_0001 = 2;
+                    }
+                    break;
+                case 2:
+                    if (gWeatherPtr->currWeather == 2)
+                    {
+                        sCableCarPtr->unk_0001 = 2;
+                    }
+                    else if (sCableCarPtr->unk_0006 >= sCableCarPtr->unk_0004 + 8)
+                    {
+                        for (; i < 20; i++)
+                        {
+                            if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL)
+                            {
+                                gWeatherPtr->sprites.s2.ashSprites[i]->invisible ^= TRUE;
+                            }
+                        }
+                    }
+                    break;
+            }
+            break;
+        case 2:
+            if (sCableCarPtr->unk_0006 == 570)
+            {
+                sCableCarPtr->unk_0001 = 3;
+                BeginNormalPaletteFade(-1, 3, 0, 16, 0);
+                FadeOutBGM(4);
+            }
+            break;
+        case 3:
+            if (!gPaletteFade.active)
+            {
+                sCableCarPtr->unk_0001 = 255;
+            }
+            break;
+        case 255:
+            SetVBlankCallback(NULL);
+            DestroyTask(taskId);
+            DestroyTask(sCableCarPtr->unk_0000);
+            SetMainCallback2(sub_8123740);
+            break;
+    }
+}
+
+static void sub_81239E4(u8 taskId)
+{
+    if (sCableCarPtr->unk_0001 != 255)
+    {
+        sCableCarPtr->unk_0014--;
+        if ((sCableCarPtr->unk_0006 % 2) == 0)
+        {
+            sCableCarPtr->unk_0015--;
+        }
+        if ((sCableCarPtr->unk_0006 % 8) == 0)
+        {
+            sCableCarPtr->unk_000c--;
+            sCableCarPtr->unk_000d--;
+        }
+        switch (sCableCarPtr->unk_0014)
+        {
+            case 175:
+                CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 0, 22, 2, 10);
+                break;
+            case 40:
+                CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 3, 0, 2, 2);
+                break;
+            case 32:
+                CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 2, 0, 1, 2);
+                break;
+            case 16:
+                CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2);
+                CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30);
+                sCableCarPtr->unk_0015 = 64;
+                break;
+        }
+    }
+    sub_812453C();
+    gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 1) % 128;
+}
+
+static void sub_8123AF8(u8 taskId)
+{
+    if (sCableCarPtr->unk_0001 != 255)
+    {
+        sCableCarPtr->unk_0014++;
+        if ((sCableCarPtr->unk_0006 % 2) == 0)
+        {
+            sCableCarPtr->unk_0015++;
+        }
+        if ((sCableCarPtr->unk_0006 % 8) == 0)
+        {
+            sCableCarPtr->unk_000c++;
+            sCableCarPtr->unk_000d++;
+        }
+        switch (sCableCarPtr->unk_0014)
+        {
+            case 176:
+                CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30);
+                break;
+            case 16:
+                CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 2, 0, 3, 2);
+                CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 0, 22, 2, 10);
+                sCableCarPtr->unk_0015 = 192;
+                break;
+            case 32:
+                sCableCarPtr->unk_08fc[0][2] = (gCableCarPylonHookTilemapEntries + 2)[0];
+                sCableCarPtr->unk_08fc[0][3] = (gCableCarPylonHookTilemapEntries + 2)[1];
+                sCableCarPtr->unk_08fc[1][2] = (gCableCarPylonHookTilemapEntries + 2)[5];
+                sCableCarPtr->unk_08fc[1][3] = (gCableCarPylonHookTilemapEntries + 2)[6];
+                break;
+            case 40:
+                sCableCarPtr->unk_08fc[0][4] = (gCableCarPylonHookTilemapEntries + 4)[0];
+                sCableCarPtr->unk_08fc[1][4] = (gCableCarPylonHookTilemapEntries + 4)[5];
+                break;
+        }
+    }
+    sub_8124598();
+    if (sCableCarPtr->unk_0006 < sCableCarPtr->unk_0004) {
+        gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248;
+    }
+    else
+    {
+        gWeatherPtr->unknown_6FC = (gWeatherPtr->unknown_6FC + 247) % 248;
+    }
+}
+
+static void CableCarVblankCallback(void)
+{
+    DmaCopy16(3, sCableCarPtr->unk_00fc, BG_SCREEN_ADDR(28), 0x800);
+    DmaCopy16(3, sCableCarPtr->unk_08fc, BG_SCREEN_ADDR(31), 0x800);
+    REG_BG3HOFS = sCableCarPtr->unk_0014;
+    REG_BG3VOFS = sCableCarPtr->unk_0015;
+    REG_BG1HOFS = sCableCarPtr->unk_000c;
+    REG_BG1VOFS = sCableCarPtr->unk_000d;
+    REG_BG0HOFS = sCableCarPtr->unk_0008;
+    REG_BG0VOFS = sCableCarPtr->unk_0009;
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+static void nullsub_76(struct Sprite *sprite)
+{
+
+}
+
+static void sub_8123CB8(struct Sprite *sprite)
+{
+    if (sCableCarPtr->unk_0001 != 255)
+    {
+        if (gSpecialVar_0x8004 == 0)
+        {
+            sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006));
+            sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006));
+        }
+        else
+        {
+            sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006));
+            sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006));
+        }
+    }
+}
+
+static void sub_8123D98(struct Sprite *sprite)
+{
+    if (sCableCarPtr->unk_0001 != 255)
+    {
+        if (gSpecialVar_0x8004 == 0)
+        {
+            sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006));
+            sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006));
+        }
+        else
+        {
+            sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006));
+            sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006));
+        }
+        switch (sprite->data[2])
+        {
+            case 0:
+                sprite->pos2.y = 17;
+                if (sprite->data[3] ++ > 9)
+                {
+                    sprite->data[3] = 0;
+                    sprite->data[2] ++;
+                }
+                break;
+            default:
+                sprite->pos2.y = 16;
+                if (sprite->data[3] ++ > 9)
+                {
+                    sprite->data[3] = 0;
+                    sprite->data[2] = 0;
+                }
+                break;
+        }
+    }
+}
+
+static void sub_8123EB8(struct Sprite *sprite)
+{
+    if (sprite->data[0] == 0)
+    {
+        sprite->pos1.x += 2 * sprite->centerToCornerVecX;
+        sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    }
+    if (++sprite->data[0] >= sprite->data[2])
+    {
+        switch (sprite->data[1])
+        {
+            case 0:
+                sprite->pos1.x++;
+                if ((sprite->data[0] % 4) == 0)
+                {
+                    sprite->pos1.y++;
+                }
+                break;
+            case 1:
+                if ((sprite->data[0] % 2) != 0)
+                {
+                    sprite->pos1.x++;
+                    if ((sprite->pos1.x % 4) == 0)
+                    {
+                        sprite->pos1.y++;
+                    }
+                }
+                break;
+        }
+        if (sprite->pos1.y > 0xa0)
+        {
+            DestroySprite(sprite);
+        }
+    }
+}
+
+static void sub_8123F44(struct Sprite *sprite)
+{
+    if (sprite->data[0] == 0)
+    {
+        sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    }
+    if (++sprite->data[0] >= sprite->data[2])
+    {
+        switch (sprite->data[1])
+        {
+            case 0:
+                sprite->pos1.x--;
+                if ((sprite->data[0] % 4) == 0)
+                {
+                    sprite->pos1.y--;
+                }
+                break;
+            case 1:
+                if ((sprite->data[0] % 2) != 0)
+                {
+                    sprite->pos1.x--;
+                    if ((sprite->pos1.x % 4) == 0)
+                    {
+                        sprite->pos1.y--;
+                    }
+                }
+                break;
+        }
+        if (sprite->pos1.y < 0x50)
+        {
+            DestroySprite(sprite);
+        }
+    }
+}
+
+static void sub_8123FBC(bool8 which)
+{
+    switch (which)
+    {
+        case FALSE:
+        default:
+            REG_WININ = 0;
+            REG_WINOUT = 0;
+            REG_WIN0H = 0;
+            REG_WIN1H = 0;
+            REG_WIN0V = 0;
+            REG_WIN1V = 0;
+            REG_DISPCNT = 0;
+            REG_BG3CNT = 0;
+            REG_BG2CNT = 0;
+            REG_BG1CNT = 0;
+            REG_BG0CNT = 0;
+            REG_BG3HOFS = 0;
+            REG_BG3VOFS = 0;
+            REG_BG2HOFS = 0;
+            REG_BG2VOFS = 0;
+            REG_BG1HOFS = 0;
+            REG_BG1VOFS = 0;
+            REG_BG0HOFS = 0;
+            REG_BG0VOFS = 0;
+            REG_BLDCNT = 0;
+            break;
+        case TRUE:
+            REG_WININ = 0;
+            REG_WINOUT = 0;
+            REG_WIN0H = 0;
+            REG_WIN1H = 0;
+            REG_WIN0V = 0;
+            REG_WIN1V = 0;
+            if (gSpecialVar_0x8004 == 0)
+            {
+                sCableCarPtr->unk_0014 = 0xb0;
+                sCableCarPtr->unk_0015 = 0x10;
+                sCableCarPtr->unk_000c = 0x00;
+                sCableCarPtr->unk_000d = 0x50;
+                sCableCarPtr->unk_0009 = 0;
+                sCableCarPtr->unk_0009 = 0;
+            }
+            else
+            {
+                sCableCarPtr->unk_0014 = 0x60;
+                sCableCarPtr->unk_0015 = 0xe8;
+                sCableCarPtr->unk_000c = 0x00;
+                sCableCarPtr->unk_000d = 0x04;
+                sCableCarPtr->unk_0009 = 0;
+                sCableCarPtr->unk_0009 = 0;
+            }
+            REG_BG3HOFS = sCableCarPtr->unk_0014;
+            REG_BG3VOFS = sCableCarPtr->unk_0015;
+            REG_BG2HOFS = 0;
+            REG_BG2VOFS = 0;
+            REG_BG1HOFS = sCableCarPtr->unk_000c;
+            REG_BG1VOFS = sCableCarPtr->unk_000d;
+            REG_BG0HOFS = sCableCarPtr->unk_0008;
+            REG_BG0VOFS = sCableCarPtr->unk_0009;
+            REG_BG0CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(28) | BGCNT_WRAP;
+            REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(29) | BGCNT_WRAP;
+            REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_SCREENBASE(30) | BGCNT_WRAP;
+            REG_BG3CNT = BGCNT_PRIORITY(0) | BGCNT_SCREENBASE(31) | BGCNT_WRAP;
+            REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
+            REG_BLDCNT = 0x3f00;
+            break;
+    }
+}
+
+static void LoadSprites(void)
+{
+    u8 spriteId;
+    u8 i;
+
+    u8 playerGraphicsIds[2] = {
+        MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL,
+        MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+    };
+    u16 rval = Random();
+    u8 hikerGraphicsIds[4] = {
+        MAP_OBJ_GFX_HIKER,
+        MAP_OBJ_GFX_CAMPER,
+        MAP_OBJ_GFX_PICNICKER,
+        MAP_OBJ_GFX_POOCHYENA
+    };
+    s16 hikerCoords[2][2] = {
+        {   0,  80 },
+        { 240, 146 }
+    };
+    u8 hikerMovementDelayTable[4] = {
+        0,
+        60,
+        120,
+        170
+    };
+    void (*callbacks[2])(struct Sprite *) = {
+        sub_8123EB8,
+        sub_8123F44
+    };
+
+    switch (gSpecialVar_0x8004)
+    {
+        case 0:
+        default:
+            spriteId = AddPseudoFieldObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0xc8, 0x49, 0x66);
+            if (spriteId != MAX_SPRITES)
+            {
+                gSprites[spriteId].oam.priority = 2;
+                gSprites[spriteId].pos2.x = 0x08;
+                gSprites[spriteId].pos2.y = 0x10;
+                gSprites[spriteId].data[0] = 0xc8;
+                gSprites[spriteId].data[1] = 0x49;
+            }
+            spriteId = CreateSprite(&gSpriteTemplate_8401D40[0], 0xb0, 0x2b, 0x67);
+            gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20;
+            gSprites[spriteId].data[0] = 0xb0;
+            gSprites[spriteId].data[1] = 0x2b;
+            spriteId = CreateSprite(&gSpriteTemplate_8401D40[1], 0xc8, 0x63, 0x65);
+            gSprites[spriteId].pos2.x = 8;
+            gSprites[spriteId].pos2.y = 4;
+            gSprites[spriteId].data[0] = 0xc8;
+            gSprites[spriteId].data[1] = 0x63;
+            sCableCarPtr->unk_0002 = 7;
+            sCableCarPtr->unk_0004 = 0x15e;
+            sub_807C9B4(2);
+            break;
+        case 1:
+            CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03);
+            spriteId = AddPseudoFieldObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66);
+            if (spriteId != MAX_SPRITES)
+            {
+                gSprites[spriteId].oam.priority = 2;
+                gSprites[spriteId].pos2.x = 0x08;
+                gSprites[spriteId].pos2.y = 0x10;
+                gSprites[spriteId].data[0] = 0x80;
+                gSprites[spriteId].data[1] = 0x27;
+            }
+            spriteId = CreateSprite(&gSpriteTemplate_8401D40[0], 0x68, 0x09, 0x67);
+            gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20;
+            gSprites[spriteId].data[0] = 0x68;
+            gSprites[spriteId].data[1] = 0x09;
+            spriteId = CreateSprite(&gSpriteTemplate_8401D40[1], 0x80, 0x41, 0x65);
+            gSprites[spriteId].pos2.x = 8;
+            gSprites[spriteId].pos2.y = 4;
+            gSprites[spriteId].data[0] = 0x80;
+            gSprites[spriteId].data[1] = 0x41;
+            sCableCarPtr->unk_0002 = 2;
+            sCableCarPtr->unk_0004 = 0x109;
+            sub_807C9B4(7);
+            break;
+    }
+    for (i = 0; i < 9; i++)
+    {
+        spriteId = CreateSprite(&gSpriteTemplate_8401D40[2], 16 * i + 0x60, 8 * i - 8, 0x68);
+        gSprites[spriteId].pos2.x = 8;
+        gSprites[spriteId].pos2.y = 8;
+    }
+    if ((rval % 64) == 0)
+    {
+        spriteId = AddPseudoFieldObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a);
+        if (spriteId != MAX_SPRITES)
+        {
+            gSprites[spriteId].oam.priority = 2;
+            gSprites[spriteId].pos2.x = -gSprites[spriteId].centerToCornerVecX;
+            gSprites[spriteId].pos2.y = -gSprites[spriteId].centerToCornerVecY;
+            if (gSpecialVar_0x8004 == 0)
+            {
+                if (rval % 2)
+                {
+                    StartSpriteAnim(&gSprites[spriteId], 6);
+                    gSprites[spriteId].data[1] = 1;
+                    gSprites[spriteId].pos1.y += 2;
+                }
+                else
+                {
+                    StartSpriteAnim(&gSprites[spriteId], 7);
+                    gSprites[spriteId].data[1] = 0;
+                }
+            }
+            else
+            {
+                if (rval % 2)
+                {
+                    StartSpriteAnim(&gSprites[spriteId], 7);
+                    gSprites[spriteId].data[1] = 1;
+                    gSprites[spriteId].pos1.y += 2;
+                }
+                else
+                {
+                    StartSpriteAnim(&gSprites[spriteId], 6);
+                    gSprites[spriteId].data[1] = 0;
+                }
+            }
+            gSprites[spriteId].data[2] = hikerMovementDelayTable[rval % 4];
+        }
+    }
+}
+
+static void sub_812446C(void)
+{
+    u8 i;
+    u8 j;
+    u8 k;
+    u8 offset;
+
+    for (i = 0, k = 0, offset = 0x24 * (sCableCarPtr->unk_001b + 2); i < 3; i++)
+    {
+        for (j = 0; j < 12; j++)
+        {
+            sCableCarPtr->unk_0022[i][j] = *(eCableCar2->mtChimneyTilemap + (offset++));
+            sCableCarPtr->unk_0022[i + 3][j] = eCableCar2->mtChimneyTilemap[k];
+            sCableCarPtr->unk_0022[i + 6][j] = (eCableCar2->mtChimneyTilemap + 0x24)[k];
+            k++;
+        }
+    }
+    sCableCarPtr->unk_001b = (sCableCarPtr->unk_001b + 1) % 3;
+}
+
+static void sub_812453C(void)
+{
+    sCableCarPtr->unk_001c = (sCableCarPtr->unk_001c + 1) % 0x60;
+    sCableCarPtr->unk_0008 = sCableCarPtr->unk_001f - sCableCarPtr->unk_001d;
+    sCableCarPtr->unk_0009 = sCableCarPtr->unk_0020 - sCableCarPtr->unk_001e;
+    sCableCarPtr->unk_001d++;
+    if ((sCableCarPtr->unk_001d % 4) == 0)
+    {
+        sCableCarPtr->unk_001e++;
+    }
+    if (sCableCarPtr->unk_001d > 16)
+    {
+        sub_81245F4();
+    }
+}
+
+static void sub_8124598(void)
+{
+    sCableCarPtr->unk_001c = (sCableCarPtr->unk_001c + 1) % 0x60;
+    sCableCarPtr->unk_0008 = sCableCarPtr->unk_001f + sCableCarPtr->unk_001d;
+    sCableCarPtr->unk_0009 = sCableCarPtr->unk_0020 + sCableCarPtr->unk_001e;
+    sCableCarPtr->unk_001d++;
+    if ((sCableCarPtr->unk_001d % 4) == 0)
+    {
+        sCableCarPtr->unk_001e++;
+    }
+    if (sCableCarPtr->unk_001d > 16)
+    {
+        sub_812476C();
+    }
+}
+
+static void sub_81245F4(void)
+{
+    u8 i = 0;
+
+    sCableCarPtr->unk_001d = sCableCarPtr->unk_001e = 0;
+    sCableCarPtr->unk_001f = sCableCarPtr->unk_0008;
+    sCableCarPtr->unk_0020 = sCableCarPtr->unk_0009;
+    sCableCarPtr->unk_0019 = (sCableCarPtr->unk_0019 + 30) % 32;
+    sCableCarPtr->unk_0018 -= 2;
+    gUnknown_0203927A = (sCableCarPtr->unk_001a + 23) % 32;
+    for (i = 0; i < 9; i++)
+    {
+        gUnknown_02039278 = sCableCarPtr->unk_0019;
+        gUnknown_02039279 = (gUnknown_0203927A + i) % 32;
+        sCableCarPtr->unk_00fc[gUnknown_02039279][gUnknown_02039278] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018];
+        gUnknown_02039278 = (gUnknown_02039278 + 1) % 32;
+        sCableCarPtr->unk_00fc[gUnknown_02039279][gUnknown_02039278] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018 + 1];
+    }
+    gUnknown_02039278 = (sCableCarPtr->unk_0019 + 30) % 32;
+    CableCarUtil_FillWrapped(sCableCarPtr->unk_00fc, 0, gUnknown_02039278, 0, 2, 32);
+    if (sCableCarPtr->unk_0018 == 0)
+    {
+        sCableCarPtr->unk_001a = (sCableCarPtr->unk_001a + 29) % 32;
+        sCableCarPtr->unk_0018 = 12;
+        sub_812446C();
+        gUnknown_02039278 = (sCableCarPtr->unk_001a + 1) % 32;
+        CableCarUtil_FillWrapped(sCableCarPtr->unk_00fc, 0, 0, gUnknown_02039278, 32, 9);
+    }
+}
+
+static void sub_812476C(void)
+{
+    u8 i = 0;
+
+    sCableCarPtr->unk_001d = sCableCarPtr->unk_001e = 0;
+    sCableCarPtr->unk_001f = sCableCarPtr->unk_0008;
+    sCableCarPtr->unk_0020 = sCableCarPtr->unk_0009;
+    sCableCarPtr->unk_0019 = (sCableCarPtr->unk_0019 + 2) % 32;
+    sCableCarPtr->unk_0018 += 2;
+    gUnknown_0203927D = sCableCarPtr->unk_001a;
+    for (i = 0; i < 9; i++)
+    {
+        gUnknown_0203927B = sCableCarPtr->unk_0019;
+        gUnknown_0203927C = (gUnknown_0203927D + i) % 32;
+        sCableCarPtr->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018];
+        gUnknown_0203927B = (gUnknown_0203927B + 1) % 32;
+        sCableCarPtr->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018 + 1];
+    }
+    gUnknown_0203927C = (sCableCarPtr->unk_001a + 23) % 32;
+    CableCarUtil_FillWrapped(sCableCarPtr->unk_00fc, 0, sCableCarPtr->unk_0019, gUnknown_0203927C, 2, 9);
+    if (sCableCarPtr->unk_0018 == 10)
+    {
+        sCableCarPtr->unk_001a = (sCableCarPtr->unk_001a + 3) % 32;
+        sCableCarPtr->unk_0018 = 0xfe;
+        sub_812446C();
+    }
+}
+
+static void sub_81248AC(u8 a0)
+{
+    switch (a0)
+    {
+        case 0:
+        default:
+            sCableCarPtr->unk_001b = 2;
+            sCableCarPtr->unk_0019 = 0;
+            sCableCarPtr->unk_001a = 20;
+            sCableCarPtr->unk_0018 = 12;
+            sub_812446C();
+            sub_81245F4();
+            break;
+        case 1:
+            sCableCarPtr->unk_001b = 2;
+            sCableCarPtr->unk_0019 = 28;
+            sCableCarPtr->unk_001a = 20;
+            sCableCarPtr->unk_0018 = 4;
+            sub_812446C();
+            sub_812476C();
+            break;
+    }
+    sCableCarPtr->unk_001c = 0;
+}
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c
index f307f5979..4ee601360 100644
--- a/src/scene/evolution_scene.c
+++ b/src/scene/evolution_scene.c
@@ -65,8 +65,8 @@ void nullsub_6(void);
 bool32 IsHMMove2(u16 move);
 
 extern struct Window gUnknown_03004210;
-extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042A0;
+extern u16 gBattle_BG0_X;
+extern u16 gBattle_BG0_Y;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
@@ -200,8 +200,8 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
     SetUpWindowConfig(&gWindowConfig_81E6C58);
     ResetPaletteFade();
 
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = 0;
     gBattle_BG2_X = 0;
@@ -308,8 +308,8 @@ static void CB2_EvolutionSceneLoadGraphics(void)
     REG_WINOUT = 0;
     SetUpWindowConfig(&gWindowConfig_81E6C58);
     ResetPaletteFade();
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = 0;
     gBattle_BG2_X = 0;
@@ -362,8 +362,8 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
         ResetSpriteData();
         FreeAllSpritePalettes();
         gReservedSpritePaletteCount = 4;
-        gUnknown_030042A4 = 0;
-        gUnknown_030042A0 = 0;
+        gBattle_BG0_X = 0;
+        gBattle_BG0_Y = 0;
         gBattle_BG1_X = 0;
         gBattle_BG1_Y = 0;
         gBattle_BG2_X = 0;
@@ -3923,8 +3923,8 @@ static void EvoDummyFunc(void)
 static void VBlankCB_EvolutionScene(void)
 {
     REG_BG0CNT = BGCNT_SCREENBASE(24) | BGCNT_16COLOR | BGCNT_TXT256x256 | BGCNT_AFF512x512 | BGCNT_PRIORITY(3); // 0x9803
-    REG_BG0HOFS = gUnknown_030042A4;
-    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG0HOFS = gBattle_BG0_X;
+    REG_BG0VOFS = gBattle_BG0_Y;
     REG_BG1HOFS = gBattle_BG1_X;
     REG_BG1VOFS = gBattle_BG1_Y;
     REG_BG2HOFS = gBattle_BG2_X;
@@ -3939,8 +3939,8 @@ static void VBlankCB_EvolutionScene(void)
 
 static void VBlankCB_TradeEvolutionScene(void)
 {
-    REG_BG0HOFS = gUnknown_030042A4;
-    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG0HOFS = gBattle_BG0_X;
+    REG_BG0VOFS = gBattle_BG0_Y;
     REG_BG1HOFS = gBattle_BG1_X;
     REG_BG1VOFS = gBattle_BG1_Y;
     REG_BG2HOFS = gBattle_BG2_X;
diff --git a/src/unknown_task.c b/src/unknown_task.c
index 62245502a..2c71bfb08 100644
--- a/src/unknown_task.c
+++ b/src/unknown_task.c
@@ -12,8 +12,8 @@ extern u16 gBattle_BG1_Y;
 extern u16 gUnknown_030041B8;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG2_X;
-extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042A4;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG1_X;
 
 extern u8 gUnknown_0202FFA4;
@@ -120,10 +120,10 @@ static void task00_for_dp12(u8 taskId)
             switch (gTasks[taskId].data[6])
             {
             case 0x0:
-                value = gUnknown_030042A4;
+                value = gBattle_BG0_X;
                 break;
             case 0x2:
-                value = gUnknown_030042A0;
+                value = gBattle_BG0_Y;
                 break;
             case 0x4:
                 value = gBattle_BG1_X;
diff --git a/sym_common.txt b/sym_common.txt
index 87b411ff4..f620e9e49 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -53,10 +53,10 @@ gBattleTerrain: @ 300428C
 gBattleTextBuff2: @ 3004290
 	.space 0x10
 
-gUnknown_030042A0: @ 30042A0
+gBattle_BG0_Y: @ 30042A0
 	.space 0x4
 
-gUnknown_030042A4: @ 30042A4
+gBattle_BG0_X: @ 30042A4
 	.space 0xC
 
 gBattleTextBuff3: @ 30042B0
diff --git a/sym_ewram.txt b/sym_ewram.txt
index de949bbe7..62758ab78 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -65,16 +65,16 @@ gBattlePartyID: @ 2024A6A
 gBanksBySide: @ 2024A72
 	.space 0x4
 
-gUnknown_02024A76: @ 2024A76
+gActionsByTurnOrder: @ 2024A76
 	.space 0x4
 
-gTurnOrder: @ 2024A7A
+gBanksByTurnOrder: @ 2024A7A
 	.space 0x4
 
-gCurrentMoveTurn: @ 2024A7E
+gCurrentTurnActionNumber: @ 2024A7E
 	.space 0x1
 
-gFightStateTracker: @ 2024A7F
+gCurrentActionFuncId: @ 2024A7F
 	.space 0x1
 
 gBattleMons: @ 2024A80
@@ -179,7 +179,7 @@ gUnknown_02024C44: @ 2024C44
 gUnknown_02024C4C: @ 2024C4C
 	.space 0x8
 
-gLockedMove: @ 2024C54
+gLockedMoves: @ 2024C54
 	.space 0x8
 
 gUnknown_02024C5C: @ 2024C5C
@@ -206,7 +206,7 @@ gUnknown_02024C78: @ 2024C78
 gSideAffecting: @ 2024C7A
 	.space 0x6
 
-gSideTimer: @ 2024C80
+gSideTimers: @ 2024C80
 	.space 0x18
 
 gStatuses3: @ 2024C98
@@ -526,31 +526,7 @@ gAbilitiesPerBank: @ 203926C
 	.space 0x4
 
 	.include "src/field/choose_party.o"
-
-@ cable_car
-
-	.align 2
-gUnknown_02039274: @ 2039274
-	.space 0x4
-
-gUnknown_02039278: @ 2039278
-	.space 0x1
-
-gUnknown_02039279: @ 2039279
-	.space 0x1
-
-gUnknown_0203927A: @ 203927A
-	.space 0x1
-
-gUnknown_0203927B: @ 203927B
-	.space 0x1
-
-gUnknown_0203927C: @ 203927C
-	.space 0x1
-
-gUnknown_0203927D: @ 203927D
-	.space 0x7
-
+	.include "src/scene/cable_car.o"
 	.include "src/engine/save.o"
 	.include "src/engine/mystery_event_script.o"
 	.include "src/field/roamer.o"