Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base

asm/contest_link_81D9DE4.s

@@ -1,890 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81D9DE4
-sub_81D9DE4: @ 81D9DE4
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x1A
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x4
-	bhi _081D9EA4
-	lsls r0, 2
-	ldr r1, =_081D9E10
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081D9E10:
-	.4byte _081D9E24
-	.4byte _081D9E44
-	.4byte _081D9E64
-	.4byte _081D9E84
-	.4byte _081D9EA4
-_081D9E24:
-	ldr r4, =gUnknown_02039F31
-	ldr r0, =gUnknown_02039F24
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =gPlayerParty
-	adds r0, r1
-	movs r1, 0x32
-	b _081D9EB4
-	.pool
-_081D9E44:
-	ldr r4, =gUnknown_02039F31
-	ldr r0, =gUnknown_02039F24
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =gPlayerParty
-	adds r0, r1
-	movs r1, 0x33
-	b _081D9EB4
-	.pool
-_081D9E64:
-	ldr r4, =gUnknown_02039F31
-	ldr r0, =gUnknown_02039F24
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =gPlayerParty
-	adds r0, r1
-	movs r1, 0x34
-	b _081D9EB4
-	.pool
-_081D9E84:
-	ldr r4, =gUnknown_02039F31
-	ldr r0, =gUnknown_02039F24
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =gPlayerParty
-	adds r0, r1
-	movs r1, 0x35
-	b _081D9EB4
-	.pool
-_081D9EA4:
-	ldr r4, =gUnknown_02039F31
-	ldr r0, =gUnknown_02039F24
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =gPlayerParty
-	adds r0, r1
-	movs r1, 0x36
-_081D9EB4:
-	bl GetMonData
-	strb r0, [r4]
-	ldr r5, =gContestMons
-	ldr r4, =gContestPlayerMonIndex
-	ldrb r0, [r4]
-	lsls r0, 6
-	adds r0, r5
-	ldr r1, =gUnknown_02039F31
-	ldrb r1, [r1]
-	adds r0, 0x2C
-	strb r1, [r0]
-	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	negs r0, r0
-	lsrs r0, 31
-	ldrb r1, [r4]
-	lsls r1, 6
-	adds r1, r5
-	adds r1, 0x2D
-	strb r0, [r1]
-	ldr r1, =sub_81DA160
-	ldr r2, =sub_81D9F14
-	adds r0, r6, 0
-	bl SetTaskFuncWithFollowupFunc
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81D9DE4
-
-	thumb_func_start sub_81D9F14
-sub_81D9F14: @ 81D9F14
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =sub_81DA244
-	ldr r2, =sub_81D9F30
-	bl SetTaskFuncWithFollowupFunc
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81D9F14
-
-	thumb_func_start sub_81D9F30
-sub_81D9F30: @ 81D9F30
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =sub_81DA2E8
-	ldr r2, =sub_81D9F4C
-	bl SetTaskFuncWithFollowupFunc
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81D9F30
-
-	thumb_func_start sub_81D9F4C
-sub_81D9F4C: @ 81D9F4C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =sub_81DA3B8
-	ldr r2, =sub_81D9F68
-	bl SetTaskFuncWithFollowupFunc
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81D9F4C
-
-	thumb_func_start sub_81D9F68
-sub_81D9F68: @ 81D9F68
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r0, 0
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	movs r3, 0
-	ldr r5, =gUnknown_02039F30
-	mov r8, r5
-	ldr r0, =gSpecialVar_0x8004
-	mov r12, r0
-	add r1, sp, 0x4
-	mov r9, r1
-	ldrb r4, [r5]
-	cmp r3, r4
-	bcs _081D9FB2
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r4, r0, 3
-	ldr r7, =gTasks + 0x8
-_081D9F98:
-	mov r0, sp
-	adds r2, r0, r3
-	adds r1, r3, 0x1
-	lsls r0, r1, 1
-	adds r0, r4
-	adds r0, r7
-	ldrh r0, [r0]
-	strb r0, [r2]
-	lsls r1, 24
-	lsrs r3, r1, 24
-	ldrb r1, [r5]
-	cmp r3, r1
-	bcc _081D9F98
-_081D9FB2:
-	movs r3, 0
-	mov r4, r8
-	ldrb r0, [r4]
-	cmp r3, r0
-	bcs _081D9FD6
-	adds r4, r0, 0
-	mov r2, sp
-_081D9FC0:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r4
-	bcs _081D9FD6
-	mov r7, sp
-	adds r1, r7, r3
-	ldrb r0, [r2]
-	ldrb r1, [r1]
-	cmp r0, r1
-	beq _081D9FC0
-_081D9FD6:
-	mov r0, r8
-	ldrb r0, [r0]
-	cmp r3, r0
-	bne _081D9FF4
-	movs r0, 0
-	mov r1, r12
-	strh r0, [r1]
-	b _081D9FFA
-	.pool
-_081D9FF4:
-	movs r0, 0x1
-	mov r4, r12
-	strh r0, [r4]
-_081D9FFA:
-	movs r3, 0
-	mov r7, r8
-	mov r0, r8
-	ldrb r0, [r0]
-	cmp r3, r0
-	bcs _081DA02A
-	mov r4, r9
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r2, r0, 3
-	ldr r5, =gTasks + 0x8
-_081DA010:
-	adds r1, r4, r3
-	adds r0, r3, 0x5
-	lsls r0, 1
-	adds r0, r2
-	adds r0, r5
-	ldrh r0, [r0]
-	strb r0, [r1]
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldrb r1, [r7]
-	cmp r3, r1
-	bcc _081DA010
-_081DA02A:
-	mov r4, r8
-	ldrb r0, [r4]
-	cmp r0, 0x4
-	beq _081DA0B8
-	bl GetMultiplayerId
-	lsls r0, 24
-	cmp r0, 0
-	bne _081DA0B8
-	ldr r0, =gContestMons
-	adds r1, r0, 0
-	adds r1, 0x2C
-	ldrb r2, [r1]
-	movs r3, 0x1
-	ldrb r1, [r4]
-	adds r5, r0, 0
-	cmp r3, r1
-	bcs _081DA06C
-	adds r4, r5, 0
-	mov r7, r8
-	ldrb r1, [r7]
-_081DA054:
-	lsls r0, r3, 6
-	adds r0, r4
-	adds r0, 0x2C
-	ldrb r7, [r0]
-	cmp r2, r7
-	bcs _081DA062
-	ldrb r2, [r0]
-_081DA062:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r1
-	bcc _081DA054
-_081DA06C:
-	cmp r2, 0
-	beq _081DA076
-	subs r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-_081DA076:
-	movs r4, 0x1
-	movs r3, 0
-	mov r0, r8
-	ldrb r0, [r0]
-	cmp r3, r0
-	bcs _081DA0AC
-	adds r0, r5, 0
-	b _081DA0A2
-	.pool
-_081DA090:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	mov r1, r8
-	ldrb r1, [r1]
-	cmp r3, r1
-	bcs _081DA0AC
-	lsls r0, r3, 6
-	adds r0, r5
-_081DA0A2:
-	adds r0, 0x2D
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _081DA090
-	movs r4, 0
-_081DA0AC:
-	mov r0, sp
-	ldrb r0, [r0]
-	adds r1, r2, 0
-	adds r2, r4, 0
-	bl sub_80DACBC
-_081DA0B8:
-	mov r0, r9
-	bl sub_80F86E0
-	ldr r1, =gUnknown_02039F2B
-	strb r0, [r1]
-	ldr r0, =gUnknown_02039F30
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bhi _081DA0E8
-	ldr r1, =sub_81DA488
-	ldr r2, =sub_81DA10C
-	adds r0, r6, 0
-	bl SetTaskFuncWithFollowupFunc
-	b _081DA0F6
-	.pool
-_081DA0E8:
-	ldr r0, =gTasks
-	lsls r1, r6, 2
-	adds r1, r6
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, =sub_81DA10C
-	str r0, [r1]
-_081DA0F6:
-	add sp, 0x8
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81D9F68
-
-	thumb_func_start sub_81DA10C
-sub_81DA10C: @ 81DA10C
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, =gSpecialVar_ContestCategory
-	ldrb r0, [r0]
-	bl sub_80DB09C
-	ldr r1, =sub_80FCF40
-	ldr r2, =sub_81DA138
-	adds r0, r4, 0
-	bl SetTaskFuncWithFollowupFunc
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81DA10C
-
-	thumb_func_start sub_81DA138
-sub_81DA138: @ 81DA138
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0
-	bl sub_80DCE58
-	ldr r1, =sub_80FCFD0
-	ldr r2, =sub_80F8714
-	adds r0, r4, 0
-	bl SetTaskFuncWithFollowupFunc
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81DA138
-
-	thumb_func_start sub_81DA160
-sub_81DA160: @ 81DA160
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r6, r7, 2
-	adds r0, r6, r7
-	lsls r4, r0, 3
-	ldr r5, =gTasks + 0x8
-	adds r0, r4, r5
-	adds r0, 0x18
-	bl sub_80FC670
-	cmp r0, 0
-	beq _081DA224
-	adds r0, r5, 0
-	subs r0, 0x8
-	adds r4, r0
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _081DA1A4
-	cmp r0, 0x1
-	beq _081DA1D4
-	movs r0, 0
-	strh r0, [r4, 0x8]
-	strh r0, [r4, 0x20]
-	adds r0, r7, 0
-	bl SwitchTaskToFollowupFunc
-	b _081DA224
-	.pool
-_081DA1A4:
-	bl IsLinkTaskFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA224
-	ldr r0, =gContestPlayerMonIndex
-	ldrb r0, [r0]
-	lsls r0, 6
-	ldr r1, =gContestMons
-	adds r0, r1
-	movs r1, 0x40
-	bl sub_80FC4F4
-	cmp r0, 0x1
-	bne _081DA224
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _081DA224
-	.pool
-_081DA1D4:
-	bl sub_80FC55C
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA224
-	movs r5, 0
-	ldr r0, =gUnknown_02039F30
-	mov r8, r6
-	ldrb r0, [r0]
-	cmp r5, r0
-	bge _081DA214
-	ldr r6, =gLinkPlayers
-_081DA1EC:
-	lsls r4, r5, 6
-	ldr r0, =gContestMons
-	adds r4, r0
-	lsls r1, r5, 8
-	ldr r0, =gBlockRecvBuffer
-	adds r1, r0
-	adds r0, r4, 0
-	movs r2, 0x40
-	bl memcpy
-	ldrh r1, [r6, 0x1A]
-	adds r0, r4, 0
-	bl sub_80DFA08
-	adds r6, 0x1C
-	adds r5, 0x1
-	ldr r0, =gUnknown_02039F30
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _081DA1EC
-_081DA214:
-	ldr r0, =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-_081DA224:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81DA160
-
-	thumb_func_start sub_81DA244
-sub_81DA244: @ 81DA244
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r5, r0, 3
-	ldr r6, =gTasks + 0x8
-	adds r0, r5, r6
-	adds r0, 0x18
-	bl sub_80FC670
-	cmp r0, 0
-	beq _081DA2D4
-	adds r0, r6, 0
-	subs r0, 0x8
-	adds r5, r0
-	movs r1, 0x8
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	beq _081DA284
-	cmp r0, 0x1
-	beq _081DA2AC
-	movs r0, 0
-	strh r0, [r5, 0x8]
-	strh r0, [r5, 0x20]
-	adds r0, r4, 0
-	bl SwitchTaskToFollowupFunc
-	b _081DA2D4
-	.pool
-_081DA284:
-	bl GetMultiplayerId
-	lsls r0, 24
-	cmp r0, 0
-	bne _081DA2CE
-	bl IsLinkTaskFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA2D4
-	ldr r0, =gRngValue
-	movs r1, 0x4
-	bl sub_80FC4F4
-	cmp r0, 0x1
-	bne _081DA2D4
-	b _081DA2CE
-	.pool
-_081DA2AC:
-	movs r0, 0
-	bl sub_80FC530
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA2D4
-	ldr r0, =gRngValue
-	ldr r4, =gBlockRecvBuffer
-	adds r1, r4, 0
-	movs r2, 0x4
-	bl memcpy
-	ldr r0, =gContestRngValue
-	adds r1, r4, 0
-	movs r2, 0x4
-	bl memcpy
-_081DA2CE:
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_081DA2D4:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81DA244
-
-	thumb_func_start sub_81DA2E8
-sub_81DA2E8: @ 81DA2E8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	mov r9, r0
-	adds r0, r6
-	lsls r5, r0, 3
-	ldr r1, =gTasks + 0x8
-	mov r8, r1
-	adds r0, r5, r1
-	adds r0, 0x18
-	bl sub_80FC670
-	cmp r0, 0
-	beq _081DA39E
-	movs r0, 0x8
-	negs r0, r0
-	add r0, r8
-	mov r10, r0
-	adds r4, r5, r0
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _081DA338
-	cmp r0, 0x1
-	beq _081DA35A
-	movs r0, 0
-	strh r0, [r4, 0x8]
-	strh r0, [r4, 0x20]
-	adds r0, r6, 0
-	bl SwitchTaskToFollowupFunc
-	b _081DA39E
-	.pool
-_081DA338:
-	bl IsLinkTaskFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA39E
-	add r0, sp, 0x8
-	movs r1, 0x6E
-	strh r1, [r0]
-	movs r1, 0x2
-	bl sub_80FC4F4
-	cmp r0, 0x1
-	bne _081DA39E
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _081DA39E
-_081DA35A:
-	bl sub_80FC55C
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA39E
-	movs r1, 0
-	ldr r7, =gUnknown_02039F30
-	ldrb r0, [r7]
-	cmp r1, r0
-	bge _081DA390
-	mov r0, r8
-	adds r0, 0xA
-	adds r3, r5, r0
-	ldr r4, =gBlockRecvBuffer
-	mov r2, sp
-	movs r5, 0x80
-	lsls r5, 1
-_081DA37C:
-	ldrh r0, [r4]
-	strh r0, [r2]
-	strh r0, [r3]
-	adds r3, 0x2
-	adds r4, r5
-	adds r2, 0x2
-	adds r1, 0x1
-	ldrb r0, [r7]
-	cmp r1, r0
-	blt _081DA37C
-_081DA390:
-	mov r0, r9
-	adds r1, r0, r6
-	lsls r1, 3
-	add r1, r10
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-_081DA39E:
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81DA2E8
-
-	thumb_func_start sub_81DA3B8
-sub_81DA3B8: @ 81DA3B8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	mov r9, r0
-	adds r0, r6
-	lsls r5, r0, 3
-	ldr r1, =gTasks + 0x8
-	mov r8, r1
-	adds r0, r5, r1
-	adds r0, 0x18
-	bl sub_80FC670
-	cmp r0, 0
-	beq _081DA46E
-	movs r0, 0x8
-	negs r0, r0
-	add r0, r8
-	mov r10, r0
-	adds r4, r5, r0
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _081DA408
-	cmp r0, 0x1
-	beq _081DA42A
-	movs r0, 0
-	strh r0, [r4, 0x8]
-	strh r0, [r4, 0x20]
-	adds r0, r6, 0
-	bl SwitchTaskToFollowupFunc
-	b _081DA46E
-	.pool
-_081DA408:
-	bl IsLinkTaskFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA46E
-	ldrh r1, [r4, 0x1A]
-	add r0, sp, 0x8
-	strh r1, [r0]
-	movs r1, 0x2
-	bl sub_80FC4F4
-	cmp r0, 0x1
-	bne _081DA46E
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _081DA46E
-_081DA42A:
-	bl sub_80FC55C
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA46E
-	movs r1, 0
-	ldr r7, =gUnknown_02039F30
-	ldrb r0, [r7]
-	cmp r1, r0
-	bge _081DA460
-	mov r0, r8
-	adds r0, 0x2
-	adds r3, r5, r0
-	ldr r4, =gBlockRecvBuffer
-	mov r2, sp
-	movs r5, 0x80
-	lsls r5, 1
-_081DA44C:
-	ldrh r0, [r4]
-	strh r0, [r2]
-	strh r0, [r3]
-	adds r3, 0x2
-	adds r4, r5
-	adds r2, 0x2
-	adds r1, 0x1
-	ldrb r0, [r7]
-	cmp r1, r0
-	blt _081DA44C
-_081DA460:
-	mov r0, r9
-	adds r1, r0, r6
-	lsls r1, 3
-	add r1, r10
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-_081DA46E:
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81DA3B8
-
-	thumb_func_start sub_81DA488
-sub_81DA488: @ 81DA488
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r7, r6, 2
-	adds r0, r7, r6
-	lsls r4, r0, 3
-	ldr r5, =gTasks + 0x8
-	adds r0, r4, r5
-	adds r0, 0x18
-	bl sub_80FC670
-	cmp r0, 0
-	beq _081DA55C
-	adds r0, r5, 0
-	subs r0, 0x8
-	adds r4, r0
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _081DA4CC
-	cmp r0, 0x1
-	beq _081DA50C
-	movs r0, 0
-	strh r0, [r4, 0x8]
-	strh r0, [r4, 0x20]
-	adds r0, r6, 0
-	bl SwitchTaskToFollowupFunc
-	b _081DA55C
-	.pool
-_081DA4CC:
-	bl GetMultiplayerId
-	lsls r0, 24
-	cmp r0, 0
-	bne _081DA4FA
-	bl IsLinkTaskFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA55C
-	ldr r0, =gUnknown_02039F30
-	ldrb r2, [r0]
-	lsls r0, r2, 6
-	ldr r1, =gContestMons
-	adds r0, r1
-	movs r1, 0x4
-	subs r1, r2
-	lsls r1, 22
-	lsrs r1, 16
-	bl sub_80FC4F4
-	cmp r0, 0x1
-	bne _081DA55C
-_081DA4FA:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _081DA55C
-	.pool
-_081DA50C:
-	movs r0, 0
-	bl sub_80FC530
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DA55C
-	ldr r4, =gUnknown_02039F30
-	ldrb r3, [r4]
-	lsls r0, r3, 6
-	ldr r5, =gContestMons
-	adds r0, r5
-	ldr r1, =gBlockRecvBuffer
-	movs r2, 0x4
-	subs r2, r3
-	lsls r2, 6
-	bl memcpy
-	ldrb r4, [r4]
-	mov r8, r7
-	cmp r4, 0x3
-	bgt _081DA54C
-	lsls r0, r4, 6
-	adds r5, r0, r5
-	ldr r7, =gLinkPlayers
-_081DA53C:
-	ldrh r1, [r7, 0x1A]
-	adds r0, r5, 0
-	bl sub_80DFA08
-	adds r5, 0x40
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _081DA53C
-_081DA54C:
-	ldr r0, =gTasks
-	mov r2, r8
-	adds r1, r2, r6
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-_081DA55C:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81DA488
-
-	.align 2, 0 @ Don't pad with nop.

asm/pokenav.s

@@ -8173,7 +8173,7 @@ _081CAFA4:
 	ldrh r0, [r1, 0x1E]
 	bl GetTrainerIdxByRematchIdx
 	ldr r1, =gStringVar4
-	bl sub_81967AC
+	bl SelectMatchCallMessage
 	strb r0, [r6]
 	b _081CAFCC
 	.pool

data/battle_frontier_1.s

@@ -1,434 +0,0 @@
-#include "constants/flags.h"
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_0860DEB8:: @ 860DEB8 //struct
-	.2byte 0x0025, 0x0000, 0x0108, 0x0208, 0x0308, 0x0103, 0x0008, 0x0108, 0x0208, 0x0000
-	.2byte 0x02e1, 0x0000, 0x010c, 0x020c, 0x030c, 0x013e, 0x000c, 0x010c, 0x020c, 0x0000
-	.2byte 0x002c, 0x0000, 0x010c, 0x020c, 0x030c, 0x0104, 0x000c, 0x010c, 0x020c, 0x0000
-	.2byte 0x0039, 0x0000, 0x0102, 0x0202, 0x0302, 0x0105, 0x0002, 0x0102, 0x0202, 0x0000
-	.2byte 0x0040, 0x0000, 0x0101, 0x0201, 0x0301, 0x0106, 0x0001, 0x0101, 0x0201, 0x0000
-	.2byte 0x02af, 0x0004, 0x0101, 0x0201, 0x0301, 0x013d, 0x0001, 0x0101, 0x0201, 0x0000
-	.2byte 0x02ff, 0x0000, 0x010a, 0x020a, 0x030a, 0x0140, 0x000a, 0x010a, 0x020a, 0x0000
-	.2byte 0x005e, 0x0000, 0x0109, 0x0209, 0x0309, 0x0108, 0x0009, 0x0109, 0x0209, 0x0000
-	.2byte 0x004e, 0x0000, 0x0106, 0x0206, 0x0306, 0x0107, 0x0006, 0x0106, 0x0206, 0x0000
-	.2byte 0x006c, 0x0000, 0x0108, 0x0208, 0x0308, 0x0109, 0x0008, 0x0108, 0x0208, 0x0000
-	.2byte 0x0072, 0x0000, 0x0108, 0x0208, 0x0308, 0x010a, 0x0008, 0x0108, 0x0208, 0x0000
-	.2byte 0x0090, 0x0000, 0x0108, 0x020a, 0x030a, 0x010e, 0x000a, 0x0108, 0x020a, 0x0000
-	.2byte 0x007f, 0x0000, 0x010a, 0x020a, 0x030a, 0x010b, 0x000a, 0x0108, 0x020a, 0x0000
-	.2byte 0x0088, 0x0000, 0x0104, 0x0204, 0x0304, 0x010c, 0x0004, 0x0104, 0x0204, 0x0000
-	.2byte 0x008f, 0x0000, 0x0107, 0x0207, 0x0307, 0x010d, 0x0007, 0x0107, 0x0207, 0x0000
-	.2byte 0x009b, 0x0000, 0x0105, 0x0205, 0x0305, 0x010f, 0x0005, 0x0105, 0x0205, 0x0000
-	.2byte 0x00b7, 0x0000, 0x0103, 0x0203, 0x0303, 0x0110, 0x0003, 0x0103, 0x0203, 0x0000
-	.2byte 0x02a0, 0x0000, 0x0103, 0x0203, 0x0303, 0x013b, 0x0003, 0x0103, 0x0203, 0x0000
-	.2byte 0x00c3, 0x0000, 0x0106, 0x0206, 0x0306, 0x0111, 0x0006, 0x0106, 0x0206, 0x0000
-	.2byte 0x00c4, 0x0000, 0x0104, 0x0204, 0x0304, 0x0112, 0x0004, 0x0104, 0x0204, 0x0000
-	.2byte 0x00ce, 0x0000, 0x010b, 0x020b, 0x030b, 0x0113, 0x000b, 0x010b, 0x020b, 0x0000
-	.2byte 0x00d8, 0x0000, 0x0101, 0x0201, 0x0301, 0x0114, 0x0001, 0x0101, 0x0201, 0x0000
-	.2byte 0x02a9, 0x0003, 0x010c, 0x020c, 0x030c, 0x013c, 0x000c, 0x010c, 0x020c, 0x0000
-	.2byte 0x00e2, 0x0000, 0x0107, 0x0207, 0x0307, 0x0115, 0x0007, 0x0107, 0x0207, 0x0000
-	.2byte 0x00ee, 0x0000, 0x0104, 0x0204, 0x0304, 0x0116, 0x0001, 0x0104, 0x0204, 0x0000
-	.2byte 0x00f9, 0x0000, 0x0108, 0x0208, 0x0308, 0x0117, 0x0008, 0x0108, 0x0208, 0x0000
-	.2byte 0x00fe, 0x0000, 0x010c, 0x020c, 0x030c, 0x0118, 0x000c, 0x010c, 0x020c, 0x0000
-	.2byte 0x0118, 0x0000, 0x0102, 0x0202, 0x0302, 0x011a, 0x0002, 0x0102, 0x0202, 0x0000
-	.2byte 0x0111, 0x0000, 0x0101, 0x0201, 0x0301, 0x0119, 0x0001, 0x0101, 0x0201, 0x0000
-	.2byte 0x011f, 0x0006, 0x0109, 0x0209, 0x0309, 0x011b, 0x0009, 0x0109, 0x0209, 0x0000
-	.2byte 0x012e, 0x0000, 0x010e, 0x020e, 0x030e, 0x011d, 0x000e, 0x010e, 0x020e, 0x0000
-	.2byte 0x0125, 0x0000, 0x010b, 0x020b, 0x030b, 0x011c, 0x000b, 0x010b, 0x020b, 0x0000
-	.2byte 0x0133, 0x0000, 0x010c, 0x020c, 0x030c, 0x011e, 0x000c, 0x010c, 0x020c, 0x0000
-	.2byte 0x0139, 0x0000, 0x010d, 0x020d, 0x030d, 0x011f, 0x000d, 0x010d, 0x020d, 0x0000
-	.2byte 0x013e, 0x0000, 0x0101, 0x0201, 0x0301, 0x0120, 0x0001, 0x0101, 0x0201, 0x0000
-	.2byte 0x0153, 0x0000, 0x0103, 0x0203, 0x0303, 0x0121, 0x0003, 0x0103, 0x0203, 0x0000
-	.2byte 0x0178, 0x0000, 0x0105, 0x0205, 0x0305, 0x0126, 0x0005, 0x0105, 0x0205, 0x0000
-	.2byte 0x0171, 0x0000, 0x0109, 0x0209, 0x0309, 0x0125, 0x0009, 0x0109, 0x0209, 0x0000
-	.2byte 0x0166, 0x0000, 0x0109, 0x0209, 0x0309, 0x0123, 0x0009, 0x0109, 0x0209, 0x0000
-	.2byte 0x016c, 0x0000, 0x0105, 0x0205, 0x0305, 0x0124, 0x0005, 0x0105, 0x0205, 0x0000
-	.2byte 0x0182, 0x0000, 0x0109, 0x0209, 0x0309, 0x0128, 0x0009, 0x0109, 0x0209, 0x0000
-	.2byte 0x0161, 0x0000, 0x0105, 0x0205, 0x0305, 0x0122, 0x0005, 0x0105, 0x0205, 0x0000
-	.2byte 0x0179, 0x0000, 0x0105, 0x0205, 0x0305, 0x0127, 0x0005, 0x0105, 0x0205, 0x0000
-	.2byte 0x0188, 0x0000, 0x0104, 0x0204, 0x0304, 0x0129, 0x0004, 0x0104, 0x0204, 0x0000
-	.2byte 0x0196, 0x0000, 0x0106, 0x0206, 0x0306, 0x012a, 0x0006, 0x0106, 0x0206, 0x0000
-	.2byte 0x01a3, 0x0000, 0x0101, 0x0201, 0x0301, 0x012b, 0x0001, 0x0101, 0x0201, 0x0000
-	.2byte 0x01ab, 0x0000, 0x0109, 0x0209, 0x0309, 0x012c, 0x0009, 0x0109, 0x0209, 0x0000
-	.2byte 0x01b2, 0x0000, 0x0108, 0x0208, 0x0308, 0x012d, 0x0008, 0x0108, 0x0208, 0x0000
-	.2byte 0x01c1, 0x0000, 0x0109, 0x0209, 0x0309, 0x012e, 0x0009, 0x0109, 0x0209, 0x0000
-	.2byte 0x01da, 0x0000, 0x0102, 0x0202, 0x0302, 0x012f, 0x0002, 0x0102, 0x0202, 0x0000
-	.2byte 0x01e1, 0x0002, 0x0102, 0x0202, 0x0302, 0x0130, 0x0001, 0x0102, 0x0202, 0x0000
-	.2byte 0x01ec, 0x0000, 0x0103, 0x0203, 0x0303, 0x0131, 0x0003, 0x0103, 0x0203, 0x0000
-	.2byte 0x02e4, 0x0000, 0x0103, 0x0203, 0x0303, 0x013f, 0x0003, 0x0103, 0x0203, 0x0000
-	.2byte 0x0200, 0x0000, 0x0107, 0x0207, 0x0307, 0x0132, 0x0007, 0x0107, 0x0207, 0x0000
-	.2byte 0x0221, 0x0000, 0x0108, 0x0208, 0x0308, 0x0134, 0x0008, 0x0108, 0x0208, 0x0000
-	.2byte 0x021a, 0x0000, 0x0105, 0x0205, 0x0305, 0x0133, 0x0005, 0x0105, 0x0205, 0x0000
-	.2byte 0x0009, 0x0000, 0x0108, 0x0208, 0x0308, 0x0102, 0x0008, 0x0108, 0x0208, 0x0000
-	.2byte 0x022f, 0x0000, 0x0109, 0x0209, 0x0309, 0x0136, 0x0009, 0x0109, 0x0209, 0x0000
-	.2byte 0x0228, 0x0000, 0x0105, 0x0205, 0x0305, 0x0135, 0x0005, 0x0105, 0x0205, 0x0000
-	.2byte 0x025c, 0x0000, 0x0102, 0x0202, 0x0302, 0x0137, 0x0002, 0x0102, 0x0202, 0x0000
-	.2byte 0x026d, 0x0000, 0x0101, 0x0201, 0x0301, 0x0138, 0x0001, 0x0101, 0x0201, 0x0000
-	.2byte 0x0273, 0x0000, 0x0103, 0x0203, 0x0303, 0x0139, 0x0003, 0x0103, 0x0203, 0x0000
-	.2byte 0x0001, 0x0000, 0x010f, 0x0203, 0x0303, 0x0101, 0x0003, 0x0103, 0x0203, 0x0000
-	.2byte 0x0282, 0x0001, 0x0109, 0x0209, 0x0309, 0x013a, 0x0009, 0x0109, 0x0209, 0x0000
-
-	.align 2
-gUnknown_0860E3B8:: @ 860E3B8
-	.4byte BattleFrontier_PokeNav_2A971C, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9798, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9813, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A98A8, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9977, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A99FD, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9A78, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9AE8, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9BA7, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9C36, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9CC8, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9D44, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9DD7, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9E70, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2A9EFD, 0x00ff0200
-
-	.align 2
-gUnknown_0860E430:: @ 860E430
-	.4byte BattleFrontier_PokeNav_2A9FAB, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA028, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA099, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA100, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA188, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA214, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA2A1, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA31B, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA3A8, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA442, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA4C5, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA520, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA5AD, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AA64D, 0x00ffff00
-
-	.align 2
-gUnknown_0860E4A0:: @ 860E4A0
-	.4byte BattleFrontier_PokeNav_2AA6AF, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AA730, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AA77A, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AA81C, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AA88C, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AA934, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AA9D3, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AAA40, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AAAE4, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AAB8C, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AAC25, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AAC9D, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AAD41, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AAE00, 0x00ff0300
-
-	.align 2
-gUnknown_0860E510:: @ 860E510
-	.4byte BattleFrontier_PokeNav_2AAE7F, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AAEF1, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AAF69, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB010, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB076, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB11A, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB1B4, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB23D, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB2E9, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB382, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB410, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB4B0, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB538, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB5E4, 0x00ff0100
-
-	.align 2
-gUnknown_0860E580:: @ 860E580
-	.4byte BattleFrontier_PokeNav_2AB670, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB6CD, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB73C, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB808, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB8B7, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AB95D, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2ABA03, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2ABA9F, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2ABB62, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2ABC26, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2ABCE9, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2ABDA2, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2ABE5E, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2ABF36, 0x00ff0100
-
-	.align 2
-gUnknown_0860E5F0:: @ 860E5F0
-	.4byte BattleFrontier_PokeNav_2AC009, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AC0BD, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC18C, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC228, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC30C, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC3B6, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC446, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC5C7, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC682, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC755, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC82C, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AC914, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ACA59, 0x00ff0200
-	.4byte BattleFrontier_PokeNav_2ACB02, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ACC3F, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ACD2F, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ACE1E, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ACF32, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2ACFBE, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD0AC, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD194, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD1DF, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD2A8, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD34F, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD44E, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD53A, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD642, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AD801, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AD92E, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2ADA8F, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ADB9B, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ADC92, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ADE08, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2ADF07, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE0D9, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE1FD, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE327, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE3DA, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE489, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE5CD, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE698, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE704, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AE78F, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE859, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AE8E6, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AE998, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AEA8F, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AEB77, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AEBFA, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AECC1, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AED52, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AEE35, 0x00ff0300
-	.4byte BattleFrontier_PokeNav_2AEEF4, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AEFDA, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AF0E7, 0x00ff0100
-	.4byte BattleFrontier_PokeNav_2AF1B8, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AF2C4, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AF371, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AF480, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AF671, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AF7D8, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AF8F7, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AFA39, 0x00ffff00
-	.4byte BattleFrontier_PokeNav_2AFB26, 0x00ffff00
-
-	.align 2
-gUnknown_0860E7F0:: @860E7F0
-	.4byte BattleFrontier_PokeNav_2AFC07, 0x00050400
-	.4byte BattleFrontier_PokeNav_2AFC78, 0x00050400
-	.4byte BattleFrontier_PokeNav_2AFCFF, 0x00050400
-	.4byte BattleFrontier_PokeNav_2AFDA7, 0x00050400
-	.4byte BattleFrontier_PokeNav_2AFE3D, 0x00050400
-	.4byte BattleFrontier_PokeNav_2AFECA, 0x00050400
-	.4byte BattleFrontier_PokeNav_2AFF64, 0x00050400
-	.4byte BattleFrontier_PokeNav_2AFFF0, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B00B5, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0129, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B01A5, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0232, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B02D9, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0366, 0x00050400
-
-	.align 2
-gUnknown_0860E860:: @860E860
-	.4byte BattleFrontier_PokeNav_2B03E6, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0457, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B04DE, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0586, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B061C, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B06A3, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B073B, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B07C7, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0894, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0908, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0984, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0A11, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0AB8, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0B45, 0x00050400
-
-	.align 2
-gUnknown_0860E8D0:: @860E8D0
-	.4byte BattleFrontier_PokeNav_2B0BC5, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0C4A, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0CC7, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0D4A, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0DC8, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0E35, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0ED1, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B0F72, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B102A, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B10A7, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1121, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B11D3, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B124D, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B12D0, 0x00050400
-
-	.align 2
-gUnknown_0860E940:: @860E940
-	.4byte BattleFrontier_PokeNav_2B1347, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B13B1, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B142B, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B14B4, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1525, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B158E, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1622, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B169D, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1775, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B17F8, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1877, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1946, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B19C7, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1A4C, 0x00050400
-
-	.align 2
-gUnknown_0860E9B0:: @860E9B0
-	.4byte BattleFrontier_PokeNav_2B1ACA, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1B50, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1BE4, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1C6A, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1CCF, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1D38, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1DCD, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1E4B, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1F24, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B1FA8, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B2022, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B20F3, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B2175, 0x00050400
-	.4byte BattleFrontier_PokeNav_2B21FC, 0x00050400
-
-	.align 2
-gUnknown_0860EA20:: @ 860EA20
-	.4byte gUnknown_0860E3B8
-	.4byte gUnknown_0860E430
-	.4byte gUnknown_0860E4A0
-
-	.align 2
-gUnknown_0860EA2C:: @ 860EA2C
-	.4byte gUnknown_0860E510
-	.4byte gUnknown_0860E580
-
-	.align 2
-gUnknown_0860EA34:: @ 860EA34
-	.4byte gUnknown_0860E5F0
-	.4byte gUnknown_0860E7F0
-	.4byte gUnknown_0860E860
-	.4byte gUnknown_0860E8D0
-	.4byte gUnknown_0860E940
-	.4byte gUnknown_0860E9B0
-
-	.align 2
-gUnknown_0860EA4C:: @ 860EA4C
-	.incbin "graphics/unknown/unknown_60EA4C.gbapal"
-
-	.align 2
-gUnknown_0860EA6C:: @ 860EA6C
-	.incbin "graphics/interface/menu_border.4bpp"
-
-	.align 2
-gUnknown_0860EB6C:: @ 860EB6C
-	.incbin "graphics/pokenav/icon.gbapal"
-
-	.align 2
-gUnknown_0860EB8C:: @ 860EB8C
-	.incbin "graphics/pokenav/icon.4bpp.lz"
-
-	.align 2
-gText_PokenavCallEllipsis:: @ 860EF70
-	.string "………………\p$"
-
-	.align 2
-gUnknown_0860EF78:: @ 860EF78
-	.4byte sub_819612C
-	.4byte sub_81961F0
-	.4byte sub_8196274
-	.4byte sub_81962B0
-	.4byte sub_81962D8
-	.4byte sub_8196330
-	.4byte sub_8196390
-	.4byte sub_81963F0
-
-	.align 2
-gUnknown_0860EF98:: @ 860EF98
-	window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0f, 0x0200
-
-	.align 2
-gUnknown_0860EFA0:: @ 860EFA0
-	.4byte gStringVar1
-	.4byte gStringVar2
-	.4byte gStringVar3
-
-	.align 2
-gUnknown_0860EFAC:: @ 860EFAC
-	.4byte sub_8196A44
-	.4byte sub_8196A9C
-	.4byte sub_8196B98
-	.4byte sub_8196C70
-	.4byte sub_8196CF4
-	.4byte sub_8196D14
-
-	.align 2
-gUnknown_0860EFC4:: @ 860EFC4
-    .4byte 0x00000282, gText_Kira
-    .4byte 0x000001e1, gText_Amy
-    .4byte 0x000002a9, gText_John
-    .4byte 0x000002af, gText_Roy
-    .4byte 0x00000033, gText_Gabby
-    .4byte 0x0000011f, gText_Anna
-
-	.align 2
-gUnknown_0860EFF4:: @ 860EFF4
-	.4byte gText_BattleTower2
-	.4byte gText_BattleDome
-	.4byte gText_BattlePalace
-	.4byte gText_BattleArena
-	.4byte gText_BattlePike
-	.4byte gText_BattleFactory
-	.4byte gText_BattlePyramid
-
-	.align 2
-gUnknown_0860F010:: @ 860F010
-	.2byte FLAG_BADGE01_GET
-	.2byte FLAG_BADGE02_GET
-	.2byte FLAG_BADGE03_GET
-	.2byte FLAG_BADGE04_GET
-	.2byte FLAG_BADGE05_GET
-	.2byte FLAG_BADGE06_GET
-	.2byte FLAG_BADGE07_GET
-	.2byte FLAG_BADGE08_GET
-
-gUnknown_0860F020:: @ 860F020
-	.4byte gBirchDexRatingText_LessThan10
-	.4byte gBirchDexRatingText_LessThan20
-	.4byte gBirchDexRatingText_LessThan30
-	.4byte gBirchDexRatingText_LessThan40
-	.4byte gBirchDexRatingText_LessThan50
-	.4byte gBirchDexRatingText_LessThan60
-	.4byte gBirchDexRatingText_LessThan70
-	.4byte gBirchDexRatingText_LessThan80
-	.4byte gBirchDexRatingText_LessThan90
-	.4byte gBirchDexRatingText_LessThan100
-	.4byte gBirchDexRatingText_LessThan110
-	.4byte gBirchDexRatingText_LessThan120
-	.4byte gBirchDexRatingText_LessThan130
-	.4byte gBirchDexRatingText_LessThan140
-	.4byte gBirchDexRatingText_LessThan150
-	.4byte gBirchDexRatingText_LessThan160
-	.4byte gBirchDexRatingText_LessThan170
-	.4byte gBirchDexRatingText_LessThan180
-	.4byte gBirchDexRatingText_LessThan190
-	.4byte gBirchDexRatingText_LessThan200
-	.4byte gBirchDexRatingText_DexCompleted

data/maps/AbandonedShip_CaptainsOffice/scripts.inc

@@ -4,7 +4,7 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2
 	lock
 	faceplayer
-	goto_if_set FLAG_TRADED_SCANNER_TO_STERN, AbandonedShip_CaptainsOffice_EventScript_23881A
+	goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A
 	checkitem ITEM_SCANNER, 1
 	compare VAR_RESULT, 1
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810

data/maps/AbandonedShip_Corridors_B1F/scripts.inc

@@ -8,8 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F
 	end
 
 AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
-	call_if_unset FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DAB
-	call_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DB5
+	call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DAB
+	call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DB5
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
@@ -26,14 +26,14 @@ AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF
 
 AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
 	lockall
-	goto_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237E09
+	goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237E09
 	checkitem ITEM_STORAGE_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
 	msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_STORAGE_KEY, 1
-	setflag FLAG_0x0EF
+	setflag FLAG_USED_STORAGE_KEY
 	call AbandonedShip_Corridors_B1F_EventScript_237DB5
 	special DrawWholeMapView
 	releaseall

data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc

@@ -8,14 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977
 	end
 
 AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
-	call_if_unset FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
-	call_if_unset FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
-	call_if_unset FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
-	call_if_unset FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
-	call_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
-	call_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
-	call_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
-	call_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
+	call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
+	call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
+	call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
+	call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
+	call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
+	call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
+	call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
+	call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
@@ -52,14 +52,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
 	lockall
-	goto_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
 	checkitem ITEM_ROOM_1_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_1_KEY, 1
-	setflag FLAG_0x0F0
+	setflag FLAG_USED_ROOM_1_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
 	special DrawWholeMapView
 	releaseall
@@ -67,14 +67,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
 	lockall
-	goto_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
 	checkitem ITEM_ROOM_2_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_2_KEY, 1
-	setflag FLAG_0x0F1
+	setflag FLAG_USED_ROOM_2_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
 	special DrawWholeMapView
 	releaseall
@@ -82,14 +82,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
 	lockall
-	goto_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
 	checkitem ITEM_ROOM_4_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_4_KEY, 1
-	setflag FLAG_0x0F2
+	setflag FLAG_USED_ROOM_4_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
 	special DrawWholeMapView
 	releaseall
@@ -97,14 +97,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
 	lockall
-	goto_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
 	checkitem ITEM_ROOM_6_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_6_KEY, 1
-	setflag FLAG_0x0F3
+	setflag FLAG_USED_ROOM_6_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
 	special DrawWholeMapView
 	releaseall

data/maps/AncientTomb/scripts.inc

@@ -17,7 +17,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
 
 AncientTomb_MapScript1_238FE1: @ 8238FE1
 	setflag FLAG_LANDMARK_ANCIENT_TOMB
-	call_if_unset FLAG_0x1BD, AncientTomb_EventScript_238FEE
+	call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE
 	end
 
 AncientTomb_EventScript_238FEE:: @ 8238FEE
@@ -78,12 +78,12 @@ AncientTomb_EventScript_23905A:: @ 823905A
 	goto_if_eq AncientTomb_EventScript_2390AA
 	compare VAR_RESULT, 5
 	goto_if_eq AncientTomb_EventScript_2390AA
-	setflag FLAG_0x1BD
+	setflag FLAG_DEFEATED_REGISTEEL
 	release
 	end
 
 AncientTomb_EventScript_2390A1:: @ 82390A1
-	setflag FLAG_0x1BD
+	setflag FLAG_DEFEATED_REGISTEEL
 	goto AncientTomb_EventScript_27376D
 	end
 

data/maps/AquaHideout_1F/scripts.inc

@@ -4,8 +4,8 @@ AquaHideout_1F_MapScripts:: @ 8233493
 AquaHideout_1F_EventScript_233494:: @ 8233494
 	lock
 	faceplayer
-	goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334BC
-	goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334B2
+	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334BC
+	goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334B2
 	msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT
 	release
 	end
@@ -23,8 +23,8 @@ AquaHideout_1F_EventScript_2334BC:: @ 82334BC
 AquaHideout_1F_EventScript_2334C6:: @ 82334C6
 	lock
 	faceplayer
-	goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334EE
-	goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334E4
+	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334EE
+	goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334E4
 	msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT
 	release
 	end

data/maps/AquaHideout_B1F/scripts.inc

@@ -15,8 +15,8 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
 	return
 
 AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
-	call_if_unset FLAG_0x1C4, AquaHideout_B1F_EventScript_2339E3
-	call_if_unset FLAG_0x1C5, AquaHideout_B1F_EventScript_2339E7
+	call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3
+	call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7
 	end
 
 AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
@@ -45,12 +45,12 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
 	goto_if_eq AquaHideout_B1F_EventScript_233A2F
 	compare VAR_RESULT, 5
 	goto_if_eq AquaHideout_B1F_EventScript_233A2F
-	setflag FLAG_0x1C4
+	setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
 	release
 	end
 
 AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F
-	setflag FLAG_0x1C4
+	setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
 	goto AquaHideout_B1F_EventScript_27376D
 	end
 
@@ -72,12 +72,12 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
 	goto_if_eq AquaHideout_B1F_EventScript_233A7C
 	compare VAR_RESULT, 5
 	goto_if_eq AquaHideout_B1F_EventScript_233A7C
-	setflag FLAG_0x1C5
+	setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
 	release
 	end
 
 AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C
-	setflag FLAG_0x1C5
+	setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
 	goto AquaHideout_B1F_EventScript_27376D
 	end
 
@@ -165,4 +165,3 @@ AquaHideout_B1F_Text_233D6E: @ 8233D6E
 AquaHideout_B1F_Text_233D84: @ 8233D84
 	.string "If you have a cool uniform, you look\n"
 	.string "good even in a loss, don't you think?$"
-

data/maps/AquaHideout_B2F/scripts.inc

@@ -3,7 +3,7 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF
 	.byte 0
 
 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
-	call_if_set FLAG_0x070, AquaHideout_B2F_EventScript_233DDF
+	call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF
 	end
 
 AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF
@@ -46,7 +46,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25
 	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
-	setflag FLAG_0x070
+	setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE
 	setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
 	release
 	end
@@ -156,4 +156,3 @@ AquaHideout_B2F_Text_2342CC: @ 82342CC
 AquaHideout_B2F_Text_2342FF: @ 82342FF
 	.string "I'll have to learn about how I can\n"
 	.string "battle more effectively…$"
-

data/maps/ArtisanCave_B1F/scripts.inc

@@ -3,6 +3,6 @@ ArtisanCave_B1F_MapScripts:: @ 823AFAD
 	.byte 0
 
 ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3
-	setflag FLAG_0x8DF
+	setflag FLAG_LANDMARK_ARTISAN_CAVE
 	end
 

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -513,7 +513,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC
 	end
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E
-	setflag FLAG_0x077
+	setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
 	end
 

data/maps/BattleFrontier_BattleTowerElevator/scripts.inc

@@ -40,7 +40,7 @@ BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
 	return
 
 BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F
-	goto_if_unset FLAG_0x152, BattleFrontier_BattleTowerElevator_EventScript_241A7C
+	goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_241A7C
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
 	waitstate
 	return

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -15,7 +15,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
 	special CallApprenticeFunction
 	compare VAR_0x8004, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
-	goto_if_set FLAG_0x934, BattleFrontier_BattleTowerLobby_EventScript_23E6C1
+	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_23E6C1
 
 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
 	clearflag FLAG_HIDE_APPRENTICE
@@ -120,7 +120,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2
 BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
 	compare VAR_FRONTIER_BATTLE_MODE, 2
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
-	goto_if_set FLAG_0x152, BattleFrontier_BattleTowerLobby_EventScript_23E81E
+	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
 	special sub_8161F74
@@ -398,7 +398,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, 0
-	clearflag FLAG_0x152
+	clearflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, MSGBOX_DEFAULT
 
@@ -744,7 +744,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
 	compare VAR_RESULT, 6
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108
 	call BattleFrontier_BattleTowerLobby_EventScript_23F135
-	clearflag FLAG_0x077
+	clearflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
 	setvar VAR_TEMP_0, 0
 	waitstate

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc

@@ -11,7 +11,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
-	goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
+	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
 	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
 	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
 	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
@@ -165,7 +165,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
-	goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
+	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
 	setvar VAR_0x8004, 11
 	setvar VAR_0x8005, 0
 	special sub_8161F74
@@ -195,7 +195,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
 	compare VAR_FACING, 1
 	call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
 	removeobject VAR_LAST_TALKED
-	setflag FLAG_0x152
+	setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3
 	waitstate
 	release

data/maps/BattleFrontier_Lounge1/scripts.inc

@@ -4,9 +4,9 @@ BattleFrontier_Lounge1_MapScripts:: @ 825E774
 BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775
 	lock
 	faceplayer
-	call_if_unset FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7AD
-	call_if_set FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7B6
-	setflag FLAG_0x153
+	call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7AD
+	call_if_set FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7B6
+	setflag FLAG_MET_BATTLE_FRONTIER_BREEDER
 	goto BattleFrontier_Lounge1_EventScript_25E792
 	end
 

data/maps/BattleFrontier_Lounge2/scripts.inc

@@ -4,8 +4,8 @@ BattleFrontier_Lounge2_MapScripts:: @ 8260642
 BattleFrontier_Lounge2_EventScript_260643:: @ 8260643
 	lock
 	faceplayer
-	goto_if_set FLAG_0x154, BattleFrontier_Lounge2_EventScript_26065F
-	setflag FLAG_0x154
+	goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_26065F
+	setflag FLAG_MET_BATTLE_FRONTIER_MANIAC
 	msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge2_EventScript_26066D
 	end

data/maps/BattleFrontier_Lounge3/scripts.inc

@@ -4,11 +4,11 @@ BattleFrontier_Lounge3_MapScripts:: @ 8261D82
 BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83
 	lock
 	faceplayer
-	goto_if_set FLAG_0x157, BattleFrontier_Lounge3_EventScript_261EF9
+	goto_if_set FLAG_MET_BATTLE_FRONTIER_BETTOR, BattleFrontier_Lounge3_EventScript_261EF9
 	call BattleFrontier_Lounge3_EventScript_261EA0
 	compare VAR_0x8004, 2
 	goto_if_le BattleFrontier_Lounge3_EventScript_261EEB
-	setflag FLAG_0x157
+	setflag FLAG_MET_BATTLE_FRONTIER_BETTOR
 	msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_261DAF
 	end
@@ -472,4 +472,3 @@ BattleFrontier_Lounge3_Text_263545:: @ 8263545
 	.string "Those TRAINERS…\n"
 	.string "What are they doing?\l"
 	.string "They should be taking challenges.$"
-

data/maps/BattleFrontier_Lounge6/scripts.inc

@@ -4,7 +4,7 @@ BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
 BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
 	lock
 	faceplayer
-	goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083
+	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
 	setvar VAR_0x8008, 3
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
@@ -28,7 +28,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
 	special DoInGameTradeScene
 	waitstate
 	msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
-	setflag FLAG_0x09C
+	setflag FLAG_BATTLE_FRONTIER_TRADE_DONE
 	release
 	end
 
@@ -78,4 +78,3 @@ BattleFrontier_Lounge6_Text_26520E: @ 826520E
 	.string "Giggle!\n"
 	.string "A SKITTY is so much cuter than I had\l"
 	.string "imagined. I'm delighted!$"
-

data/maps/BattleFrontier_Lounge7/scripts.inc

@@ -5,9 +5,9 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255
 	lock
 	faceplayer
 	setvar VAR_TEMP_C, 9
-	goto_if_set FLAG_0x15A, BattleFrontier_Lounge7_EventScript_265276
+	goto_if_set FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265276
 	msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT
-	setflag FLAG_0x15A
+	setflag FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR
 	goto BattleFrontier_Lounge7_EventScript_265284
 	end
 
@@ -119,9 +119,9 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445
 	lock
 	faceplayer
 	setvar VAR_TEMP_C, 10
-	goto_if_set FLAG_0x15B, BattleFrontier_Lounge7_EventScript_265466
+	goto_if_set FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265466
 	msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT
-	setflag FLAG_0x15B
+	setflag FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR
 	goto BattleFrontier_Lounge7_EventScript_265474
 	end
 
@@ -477,4 +477,3 @@ BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5
 	.string "A fiery punch\n"
 	.string "that may burn\n"
 	.string "the foe.$"
-

data/maps/BattleFrontier_OutsideEast/scripts.inc

@@ -17,7 +17,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
 BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
 	setvar VAR_0x40BC, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
-	call_if_unset FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242C3F
+	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F
 	end
 
 BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
@@ -139,12 +139,12 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
 	goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
 	compare VAR_RESULT, 5
 	goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
-	setflag FLAG_0x1C6
+	setflag FLAG_DEFEATED_SUDOWOODO
 	release
 	end
 
 BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60
-	setflag FLAG_0x1C6
+	setflag FLAG_DEFEATED_SUDOWOODO
 	goto IslandCave_EventScript_27376D
 	end
 
@@ -221,7 +221,7 @@ BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
 BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
 	lock
 	faceplayer
-	goto_if_set FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242DFE
+	goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242DFE
 	msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT
 	release
 	end

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -11,15 +11,15 @@ BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8
 	end
 
 BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB
-	goto_if_unset FLAG_0x1D1, BattleFrontier_ScottsHouse_EventScript_263943
-	goto_if_unset FLAG_0x05C, BattleFrontier_ScottsHouse_EventScript_263704
-	goto_if_unset FLAG_0x1D2, BattleFrontier_ScottsHouse_EventScript_26376A
+	goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_263943
+	goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_263704
+	goto_if_unset FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT, BattleFrontier_ScottsHouse_EventScript_26376A
 	goto BattleFrontier_ScottsHouse_EventScript_2636EC
 	end
 
 BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC
-	goto_if_unset FLAG_0x0ED, BattleFrontier_ScottsHouse_EventScript_26381B
-	goto_if_unset FLAG_0x0EE, BattleFrontier_ScottsHouse_EventScript_2638B4
+	goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_26381B
+	goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_2638B4
 	goto BattleFrontier_ScottsHouse_EventScript_2637E4
 	end
 
@@ -35,7 +35,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704
 	giveitem_std ITEM_LANSAT_BERRY
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
-	setflag FLAG_0x05C
+	setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS
 	setflag FLAG_TEMP_4
 	release
 	end
@@ -52,7 +52,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
 	giveitem_std ITEM_STARF_BERRY
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
-	setflag FLAG_0x1D2
+	setflag FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT
 	setflag FLAG_TEMP_4
 	release
 	end
@@ -115,7 +115,7 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
 	givedecoration_std 42
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
-	setflag FLAG_0x0ED
+	setflag FLAG_RECEIVED_SILVER_SHIELD
 	setflag FLAG_TEMP_3
 	goto BattleFrontier_ScottsHouse_EventScript_2638AA
 	end
@@ -158,7 +158,7 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
 	givedecoration_std 43
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
-	setflag FLAG_0x0EE
+	setflag FLAG_RECEIVED_GOLD_SHIELD
 	setflag FLAG_TEMP_3
 	goto BattleFrontier_ScottsHouse_EventScript_2638AA
 	end
@@ -221,7 +221,7 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
 	special sub_813A9D0
 	msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
 	msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT
-	setflag FLAG_0x1D1
+	setflag FLAG_SCOTT_GIVES_BATTLE_POINTS
 	setflag FLAG_TEMP_2
 	release
 	end

data/maps/BirthIsland_Exterior/scripts.inc

@@ -9,12 +9,12 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
 	end
 
 BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
-	setflag FLAG_0x8D3
+	setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0
 	setvar VAR_DEOXYS_ROCK_LEVEL, 0
-	call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E
-	call_if_unset FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F55
+	call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F4E
+	call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F55
 	end
 
 BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
@@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
 	return
 
 BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
-	goto_if_set FLAG_0x1AC, BirthIsland_Exterior_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E
 	clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	clearflag FLAG_DEOXYS_ROCK_COMPLETE
 	return
@@ -94,12 +94,12 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
 	goto_if_eq BirthIsland_Exterior_EventScript_268049
 	compare VAR_RESULT, 5
 	goto_if_eq BirthIsland_Exterior_EventScript_268049
-	setflag FLAG_0x1AD
+	setflag FLAG_BATTLED_DEOXYS
 	release
 	end
 
 BirthIsland_Exterior_EventScript_26803B:: @ 826803B
-	setflag FLAG_0x1AC
+	setflag FLAG_DEFEATED_DEOXYS
 	setvar VAR_0x8004, 410
 	goto BirthIsland_Exterior_EventScript_273776
 	end
@@ -118,4 +118,3 @@ BirthIsland_Exterior_Movement_268054: @ 8268054
 	walk_slow_down
 	walk_slow_down
 	step_end
-

data/maps/CaveOfOrigin_1F/scripts.inc

@@ -3,6 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768
 	.byte 0
 
 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E
-	call_if_set FLAG_0x071, CaveOfOrigin_1F_EventScript_2722C1
+	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1
 	end
-

data/maps/CaveOfOrigin_B1F/scripts.inc

@@ -51,7 +51,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D
 	closemessage
 	playse SE_KAIDAN
 	fadescreenspeed 1, 4
-	setflag FLAG_0x137
+	setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
 	setvar VAR_0x405E, 3
 	removeobject 1
 	clearflag FLAG_HIDE_SKY_PILLAR_WALLACE

data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc

@@ -3,6 +3,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E
-	call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
+	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
 	end
-

data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc

@@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E
-	call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
+	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
 	end
 

data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc

@@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E
-	call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
+	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
 	end
 

data/maps/DesertRuins/scripts.inc

@@ -30,7 +30,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
 
 DesertRuins_MapScript1_22D9CA: @ 822D9CA
 	setflag FLAG_LANDMARK_DESERT_RUINS
-	call_if_unset FLAG_0x1BB, DesertRuins_EventScript_22D9D7
+	call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7
 	end
 
 DesertRuins_EventScript_22D9D7:: @ 822D9D7
@@ -78,12 +78,12 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
 	goto_if_eq DesertRuins_EventScript_22DA52
 	compare VAR_RESULT, 5
 	goto_if_eq DesertRuins_EventScript_22DA52
-	setflag FLAG_0x1BB
+	setflag FLAG_DEFEATED_REGIROCK
 	release
 	end
 
 DesertRuins_EventScript_22DA49:: @ 822DA49
-	setflag FLAG_0x1BB
+	setflag FLAG_DEFEATED_REGIROCK
 	goto DesertRuins_EventScript_27376D
 	end
 

data/maps/DesertUnderpass/scripts.inc

@@ -9,8 +9,8 @@ DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
 DesertUnderpass_EventScript_23AF41:: @ 823AF41
 	lock
 	faceplayer
-	goto_if_set FLAG_0x14F, DesertUnderpass_EventScript_23AF57
-	goto_if_set FLAG_0x150, DesertUnderpass_EventScript_23AF68
+	goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57
+	goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68
 	release
 	end
 

data/maps/DewfordTown/scripts.inc

@@ -9,7 +9,7 @@ DewfordTown_MapScript1_1E950D: @ 81E950D
 DewfordTown_EventScript_1E9511:: @ 81E9511
 	lock
 	faceplayer
-	goto_if_unset FLAG_0x0BD, DewfordTown_EventScript_1E9585
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585
 	message DewfordTown_Text_1E9C8A
 	waitmessage
 	multichoicedefault 21, 6, 0, 2, 0
@@ -73,7 +73,7 @@ DewfordTown_EventScript_1E95CC:: @ 81E95CC
 DewfordTown_EventScript_1E95D5:: @ 81E95D5
 	lock
 	faceplayer
-	goto_if_set FLAG_0x101, DewfordTown_EventScript_1E962A
+	goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_1E962A
 	msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	goto_if_eq DewfordTown_EventScript_1E95FF
@@ -84,7 +84,7 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5
 DewfordTown_EventScript_1E95FF:: @ 81E95FF
 	msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT
 	giveitem_std ITEM_OLD_ROD
-	setflag FLAG_0x101
+	setflag FLAG_RECEIVED_OLD_ROD
 	msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT
 	release
 	end
@@ -174,8 +174,8 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
 	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	hideobjectat 4, MAP_DEWFORD_TOWN
-	call_if_unset FLAG_0x095, DewfordTown_EventScript_1E9790
-	call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799
+	call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790
+	call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799
 	closemessage
 	copyvar VAR_0x4096, VAR_0x8008
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN

data/maps/DewfordTown_Gym/scripts.inc

@@ -160,7 +160,7 @@ DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq DewfordTown_Gym_EventScript_1FC89C
-	goto_if_unset FLAG_0x0A6, DewfordTown_Gym_EventScript_1FC878
+	goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1FC878
 	msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT
 	release
 	end
@@ -171,7 +171,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 	waitmessage
 	call DewfordTown_Gym_EventScript_27207E
 	msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT
-	setflag FLAG_0x4F1
+	setflag FLAG_DEFEATED_DEWFORD_GYM
 	setflag FLAG_BADGE02_GET
 	addvar VAR_0x4085, 1
 	compare VAR_0x4085, 6
@@ -186,9 +186,9 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x1D4
+	setflag FLAG_ENABLE_BRAWLY_MATCH_CALL
 	setvar VAR_0x40F4, 0
-	setflag FLAG_0x080
+	setflag FLAG_ENABLE_ROXANNE_FIRST_CALL
 	release
 	end
 
@@ -197,7 +197,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
 	compare VAR_RESULT, 0
 	goto_if_eq DewfordTown_Gym_EventScript_27205E
 	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
-	setflag FLAG_0x0A6
+	setflag FLAG_RECEIVED_TM08
 	return
 
 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
@@ -205,7 +205,7 @@ DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
 	compare VAR_RESULT, 0
 	goto_if_eq DewfordTown_Gym_EventScript_272054
 	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
-	setflag FLAG_0x0A6
+	setflag FLAG_RECEIVED_TM08
 	release
 	end
 
@@ -277,7 +277,7 @@ DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C
 DewfordTown_Gym_EventScript_1FC983:: @ 81FC983
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4F1, DewfordTown_Gym_EventScript_1FC998
+	goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_1FC998
 	msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT
 	release
 	end
@@ -484,4 +484,3 @@ DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE
 	.string "that can battle.\p"
 	.string "I'm sorry, but I'd like you to come back\n"
 	.string "with at least two POKéMON.$"
-

data/maps/DewfordTown_Hall/scripts.inc

@@ -252,12 +252,12 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
 	lock
 	faceplayer
 	call DewfordTown_Hall_EventScript_271E8B
-	goto_if_set FLAG_RECEIVED_TM_36, DewfordTown_Hall_EventScript_1FD80E
+	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1FD80E
 	msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM36
 	compare VAR_RESULT, 0
 	goto_if_eq DewfordTown_Hall_EventScript_272054
-	setflag FLAG_RECEIVED_TM_36
+	setflag FLAG_RECEIVED_TM36
 	release
 	end
 

data/maps/DewfordTown_House2/scripts.inc

@@ -4,12 +4,12 @@ DewfordTown_House2_MapScripts:: @ 81FE22D
 DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E
 	lock
 	faceplayer
-	goto_if_set FLAG_0x121, DewfordTown_House2_EventScript_1FE267
+	goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_1FE267
 	msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT
 	giveitem_std ITEM_SILK_SCARF
 	compare VAR_RESULT, 0
 	goto_if_eq DewfordTown_House2_EventScript_1FE25D
-	setflag FLAG_0x121
+	setflag FLAG_RECEIVED_SILK_SCARF
 	release
 	end
 

data/maps/EverGrandeCity_DrakesRoom/scripts.inc

@@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
 	end
 
 EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
-	call_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_2286E7
+	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7
 	compare VAR_0x409C, 4
 	call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
 	end
@@ -40,7 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED
 EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_22871A
+	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_22871A
 	playbgm MUS_SITENNOU, 0
 	msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895
@@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A
 EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724
 	setvar VAR_0x8004, 0
 	special sub_813BF7C
-	setflag FLAG_0x4FE
+	setflag FLAG_DEFEATED_ELITE_4_DRAKE
 	call EverGrandeCity_DrakesRoom_EventScript_2723F8
 	msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT
 	release

data/maps/EverGrandeCity_GlaciasRoom/scripts.inc

@@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
-	call_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_22845D
+	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D
 	compare VAR_0x409C, 3
 	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
 	end
@@ -40,7 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463
 EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_228490
+	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_228490
 	playbgm MUS_SITENNOU, 0
 	msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4
@@ -53,7 +53,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A
-	setflag FLAG_0x4FD
+	setflag FLAG_DEFEATED_ELITE_4_GLACIA
 	call EverGrandeCity_GlaciasRoom_EventScript_2723F8
 	msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT
 	release

data/maps/EverGrandeCity_PhoebesRoom/scripts.inc

@@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA
-	call_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281BF
+	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF
 	compare VAR_0x409C, 2
 	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5
 	end
@@ -40,7 +40,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5
 EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281F2
+	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281F2
 	playbgm MUS_SITENNOU, 0
 	msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325
@@ -53,7 +53,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC
-	setflag FLAG_0x4FC
+	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	call EverGrandeCity_PhoebesRoom_EventScript_2723F8
 	msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT
 	release

data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc

@@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
 
 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
 	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
-	call_if_unset FLAG_0x1CF, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
+	call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
 	end
 
 EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
@@ -41,7 +41,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
 	compare VAR_FACING, 3
 	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
 	addvar VAR_0x40D1, 1
-	setflag FLAG_0x1CF
+	setflag FLAG_MET_SCOTT_IN_EVERGRANDE
 	playse SE_KAIDAN
 	waitse
 	removeobject 4

data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc

@@ -6,7 +6,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
 	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
 	setflag FLAG_LANDMARK_POKEMON_LEAGUE
-	call_if_unset FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
+	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
 	end
 
 EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED
@@ -47,7 +47,7 @@ EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
 
 EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
 	lockall
-	goto_if_set FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
+	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 11
 	call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698
@@ -69,7 +69,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
 	closemessage
 	moveobjectoffscreen 3
 	moveobjectoffscreen 4
-	setflag FLAG_0x107
+	setflag FLAG_ENTERED_ELITE_FOUR
 	releaseall
 	end
 

data/maps/EverGrandeCity_SidneysRoom/scripts.inc

@@ -6,12 +6,12 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
 	.byte 0
 
 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
-	setflag FLAG_0x1CF
+	setflag FLAG_MET_SCOTT_IN_EVERGRANDE
 	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	end
 
 EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
-	call_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F32
+	call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
 	compare VAR_0x409C, 1
 	call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
 	end
@@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
 EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F8B
+	goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B
 	playbgm MUS_SITENNOU, 0
 	msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2
@@ -60,7 +60,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95
-	setflag FLAG_0x4FB
+	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	call EverGrandeCity_SidneysRoom_EventScript_2723F8
 	msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT
 	release

data/maps/FallarborTown/scripts.inc

@@ -5,13 +5,13 @@ FallarborTown_MapScripts:: @ 81EB1FA
 FallarborTown_MapScript1_1EB200: @ 81EB200
 	setflag FLAG_VISITED_FALLARBOR_TOWN
 	setvar VAR_0x4086, 0
-	clearflag FLAG_0x10E
+	clearflag FLAG_CONTEST_SKETCH_CREATED
 	end
 
 FallarborTown_EventScript_1EB20C:: @ 81EB20C
 	lock
 	faceplayer
-	goto_if_set FLAG_0x08B, FallarborTown_EventScript_1EB221
+	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_1EB221
 	msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT
 	release
 	end

data/maps/FallarborTown_BattleTentLobby/scripts.inc

@@ -294,10 +294,10 @@ FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F
 FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
 	lock
 	faceplayer
-	goto_if_set FLAG_0x1CD, FallarborTown_BattleTentLobby_EventScript_200245
+	goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245
 	msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT
 	addvar VAR_0x40D1, 1
-	setflag FLAG_0x1CD
+	setflag FLAG_MET_SCOTT_IN_FALLARBOR
 	release
 	end
 

data/maps/FallarborTown_House1/scripts.inc

@@ -4,7 +4,7 @@ FallarborTown_House1_MapScripts:: @ 8200F12
 FallarborTown_House1_EventScript_200F13:: @ 8200F13
 	lock
 	faceplayer
-	goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FB2
+	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FB2
 	checkitem ITEM_METEORITE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq FallarborTown_House1_EventScript_200F38
@@ -23,7 +23,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38
 	goto_if_eq FallarborTown_House1_EventScript_272054
 	setvar VAR_0x8004, 280
 	call FallarborTown_House1_EventScript_2723E4
-	setflag FLAG_0x0E5
+	setflag FLAG_RECEIVED_TM27
 	msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT
 	release
 	end
@@ -51,8 +51,8 @@ FallarborTown_House1_EventScript_200FB2:: @ 8200FB2
 FallarborTown_House1_EventScript_200FBC:: @ 8200FBC
 	lock
 	faceplayer
-	goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FE4
-	goto_if_set FLAG_0x08B, FallarborTown_House1_EventScript_200FDA
+	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FE4
+	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_200FDA
 	msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT
 	release
 	end

data/maps/FarawayIsland_Entrance/scripts.inc

@@ -3,7 +3,7 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E
 	.byte 0
 
 FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
-	setflag FLAG_0x8D8
+	setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND
 	end
 
 FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98

data/maps/FarawayIsland_Interior/scripts.inc

@@ -40,11 +40,11 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
 FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
 	setvar VAR_0x403A, 0
 	setvar VAR_TEMP_1, 1
-	call_if_unset FLAG_0x1CA, FarawayIsland_Interior_EventScript_267D86
+	call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86
 	end
 
 FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
-	goto_if_set FLAG_0x1C7, FarawayIsland_Interior_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E
 	clearflag FLAG_HIDE_MEW
 	setvar VAR_TEMP_1, 0
 	return
@@ -153,12 +153,12 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
 	goto_if_eq FarawayIsland_Interior_EventScript_267EA4
 	compare VAR_RESULT, 10
 	goto_if_eq FarawayIsland_Interior_EventScript_267EA4
-	setflag FLAG_0x1CA
+	setflag FLAG_CAUGHT_MEW
 	release
 	end
 
 FarawayIsland_Interior_EventScript_267E96:: @ 8267E96
-	setflag FLAG_0x1C7
+	setflag FLAG_DEFEATED_MEW
 	setvar VAR_0x8004, 151
 	goto FarawayIsland_Interior_EventScript_273776
 	end

data/maps/FortreeCity/scripts.inc

@@ -18,7 +18,7 @@ FortreeCity_EventScript_1E25B6:: @ 81E25B6
 FortreeCity_EventScript_1E25BF:: @ 81E25BF
 	lock
 	faceplayer
-	goto_if_set FLAG_0x127, FortreeCity_EventScript_1E25D4
+	goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_1E25D4
 	msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT
 	release
 	end
@@ -81,7 +81,7 @@ FortreeCity_EventScript_1E2645:: @ 81E2645
 	applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
-	setflag FLAG_0x127
+	setflag FLAG_KECLEON_FLED_FORTREE
 	release
 	end
 

data/maps/FortreeCity_Gym/scripts.inc

@@ -20,7 +20,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq FortreeCity_Gym_EventScript_21668D
-	goto_if_unset FLAG_0x0AA, FortreeCity_Gym_EventScript_216646
+	goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646
 	msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT
 	release
 	end
@@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 	waitmessage
 	call FortreeCity_Gym_EventScript_27207E
 	msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT
-	setflag FLAG_0x4F5
+	setflag FLAG_DEFEATED_FORTREE_GYM
 	setflag FLAG_BADGE06_GET
 	setvar VAR_0x8008, 6
 	call FortreeCity_Gym_EventScript_271F43
@@ -42,9 +42,9 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x1D7
+	setflag FLAG_ENABLE_WINONA_MATCH_CALL
 	setvar VAR_0x40F3, 0
-	setflag FLAG_0x08A
+	setflag FLAG_REGISTER_WINONA_POKENAV
 	release
 	end
 
@@ -53,7 +53,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646
 	compare VAR_RESULT, 0
 	goto_if_eq FortreeCity_Gym_EventScript_272054
 	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
-	setflag FLAG_0x0AA
+	setflag FLAG_RECEIVED_TM40
 	release
 	end
 
@@ -62,7 +62,7 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A
 	compare VAR_RESULT, 0
 	goto_if_eq FortreeCity_Gym_EventScript_27205E
 	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
-	setflag FLAG_0x0AA
+	setflag FLAG_RECEIVED_TM40
 	return
 
 FortreeCity_Gym_EventScript_21668D:: @ 821668D
@@ -103,7 +103,7 @@ FortreeCity_Gym_EventScript_21671B:: @ 821671B
 FortreeCity_Gym_EventScript_216732:: @ 8216732
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4F5, FortreeCity_Gym_EventScript_216747
+	goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747
 	msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT
 	release
 	end
@@ -318,4 +318,3 @@ FortreeCity_Gym_Text_217292: @ 8217292
 	.string "POKéMON with you?\p"
 	.string "Please return with two POKéMON\n"
 	.string "at the very least.$"
-

data/maps/FortreeCity_House1/scripts.inc

@@ -4,7 +4,7 @@ FortreeCity_House1_MapScripts:: @ 82162BA
 FortreeCity_House1_EventScript_2162BB:: @ 82162BB
 	lock
 	faceplayer
-	goto_if_set FLAG_0x09B, FortreeCity_House1_EventScript_216355
+	goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355
 	setvar VAR_0x8008, 1
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
@@ -29,7 +29,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
 	waitstate
 	bufferspeciesname 0, VAR_0x8009
 	msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT
-	setflag FLAG_0x09B
+	setflag FLAG_FORTREE_NPC_TRADE_COMPLETED
 	release
 	end
 

data/maps/FortreeCity_House2/scripts.inc

@@ -4,8 +4,8 @@ FortreeCity_House2_MapScripts:: @ 82177CA
 FortreeCity_House2_EventScript_2177CB:: @ 82177CB
 	lock
 	faceplayer
-	goto_if_set FLAG_0x108, FortreeCity_House2_EventScript_21786E
-	call_if_unset FLAG_0x076, FortreeCity_House2_EventScript_217862
+	goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E
+	call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862
 	msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT
 	multichoice 21, 8, 54, 1
 	switch VAR_RESULT
@@ -22,14 +22,14 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB
 	giveitem_std ITEM_TM10
 	compare VAR_RESULT, 0
 	goto_if_eq FortreeCity_House2_EventScript_272054
-	setflag FLAG_0x108
+	setflag FLAG_RECEIVED_TM10
 	msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_House2_EventScript_217862:: @ 8217862
 	msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT
-	setflag FLAG_0x076
+	setflag FLAG_MET_HIDDEN_POWER_GIVER
 	return
 
 FortreeCity_House2_EventScript_21786E:: @ 821786E

data/maps/FortreeCity_House4/scripts.inc

@@ -7,12 +7,12 @@ FortreeCity_House4_EventScript_217C81:: @ 8217C81
 
 FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
 	lockall
-	goto_if_set FLAG_0x0DF, FortreeCity_House4_EventScript_217D06
-	goto_if_set FLAG_0x0E0, FortreeCity_House4_EventScript_217CD8
-	goto_if_set FLAG_0x0DE, FortreeCity_House4_EventScript_217CC4
+	goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_217D06
+	goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_217CD8
+	goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_217CC4
 	msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT
 	closemessage
-	setflag FLAG_0x0DE
+	setflag FLAG_WINGULL_SENT_ON_ERRAND
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
 	applymovement 3, FortreeCity_House4_Movement_217D1A
 	waitmovement 0
@@ -34,7 +34,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8
 	giveitem_std ITEM_MENTAL_HERB
 	compare VAR_RESULT, 0
 	goto_if_eq FortreeCity_House4_EventScript_272054
-	setflag FLAG_0x0DF
+	setflag FLAG_RECEIVED_MENTAL_HERB
 	releaseall
 	end
 

data/maps/GraniteCave_1F/scripts.inc

@@ -4,10 +4,10 @@ GraniteCave_1F_MapScripts:: @ 822DA5D
 GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E
 	lock
 	faceplayer
-	goto_if_set FLAG_0x06D, GraniteCave_1F_EventScript_22DA8A
+	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_22DA8A
 	msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM05
-	setflag FLAG_0x06D
+	setflag FLAG_RECEIVED_HM05
 	msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT
 	release
 	end

data/maps/GraniteCave_StevensRoom/scripts.inc

@@ -7,7 +7,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
 	msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 274
 	call GraniteCave_StevensRoom_EventScript_2723E4
-	setflag FLAG_0x0BD
+	setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM47
 	compare VAR_RESULT, 0
@@ -20,7 +20,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x131
+	setflag FLAG_REGISTERED_STEVEN_POKENAV
 	msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 2

data/maps/IslandCave/scripts.inc

@@ -31,7 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
 IslandCave_MapScript1_238E99: @ 8238E99
 	setflag FLAG_LANDMARK_ISLAND_CAVE
 	call IslandCave_EventScript_238F45
-	call_if_unset FLAG_0x1BC, IslandCave_EventScript_238EAB
+	call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB
 	end
 
 IslandCave_EventScript_238EAB:: @ 8238EAB
@@ -107,12 +107,12 @@ IslandCave_EventScript_238F58:: @ 8238F58
 	goto_if_eq IslandCave_EventScript_238FA8
 	compare VAR_RESULT, 5
 	goto_if_eq IslandCave_EventScript_238FA8
-	setflag FLAG_0x1BC
+	setflag FLAG_DEFEATED_REGICE
 	release
 	end
 
 IslandCave_EventScript_238F9F:: @ 8238F9F
-	setflag FLAG_0x1BC
+	setflag FLAG_DEFEATED_REGICE
 	goto IslandCave_EventScript_27376D
 	end
 

data/maps/JaggedPass/scripts.inc

@@ -68,7 +68,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
 
 JaggedPass_EventScript_230718:: @ 8230718
 	lockall
-	goto_if_set FLAG_0x139, JaggedPass_EventScript_230766
+	goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766
 	waitse
 	playse SE_PIN
 	applymovement 5, JaggedPass_Movement_272598
@@ -80,7 +80,7 @@ JaggedPass_EventScript_230718:: @ 8230718
 	msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT
 	closemessage
 	trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D
-	setflag FLAG_0x139
+	setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS
 	applymovement 5, JaggedPass_Movement_2725A2
 	waitmovement 0
 	releaseall

data/maps/LavaridgeTown/scripts.inc

@@ -5,8 +5,8 @@ LavaridgeTown_MapScripts:: @ 81EA4D3
 
 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
 	setflag FLAG_VISITED_LAVARIDGE_TOWN
-	call_if_set FLAG_0x06C, LavaridgeTown_EventScript_1EA514
-	call_if_set FLAG_0x08B, LavaridgeTown_EventScript_1EA53F
+	call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
+	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
 	call LavaridgeTown_EventScript_271ED7
 	call LavaridgeTown_EventScript_271EFB
 	compare VAR_0x4053, 1
@@ -16,7 +16,7 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
 	end
 
 LavaridgeTown_EventScript_1EA514:: @ 81EA514
-	clearflag FLAG_0x06C
+	clearflag FLAG_FLANNERY_GIVES_BADGE_INFO
 	return
 
 LavaridgeTown_EventScript_1EA518:: @ 81EA518
@@ -71,7 +71,7 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551
 LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5
 	msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT
 	giveitem_std ITEM_GO_GOGGLES
-	setflag FLAG_0x0DD
+	setflag FLAG_RECEIVED_GO_GOGGLES
 	msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT
 	goto LavaridgeTown_EventScript_1EA5FF
 	end
@@ -79,7 +79,7 @@ LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5
 LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA
 	msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT
 	giveitem_std ITEM_GO_GOGGLES
-	setflag FLAG_0x0DD
+	setflag FLAG_RECEIVED_GO_GOGGLES
 	msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT
 	goto LavaridgeTown_EventScript_1EA5FF
 	end
@@ -246,7 +246,7 @@ LavaridgeTown_EventScript_1EA73B:: @ 81EA73B
 LavaridgeTown_EventScript_1EA744:: @ 81EA744
 	lock
 	faceplayer
-	goto_if_set FLAG_0x10A, LavaridgeTown_EventScript_1EA787
+	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_1EA787
 	msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LavaridgeTown_EventScript_1EA79B
@@ -254,7 +254,7 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744
 	compare VAR_RESULT, 6
 	goto_if_eq LavaridgeTown_EventScript_1EA791
 	msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT
-	setflag FLAG_0x10A
+	setflag FLAG_RECEIVED_LAVARIDGE_EGG
 	playfanfare MUS_FANFA4
 	message LavaridgeTown_Text_1EACF4
 	waitfanfare

data/maps/LavaridgeTown_Gym_1F/scripts.inc

@@ -63,7 +63,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE864
-	goto_if_unset FLAG_0x0A8, LavaridgeTown_Gym_1F_EventScript_1FE81D
+	goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1FE81D
 	msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT
 	release
 	end
@@ -73,8 +73,8 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 	waitmessage
 	call LavaridgeTown_Gym_1F_EventScript_27207E
 	msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT
-	setflag FLAG_0x06C
-	setflag FLAG_0x4F3
+	setflag FLAG_FLANNERY_GIVES_BADGE_INFO
+	setflag FLAG_DEFEATED_LAVARIDGE_GYM
 	setflag FLAG_BADGE04_GET
 	addvar VAR_0x4085, 1
 	compare VAR_0x4085, 6
@@ -91,7 +91,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x1D6
+	setflag FLAG_ENABLE_FLANNERY_MATCH_CALL
 	release
 	end
 
@@ -100,7 +100,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
 	compare VAR_RESULT, 0
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054
 	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
-	setflag FLAG_0x0A8
+	setflag FLAG_RECEIVED_TM50
 	release
 	end
 
@@ -109,7 +109,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841
 	compare VAR_RESULT, 0
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E
 	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
-	setflag FLAG_0x0A8
+	setflag FLAG_RECEIVED_TM50
 	return
 
 LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864
@@ -169,7 +169,7 @@ LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951
 LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4F3, LavaridgeTown_Gym_1F_EventScript_1FE981
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_1FE981
 	msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT
 	release
 	end

data/maps/LavaridgeTown_HerbShop/scripts.inc

@@ -28,12 +28,12 @@ LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC
 LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505
 	lock
 	faceplayer
-	goto_if_set FLAG_0x0FE, LavaridgeTown_HerbShop_EventScript_1FE534
+	goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_1FE534
 	msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT
 	giveitem_std ITEM_CHARCOAL
 	compare VAR_RESULT, 0
 	goto_if_eq LavaridgeTown_HerbShop_EventScript_272054
-	setflag FLAG_0x0FE
+	setflag FLFLAG_RECEIVED_CHARCOAL
 	release
 	end
 

data/maps/LilycoveCity/scripts.inc

@@ -12,7 +12,7 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47
 	end
 
 LilycoveCity_MapScript1_1E2B61: @ 81E2B61
-	call_if_unset FLAG_0x070, LilycoveCity_EventScript_1E2B6B
+	call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2B6B
 	end
 
 LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
@@ -34,14 +34,14 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
 	lock
 	faceplayer
 	dodailyevents
-	goto_if_set FLAG_0x92F, LilycoveCity_EventScript_1E2C18
+	goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18
 	msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_272054
-	setflag FLAG_0x92F
+	setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY
 	msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
 	release
 	end
@@ -75,7 +75,7 @@ LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A
 LilycoveCity_EventScript_1E2C53:: @ 81E2C53
 	lock
 	faceplayer
-	goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C68
+	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C68
 	msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT
 	release
 	end
@@ -88,7 +88,7 @@ LilycoveCity_EventScript_1E2C68:: @ 81E2C68
 LilycoveCity_EventScript_1E2C72:: @ 81E2C72
 	lock
 	faceplayer
-	goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C87
+	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C87
 	msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT
 	release
 	end
@@ -195,14 +195,14 @@ LilycoveCity_EventScript_1E2D74:: @ 81E2D74
 
 LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
 	lockall
-	goto_if_set FLAG_0x0DA, LilycoveCity_EventScript_1E2DB0
+	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0
 	msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E
 	waitmovement 0
 	msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2
 	waitmovement 0
-	setflag FLAG_0x0DA
+	setflag FLAG_MET_WAILMER_TRAINER
 	releaseall
 	end
 
@@ -239,8 +239,8 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
 
 LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
 	playbgm MUS_GIRL_SUP, 1
-	call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2E48
-	call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2E51
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E48
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E51
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_1E2E5A
 	msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT
@@ -259,7 +259,7 @@ LilycoveCity_EventScript_1E2E51:: @ 81E2E51
 	return
 
 LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
-	setflag FLAG_0x11E
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT
 	savebgm MUS_DUMMY
 	fadedefaultbgm
@@ -268,8 +268,8 @@ LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
 
 LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
 	playbgm MUS_BOY_SUP, 1
-	call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2EBB
-	call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2EC4
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EBB
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EC4
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_1E2ECD
 	msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT
@@ -288,7 +288,7 @@ LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4
 	return
 
 LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD
-	setflag FLAG_0x11E
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT
 	savebgm MUS_DUMMY
 	fadedefaultbgm
@@ -397,7 +397,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
 	waitfieldeffect 30
 	savebgm MUS_DUMMY
 	fadedefaultbgm
-	setflag FLAG_0x124
+	setflag FLAG_MET_RIVAL_LILYCOVE
 	release
 	end
 

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -139,23 +139,23 @@ LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3
-	setflag FLAG_0x0A0
+	setflag FLAG_COOL_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7
-	setflag FLAG_0x0A1
+	setflag FLAG_BEAUTY_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB
-	setflag FLAG_0x0A2
+	setflag FLAG_CUTE_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF
-	setflag FLAG_0x0A3
+	setflag FLAG_SMART_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403
-	setflag FLAG_0x0A4
+	setflag FLAG_TOUGH_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
@@ -364,7 +364,7 @@ LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF
-	setflag FLAG_0x155
+	setflag FLAG_ENTERED_LINK_CONTEST
 	switch VAR_CONTEST_CATEGORY
 	case 0, LilycoveCity_ContestLobby_EventScript_21A62F
 	case 1, LilycoveCity_ContestLobby_EventScript_21A63C
@@ -1004,7 +1004,7 @@ LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
 LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1
 	lock
 	faceplayer
-	goto_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_21AD06
+	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_21AD06
 	msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT
 	release
 	end

data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc

@@ -55,10 +55,10 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744
 LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D
 	lock
 	faceplayer
-	goto_if_set FLAG_0x1CE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A
+	goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT
 	addvar VAR_0x40D1, 1
-	setflag FLAG_0x1CE
+	setflag FLAG_MET_SCOTT_IN_LILYCOVE
 	release
 	end
 

data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc

@@ -11,11 +11,11 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	dodailyevents
 	compare VAR_POKELOT_PRIZE, 0
 	goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7
-	goto_if_set FLAG_0x92A, LilycoveCity_DepartmentStore_1F_EventScript_21F78D
+	goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D
 	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797
-	setflag FLAG_0x92A
+	setflag FLAG_DAILY_PICKED_LOTO_TICKET
 	message LilycoveCity_DepartmentStore_1F_Text_2A64C8
 	waitmessage
 	special RetrieveLotteryNumber

data/maps/LilycoveCity_Harbor/scripts.inc

@@ -112,40 +112,40 @@ LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
 	setvar VAR_TEMP_E, 1
-	goto_if_set FLAG_0x1AE, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E
 	setvar VAR_TEMP_E, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
 	setvar VAR_TEMP_D, 0
-	goto_if_unset FLAG_0x8D5, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E
 	checkitem ITEM_AURORA_TICKET, 1
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
 	setvar VAR_TEMP_D, 1
-	goto_if_set FLAG_0x1AF, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E
 	setvar VAR_TEMP_D, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
 	setvar VAR_TEMP_C, 0
-	goto_if_unset FLAG_0x8D6, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E
 	checkitem ITEM_OLD_SEA_MAP, 1
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
 	setvar VAR_TEMP_C, 1
-	goto_if_set FLAG_0x1B0, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E
 	setvar VAR_TEMP_C, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
 	setvar VAR_TEMP_9, 0
-	goto_if_unset FLAG_0x8E0, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E
 	checkitem ITEM_MYSTIC_TICKET, 1
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
 	setvar VAR_TEMP_9, 1
-	goto_if_set FLAG_0x1DB, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E
 	setvar VAR_TEMP_9, 2
 	return
 
@@ -206,7 +206,7 @@ LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA
 	return
 
 LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0
-	setflag FLAG_0x1AE
+	setflag FLAG_HAS_EON_TICKET
 	msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_21E4EE
@@ -223,7 +223,7 @@ LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F
 	end
 
 LilycoveCity_Harbor_EventScript_21E320:: @ 821E320
-	setflag FLAG_0x1AF
+	setflag FLAG_HAS_AURORA_TICKET
 	msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_21E4EE
@@ -240,7 +240,7 @@ LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F
 	end
 
 LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
-	setflag FLAG_0x1B0
+	setflag FLAG_HAS_OLD_SEA_MAP
 	msgbox LilycoveCity_Harbor_Text_2A6848, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_21E4EE
@@ -289,7 +289,7 @@ LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C
 	end
 
 LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D
-	setflag FLAG_0x1DB
+	setflag FLAG_HAS_MYSTIC_TICKET
 	msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_21E4EE
@@ -617,4 +617,3 @@ LilycoveCity_Harbor_Text_21E976: @ 821E976
 	.string "The folks at the SHIPYARD in SLATEPORT\n"
 	.string "must've worked extra hard.\p"
 	.string "Well, it's my turn to get busy now!$"
-

data/maps/LilycoveCity_House2/scripts.inc

@@ -4,12 +4,12 @@ LilycoveCity_House2_MapScripts:: @ 821ED74
 LilycoveCity_House2_EventScript_21ED75:: @ 821ED75
 	lock
 	faceplayer
-	goto_if_set FLAG_0x0EA, LilycoveCity_House2_EventScript_21EDAC
+	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_21EDAC
 	msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM44
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_House2_EventScript_272054
-	setflag FLAG_0x0EA
+	setflag FLAG_RECEIVED_TM44
 	msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT
 	release
 	end
@@ -28,4 +28,3 @@ LilycoveCity_House2_Text_21EDF9: @ 821EDF9
 	.string "Yawn…\p"
 	.string "Sleep is essential for good health…\n"
 	.string "Sleep and regain health…$"
-

data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc

@@ -4,27 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A
 	.byte 0
 
 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745
-	goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754
-	goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763
-	goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772
-	goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781
-	goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B
@@ -91,7 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
 	lockall
-	goto_if_set FLAG_0x0EC, LilycoveCity_LilycoveMuseum_2F_EventScript_219921
+	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_219921
 	specialvar VAR_0x8004, sub_80F8940
 	switch VAR_0x8004
 	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
@@ -121,7 +121,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
 	givedecoration_std 44
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911
-	setflag FLAG_0x0EC
+	setflag FLAG_RECEIVED_GLASS_ORNAMENT
 	closemessage
 	releaseall
 	end
@@ -140,31 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B
 	lockall
-	goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E
 	lockall
-	goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951
 	lockall
-	goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964
 	lockall
-	goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977
 	lockall
-	goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN
 	end
 

data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc

@@ -110,7 +110,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1
 	clearflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
-	clearflag FLAG_0x0D2
+	clearflag FLAG_FAN_CLUB_STRENGTH_SHARED
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
@@ -499,8 +499,8 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B
 	lock
 	faceplayer
-	goto_if_set FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
-	goto_if_unset FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
+	goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
+	goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
@@ -594,7 +594,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT
-	setflag FLAG_0x0D2
+	setflag FLAG_FAN_CLUB_STRENGTH_SHARED
 	release
 	end
 
@@ -859,4 +859,3 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51
 	.string "True strength is…!\n"
 	.string "… …\p"
 	.string "Actually, I have no idea, either.$"
-

data/maps/LittlerootTown/scripts.inc

@@ -9,7 +9,7 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
 	call LittlerootTown_EventScript_271ED7
 	compare VAR_0x4092, 2
 	call_if_eq LittlerootTown_EventScript_1E7E67
-	call_if_unset FLAG_0x052, LittlerootTown_EventScript_1E7E6F
+	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
 	compare VAR_0x4050, 3
 	call_if_eq LittlerootTown_EventScript_1E7E92
 	compare VAR_0x4082, 4
@@ -35,7 +35,7 @@ LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
 	return
 
 LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
-	setflag FLAG_0x12D
+	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	return
 
 LittlerootTown_EventScript_1E7E53:: @ 81E7E53
@@ -234,8 +234,8 @@ LittlerootTown_EventScript_1E802B:: @ 81E802B
 LittlerootTown_EventScript_1E8034:: @ 81E8034
 	lock
 	faceplayer
-	goto_if_set FLAG_0x074, LittlerootTown_EventScript_1E8087
-	goto_if_set FLAG_0x052, LittlerootTown_EventScript_1E807A
+	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087
+	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A
 	compare VAR_0x4050, 0
 	goto_if_ne LittlerootTown_EventScript_1E805D
 	msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT
@@ -918,7 +918,7 @@ LittlerootTown_EventScript_1E8693:: @ 81E8693
 	playfanfare MUS_FANFA4
 	message LittlerootTown_Text_1E8925
 	waitfanfare
-	setflag FLAG_0x112
+	setflag FLAG_RECEIVED_RUNNING_SHOES
 	msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT
 	msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT
 	closemessage

data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc

@@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
 	compare VAR_0x4092, 6
 	call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A
-	call_if_set FLAG_0x112, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
+	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
@@ -99,7 +99,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
 	waitmovement 0
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
-	setflag FLAG_0x057
+	setflag FLAG_MET_RIVAL_MOM
 	setvar VAR_0x4082, 2
 	releaseall
 	end

data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc

@@ -15,7 +15,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
-	goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F8433
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433
 	compare VAR_0x4084, 2
 	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456
 	goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433

data/maps/LittlerootTown_MaysHouse_1F/scripts.inc

@@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
 	compare VAR_0x4092, 6
 	call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA
-	call_if_set FLAG_0x112, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
+	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
@@ -99,7 +99,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
 	waitmovement 0
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
-	setflag FLAG_0x057
+	setflag FLAG_MET_RIVAL_MOM
 	setvar VAR_0x408C, 2
 	releaseall
 	end
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3
 LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3
 	lock
 	faceplayer
-	goto_if_set FLAG_0x082, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33
+	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33
 	goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29
 	compare VAR_0x408D, 3
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F

data/maps/LittlerootTown_MaysHouse_2F/scripts.inc

@@ -15,7 +15,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
 	end
 
 LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
-	goto_if_set FLAG_0x124, LittlerootTown_MaysHouse_2F_EventScript_1F92E6
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6
 	compare VAR_0x4084, 2
 	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
 	goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6
@@ -249,7 +249,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB
 LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1
 LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1
 	lockall
-	goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3
@@ -275,17 +275,17 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D
 	compare VAR_RESULT, FEMALE
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F
-	setflag FLAG_0x125
+	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D
-	goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F9541
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F9541
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F
-	goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F954A
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F954A
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT
 	return
 

data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc

@@ -196,7 +196,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	setvar VAR_0x40D3, 2
 	setvar VAR_0x40F5, 0
-	setflag FLAG_0x072
+	setflag FLAG_SCOTT_CALL_NATIONAL_DEX
 	releaseall
 	end
 
@@ -266,9 +266,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84
 	faceplayer
 	compare VAR_0x4084, 3
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1
-	goto_if_set FLAG_0x058, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
+	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT
-	setflag FLAG_0x058
+	setflag FLAG_BIRCH_AIDE_MET
 	release
 	end
 
@@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
 	compare VAR_0x40D3, 2
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
 	goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
-	goto_if_unset FLAG_0x119, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
+	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
 	end
 
@@ -518,7 +518,7 @@ Route101_EventScript_1FA2D2:: @ 81FA2D2
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x119
+	setflag FLAG_ENABLE_PROF_BIRCH_MATCH_CALL
 	setvar VAR_0x40DA, 2
 	release
 	end
@@ -538,7 +538,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
 	compare VAR_RESULT, FEMALE
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
 	setvar VAR_0x4084, 5
-	setflag FLAG_0x074
+	setflag FLAG_ADVENTURE_STARTED
 	setvar VAR_0x4051, 1
 	setvar VAR_0x408D, 4
 	setvar VAR_0x4050, 3
@@ -569,7 +569,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC
 	waitfanfare
 	setflag FLAG_SYS_POKEDEX_GET
 	special sub_81AFDA0
-	setflag FLAG_0x8E4
+	setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
 	setvar VAR_0x40CD, 1
 	return
 
@@ -687,7 +687,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6
 	lockall
 	pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A
 	waitmessage
-	clearflag FLAG_0x072
+	clearflag FLAG_SCOTT_CALL_NATIONAL_DEX
 	releaseall
 	end
 

data/maps/MagmaHideout_4F/scripts.inc

@@ -63,7 +63,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
 	clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
 	setvar VAR_0x4058, 1
-	setflag FLAG_0x06F
+	setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT
 	setvar VAR_0x40A0, 1
 	fadescreen 1
 	removeobject 6
@@ -225,4 +225,3 @@ MagmaHideout_4F_Text_23ABE2: @ 823ABE2
 	.string "any need for this blasted volcano.\p"
 	.string "I am going after GROUDON, so this\n"
 	.string "is where we part!$"
-

data/maps/MarineCave_End/scripts.inc

@@ -15,7 +15,7 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4
 	return
 
 MarineCave_End_MapScript1_23B008: @ 823B008
-	call_if_unset FLAG_0x1BE, MarineCave_End_EventScript_23B012
+	call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_23B012
 	end
 
 MarineCave_End_EventScript_23B012:: @ 823B012
@@ -48,13 +48,13 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
 	compare VAR_RESULT, 5
 	goto_if_eq MarineCave_End_EventScript_23B092
 	setvar VAR_0x4039, 1
-	setflag FLAG_0x1BE
+	setflag FLAG_DEFEATED_KYOGRE
 	releaseall
 	end
 
 MarineCave_End_EventScript_23B084:: @ 823B084
 	setvar VAR_0x4039, 1
-	setflag FLAG_0x1BE
+	setflag FLAG_DEFEATED_KYOGRE
 	goto MarineCave_End_EventScript_27376D
 	end
 

data/maps/MauvilleCity/scripts.inc

@@ -7,7 +7,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_SYS_TV_START
-	clearflag FLAG_0x063
+	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	setvar VAR_0x4093, 0
 	call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9
 	end
@@ -53,9 +53,9 @@ MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2
 MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB
 	lock
 	faceplayer
-	goto_if_set FLAG_0x062, MauvilleCity_EventScript_1DF413
+	goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_1DF413
 	msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT
-	setflag FLAG_0x062
+	setflag FLAG_TV_EXPLAINED
 	release
 	end
 
@@ -67,7 +67,7 @@ MauvilleCity_EventScript_1DF413:: @ 81DF413
 MauvilleCity_EventScript_1DF41D:: @ 81DF41D
 	lock
 	faceplayer
-	goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF43D
+	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D
 	msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT
 	closemessage
 	applymovement 7, MauvilleCity_Movement_2725A2
@@ -85,7 +85,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D
 
 MauvilleCity_EventScript_1DF452:: @ 81DF452
 	lockall
-	goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF690
+	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690
 	applymovement 6, MauvilleCity_Movement_2725A8
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
@@ -157,9 +157,9 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
 	removeobject 7
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
-	setflag FLAG_0x0BE
+	setflag FLAG_DEFEATED_WALLY_MAUVILLE
 	setvar VAR_0x40F2, 0
-	setflag FLAG_0x088
+	setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
 	compare VAR_FACING, 2
 	call_if_eq MauvilleCity_EventScript_1DF5F3
 	compare VAR_FACING, 4
@@ -217,7 +217,7 @@ MauvilleCity_EventScript_1DF63A:: @ 81DF63A
 	return
 
 MauvilleCity_EventScript_1DF683:: @ 81DF683
-	setflag FLAG_0x11C
+	setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
 	msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT
 	release
 	end
@@ -461,8 +461,8 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x0D6
-	clearflag FLAG_0x088
+	setflag FLAG_ENABLE_WALLY_MATCH_CALL
+	clearflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
 	releaseall
 	end
 

data/maps/MauvilleCity_BikeShop/scripts.inc

@@ -4,8 +4,8 @@ MauvilleCity_BikeShop_MapScripts:: @ 820EBBB
 MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC
 	lock
 	faceplayer
-	goto_if_set FLAG_0x05A, MauvilleCity_BikeShop_EventScript_20EC94
-	goto_if_set FLAG_0x059, MauvilleCity_BikeShop_EventScript_20EBF7
+	goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_20EC94
+	goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_20EBF7
 	msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT
 	msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO
 	compare VAR_RESULT, 1
@@ -32,13 +32,13 @@ MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16
 	end
 
 MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D
-	setflag FLAG_0x059
+	setflag FLAG_DECLINED_BIKE
 	msgbox MauvilleCity_BikeShop_Text_20EEE8, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A
-	setflag FLAG_0x05A
+	setflag FLAG_RECEIVED_BIKE
 	goto MauvilleCity_BikeShop_EventScript_20EC16
 	end
 

data/maps/MauvilleCity_GameCorner/scripts.inc

@@ -404,7 +404,7 @@ MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E
 MauvilleCity_GameCorner_EventScript_210137:: @ 8210137
 	lock
 	faceplayer
-	goto_if_set FLAG_0x0E2, MauvilleCity_GameCorner_EventScript_210213
+	goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_210213
 	msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_210209
@@ -421,7 +421,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
 	givedecoration_std 88
-	setflag FLAG_0x0E2
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end
 
@@ -432,7 +432,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
 	givedecoration_std 89
-	setflag FLAG_0x0E2
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end
 
@@ -443,7 +443,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
 	givedecoration_std 90
-	setflag FLAG_0x0E2
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end
 
@@ -474,11 +474,11 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D
 	end
 
 MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D
-	goto_if_set FLAG_0x0E1, MauvilleCity_GameCorner_EventScript_21026B
+	goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_21026B
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 1
 	goto_if_ge MauvilleCity_GameCorner_EventScript_21026B
-	setflag FLAG_0x0E1
+	setflag FLAG_RECEIVED_20_COINS
 	givecoins 20
 	msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT
 	playse SE_REGI

data/maps/MauvilleCity_Gym/scripts.inc

@@ -3,7 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E
 	.byte 0
 
 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74
-	goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20DEE7
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7
 	switch VAR_0x4093
 	case 0, MauvilleCity_Gym_EventScript_20DDBA
 	case 1, MauvilleCity_Gym_EventScript_20DEAF
@@ -13,7 +13,7 @@ MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74
 	end
 
 MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA
-	goto_if_set FLAG_0x063, MauvilleCity_Gym_EventScript_20DDC4
+	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20DDC4
 	end
 
 MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4
@@ -78,7 +78,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_20DFDE
-	goto_if_unset FLAG_0x0A7, MauvilleCity_Gym_EventScript_20DF8D
+	goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D
 	compare VAR_0x40BA, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_20DFD4
 	msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT
@@ -92,7 +92,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
 	msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT
 	setvar VAR_0x40D2, 3
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
-	setflag FLAG_0x4F2
+	setflag FLAG_DEFEATED_MAUVILLE_GYM
 	setflag FLAG_BADGE03_GET
 	addvar VAR_0x4085, 1
 	compare VAR_0x4085, 6
@@ -110,7 +110,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x1D5
+	setflag FLAG_ENABLE_WATTSON_MATCH_CALL
 	release
 	end
 
@@ -119,7 +119,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_Gym_EventScript_272054
 	msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT
-	setflag FLAG_0x0A7
+	setflag FLAG_RECEIVED_TM34
 	release
 	end
 
@@ -128,7 +128,7 @@ MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_Gym_EventScript_27205E
 	msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT
-	setflag FLAG_0x0A7
+	setflag FLAG_RECEIVED_TM34
 	return
 
 MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4
@@ -143,7 +143,7 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE
 
 MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9
 	lockall
-	goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
 	compare VAR_0x4093, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
 	setvar VAR_0x4093, 1
@@ -153,7 +153,7 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9
 
 MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E
 	lockall
-	goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
 	compare VAR_0x4093, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
 	setvar VAR_0x4093, 2
@@ -163,7 +163,7 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E
 
 MauvilleCity_Gym_EventScript_20E043:: @ 820E043
 	lockall
-	goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
 	compare VAR_0x4093, 3
 	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
 	setvar VAR_0x4093, 3
@@ -173,7 +173,7 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043
 
 MauvilleCity_Gym_EventScript_20E068:: @ 820E068
 	lockall
-	goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
 	compare VAR_0x4093, 4
 	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
 	setvar VAR_0x4093, 4
@@ -186,8 +186,8 @@ MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D
 	special MauvilleGymSpecial1
 	special DrawWholeMapView
 	playse SE_KI_GASYAN
-	goto_if_set FLAG_0x063, MauvilleCity_Gym_EventScript_20E0B4
-	goto_if_unset FLAG_0x063, MauvilleCity_Gym_EventScript_20E0AF
+	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20E0B4
+	goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20E0AF
 	releaseall
 	end
 
@@ -196,12 +196,12 @@ MauvilleCity_Gym_EventScript_20E0AD:: @ 820E0AD
 	end
 
 MauvilleCity_Gym_EventScript_20E0AF:: @ 820E0AF
-	setflag FLAG_0x063
+	setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
 MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4
-	clearflag FLAG_0x063
+	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
@@ -233,7 +233,7 @@ MauvilleCity_Gym_EventScript_20E115:: @ 820E115
 MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E141
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E141
 	msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT
 	release
 	end

data/maps/MauvilleCity_House1/scripts.inc

@@ -4,10 +4,10 @@ MauvilleCity_House1_MapScripts:: @ 820F975
 MauvilleCity_House1_EventScript_20F976:: @ 820F976
 	lock
 	faceplayer
-	goto_if_set FLAG_0x06B, MauvilleCity_House1_EventScript_20F9A5
+	goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_20F9A5
 	msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM06
-	setflag FLAG_0x06B
+	setflag FLAG_RECEIVED_HM06
 	setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY
 	msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT
 	release

data/maps/MauvilleCity_House2/scripts.inc

@@ -4,7 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 8210C5C
 MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D
 	lock
 	faceplayer
-	goto_if_set FLAG_0x102, MauvilleCity_House2_EventScript_210CDA
+	goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_210CDA
 	msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT
 	checkitem ITEM_HARBOR_MAIL, 1
 	compare VAR_RESULT, 1
@@ -29,7 +29,7 @@ MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8
 	msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT
 	takeitem ITEM_HARBOR_MAIL, 1
 	giveitem_std ITEM_COIN_CASE
-	setflag FLAG_0x102
+	setflag FLAG_RECEIVED_COIN_CASE
 	goto MauvilleCity_House2_EventScript_210CDA
 	end
 

data/maps/MeteorFalls_1F_1R/scripts.inc

@@ -84,7 +84,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	removeobject 8
 	removeobject 9
 	setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA
-	setflag FLAG_0x0CF
+	setflag FLAG_MET_ARCHIE_METEOR_FALLS
 	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
 	setvar VAR_0x40BF, 1
 	releaseall
@@ -220,8 +220,8 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D
 MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25
 	lock
 	faceplayer
-	goto_if_set FLAG_0x0F4, MeteorFalls_1F_1R_EventScript_22BF3D
-	setflag FLAG_0x0F4
+	goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_22BF3D
+	setflag FLAG_MET_PROF_COSMO
 	msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT
 	release
 	end
@@ -307,4 +307,3 @@ MeteorFalls_1F_1R_Text_22C47D: @ 822C47D
 	.string "PROF. COZMO: But that TEAM MAGMA…\p"
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"
-

data/maps/MeteorFalls_StevensCave/scripts.inc

@@ -3,7 +3,7 @@ MeteorFalls_StevensCave_MapScripts:: @ 823B181
 
 MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	lock
-	goto_if_set FLAG_0x4F8, MeteorFalls_StevensCave_EventScript_23B1CD
+	goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD
 	waitse
 	playse SE_PIN
 	applymovement 1, MeteorFalls_StevensCave_Movement_272598
@@ -15,7 +15,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D
 	msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT
-	setflag FLAG_0x4F8
+	setflag FLAG_DEFEATED_METEOR_FALLS_STEVEN
 	release
 	end
 

data/maps/MirageTower_1F/scripts.inc

@@ -3,7 +3,7 @@ MirageTower_1F_MapScripts:: @ 823AD01
 	.byte 0
 
 MirageTower_1F_MapScript1_23AD07: @ 823AD07
-	setflag FLAG_0x8DC
+	setflag FLAG_ENTERED_MIRAGE_TOWER
 	setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	setflag FLAG_LANDMARK_MIRAGE_TOWER
 	end

data/maps/MirageTower_4F/scripts.inc

@@ -13,7 +13,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48
 	setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
 	removeobject 1
 	delay 30
-	setflag FLAG_0x14F
+	setflag FLAG_CHOSE_CLAW_FOSSIL
 	goto MirageTower_4F_EventScript_23ADCA
 	end
 
@@ -34,7 +34,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89
 	setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
 	removeobject 2
 	delay 30
-	setflag FLAG_0x150
+	setflag FLAG_CHOSE_ROOT_FOSSIL
 	goto MirageTower_4F_EventScript_23ADCA
 	end
 

data/maps/MossdeepCity/scripts.inc

@@ -3,17 +3,17 @@ MossdeepCity_MapScripts:: @ 81E4A96
 	.byte 0
 
 MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C
-	clearflag FLAG_0x064
-	clearflag FLAG_0x065
-	clearflag FLAG_0x066
-	clearflag FLAG_0x067
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A
 	end
 
 MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
 	lock
 	faceplayer
-	goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AC7
+	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AC7
 	msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT
 	release
 	end
@@ -26,7 +26,7 @@ MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7
 MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1
 	lock
 	faceplayer
-	goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AE6
+	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AE6
 	msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT
 	release
 	end
@@ -224,7 +224,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10
 MossdeepCity_EventScript_1E4C26:: @ 81E4C26
 	lock
 	faceplayer
-	goto_if_set FLAG_0x114, MossdeepCity_EventScript_1E4C68
+	goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_1E4C68
 	msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_EventScript_1E4C72
@@ -232,7 +232,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26
 	giveitem_std ITEM_KINGS_ROCK
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_EventScript_272054
-	setflag FLAG_0x114
+	setflag FLAG_RECEIVED_KINGS_ROCK
 	release
 	end
 

data/maps/MossdeepCity_Gym/scripts.inc

@@ -3,22 +3,22 @@ MossdeepCity_Gym_MapScripts:: @ 8220800
 	.byte 0
 
 MossdeepCity_Gym_MapScript1_220806: @ 8220806
-	goto_if_set FLAG_0x064, MossdeepCity_Gym_EventScript_22083D
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_22083D
 	goto MossdeepCity_Gym_EventScript_220815
 	end
 
 MossdeepCity_Gym_EventScript_220815:: @ 8220815
-	goto_if_set FLAG_0x065, MossdeepCity_Gym_EventScript_220855
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220855
 	goto MossdeepCity_Gym_EventScript_220824
 	end
 
 MossdeepCity_Gym_EventScript_220824:: @ 8220824
-	goto_if_set FLAG_0x066, MossdeepCity_Gym_EventScript_22086D
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_22086D
 	goto MossdeepCity_Gym_EventScript_220833
 	end
 
 MossdeepCity_Gym_EventScript_220833:: @ 8220833
-	goto_if_set FLAG_0x067, MossdeepCity_Gym_EventScript_220885
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220885
 	end
 
 MossdeepCity_Gym_EventScript_22083D:: @ 822083D
@@ -49,7 +49,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq MossdeepCity_Gym_EventScript_22097E
-	goto_if_unset FLAG_0x0AB, MossdeepCity_Gym_EventScript_220937
+	goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_220937
 	msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT
 	release
 	end
@@ -59,11 +59,11 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
 	waitmessage
 	call MossdeepCity_Gym_EventScript_27207E
 	msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT
-	setflag FLAG_0x4F6
+	setflag FLAG_DEFEATED_MOSSDEEP_GYM
 	setflag FLAG_BADGE07_GET
 	setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 	clearflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
-	clearflag FLAG_0x393
+	clearflag FLAG_UNKNOWN_0x393
 	setvar VAR_0x8008, 7
 	call MossdeepCity_Gym_EventScript_271F43
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
@@ -82,7 +82,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x1D8
+	setflag FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL
 	release
 	end
 
@@ -91,7 +91,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_Gym_EventScript_272054
 	msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
-	setflag FLAG_0x0AB
+	setflag FLAG_RECEIVED_TM04
 	release
 	end
 
@@ -100,7 +100,7 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_Gym_EventScript_27205E
 	msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
-	setflag FLAG_0x0AB
+	setflag FLAG_RECEIVED_TM04
 	return
 
 MossdeepCity_Gym_EventScript_22097E:: @ 822097E
@@ -110,8 +110,8 @@ MossdeepCity_Gym_EventScript_22097E:: @ 822097E
 
 MossdeepCity_Gym_EventScript_220999:: @ 8220999
 	lockall
-	goto_if_set FLAG_0x064, MossdeepCity_Gym_EventScript_2209D0
-	setflag FLAG_0x064
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_2209D0
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
 	setmetatile 5, 5, 516, 0
@@ -126,7 +126,7 @@ MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8
 	end
 
 MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0
-	clearflag FLAG_0x064
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
 	setmetatile 5, 5, 524, 0
@@ -136,8 +136,8 @@ MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0
 
 MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5
 	lockall
-	goto_if_set FLAG_0x065, MossdeepCity_Gym_EventScript_220A24
-	setflag FLAG_0x065
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220A24
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
 	setmetatile 8, 14, 516, 0
@@ -146,7 +146,7 @@ MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5
 	end
 
 MossdeepCity_Gym_EventScript_220A24:: @ 8220A24
-	clearflag FLAG_0x065
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
 	setmetatile 8, 14, 517, 0
@@ -156,8 +156,8 @@ MossdeepCity_Gym_EventScript_220A24:: @ 8220A24
 
 MossdeepCity_Gym_EventScript_220A49:: @ 8220A49
 	lockall
-	goto_if_set FLAG_0x066, MossdeepCity_Gym_EventScript_220A78
-	setflag FLAG_0x066
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_220A78
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
 	setmetatile 15, 17, 524, 0
@@ -166,7 +166,7 @@ MossdeepCity_Gym_EventScript_220A49:: @ 8220A49
 	end
 
 MossdeepCity_Gym_EventScript_220A78:: @ 8220A78
-	clearflag FLAG_0x066
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
 	setmetatile 15, 17, 516, 0
@@ -176,8 +176,8 @@ MossdeepCity_Gym_EventScript_220A78:: @ 8220A78
 
 MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D
 	lockall
-	goto_if_set FLAG_0x067, MossdeepCity_Gym_EventScript_220ACC
-	setflag FLAG_0x067
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220ACC
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
 	setmetatile 1, 23, 525, 0
@@ -186,7 +186,7 @@ MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D
 	end
 
 MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC
-	clearflag FLAG_0x067
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
 	setmetatile 1, 23, 516, 0
@@ -264,7 +264,7 @@ MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA
 MossdeepCity_Gym_EventScript_220C11:: @ 8220C11
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4F6, MossdeepCity_Gym_EventScript_220C26
+	goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_220C26
 	msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT
 	release
 	end
@@ -643,4 +643,3 @@ MossdeepCity_Gym_Text_221EB8: @ 8221EB8
 	.string "LIZA: You brought just one POKéMON!\p"
 	.string "TATE: We need you to bring at least…\n"
 	.string "LIZA: Two POKéMON when you come back.$"
-

data/maps/MossdeepCity_House2/scripts.inc

@@ -17,7 +17,7 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
 	msgbox MossdeepCity_House2_Text_22222E, MSGBOX_DEFAULT
 	waitmoncry
 	closemessage
-	setflag FLAG_0x0E0
+	setflag FLAG_WINGULL_DELIVERED_MAIL
 	clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
 	compare VAR_FACING, 2
 	call_if_eq MossdeepCity_House2_EventScript_222124

data/maps/MossdeepCity_House3/scripts.inc

@@ -4,13 +4,13 @@ MossdeepCity_House3_MapScripts:: @ 82225C2
 MossdeepCity_House3_EventScript_2225C3:: @ 82225C3
 	lock
 	faceplayer
-	goto_if_set FLAG_0x098, MossdeepCity_House3_EventScript_222602
+	goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_222602
 	msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_House3_EventScript_22260C
 	msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUPER_ROD
-	setflag FLAG_0x098
+	setflag FLAG_RECEIVED_SUPER_ROD
 	msgbox MossdeepCity_House3_Text_2226F0, MSGBOX_DEFAULT
 	release
 	end

data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc

@@ -116,12 +116,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E
 	faceplayer
 	compare VAR_0x405D, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA
-	goto_if_set FLAG_0x0C0, MossdeepCity_SpaceCenter_1F_EventScript_2230D0
+	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUN_STONE
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
-	setflag FLAG_0x0C0
+	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT
 	release
 	end
@@ -132,12 +132,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA
-	goto_if_set FLAG_0x0C0, MossdeepCity_SpaceCenter_1F_EventScript_223119
+	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_223119
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUN_STONE
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
-	setflag FLAG_0x0C0
+	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
 	waitmovement 0
@@ -232,10 +232,10 @@ MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208
 MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
 	lock
 	faceplayer
-	goto_if_set FLAG_0x0BF, MossdeepCity_SpaceCenter_1F_EventScript_22326E
+	goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_22326E
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2
-	setflag FLAG_0x0BF
+	setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F
 	moveobjectoffscreen 9
 	switch VAR_FACING
 	case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278
@@ -431,4 +431,3 @@ MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C
 	.string "We will take the fuel no matter what.\p"
 	.string "“Let there be more land!\n"
 	.string "                                          TEAM MAGMA”$"
-

data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc

@@ -11,7 +11,7 @@ MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A
-	clearflag FLAG_0x0CD
+	clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER
 	setobjectxyperm 3, 5, 3
 	setobjectmovementtype 3, 10
 	setobjectxyperm 1, 3, 2
@@ -186,8 +186,8 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F
 
 MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A
 	lockall
-	goto_if_set FLAG_0x0CD, MossdeepCity_SpaceCenter_2F_EventScript_223FDA
-	setflag FLAG_0x0CD
+	goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_223FDA
+	setflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT
 	closemessage
@@ -310,7 +310,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT
 	closemessage
 	fadescreen 1
-	setflag FLAG_0x075
+	setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
 	removeobject 4
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY
@@ -354,7 +354,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
 	compare VAR_RESULT, FEMALE
 	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A
 	closemessage
-	clearflag FLAG_0x075
+	clearflag FLAG_DEFEATED_MAGMA_SPACE_CENTER
 	releaseall
 	end
 
@@ -517,4 +517,3 @@ MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A
 	.string "after this.\p"
 	.string "Oh, yes, I don't live in RUSTBORO CITY.\n"
 	.string "I live right here on this island.$"
-

data/maps/MossdeepCity_StevensHouse/scripts.inc

@@ -39,8 +39,8 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	waitmovement 0
 	msgbox MossdeepCity_StevensHouse_Text_222936, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM08
-	setflag FLAG_0x07B
-	setflag FLAG_0x12E
+	setflag FLAG_RECEIVED_HM08
+	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	msgbox MossdeepCity_StevensHouse_Text_222A0E, MSGBOX_DEFAULT
 	closemessage
 	delay 20
@@ -129,7 +129,7 @@ MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB
 
 MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
-	setflag FLAG_0x12A
+	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
 
@@ -149,7 +149,7 @@ MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B
 
 MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926
 	giveitem_std ITEM_HM08, 1, 1
-	setflag FLAG_0x07B
+	setflag FLAG_RECEIVED_HM08
 	end
 
 MossdeepCity_StevensHouse_Text_222936: @ 8222936

data/maps/MtChimney/scripts.inc

@@ -14,12 +14,12 @@ MtChimney_MapScript1_22EDD2: @ 822EDD2
 MtChimney_EventScript_22EDD5:: @ 822EDD5
 	lock
 	faceplayer
-	call_if_unset FLAG_0x0DB, MtChimney_EventScript_22EDF9
-	call_if_set FLAG_0x0DB, MtChimney_EventScript_22EE02
+	call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9
+	call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02
 	closemessage
 	applymovement 1, MtChimney_Movement_2725A2
 	waitmovement 0
-	setflag FLAG_0x0DB
+	setflag FLAG_EVIL_LEADER_PLEASE_STOP
 	release
 	end
 
@@ -70,7 +70,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	call_if_eq MtChimney_EventScript_22EEE8
 	removeobject 1
 	setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	setflag FLAG_0x08B
+	setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	clearflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
 	setflag FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO
 	clearflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
@@ -452,14 +452,14 @@ MtChimney_EventScript_22F0DB:: @ 822F0DB
 
 MtChimney_EventScript_22F0E4:: @ 822F0E4
 	lockall
-	goto_if_unset FLAG_0x08B, MtChimney_EventScript_22F137
-	goto_if_set FLAG_0x073, MtChimney_EventScript_22F12D
+	goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_22F137
+	goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_22F12D
 	msgbox MtChimney_Text_22FF12, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MtChimney_EventScript_22F123
 	msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT
 	giveitem_std ITEM_METEORITE
-	setflag FLAG_0x073
+	setflag FLAG_RECEIVED_METEORITE
 	releaseall
 	end
 

data/maps/MtPyre_1F/scripts.inc

@@ -4,12 +4,12 @@ MtPyre_1F_MapScripts:: @ 8230F3E
 MtPyre_1F_EventScript_230F3F:: @ 8230F3F
 	lock
 	faceplayer
-	goto_if_set FLAG_0x11A, MtPyre_1F_EventScript_230F6E
+	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_230F6E
 	msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT
 	giveitem_std ITEM_CLEANSE_TAG
 	compare VAR_RESULT, 0
 	goto_if_eq MtPyre_1F_EventScript_272054
-	setflag FLAG_0x11A
+	setflag FLAG_RECEIVED_CLEANSE_TAG
 	release
 	end
 

data/maps/MtPyre_Summit/scripts.inc

@@ -65,7 +65,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	call_if_eq MtPyre_Summit_EventScript_232117
 	msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT
 	giveitem_std ITEM_MAGMA_EMBLEM
-	setflag FLAG_0x0D4
+	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
 	setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
 	releaseall
 	end
@@ -131,7 +131,7 @@ MtPyre_Summit_Movement_232139: @ 8232139
 MtPyre_Summit_EventScript_23213C:: @ 823213C
 	lock
 	faceplayer
-	goto_if_set FLAG_0x09E, MtPyre_Summit_EventScript_232167
+	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_232167
 	msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	call_if_eq MtPyre_Summit_EventScript_232187
@@ -164,17 +164,17 @@ MtPyre_Summit_EventScript_232199:: @ 8232199
 MtPyre_Summit_EventScript_2321A2:: @ 82321A2
 	lock
 	faceplayer
-	goto_if_set FLAG_0x103, MtPyre_Summit_EventScript_2321E2
+	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2
 	compare VAR_0x40B9, 3
 	call_if_ge MtPyre_Summit_EventScript_2321CB
-	goto_if_set FLAG_0x081, MtPyre_Summit_EventScript_2321D8
+	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8
 	msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT
 	release
 	end
 
 MtPyre_Summit_EventScript_2321CB:: @ 82321CB
 	msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT
-	setflag FLAG_0x103
+	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	release
 	end
 

data/maps/NavelRock_Bottom/scripts.inc

@@ -4,8 +4,8 @@ NavelRock_Bottom_MapScripts:: @ 8269255
 	.byte 0
 
 NavelRock_Bottom_MapScript1_269260: @ 8269260
-	call_if_set FLAG_0x091, NavelRock_Bottom_EventScript_269273
-	call_if_unset FLAG_0x091, NavelRock_Bottom_EventScript_269277
+	call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269273
+	call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269277
 	end
 
 NavelRock_Bottom_EventScript_269273:: @ 8269273
@@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273
 	return
 
 NavelRock_Bottom_EventScript_269277:: @ 8269277
-	goto_if_set FLAG_0x1DD, NavelRock_Bottom_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E
 	clearflag FLAG_HIDE_LUGIA
 	return
 
@@ -67,12 +67,12 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
 	goto_if_eq NavelRock_Bottom_EventScript_269344
 	compare VAR_RESULT, 5
 	goto_if_eq NavelRock_Bottom_EventScript_269344
-	setflag FLAG_0x091
+	setflag FLAG_CAUGHT_LUGIA
 	release
 	end
 
 NavelRock_Bottom_EventScript_269336:: @ 8269336
-	setflag FLAG_0x1DD
+	setflag FLAG_DEFEATED_LUGIA
 	setvar VAR_0x8004, 249
 	goto NavelRock_Bottom_EventScript_273776
 	end
@@ -81,4 +81,3 @@ NavelRock_Bottom_EventScript_269344:: @ 8269344
 	setvar VAR_0x8004, 249
 	goto NavelRock_Bottom_EventScript_273776
 	end
-

data/maps/NavelRock_Exterior/scripts.inc

@@ -3,6 +3,6 @@ NavelRock_Exterior_MapScripts:: @ 82690B2
 	.byte 0
 
 NavelRock_Exterior_MapScript1_2690B8: @ 82690B8
-	setflag FLAG_0x8E1
+	setflag FLAG_ARRIVED_AT_NAVEL_ROCK
 	end