fix merge conflicts

539 files changed, 7885 insertions, 8842 deletions

diff --git a/asm-de/contest_link_80C2020.s b/asm-de/contest_link_80C2020.s
index ee555287a..0c07937f8 100644
--- a/asm-de/contest_link_80C2020.s
+++ b/asm-de/contest_link_80C2020.s
@@ -1713,7 +1713,7 @@ sub_80C2E14: @ 80C2E14
 	bl sub_80BE284
 	movs r0, 0x2
 	bl sub_810FB10
-	ldr r0, _080C2E88 @ =gScriptContestRank
+	ldr r0, _080C2E88 @ =gSpecialVar_ContestRank
 	ldrb r0, [r0]
 	bl sub_80B2A7C
 	movs r0, 0xFE
@@ -1750,7 +1750,7 @@ sub_80C2E14: @ 80C2E14
 	.align 2, 0
 _080C2E80: .4byte gUnknown_02038690
 _080C2E84: .4byte gContestPlayerMonIndex
-_080C2E88: .4byte gScriptContestRank
+_080C2E88: .4byte gSpecialVar_ContestRank
 _080C2E8C: .4byte gSharedMem
 _080C2E90: .4byte 0x00015ddf
 _080C2E94: .4byte 0x00015dde
@@ -2978,7 +2978,7 @@ _de_080C39DC: .4byte gIsLinkContest
 _de_080C39E0: .4byte 0x0600e000
 _de_080C39E4: .4byte gUnknown_08E964B8
 _de_080C39E8:
-	ldr r0, _de_080C3A08 @ =gScriptContestRank
+	ldr r0, _de_080C3A08 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r0, 0
 	bne _de_080C3A14
@@ -2994,7 +2994,7 @@ _de_080C39E8:
 	str r2, [sp, 0xC]
 	b _de_080C3A6C
 	.align 2, 0
-_de_080C3A08: .4byte gScriptContestRank
+_de_080C3A08: .4byte gSpecialVar_ContestRank
 _de_080C3A0C: .4byte 0x0600e000
 _de_080C3A10: .4byte gUnknown_08E964B8
 _de_080C3A14:
@@ -3061,7 +3061,7 @@ de_sub_80C3A84: @ 80C3A84
 	push {r4,lr}
 	sub sp, 0x10
 	adds r2, r0, 0
-	ldr r0, _de_080C3AAC @ =gScriptContestCategory
+	ldr r0, _de_080C3AAC @ =gSpecialVar_ContestCategory
 	ldrh r4, [r0]
 	cmp r4, 0
 	bne _de_080C3AB8
@@ -3079,7 +3079,7 @@ de_sub_80C3A84: @ 80C3A84
 	str r4, [sp, 0xC]
 	b _de_080C3AD6
 	.align 2, 0
-_de_080C3AAC: .4byte gScriptContestCategory
+_de_080C3AAC: .4byte gSpecialVar_ContestCategory
 _de_080C3AB0: .4byte 0x0600e000
 _de_080C3AB4: .4byte gUnknown_08E964B8
 _de_080C3AB8:
@@ -4604,15 +4604,15 @@ sub_80C43F4: @ 80C43F4
 	adds r5, r0, 0
 	cmp r5, 0
 	beq _080C4422
-	ldr r4, _080C4434 @ =gScriptContestCategory
+	ldr r4, _080C4434 @ =gSpecialVar_ContestCategory
 	ldrb r0, [r4]
-	ldr r1, _080C4438 @ =gScriptContestRank
+	ldr r1, _080C4438 @ =gSpecialVar_ContestRank
 	ldrb r1, [r1]
 	bl sub_80AE398
 	ldrb r0, [r4]
 	bl sub_80AE82C
 _080C4422:
-	ldr r0, _080C443C @ =gScriptResult
+	ldr r0, _080C443C @ =gSpecialVar_Result
 	strh r5, [r0]
 	pop {r4,r5}
 	pop {r0}
@@ -4620,9 +4620,9 @@ _080C4422:
 	.align 2, 0
 _080C442C: .4byte gUnknown_02038694
 _080C4430: .4byte gPlayerParty
-_080C4434: .4byte gScriptContestCategory
-_080C4438: .4byte gScriptContestRank
-_080C443C: .4byte gScriptResult
+_080C4434: .4byte gSpecialVar_ContestCategory
+_080C4438: .4byte gSpecialVar_ContestRank
+_080C443C: .4byte gSpecialVar_Result
 	thumb_func_end sub_80C43F4
 
 	thumb_func_start sub_80C4440
@@ -4635,7 +4635,7 @@ sub_80C4440: @ 80C4440
 	muls r1, r0
 	ldr r0, _080C4468 @ =gPlayerParty
 	adds r2, r1, r0
-	ldr r0, _080C446C @ =gScriptContestCategory
+	ldr r0, _080C446C @ =gSpecialVar_ContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bhi _080C44B2
@@ -4647,7 +4647,7 @@ sub_80C4440: @ 80C4440
 	.align 2, 0
 _080C4464: .4byte gUnknown_02038694
 _080C4468: .4byte gPlayerParty
-_080C446C: .4byte gScriptContestCategory
+_080C446C: .4byte gSpecialVar_ContestCategory
 _080C4470: .4byte _080C4474
 	.align 2, 0
 _080C4474:
@@ -4677,7 +4677,7 @@ _080C44A0:
 	movs r1, 0x36
 _080C44A4:
 	bl GetMonData
-	ldr r1, _080C44BC @ =gScriptContestRank
+	ldr r1, _080C44BC @ =gSpecialVar_ContestRank
 	ldrh r1, [r1]
 	cmp r0, r1
 	bls _080C44B2
@@ -4688,7 +4688,7 @@ _080C44B2:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080C44BC: .4byte gScriptContestRank
+_080C44BC: .4byte gSpecialVar_ContestRank
 	thumb_func_end sub_80C4440
 
 	thumb_func_start sub_80C44C0
@@ -4704,7 +4704,7 @@ sub_80C44C0: @ 80C44C0
 	beq _080C44D4
 	b _080C465E
 _080C44D4:
-	ldr r0, _080C44F0 @ =gScriptContestCategory
+	ldr r0, _080C44F0 @ =gSpecialVar_ContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bls _080C44DE
@@ -4718,7 +4718,7 @@ _080C44DE:
 	.align 2, 0
 _080C44E8: .4byte gUnknown_02038690
 _080C44EC: .4byte gContestPlayerMonIndex
-_080C44F0: .4byte gScriptContestCategory
+_080C44F0: .4byte gSpecialVar_ContestCategory
 _080C44F4: .4byte _080C44F8
 	.align 2, 0
 _080C44F8:
@@ -4740,7 +4740,7 @@ _080C450C:
 	lsrs r1, r0, 24
 	mov r0, sp
 	strb r1, [r0]
-	ldr r0, _080C4550 @ =gScriptContestRank
+	ldr r0, _080C4550 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r1, r0
 	bls _080C4530
@@ -4762,7 +4762,7 @@ _080C4538:
 	.align 2, 0
 _080C4548: .4byte gUnknown_02038694
 _080C454C: .4byte gPlayerParty
-_080C4550: .4byte gScriptContestRank
+_080C4550: .4byte gSpecialVar_ContestRank
 _080C4554:
 	mov r4, sp
 	ldr r7, _080C458C @ =gUnknown_02038694
@@ -4776,7 +4776,7 @@ _080C4554:
 	strb r0, [r4]
 	mov r0, sp
 	ldrb r2, [r0]
-	ldr r0, _080C4594 @ =gScriptContestRank
+	ldr r0, _080C4594 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r2, r0
 	bhi _080C465E
@@ -4793,7 +4793,7 @@ _080C4554:
 	.align 2, 0
 _080C458C: .4byte gUnknown_02038694
 _080C4590: .4byte gPlayerParty
-_080C4594: .4byte gScriptContestRank
+_080C4594: .4byte gSpecialVar_ContestRank
 _080C4598:
 	mov r4, sp
 	ldr r7, _080C45D0 @ =gUnknown_02038694
@@ -4807,7 +4807,7 @@ _080C4598:
 	strb r0, [r4]
 	mov r0, sp
 	ldrb r2, [r0]
-	ldr r0, _080C45D8 @ =gScriptContestRank
+	ldr r0, _080C45D8 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r2, r0
 	bhi _080C465E
@@ -4824,7 +4824,7 @@ _080C4598:
 	.align 2, 0
 _080C45D0: .4byte gUnknown_02038694
 _080C45D4: .4byte gPlayerParty
-_080C45D8: .4byte gScriptContestRank
+_080C45D8: .4byte gSpecialVar_ContestRank
 _080C45DC:
 	mov r4, sp
 	ldr r7, _080C4618 @ =gUnknown_02038694
@@ -4838,7 +4838,7 @@ _080C45DC:
 	strb r0, [r4]
 	mov r0, sp
 	ldrb r2, [r0]
-	ldr r0, _080C4620 @ =gScriptContestRank
+	ldr r0, _080C4620 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r2, r0
 	bhi _080C465E
@@ -4858,7 +4858,7 @@ _080C4610:
 	.align 2, 0
 _080C4618: .4byte gUnknown_02038694
 _080C461C: .4byte gPlayerParty
-_080C4620: .4byte gScriptContestRank
+_080C4620: .4byte gSpecialVar_ContestRank
 _080C4624:
 	mov r4, sp
 	ldr r7, _080C4668 @ =gUnknown_02038694
@@ -4872,7 +4872,7 @@ _080C4624:
 	strb r0, [r4]
 	mov r0, sp
 	ldrb r2, [r0]
-	ldr r0, _080C4670 @ =gScriptContestRank
+	ldr r0, _080C4670 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r2, r0
 	bhi _080C465E
@@ -4895,7 +4895,7 @@ _080C465E:
 	.align 2, 0
 _080C4668: .4byte gUnknown_02038694
 _080C466C: .4byte gPlayerParty
-_080C4670: .4byte gScriptContestRank
+_080C4670: .4byte gSpecialVar_ContestRank
 	thumb_func_end sub_80C44C0
 
 	thumb_func_start sub_80C4674
@@ -5491,7 +5491,7 @@ _080C4AB8:
 	bl sub_80C4B34
 	ldr r1, _080C4AFC @ =gUnknown_0203869B
 	strb r0, [r1]
-	ldr r0, _080C4B00 @ =gScriptContestCategory
+	ldr r0, _080C4B00 @ =gSpecialVar_ContestCategory
 	ldrb r0, [r0]
 	bl sub_80AE82C
 	ldr r1, _080C4B04 @ =sub_80C8EBC
@@ -5507,7 +5507,7 @@ _080C4AB8:
 	.align 2, 0
 _080C4AF8: .4byte gTasks + 0x8
 _080C4AFC: .4byte gUnknown_0203869B
-_080C4B00: .4byte gScriptContestCategory
+_080C4B00: .4byte gSpecialVar_ContestCategory
 _080C4B04: .4byte sub_80C8EBC
 _080C4B08: .4byte sub_80C4B0C
 	thumb_func_end sub_80C4A44
diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s
index 795713490..89ea03b69 100644
--- a/asm-de/easy_chat.s
+++ b/asm-de/easy_chat.s
@@ -1578,13 +1578,13 @@ _080E6D3E:
 	beq _080E6D58
 	b _080E6D72
 _080E6D44:
-	ldr r0, _080E6D50 @ =gScriptResult
+	ldr r0, _080E6D50 @ =gSpecialVar_Result
 	strh r1, [r0]
 	ldr r0, _080E6D54 @ =sub_80E752C
 	bl sub_80E682C
 	b _080E6D72
 	.align 2, 0
-_080E6D50: .4byte gScriptResult
+_080E6D50: .4byte gSpecialVar_Result
 _080E6D54: .4byte sub_80E752C
 _080E6D58:
 	ldr r1, _080E6D60 @ =gSharedMem + 0x1000
@@ -1722,7 +1722,7 @@ _080E6E56:
 	beq _080E6EDC
 	b _080E6F5E
 _080E6E5C:
-	ldr r7, _080E6EC8 @ =gScriptResult
+	ldr r7, _080E6EC8 @ =gSpecialVar_Result
 	bl sub_80E7FA8
 	lsls r0, 24
 	lsrs r0, 24
@@ -1774,7 +1774,7 @@ _080E6EBE:
 	bl sub_80E682C
 	b _080E6F5E
 	.align 2, 0
-_080E6EC8: .4byte gScriptResult
+_080E6EC8: .4byte gSpecialVar_Result
 _080E6ECC: .4byte gSpecialVar_0x8004
 _080E6ED0: .4byte 0x00009fa8
 _080E6ED4: .4byte 0x0000ffff
diff --git a/asm/aurora.s b/asm/aurora.s
deleted file mode 100755
index e5de7c419..000000000
--- a/asm/aurora.s
+++ /dev/null
@@ -1,218 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ aurora
-
-	thumb_func_start sub_80D33B4
-sub_80D33B4: @ 80D33B4
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	movs r1, 0x1
-	bl sub_80787B0
-	ldr r0, _080D33DC @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D33E4
-	ldr r1, _080D33E0 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	lsls r0, 16
-	lsrs r6, r0, 16
-	adds r7, r1, 0
-	b _080D33EA
-	.align 2, 0
-_080D33DC: .4byte gBattleAnimBankAttacker
-_080D33E0: .4byte gBattleAnimArgs
-_080D33E4:
-	ldr r0, _080D3440 @ =gBattleAnimArgs
-	ldrh r6, [r0, 0x4]
-	adds r7, r0, 0
-_080D33EA:
-	ldrh r0, [r7, 0x8]
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r5, 0x20]
-	strh r0, [r5, 0x30]
-	ldr r4, _080D3444 @ =gBattleAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r6
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x22]
-	strh r0, [r5, 0x34]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r7, [r7, 0x6]
-	adds r0, r7
-	strh r0, [r5, 0x36]
-	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
-	ldr r0, _080D3448 @ =sub_80D344C
-	str r0, [r5, 0x1C]
-	adds r2, r5, 0
-	adds r2, 0x2C
-	ldrb r0, [r2]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r1, [r5, 0x1C]
-	adds r0, r5, 0
-	bl _call_via_r1
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D3440: .4byte gBattleAnimArgs
-_080D3444: .4byte gBattleAnimBankTarget
-_080D3448: .4byte sub_80D344C
-	thumb_func_end sub_80D33B4
-
-	thumb_func_start sub_80D344C
-sub_80D344C: @ 80D344C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080D3488 @ =gBattleAnimArgs
-	ldrh r1, [r0, 0xE]
-	ldr r0, _080D348C @ =0x0000ffff
-	cmp r1, r0
-	bne _080D346E
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAnim
-	adds r2, r4, 0
-	adds r2, 0x2C
-	ldrb r1, [r2]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r2]
-_080D346E:
-	adds r0, r4, 0
-	bl sub_8078B5C
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D3480
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D3480:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D3488: .4byte gBattleAnimArgs
-_080D348C: .4byte 0x0000ffff
-	thumb_func_end sub_80D344C
-
-	thumb_func_start sub_80D3490
-sub_80D3490: @ 80D3490
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _080D34C4 @ =gTasks
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	adds r4, r1
-	ldr r0, _080D34C8 @ =gBattleAnimArgs
-	ldrh r0, [r0]
-	strh r0, [r4, 0x8]
-	ldr r0, _080D34CC @ =0x0000279c
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 20
-	movs r1, 0x80
-	lsls r1, 1
-	adds r0, r1
-	strh r0, [r4, 0xC]
-	ldr r0, _080D34D0 @ =sub_80D34D4
-	str r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D34C4: .4byte gTasks
-_080D34C8: .4byte gBattleAnimArgs
-_080D34CC: .4byte 0x0000279c
-_080D34D0: .4byte sub_80D34D4
-	thumb_func_end sub_80D3490
-
-	thumb_func_start sub_80D34D4
-sub_80D34D4: @ 80D34D4
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, _080D354C @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r2, r0, r1
-	ldrh r0, [r2, 0x1C]
-	adds r0, 0x1
-	strh r0, [r2, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	mov r12, r1
-	cmp r0, 0x3
-	bne _080D3526
-	movs r0, 0
-	strh r0, [r2, 0x1C]
-	ldrh r0, [r2, 0xC]
-	adds r0, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	ldr r1, _080D3550 @ =gPlttBufferFaded
-	lsls r0, r5, 1
-	adds r0, r1
-	ldrh r6, [r0]
-	adds r7, r1, 0
-	adds r3, r0, 0x2
-	movs r1, 0x6
-	adds r2, r0, 0
-_080D3510:
-	ldrh r0, [r3]
-	strh r0, [r2]
-	adds r3, 0x2
-	adds r2, 0x2
-	subs r1, 0x1
-	cmp r1, 0
-	bge _080D3510
-	adds r0, r5, 0x7
-	lsls r0, 1
-	adds r0, r7
-	strh r6, [r0]
-_080D3526:
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	add r0, r12
-	ldrh r1, [r0, 0x1E]
-	adds r1, 0x1
-	strh r1, [r0, 0x1E]
-	lsls r1, 16
-	asrs r1, 16
-	movs r2, 0x8
-	ldrsh r0, [r0, r2]
-	cmp r1, r0
-	bne _080D3546
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-_080D3546:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D354C: .4byte gTasks
-_080D3550: .4byte gPlttBufferFaded
-	thumb_func_end sub_80D34D4
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_2.s b/asm/battle_2.s
index c8f8eb0f4..dd720ec79 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -3336,7 +3336,7 @@ _08013ECE:
 	cmp r0, 0
 	bne _08013F2A
 _08013EE0:
-	ldr r1, _08013F3C @ =gScriptResult
+	ldr r1, _08013F3C @ =gSpecialVar_Result
 	ldr r5, _08013F40 @ =gBattleOutcome
 	ldrb r0, [r5]
 	strh r0, [r1]
@@ -3379,7 +3379,7 @@ _08013F2A:
 _08013F30: .4byte gBattleTypeFlags
 _08013F34: .4byte gPlayerParty
 _08013F38: .4byte gReceivedRemoteLinkPlayers
-_08013F3C: .4byte gScriptResult
+_08013F3C: .4byte gSpecialVar_Result
 _08013F40: .4byte gBattleOutcome
 _08013F44: .4byte gMain
 _08013F48: .4byte 0x0000043d
diff --git a/asm/beta_beat_up.s b/asm/beta_beat_up.s
deleted file mode 100755
index d6e1ba675..000000000
--- a/asm/beta_beat_up.s
+++ /dev/null
@@ -1,63 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ beta_beat_up
-
-	thumb_func_start sub_80D6234
-sub_80D6234: @ 80D6234
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080D6254 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D625C
-	ldr r0, _080D6258 @ =gBattleAnimArgs
-	ldrh r1, [r4, 0x20]
-	ldrh r0, [r0]
-	subs r1, r0
-	strh r1, [r4, 0x20]
-	b _080D6266
-	.align 2, 0
-_080D6254: .4byte gBattleAnimBankAttacker
-_080D6258: .4byte gBattleAnimArgs
-_080D625C:
-	ldr r0, _080D6270 @ =gBattleAnimArgs
-	ldrh r0, [r0]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	strh r0, [r4, 0x20]
-_080D6266:
-	ldr r0, _080D6274 @ =sub_80D6278
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D6270: .4byte gBattleAnimArgs
-_080D6274: .4byte sub_80D6278
-	thumb_func_end sub_80D6234
-
-	thumb_func_start sub_80D6278
-sub_80D6278: @ 80D6278
-	push {lr}
-	adds r2, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080D628E
-	adds r0, r2, 0
-	bl move_anim_8074EE0
-_080D628E:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D6278
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/bubble.s b/asm/bubble.s
deleted file mode 100755
index 466e31b0d..000000000
--- a/asm/bubble.s
+++ /dev/null
@@ -1,248 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ bubble
-
-	thumb_func_start sub_80D31C8
-sub_80D31C8: @ 80D31C8
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	ldr r5, _080D31F0 @ =gBattleAnimBankAttacker
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D31F8
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r4, _080D31F4 @ =gBattleAnimArgs
-	ldrh r1, [r4]
-	subs r0, r1
-	b _080D320A
-	.align 2, 0
-_080D31F0: .4byte gBattleAnimBankAttacker
-_080D31F4: .4byte gBattleAnimArgs
-_080D31F8:
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	ldr r4, _080D32D0 @ =gBattleAnimArgs
-	lsrs r0, 24
-	ldrh r1, [r4]
-	adds r0, r1
-_080D320A:
-	strh r0, [r6, 0x20]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r4, [r4, 0x2]
-	adds r0, r4
-	strh r0, [r6, 0x22]
-	adds r2, r6, 0
-	adds r2, 0x2C
-	ldrb r0, [r2]
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, _080D32D4 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D3240
-	ldr r1, _080D32D0 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-_080D3240:
-	ldr r5, _080D32D0 @ =gBattleAnimArgs
-	ldrh r0, [r5, 0xC]
-	strh r0, [r6, 0x2E]
-	ldrh r0, [r6, 0x20]
-	strh r0, [r6, 0x30]
-	ldr r4, _080D32D8 @ =gBattleAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x32]
-	ldrh r0, [r6, 0x22]
-	strh r0, [r6, 0x34]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x36]
-	adds r0, r6, 0
-	bl obj_translate_based_on_private_1_2_3_4
-	ldr r0, _080D32DC @ =SpriteCallbackDummy
-	bl CreateInvisibleSpriteWithCallback
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	strh r4, [r6, 0x38]
-	ldrb r0, [r5, 0x8]
-	movs r2, 0x4
-	ldrsh r1, [r5, r2]
-	bl Sin
-	ldrh r1, [r6, 0x20]
-	subs r1, r0
-	strh r1, [r6, 0x20]
-	ldrb r0, [r5, 0x8]
-	movs r2, 0x6
-	ldrsh r1, [r5, r2]
-	bl Cos
-	ldrh r1, [r6, 0x22]
-	subs r1, r0
-	strh r1, [r6, 0x22]
-	ldr r0, _080D32E0 @ =gSprites
-	lsls r1, r4, 4
-	adds r1, r4
-	lsls r1, 2
-	adds r1, r0
-	ldrh r0, [r5, 0x4]
-	strh r0, [r1, 0x2E]
-	ldrh r0, [r5, 0x6]
-	strh r0, [r1, 0x30]
-	ldrh r0, [r5, 0xA]
-	strh r0, [r1, 0x32]
-	ldrb r0, [r5, 0x8]
-	lsls r0, 8
-	strh r0, [r1, 0x34]
-	ldrh r0, [r5, 0xC]
-	strh r0, [r1, 0x36]
-	ldr r1, _080D32E4 @ =sub_80D32E8
-	str r1, [r6, 0x1C]
-	adds r0, r6, 0
-	bl _call_via_r1
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D32D0: .4byte gBattleAnimArgs
-_080D32D4: .4byte gBattleAnimBankAttacker
-_080D32D8: .4byte gBattleAnimBankTarget
-_080D32DC: .4byte SpriteCallbackDummy
-_080D32E0: .4byte gSprites
-_080D32E4: .4byte sub_80D32E8
-	thumb_func_end sub_80D31C8
-
-	thumb_func_start sub_80D32E8
-sub_80D32E8: @ 80D32E8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r5, r0, 0
-	ldrh r1, [r5, 0x38]
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, _080D3350 @ =gSprites
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r7, r0, r2
-	ldrh r4, [r7, 0x36]
-	lsls r4, 24
-	lsrs r4, 24
-	ldrh r0, [r7, 0x34]
-	mov r8, r0
-	movs r0, 0x1
-	strh r0, [r5, 0x2E]
-	adds r0, r5, 0
-	bl sub_8078B5C
-	mov r1, r8
-	lsrs r6, r1, 8
-	movs r0, 0x2E
-	ldrsh r1, [r7, r0]
-	adds r0, r6, 0
-	bl Sin
-	ldrh r1, [r5, 0x24]
-	adds r0, r1
-	strh r0, [r5, 0x24]
-	movs r0, 0x30
-	ldrsh r1, [r7, r0]
-	adds r0, r6, 0
-	bl Cos
-	ldrh r1, [r5, 0x26]
-	adds r0, r1
-	strh r0, [r5, 0x26]
-	ldrh r0, [r7, 0x32]
-	mov r1, r8
-	adds r1, r0
-	strh r1, [r7, 0x34]
-	subs r4, 0x1
-	lsls r4, 24
-	lsrs r4, 24
-	cmp r4, 0
-	beq _080D3354
-	strh r4, [r7, 0x36]
-	b _080D335E
-	.align 2, 0
-_080D3350: .4byte gSprites
-_080D3354:
-	ldr r0, _080D336C @ =sub_80D3370
-	str r0, [r5, 0x1C]
-	adds r0, r7, 0
-	bl DestroySprite
-_080D335E:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D336C: .4byte sub_80D3370
-	thumb_func_end sub_80D32E8
-
-	thumb_func_start sub_80D3370
-sub_80D3370: @ 80D3370
-	push {lr}
-	adds r3, r0, 0
-	adds r3, 0x2C
-	ldrb r2, [r3]
-	movs r1, 0x41
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r3]
-	ldr r1, _080D3390 @ =sub_8078600
-	str r1, [r0, 0x1C]
-	ldr r1, _080D3394 @ =sub_80D3398
-	bl StoreSpriteCallbackInData
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D3390: .4byte sub_8078600
-_080D3394: .4byte sub_80D3398
-	thumb_func_end sub_80D3370
-
-	thumb_func_start sub_80D3398
-sub_80D3398: @ 80D3398
-	push {lr}
-	movs r1, 0xA
-	strh r1, [r0, 0x2E]
-	ldr r1, _080D33AC @ =sub_80782D8
-	str r1, [r0, 0x1C]
-	ldr r1, _080D33B0 @ =move_anim_8074EE0
-	bl StoreSpriteCallbackInData
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D33AC: .4byte sub_80782D8
-_080D33B0: .4byte move_anim_8074EE0
-	thumb_func_end sub_80D3398
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/contest_ai.s b/asm/contest_ai.s
index 33862eb8c..94347f2ad 100644
--- a/asm/contest_ai.s
+++ b/asm/contest_ai.s
@@ -1315,7 +1315,7 @@ _0812923C:
 	thumb_func_start ContestAICmd_get_contest_type
 ContestAICmd_get_contest_type: @ 8129244
 	ldr r1, _08129258 @ =gSharedMem + 0x192E4
-	ldr r0, _0812925C @ =gScriptContestCategory
+	ldr r0, _0812925C @ =gSpecialVar_ContestCategory
 	ldrh r0, [r0]
 	strh r0, [r1, 0x18]
 	ldr r1, _08129260 @ =gAIScriptPtr
@@ -1325,7 +1325,7 @@ ContestAICmd_get_contest_type: @ 8129244
 	bx lr
 	.align 2, 0
 _08129258: .4byte gSharedMem + 0x192E4
-_0812925C: .4byte gScriptContestCategory
+_0812925C: .4byte gSpecialVar_ContestCategory
 _08129260: .4byte gAIScriptPtr
 	thumb_func_end ContestAICmd_get_contest_type
 
diff --git a/asm/contest_effect.s b/asm/contest_effect.s
index 2b339670b..d06789976 100644
--- a/asm/contest_effect.s
+++ b/asm/contest_effect.s
@@ -2412,7 +2412,7 @@ ContestEffect_44: @ 80B8EBC
 	adds r0, r3
 	ldrb r0, [r0, 0x1]
 	lsls r0, 29
-	ldr r1, _080B8EF8 @ =gScriptContestCategory
+	ldr r1, _080B8EF8 @ =gSpecialVar_ContestCategory
 	lsrs r0, 29
 	ldrh r1, [r1]
 	cmp r0, r1
@@ -2427,7 +2427,7 @@ _080B8EEA:
 	.align 2, 0
 _080B8EF0: .4byte gContestMoves
 _080B8EF4: .4byte gSharedMem + 0x192D0
-_080B8EF8: .4byte gScriptContestCategory
+_080B8EF8: .4byte gSpecialVar_ContestCategory
 	thumb_func_end ContestEffect_44
 
 	thumb_func_start ContestEffect_45
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 101f25cda..5ade1419c 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -1713,7 +1713,7 @@ sub_80C2E14: @ 80C2E14
 	bl sub_80BE284
 	movs r0, 0x2
 	bl sub_810FB10
-	ldr r0, _080C2E88 @ =gScriptContestRank
+	ldr r0, _080C2E88 @ =gSpecialVar_ContestRank
 	ldrb r0, [r0]
 	bl sub_80B2A7C
 	movs r0, 0xFE
@@ -1750,7 +1750,7 @@ sub_80C2E14: @ 80C2E14
 	.align 2, 0
 _080C2E80: .4byte gUnknown_02038690
 _080C2E84: .4byte gContestPlayerMonIndex
-_080C2E88: .4byte gScriptContestRank
+_080C2E88: .4byte gSpecialVar_ContestRank
 _080C2E8C: .4byte gSharedMem
 _080C2E90: .4byte 0x00015ddf
 _080C2E94: .4byte 0x00015dde
@@ -2971,7 +2971,7 @@ _080C3808: .4byte gIsLinkContest
 _080C380C: .4byte 0x0600e000
 _080C3810: .4byte gUnknown_08E964B8
 _080C3814:
-	ldr r0, _080C3830 @ =gScriptContestRank
+	ldr r0, _080C3830 @ =gSpecialVar_ContestRank
 	ldrh r2, [r0]
 	cmp r2, 0
 	bne _080C383C
@@ -2986,7 +2986,7 @@ _080C3814:
 	str r1, [sp, 0xC]
 	b _080C3870
 	.align 2, 0
-_080C3830: .4byte gScriptContestRank
+_080C3830: .4byte gSpecialVar_ContestRank
 _080C3834: .4byte 0x0600e000
 _080C3838: .4byte gUnknown_08E964B8
 _080C383C:
@@ -3040,7 +3040,7 @@ _080C3884:
 	bl sub_809D104
 _080C389E:
 	adds r4, 0xD
-	ldr r0, _080C38C8 @ =gScriptContestCategory
+	ldr r0, _080C38C8 @ =gSpecialVar_ContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0
 	bne _080C38CC
@@ -3058,7 +3058,7 @@ _080C389E:
 	.align 2, 0
 _080C38C0: .4byte 0x0600e000
 _080C38C4: .4byte gUnknown_08E964B8
-_080C38C8: .4byte gScriptContestCategory
+_080C38C8: .4byte gSpecialVar_ContestCategory
 _080C38CC:
 	cmp r0, 0x1
 	bne _080C38EC
@@ -4545,15 +4545,15 @@ sub_80C43F4: @ 80C43F4
 	adds r5, r0, 0
 	cmp r5, 0
 	beq _080C4422
-	ldr r4, _080C4434 @ =gScriptContestCategory
+	ldr r4, _080C4434 @ =gSpecialVar_ContestCategory
 	ldrb r0, [r4]
-	ldr r1, _080C4438 @ =gScriptContestRank
+	ldr r1, _080C4438 @ =gSpecialVar_ContestRank
 	ldrb r1, [r1]
 	bl sub_80AE398
 	ldrb r0, [r4]
 	bl sub_80AE82C
 _080C4422:
-	ldr r0, _080C443C @ =gScriptResult
+	ldr r0, _080C443C @ =gSpecialVar_Result
 	strh r5, [r0]
 	pop {r4,r5}
 	pop {r0}
@@ -4561,9 +4561,9 @@ _080C4422:
 	.align 2, 0
 _080C442C: .4byte gUnknown_02038694
 _080C4430: .4byte gPlayerParty
-_080C4434: .4byte gScriptContestCategory
-_080C4438: .4byte gScriptContestRank
-_080C443C: .4byte gScriptResult
+_080C4434: .4byte gSpecialVar_ContestCategory
+_080C4438: .4byte gSpecialVar_ContestRank
+_080C443C: .4byte gSpecialVar_Result
 	thumb_func_end sub_80C43F4
 
 	thumb_func_start sub_80C4440
@@ -4576,7 +4576,7 @@ sub_80C4440: @ 80C4440
 	muls r1, r0
 	ldr r0, _080C4468 @ =gPlayerParty
 	adds r2, r1, r0
-	ldr r0, _080C446C @ =gScriptContestCategory
+	ldr r0, _080C446C @ =gSpecialVar_ContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bhi _080C44B2
@@ -4588,7 +4588,7 @@ sub_80C4440: @ 80C4440
 	.align 2, 0
 _080C4464: .4byte gUnknown_02038694
 _080C4468: .4byte gPlayerParty
-_080C446C: .4byte gScriptContestCategory
+_080C446C: .4byte gSpecialVar_ContestCategory
 _080C4470: .4byte _080C4474
 	.align 2, 0
 _080C4474:
@@ -4618,7 +4618,7 @@ _080C44A0:
 	movs r1, 0x36
 _080C44A4:
 	bl GetMonData
-	ldr r1, _080C44BC @ =gScriptContestRank
+	ldr r1, _080C44BC @ =gSpecialVar_ContestRank
 	ldrh r1, [r1]
 	cmp r0, r1
 	bls _080C44B2
@@ -4629,7 +4629,7 @@ _080C44B2:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080C44BC: .4byte gScriptContestRank
+_080C44BC: .4byte gSpecialVar_ContestRank
 	thumb_func_end sub_80C4440
 
 	thumb_func_start sub_80C44C0
@@ -4645,7 +4645,7 @@ sub_80C44C0: @ 80C44C0
 	beq _080C44D4
 	b _080C465E
 _080C44D4:
-	ldr r0, _080C44F0 @ =gScriptContestCategory
+	ldr r0, _080C44F0 @ =gSpecialVar_ContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bls _080C44DE
@@ -4659,7 +4659,7 @@ _080C44DE:
 	.align 2, 0
 _080C44E8: .4byte gUnknown_02038690
 _080C44EC: .4byte gContestPlayerMonIndex
-_080C44F0: .4byte gScriptContestCategory
+_080C44F0: .4byte gSpecialVar_ContestCategory
 _080C44F4: .4byte _080C44F8
 	.align 2, 0
 _080C44F8:
@@ -4681,7 +4681,7 @@ _080C450C:
 	lsrs r1, r0, 24
 	mov r0, sp
 	strb r1, [r0]
-	ldr r0, _080C4550 @ =gScriptContestRank
+	ldr r0, _080C4550 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r1, r0
 	bls _080C4530
@@ -4703,7 +4703,7 @@ _080C4538:
 	.align 2, 0
 _080C4548: .4byte gUnknown_02038694
 _080C454C: .4byte gPlayerParty
-_080C4550: .4byte gScriptContestRank
+_080C4550: .4byte gSpecialVar_ContestRank
 _080C4554:
 	mov r4, sp
 	ldr r7, _080C458C @ =gUnknown_02038694
@@ -4717,7 +4717,7 @@ _080C4554:
 	strb r0, [r4]
 	mov r0, sp
 	ldrb r2, [r0]
-	ldr r0, _080C4594 @ =gScriptContestRank
+	ldr r0, _080C4594 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r2, r0
 	bhi _080C465E
@@ -4734,7 +4734,7 @@ _080C4554:
 	.align 2, 0
 _080C458C: .4byte gUnknown_02038694
 _080C4590: .4byte gPlayerParty
-_080C4594: .4byte gScriptContestRank
+_080C4594: .4byte gSpecialVar_ContestRank
 _080C4598:
 	mov r4, sp
 	ldr r7, _080C45D0 @ =gUnknown_02038694
@@ -4748,7 +4748,7 @@ _080C4598:
 	strb r0, [r4]
 	mov r0, sp
 	ldrb r2, [r0]
-	ldr r0, _080C45D8 @ =gScriptContestRank
+	ldr r0, _080C45D8 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r2, r0
 	bhi _080C465E
@@ -4765,7 +4765,7 @@ _080C4598:
 	.align 2, 0
 _080C45D0: .4byte gUnknown_02038694
 _080C45D4: .4byte gPlayerParty
-_080C45D8: .4byte gScriptContestRank
+_080C45D8: .4byte gSpecialVar_ContestRank
 _080C45DC:
 	mov r4, sp
 	ldr r7, _080C4618 @ =gUnknown_02038694
@@ -4779,7 +4779,7 @@ _080C45DC:
 	strb r0, [r4]
 	mov r0, sp
 	ldrb r2, [r0]
-	ldr r0, _080C4620 @ =gScriptContestRank
+	ldr r0, _080C4620 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r2, r0
 	bhi _080C465E
@@ -4799,7 +4799,7 @@ _080C4610:
 	.align 2, 0
 _080C4618: .4byte gUnknown_02038694
 _080C461C: .4byte gPlayerParty
-_080C4620: .4byte gScriptContestRank
+_080C4620: .4byte gSpecialVar_ContestRank
 _080C4624:
 	mov r4, sp
 	ldr r7, _080C4668 @ =gUnknown_02038694
@@ -4813,7 +4813,7 @@ _080C4624:
 	strb r0, [r4]
 	mov r0, sp
 	ldrb r2, [r0]
-	ldr r0, _080C4670 @ =gScriptContestRank
+	ldr r0, _080C4670 @ =gSpecialVar_ContestRank
 	ldrh r0, [r0]
 	cmp r2, r0
 	bhi _080C465E
@@ -4836,7 +4836,7 @@ _080C465E:
 	.align 2, 0
 _080C4668: .4byte gUnknown_02038694
 _080C466C: .4byte gPlayerParty
-_080C4670: .4byte gScriptContestRank
+_080C4670: .4byte gSpecialVar_ContestRank
 	thumb_func_end sub_80C44C0
 
 	thumb_func_start sub_80C4674
@@ -5432,7 +5432,7 @@ _080C4AB8:
 	bl sub_80C4B34
 	ldr r1, _080C4AFC @ =gUnknown_0203869B
 	strb r0, [r1]
-	ldr r0, _080C4B00 @ =gScriptContestCategory
+	ldr r0, _080C4B00 @ =gSpecialVar_ContestCategory
 	ldrb r0, [r0]
 	bl sub_80AE82C
 	ldr r1, _080C4B04 @ =sub_80C8EBC
@@ -5448,7 +5448,7 @@ _080C4AB8:
 	.align 2, 0
 _080C4AF8: .4byte gTasks + 0x8
 _080C4AFC: .4byte gUnknown_0203869B
-_080C4B00: .4byte gScriptContestCategory
+_080C4B00: .4byte gSpecialVar_ContestCategory
 _080C4B04: .4byte sub_80C8EBC
 _080C4B08: .4byte sub_80C4B0C
 	thumb_func_end sub_80C4A44
diff --git a/asm/devil.s b/asm/devil.s
deleted file mode 100755
index ae552f231..000000000
--- a/asm/devil.s
+++ /dev/null
@@ -1,163 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D2ABC
-sub_80D2ABC: @ 80D2ABC
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x34
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D2AF6
-	ldr r1, _080D2BB8 @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	ldrh r2, [r4, 0x20]
-	adds r0, r2
-	strh r0, [r4, 0x20]
-	ldrh r0, [r1, 0x2]
-	ldrh r1, [r4, 0x22]
-	adds r0, r1
-	strh r0, [r4, 0x22]
-	adds r0, r4, 0
-	movs r1, 0
-	bl StartSpriteAnim
-	ldr r0, _080D2BBC @ =gBattleAnimBankTarget
-	ldrb r0, [r0]
-	bl sub_8079E90
-	subs r0, 0x1
-	adds r1, r4, 0
-	adds r1, 0x43
-	strb r0, [r1]
-	movs r0, 0x1
-	strh r0, [r4, 0x32]
-_080D2AF6:
-	ldrh r0, [r4, 0x32]
-	ldrh r2, [r4, 0x2E]
-	adds r0, r2
-	strh r0, [r4, 0x2E]
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	lsls r1, r0, 2
-	adds r0, r1, 0
-	cmp r1, 0
-	bge _080D2B0C
-	adds r0, 0xFF
-_080D2B0C:
-	asrs r0, 8
-	lsls r0, 8
-	subs r0, r1, r0
-	strh r0, [r4, 0x30]
-	lsls r0, 16
-	cmp r0, 0
-	bge _080D2B1E
-	movs r0, 0
-	strh r0, [r4, 0x30]
-_080D2B1E:
-	movs r0, 0x30
-	ldrsh r2, [r4, r0]
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bge _080D2B2C
-	adds r0, 0x3
-_080D2B2C:
-	asrs r0, 2
-	movs r1, 0x1E
-	subs r1, r0
-	adds r0, r2, 0
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r0, 0x30
-	ldrsh r2, [r4, r0]
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bge _080D2B48
-	adds r0, 0x7
-_080D2B48:
-	asrs r0, 3
-	movs r1, 0xA
-	subs r1, r0
-	adds r0, r2, 0
-	bl Sin
-	strh r0, [r4, 0x26]
-	movs r2, 0x30
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x80
-	ble _080D2B6C
-	ldrh r1, [r4, 0x32]
-	movs r2, 0x32
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	ble _080D2B6C
-	ldr r0, _080D2BC0 @ =0x0000ffff
-	strh r0, [r4, 0x32]
-_080D2B6C:
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D2B80
-	movs r2, 0x32
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	bge _080D2B80
-	movs r0, 0x1
-	strh r0, [r4, 0x32]
-_080D2B80:
-	ldrh r0, [r4, 0x34]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x34]
-	subs r0, 0x9
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x46
-	bls _080D2BC4
-	movs r0, 0x2E
-	ldrsh r1, [r4, r0]
-	lsrs r0, r1, 31
-	adds r0, r1, r0
-	asrs r0, 1
-	lsls r0, 1
-	subs r1, r0
-	adds r3, r4, 0
-	adds r3, 0x3E
-	movs r0, 0x1
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	b _080D2BD2
-	.align 2, 0
-_080D2BB8: .4byte gBattleAnimArgs
-_080D2BBC: .4byte gBattleAnimBankTarget
-_080D2BC0: .4byte 0x0000ffff
-_080D2BC4:
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r1, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-_080D2BD2:
-	movs r1, 0x34
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x5A
-	ble _080D2BE0
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D2BE0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D2ABC
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 547ce174e..e08d71083 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -1578,13 +1578,13 @@ _080E6D3E:
 	beq _080E6D58
 	b _080E6D72
 _080E6D44:
-	ldr r0, _080E6D50 @ =gScriptResult
+	ldr r0, _080E6D50 @ =gSpecialVar_Result
 	strh r1, [r0]
 	ldr r0, _080E6D54 @ =sub_80E752C
 	bl sub_80E682C
 	b _080E6D72
 	.align 2, 0
-_080E6D50: .4byte gScriptResult
+_080E6D50: .4byte gSpecialVar_Result
 _080E6D54: .4byte sub_80E752C
 _080E6D58:
 	ldr r1, _080E6D60 @ =gSharedMem + 0x1000
@@ -1722,7 +1722,7 @@ _080E6E56:
 	beq _080E6EDC
 	b _080E6F5E
 _080E6E5C:
-	ldr r7, _080E6EC8 @ =gScriptResult
+	ldr r7, _080E6EC8 @ =gSpecialVar_Result
 	bl sub_80E7FA8
 	lsls r0, 24
 	lsrs r0, 24
@@ -1774,7 +1774,7 @@ _080E6EBE:
 	bl sub_80E682C
 	b _080E6F5E
 	.align 2, 0
-_080E6EC8: .4byte gScriptResult
+_080E6EC8: .4byte gSpecialVar_Result
 _080E6ECC: .4byte gSpecialVar_0x8004
 _080E6ED0: .4byte 0x00009c7c
 _080E6ED4: .4byte 0x0000ffff
diff --git a/asm/fury_cutter_count.s b/asm/fury_cutter_count.s
deleted file mode 100755
index 10444b254..000000000
--- a/asm/fury_cutter_count.s
+++ /dev/null
@@ -1,48 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ fury_cutter_count
-
-	thumb_func_start sub_80D30AC
-sub_80D30AC: @ 80D30AC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r3, _080D30C8 @ =gBattleAnimArgs
-	ldr r1, _080D30CC @ =gDisableStructMoveAnim
-	ldr r1, [r1]
-	ldrb r2, [r1, 0x10]
-	movs r1, 0x1
-	ands r1, r2
-	strh r1, [r3, 0xE]
-	bl DestroyAnimVisualTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D30C8: .4byte gBattleAnimArgs
-_080D30CC: .4byte gDisableStructMoveAnim
-	thumb_func_end sub_80D30AC
-
-	thumb_func_start update_fury_cutter_counter_copy
-update_fury_cutter_counter_copy: @ 80D30D0
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080D30E8 @ =gBattleAnimArgs
-	ldr r1, _080D30EC @ =gDisableStructMoveAnim
-	ldr r1, [r1]
-	ldrb r1, [r1, 0x10]
-	strh r1, [r2, 0xE]
-	bl DestroyAnimVisualTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D30E8: .4byte gBattleAnimArgs
-_080D30EC: .4byte gDisableStructMoveAnim
-	thumb_func_end update_fury_cutter_counter_copy
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/guard.s b/asm/guard.s
deleted file mode 100755
index 13ead6879..000000000
--- a/asm/guard.s
+++ /dev/null
@@ -1,80 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D3014
-sub_80D3014: @ 80D3014
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _080D3058 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D3060
-	ldr r4, _080D305C @ =gBattleAnimBankAttacker
-	ldrb r1, [r4]
-	movs r0, 0x2
-	eors r0, r1
-	bl IsAnimBankSpriteVisible
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D3060
-	ldrb r0, [r4]
-	adds r2, r5, 0
-	adds r2, 0x20
-	adds r3, r5, 0
-	adds r3, 0x22
-	movs r1, 0
-	bl sub_807A3FC
-	ldrh r0, [r5, 0x22]
-	adds r0, 0x28
-	strh r0, [r5, 0x22]
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	b _080D3080
-	.align 2, 0
-_080D3058: .4byte gBattleTypeFlags
-_080D305C: .4byte gBattleAnimBankAttacker
-_080D3060:
-	ldr r4, _080D30A0 @ =gBattleAnimBankAttacker
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x1
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x28
-	strh r0, [r5, 0x22]
-_080D3080:
-	movs r0, 0xD
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r5, 0x20]
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x22]
-	subs r0, 0x48
-	strh r0, [r5, 0x36]
-	ldr r0, _080D30A4 @ =sub_8078B34
-	str r0, [r5, 0x1C]
-	ldr r1, _080D30A8 @ =move_anim_8072740
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D30A0: .4byte gBattleAnimBankAttacker
-_080D30A4: .4byte sub_8078B34
-_080D30A8: .4byte move_anim_8072740
-	thumb_func_end sub_80D3014
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/heated_rock.s b/asm/heated_rock.s
deleted file mode 100755
index eb957a6f1..000000000
--- a/asm/heated_rock.s
+++ /dev/null
@@ -1,302 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ heated_rock
-
-	thumb_func_start sub_80D58FC
-sub_80D58FC: @ 80D58FC
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80D59B0
-	adds r0, r4, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5936
-	ldr r3, _080D593C @ =gTasks
-	movs r0, 0x3C
-	ldrsh r1, [r4, r0]
-	lsls r1, 1
-	movs r0, 0x3A
-	ldrsh r2, [r4, r0]
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r1, r0
-	adds r3, 0x8
-	adds r1, r3
-	ldrh r0, [r1]
-	subs r0, 0x1
-	strh r0, [r1]
-	adds r0, r4, 0
-	bl DestroySprite
-_080D5936:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D593C: .4byte gTasks
-	thumb_func_end sub_80D58FC
-
-	thumb_func_start sub_80D5940
-sub_80D5940: @ 80D5940
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080D5978 @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrh r2, [r1, 0x26]
-	ldrh r0, [r1, 0x22]
-	adds r2, r0
-	adds r1, 0x29
-	movs r0, 0
-	ldrsb r0, [r1, r0]
-	adds r0, r2
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, _080D597C @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D5980
-	lsls r0, r4, 16
-	movs r1, 0x94
-	lsls r1, 15
-	b _080D5986
-	.align 2, 0
-_080D5978: .4byte gSprites
-_080D597C: .4byte gBattleAnimBankAttacker
-_080D5980:
-	lsls r0, r4, 16
-	movs r1, 0xB0
-	lsls r1, 14
-_080D5986:
-	adds r0, r1
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D5940
-
-	thumb_func_start sub_80D5994
-sub_80D5994: @ 80D5994
-	movs r3, 0
-	strh r3, [r0, 0x2E]
-	strh r3, [r0, 0x30]
-	ldrh r3, [r0, 0x20]
-	lsls r3, 3
-	strh r3, [r0, 0x32]
-	ldrh r3, [r0, 0x22]
-	lsls r3, 3
-	strh r3, [r0, 0x34]
-	lsls r1, 3
-	strh r1, [r0, 0x36]
-	lsls r2, 3
-	strh r2, [r0, 0x38]
-	bx lr
-	thumb_func_end sub_80D5994
-
-	thumb_func_start sub_80D59B0
-sub_80D59B0: @ 80D59B0
-	push {lr}
-	adds r2, r0, 0
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	ble _080D59DA
-	movs r0, 0
-	strh r0, [r2, 0x2E]
-	ldrh r0, [r2, 0x30]
-	adds r0, 0x1
-	strh r0, [r2, 0x30]
-	ldrh r0, [r2, 0x30]
-	adds r1, r0, 0
-	muls r1, r0
-	adds r0, r1, 0
-	ldrh r3, [r2, 0x34]
-	adds r0, r3
-	strh r0, [r2, 0x34]
-_080D59DA:
-	ldrh r0, [r2, 0x36]
-	ldrh r1, [r2, 0x32]
-	adds r0, r1
-	strh r0, [r2, 0x32]
-	lsls r0, 16
-	asrs r0, 19
-	strh r0, [r2, 0x20]
-	ldrh r1, [r2, 0x38]
-	ldrh r3, [r2, 0x34]
-	adds r1, r3
-	strh r1, [r2, 0x34]
-	lsls r1, 16
-	asrs r3, r1, 19
-	strh r3, [r2, 0x22]
-	adds r0, 0x8
-	lsls r0, 16
-	movs r1, 0x80
-	lsls r1, 17
-	cmp r0, r1
-	bhi _080D5A10
-	adds r1, r3, 0
-	movs r0, 0x8
-	negs r0, r0
-	cmp r1, r0
-	blt _080D5A10
-	cmp r1, 0x78
-	ble _080D5A1C
-_080D5A10:
-	adds r0, r2, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-_080D5A1C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D59B0
-
-	thumb_func_start sub_80D5A20
-sub_80D5A20: @ 80D5A20
-	push {r4,r5,lr}
-	ldr r3, _080D5A64 @ =gBattleAnimArgs
-	ldrh r1, [r3]
-	movs r2, 0
-	strh r1, [r0, 0x20]
-	ldrh r1, [r3, 0x2]
-	strh r1, [r0, 0x22]
-	strh r2, [r0, 0x2E]
-	strh r2, [r0, 0x30]
-	strh r2, [r0, 0x32]
-	ldrh r1, [r3, 0x4]
-	strh r1, [r0, 0x3A]
-	ldrh r1, [r3, 0x6]
-	strh r1, [r0, 0x3C]
-	ldrh r4, [r0, 0x4]
-	lsls r2, r4, 22
-	lsrs r2, 22
-	movs r5, 0x8
-	ldrsh r1, [r3, r5]
-	lsls r1, 4
-	adds r2, r1
-	ldr r3, _080D5A68 @ =0x000003ff
-	adds r1, r3, 0
-	ands r2, r1
-	ldr r1, _080D5A6C @ =0xfffffc00
-	ands r1, r4
-	orrs r1, r2
-	strh r1, [r0, 0x4]
-	ldr r1, _080D5A70 @ =sub_80D5A74
-	str r1, [r0, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D5A64: .4byte gBattleAnimArgs
-_080D5A68: .4byte 0x000003ff
-_080D5A6C: .4byte 0xfffffc00
-_080D5A70: .4byte sub_80D5A74
-	thumb_func_end sub_80D5A20
-
-	thumb_func_start sub_80D5A74
-sub_80D5A74: @ 80D5A74
-	push {r4,lr}
-	adds r2, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r2, r1]
-	cmp r0, 0x1
-	beq _080D5AA6
-	cmp r0, 0x1
-	bgt _080D5A8A
-	cmp r0, 0
-	beq _080D5A90
-	b _080D5B04
-_080D5A8A:
-	cmp r0, 0x2
-	beq _080D5AC4
-	b _080D5B04
-_080D5A90:
-	ldrh r1, [r2, 0x3A]
-	movs r3, 0x3A
-	ldrsh r0, [r2, r3]
-	cmp r0, 0
-	beq _080D5AA0
-	subs r0, r1, 0x1
-	strh r0, [r2, 0x3A]
-	b _080D5B04
-_080D5AA0:
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-_080D5AA6:
-	ldrh r0, [r2, 0x22]
-	adds r0, 0x8
-	strh r0, [r2, 0x22]
-	lsls r0, 16
-	asrs r0, 16
-	ldrh r3, [r2, 0x3C]
-	movs r4, 0x3C
-	ldrsh r1, [r2, r4]
-	cmp r0, r1
-	blt _080D5B04
-	strh r3, [r2, 0x22]
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	b _080D5B04
-_080D5AC4:
-	ldrh r0, [r2, 0x30]
-	adds r0, 0x1
-	strh r0, [r2, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080D5AF0
-	movs r0, 0
-	strh r0, [r2, 0x30]
-	ldrh r0, [r2, 0x32]
-	adds r0, 0x1
-	strh r0, [r2, 0x32]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5AEC
-	ldr r0, _080D5AE8 @ =0x0000fffd
-	b _080D5AEE
-	.align 2, 0
-_080D5AE8: .4byte 0x0000fffd
-_080D5AEC:
-	movs r0, 0x3
-_080D5AEE:
-	strh r0, [r2, 0x26]
-_080D5AF0:
-	ldrh r0, [r2, 0x34]
-	adds r0, 0x1
-	strh r0, [r2, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x10
-	ble _080D5B04
-	adds r0, r2, 0
-	bl move_anim_8072740
-_080D5B04:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D5A74
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/liquid_ball.s b/asm/liquid_ball.s
deleted file mode 100755
index 6af030ecf..000000000
--- a/asm/liquid_ball.s
+++ /dev/null
@@ -1,353 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ liquid_ball
-
-	thumb_func_start sub_80D3554
-sub_80D3554: @ 80D3554
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	movs r1, 0x1
-	bl sub_80787B0
-	movs r0, 0x1E
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r5, 0x20]
-	strh r0, [r5, 0x30]
-	ldr r4, _080D35BC @ =gBattleAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x22]
-	strh r0, [r5, 0x34]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x36]
-	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
-	movs r0, 0x2E
-	ldrsh r1, [r5, r0]
-	movs r0, 0xD2
-	lsls r0, 8
-	bl __divsi3
-	strh r0, [r5, 0x38]
-	ldr r0, _080D35C0 @ =gBattleAnimArgs
-	ldrh r2, [r0, 0x6]
-	strh r2, [r5, 0x3C]
-	ldrh r1, [r0, 0xE]
-	movs r3, 0xE
-	ldrsh r0, [r0, r3]
-	cmp r0, 0x7F
-	ble _080D35C4
-	adds r0, r1, 0
-	subs r0, 0x7F
-	lsls r0, 8
-	strh r0, [r5, 0x3A]
-	negs r0, r2
-	strh r0, [r5, 0x3C]
-	b _080D35C8
-	.align 2, 0
-_080D35BC: .4byte gBattleAnimBankTarget
-_080D35C0: .4byte gBattleAnimArgs
-_080D35C4:
-	lsls r0, r1, 8
-	strh r0, [r5, 0x3A]
-_080D35C8:
-	ldr r1, _080D35D8 @ =sub_80D35DC
-	str r1, [r5, 0x1C]
-	adds r0, r5, 0
-	bl _call_via_r1
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D35D8: .4byte sub_80D35DC
-	thumb_func_end sub_80D3554
-
-	thumb_func_start sub_80D35DC
-sub_80D35DC: @ 80D35DC
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8078B5C
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D35F0
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D35F0:
-	ldrh r0, [r4, 0x3A]
-	lsls r0, 16
-	asrs r0, 24
-	movs r2, 0x3C
-	ldrsh r1, [r4, r2]
-	bl Sin
-	ldrh r1, [r4, 0x26]
-	adds r0, r1
-	strh r0, [r4, 0x26]
-	movs r2, 0x3A
-	ldrsh r0, [r4, r2]
-	movs r2, 0x38
-	ldrsh r1, [r4, r2]
-	adds r0, r1
-	asrs r0, 8
-	cmp r0, 0x7F
-	ble _080D3620
-	movs r0, 0
-	strh r0, [r4, 0x3A]
-	ldrh r0, [r4, 0x3C]
-	negs r0, r0
-	strh r0, [r4, 0x3C]
-	b _080D3628
-_080D3620:
-	ldrh r0, [r4, 0x38]
-	ldrh r1, [r4, 0x3A]
-	adds r0, r1
-	strh r0, [r4, 0x3A]
-_080D3628:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D35DC
-
-	thumb_func_start sub_80D3630
-sub_80D3630: @ 80D3630
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080D3650 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r3, _080D3654 @ =gBattleAnimArgs
-	ldrh r0, [r3]
-	movs r2, 0
-	strh r0, [r1, 0x8]
-	strh r2, [r3, 0xE]
-	ldr r0, _080D3658 @ =sub_80D365C
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_080D3650: .4byte gTasks
-_080D3654: .4byte gBattleAnimArgs
-_080D3658: .4byte sub_80D365C
-	thumb_func_end sub_80D3630
-
-	thumb_func_start sub_80D365C
-sub_80D365C: @ 80D365C
-	push {lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r2, _080D3690 @ =gBattleAnimArgs
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x3
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r2, 0xE]
-	ldr r1, _080D3694 @ =gTasks
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0x8]
-	subs r1, 0x1
-	strh r1, [r0, 0x8]
-	lsls r1, 16
-	cmp r1, 0
-	bne _080D368A
-	adds r0, r3, 0
-	bl DestroyAnimVisualTask
-_080D368A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D3690: .4byte gBattleAnimArgs
-_080D3694: .4byte gTasks
-	thumb_func_end sub_80D365C
-
-	thumb_func_start sub_80D3698
-sub_80D3698: @ 80D3698
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	ldr r7, _080D36E4 @ =gBattleAnimBankAttacker
-	ldrb r0, [r7]
-	movs r1, 0
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x20]
-	ldrb r0, [r7]
-	movs r1, 0x1
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x22]
-	ldr r6, _080D36E8 @ =0x0000fff6
-	strh r6, [r4, 0x26]
-	ldrb r0, [r7]
-	bl sub_8079E90
-	lsls r0, 24
-	lsrs r5, r0, 24
-	bl NotInBattle
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D36F2
-	ldrb r0, [r7]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D36EC
-	movs r0, 0xA
-	strh r0, [r4, 0x24]
-	b _080D36F4
-	.align 2, 0
-_080D36E4: .4byte gBattleAnimBankAttacker
-_080D36E8: .4byte 0x0000fff6
-_080D36EC:
-	strh r6, [r4, 0x24]
-	subs r0, r5, 0x2
-	b _080D36F6
-_080D36F2:
-	strh r6, [r4, 0x24]
-_080D36F4:
-	adds r0, r5, 0x2
-_080D36F6:
-	adds r1, r4, 0
-	adds r1, 0x43
-	strb r0, [r1]
-	ldr r0, _080D3708 @ =sub_80D370C
-	str r0, [r4, 0x1C]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D3708: .4byte sub_80D370C
-	thumb_func_end sub_80D3698
-
-	thumb_func_start sub_80D370C
-sub_80D370C: @ 80D370C
-	push {lr}
-	adds r2, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080D3722
-	adds r0, r2, 0
-	bl move_anim_8072740
-_080D3722:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D370C
-
-	thumb_func_start sub_80D3728
-sub_80D3728: @ 80D3728
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	ldr r5, _080D37E8 @ =gBattleAnimBankAttacker
-	ldrb r0, [r5]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldr r0, _080D37EC @ =gBattleAnimBankTarget
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	bne _080D3772
-	ldr r4, _080D37F0 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	negs r0, r0
-	strh r0, [r4]
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D376A
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080D3772
-_080D376A:
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	negs r0, r0
-	strh r0, [r4]
-_080D3772:
-	ldr r5, _080D37F0 @ =gBattleAnimArgs
-	movs r1, 0xA
-	ldrsh r0, [r5, r1]
-	movs r1, 0xFF
-	lsls r1, 8
-	ands r0, r1
-	movs r1, 0
-	cmp r0, 0
-	bne _080D3786
-	movs r1, 0x1
-_080D3786:
-	ldrb r0, [r5, 0xA]
-	movs r7, 0x1
-	cmp r0, 0
-	bne _080D3790
-	movs r7, 0x3
-_080D3790:
-	adds r0, r6, 0
-	bl sub_80787B0
-	ldr r0, _080D37E8 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D37AA
-	ldrh r0, [r5, 0x4]
-	negs r0, r0
-	strh r0, [r5, 0x4]
-_080D37AA:
-	ldrh r0, [r5, 0x8]
-	strh r0, [r6, 0x2E]
-	ldr r4, _080D37EC @ =gBattleAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x4]
-	adds r0, r1
-	strh r0, [r6, 0x32]
-	ldrb r0, [r4]
-	adds r1, r7, 0
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r5, [r5, 0x6]
-	adds r0, r5
-	strh r0, [r6, 0x36]
-	ldr r0, _080D37F4 @ =sub_8078B34
-	str r0, [r6, 0x1C]
-	ldr r1, _080D37F8 @ =move_anim_8072740
-	adds r0, r6, 0
-	bl StoreSpriteCallbackInData
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D37E8: .4byte gBattleAnimBankAttacker
-_080D37EC: .4byte gBattleAnimBankTarget
-_080D37F0: .4byte gBattleAnimArgs
-_080D37F4: .4byte sub_8078B34
-_080D37F8: .4byte move_anim_8072740
-	thumb_func_end sub_80D3728
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 960b300b7..738c2418e 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -80,20 +80,20 @@
 	.byte 0x0d
 	.endm
 
-	@ Sets mystery event status
+	@ Sets some status related to Mystery Event.
 	.macro setmysteryeventstatus value
 	.byte 0x0e
 	.byte \value
 	.endm
 
-	@ Sets the specified script bank to immediate value.
+	@ Sets the specified script bank to value.
 	.macro loadword destination, value
 	.byte 0x0f
 	.byte \destination
 	.4byte \value
 	.endm
 
-	@ Sets the specified script bank to immediate value.
+	@ Sets the specified script bank to value.
 	.macro loadbyte destination, value
 	.byte 0x10
 	.byte \destination
@@ -219,7 +219,7 @@
 	.2byte \value
 	.endm
 
-	@ Compares the value of `var` to the value of `var2`.
+	@ Compares the value of `var1` to the value of `var2`.
 	.macro compare_var_to_var var1, var2
 	.byte 0x22
 	.2byte \var1
@@ -250,7 +250,7 @@
 	.4byte \func
 	.endm
 
-	@ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers.
+	@ Calls a special function; that is, a function designed for use by scripts and listed in a table of pointers.
 	.macro special function
 	.byte 0x25
 	.2byte SPECIAL_\function
@@ -292,19 +292,19 @@
 	.2byte \a
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro initclock hour minute
+	@ Initializes the RTC`s local time offset to the given hour and minute. In FireRed, this command is a nop.
+	.macro initclock hour, minute
 	.byte 0x2c
-	.byte \hour
-	.byte \minute
+	.2byte \hour
+	.2byte \minute
 	.endm
 
-	@ In FireRed, this command is a nop.
+	@ Runs time based events. In FireRed, this command is a nop.
 	.macro dodailyevents
 	.byte 0x2d
 	.endm
 
-	@ Resets the values of variables 0x8000, 0x8001, and 0x8002. Related to RTC in RSE?
+	@ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG, this command sets those variables to zero.
 	.macro gettime
 	.byte 0x2e
 	.endm
@@ -315,7 +315,7 @@
 	.2byte \sound_number
 	.endm
 
-	@ Blocks script execution until the currently-playing sound (triggered by sound) finishes playing.
+	@ Blocks script execution until the currently-playing sound (triggered by playse) finishes playing.
 	.macro waitse
 	.byte 0x30
 	.endm
@@ -338,7 +338,7 @@
 	.byte \unknown
 	.endm
 
-	@ Plays the specified (song_number) song.
+	@ Saves the specified (song_number) song to be played later.
 	.macro savebgm song_number
 	.byte 0x34
 	.2byte \song_number
@@ -361,7 +361,7 @@
 	.byte \speed
 	.endm
 
-	@ Fades the currently-playing song back in.
+	@ Fades the previously-playing song back in.
 	.macro fadeinbgm speed
 	.byte 0x38
 	.byte \speed
@@ -385,7 +385,7 @@
 	.2byte \Y
 	.endm
 
-	@ Clone of warp that uses "a walking effect".
+	@ Clone of warp that plays a door opening animation before stepping upwards into it.
 	.macro warpdoor map, warp, X, Y
 	.byte 0x3b
 	map \map
@@ -400,7 +400,7 @@
 	map \map
 	.endm
 
-	@ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E.[source]
+	@ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E.
 	.macro warpteleport map, warp, X, Y
 	.byte 0x3d
 	map \map
@@ -409,7 +409,7 @@
 	.2byte \Y
 	.endm
 
-	@ Clone of warp. Used by an (unused?) Safari Zone script to return the player to the gatehouse and end the Safari Game.
+	@ Sets the warp destination to be used later.
 	.macro setwarp map, warp, X, Y
 	.byte 0x3e
 	map \map
@@ -418,7 +418,7 @@
 	.2byte \Y
 	.endm
 
-	@ Sets a default warp place. If a warp tries to send the player to Warp 127 on Map 127.127, they will instead be sent here. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
+	@ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
 	.macro setdynamicwarp map, warp, X, Y
 	.byte 0x3f
 	map \map
@@ -427,7 +427,7 @@
 	.2byte \Y
 	.endm
 
-	@ Clone of warp3, except that this writes data to different offsets...
+	@ Sets the destination that diving or emerging from a dive will take the player to.
 	.macro setdivewarp map, warp, X, Y
 	.byte 0x40
 	map \map
@@ -436,7 +436,7 @@
 	.2byte \Y
 	.endm
 
-	@ Clone of warp3, except that this writes data to different offsets...
+	@ Sets the destination that falling into a hole will take the player to.
 	.macro setholewarp map, warp, X, Y
 	.byte 0x41
 	map \map
@@ -452,20 +452,20 @@
 	.2byte \Y
 	.endm
 
-	@ Retrieves the number of Pokmon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
-	.macro countpokemon
+	@ Retrieves the number of Pokemon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
+	.macro getpartysize
 	.byte 0x43
 	.endm
 
 	@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000.
-	.macro additem index, quantity
+	.macro giveitem index, quantity
 	.byte 0x44
 	.2byte \index
 	.2byte \quantity
 	.endm
 
 	@ Removes quantity of item index from the player's Bag.
-	.macro removeitem index, quantity
+	.macro takeitem index, quantity
 	.byte 0x45
 	.2byte \index
 	.2byte \quantity
@@ -492,7 +492,7 @@
 	.endm
 
 	@ Adds a quantity amount of item index to the player's PC. Both arguments can be variables.
-	.macro addpcitem index, quantity
+	.macro givepcitem index, quantity
 	.byte 0x49
 	.2byte \index
 	.2byte \quantity
@@ -505,32 +505,32 @@
 	.2byte \quantity
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro adddecor a
+	@ Adds decoration to the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	.macro givedecoration decoration
 	.byte 0x4b
-	.2byte \a
+	.2byte \decoration
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro removedecor a
+	@ Removes a decoration from the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	.macro takedecoration decoration
 	.byte 0x4c
-	.2byte \a
+	.2byte \decoration
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro hasdecor a
+	@ Checks for decoration in the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	.macro checkdecor decoration
 	.byte 0x4d
-	.2byte \a
+	.2byte \decoration
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro checkdecor a
+	@ Checks if the player has enough space in their PC to hold decoration. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	.macro checkdecorspace decoration
 	.byte 0x4e
-	.2byte \a
+	.2byte \decoration
 	.endm
 
-	@ Applies the movement data at movements to the specified (index) Person event. Also closes any standard message boxes that are still open.
-	@ This command in fact uses variables to access the Person event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Person event 3 will have the movements at @move1 applied to them. Thank you Shiny Quagsire for bringing this to my attention.
+	@ Applies the movement data at movements to the specified (index) Object event. Also closes any standard message boxes that are still open.
+	@ This command in fact uses variables to access the Object event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Object event 3 will have the movements at @move1 applied to them.
 	.macro applymovement index, movements, mapGroup, mapNum
 		.ifb \mapGroup
 			.byte 0x4f
@@ -545,7 +545,7 @@
 		.endif
 	.endm
 
-	@ Blocks script execution until the movements being applied to the specified (index) Person event finish. If the specified Person event is 0x0000, then the command will block script execution until all Person events affected by applymovement finish their movements. If the specified Person event is not currently being manipulated with applymovement, then this command does nothing.
+	@ Blocks script execution until the movements being applied to the specified (index) Object event finish. If the specified Object event is 0x0000, then the command will block script execution until all Object events affected by applymovement finish their movements. If the specified Object event is not currently being manipulated with applymovement, then this command does nothing.
 	.macro waitmovement index, mapBank, mapNum
 		.ifb \mapBank
 			.byte 0x51
@@ -558,7 +558,7 @@
 		.endif
 	.endm
 
-	@ Attempts to hide the specified (local_ID, a local ID) Person event on the specified map, by setting its visibility flag if it has a valid one. If the Person does not have a valid visibility flag, this command does nothing.
+	@ Attempts to hide the specified (local_ID, a local ID) Object event on the specified map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
 	@ If no map is specified, then the current map is used
 	.macro removeobject localId, mapGroup, mapNum
 		.ifb \mapGroup
@@ -584,92 +584,92 @@
 		.endif
 	.endm
 
-	.macro setobjectxy word1, word2, word3
-		.byte 0x57
-		.2byte \word1
-		.2byte \word2
-		.2byte \word3
+	@ Sets the specified (index) Object's position on the current map.
+	.macro setobjectxy index, x, y
+	.byte 0x57
+	.2byte \index
+	.2byte \x
+	.2byte \y
 	.endm
 
-	.macro showobject word, byte1, byte2
-		.byte 0x58
-		.2byte \word
-		.byte \byte1
-		.byte \byte2
+	.macro showobjectat index, map
+	.byte 0x58
+	.2byte \index
+	map \map
 	.endm
 
-	.macro hideobject word, byte1, byte2
-		.byte 0x59
-		.2byte \word
-		.byte \byte1
-		.byte \byte2
+	.macro hideobjectat index, map
+	.byte 0x59
+	.2byte \index
+	map \map
 	.endm
 
-	@ If the script was called by a Person event, then that Person will turn to face toward the tile that the player is stepping off of.
+	@ If the script was called by a Object event, then that Object will turn to face toward the tile that the player is stepping off of.
 	.macro faceplayer
-		.byte 0x5a
+	.byte 0x5a
 	.endm
 
-	.macro turnobject word, byte
-		.byte 0x5b
-		.2byte \word
-		.byte \byte
+	.macro turnobject index, direction
+	.byte 0x5b
+	.2byte \index
+	.byte \direction
 	.endm
 
 	@ If the Trainer flag for Trainer index is not set, this command does absolutely nothing.
 	.macro trainerbattle type, trainer, word, pointer1, pointer2, pointer3, pointer4
-		.byte 0x5c
-		.byte \type
-		.2byte \trainer
-		.2byte \word
-		.if \type == 0
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-		.elseif \type == 1
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ event script
-		.elseif \type == 2
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ event script
-		.elseif \type == 3
-			.4byte \pointer1 @ text
-		.elseif \type == 4
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ text
-		.elseif \type == 5
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-		.elseif \type == 6
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ text
-			.4byte \pointer4 @ event script
-		.elseif \type == 7
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ text
-		.elseif \type == 8
-			.4byte \pointer1 @ text
-			.4byte \pointer2 @ text
-			.4byte \pointer3 @ text
-			.4byte \pointer4 @ event script
-		.endif
+	.byte 0x5c
+	.byte \type
+	.2byte \trainer
+	.2byte \word
+	.if \type == 0
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+	.elseif \type == 1
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ event script
+	.elseif \type == 2
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ event script
+	.elseif \type == 3
+		.4byte \pointer1 @ text
+	.elseif \type == 4
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ text
+	.elseif \type == 5
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+	.elseif \type == 6
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ text
+		.4byte \pointer4 @ event script
+	.elseif \type == 7
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ text
+	.elseif \type == 8
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+		.4byte \pointer3 @ text
+		.4byte \pointer4 @ event script
+	.endif
 	.endm
 
-
 	@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes.
-	.macro battlebegin
+	.macro trainerbattlebegin
 	.byte 0x5d
 	.endm
 
-	.macro ontrainerbattleend
+	@ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) 
+	.macro gotopostbattlescript
 	.byte 0x5e
 	.endm
 
-	.macro ontrainerbattleendgoto
+	@ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c)
+	.macro gotobeatenscript
 	.byte 0x5f
 	.endm
 
@@ -679,28 +679,28 @@
 	.2byte \trainer
 	.endm
 
-	@ Sets Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
+	@ Sets Flag (trainer + 0x500).
 	.macro settrainerflag trainer
 	.byte 0x61
 	.2byte \trainer
 	.endm
 
-	@ Clears Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
+	@ Clears Flag (trainer + 0x500).
 	.macro cleartrainerflag trainer
 	.byte 0x62
 	.2byte \trainer
 	.endm
 
-	.macro setobjectxyperm word1, word2, word3
+	.macro setobjectxyperm index, x, y
 	.byte 0x63
-	.2byte \word1
-	.2byte \word2
-	.2byte \word3
+	.2byte \index
+	.2byte \x
+	.2byte \y
 	.endm
 
-	.macro moveobjectoffscreen word
+	.macro moveobjectoffscreen index
 	.byte 0x64
-	.2byte \word
+	.2byte \index
 	.endm
 
 	.macro setobjectmovementtype word, byte
@@ -720,67 +720,67 @@
 	.4byte \text
 	.endm
 
-	@ Holds the current message box open until the player presses a key. The message box is then closed.
+	@ Closes the current message box.
 	.macro closemessage
 	.byte 0x68
 	.endm
 
-	@ Ceases movement for all OWs on-screen.
+	@ Ceases movement for all Objects on-screen.
 	.macro lockall
 	.byte 0x69
 	.endm
 
-	@ If the script was called by a Person event, then that Person's movement will cease.
+	@ If the script was called by an Object, then that Object's movement will cease.
 	.macro lock
 	.byte 0x6a
 	.endm
 
-	@ Resumes normal movement for all OWs on-screen, and closes any standard message boxes that are still open.
+	@ Resumes normal movement for all Objects on-screen, and closes any standard message boxes that are still open.
 	.macro releaseall
 	.byte 0x6b
 	.endm
 
-	@ If the script was called by a Person event, then that Person's movement will resume. This command also closes any standard message boxes that are still open.
+	@ If the script was called by an Object, then that Object's movement will resume. This command also closes any standard message boxes that are still open.
 	.macro release
 	.byte 0x6c
 	.endm
 
 	@ Blocks script execution until the player presses any key.
-	.macro waitbutton
+	.macro waitbuttonpress
 	.byte 0x6d
 	.endm
 
 	@ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES".
-	.macro yesnobox X, Y
+	.macro yesnobox x, y
 	.byte 0x6e
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
-	.macro multichoice X, Y, list, B
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	.macro multichoice x, y, list, b
 	.byte 0x6f
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.byte \list
-	.byte \B
+	.byte \b
 	.endm
 
-	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
-	.macro multichoicedefault X, Y, list, default, B
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	.macro multichoicedefault x, y, list, default, b
 	.byte 0x70
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.byte \list
 	.byte \default
-	.byte \B
+	.byte \b
 	.endm
 
 	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
-	.macro multichoicegrid X, Y, list, per_row, B
+	.macro multichoicegrid x, y, list, per_row, B
 	.byte 0x71
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.byte \list
 	.byte \per_row
 	.byte \B
@@ -810,20 +810,20 @@
 	.byte \byte4
 	.endm
 
-	@ Displays a box containing the front sprite for the specified (species) Pokmon species.
-	.macro drawpokepic species, X, Y
+	@ Displays a box containing the front sprite for the specified (species) Pokemon species.
+	.macro drawmonpic species, x, y
 	.byte 0x75
 	.2byte \species
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Hides all boxes displayed with showpokepic.
-	.macro erasepokepic
+	@ Hides all boxes displayed with drawmonpic.
+	.macro erasemonpic 
 	.byte 0x76
 	.endm
 
-	@ In FireRed, this command is a nop. (The argument is discarded.)
+	@ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.)
 	.macro drawcontestwinner a
 	.byte 0x77
 	.byte \a
@@ -835,8 +835,8 @@
 	.4byte \text
 	.endm
 
-	@ Gives the player one of the specified (species) Pokmon at level level holding item. The unknown arguments should all be zeroes.
-	.macro givepoke species, level, item, unknown1, unknown2, unknown3
+	@ Gives the player one of the specified (species) Pokemon at level level holding item. The unknown arguments should all be zeroes.
+	.macro givemon species, level, item, unknown1, unknown2, unknown3
 	.byte 0x79
 	.2byte \species
 	.byte \level
@@ -846,81 +846,81 @@
 	.byte \unknown3
 	.endm
 
-	.macro giveegg word
+	.macro giveegg species
 	.byte 0x7a
-	.2byte \word
+	.2byte \species
 	.endm
 
-	.macro setpokemove byte1, byte2, word
+	.macro setmonmove index, slot, move
 	.byte 0x7b
-	.byte \byte1
-	.byte \byte2
-	.2byte \word
+	.byte \index
+	.byte \slot
+	.2byte \move
 	.endm
 
-	@ Checks if at least one Pokmon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the Pokmon that knows the move. If not, LASTRESULT is set to 0x0006.
-	.macro checkpokemove index
+	@ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species.
+	.macro checkpartymove index
 	.byte 0x7c
 	.2byte \index
 	.endm
 
-	@ Writes the name of the Pokmon at index species to the specified buffer.
-	.macro getspeciesname out, species
+	@ Writes the name of the Pokemon at index species to the specified buffer.
+	.macro bufferspeciesname out, species
 	.byte 0x7d
 	.byte \out
 	.2byte \species
 	.endm
 
-	@ Writes the name of the first Pokmon in the player's party to the specified buffer.
-	.macro getfirstpartypokename out
+	@ Writes the name of the species of the first Pokemon in the player's party to the specified buffer.
+	.macro bufferleadmonspeciesname out
 	.byte 0x7e
 	.byte \out
 	.endm
 
-	@ Writes the name of the Pokmon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer.
-	.macro getpartypokename out, slot
+	@ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer.
+	.macro bufferpartymonnick out, slot
 	.byte 0x7f
 	.byte \out
 	.2byte \slot
 	.endm
 
 	@ Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
-	.macro getitemname out, item
+	.macro bufferitemname out, item
 	.byte 0x80
 	.byte \out
 	.2byte \item
 	.endm
 
-	@ In FireRed, this command is a nop. (The first argument is discarded immediately. The second argument is read, but not used for anything.)
-	.macro getdecorname a, b
+	@ Writes the name of the decoration at index decoration to the specified buffer. In FireRed, this command is a nop.
+	.macro bufferdecorationname out, decoration
 	.byte 0x81
-	.byte \a
-	.2byte \b
+	.byte \out
+	.2byte \decoration
 	.endm
 
-	@ Writes the name of the attack at index attack to the specified buffer.
-	.macro getmovename out, attack
+	@ Writes the name of the move at index move to the specified buffer.
+	.macro buffermovename out, move
 	.byte 0x82
 	.byte \out
-	.2byte \attack
+	.2byte \move
 	.endm
 
 	@ Converts the value of input to a decimal string, and writes that string to the specified buffer.
-	.macro getnumberstring out, input
+	.macro buffernumberstring out, input
 	.byte 0x83
 	.byte \out
 	.2byte \input
 	.endm
 
-	@ Writes the standard string identified by index to the specified buffer. Specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption (I've observed destruction of the stored player name and crashes when entering/exiting certain menu screens).
-	.macro getstdstring out, index
+	@ Writes the standard string identified by index to the specified buffer. This command has no protections in place at all, so specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption.
+	.macro bufferstdstring out, index
 	.byte 0x84
 	.byte \out
 	.2byte \index
 	.endm
 
 	@ Copies the string at offset to the specified buffer.
-	.macro getstring out, offset
+	.macro bufferstring out, offset
 	.byte 0x85
 	.byte \out
 	.4byte \offset
@@ -932,46 +932,49 @@
 	.4byte \products
 	.endm
 
-	@ Apparent clone of pokemart.
-	.macro pokemartdecor products
+	@ Opens the Pokemart system and treats the list of items as decorations.
+	.macro pokemartdecoration products
 	.byte 0x87
 	.4byte \products
 	.endm
 
-	@ Apparent clone of pokemart.
-	.macro pokemartbp products
+	@ Apparent clone of pokemartdecoration.
+	.macro pokemartdecoration2 products
 	.byte 0x88
 	.4byte \products
 	.endm
 
+	@ Starts up the slot machine minigame.
 	.macro playslotmachine word
 	.byte 0x89
 	.2byte \word
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro plantberrytree byte1, byte2, byte3
+	@ Sets a berry tree's specific berry and growth stage. In FireRed, this command is a nop.
+	.macro setberrytree tree_id, berry, growth_stage
 	.byte 0x8a
-	.byte \byte1, \byte2, \byte3
+	.byte \tree_id
+	.byte \berry
+	.byte \growth_stage
 	.endm
 
-	@ In FireRed, this command sets the byte at 0x03000EA8 to 0x01. I do not know what that means.
-	.macro choosecontestpkmn
+	@ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01.
+	.macro choosecontestmon 
 	.byte 0x8b
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro startcontest
+	@ Starts a contest. In FireRed, this command is a nop.
+	.macro startcontest 
 	.byte 0x8c
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro showcontestresults
+	@ Shows the results of a contest. In FireRed, this command is a nop.
+	.macro showcontestresults 
 	.byte 0x8d
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro contestlinktransfer
+	@ Starts a contest over a link connection. In FireRed, this command is a nop.
+	.macro contestlinktransfer 
 	.byte 0x8e
 	.endm
 
@@ -1003,50 +1006,51 @@
 	.endm
 
 	@ Spawns a secondary box showing how much money the player has.
-	.macro showmoneybox X, Y
+	.macro showmoneybox x, y
 	.byte 0x93
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
 	@ Hides the secondary box spawned by showmoney.
-	.macro hidemoneybox X, Y
+	.macro hidemoneybox x, y
 	.byte 0x94
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Updates the secondary box spawned by showmoney. (What does it do with its arguments?)
-	.macro updatemoneybox X, Y
+	@ Updates the secondary box spawned by showmoney. Consumes but does not use arguments.
+	.macro updatemoneybox x, y
 	.byte 0x95
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro getpricereduction word
+	@ Gets the price reduction for the index given. In FireRed, this command is a nop.
+	.macro getpricereduction index
 	.byte 0x96
-	.2byte \word
+	.2byte \index
 	.endm
 
-	@ Fades the screen to black or back, using the specified effect. Effect 0x00 fades in, and effect 0x01 fades out. I don't know if other effects exist.
+	@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white.
 	.macro fadescreen effect
 	.byte 0x97
 	.byte \effect
 	.endm
 
-	.macro fadescreendelay byte1, byte2
+	@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist.
+	.macro fadescreenspeed effect, speed
 	.byte 0x98
-	.byte \byte1
-	.byte \byte2
+	.byte \effect
+	.byte \speed
 	.endm
 
-	.macro setdarklevel word
+	.macro setflashradius word
 	.byte 0x99
 	.2byte \word
 	.endm
 
-	.macro animdarklevel byte
+	.macro animateflash byte
 	.byte 0x9a
 	.byte \byte
 	.endm
@@ -1062,11 +1066,11 @@
 	.2byte \animation
 	.endm
 
-	@ Tells the game which party Pokmon to use for the next field move animation.
-	.macro setfieldeffect animation, slot
+	@ Sets up the field effect argument argument with the value value.
+	.macro setfieldeffectargument argument, param
 	.byte 0x9d
-	.byte \animation
-	.2byte \slot
+	.byte \argument
+	.2byte \param
 	.endm
 
 	@ Blocks script execution until all playing field move animations complete.
@@ -1075,10 +1079,10 @@
 	.2byte \animation
 	.endm
 
-	@ Sets which healing place the player will return to if all of the Pokmon in their party faint. A list of available healing places can be found on PokeCommunity.
-	.macro sethealplace flightspot
+	@ Sets which healing place the player will return to if all of the Pokemon in their party faint.
+	.macro setrespawn heallocation
 	.byte 0x9f
-	.2byte \flightspot
+	.2byte \heallocation
 	.endm
 
 	@ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
@@ -1086,19 +1090,19 @@
 	.byte 0xa0
 	.endm
 
-	@ Plays the specified (species) Pokmon's cry. You can use waitcry to block script execution until the sound finishes.
-	.macro playpokecry species, effect
+	@ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes.
+	.macro playmoncry species, effect
 	.byte 0xa1
 	.2byte \species
 	.2byte \effect
 	.endm
 
-	@ Changes the tile at (X, Y) on the current map.
-	.macro setmaptile X, Y, tile_number, tile_attrib
+	@ Changes the metatile at (x, y) on the current map.
+	.macro setmetatile x, y, metatile_number, tile_attrib
 	.byte 0xa2
-	.2byte \X
-	.2byte \Y
-	.2byte \tile_number
+	.2byte \x
+	.2byte \y
+	.2byte \metatile_number
 	.2byte \tile_attrib
 	.endm
 
@@ -1119,78 +1123,76 @@
 	.endm
 
 	@ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors).
-	.macro tileeffect subroutine
+	.macro setstepcallback subroutine
 	.byte 0xa6
 	.byte \subroutine
 	.endm
 
-	.macro setmaplayoutindex word
+	.macro setmaplayoutindex index
 	.byte 0xa7
-	.2byte \word
+	.2byte \index
 	.endm
 
-	.macro setobjectpriority word, byte1, byte2, byte3
+	.macro setobjectpriority index, map, priority
 	.byte 0xa8
-	.2byte \word
-	.byte \byte1
-	.byte \byte2
-	.byte \byte3
+	.2byte \index
+	map \map
+	.byte \priority
 	.endm
 
-	.macro resetobjectpriority word, byte1, byte2
+	.macro resetobjectpriority index, map
 	.byte 0xa9
-	.2byte \word
-	.byte \byte1
-	.byte \byte2
+	.2byte \index
+	map \map
 	.endm
 
-	.macro createvobject byte1, byte2, word1, word2, byte3, byte4
+	.macro createvobject sprite, byte2, x, y, elevation, direction
 	.byte 0xaa
-	.byte \byte1
+	.byte \sprite
 	.byte \byte2
-	.2byte \word1
-	.2byte \word2
-	.byte \byte3
-	.byte \byte4
+	.2byte \x
+	.2byte \y
+	.byte \elevation
+	.byte \direction
 	.endm
 
-	.macro turnvobject byte1, byte2
+	.macro turnvobject index, direction
 	.byte 0xab
-	.byte \byte1
-	.byte \byte2
+	.byte \index
+	.byte \direction
 	.endm
 
-	@ Queues the opening of the door tile at (X, Y) with an animation.
-	.macro opendoor X, Y
+	@ Opens the door metatile at (X, Y) with an animation.
+	.macro opendoor x, y
 	.byte 0xac
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
-	@ Queues the closing of the door tile at (X, Y) with an animation.
-	.macro closedoor X, Y
+	@ Closes the door metatile at (X, Y) with an animation.
+	.macro closedoor x, y
 	.byte 0xad
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
-	@ Executes the state changes queued with setdooropened, setdoorclosed, setdooropened2, and setdoorclosed2.
-	.macro waitdooranim
+	@ Waits for the door animation started with opendoor or closedoor to finish.
+	.macro waitdooranim 
 	.byte 0xae
 	.endm
 
-	@ Queues the opening of the door tile at (X, Y) without an animation.
-	.macro setdooropen X, Y
+	@ Sets the door tile at (x, y) to be open without an animation.
+	.macro setdooropen x, y
 	.byte 0xaf
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
-	@ Queues the closing of the door tile at (X, Y) without an animation.
-	.macro setdoorclosed X, Y
+	@ Sets the door tile at (x, y) to be closed without an animation.
+	.macro setdoorclosed x, y
 	.byte 0xb0
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
 	@ In FireRed, this command is a nop.
@@ -1198,24 +1200,24 @@
 	.byte 0xb1
 	.endm
 
-	@ In FireRed, this command is a nop.
-	.macro showelevmenu
+	@ In FireRed and Emerald, this command is a nop.
+	.macro showelevmenu 
 	.byte 0xb2
 	.endm
 
-	.macro checkcoins word
+	.macro checkcoins out
 	.byte 0xb3
-	.2byte \word
+	.2byte \out
 	.endm
 
-	.macro givecoins word
+	.macro givecoins count
 	.byte 0xb4
-	.2byte \word
+	.2byte \count
 	.endm
 
-	.macro takecoins word
+	.macro takecoins count
 	.byte 0xb5
-	.2byte \word
+	.2byte \count
 	.endm
 
 	@ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle.
@@ -1226,7 +1228,7 @@
 	.2byte \item
 	.endm
 
-	@ Starts a wild battle against the Pokmon generated by setwildbattle. Blocks script execution until the battle finishes.
+	@ Starts a wild battle against the Pokemon generated by setwildbattle. Blocks script execution until the battle finishes.
 	.macro dowildbattle
 	.byte 0xb7
 	.endm
@@ -1264,55 +1266,55 @@
 	.4byte \pointer
 	.endm
 
-	.macro vloadword pointer
+	.macro vloadptr pointer
 	.byte 0xbe
 	.4byte \pointer
 	.endm
 
-	.macro vgetstring byte, pointer
+	.macro vbufferstring byte, pointer
 	.byte 0xbf
 	.byte \byte
 	.4byte \pointer
 	.endm
 
 	@ Spawns a secondary box showing how many Coins the player has.
-	.macro showcoinsbox X, Y
+	.macro showcoinsbox x, y
 	.byte 0xc0
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Hides the secondary box spawned by showcoins. It doesn't appear to use its arguments, but they are still required.
-	.macro hidecoinsbox X, Y
+	@ Hides the secondary box spawned by showcoins. It consumes its arguments but doesn't use them.
+	.macro hidecoinsbox x, y
 	.byte 0xc1
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Updates the secondary box spawned by showcoins. (What does it do with its arguments?)
-	.macro updatecoinsbox X, Y
+	@ Updates the secondary box spawned by showcoins. It consumes its arguments but doesn't use them.
+	.macro updatecoinsbox x, y
 	.byte 0xc2
-	.byte \X
-	.byte \Y
+	.byte \x
+	.byte \y
 	.endm
 
-	@ Increases the value of the specified hidden variable by 1. The hidden variable's value will not be allowed to exceed 0x00FFFFFF.
-	.macro incrementgamestat a
+	@ Increases the value of the specified game stat by 1. The stat's value will not be allowed to exceed 0x00FFFFFF.
+	.macro incrementgamestat stat
 	.byte 0xc3
-	.byte \a
+	.byte \stat
 	.endm
 
-	@ Clone of warp... Except that it doesn't appear to have any effect when used in some of FireRed's default level scripts. (If it did, Berry Forest would be impossible to enter...)
-	.macro setescapewarp map, warp, X, Y
+	@ Sets the destination that using an Escape Rope or Dig will take the player to.
+	.macro setescapewarp map, warp, x, y
 	.byte 0xc4
 	map \map
 	.byte \warp
-	.2byte \X
-	.2byte \Y
+	.2byte \x
+	.2byte \y
 	.endm
 
 	@ Blocks script execution until cry finishes.
-	.macro waitpokecry
+	.macro waitmoncry
 	.byte 0xc5
 	.endm
 
@@ -1357,134 +1359,6 @@
 	.4byte \value
 	.endm
 
-	@ Makes the Pokmon in the specified slot of the player's party obedient. It will not randomly disobey orders in battle.
-	.macro setobedience slot
-	.byte 0xcd
-	.2byte \slot
-	.endm
-
-	@ Checks if the Pokmon in the specified slot of the player's party is obedient. If the Pokmon is disobedient, 0x0001 is written to script variable 0x800D (LASTRESULT). If the Pokmon is obedient (or if the specified slot is empty or invalid), 0x0000 is written.
-	.macro checkobedience slot
-	.byte 0xce
-	.2byte \slot
-	.endm
-
-	@ Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020370A4.
-	.macro execram
-	.byte 0xcf
-	.endm
-
-	@ Sets worldmapflag to 1. This allows the player to Fly to the corresponding map, if that map has a flightspot.
-	.macro setworldflag worldmapflag
-	.byte 0xd0
-	.2byte \worldmapflag
-	.endm
-
-	@ Clone of warpteleport? It is apparently only used in FR/LG, and only with specials.[source]
-	.macro warpteleport2 map, warp, X, Y
-	.byte 0xd1
-	map \map
-	.byte \warp
-	.2byte \X
-	.2byte \Y
-	.endm
-
-	@ Changes the location where the player caught the Pokmon in the specified slot of their party. A list of valid catch locations can be found on PokeCommunity.
-	.macro setcatchlocale slot, location
-	.byte 0xd2
-	.2byte \slot
-	.byte \location
-	.endm
-
-	.macro event_d3 unknown
-	.byte 0xd3
-	.2byte \unknown
-	.endm
-
-	.macro event_d4
-	.byte 0xd4
-	.endm
-
-	@ In FireRed, this command is a nop.
-	.macro event_d5 var
-	.byte 0xd5
-	.2byte \var
-	.endm
-
-	.macro event_d6
-	.byte 0xd6
-	.endm
-
-	.macro warp7 map, byte, word1, word2
-	.byte 0xd7
-	map \map
-	.byte \byte
-	.2byte \word1
-	.2byte \word2
-	.endm
-
-	.macro event_d8
-	.byte 0xd8
-	.endm
-
-	.macro event_d9
-	.byte 0xd9
-	.endm
-
-	.macro hidebox2
-	.byte 0xda
-	.endm
-
-	.macro message3 pointer
-	.byte 0xdb
-	.4byte \pointer
-	.endm
-
-	.macro fadescreen3 byte
-	.byte 0xdc
-	.byte \byte
-	.endm
-
-	.macro buffertrainerclass byte, word
-	.byte 0xdd
-	.byte \byte
-	.2byte \word
-	.endm
-
-	.macro buffertrainername byte, word
-	.byte 0xde
-	.byte \byte
-	.2byte \word
-	.endm
-
-	.macro pokenavcall pointer
-	.byte 0xdf
-	.4byte \pointer
-	.endm
-
-	.macro warp8 map, byte, word1, word2
-	.byte 0xe0
-	map \map
-	.byte \byte
-	.2byte \word1
-	.2byte \word2
-	.endm
-
-	.macro buffercontesttype byte, word
-	.byte 0xe1
-	.byte \byte
-	.2byte \word
-	.endm
-
-	@ Writes the name of the specified (item) item to the specified buffer. If the specified item is a Berry (0x85 - 0xAE) or Poke Ball (0x4) and if the quantity is 2 or more, the buffered string will be pluralized ("IES" or "S" appended). If the specified item is the Enigma Berry, I have no idea what this command does (but testing showed no pluralization). If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
-	.macro storeitems out, item, quantity
-	.byte 0xe2
-	.byte \out
-	.2byte \item
-	.2byte \quantity
-	.endm
-
-
 @ Supplementary
 
 	.macro goto_if_eq dest
@@ -1511,13 +1385,13 @@
 	YES = 1
 	NO  = 0
 
-	.macro giveitem item, amount=1, function=0
+	.macro giveitem_std item, amount=1, function=0
 	setorcopyvar 0x8000, \item
 	setorcopyvar 0x8001, \amount
 	callstd \function
 	.endm
 
-	.macro givedecoration decoration
+	.macro givedecoration_std decoration
 	setorcopyvar 0x8000, \decoration
 	callstd 7
 	.endm
diff --git a/asm/noise.s b/asm/noise.s
deleted file mode 100755
index 930b77309..000000000
--- a/asm/noise.s
+++ /dev/null
@@ -1,139 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D2D68
-sub_80D2D68: @ 80D2D68
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	ldr r0, _080D2D7C @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080D2D84
-	ldr r0, _080D2D80 @ =gBattleAnimBankAttacker
-	b _080D2D86
-	.align 2, 0
-_080D2D7C: .4byte gBattleAnimArgs
-_080D2D80: .4byte gBattleAnimBankAttacker
-_080D2D84:
-	ldr r0, _080D2E1C @ =gBattleAnimBankTarget
-_080D2D86:
-	ldrb r6, [r0]
-	adds r0, r6, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080D2DA0
-	ldr r1, _080D2E20 @ =gBattleAnimArgs
-	movs r2, 0x2
-	ldrsh r0, [r1, r2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-_080D2DA0:
-	adds r0, r6, 0
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	ldr r7, _080D2E20 @ =gBattleAnimArgs
-	lsrs r0, 24
-	ldrh r3, [r7, 0x2]
-	adds r0, r3
-	movs r4, 0
-	strh r0, [r5, 0x20]
-	adds r0, r6, 0
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r7, 0x4]
-	adds r0, r1
-	strh r0, [r5, 0x22]
-	strh r4, [r5, 0x2E]
-	ldrh r1, [r5, 0x20]
-	lsls r1, 3
-	strh r1, [r5, 0x30]
-	lsls r0, 3
-	strh r0, [r5, 0x32]
-	movs r2, 0x2
-	ldrsh r0, [r7, r2]
-	lsls r0, 3
-	cmp r0, 0
-	bge _080D2DE0
-	adds r0, 0x7
-_080D2DE0:
-	asrs r0, 3
-	strh r0, [r5, 0x34]
-	movs r3, 0x4
-	ldrsh r0, [r7, r3]
-	lsls r0, 3
-	cmp r0, 0
-	bge _080D2DF0
-	adds r0, 0x7
-_080D2DF0:
-	asrs r0, 3
-	strh r0, [r5, 0x36]
-	ldrh r2, [r5, 0x4]
-	lsls r1, r2, 22
-	lsrs r1, 22
-	movs r3, 0x6
-	ldrsh r0, [r7, r3]
-	lsls r0, 4
-	adds r1, r0
-	ldr r3, _080D2E24 @ =0x000003ff
-	adds r0, r3, 0
-	ands r1, r0
-	ldr r0, _080D2E28 @ =0xfffffc00
-	ands r0, r2
-	orrs r0, r1
-	strh r0, [r5, 0x4]
-	ldr r0, _080D2E2C @ =sub_80D2E30
-	str r0, [r5, 0x1C]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2E1C: .4byte gBattleAnimBankTarget
-_080D2E20: .4byte gBattleAnimArgs
-_080D2E24: .4byte 0x000003ff
-_080D2E28: .4byte 0xfffffc00
-_080D2E2C: .4byte sub_80D2E30
-	thumb_func_end sub_80D2D68
-
-	thumb_func_start sub_80D2E30
-sub_80D2E30: @ 80D2E30
-	push {lr}
-	adds r2, r0, 0
-	ldrh r0, [r2, 0x34]
-	ldrh r1, [r2, 0x30]
-	adds r0, r1
-	strh r0, [r2, 0x30]
-	ldrh r1, [r2, 0x36]
-	ldrh r3, [r2, 0x32]
-	adds r1, r3
-	strh r1, [r2, 0x32]
-	lsls r0, 16
-	asrs r0, 19
-	strh r0, [r2, 0x20]
-	lsls r1, 16
-	asrs r1, 19
-	strh r1, [r2, 0x22]
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x10
-	ble _080D2E64
-	adds r0, r2, 0
-	bl move_anim_8072740
-_080D2E64:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D2E30
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/note_spin.s b/asm/note_spin.s
deleted file mode 100755
index d0df90fd1..000000000
--- a/asm/note_spin.s
+++ /dev/null
@@ -1,234 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D2E68
-sub_80D2E68: @ 80D2E68
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D2E8A
-	ldr r0, _080D2EC4 @ =gBattleAnimArgs
-	ldrh r1, [r0]
-	movs r0, 0x78
-	subs r0, r1
-	strh r0, [r4, 0x30]
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-_080D2E8A:
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	movs r2, 0x30
-	ldrsh r1, [r4, r2]
-	cmp r0, r1
-	bne _080D2EA8
-	ldrb r0, [r4, 0x5]
-	lsrs r0, 4
-	adds r0, 0x10
-	movs r1, 0
-	bl sub_8079108
-_080D2EA8:
-	movs r0, 0x2E
-	ldrsh r1, [r4, r0]
-	movs r2, 0x30
-	ldrsh r0, [r4, r2]
-	adds r0, 0x50
-	cmp r1, r0
-	bne _080D2EBC
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D2EBC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2EC4: .4byte gBattleAnimArgs
-	thumb_func_end sub_80D2E68
-
-	thumb_func_start sub_80D2EC8
-sub_80D2EC8: @ 80D2EC8
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r6, r1]
-	cmp r0, 0
-	bne _080D2EF6
-	movs r5, 0x78
-	strh r5, [r6, 0x20]
-	ldr r4, _080D2F78 @ =gBattleAnimArgs
-	movs r2, 0
-	ldrsh r0, [r4, r2]
-	lsrs r1, r0, 31
-	adds r0, r1
-	asrs r0, 1
-	subs r0, 0xF
-	strh r0, [r6, 0x22]
-	ldrb r1, [r4, 0x2]
-	adds r0, r6, 0
-	bl StartSpriteAnim
-	strh r5, [r6, 0x38]
-	ldrh r0, [r4, 0x4]
-	strh r0, [r6, 0x34]
-_080D2EF6:
-	ldrh r0, [r6, 0x2E]
-	adds r0, 0x1
-	movs r5, 0
-	strh r0, [r6, 0x2E]
-	movs r1, 0x2E
-	ldrsh r0, [r6, r1]
-	lsrs r1, r0, 31
-	adds r0, r1
-	asrs r0, 1
-	strh r0, [r6, 0x30]
-	movs r2, 0x2E
-	ldrsh r0, [r6, r2]
-	lsls r4, r0, 1
-	adds r4, r0
-	ldrh r0, [r6, 0x34]
-	adds r4, r0
-	movs r2, 0xFF
-	ldrh r0, [r6, 0x3A]
-	adds r0, 0xA
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r6, 0x3A]
-	ands r4, r2
-	adds r0, r4, 0
-	movs r1, 0x64
-	bl Cos
-	strh r0, [r6, 0x24]
-	adds r0, r4, 0
-	movs r1, 0xA
-	bl Sin
-	adds r4, r0, 0
-	movs r1, 0x3A
-	ldrsh r0, [r6, r1]
-	movs r1, 0x4
-	bl Cos
-	ldrh r2, [r6, 0x30]
-	adds r4, r2
-	adds r0, r4
-	strh r0, [r6, 0x26]
-	movs r0, 0x2E
-	ldrsh r1, [r6, r0]
-	movs r2, 0x38
-	ldrsh r0, [r6, r2]
-	cmp r1, r0
-	ble _080D2F72
-	ldr r0, _080D2F7C @ =sub_80D2F80
-	str r0, [r6, 0x1C]
-	strh r5, [r6, 0x2E]
-	adds r0, r6, 0
-	bl oamt_add_pos2_onto_pos1
-	movs r0, 0x5
-	strh r0, [r6, 0x32]
-	strh r5, [r6, 0x36]
-	strh r5, [r6, 0x34]
-	adds r0, r6, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-_080D2F72:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2F78: .4byte gBattleAnimArgs
-_080D2F7C: .4byte sub_80D2F80
-	thumb_func_end sub_80D2EC8
-
-	thumb_func_start sub_80D2F80
-sub_80D2F80: @ 80D2F80
-	push {lr}
-	adds r1, r0, 0
-	ldrh r0, [r1, 0x2E]
-	adds r0, 0x1
-	strh r0, [r1, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xA
-	ble _080D2F9A
-	movs r0, 0
-	strh r0, [r1, 0x2E]
-	ldr r0, _080D2FA0 @ =sub_80D2FA4
-	str r0, [r1, 0x1C]
-_080D2F9A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2FA0: .4byte sub_80D2FA4
-	thumb_func_end sub_80D2F80
-
-	thumb_func_start sub_80D2FA4
-sub_80D2FA4: @ 80D2FA4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4, 0x32]
-	ldrh r2, [r4, 0x34]
-	adds r0, r1, r2
-	strh r0, [r4, 0x34]
-	strh r0, [r4, 0x26]
-	adds r1, 0x1
-	strh r1, [r4, 0x32]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x30
-	ble _080D2FCE
-	lsls r0, r1, 16
-	cmp r0, 0
-	ble _080D2FCE
-	ldrh r0, [r4, 0x36]
-	subs r1, r0, 0x5
-	strh r1, [r4, 0x32]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-_080D2FCE:
-	movs r1, 0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x3
-	ble _080D3000
-	movs r2, 0x32
-	ldrsh r1, [r4, r2]
-	lsrs r0, r1, 31
-	adds r0, r1, r0
-	asrs r0, 1
-	lsls r0, 1
-	subs r1, r0
-	adds r3, r4, 0
-	adds r3, 0x3E
-	movs r0, 0x1
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D3000:
-	movs r1, 0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x4
-	bne _080D300E
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D300E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D2FA4
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/rain.s b/asm/rain.s
deleted file mode 100755
index f8f68dd28..000000000
--- a/asm/rain.s
+++ /dev/null
@@ -1,123 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ rain
-
-	thumb_func_start sub_80D30F0
-sub_80D30F0: @ 80D30F0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r6, r0, 0
-	ldr r1, _080D3178 @ =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r5, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	bne _080D3118
-	ldr r1, _080D317C @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	strh r0, [r5, 0xA]
-	ldrh r0, [r1, 0x2]
-	strh r0, [r5, 0xC]
-	ldrh r0, [r1, 0x4]
-	strh r0, [r5, 0xE]
-_080D3118:
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r2, 0x8
-	ldrsh r0, [r5, r2]
-	movs r2, 0xC
-	ldrsh r1, [r5, r2]
-	bl __modsi3
-	cmp r0, 0x1
-	bne _080D3160
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0xF0
-	bl __umodsi3
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x50
-	bl __umodsi3
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r0, _080D3180 @ =gSpriteTemplate_83D9130
-	adds r1, r4, 0
-	movs r3, 0x4
-	bl CreateSprite
-_080D3160:
-	movs r0, 0x8
-	ldrsh r1, [r5, r0]
-	movs r2, 0xE
-	ldrsh r0, [r5, r2]
-	cmp r1, r0
-	bne _080D3172
-	adds r0, r6, 0
-	bl DestroyAnimVisualTask
-_080D3172:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D3178: .4byte gTasks
-_080D317C: .4byte gBattleAnimArgs
-_080D3180: .4byte gSpriteTemplate_83D9130
-	thumb_func_end sub_80D30F0
-
-	thumb_func_start sub_80D3184
-sub_80D3184: @ 80D3184
-	ldr r1, _080D318C @ =sub_80D3190
-	str r1, [r0, 0x1C]
-	bx lr
-	.align 2, 0
-_080D318C: .4byte sub_80D3190
-	thumb_func_end sub_80D3184
-
-	thumb_func_start sub_80D3190
-sub_80D3190: @ 80D3190
-	push {lr}
-	adds r2, r0, 0
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xD
-	bgt _080D31AE
-	ldrh r0, [r2, 0x24]
-	adds r0, 0x1
-	strh r0, [r2, 0x24]
-	ldrh r0, [r2, 0x26]
-	adds r0, 0x4
-	strh r0, [r2, 0x26]
-_080D31AE:
-	adds r0, r2, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080D31C2
-	adds r0, r2, 0
-	bl DestroySprite
-_080D31C2:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D3190
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/shock.s b/asm/shock.s
deleted file mode 100755
index 743aefe8a..000000000
--- a/asm/shock.s
+++ /dev/null
@@ -1,259 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ shock
-
-	thumb_func_start sub_80D6294
-sub_80D6294: @ 80D6294
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, _080D62D8 @ =gBattleAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x22]
-	ldr r0, _080D62DC @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D62E4
-	ldr r2, _080D62E0 @ =gBattleAnimArgs
-	ldrh r0, [r5, 0x20]
-	ldrh r1, [r2]
-	subs r0, r1
-	strh r0, [r5, 0x20]
-	ldrh r0, [r5, 0x22]
-	ldrh r1, [r2, 0x2]
-	subs r0, r1
-	strh r0, [r5, 0x22]
-	b _080D62F8
-	.align 2, 0
-_080D62D8: .4byte gBattleAnimBankTarget
-_080D62DC: .4byte gBattleAnimBankAttacker
-_080D62E0: .4byte gBattleAnimArgs
-_080D62E4:
-	ldr r0, _080D631C @ =gBattleAnimArgs
-	ldrh r1, [r0]
-	ldrh r2, [r5, 0x20]
-	adds r1, r2
-	strh r1, [r5, 0x20]
-	ldrh r1, [r0, 0x2]
-	ldrh r2, [r5, 0x22]
-	adds r1, r2
-	strh r1, [r5, 0x22]
-	adds r2, r0, 0
-_080D62F8:
-	movs r0, 0
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r2, 0x4]
-	strh r0, [r5, 0x30]
-	ldrh r0, [r2, 0x6]
-	strh r0, [r5, 0x32]
-	ldrh r0, [r2, 0x8]
-	strh r0, [r5, 0x34]
-	ldr r1, _080D6320 @ =move_anim_8074EE0
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData
-	ldr r0, _080D6324 @ =sub_8078114
-	str r0, [r5, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D631C: .4byte gBattleAnimArgs
-_080D6320: .4byte move_anim_8074EE0
-_080D6324: .4byte sub_8078114
-	thumb_func_end sub_80D6294
-
-	thumb_func_start sub_80D6328
-sub_80D6328: @ 80D6328
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	ldr r0, _080D6340 @ =gBattleAnimArgs
-	movs r1, 0x8
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x1
-	beq _080D63A0
-	cmp r0, 0x1
-	bgt _080D6344
-	cmp r0, 0
-	beq _080D634E
-	b _080D63A0
-	.align 2, 0
-_080D6340: .4byte gBattleAnimArgs
-_080D6344:
-	cmp r0, 0x2
-	beq _080D6358
-	cmp r0, 0x3
-	beq _080D637C
-	b _080D63A0
-_080D634E:
-	ldr r0, _080D6354 @ =gBattleAnimBankAttacker
-	b _080D63A2
-	.align 2, 0
-_080D6354: .4byte gBattleAnimBankAttacker
-_080D6358:
-	ldr r4, _080D6370 @ =gBattleAnimBankAttacker
-	ldrb r0, [r4]
-	movs r6, 0x2
-	eors r0, r6
-	bl IsAnimBankSpriteVisible
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D6374
-	ldrb r4, [r4]
-	b _080D63A4
-	.align 2, 0
-_080D6370: .4byte gBattleAnimBankAttacker
-_080D6374:
-	ldrb r0, [r4]
-	adds r4, r6, 0
-	eors r4, r0
-	b _080D63A4
-_080D637C:
-	ldr r0, _080D6398 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	movs r4, 0x2
-	eors r0, r4
-	bl IsAnimBankSpriteVisible
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D63A0
-	ldr r0, _080D639C @ =gBattleAnimBankTarget
-	ldrb r0, [r0]
-	eors r4, r0
-	b _080D63A4
-	.align 2, 0
-_080D6398: .4byte gBattleAnimBankAttacker
-_080D639C: .4byte gBattleAnimBankTarget
-_080D63A0:
-	ldr r0, _080D63C4 @ =gBattleAnimBankTarget
-_080D63A2:
-	ldrb r4, [r0]
-_080D63A4:
-	ldr r0, _080D63C8 @ =gBattleAnimArgs
-	movs r2, 0xA
-	ldrsh r0, [r0, r2]
-	cmp r0, 0
-	bne _080D63CC
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	adds r0, r4, 0
-	movs r1, 0x1
-	b _080D63DE
-	.align 2, 0
-_080D63C4: .4byte gBattleAnimBankTarget
-_080D63C8: .4byte gBattleAnimArgs
-_080D63CC:
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	adds r0, r4, 0
-	movs r1, 0x3
-_080D63DE:
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x22]
-	ldr r7, _080D647C @ =gSineTable
-	ldr r6, _080D6480 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r6, r1]
-	lsls r0, 1
-	adds r0, r7
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r2, 0x2
-	ldrsh r0, [r6, r2]
-	muls r0, r1
-	asrs r0, 8
-	strh r0, [r5, 0x24]
-	movs r1, 0
-	ldrsh r0, [r6, r1]
-	adds r0, 0x40
-	lsls r0, 1
-	adds r0, r7
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r2, 0x2
-	ldrsh r0, [r6, r2]
-	muls r0, r1
-	asrs r0, 8
-	strh r0, [r5, 0x26]
-	ldrh r1, [r6, 0xC]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D6442
-	adds r0, r4, 0
-	bl sub_8079ED4
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x1
-	movs r1, 0x3
-	ands r0, r1
-	lsls r0, 2
-	ldrb r2, [r5, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r5, 0x5]
-_080D6442:
-	ldrb r2, [r5, 0x3]
-	lsls r2, 26
-	lsrs r2, 27
-	movs r0, 0x4
-	ldrsh r1, [r6, r0]
-	lsls r0, r1, 1
-	adds r0, r7
-	ldrh r0, [r0]
-	ldr r3, _080D6484 @ =gOamMatrices
-	lsls r2, 3
-	adds r2, r3
-	adds r1, 0x40
-	lsls r1, 1
-	adds r1, r7
-	ldrh r1, [r1]
-	strh r1, [r2, 0x6]
-	strh r1, [r2]
-	strh r0, [r2, 0x2]
-	lsls r0, 16
-	asrs r0, 16
-	negs r0, r0
-	strh r0, [r2, 0x4]
-	ldrh r0, [r6, 0x6]
-	strh r0, [r5, 0x2E]
-	ldr r0, _080D6488 @ =sub_80DA48C
-	str r0, [r5, 0x1C]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D647C: .4byte gSineTable
-_080D6480: .4byte gBattleAnimArgs
-_080D6484: .4byte gOamMatrices
-_080D6488: .4byte sub_80DA48C
-	thumb_func_end sub_80D6328
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/struggle.s b/asm/struggle.s
deleted file mode 100755
index 2d618ed8f..000000000
--- a/asm/struggle.s
+++ /dev/null
@@ -1,111 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D2C38
-sub_80D2C38: @ 80D2C38
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r1, _080D2C50 @ =gBattleAnimArgs
-	movs r2, 0x4
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bne _080D2C54
-	adds r0, r5, 0
-	bl move_anim_8072740
-	b _080D2CB8
-	.align 2, 0
-_080D2C50: .4byte gBattleAnimArgs
-_080D2C54:
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bne _080D2C64
-	ldr r4, _080D2C60 @ =gBattleAnimBankAttacker
-	b _080D2C66
-	.align 2, 0
-_080D2C60: .4byte gBattleAnimBankAttacker
-_080D2C64:
-	ldr r4, _080D2C94 @ =gBattleAnimBankTarget
-_080D2C66:
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x22]
-	ldr r0, _080D2C98 @ =gBattleAnimArgs
-	movs r2, 0x2
-	ldrsh r1, [r0, r2]
-	adds r2, r0, 0
-	cmp r1, 0
-	bne _080D2C9C
-	ldrh r0, [r5, 0x20]
-	adds r0, 0x20
-	b _080D2CA0
-	.align 2, 0
-_080D2C94: .4byte gBattleAnimBankTarget
-_080D2C98: .4byte gBattleAnimArgs
-_080D2C9C:
-	ldrh r0, [r5, 0x20]
-	subs r0, 0x20
-_080D2CA0:
-	strh r0, [r5, 0x20]
-	ldrh r0, [r2, 0x4]
-	strh r0, [r5, 0x2E]
-	ldrh r1, [r2, 0x2]
-	strh r1, [r5, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl StartSpriteAnim
-	ldr r0, _080D2CC0 @ =sub_80D2CC4
-	str r0, [r5, 0x1C]
-_080D2CB8:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2CC0: .4byte sub_80D2CC4
-	thumb_func_end sub_80D2C38
-
-	thumb_func_start sub_80D2CC4
-sub_80D2CC4: @ 80D2CC4
-	push {lr}
-	adds r2, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080D2CF4
-	ldrh r0, [r2, 0x2E]
-	subs r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	cmp r0, 0
-	beq _080D2CEE
-	ldrh r1, [r2, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r2, 0
-	bl StartSpriteAnim
-	b _080D2CF4
-_080D2CEE:
-	adds r0, r2, 0
-	bl move_anim_8072740
-_080D2CF4:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D2CC4
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/sunlight.s b/asm/sunlight.s
deleted file mode 100755
index 07895e1b9..000000000
--- a/asm/sunlight.s
+++ /dev/null
@@ -1,33 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ sunlight
-
-	thumb_func_start sub_80D517C
-sub_80D517C: @ 80D517C
-	push {lr}
-	movs r1, 0
-	strh r1, [r0, 0x20]
-	strh r1, [r0, 0x22]
-	movs r1, 0x3C
-	strh r1, [r0, 0x2E]
-	movs r1, 0x8C
-	strh r1, [r0, 0x32]
-	movs r1, 0x50
-	strh r1, [r0, 0x36]
-	ldr r1, _080D51A0 @ =sub_8078B34
-	str r1, [r0, 0x1C]
-	ldr r1, _080D51A4 @ =move_anim_8072740
-	bl StoreSpriteCallbackInData
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D51A0: .4byte sub_8078B34
-_080D51A4: .4byte move_anim_8072740
-	thumb_func_end sub_80D517C
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/swipe.s b/asm/swipe.s
deleted file mode 100755
index 7f5284d7c..000000000
--- a/asm/swipe.s
+++ /dev/null
@@ -1,50 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D2BE8
-sub_80D2BE8: @ 80D2BE8
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D2C1C
-	ldr r1, _080D2C18 @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	ldrh r2, [r4, 0x20]
-	adds r0, r2
-	strh r0, [r4, 0x20]
-	ldrh r0, [r1, 0x2]
-	ldrh r2, [r4, 0x22]
-	adds r0, r2
-	strh r0, [r4, 0x22]
-	ldrb r1, [r1, 0x4]
-	adds r0, r4, 0
-	bl StartSpriteAnim
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	b _080D2C30
-	.align 2, 0
-_080D2C18: .4byte gBattleAnimArgs
-_080D2C1C:
-	adds r0, r4, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080D2C30
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D2C30:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D2BE8
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/thunder.s b/asm/thunder.s
deleted file mode 100755
index df97608f9..000000000
--- a/asm/thunder.s
+++ /dev/null
@@ -1,68 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ thunder
-
-	thumb_func_start sub_80D61C8
-sub_80D61C8: @ 80D61C8
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080D61E8 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D61F0
-	ldr r0, _080D61EC @ =gBattleAnimArgs
-	ldrh r1, [r4, 0x20]
-	ldrh r2, [r0]
-	subs r1, r2
-	strh r1, [r4, 0x20]
-	b _080D61FC
-	.align 2, 0
-_080D61E8: .4byte gBattleAnimBankAttacker
-_080D61EC: .4byte gBattleAnimArgs
-_080D61F0:
-	ldr r1, _080D6210 @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	ldrh r2, [r4, 0x20]
-	adds r0, r2
-	strh r0, [r4, 0x20]
-	adds r0, r1, 0
-_080D61FC:
-	ldrh r0, [r0, 0x2]
-	ldrh r1, [r4, 0x22]
-	adds r0, r1
-	strh r0, [r4, 0x22]
-	ldr r0, _080D6214 @ =sub_80D6218
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D6210: .4byte gBattleAnimArgs
-_080D6214: .4byte sub_80D6218
-	thumb_func_end sub_80D61C8
-
-	thumb_func_start sub_80D6218
-sub_80D6218: @ 80D6218
-	push {lr}
-	adds r2, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080D622E
-	adds r0, r2, 0
-	bl move_anim_8072740
-_080D622E:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D6218
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/uproar.s b/asm/uproar.s
deleted file mode 100755
index 04f428d4e..000000000
--- a/asm/uproar.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D2CF8
-sub_80D2CF8: @ 80D2CF8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r0, _080D2D2C @ =gBattleAnimArgs
-	ldrb r0, [r0]
-	bl GetAnimBankSpriteId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r4, r5, 2
-	adds r4, r5
-	lsls r4, 3
-	ldr r0, _080D2D30 @ =gTasks
-	adds r4, r0
-	ldr r2, _080D2D34 @ =gUnknown_083D7CA8
-	adds r0, r4, 0
-	bl sub_80798F4
-	ldr r0, _080D2D38 @ =sub_80D2D3C
-	str r0, [r4]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2D2C: .4byte gBattleAnimArgs
-_080D2D30: .4byte gTasks
-_080D2D34: .4byte gUnknown_083D7CA8
-_080D2D38: .4byte sub_80D2D3C
-	thumb_func_end sub_80D2CF8
-
-	thumb_func_start sub_80D2D3C
-sub_80D2D3C: @ 80D2D3C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _080D2D64 @ =gTasks
-	adds r0, r1
-	bl sub_807992C
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D2D5C
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-_080D2D5C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2D64: .4byte gTasks
-	thumb_func_end sub_80D2D3C
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/water.s b/asm/water.s
index e982d4265..4bf95ab59 100755
--- a/asm/water.s
+++ b/asm/water.s
@@ -7,420 +7,6 @@
 
 	@ water
 
-	thumb_func_start sub_80D37FC
-sub_80D37FC: @ 80D37FC
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x1
-	bl sub_8078764
-	ldr r0, _080D382C @ =gBattleAnimArgs
-	ldrh r1, [r0, 0x8]
-	strh r1, [r4, 0x2E]
-	ldrh r0, [r0, 0x4]
-	ldrh r2, [r4, 0x20]
-	adds r0, r2
-	strh r0, [r4, 0x32]
-	ldrh r0, [r4, 0x22]
-	adds r1, r0
-	strh r1, [r4, 0x36]
-	ldr r0, _080D3830 @ =sub_8078B34
-	str r0, [r4, 0x1C]
-	ldr r1, _080D3834 @ =move_anim_8072740
-	adds r0, r4, 0
-	bl StoreSpriteCallbackInData
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D382C: .4byte gBattleAnimArgs
-_080D3830: .4byte sub_8078B34
-_080D3834: .4byte move_anim_8072740
-	thumb_func_end sub_80D37FC
-
-	thumb_func_start sub_80D3838
-sub_80D3838: @ 80D3838
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080D3850 @ =gBattleAnimArgs
-	movs r1, 0x6
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _080D3854
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8078764
-	b _080D385C
-	.align 2, 0
-_080D3850: .4byte gBattleAnimArgs
-_080D3854:
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_80787B0
-_080D385C:
-	ldr r0, _080D386C @ =gBattleAnimArgs
-	ldrh r0, [r0, 0x4]
-	strh r0, [r4, 0x3C]
-	ldr r0, _080D3870 @ =sub_80D3874
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D386C: .4byte gBattleAnimArgs
-_080D3870: .4byte sub_80D3874
-	thumb_func_end sub_80D3838
-
-	thumb_func_start sub_80D3874
-sub_80D3874: @ 80D3874
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0xB
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x2E]
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	movs r1, 0x4
-	bl Sin
-	strh r0, [r4, 0x24]
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x30
-	strh r0, [r4, 0x30]
-	lsls r0, 16
-	asrs r0, 24
-	negs r0, r0
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x3C]
-	subs r0, 0x1
-	strh r0, [r4, 0x3C]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	bne _080D38B4
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D38B4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D3874
-
-	thumb_func_start sub_80D38BC
-sub_80D38BC: @ 80D38BC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x14
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-	ldr r1, _080D398C @ =REG_BLDCNT
-	ldr r2, _080D3990 @ =0x00003f42
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	movs r3, 0x80
-	lsls r3, 5
-	adds r0, r3, 0
-	strh r0, [r1]
-	ldr r2, _080D3994 @ =REG_BG1CNT
-	ldrb r1, [r2]
-	movs r0, 0x4
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r2]
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r2, 0x1]
-	mov r0, sp
-	bl sub_8078914
-	ldr r2, [sp]
-	movs r3, 0x80
-	lsls r3, 6
-	add r6, sp, 0x10
-	add r0, sp, 0xC
-	mov r12, r0
-	movs r5, 0
-	ldr r1, _080D3998 @ =0x040000d4
-	movs r4, 0x80
-	lsls r4, 5
-	mov r8, r6
-	ldr r7, _080D399C @ =0x85000400
-	movs r0, 0x85
-	lsls r0, 24
-	mov r9, r0
-_080D3920:
-	str r5, [sp, 0x10]
-	mov r0, r8
-	str r0, [r1]
-	str r2, [r1, 0x4]
-	str r7, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r2, r4
-	subs r3, r4
-	cmp r3, r4
-	bhi _080D3920
-	str r5, [sp, 0x10]
-	str r6, [r1]
-	str r2, [r1, 0x4]
-	lsrs r0, r3, 2
-	mov r2, r9
-	orrs r0, r2
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r0, 0
-	mov r3, r12
-	strb r0, [r3]
-	strb r0, [r3]
-	ldr r1, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x10]
-	ldr r0, _080D3998 @ =0x040000d4
-	str r6, [r0]
-	str r1, [r0, 0x4]
-	ldr r1, _080D399C @ =0x85000400
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-	bl NotInBattle
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D39B8
-	ldr r2, _080D3994 @ =REG_BG1CNT
-	ldrb r1, [r2]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, _080D39A0 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080D39A8
-	ldr r0, _080D39A4 @ =gUnknown_08E70968
-	b _080D39AA
-	.align 2, 0
-_080D398C: .4byte REG_BLDCNT
-_080D3990: .4byte 0x00003f42
-_080D3994: .4byte REG_BG1CNT
-_080D3998: .4byte 0x040000d4
-_080D399C: .4byte 0x85000400
-_080D39A0: .4byte gBattleAnimBankAttacker
-_080D39A4: .4byte gUnknown_08E70968
-_080D39A8:
-	ldr r0, _080D39B4 @ =gUnknown_08E70C38
-_080D39AA:
-	ldr r1, [sp, 0x4]
-	bl LZDecompressVram
-	b _080D39CE
-	.align 2, 0
-_080D39B4: .4byte gUnknown_08E70C38
-_080D39B8:
-	ldr r0, _080D39F0 @ =gUnknown_08E70F0C
-	ldr r1, [sp, 0x4]
-	bl LZDecompressVram
-	mov r0, sp
-	ldrb r0, [r0, 0x8]
-	ldr r1, [sp, 0x4]
-	movs r2, 0
-	movs r3, 0x1
-	bl sub_80763FC
-_080D39CE:
-	ldr r0, _080D39F4 @ =gBattleAnimBackgroundImage_Surf
-	ldr r1, [sp]
-	bl LZDecompressVram
-	ldr r0, _080D39F8 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080D3A00
-	ldr r0, _080D39FC @ =gBattleAnimBackgroundPalette_Surf
-	mov r1, sp
-	ldrb r1, [r1, 0x8]
-	lsls r1, 4
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	b _080D3A0E
-	.align 2, 0
-_080D39F0: .4byte gUnknown_08E70F0C
-_080D39F4: .4byte gBattleAnimBackgroundImage_Surf
-_080D39F8: .4byte gBattleAnimArgs
-_080D39FC: .4byte gBattleAnimBackgroundPalette_Surf
-_080D3A00:
-	ldr r0, _080D3A78 @ =gBattleAnimBackgroundImageMuddyWater_Pal
-	mov r1, sp
-	ldrb r1, [r1, 0x8]
-	lsls r1, 4
-	movs r2, 0x20
-	bl LoadCompressedPalette
-_080D3A0E:
-	ldr r0, _080D3A7C @ =sub_80D3D68
-	ldr r4, _080D3A80 @ =gTasks
-	mov r2, r10
-	lsls r5, r2, 2
-	adds r1, r5, r2
-	lsls r1, 3
-	adds r6, r1, r4
-	ldrb r1, [r6, 0x7]
-	adds r1, 0x1
-	lsls r1, 24
-	lsrs r1, 24
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	movs r3, 0
-	mov r9, r3
-	mov r0, r8
-	strh r0, [r6, 0x26]
-	mov r1, r8
-	lsls r0, r1, 2
-	add r0, r8
-	lsls r0, 3
-	adds r7, r0, r4
-	mov r2, r9
-	strh r2, [r7, 0x8]
-	movs r0, 0x80
-	lsls r0, 5
-	strh r0, [r7, 0xA]
-	strh r0, [r7, 0xC]
-	bl NotInBattle
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	beq _080D3A94
-	ldr r3, _080D3A84 @ =0x0000ffb0
-	adds r0, r3, 0
-	ldr r1, _080D3A88 @ =gUnknown_030042C0
-	strh r0, [r1]
-	ldr r2, _080D3A8C @ =0x0000ffd0
-	adds r0, r2, 0
-	ldr r3, _080D3A90 @ =gUnknown_030041B4
-	strh r0, [r3]
-	movs r0, 0x2
-	strh r0, [r6, 0x8]
-	movs r0, 0x1
-	strh r0, [r6, 0xA]
-	mov r0, r9
-	strh r0, [r7, 0xE]
-	b _080D3AEE
-	.align 2, 0
-_080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal
-_080D3A7C: .4byte sub_80D3D68
-_080D3A80: .4byte gTasks
-_080D3A84: .4byte 0x0000ffb0
-_080D3A88: .4byte gUnknown_030042C0
-_080D3A8C: .4byte 0x0000ffd0
-_080D3A90: .4byte gUnknown_030041B4
-_080D3A94:
-	ldr r0, _080D3AC4 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x1
-	bne _080D3AD8
-	ldr r2, _080D3AC8 @ =0x0000ff20
-	adds r0, r2, 0
-	ldr r3, _080D3ACC @ =gUnknown_030042C0
-	strh r0, [r3]
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r2, 0
-	ldr r3, _080D3AD0 @ =gUnknown_030041B4
-	strh r0, [r3]
-	movs r0, 0x2
-	strh r0, [r6, 0x8]
-	ldr r0, _080D3AD4 @ =0x0000ffff
-	strh r0, [r6, 0xA]
-	strh r1, [r7, 0xE]
-	b _080D3AEE
-	.align 2, 0
-_080D3AC4: .4byte gBattleAnimBankAttacker
-_080D3AC8: .4byte 0x0000ff20
-_080D3ACC: .4byte gUnknown_030042C0
-_080D3AD0: .4byte gUnknown_030041B4
-_080D3AD4: .4byte 0x0000ffff
-_080D3AD8:
-	ldr r0, _080D3B1C @ =gUnknown_030042C0
-	strh r4, [r0]
-	ldr r1, _080D3B20 @ =0x0000ffd0
-	adds r0, r1, 0
-	ldr r2, _080D3B24 @ =gUnknown_030041B4
-	strh r0, [r2]
-	ldr r0, _080D3B28 @ =0x0000fffe
-	strh r0, [r6, 0x8]
-	movs r0, 0x1
-	strh r0, [r6, 0xA]
-	strh r4, [r7, 0xE]
-_080D3AEE:
-	ldr r1, _080D3B2C @ =REG_BG1HOFS
-	ldr r3, _080D3B1C @ =gUnknown_030042C0
-	ldrh r0, [r3]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r2, _080D3B24 @ =gUnknown_030041B4
-	ldrh r0, [r2]
-	strh r0, [r1]
-	ldr r1, _080D3B30 @ =gTasks
-	mov r3, r8
-	lsls r0, r3, 2
-	add r0, r8
-	lsls r0, 3
-	adds r2, r0, r1
-	movs r3, 0xE
-	ldrsh r0, [r2, r3]
-	cmp r0, 0
-	bne _080D3B34
-	movs r0, 0x30
-	strh r0, [r2, 0x10]
-	movs r0, 0x70
-	b _080D3B38
-	.align 2, 0
-_080D3B1C: .4byte gUnknown_030042C0
-_080D3B20: .4byte 0x0000ffd0
-_080D3B24: .4byte gUnknown_030041B4
-_080D3B28: .4byte 0x0000fffe
-_080D3B2C: .4byte REG_BG1HOFS
-_080D3B30: .4byte gTasks
-_080D3B34:
-	movs r0, 0
-	strh r0, [r2, 0x10]
-_080D3B38:
-	strh r0, [r2, 0x12]
-	mov r2, r10
-	adds r0, r5, r2
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x1
-	strh r1, [r0, 0x14]
-	ldr r1, _080D3B5C @ =sub_80D3B60
-	str r1, [r0]
-	add sp, 0x14
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D3B5C: .4byte sub_80D3B60
-	thumb_func_end sub_80D38BC
-
 	thumb_func_start sub_80D3B60
 sub_80D3B60: @ 80D3B60
 	push {r4-r7,lr}
diff --git a/asm/wisp_orb.s b/asm/wisp_orb.s
deleted file mode 100755
index cb5920ba4..000000000
--- a/asm/wisp_orb.s
+++ /dev/null
@@ -1,230 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ wisp_orb
-
-	thumb_func_start sub_80D5B0C
-sub_80D5B0C: @ 80D5B0C
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1
-	beq _080D5B80
-	cmp r0, 0x1
-	bgt _080D5B22
-	cmp r0, 0
-	beq _080D5B28
-	b _080D5C4E
-_080D5B22:
-	cmp r0, 0x2
-	beq _080D5BDE
-	b _080D5C4E
-_080D5B28:
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_80787B0
-	ldr r4, _080D5B50 @ =gBattleAnimArgs
-	ldrb r1, [r4, 0x4]
-	adds r0, r5, 0
-	bl StartSpriteAnim
-	ldrh r0, [r4, 0x4]
-	strh r0, [r5, 0x3C]
-	ldr r0, _080D5B54 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D5B58
-	movs r0, 0x4
-	b _080D5B5A
-	.align 2, 0
-_080D5B50: .4byte gBattleAnimArgs
-_080D5B54: .4byte gBattleAnimBankAttacker
-_080D5B58:
-	ldr r0, _080D5B78 @ =0x0000fffc
-_080D5B5A:
-	strh r0, [r5, 0x36]
-	ldr r0, _080D5B7C @ =gBattleAnimBankTarget
-	ldrb r0, [r0]
-	bl sub_8079ED4
-	movs r1, 0x3
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, 0x5]
-	b _080D5BD6
-	.align 2, 0
-_080D5B78: .4byte 0x0000fffc
-_080D5B7C: .4byte gBattleAnimBankTarget
-_080D5B80:
-	ldrh r0, [r5, 0x30]
-	adds r0, 0xC0
-	strh r0, [r5, 0x30]
-	ldr r0, _080D5BA0 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D5BA4
-	ldrh r0, [r5, 0x30]
-	lsls r0, 16
-	asrs r0, 24
-	negs r0, r0
-	b _080D5BAA
-	.align 2, 0
-_080D5BA0: .4byte gBattleAnimBankAttacker
-_080D5BA4:
-	ldrh r0, [r5, 0x30]
-	lsls r0, 16
-	asrs r0, 24
-_080D5BAA:
-	strh r0, [r5, 0x26]
-	movs r2, 0x32
-	ldrsh r0, [r5, r2]
-	movs r2, 0x36
-	ldrsh r1, [r5, r2]
-	bl Sin
-	strh r0, [r5, 0x24]
-	ldrh r0, [r5, 0x32]
-	adds r0, 0x4
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x34]
-	adds r0, 0x1
-	strh r0, [r5, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	bne _080D5C4E
-	movs r0, 0
-	strh r0, [r5, 0x34]
-_080D5BD6:
-	ldrh r0, [r5, 0x2E]
-	adds r0, 0x1
-	strh r0, [r5, 0x2E]
-	b _080D5C4E
-_080D5BDE:
-	movs r1, 0x32
-	ldrsh r0, [r5, r1]
-	movs r2, 0x36
-	ldrsh r1, [r5, r2]
-	bl Sin
-	adds r2, r0, 0
-	movs r3, 0
-	strh r2, [r5, 0x24]
-	ldrh r0, [r5, 0x32]
-	adds r0, 0x4
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x34]
-	adds r0, 0x1
-	strh r0, [r5, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1F
-	bne _080D5C4E
-	ldrh r0, [r5, 0x20]
-	adds r1, r2, r0
-	strh r1, [r5, 0x20]
-	ldrh r0, [r5, 0x26]
-	ldrh r2, [r5, 0x22]
-	adds r0, r2
-	strh r0, [r5, 0x22]
-	strh r3, [r5, 0x26]
-	strh r3, [r5, 0x24]
-	movs r0, 0x80
-	lsls r0, 1
-	strh r0, [r5, 0x2E]
-	strh r1, [r5, 0x30]
-	ldr r4, _080D5C54 @ =gBattleAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x22]
-	strh r0, [r5, 0x34]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x36]
-	adds r0, r5, 0
-	bl sub_8078BD4
-	ldr r0, _080D5C58 @ =sub_80D5C5C
-	str r0, [r5, 0x1C]
-_080D5C4E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D5C54: .4byte gBattleAnimBankTarget
-_080D5C58: .4byte sub_80D5C5C
-	thumb_func_end sub_80D5B0C
-
-	thumb_func_start sub_80D5C5C
-sub_80D5C5C: @ 80D5C5C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8078B5C
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D5CB4
-	movs r1, 0x38
-	ldrsh r0, [r4, r1]
-	movs r1, 0x10
-	bl Sin
-	ldrh r1, [r4, 0x24]
-	adds r0, r1
-	strh r0, [r4, 0x24]
-	ldrh r2, [r4, 0x38]
-	adds r0, r2, 0x4
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x38]
-	ldrh r0, [r4, 0x38]
-	lsls r2, 16
-	asrs r2, 16
-	cmp r2, 0
-	beq _080D5C92
-	cmp r2, 0xC4
-	ble _080D5CBA
-_080D5C92:
-	lsls r0, 16
-	cmp r0, 0
-	ble _080D5CBA
-	movs r1, 0x3C
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D5CBA
-	ldr r0, _080D5CB0 @ =gUnknown_0202F7D2
-	movs r1, 0
-	ldrsb r1, [r0, r1]
-	movs r0, 0x90
-	bl PlaySE12WithPanning
-	b _080D5CBA
-	.align 2, 0
-_080D5CB0: .4byte gUnknown_0202F7D2
-_080D5CB4:
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D5CBA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D5C5C
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 88634d215..4501d62b6 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1,4 +1,5 @@
 #include "constants/decorations.h"
+#include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/items.h"
 #include "constants/map_objects.h"
@@ -31,12 +32,12 @@ gSpecialVars::
 	.4byte gSpecialVar_0x8009
 	.4byte gSpecialVar_0x800A
 	.4byte gSpecialVar_0x800B
-	.4byte gScriptFacing
-	.4byte gScriptResult
-	.4byte gScriptItemId
-	.4byte gScriptLastTalked
-	.4byte gScriptContestRank
-	.4byte gScriptContestCategory
+	.4byte gSpecialVar_Facing
+	.4byte gSpecialVar_Result
+	.4byte gSpecialVar_ItemId
+	.4byte gSpecialVar_LastTalked
+	.4byte gSpecialVar_ContestRank
+	.4byte gSpecialVar_ContestCategory
 
 	.include "data/specials.inc"
 
@@ -400,7 +401,7 @@ gUnknown_0815F36C:: @ 815F36C
 	dofieldeffect 61
 	waitstate
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	playse 5
 	goto EventScript_15F384
 	end
@@ -408,7 +409,7 @@ gUnknown_0815F36C:: @ 815F36C
 EventScript_15F384:
 	message UnknownString_81A3A87
 	waitmessage
-	checkflag 268
+	checkflag FLAG_DECORATION_16
 	goto_if_eq EventScript_15F3A0
 	goto EventScript_15F3E2
 	end
@@ -461,7 +462,7 @@ gUnknown_0815F43A:: @ 815F43A
 	dofieldeffect 61
 	waitstate
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	playse 5
 	goto EventScript_15F452
 	end
@@ -901,7 +902,7 @@ Std_2:
 	faceplayer
 	message 0x0
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	return
 
@@ -909,14 +910,14 @@ Std_3:
 	lockall
 	message 0x0
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	return
 
 Std_4:
 	message 0x0
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	return
 
 Std_5:
@@ -958,7 +959,7 @@ gUnknown_0819F818:: @ 819F818
 	goto EventScript_19F8F2
 
 EventScript_19F83F:
-	ontrainerbattleend
+	gotopostbattlescript
 
 gUnknown_0819F840:: @ 819F840
 	lock
@@ -977,19 +978,19 @@ gUnknown_0819F840:: @ 819F840
 EventScript_19F870:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
 EventScript_19F877:
-	ontrainerbattleend
+	gotopostbattlescript
 
 gUnknown_0819F878:: @ 819F878
 	applymovement LAST_TALKED, Movement_19F8F0
 	waitmovement 0
 	special PlayTrainerEncounterMusic
-	battlebegin
-	ontrainerbattleend
+	trainerbattlebegin
+	gotopostbattlescript
 
 gUnknown_0819F887:: @ 819F887
 	call EventScript_19F8E5
@@ -1000,14 +1001,14 @@ gUnknown_0819F887:: @ 819F887
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
 
 EventScript_19F8AD:
-	ontrainerbattleend
+	gotopostbattlescript
 
 gUnknown_0819F8AE:: @ 819F8AE
 	specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag
@@ -1020,19 +1021,19 @@ gUnknown_0819F8AE:: @ 819F8AE
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
 
 EventScript_19F8DD:
-	ontrainerbattleend
+	gotopostbattlescript
 
 EventScript_19F8DE:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -1048,8 +1049,8 @@ Movement_19F8F0::
 EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
-	waitbutton
-	battlebegin
+	waitbuttonpress
+	trainerbattlebegin
 	specialvar RESULT, ScrSpecial_GetTrainerBattleMode
 	compare RESULT, 0
 	goto_if_eq EventScript_19F934
@@ -1067,271 +1068,271 @@ EventScript_19F934:
 	end
 
 EventScript_19F936:
-	ontrainerbattleendgoto
+	gotobeatenscript
 
 Std_6::
 	message 0x0
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	return
 
 Event_ResetBerryTrees: @ 19F940
-	plantberrytree 2, 7, 5
-	plantberrytree 1, 3, 5
-	plantberrytree 11, 7, 5
-	plantberrytree 13, 3, 5
-	plantberrytree 4, 7, 5
-	plantberrytree 76, 1, 5
-	plantberrytree 8, 1, 5
-	plantberrytree 10, 6, 5
-	plantberrytree 25, 20, 5
-	plantberrytree 26, 2, 5
-	plantberrytree 66, 2, 5
-	plantberrytree 67, 20, 5
-	plantberrytree 69, 22, 5
-	plantberrytree 70, 22, 5
-	plantberrytree 71, 22, 5
-	plantberrytree 55, 17, 5
-	plantberrytree 56, 17, 5
-	plantberrytree 5, 1, 5
-	plantberrytree 6, 6, 5
-	plantberrytree 7, 1, 5
-	plantberrytree 16, 18, 5
-	plantberrytree 17, 18, 5
-	plantberrytree 18, 18, 5
-	plantberrytree 29, 19, 5
-	plantberrytree 28, 19, 5
-	plantberrytree 27, 19, 5
-	plantberrytree 24, 4, 5
-	plantberrytree 23, 3, 5
-	plantberrytree 22, 3, 5
-	plantberrytree 21, 4, 5
-	plantberrytree 19, 16, 5
-	plantberrytree 20, 16, 5
-	plantberrytree 80, 7, 5
-	plantberrytree 81, 7, 5
-	plantberrytree 77, 8, 5
-	plantberrytree 78, 8, 5
-	plantberrytree 68, 8, 5
-	plantberrytree 31, 10, 5
-	plantberrytree 33, 10, 5
-	plantberrytree 34, 21, 5
-	plantberrytree 35, 21, 5
-	plantberrytree 36, 21, 5
-	plantberrytree 83, 24, 5
-	plantberrytree 84, 24, 5
-	plantberrytree 85, 10, 5
-	plantberrytree 86, 6, 5
-	plantberrytree 37, 5, 5
-	plantberrytree 38, 5, 5
-	plantberrytree 39, 5, 5
-	plantberrytree 40, 3, 5
-	plantberrytree 41, 3, 5
-	plantberrytree 42, 3, 5
-	plantberrytree 46, 19, 5
-	plantberrytree 45, 20, 5
-	plantberrytree 44, 18, 5
-	plantberrytree 43, 16, 5
-	plantberrytree 47, 8, 5
-	plantberrytree 48, 5, 5
-	plantberrytree 49, 4, 5
-	plantberrytree 50, 2, 5
-	plantberrytree 52, 18, 5
-	plantberrytree 53, 18, 5
-	plantberrytree 62, 6, 5
-	plantberrytree 64, 6, 5
-	plantberrytree 58, 21, 5
-	plantberrytree 59, 21, 5
-	plantberrytree 60, 25, 5
-	plantberrytree 61, 25, 5
-	plantberrytree 79, 23, 5
-	plantberrytree 14, 23, 5
-	plantberrytree 15, 21, 5
-	plantberrytree 30, 21, 5
-	plantberrytree 65, 25, 5
-	plantberrytree 72, 25, 5
-	plantberrytree 73, 23, 5
-	plantberrytree 74, 23, 5
-	plantberrytree 87, 3, 5
-	plantberrytree 88, 10, 5
-	plantberrytree 89, 4, 5
-	plantberrytree 82, 36, 5
+	setberrytree 2, 7, 5
+	setberrytree 1, 3, 5
+	setberrytree 11, 7, 5
+	setberrytree 13, 3, 5
+	setberrytree 4, 7, 5
+	setberrytree 76, 1, 5
+	setberrytree 8, 1, 5
+	setberrytree 10, 6, 5
+	setberrytree 25, 20, 5
+	setberrytree 26, 2, 5
+	setberrytree 66, 2, 5
+	setberrytree 67, 20, 5
+	setberrytree 69, 22, 5
+	setberrytree 70, 22, 5
+	setberrytree 71, 22, 5
+	setberrytree 55, 17, 5
+	setberrytree 56, 17, 5
+	setberrytree 5, 1, 5
+	setberrytree 6, 6, 5
+	setberrytree 7, 1, 5
+	setberrytree 16, 18, 5
+	setberrytree 17, 18, 5
+	setberrytree 18, 18, 5
+	setberrytree 29, 19, 5
+	setberrytree 28, 19, 5
+	setberrytree 27, 19, 5
+	setberrytree 24, 4, 5
+	setberrytree 23, 3, 5
+	setberrytree 22, 3, 5
+	setberrytree 21, 4, 5
+	setberrytree 19, 16, 5
+	setberrytree 20, 16, 5
+	setberrytree 80, 7, 5
+	setberrytree 81, 7, 5
+	setberrytree 77, 8, 5
+	setberrytree 78, 8, 5
+	setberrytree 68, 8, 5
+	setberrytree 31, 10, 5
+	setberrytree 33, 10, 5
+	setberrytree 34, 21, 5
+	setberrytree 35, 21, 5
+	setberrytree 36, 21, 5
+	setberrytree 83, 24, 5
+	setberrytree 84, 24, 5
+	setberrytree 85, 10, 5
+	setberrytree 86, 6, 5
+	setberrytree 37, 5, 5
+	setberrytree 38, 5, 5
+	setberrytree 39, 5, 5
+	setberrytree 40, 3, 5
+	setberrytree 41, 3, 5
+	setberrytree 42, 3, 5
+	setberrytree 46, 19, 5
+	setberrytree 45, 20, 5
+	setberrytree 44, 18, 5
+	setberrytree 43, 16, 5
+	setberrytree 47, 8, 5
+	setberrytree 48, 5, 5
+	setberrytree 49, 4, 5
+	setberrytree 50, 2, 5
+	setberrytree 52, 18, 5
+	setberrytree 53, 18, 5
+	setberrytree 62, 6, 5
+	setberrytree 64, 6, 5
+	setberrytree 58, 21, 5
+	setberrytree 59, 21, 5
+	setberrytree 60, 25, 5
+	setberrytree 61, 25, 5
+	setberrytree 79, 23, 5
+	setberrytree 14, 23, 5
+	setberrytree 15, 21, 5
+	setberrytree 30, 21, 5
+	setberrytree 65, 25, 5
+	setberrytree 72, 25, 5
+	setberrytree 73, 23, 5
+	setberrytree 74, 23, 5
+	setberrytree 87, 3, 5
+	setberrytree 88, 10, 5
+	setberrytree 89, 4, 5
+	setberrytree 82, 36, 5
 	return
 
 gUnknown_0819FA81:: @ 819FA81
-	setflag 86
-	setflag 769
-	setflag 770
-	setflag 771
-	setflag 721
-	setflag 889
-	setflag 726
-	setflag 867
-	setflag 731
-	setflag 732
-	setflag 814
-	setflag 868
-	setflag 739
-	setflag 881
-	setflag 738
-	setflag 740
-	setflag 741
-	setflag 743
-	setflag 744
-	setflag 906
-	setflag 737
-	setflag 747
-	setflag 748
-	setflag 749
-	setflag 756
-	setflag 774
-	setflag 895
-	setflag 776
-	setflag 777
-	setflag 778
-	setflag 779
-	setflag 780
-	setflag 781
-	setflag 782
-	setflag 783
-	setflag 734
-	setflag 849
-	setflag 789
-	setflag 790
-	setflag 791
-	setflag 792
-	setflag 797
-	setflag 798
-	setflag 799
-	setflag 901
-	setflag 902
-	setflag 903
-	setflag 904
-	setflag 800
-	setflag 801
-	setflag 803
-	setflag 802
-	setflag 806
-	setflag 808
-	setflag 809
-	setflag 984
-	setflag 811
-	setflag 812
-	setflag 866
-	setflag 815
-	setflag 816
-	setflag 869
-	setflag 823
-	setflag 828
-	setflag 829
-	setflag 831
-	setflag 859
-	setflag 841
-	setflag 843
-	setflag 844
-	setflag 847
-	setflag 845
-	setflag 846
-	setflag 860
-	setflag 861
-	setflag 835
-	setflag 840
-	setflag 848
-	setflag 851
-	setflag 855
-	setflag 856
-	setflag 973
-	setflag 870
-	setflag 872
-	setflag 877
-	setflag 879
-	setflag 891
-	setflag 880
-	setflag 878
-	setflag 807
-	setflag 983
-	setflag 886
-	setflag 884
-	setflag 885
-	setflag 961
-	setflag 888
-	setflag 941
-	setflag 752
-	setflag 757
-	setflag 892
-	setflag 896
-	setflag 897
-	setflag 898
-	setflag 909
-	setflag 910
-	setflag 911
-	setflag 915
-	setflag 912
-	setflag 920
-	setflag 921
-	setflag 922
-	setflag 923
-	setflag 925
-	setflag 929
-	setflag 930
-	setflag 934
-	setflag 939
-	setflag 940
-	setflag 928
-	setflag 834
-	setflag 944
-	setflag 945
-	setflag 947
-	setflag 948
-	setflag 858
-	setflag 950
-	setflag 968
-	setflag 1133
-	setflag 727
-	setflag 979
-	setflag 751
-	setflag 991
+	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_HIDE_WALLY_PETALBURG
+	setflag FLAG_UNKNOWN_363
+	setflag FLAG_HIDE_GRUNT_RUSTBORO
+	setflag FLAG_HIDE_DEVON_RUSTBORO
+	setflag FLAG_HIDE_RIVAL_RUSTBORO
+	setflag FLAG_HIDE_FAT_MAN_LITTLEROOT
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
+	setflag FLAG_UNKNOWN_2E1
+	setflag FLAG_UNKNOWN_2EB
+	setflag FLAG_UNKNOWN_2EC
+	setflag FLAG_UNKNOWN_2ED
+	setflag FLAG_UNKNOWN_2F4
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
+	setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	setflag FLAG_UNKNOWN_30E
+	setflag FLAG_UNKNOWN_30F
+	setflag FLAG_HIDE_NORMAN_LITTLEROOT
+	setflag FLAG_HIDE_MAY_PICHU_DOLL
+	setflag FLAG_HIDE_FANCLUB_OLD_LADY
+	setflag FLAG_HIDE_FANCLUB_BOY
+	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
+	setflag FLAG_HIDE_FANCLUB_LADY
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
+	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
+	setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	setflag FLAG_UNKNOWN_337
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	setflag FLAG_UNKNOWN_34B
+	setflag FLAG_UNKNOWN_34C
+	setflag FLAG_UNKNOWN_34F
+	setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
+	setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	setflag FLAG_HIDE_STERN_SLATEPORT
+	setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_RIVAL_ROUTE119
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
+	setflag FLAG_HIDE_LANETTE
+	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
+	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BRINEY_ROUTE116
+	setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	setflag FLAG_HIDE_MOM_LITTLEROOT
+	setflag FLAG_HIDE_MOM_UPSTAIRS
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+	setflag FLAG_UNKNOWN_393
+	setflag FLAG_HIDE_WATTSON_MAUVILLE
+	setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
+	setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
+	setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
+	setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
+	setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+	setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+	setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
+	setflag FLAG_HIDE_STEVEN_ROUTE128
+	setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
+	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
+	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
+	setflag FLAG_HIDE_STEVENS_LETTER
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	setflag FLAG_HIDE_BOY_ROUTE101
 	call Event_ResetBerryTrees
 	end
 
 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
-	clearflag 925
+	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
 	call EverGrandeCity_HallOfFame_EventScript_19FD09
-	setflag 869
-	clearflag 950
-	clearflag 727
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	clearflag FLAG_HIDE_STEVENS_LETTER
 	setvar 0x40c6, 1
-	clearflag 751
-	clearflag 860
-	clearflag 861
+	clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
 	special sub_810FAA0
-	checkflag 291
+	checkflag FLAG_RECEIVED_SS_TICKET
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62
-	checkflag 255
+	checkflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70
-	checkflag 298
+	checkflag FLAG_RECEIVED_BELDUM
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
-	checkflag 123
+	checkflag FLAG_RECEIVED_HM08
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
-	clearflag 968
+	clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E
-	clearflag 1133
+	clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62
 	setvar 0x4082, 3
 	setvar 0x408c, 3
-	clearflag 734
+	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
-	setflag 2141
+	setflag FLAG_SYS_TV_LATI
 	return
 
 S_WhiteOut:: @ 819FC74
@@ -1341,11 +1342,11 @@ S_WhiteOut:: @ 819FC74
 	end
 
 EventScript_19FC84:
-	checkflag 221
+	checkflag FLAG_RECEIVED_GO_GOGGLES
 	goto_if_eq Route101_EventScript_1A14DC
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if 0, Route101_EventScript_1A14DC
-	clearflag 929
+	clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1
 	setvar 0x4053, 2
 	return
 
@@ -1359,42 +1360,42 @@ gUnknown_0819FC9F:: @ 819FC9F
 	end
 
 EventScript_19FCC1:
-	setflag 740
-	setflag 743
-	setflag 741
-	setflag 744
-	clearflag 742
-	clearflag 739
-	clearflag 881
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	end
 
 EventScript_19FCD7:
-	setflag 741
-	setflag 744
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
-	clearflag 740
-	clearflag 743
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	end
 
 EventScript_19FCF0:
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
-	setflag 740
-	setflag 743
-	clearflag 741
-	clearflag 744
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	end
 
 EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09
-	clearflag 1245
-	clearflag 1246
-	clearflag 1247
-	clearflag 1248
+	clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
+	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
+	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
+	clearflag FLAG_DEFEATED_ELITE_4_DRAKE
 	setvar 0x409c, 0
 	return
 
@@ -1407,15 +1408,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-	checkflag 188
+	checkflag FLAG_RECEIVED_POKENAV
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag 742
+	checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49
-	checkflag 740
+	checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
-	checkflag 741
+	checkflag FLAG_HIDE_MR_BRINEY_ROUTE109
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55
 	return
 
@@ -1465,7 +1466,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
 	applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
 	waitmovement 0
 	special ScrSpecial_HealPlayerParty
-	checkflag 273
+	checkflag FLAG_POKERUS_EXPLAINED
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
 	goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0
 	end
@@ -1495,7 +1496,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
 OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
 	message gText_NurseJoy_Pokerus
 	waitmessage
-	setflag 273
+	setflag FLAG_POKERUS_EXPLAINED
 	return
 
 OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
@@ -1504,13 +1505,13 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
 	step_end
 
 Std_ObtainItem: @ 819FDF7
-	additem 0x8000, 0x8001
+	giveitem 0x8000, 0x8001
 	copyvar 0x8007, RESULT
 	call Std_ObtainItem_
 	return
 
 Std_ObtainItem_: @ 819FE07
-	getitemname 1, 0x8000
+	bufferitemname 1, 0x8000
 	checkitemtype 0x8000
 	call GetItem_HandlePocket
 	compare 0x8007, 0x1
@@ -1529,31 +1530,31 @@ GetItem_HandlePocket:
 	end
 
 GetItem_HandlePocket_Items:
-	getstdstring 2, 0xE
+	bufferstdstring 2, 0xE
 	compare 0x8007, 1
 	call_if 1, PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_KeyItems:
-	getstdstring 2, 0xF
+	bufferstdstring 2, 0xF
 	compare 0x8007, 1
 	call_if 1, PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_PokeBalls:
-	getstdstring 2, 0x10
+	bufferstdstring 2, 0x10
 	compare 0x8007, 1
 	call_if 1, PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_TMsHMs:
-	getstdstring 2, 0x11
+	bufferstdstring 2, 0x11
 	compare 0x8007, 1
 	call_if 1, PlayGetTMHMFanfare
 	return
 
 GetItem_HandlePocket_Berries:
-	getstdstring 2, 0x12
+	bufferstdstring 2, 0x12
 	compare 0x8007, 1
 	call_if 1, PlayGetItemFanfare
 	return
@@ -1579,13 +1580,13 @@ PlayGetTMHMFanfare:
 	return
 
 Std_ObtainDecoration: @ 819FEDA
-	adddecor 0x8000
+	givedecoration 0x8000
 	copyvar 0x8007, RESULT
 	call Std_ObtainDecoration_
 	return
 
 Std_ObtainDecoration_: @ 819FEE8
-	getdecorname 1, 0x8000
+	bufferdecorationname 1, 0x8000
 	compare 0x8007, 1
 	call_if 1, Std_ObtainDecoration_Success
 	compare 0x8007, 0
@@ -1609,9 +1610,9 @@ Std_FindItem: @ 819FF21
 	lock
 	faceplayer
 	waitse
-	additem 0x8000, 0x8001
+	giveitem 0x8000, 0x8001
 	copyvar 0x8007, RESULT
-	getitemname 1, 0x8000
+	bufferitemname 1, 0x8000
 	checkitemtype 0x8000
 	call GetItem_HandlePocket
 	compare 0x8007, 1
@@ -1638,9 +1639,9 @@ Std_FindItem_Fail: @ 819FF65
 HiddenItemScript:: @ 819FF7B
 	lockall
 	waitse
-	additem 0x8005, 1
+	giveitem 0x8005, 1
 	copyvar 0x8007, RESULT
-	getitemname 0x1, 0x8005
+	bufferitemname 0x1, 0x8005
 	checkitemtype 0x8005
 	call GetItem_HandlePocket
 	compare 0x8007, 1
@@ -1682,7 +1683,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA
 UnusedMixRecordsScript_Done: @ 81A0000
 	message UnusedMixRecordsSeeYouAgainText
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -1722,9 +1723,9 @@ EventScript_1A0070:
 
 EventScript_1A0085:
 	playse 2
-	checkflag 2123
+	checkflag FLAG_SYS_PC_LANETTE
 	call_if 0, EventScript_1A00AC
-	checkflag 2123
+	checkflag FLAG_SYS_PC_LANETTE
 	call_if 1, EventScript_1A00B5
 	msgbox UnknownString_81A0A35, 4
 	special ShowPokemonStorageSystem
@@ -1748,7 +1749,7 @@ EventScript_1A00BE:
 	end
 
 EventScript_1A00CB:
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, EventScript_1A00BE
 	playse 2
 	special AccessHallOfFamePC
@@ -1806,8 +1807,8 @@ DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB
 LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB
 MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB
 RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB
-	clearflag 781
-	setflag 296
+	clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
 DewfordTown_EventScript_1A0102:: @ 81A0102
@@ -1825,11 +1826,11 @@ Route109_EventScript_1A010C:: @ 81A010C
 	return
 
 UseSurfScript:: @ 81A0117
-	checkpokemove MOVE_SURF
+	checkpartymove MOVE_SURF
 	compare RESULT, 6
 	goto_if_eq UseSurfScript_NoMon
-	getpartypokename 0, RESULT
-	setfieldeffect 0, RESULT
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
 	lockall
 	msgbox UseSurfPromptText, 5
 	compare RESULT, 0
@@ -2172,24 +2173,24 @@ Route103_EventScript_1A02F4:: @ 81A02F4
 	return
 
 Route101_EventScript_1A0358:: @ 81A0358
-	clearflag 721
-	clearflag 896
-	setflag 897
-	setflag 898
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	clearflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
 	return
 
 Route101_EventScript_1A0365:: @ 81A0365
-	clearflag 897
-	setflag 721
-	setflag 896
-	setflag 898
+	clearflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE103
 	return
 
 Route101_EventScript_1A0372:: @ 81A0372
-	clearflag 898
-	setflag 897
-	setflag 721
-	setflag 896
+	clearflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_UNKNOWN_BIRCH_380
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1A037F:: @ 81A037F
@@ -2213,7 +2214,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5
 	copyvar 0x8004, 0x8009
 	special ShowPokedexRatingMessage
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	return
 
 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0
@@ -2223,8 +2224,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0
 	copyvar 0x8008, 0x8005
 	copyvar 0x8009, 0x8006
 	copyvar 0x800a, RESULT
-	getnumberstring 0, 0x8008
-	getnumberstring 1, 0x8009
+	buffernumberstring 0, 0x8008
+	buffernumberstring 1, 0x8009
 	msgbox Route101_Text_1C44DC, 4
 	call Route101_EventScript_1A03A5
 	compare 0x800a, 0
@@ -2233,8 +2234,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0
 	specialvar RESULT, ScriptGetPokedexInfo
 	copyvar 0x8008, 0x8005
 	copyvar 0x8009, 0x8006
-	getnumberstring 0, 0x8008
-	getnumberstring 1, 0x8009
+	buffernumberstring 0, 0x8008
+	buffernumberstring 1, 0x8009
 	msgbox Route101_Text_1C4B05, 4
 	return
 
@@ -2257,31 +2258,31 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
 	step_end
 
 PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
-	setflag 740
-	setflag 743
-	setflag 741
-	setflag 744
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	setvar 0x4096, 0
 	return
 
 RusturfTunnel_EventScript_1A0442:: @ 81A0442
 	removeobject 1
 	removeobject 10
-	clearflag 808
-	clearflag 984
+	clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
 	setvar 0x409a, 6
-	setflag 199
+	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
 
 EventScript_1A0457: @ unreferenced?
 	delay 30
 	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841
 	waitmovement 0
-	showobject 255, 0, 0
+	showobjectat 255, MAP_PETALBURG_CITY
 	delay 30
 	applymovement 255, Movement_1A047A
 	waitmovement 0
@@ -2299,15 +2300,15 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
 	compare FACING, 3
 	call_if 1, BattleTower_Outside_EventScript_160B3A
 	delay 30
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	call BattleTower_Outside_EventScript_1A040E
 	return
 
 CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0
 	lockall
 	waitse
-	playpokecry SPECIES_GROUDON_OR_KYOGRE, 2
-	waitpokecry
+	playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
+	waitmoncry
 	setvar 0x4005, 1
 	releaseall
 	end
@@ -2361,13 +2362,13 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
 	waitse
-	playpokecry SPECIES_ELECTRODE, 2
+	playmoncry SPECIES_ELECTRODE, 2
 	delay 40
-	waitpokecry
-	setflag 977
-	setflag 2145
+	waitmoncry
+	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2377,13 +2378,13 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
 	waitse
-	playpokecry SPECIES_ELECTRODE, 2
+	playmoncry SPECIES_ELECTRODE, 2
 	delay 40
-	waitpokecry
-	setflag 978
-	setflag 2145
+	waitmoncry
+	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2460,9 +2461,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3
 	applymovement LAST_TALKED, Route119_Movement_1A0662
 	waitmovement 0
 	waitse
-	playpokecry SPECIES_KECLEON, 2
+	playmoncry SPECIES_KECLEON, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
 	compare 0x8004, 1
 	call_if 1, Route119_EventScript_1A0646
@@ -2478,38 +2479,38 @@ Route119_EventScript_1A05C3:: @ 81A05C3
 	call_if 1, Route119_EventScript_1A065A
 	compare 0x8004, 7
 	call_if 1, Route119_EventScript_1A065E
-	setflag 2145
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
 Route119_EventScript_1A0646:: @ 81A0646
-	setflag 982
+	setflag FLAG_HIDE_KECLEON_ROUTE120_3
 	return
 
 Route119_EventScript_1A064A:: @ 81A064A
-	setflag 985
+	setflag FLAG_HIDE_KECLEON_ROUTE120_4
 	return
 
 Route119_EventScript_1A064E:: @ 81A064E
-	setflag 986
+	setflag FLAG_HIDE_KECLEON_ROUTE120_5
 	return
 
 Route119_EventScript_1A0652:: @ 81A0652
-	setflag 987
+	setflag FLAG_HIDE_KECLEON_ROUTE120_6
 	return
 
 Route119_EventScript_1A0656:: @ 81A0656
-	setflag 988
+	setflag FLAG_HIDE_KECLEON_ROUTE120_7
 	return
 
 Route119_EventScript_1A065A:: @ 81A065A
-	setflag 989
+	setflag FLAG_HIDE_KECLEON_ROUTE119_1
 	return
 
 Route119_EventScript_1A065E:: @ 81A065E
-	setflag 990
+	setflag FLAG_HIDE_KECLEON_ROUTE119_2
 	return
 
 FortreeCity_Movement_1A0662:: @ 81A0662
@@ -2551,12 +2552,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F
 GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
 MtPyre_Summit_EventScript_1A067F:: @ 81A067F
 SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
-	getitemname 0, 0x8004
+	bufferitemname 0, 0x8004
 	playfanfare 372
 	message FallarborTown_House1_Text_1A1498
 	waitmessage
 	waitfanfare
-	removeitem 0x8004, 1
+	takeitem 0x8004, 1
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693
@@ -2566,18 +2567,18 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693
 	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853
 	waitmovement 0
 	playse 8
-	setmaptile 6, 1, 836, 0
-	setmaptile 6, 2, 837, 0
-	setmaptile 0, 2, 734, 1
-	setmaptile 1, 2, 733, 1
-	setmaptile 2, 2, 734, 1
-	setmaptile 3, 2, 733, 1
-	setmaptile 4, 2, 734, 1
-	setmaptile 8, 2, 733, 1
-	setmaptile 9, 2, 734, 1
-	setmaptile 10, 2, 733, 1
-	setmaptile 11, 2, 734, 1
-	setmaptile 12, 2, 733, 1
+	setmetatile 6, 1, 836, 0
+	setmetatile 6, 2, 837, 0
+	setmetatile 0, 2, 734, 1
+	setmetatile 1, 2, 733, 1
+	setmetatile 2, 2, 734, 1
+	setmetatile 3, 2, 733, 1
+	setmetatile 4, 2, 734, 1
+	setmetatile 8, 2, 733, 1
+	setmetatile 9, 2, 734, 1
+	setmetatile 10, 2, 733, 1
+	setmetatile 11, 2, 734, 1
+	setmetatile 12, 2, 733, 1
 	special DrawWholeMapView
 	return
 
@@ -2588,12 +2589,12 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710
 	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847
 	waitmovement 0
 	playse 52
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
 	special DrawWholeMapView
 	return
 
@@ -2601,36 +2602,36 @@ EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757
-	setmaptile 6, 1, 836, 0
-	setmaptile 6, 2, 837, 0
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
-	setmaptile 0, 2, 734, 1
-	setmaptile 1, 2, 733, 1
-	setmaptile 2, 2, 734, 1
-	setmaptile 3, 2, 733, 1
-	setmaptile 4, 2, 734, 1
-	setmaptile 8, 2, 733, 1
-	setmaptile 9, 2, 734, 1
-	setmaptile 10, 2, 733, 1
-	setmaptile 11, 2, 734, 1
-	setmaptile 12, 2, 733, 1
+	setmetatile 6, 1, 836, 0
+	setmetatile 6, 2, 837, 0
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
+	setmetatile 0, 2, 734, 1
+	setmetatile 1, 2, 733, 1
+	setmetatile 2, 2, 734, 1
+	setmetatile 3, 2, 733, 1
+	setmetatile 4, 2, 734, 1
+	setmetatile 8, 2, 733, 1
+	setmetatile 9, 2, 734, 1
+	setmetatile 10, 2, 733, 1
+	setmetatile 11, 2, 734, 1
+	setmetatile 12, 2, 733, 1
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
 	return
 
 SlateportCity_Movement_1A0831:: @ 81A0831
@@ -3280,7 +3281,7 @@ gUnknown_081A14B8:: @ 81A14B8
 EventScript_1A14CA::
 	message UnknownString_81A1141
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special sub_8081924
 	waitstate
 	fadescreen 1
@@ -3629,9 +3630,9 @@ gUnknown_081A2C51:: @ 81A2C51
 	special sub_80BB63C
 	compare RESULT, 1
 	goto_if_eq EventScript_1A2E45
-	checkpokemove MOVE_SECRET_POWER
-	setfieldeffect 0, RESULT
-	getmovename 1, MOVE_SECRET_POWER
+	checkpartymove MOVE_SECRET_POWER
+	setfieldeffectargument 0, RESULT
+	buffermovename 1, MOVE_SECRET_POWER
 	compare 0x8007, 1
 	goto_if_eq EventScript_1A2CB0
 	compare 0x8007, 2
@@ -3650,7 +3651,7 @@ EventScript_1A2CB0:
 	lockall
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2CF1
-	getpartypokename 0, RESULT
+	bufferpartymonnick 0, RESULT
 	msgbox UnknownString_8198F34, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
@@ -3681,7 +3682,7 @@ EventScript_1A2D08:
 	lockall
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2D49
-	getpartypokename 0, RESULT
+	bufferpartymonnick 0, RESULT
 	msgbox UnknownString_81A197B, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
@@ -3712,7 +3713,7 @@ EventScript_1A2D60:
 	lockall
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2DA1
-	getpartypokename 0, RESULT
+	bufferpartymonnick 0, RESULT
 	msgbox UnknownString_81A1A4B, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
@@ -3743,7 +3744,7 @@ EventScript_1A2DB8:
 	closemessage
 	playse 9
 	setvar 0x4097, 0
-	setflag 173
+	setflag FLAG_DECORATION_1
 	special sub_80BB8CC
 	special sub_80BBAF0
 	setvar 0x8004, 0
@@ -3767,7 +3768,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
 
 SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
 	closemessage
-	setflag 96
+	setflag FLAG_RECEIVED_SECRET_POWER
 	special sub_80BBC78
 	waitstate
 	end
@@ -3784,24 +3785,24 @@ gUnknown_081A2E14:: @ 81A2E14
 	special sub_80BC114
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2E38
-	clearflag 173
+	clearflag FLAG_DECORATION_1
 	special sub_80BBAF0
 	setvar 0x4089, 0
 	waitstate
 	end
 
 EventScript_1A2E38:
-	setflag 173
+	setflag FLAG_DECORATION_1
 	special sub_80BBAF0
 	setvar 0x4089, 0
 	waitstate
 	end
 
 EventScript_1A2E45:
-	checkpokemove MOVE_SECRET_POWER
+	checkpartymove MOVE_SECRET_POWER
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2EF7
-	setfieldeffect 0, RESULT
+	setfieldeffectargument 0, RESULT
 	setorcopyvar 0x8004, RESULT
 	lockall
 	special GetSecretBaseNearbyMapName
@@ -3818,8 +3819,8 @@ EventScript_1A2E45:
 	msgbox UnknownString_81A3CC9, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
-	getpartypokename 0, 0x8004
-	getmovename 1, MOVE_SECRET_POWER
+	bufferpartymonnick 0, 0x8004
+	buffermovename 1, MOVE_SECRET_POWER
 	msgbox UsedCutRockSmashText, 4
 	closemessage
 	closemessage
@@ -3861,20 +3862,20 @@ EventScript_1A2F3A::
 LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
 LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
 SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D
-	setflag 174
-	setflag 175
-	setflag 176
-	setflag 177
-	setflag 178
-	setflag 179
-	setflag 180
-	setflag 181
-	setflag 182
-	setflag 183
-	setflag 184
-	setflag 185
-	setflag 186
-	setflag 187
+	setflag FLAG_DECORATION_2
+	setflag FLAG_DECORATION_3
+	setflag FLAG_DECORATION_4
+	setflag FLAG_DECORATION_5
+	setflag FLAG_DECORATION_6
+	setflag FLAG_DECORATION_7
+	setflag FLAG_DECORATION_8
+	setflag FLAG_DECORATION_9
+	setflag FLAG_DECORATION_10
+	setflag FLAG_DECORATION_11
+	setflag FLAG_DECORATION_12
+	setflag FLAG_DECORATION_13
+	setflag FLAG_DECORATION_14
+	setflag FLAG_DECORATION_15
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68
@@ -3963,7 +3964,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
 	end
 
 SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3086
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
@@ -3998,7 +3999,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
 	end
 
 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3102
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
@@ -4033,7 +4034,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
 	end
 
 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A317E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
@@ -4068,7 +4069,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
 	end
 
 SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A31FA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
@@ -4103,7 +4104,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
 	end
 
 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3276
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
@@ -4138,7 +4139,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
 	end
 
 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A32F2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
@@ -4173,7 +4174,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
 	end
 
 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A336E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
@@ -4208,7 +4209,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
 	end
 
 SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A33EA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
@@ -4243,7 +4244,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
 	end
 
 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3466
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
@@ -4278,7 +4279,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
 	end
 
 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A34E2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
@@ -4470,9 +4471,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0
 	compare RESULT, 1
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
 	copyvar 0x8009, 0x8006
-	checkflag 105
+	checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
-	setflag 105
+	setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
 	msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5
 	compare RESULT, 1
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
@@ -4599,7 +4600,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 	lock
 	faceplayer
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E
 	setvar 0x8005, 6
 	special sub_80BF2C4
@@ -4645,7 +4646,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137
 	compare RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
 	msgbox FallarborTown_ContestLobby_Text_1A7153, 4
-	setflag 2
+	setflag FLAG_TEMP_2
 	setvar 0x8005, 6
 	goto FallarborTown_ContestLobby_EventScript_1ADE46
 	end
@@ -4675,19 +4676,19 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE1EE:: @ 81AE1EE
-	clearflag 800
+	clearflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1F2:: @ 81AE1F2
-	clearflag 801
+	clearflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1F6:: @ 81AE1F6
-	clearflag 803
+	clearflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1FA:: @ 81AE1FA
-	clearflag 802
+	clearflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE
@@ -4696,7 +4697,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE
 BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
 	lock
 	faceplayer
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq BattleTower_Lobby_EventScript_1AE2E3
 	setvar 0x8005, 7
 	special sub_80BF2C4
@@ -4748,7 +4749,7 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3
 	compare RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1AE2D9
 	msgbox BattleTower_Lobby_Text_1A7A6E, 4
-	setflag 2
+	setflag FLAG_TEMP_2
 	copyvar 0x8004, 0x8008
 	setvar 0x8005, 7
 	goto BattleTower_Lobby_EventScript_1ADE46
@@ -4771,11 +4772,11 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED
 	special sub_80BF2C4
 	compare RESULT, 1
 	goto_if_eq BattleTower_Lobby_EventScript_1AE30F
-	clearflag 918
+	clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	return
 
 BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
-	setflag 918
+	setflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	return
 
 	.include "data/scripts/gabby_and_ty.inc"
@@ -4804,8 +4805,8 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
 	.include "data/text/magma_summit.inc"
 
 gUnknown_081B694A:: @ 81B694A
-	animdarklevel 1
-	setdarklevel 1
+	animateflash 1
+	setflashradius 1
 	end
 
 	.include "data/scripts/players_house.inc"
@@ -4959,7 +4960,7 @@ gUnknown_081C6C02:: @ 81C6C02
 @ 81C6C1D
 	lockall
 	braillemessage Underwater_SealedChamber_Braille_1C533D
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index 497408299..2b86dc4dc 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -1,13 +1,13 @@
 S_CuttableTree:: @ 81B0DCC
 	lockall
-	checkflag 2055
+	checkflag FLAG_BADGE01_GET
 	goto_if 0, CannotUseCut
-	checkpokemove MOVE_CUT
+	checkpartymove MOVE_CUT
 	compare RESULT, 6
 	goto_if_eq CannotUseCut
-	setfieldeffect 0, RESULT
-	getpartypokename 0, RESULT
-	getmovename 1, MOVE_CUT
+	setfieldeffectargument 0, RESULT
+	bufferpartymonnick 0, RESULT
+	buffermovename 1, MOVE_CUT
 	msgbox UseCutPromptText, 5
 	compare RESULT, 0
 	goto_if_eq Cut_ChoseNo
@@ -61,14 +61,14 @@ CannotUseCutText: @ 81B0E8E
 
 S_BreakableRock:: @ 81B0EB7
 	lockall
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if 0, CannotUseRockSmash
-	checkpokemove MOVE_ROCK_SMASH
+	checkpartymove MOVE_ROCK_SMASH
 	compare RESULT, 6
 	goto_if_eq CannotUseRockSmash
-	setfieldeffect 0, RESULT
-	getpartypokename 0, RESULT
-	getmovename 1, MOVE_ROCK_SMASH
+	setfieldeffectargument 0, RESULT
+	bufferpartymonnick 0, RESULT
+	buffermovename 1, MOVE_ROCK_SMASH
 	msgbox UseRockSmashPromptText, 5
 	compare RESULT, 0
 	goto_if_eq RockSmash_ChoseNo
@@ -128,14 +128,14 @@ CannotUseRockSmashText: @ 81B0F90
 
 S_PushableBoulder:: @ 81B0FCB
 	lockall
-	checkflag 2058
+	checkflag FLAG_BADGE04_GET
 	goto_if 0, CannotUseStrength
-	checkflag 2089
+	checkflag FLAG_SYS_USE_STRENGTH
 	goto_if_eq AlreadyUsedStrength
-	checkpokemove 70
+	checkpartymove 70
 	compare RESULT, 6
 	goto_if_eq CannotUseStrength
-	setfieldeffect 0, RESULT
+	setfieldeffectargument 0, RESULT
 	msgbox UseStrengthPromptText, 5
 	compare RESULT, 0
 	goto_if_eq Strength_ChoseNo
@@ -153,7 +153,7 @@ S_UseStrength:: @ 81B100E
 	end
 
 UsedStrength: @ 81B1019
-	setflag 2089
+	setflag FLAG_SYS_USE_STRENGTH
 	msgbox UsedStrengthText, 3
 	releaseall
 	end
@@ -193,11 +193,11 @@ AlreadyUsedStrengthText: @ 81B1127
 
 S_UseWaterfall:: @ 81B115A
 	lockall
-	checkpokemove MOVE_WATERFALL
+	checkpartymove MOVE_WATERFALL
 	compare RESULT, 6
 	goto_if_eq Waterfall_NoMonKnows
-	getpartypokename 0, RESULT
-	setfieldeffect 0, RESULT
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
 	msgbox UseWaterfallPromptText, 5
 	compare RESULT, 0
 	goto_if_eq Waterfall_Done
@@ -226,12 +226,12 @@ UsedWaterfallText: @ 81B120D
 
 UseDiveScript:: @ 81B1220
 	lockall
-	checkpokemove MOVE_DIVE
+	checkpartymove MOVE_DIVE
 	compare RESULT, 6
 	goto_if_eq CannotUseDive
-	getpartypokename 0, RESULT
-	setfieldeffect 0, RESULT
-	setfieldeffect 1, 1
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
+	setfieldeffectargument 1, 1
 	msgbox UseDivePromptText, 5
 	compare RESULT, 0
 	goto_if_eq Dive_Done
@@ -249,12 +249,12 @@ Dive_Done: @ 81B1267
 
 S_UseDiveUnderwater:: @ 81B1269
 	lockall
-	checkpokemove MOVE_DIVE
+	checkpartymove MOVE_DIVE
 	compare RESULT, 6
 	goto_if_eq UnderwaterCannotUseDive
-	getpartypokename 0, RESULT
-	setfieldeffect 0, RESULT
-	setfieldeffect 1, 1
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
+	setfieldeffectargument 1, 1
 	msgbox UnderwaterUseDivePromptText, 5
 	compare RESULT, 0
 	goto_if_eq UnderwaterDive_Done
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s
index 24881ab7c..ba5d9f533 100644
--- a/data/battle_anim_80CA710.s
+++ b/data/battle_anim_80CA710.s
@@ -2091,7 +2091,7 @@ gSpriteAnimTable_83D912C:: @ 83D912C
 
 	.align 2
 gSpriteTemplate_83D9130:: @ 83D9130
-	spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, sub_80D3184
+	spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, SetAnimRaindropCallback
 
 	.align 2
 gSpriteAffineAnim_83D9148:: @ 83D9148
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index de3d354ce..e0d11637d 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1416,11 +1416,11 @@ Move_FURY_CUTTER: @ 81C914A
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W013, 63
-	createtask sub_80D30AC, 2
+	createtask UpdateFuryCutterAnimDirection, 2
 	jumpvareq 7, 0, _81C91A7
 	jump _81C91B9
 _81C916A:
-	createtask update_fury_cutter_counter_copy, 2
+	createtask UpdateFuryCutterAnimCount, 2
 	jumpvareq 7, 1, _81C918E
 	jumpvareq 7, 2, _81C91CB
 	jumpvareq 7, 3, _81C91E5
@@ -5271,8 +5271,8 @@ Move_RAIN_DANCE: @ 81CE997
 	panse_19 SE_W240, 192
 	createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0
 	wait
-	createtask sub_80D30F0, 2, 0, 3, 120
-	createtask sub_80D30F0, 2, 0, 3, 120
+	createtask CreateAnimRaindrops, 2, 0, 3, 120
+	createtask CreateAnimRaindrops, 2, 0, 3, 120
 	pause 120
 	pause 30
 	wait
@@ -10497,8 +10497,8 @@ General_Rain: @ 81D67BB
 	panse_19 SE_W240, 192
 	createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0
 	wait
-	createtask sub_80D30F0, 2, 0, 3, 60
-	createtask sub_80D30F0, 2, 0, 3, 60
+	createtask CreateAnimRaindrops, 2, 0, 3, 60
+	createtask CreateAnimRaindrops, 2, 0, 3, 60
 	pause 50
 	wait
 	createtask sub_80E2A38, 10, 1921, 2, 4, 0, 0
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 495f78dfc..76b080a5b 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,4 +1,5 @@
 #include "constants/decorations.h"
+#include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/items.h"
 #include "constants/map_objects.h"
@@ -31,12 +32,12 @@ gSpecialVars::
 	.4byte gSpecialVar_0x8009
 	.4byte gSpecialVar_0x800A
 	.4byte gSpecialVar_0x800B
-	.4byte gScriptFacing
-	.4byte gScriptResult
-	.4byte gScriptItemId
-	.4byte gScriptLastTalked
-	.4byte gScriptContestRank
-	.4byte gScriptContestCategory
+	.4byte gSpecialVar_Facing
+	.4byte gSpecialVar_Result
+	.4byte gSpecialVar_ItemId
+	.4byte gSpecialVar_LastTalked
+	.4byte gSpecialVar_ContestRank
+	.4byte gSpecialVar_ContestCategory
 
 	.include "data/specials.inc"
 
@@ -400,7 +401,7 @@ gUnknown_0815F36C:: @ 815F36C
 	dofieldeffect 61
 	waitstate
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	playse 5
 	goto EventScript_15F384
 	end
@@ -408,7 +409,7 @@ gUnknown_0815F36C:: @ 815F36C
 EventScript_15F384:
 	message UnknownString_81A3A87
 	waitmessage
-	checkflag 268
+	checkflag FLAG_DECORATION_16
 	goto_if_eq EventScript_15F3A0
 	goto EventScript_15F3E2
 	end
@@ -461,7 +462,7 @@ gUnknown_0815F43A:: @ 815F43A
 	dofieldeffect 61
 	waitstate
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	playse 5
 	goto EventScript_15F452
 	end
@@ -900,7 +901,7 @@ Std_2:
 	faceplayer
 	message 0x0
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	return
 
@@ -908,14 +909,14 @@ Std_3:
 	lockall
 	message 0x0
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	return
 
 Std_4:
 	message 0x0
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	return
 
 Std_5:
@@ -952,7 +953,7 @@ gUnknown_0819F818:: @ 819F818
 	goto EventScript_19F8F2
 
 EventScript_19F83F:
-	ontrainerbattleend
+	gotopostbattlescript
 
 gUnknown_0819F840:: @ 819F840
 	lock
@@ -971,19 +972,19 @@ gUnknown_0819F840:: @ 819F840
 EventScript_19F870:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
 EventScript_19F877:
-	ontrainerbattleend
+	gotopostbattlescript
 
 gUnknown_0819F878:: @ 819F878
 	applymovement LAST_TALKED, Movement_19F8F0
 	waitmovement 0
 	special PlayTrainerEncounterMusic
-	battlebegin
-	ontrainerbattleend
+	trainerbattlebegin
+	gotopostbattlescript
 
 gUnknown_0819F887:: @ 819F887
 	call EventScript_19F8E5
@@ -994,14 +995,14 @@ gUnknown_0819F887:: @ 819F887
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
 
 EventScript_19F8AD:
-	ontrainerbattleend
+	gotopostbattlescript
 
 gUnknown_0819F8AE:: @ 819F8AE
 	specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag
@@ -1014,19 +1015,19 @@ gUnknown_0819F8AE:: @ 819F8AE
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
 
 EventScript_19F8DD:
-	ontrainerbattleend
+	gotopostbattlescript
 
 EventScript_19F8DE:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -1042,8 +1043,8 @@ Movement_19F8F0::
 EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
-	waitbutton
-	battlebegin
+	waitbuttonpress
+	trainerbattlebegin
 	specialvar RESULT, ScrSpecial_GetTrainerBattleMode
 	compare RESULT, 0
 	goto_if_eq EventScript_19F934
@@ -1061,271 +1062,271 @@ EventScript_19F934:
 	end
 
 EventScript_19F936:
-	ontrainerbattleendgoto
+	gotobeatenscript
 
 Std_6::
 	message 0x0
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	return
 
 Event_ResetBerryTrees: @ 19F940
-	plantberrytree 2, 7, 5
-	plantberrytree 1, 3, 5
-	plantberrytree 11, 7, 5
-	plantberrytree 13, 3, 5
-	plantberrytree 4, 7, 5
-	plantberrytree 76, 1, 5
-	plantberrytree 8, 1, 5
-	plantberrytree 10, 6, 5
-	plantberrytree 25, 20, 5
-	plantberrytree 26, 2, 5
-	plantberrytree 66, 2, 5
-	plantberrytree 67, 20, 5
-	plantberrytree 69, 22, 5
-	plantberrytree 70, 22, 5
-	plantberrytree 71, 22, 5
-	plantberrytree 55, 17, 5
-	plantberrytree 56, 17, 5
-	plantberrytree 5, 1, 5
-	plantberrytree 6, 6, 5
-	plantberrytree 7, 1, 5
-	plantberrytree 16, 18, 5
-	plantberrytree 17, 18, 5
-	plantberrytree 18, 18, 5
-	plantberrytree 29, 19, 5
-	plantberrytree 28, 19, 5
-	plantberrytree 27, 19, 5
-	plantberrytree 24, 4, 5
-	plantberrytree 23, 3, 5
-	plantberrytree 22, 3, 5
-	plantberrytree 21, 4, 5
-	plantberrytree 19, 16, 5
-	plantberrytree 20, 16, 5
-	plantberrytree 80, 7, 5
-	plantberrytree 81, 7, 5
-	plantberrytree 77, 8, 5
-	plantberrytree 78, 8, 5
-	plantberrytree 68, 8, 5
-	plantberrytree 31, 10, 5
-	plantberrytree 33, 10, 5
-	plantberrytree 34, 21, 5
-	plantberrytree 35, 21, 5
-	plantberrytree 36, 21, 5
-	plantberrytree 83, 24, 5
-	plantberrytree 84, 24, 5
-	plantberrytree 85, 10, 5
-	plantberrytree 86, 6, 5
-	plantberrytree 37, 5, 5
-	plantberrytree 38, 5, 5
-	plantberrytree 39, 5, 5
-	plantberrytree 40, 3, 5
-	plantberrytree 41, 3, 5
-	plantberrytree 42, 3, 5
-	plantberrytree 46, 19, 5
-	plantberrytree 45, 20, 5
-	plantberrytree 44, 18, 5
-	plantberrytree 43, 16, 5
-	plantberrytree 47, 8, 5
-	plantberrytree 48, 5, 5
-	plantberrytree 49, 4, 5
-	plantberrytree 50, 2, 5
-	plantberrytree 52, 18, 5
-	plantberrytree 53, 18, 5
-	plantberrytree 62, 6, 5
-	plantberrytree 64, 6, 5
-	plantberrytree 58, 21, 5
-	plantberrytree 59, 21, 5
-	plantberrytree 60, 25, 5
-	plantberrytree 61, 25, 5
-	plantberrytree 79, 23, 5
-	plantberrytree 14, 23, 5
-	plantberrytree 15, 21, 5
-	plantberrytree 30, 21, 5
-	plantberrytree 65, 25, 5
-	plantberrytree 72, 25, 5
-	plantberrytree 73, 23, 5
-	plantberrytree 74, 23, 5
-	plantberrytree 87, 3, 5
-	plantberrytree 88, 10, 5
-	plantberrytree 89, 4, 5
-	plantberrytree 82, 36, 5
+	setberrytree 2, 7, 5
+	setberrytree 1, 3, 5
+	setberrytree 11, 7, 5
+	setberrytree 13, 3, 5
+	setberrytree 4, 7, 5
+	setberrytree 76, 1, 5
+	setberrytree 8, 1, 5
+	setberrytree 10, 6, 5
+	setberrytree 25, 20, 5
+	setberrytree 26, 2, 5
+	setberrytree 66, 2, 5
+	setberrytree 67, 20, 5
+	setberrytree 69, 22, 5
+	setberrytree 70, 22, 5
+	setberrytree 71, 22, 5
+	setberrytree 55, 17, 5
+	setberrytree 56, 17, 5
+	setberrytree 5, 1, 5
+	setberrytree 6, 6, 5
+	setberrytree 7, 1, 5
+	setberrytree 16, 18, 5
+	setberrytree 17, 18, 5
+	setberrytree 18, 18, 5
+	setberrytree 29, 19, 5
+	setberrytree 28, 19, 5
+	setberrytree 27, 19, 5
+	setberrytree 24, 4, 5
+	setberrytree 23, 3, 5
+	setberrytree 22, 3, 5
+	setberrytree 21, 4, 5
+	setberrytree 19, 16, 5
+	setberrytree 20, 16, 5
+	setberrytree 80, 7, 5
+	setberrytree 81, 7, 5
+	setberrytree 77, 8, 5
+	setberrytree 78, 8, 5
+	setberrytree 68, 8, 5
+	setberrytree 31, 10, 5
+	setberrytree 33, 10, 5
+	setberrytree 34, 21, 5
+	setberrytree 35, 21, 5
+	setberrytree 36, 21, 5
+	setberrytree 83, 24, 5
+	setberrytree 84, 24, 5
+	setberrytree 85, 10, 5
+	setberrytree 86, 6, 5
+	setberrytree 37, 5, 5
+	setberrytree 38, 5, 5
+	setberrytree 39, 5, 5
+	setberrytree 40, 3, 5
+	setberrytree 41, 3, 5
+	setberrytree 42, 3, 5
+	setberrytree 46, 19, 5
+	setberrytree 45, 20, 5
+	setberrytree 44, 18, 5
+	setberrytree 43, 16, 5
+	setberrytree 47, 8, 5
+	setberrytree 48, 5, 5
+	setberrytree 49, 4, 5
+	setberrytree 50, 2, 5
+	setberrytree 52, 18, 5
+	setberrytree 53, 18, 5
+	setberrytree 62, 6, 5
+	setberrytree 64, 6, 5
+	setberrytree 58, 21, 5
+	setberrytree 59, 21, 5
+	setberrytree 60, 25, 5
+	setberrytree 61, 25, 5
+	setberrytree 79, 23, 5
+	setberrytree 14, 23, 5
+	setberrytree 15, 21, 5
+	setberrytree 30, 21, 5
+	setberrytree 65, 25, 5
+	setberrytree 72, 25, 5
+	setberrytree 73, 23, 5
+	setberrytree 74, 23, 5
+	setberrytree 87, 3, 5
+	setberrytree 88, 10, 5
+	setberrytree 89, 4, 5
+	setberrytree 82, 36, 5
 	return
 
 gUnknown_0819FA81:: @ 819FA81
-	setflag 86
-	setflag 769
-	setflag 770
-	setflag 771
-	setflag 721
-	setflag 889
-	setflag 726
-	setflag 867
-	setflag 731
-	setflag 732
-	setflag 814
-	setflag 868
-	setflag 739
-	setflag 881
-	setflag 738
-	setflag 740
-	setflag 741
-	setflag 743
-	setflag 744
-	setflag 906
-	setflag 737
-	setflag 747
-	setflag 748
-	setflag 749
-	setflag 756
-	setflag 774
-	setflag 895
-	setflag 776
-	setflag 777
-	setflag 778
-	setflag 779
-	setflag 780
-	setflag 781
-	setflag 782
-	setflag 783
-	setflag 734
-	setflag 849
-	setflag 789
-	setflag 790
-	setflag 791
-	setflag 792
-	setflag 797
-	setflag 798
-	setflag 799
-	setflag 901
-	setflag 902
-	setflag 903
-	setflag 904
-	setflag 800
-	setflag 801
-	setflag 803
-	setflag 802
-	setflag 806
-	setflag 808
-	setflag 809
-	setflag 984
-	setflag 811
-	setflag 812
-	setflag 866
-	setflag 815
-	setflag 816
-	setflag 869
-	setflag 823
-	setflag 828
-	setflag 829
-	setflag 831
-	setflag 859
-	setflag 841
-	setflag 843
-	setflag 844
-	setflag 847
-	setflag 845
-	setflag 846
-	setflag 860
-	setflag 861
-	setflag 835
-	setflag 840
-	setflag 848
-	setflag 851
-	setflag 855
-	setflag 856
-	setflag 973
-	setflag 870
-	setflag 872
-	setflag 877
-	setflag 879
-	setflag 891
-	setflag 880
-	setflag 878
-	setflag 807
-	setflag 983
-	setflag 886
-	setflag 884
-	setflag 885
-	setflag 961
-	setflag 888
-	setflag 941
-	setflag 752
-	setflag 757
-	setflag 892
-	setflag 896
-	setflag 897
-	setflag 898
-	setflag 909
-	setflag 910
-	setflag 911
-	setflag 915
-	setflag 912
-	setflag 920
-	setflag 921
-	setflag 922
-	setflag 923
-	setflag 925
-	setflag 929
-	setflag 930
-	setflag 934
-	setflag 939
-	setflag 940
-	setflag 928
-	setflag 834
-	setflag 944
-	setflag 945
-	setflag 947
-	setflag 948
-	setflag 858
-	setflag 950
-	setflag 968
-	setflag 1133
-	setflag 727
-	setflag 979
-	setflag 751
-	setflag 991
+	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_HIDE_WALLY_PETALBURG
+	setflag FLAG_UNKNOWN_363
+	setflag FLAG_HIDE_GRUNT_RUSTBORO
+	setflag FLAG_HIDE_DEVON_RUSTBORO
+	setflag FLAG_HIDE_RIVAL_RUSTBORO
+	setflag FLAG_HIDE_FAT_MAN_LITTLEROOT
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
+	setflag FLAG_UNKNOWN_2E1
+	setflag FLAG_UNKNOWN_2EB
+	setflag FLAG_UNKNOWN_2EC
+	setflag FLAG_UNKNOWN_2ED
+	setflag FLAG_UNKNOWN_2F4
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
+	setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	setflag FLAG_UNKNOWN_30E
+	setflag FLAG_UNKNOWN_30F
+	setflag FLAG_HIDE_NORMAN_LITTLEROOT
+	setflag FLAG_HIDE_MAY_PICHU_DOLL
+	setflag FLAG_HIDE_FANCLUB_OLD_LADY
+	setflag FLAG_HIDE_FANCLUB_BOY
+	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
+	setflag FLAG_HIDE_FANCLUB_LADY
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
+	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
+	setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	setflag FLAG_UNKNOWN_337
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	setflag FLAG_UNKNOWN_34B
+	setflag FLAG_UNKNOWN_34C
+	setflag FLAG_UNKNOWN_34F
+	setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
+	setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	setflag FLAG_HIDE_STERN_SLATEPORT
+	setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_RIVAL_ROUTE119
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
+	setflag FLAG_HIDE_LANETTE
+	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
+	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BRINEY_ROUTE116
+	setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	setflag FLAG_HIDE_MOM_LITTLEROOT
+	setflag FLAG_HIDE_MOM_UPSTAIRS
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+	setflag FLAG_UNKNOWN_393
+	setflag FLAG_HIDE_WATTSON_MAUVILLE
+	setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
+	setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
+	setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
+	setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
+	setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+	setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+	setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
+	setflag FLAG_HIDE_STEVEN_ROUTE128
+	setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
+	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
+	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
+	setflag FLAG_HIDE_STEVENS_LETTER
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	setflag FLAG_HIDE_BOY_ROUTE101
 	call Event_ResetBerryTrees
 	end
 
 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
-	clearflag 925
+	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
 	call EverGrandeCity_HallOfFame_EventScript_19FD09
-	setflag 869
-	clearflag 950
-	clearflag 727
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	clearflag FLAG_HIDE_STEVENS_LETTER
 	setvar 0x40c6, 1
-	clearflag 751
-	clearflag 860
-	clearflag 861
+	clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
 	special sub_810FAA0
-	checkflag 291
+	checkflag FLAG_RECEIVED_SS_TICKET
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62
-	checkflag 255
+	checkflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70
-	checkflag 298
+	checkflag FLAG_RECEIVED_BELDUM
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
-	checkflag 123
+	checkflag FLAG_RECEIVED_HM08
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
-	clearflag 968
+	clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E
-	clearflag 1133
+	clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62
 	setvar 0x4082, 3
 	setvar 0x408c, 3
-	clearflag 734
+	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
-	setflag 2141
+	setflag FLAG_SYS_TV_LATI
 	return
 
 S_WhiteOut:: @ 819FC74
@@ -1335,11 +1336,11 @@ S_WhiteOut:: @ 819FC74
 	end
 
 EventScript_19FC84:
-	checkflag 221
+	checkflag FLAG_RECEIVED_GO_GOGGLES
 	goto_if_eq Route101_EventScript_1A14DC
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if 0, Route101_EventScript_1A14DC
-	clearflag 929
+	clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1
 	setvar 0x4053, 2
 	return
 
@@ -1353,42 +1354,42 @@ gUnknown_0819FC9F:: @ 819FC9F
 	end
 
 EventScript_19FCC1:
-	setflag 740
-	setflag 743
-	setflag 741
-	setflag 744
-	clearflag 742
-	clearflag 739
-	clearflag 881
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	end
 
 EventScript_19FCD7:
-	setflag 741
-	setflag 744
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
-	clearflag 740
-	clearflag 743
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	end
 
 EventScript_19FCF0:
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
-	setflag 740
-	setflag 743
-	clearflag 741
-	clearflag 744
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	end
 
 EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09
-	clearflag 1245
-	clearflag 1246
-	clearflag 1247
-	clearflag 1248
+	clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
+	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
+	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
+	clearflag FLAG_DEFEATED_ELITE_4_DRAKE
 	setvar 0x409c, 0
 	return
 
@@ -1401,15 +1402,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-	checkflag 188
+	checkflag FLAG_RECEIVED_POKENAV
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag 742
+	checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49
-	checkflag 740
+	checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
-	checkflag 741
+	checkflag FLAG_HIDE_MR_BRINEY_ROUTE109
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55
 	return
 
@@ -1459,7 +1460,7 @@ do_heal_party:: @ 819FD7C
 	applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
 	waitmovement 0
 	special ScrSpecial_HealPlayerParty
-	checkflag 273
+	checkflag FLAG_POKERUS_EXPLAINED
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
 	goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0
 	end
@@ -1489,7 +1490,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
 OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
 	message gText_NurseJoy_Pokerus
 	waitmessage
-	setflag 273
+	setflag FLAG_POKERUS_EXPLAINED
 	return
 
 OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
@@ -1498,13 +1499,13 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
 	step_end
 
 Std_ObtainItem: @ 819FDF7
-	additem 0x8000, 0x8001
+	giveitem 0x8000, 0x8001
 	copyvar 0x8007, RESULT
 	call Std_ObtainItem_
 	return
 
 Std_ObtainItem_: @ 819FE07
-	getitemname 1, 0x8000
+	bufferitemname 1, 0x8000
 	checkitemtype 0x8000
 	call GetItem_HandlePocket
 	compare 0x8007, 0x1
@@ -1523,31 +1524,31 @@ GetItem_HandlePocket:
 	end
 
 GetItem_HandlePocket_Items:
-	getstdstring 2, 0xE
+	bufferstdstring 2, 0xE
 	compare 0x8007, 1
 	call_if 1, PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_KeyItems:
-	getstdstring 2, 0xF
+	bufferstdstring 2, 0xF
 	compare 0x8007, 1
 	call_if 1, PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_PokeBalls:
-	getstdstring 2, 0x10
+	bufferstdstring 2, 0x10
 	compare 0x8007, 1
 	call_if 1, PlayGetItemFanfare
 	return
 
 GetItem_HandlePocket_TMsHMs:
-	getstdstring 2, 0x11
+	bufferstdstring 2, 0x11
 	compare 0x8007, 1
 	call_if 1, PlayGetTMHMFanfare
 	return
 
 GetItem_HandlePocket_Berries:
-	getstdstring 2, 0x12
+	bufferstdstring 2, 0x12
 	compare 0x8007, 1
 	call_if 1, PlayGetItemFanfare
 	return
@@ -1573,13 +1574,13 @@ PlayGetTMHMFanfare:
 	return
 
 Std_ObtainDecoration: @ 819FEDA
-	adddecor 0x8000
+	givedecoration 0x8000
 	copyvar 0x8007, RESULT
 	call Std_ObtainDecoration_
 	return
 
 Std_ObtainDecoration_: @ 819FEE8
-	getdecorname 1, 0x8000
+	bufferdecorationname 1, 0x8000
 	compare 0x8007, 1
 	call_if 1, Std_ObtainDecoration_Success
 	compare 0x8007, 0
@@ -1603,9 +1604,9 @@ Std_FindItem: @ 819FF21
 	lock
 	faceplayer
 	waitse
-	additem 0x8000, 0x8001
+	giveitem 0x8000, 0x8001
 	copyvar 0x8007, RESULT
-	getitemname 1, 0x8000
+	bufferitemname 1, 0x8000
 	checkitemtype 0x8000
 	call GetItem_HandlePocket
 	compare 0x8007, 1
@@ -1632,9 +1633,9 @@ Std_FindItem_Fail: @ 819FF65
 HiddenItemScript:: @ 819FF7B
 	lockall
 	waitse
-	additem 0x8005, 1
+	giveitem 0x8005, 1
 	copyvar 0x8007, RESULT
-	getitemname 0x1, 0x8005
+	bufferitemname 0x1, 0x8005
 	checkitemtype 0x8005
 	call GetItem_HandlePocket
 	compare 0x8007, 1
@@ -1676,7 +1677,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA
 UnusedMixRecordsScript_Done: @ 81A0000
 	message UnusedMixRecordsSeeYouAgainText
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -1716,9 +1717,9 @@ EventScript_1A0070:
 
 EventScript_1A0085:
 	playse 2
-	checkflag 2123
+	checkflag FLAG_SYS_PC_LANETTE
 	call_if 0, EventScript_1A00AC
-	checkflag 2123
+	checkflag FLAG_SYS_PC_LANETTE
 	call_if 1, EventScript_1A00B5
 	msgbox UnknownString_81A0A35, 4
 	special ShowPokemonStorageSystem
@@ -1742,7 +1743,7 @@ EventScript_1A00BE:
 	end
 
 EventScript_1A00CB:
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, EventScript_1A00BE
 	playse 2
 	special AccessHallOfFamePC
@@ -1800,8 +1801,8 @@ DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB
 LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB
 MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB
 RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB
-	clearflag 781
-	setflag 296
+	clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
 DewfordTown_EventScript_1A0102:: @ 81A0102
@@ -1819,11 +1820,11 @@ Route109_EventScript_1A010C:: @ 81A010C
 	return
 
 UseSurfScript:: @ 81A0117
-	checkpokemove MOVE_SURF
+	checkpartymove MOVE_SURF
 	compare RESULT, 6
 	goto_if_eq UseSurfScript_NoMon
-	getpartypokename 0, RESULT
-	setfieldeffect 0, RESULT
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
 	lockall
 	msgbox UseSurfPromptText, 5
 	compare RESULT, 0
@@ -2166,24 +2167,24 @@ Route103_EventScript_1A02F4:: @ 81A02F4
 	return
 
 Route101_EventScript_1A0358:: @ 81A0358
-	clearflag 721
-	clearflag 896
-	setflag 897
-	setflag 898
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	clearflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
 	return
 
 Route101_EventScript_1A0365:: @ 81A0365
-	clearflag 897
-	setflag 721
-	setflag 896
-	setflag 898
+	clearflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE103
 	return
 
 Route101_EventScript_1A0372:: @ 81A0372
-	clearflag 898
-	setflag 897
-	setflag 721
-	setflag 896
+	clearflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_UNKNOWN_BIRCH_380
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1A037F:: @ 81A037F
@@ -2207,7 +2208,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5
 	copyvar 0x8004, 0x8009
 	special ShowPokedexRatingMessage
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	return
 
 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0
@@ -2217,8 +2218,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0
 	copyvar 0x8008, 0x8005
 	copyvar 0x8009, 0x8006
 	copyvar 0x800a, RESULT
-	getnumberstring 0, 0x8008
-	getnumberstring 1, 0x8009
+	buffernumberstring 0, 0x8008
+	buffernumberstring 1, 0x8009
 	msgbox Route101_Text_1C44DC, 4
 	call Route101_EventScript_1A03A5
 	compare 0x800a, 0
@@ -2227,8 +2228,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0
 	specialvar RESULT, ScriptGetPokedexInfo
 	copyvar 0x8008, 0x8005
 	copyvar 0x8009, 0x8006
-	getnumberstring 0, 0x8008
-	getnumberstring 1, 0x8009
+	buffernumberstring 0, 0x8008
+	buffernumberstring 1, 0x8009
 	msgbox Route101_Text_1C4B05, 4
 	return
 
@@ -2251,31 +2252,31 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
 	step_end
 
 PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
-	setflag 740
-	setflag 743
-	setflag 741
-	setflag 744
-	setflag 738
-	setflag 742
-	setflag 739
-	setflag 881
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	setvar 0x4096, 0
 	return
 
 RusturfTunnel_EventScript_1A0442:: @ 81A0442
 	removeobject 1
 	removeobject 10
-	clearflag 808
-	clearflag 984
+	clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
 	setvar 0x409a, 6
-	setflag 199
+	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
 
 EventScript_1A0457: @ unreferenced?
 	delay 30
 	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841
 	waitmovement 0
-	showobject 255, 0, 0
+	showobjectat 255, MAP_PETALBURG_CITY
 	delay 30
 	applymovement 255, Movement_1A047A
 	waitmovement 0
@@ -2293,15 +2294,15 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
 	compare FACING, 3
 	call_if 1, BattleTower_Outside_EventScript_160B3A
 	delay 30
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	call BattleTower_Outside_EventScript_1A040E
 	return
 
 CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0
 	lockall
 	waitse
-	playpokecry SPECIES_GROUDON_OR_KYOGRE, 2
-	waitpokecry
+	playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
+	waitmoncry
 	setvar 0x4005, 1
 	releaseall
 	end
@@ -2355,13 +2356,13 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
 	waitse
-	playpokecry SPECIES_ELECTRODE, 2
+	playmoncry SPECIES_ELECTRODE, 2
 	delay 40
-	waitpokecry
-	setflag 977
-	setflag 2145
+	waitmoncry
+	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2371,13 +2372,13 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
 	waitse
-	playpokecry SPECIES_ELECTRODE, 2
+	playmoncry SPECIES_ELECTRODE, 2
 	delay 40
-	waitpokecry
-	setflag 978
-	setflag 2145
+	waitmoncry
+	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2454,9 +2455,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3
 	applymovement LAST_TALKED, Route119_Movement_1A0662
 	waitmovement 0
 	waitse
-	playpokecry SPECIES_KECLEON, 2
+	playmoncry SPECIES_KECLEON, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
 	compare 0x8004, 1
 	call_if 1, Route119_EventScript_1A0646
@@ -2472,38 +2473,38 @@ Route119_EventScript_1A05C3:: @ 81A05C3
 	call_if 1, Route119_EventScript_1A065A
 	compare 0x8004, 7
 	call_if 1, Route119_EventScript_1A065E
-	setflag 2145
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
 Route119_EventScript_1A0646:: @ 81A0646
-	setflag 982
+	setflag FLAG_HIDE_KECLEON_ROUTE120_3
 	return
 
 Route119_EventScript_1A064A:: @ 81A064A
-	setflag 985
+	setflag FLAG_HIDE_KECLEON_ROUTE120_4
 	return
 
 Route119_EventScript_1A064E:: @ 81A064E
-	setflag 986
+	setflag FLAG_HIDE_KECLEON_ROUTE120_5
 	return
 
 Route119_EventScript_1A0652:: @ 81A0652
-	setflag 987
+	setflag FLAG_HIDE_KECLEON_ROUTE120_6
 	return
 
 Route119_EventScript_1A0656:: @ 81A0656
-	setflag 988
+	setflag FLAG_HIDE_KECLEON_ROUTE120_7
 	return
 
 Route119_EventScript_1A065A:: @ 81A065A
-	setflag 989
+	setflag FLAG_HIDE_KECLEON_ROUTE119_1
 	return
 
 Route119_EventScript_1A065E:: @ 81A065E
-	setflag 990
+	setflag FLAG_HIDE_KECLEON_ROUTE119_2
 	return
 
 FortreeCity_Movement_1A0662:: @ 81A0662
@@ -2545,12 +2546,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F
 GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
 MtPyre_Summit_EventScript_1A067F:: @ 81A067F
 SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
-	getitemname 0, 0x8004
+	bufferitemname 0, 0x8004
 	playfanfare 372
 	message FallarborTown_House1_Text_1A1498
 	waitmessage
 	waitfanfare
-	removeitem 0x8004, 1
+	takeitem 0x8004, 1
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693
@@ -2560,18 +2561,18 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693
 	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853
 	waitmovement 0
 	playse 8
-	setmaptile 6, 1, 836, 0
-	setmaptile 6, 2, 837, 0
-	setmaptile 0, 2, 734, 1
-	setmaptile 1, 2, 733, 1
-	setmaptile 2, 2, 734, 1
-	setmaptile 3, 2, 733, 1
-	setmaptile 4, 2, 734, 1
-	setmaptile 8, 2, 733, 1
-	setmaptile 9, 2, 734, 1
-	setmaptile 10, 2, 733, 1
-	setmaptile 11, 2, 734, 1
-	setmaptile 12, 2, 733, 1
+	setmetatile 6, 1, 836, 0
+	setmetatile 6, 2, 837, 0
+	setmetatile 0, 2, 734, 1
+	setmetatile 1, 2, 733, 1
+	setmetatile 2, 2, 734, 1
+	setmetatile 3, 2, 733, 1
+	setmetatile 4, 2, 734, 1
+	setmetatile 8, 2, 733, 1
+	setmetatile 9, 2, 734, 1
+	setmetatile 10, 2, 733, 1
+	setmetatile 11, 2, 734, 1
+	setmetatile 12, 2, 733, 1
 	special DrawWholeMapView
 	return
 
@@ -2582,12 +2583,12 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710
 	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847
 	waitmovement 0
 	playse 52
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
 	special DrawWholeMapView
 	return
 
@@ -2595,36 +2596,36 @@ EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757
 EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757
-	setmaptile 6, 1, 836, 0
-	setmaptile 6, 2, 837, 0
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
-	setmaptile 0, 2, 734, 1
-	setmaptile 1, 2, 733, 1
-	setmaptile 2, 2, 734, 1
-	setmaptile 3, 2, 733, 1
-	setmaptile 4, 2, 734, 1
-	setmaptile 8, 2, 733, 1
-	setmaptile 9, 2, 734, 1
-	setmaptile 10, 2, 733, 1
-	setmaptile 11, 2, 734, 1
-	setmaptile 12, 2, 733, 1
+	setmetatile 6, 1, 836, 0
+	setmetatile 6, 2, 837, 0
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
+	setmetatile 0, 2, 734, 1
+	setmetatile 1, 2, 733, 1
+	setmetatile 2, 2, 734, 1
+	setmetatile 3, 2, 733, 1
+	setmetatile 4, 2, 734, 1
+	setmetatile 8, 2, 733, 1
+	setmetatile 9, 2, 734, 1
+	setmetatile 10, 2, 733, 1
+	setmetatile 11, 2, 734, 1
+	setmetatile 12, 2, 733, 1
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA
 EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA
-	setmaptile 5, 12, 518, 1
-	setmaptile 6, 12, 518, 1
-	setmaptile 7, 12, 518, 1
-	setmaptile 5, 13, 526, 1
-	setmaptile 6, 13, 526, 1
-	setmaptile 7, 13, 526, 1
+	setmetatile 5, 12, 518, 1
+	setmetatile 6, 12, 518, 1
+	setmetatile 7, 12, 518, 1
+	setmetatile 5, 13, 526, 1
+	setmetatile 6, 13, 526, 1
+	setmetatile 7, 13, 526, 1
 	return
 
 SlateportCity_Movement_1A0831:: @ 81A0831
@@ -3270,7 +3271,7 @@ gUnknown_081A14B8:: @ 81A14B8
 EventScript_1A14CA::
 	message UnknownString_81A1141
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special sub_8081924
 	waitstate
 	fadescreen 1
@@ -3608,9 +3609,9 @@ gUnknown_081A2C51:: @ 81A2C51
 	special sub_80BB63C
 	compare RESULT, 1
 	goto_if_eq EventScript_1A2E45
-	checkpokemove MOVE_SECRET_POWER
-	setfieldeffect 0, RESULT
-	getmovename 1, MOVE_SECRET_POWER
+	checkpartymove MOVE_SECRET_POWER
+	setfieldeffectargument 0, RESULT
+	buffermovename 1, MOVE_SECRET_POWER
 	compare 0x8007, 1
 	goto_if_eq EventScript_1A2CB0
 	compare 0x8007, 2
@@ -3629,7 +3630,7 @@ EventScript_1A2CB0:
 	lockall
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2CF1
-	getpartypokename 0, RESULT
+	bufferpartymonnick 0, RESULT
 	msgbox UnknownString_8198F34, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
@@ -3660,7 +3661,7 @@ EventScript_1A2D08:
 	lockall
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2D49
-	getpartypokename 0, RESULT
+	bufferpartymonnick 0, RESULT
 	msgbox UnknownString_81A197B, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
@@ -3691,7 +3692,7 @@ EventScript_1A2D60:
 	lockall
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2DA1
-	getpartypokename 0, RESULT
+	bufferpartymonnick 0, RESULT
 	msgbox UnknownString_81A1A4B, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
@@ -3722,7 +3723,7 @@ EventScript_1A2DB8:
 	closemessage
 	playse 9
 	setvar 0x4097, 0
-	setflag 173
+	setflag FLAG_DECORATION_1
 	special sub_80BB8CC
 	special sub_80BBAF0
 	setvar 0x8004, 0
@@ -3746,7 +3747,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
 
 SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
 	closemessage
-	setflag 96
+	setflag FLAG_RECEIVED_SECRET_POWER
 	special sub_80BBC78
 	waitstate
 	end
@@ -3763,24 +3764,24 @@ gUnknown_081A2E14:: @ 81A2E14
 	special sub_80BC114
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2E38
-	clearflag 173
+	clearflag FLAG_DECORATION_1
 	special sub_80BBAF0
 	setvar 0x4089, 0
 	waitstate
 	end
 
 EventScript_1A2E38:
-	setflag 173
+	setflag FLAG_DECORATION_1
 	special sub_80BBAF0
 	setvar 0x4089, 0
 	waitstate
 	end
 
 EventScript_1A2E45:
-	checkpokemove MOVE_SECRET_POWER
+	checkpartymove MOVE_SECRET_POWER
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2EF7
-	setfieldeffect 0, RESULT
+	setfieldeffectargument 0, RESULT
 	setorcopyvar 0x8004, RESULT
 	lockall
 	special GetSecretBaseNearbyMapName
@@ -3797,8 +3798,8 @@ EventScript_1A2E45:
 	msgbox UnknownString_81A3CC9, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
-	getpartypokename 0, 0x8004
-	getmovename 1, MOVE_SECRET_POWER
+	bufferpartymonnick 0, 0x8004
+	buffermovename 1, MOVE_SECRET_POWER
 	msgbox UsedCutRockSmashText, 4
 	closemessage
 	closemessage
@@ -3840,20 +3841,20 @@ EventScript_1A2F3A::
 LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
 LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
 SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D
-	setflag 174
-	setflag 175
-	setflag 176
-	setflag 177
-	setflag 178
-	setflag 179
-	setflag 180
-	setflag 181
-	setflag 182
-	setflag 183
-	setflag 184
-	setflag 185
-	setflag 186
-	setflag 187
+	setflag FLAG_DECORATION_2
+	setflag FLAG_DECORATION_3
+	setflag FLAG_DECORATION_4
+	setflag FLAG_DECORATION_5
+	setflag FLAG_DECORATION_6
+	setflag FLAG_DECORATION_7
+	setflag FLAG_DECORATION_8
+	setflag FLAG_DECORATION_9
+	setflag FLAG_DECORATION_10
+	setflag FLAG_DECORATION_11
+	setflag FLAG_DECORATION_12
+	setflag FLAG_DECORATION_13
+	setflag FLAG_DECORATION_14
+	setflag FLAG_DECORATION_15
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68
@@ -3942,7 +3943,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
 	end
 
 SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3086
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
@@ -3977,7 +3978,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
 	end
 
 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3102
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
@@ -4012,7 +4013,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
 	end
 
 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A317E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
@@ -4047,7 +4048,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
 	end
 
 SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A31FA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
@@ -4082,7 +4083,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
 	end
 
 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3276
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
@@ -4117,7 +4118,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
 	end
 
 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A32F2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
@@ -4152,7 +4153,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
 	end
 
 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A336E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
@@ -4187,7 +4188,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
 	end
 
 SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A33EA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
@@ -4222,7 +4223,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
 	end
 
 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3466
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
@@ -4257,7 +4258,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
 	end
 
 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A34E2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
@@ -4438,9 +4439,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0
 	compare RESULT, 1
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
 	copyvar 0x8009, 0x8006
-	checkflag 105
+	checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
-	setflag 105
+	setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
 	msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5
 	compare RESULT, 1
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
@@ -4567,7 +4568,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 	lock
 	faceplayer
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E
 	setvar 0x8005, 6
 	special sub_80BF2C4
@@ -4613,7 +4614,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137
 	compare RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
 	msgbox FallarborTown_ContestLobby_Text_1A7153, 4
-	setflag 2
+	setflag FLAG_TEMP_2
 	setvar 0x8005, 6
 	goto FallarborTown_ContestLobby_EventScript_1ADE46
 	end
@@ -4643,19 +4644,19 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE1EE:: @ 81AE1EE
-	clearflag 800
+	clearflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1F2:: @ 81AE1F2
-	clearflag 801
+	clearflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1F6:: @ 81AE1F6
-	clearflag 803
+	clearflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1FA:: @ 81AE1FA
-	clearflag 802
+	clearflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
 	return
 
 FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE
@@ -4664,7 +4665,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE
 BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
 	lock
 	faceplayer
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq BattleTower_Lobby_EventScript_1AE2E3
 	setvar 0x8005, 7
 	special sub_80BF2C4
@@ -4716,7 +4717,7 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3
 	compare RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1AE2D9
 	msgbox BattleTower_Lobby_Text_1A7A6E, 4
-	setflag 2
+	setflag FLAG_TEMP_2
 	copyvar 0x8004, 0x8008
 	setvar 0x8005, 7
 	goto BattleTower_Lobby_EventScript_1ADE46
@@ -4739,11 +4740,11 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED
 	special sub_80BF2C4
 	compare RESULT, 1
 	goto_if_eq BattleTower_Lobby_EventScript_1AE30F
-	clearflag 918
+	clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	return
 
 BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
-	setflag 918
+	setflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	return
 
 	.include "data/scripts/gabby_and_ty.inc"
@@ -4772,8 +4773,8 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
 	.include "data/text/magma_summit.inc"
 
 gUnknown_081B694A:: @ 81B694A
-	animdarklevel 1
-	setdarklevel 1
+	animateflash 1
+	setflashradius 1
 	end
 
 	.include "data/scripts/players_house.inc"
@@ -4927,7 +4928,7 @@ gUnknown_081C6C02:: @ 81C6C02
 @ 81C6C1D
 	lockall
 	braillemessage Underwater_SealedChamber_Braille_1C533D
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index c36f95460..0a0eeaa73 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -1,13 +1,13 @@
 S_CuttableTree:: @ 81B0DCC
 	lockall
-	checkflag 2055
+	checkflag FLAG_BADGE01_GET
 	goto_if 0, CannotUseCut
-	checkpokemove MOVE_CUT
+	checkpartymove MOVE_CUT
 	compare RESULT, 6
 	goto_if_eq CannotUseCut
-	setfieldeffect 0, RESULT
-	getpartypokename 0, RESULT
-	getmovename 1, MOVE_CUT
+	setfieldeffectargument 0, RESULT
+	bufferpartymonnick 0, RESULT
+	buffermovename 1, MOVE_CUT
 	msgbox UseCutPromptText, 5
 	compare RESULT, 0
 	goto_if_eq Cut_ChoseNo
@@ -58,14 +58,14 @@ CannotUseCutText: @ 81B0E8E
 
 S_BreakableRock:: @ 81B0EB7
 	lockall
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if 0, CannotUseRockSmash
-	checkpokemove MOVE_ROCK_SMASH
+	checkpartymove MOVE_ROCK_SMASH
 	compare RESULT, 6
 	goto_if_eq CannotUseRockSmash
-	setfieldeffect 0, RESULT
-	getpartypokename 0, RESULT
-	getmovename 1, MOVE_ROCK_SMASH
+	setfieldeffectargument 0, RESULT
+	bufferpartymonnick 0, RESULT
+	buffermovename 1, MOVE_ROCK_SMASH
 	msgbox UseRockSmashPromptText, 5
 	compare RESULT, 0
 	goto_if_eq RockSmash_ChoseNo
@@ -125,14 +125,14 @@ CannotUseRockSmashText: @ 81B0F90
 
 S_PushableBoulder:: @ 81B0FCB
 	lockall
-	checkflag 2058
+	checkflag FLAG_BADGE04_GET
 	goto_if 0, CannotUseStrength
-	checkflag 2089
+	checkflag FLAG_SYS_USE_STRENGTH
 	goto_if_eq AlreadyUsedStrength
-	checkpokemove 70
+	checkpartymove 70
 	compare RESULT, 6
 	goto_if_eq CannotUseStrength
-	setfieldeffect 0, RESULT
+	setfieldeffectargument 0, RESULT
 	msgbox UseStrengthPromptText, 5
 	compare RESULT, 0
 	goto_if_eq Strength_ChoseNo
@@ -150,7 +150,7 @@ S_UseStrength:: @ 81B100E
 	end
 
 UsedStrength: @ 81B1019
-	setflag 2089
+	setflag FLAG_SYS_USE_STRENGTH
 	msgbox UsedStrengthText, 3
 	releaseall
 	end
@@ -190,11 +190,11 @@ AlreadyUsedStrengthText: @ 81B1127
 
 S_UseWaterfall:: @ 81B115A
 	lockall
-	checkpokemove MOVE_WATERFALL
+	checkpartymove MOVE_WATERFALL
 	compare RESULT, 6
 	goto_if_eq Waterfall_NoMonKnows
-	getpartypokename 0, RESULT
-	setfieldeffect 0, RESULT
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
 	msgbox UseWaterfallPromptText, 5
 	compare RESULT, 0
 	goto_if_eq Waterfall_Done
@@ -223,12 +223,12 @@ UsedWaterfallText: @ 81B120D
 
 UseDiveScript:: @ 81B1220
 	lockall
-	checkpokemove MOVE_DIVE
+	checkpartymove MOVE_DIVE
 	compare RESULT, 6
 	goto_if_eq CannotUseDive
-	getpartypokename 0, RESULT
-	setfieldeffect 0, RESULT
-	setfieldeffect 1, 1
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
+	setfieldeffectargument 1, 1
 	msgbox UseDivePromptText, 5
 	compare RESULT, 0
 	goto_if_eq Dive_Done
@@ -246,12 +246,12 @@ Dive_Done: @ 81B1267
 
 S_UseDiveUnderwater:: @ 81B1269
 	lockall
-	checkpokemove MOVE_DIVE
+	checkpartymove MOVE_DIVE
 	compare RESULT, 6
 	goto_if_eq UnderwaterCannotUseDive
-	getpartypokename 0, RESULT
-	setfieldeffect 0, RESULT
-	setfieldeffect 1, 1
+	bufferpartymonnick 0, RESULT
+	setfieldeffectargument 0, RESULT
+	setfieldeffectargument 1, 1
 	msgbox UnderwaterUseDivePromptText, 5
 	compare RESULT, 0
 	goto_if_eq UnderwaterDive_Done
diff --git a/data/item_ball_scripts.inc b/data/item_ball_scripts.inc
index ad4386990..aae704ab2 100644
--- a/data/item_ball_scripts.inc
+++ b/data/item_ball_scripts.inc
@@ -1,539 +1,539 @@
 Route102_EventScript_1B1439:: @ 81B1439
-	giveitem ITEM_POTION, 1, 1
+	giveitem_std ITEM_POTION, 1, 1
 	end
 
 Route103_EventScript_1B1446:: @ 81B1446
-	giveitem ITEM_GUARD_SPEC, 1, 1
+	giveitem_std ITEM_GUARD_SPEC, 1, 1
 	end
 
 Route104_EventScript_1B1453:: @ 81B1453
-	giveitem ITEM_PP_UP, 1, 1
+	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
 Route104_EventScript_1B1460:: @ 81B1460
-	giveitem ITEM_POKE_BALL, 1, 1
+	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
 Route104_EventScript_1B146D:: @ 81B146D
-	giveitem ITEM_X_ACCURACY, 1, 1
+	giveitem_std ITEM_X_ACCURACY, 1, 1
 	end
 
 Route104_EventScript_1B147A:: @ 81B147A
-	giveitem ITEM_POTION, 1, 1
+	giveitem_std ITEM_POTION, 1, 1
 	end
 
 Route105_EventScript_1B1487:: @ 81B1487
-	giveitem ITEM_IRON, 1, 1
+	giveitem_std ITEM_IRON, 1, 1
 	end
 
 Route106_EventScript_1B1494:: @ 81B1494
-	giveitem ITEM_PROTEIN, 1, 1
+	giveitem_std ITEM_PROTEIN, 1, 1
 	end
 
 Route109_EventScript_1B14A1:: @ 81B14A1
-	giveitem ITEM_PP_UP, 1, 1
+	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
 Route110_EventScript_1B14AE:: @ 81B14AE
-	giveitem ITEM_RARE_CANDY, 1, 1
+	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
 Route110_EventScript_1B14BB:: @ 81B14BB
-	giveitem ITEM_DIRE_HIT, 1, 1
+	giveitem_std ITEM_DIRE_HIT, 1, 1
 	end
 
 Route111_EventScript_1B14C8:: @ 81B14C8
-	giveitem ITEM_TM37, 1, 1
+	giveitem_std ITEM_TM37, 1, 1
 	end
 
 Route111_EventScript_1B14D5:: @ 81B14D5
-	giveitem ITEM_STARDUST, 1, 1
+	giveitem_std ITEM_STARDUST, 1, 1
 	end
 
 Route111_EventScript_1B14E2:: @ 81B14E2
-	giveitem ITEM_HP_UP, 1, 1
+	giveitem_std ITEM_HP_UP, 1, 1
 	end
 
 Route112_EventScript_1B14EF:: @ 81B14EF
-	giveitem ITEM_NUGGET, 1, 1
+	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
 Route113_EventScript_1B14FC:: @ 81B14FC
-	giveitem ITEM_MAX_ETHER, 1, 1
+	giveitem_std ITEM_MAX_ETHER, 1, 1
 	end
 
 Route113_EventScript_1B1509:: @ 81B1509
-	giveitem ITEM_SUPER_REPEL, 1, 1
+	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
 Route114_EventScript_1B1516:: @ 81B1516
-	giveitem ITEM_RARE_CANDY, 1, 1
+	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
 Route114_EventScript_1B1523:: @ 81B1523
-	giveitem ITEM_PROTEIN, 1, 1
+	giveitem_std ITEM_PROTEIN, 1, 1
 	end
 
 Route115_EventScript_1B1530:: @ 81B1530
-	giveitem ITEM_SUPER_POTION, 1, 1
+	giveitem_std ITEM_SUPER_POTION, 1, 1
 	end
 
 Route115_EventScript_1B153D:: @ 81B153D
-	giveitem ITEM_TM01, 1, 1
+	giveitem_std ITEM_TM01, 1, 1
 	end
 
 Route115_EventScript_1B154A:: @ 81B154A
-	giveitem ITEM_IRON, 1, 1
+	giveitem_std ITEM_IRON, 1, 1
 	end
 
 Route115_EventScript_1B1557:: @ 81B1557
-	giveitem ITEM_GREAT_BALL, 1, 1
+	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
 Route116_EventScript_1B1564:: @ 81B1564
-	giveitem ITEM_X_SPECIAL, 1, 1
+	giveitem_std ITEM_X_SPECIAL, 1, 1
 	end
 
 Route116_EventScript_1B1571:: @ 81B1571
-	giveitem ITEM_ETHER, 1, 1
+	giveitem_std ITEM_ETHER, 1, 1
 	end
 
 Route116_EventScript_1B157E:: @ 81B157E
-	giveitem ITEM_REPEL, 1, 1
+	giveitem_std ITEM_REPEL, 1, 1
 	end
 
 Route116_EventScript_1B158B:: @ 81B158B
-	giveitem ITEM_HP_UP, 1, 1
+	giveitem_std ITEM_HP_UP, 1, 1
 	end
 
 Route117_EventScript_1B1598:: @ 81B1598
-	giveitem ITEM_GREAT_BALL, 1, 1
+	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
 Route117_EventScript_1B15A5:: @ 81B15A5
-	giveitem ITEM_REVIVE, 1, 1
+	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
 Route118_EventScript_1B15B2:: @ 81B15B2
-	giveitem ITEM_HYPER_POTION, 1, 1
+	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
 Route119_EventScript_1B15BF:: @ 81B15BF
-	giveitem ITEM_SUPER_REPEL, 1, 1
+	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
 Route119_EventScript_1B15CC:: @ 81B15CC
-	giveitem ITEM_ZINC, 1, 1
+	giveitem_std ITEM_ZINC, 1, 1
 	end
 
 Route119_EventScript_1B15D9:: @ 81B15D9
-	giveitem ITEM_ELIXIR, 1, 1
+	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
 Route119_EventScript_1B15E6:: @ 81B15E6
-	giveitem ITEM_LEAF_STONE, 1, 1
+	giveitem_std ITEM_LEAF_STONE, 1, 1
 	end
 
 Route119_EventScript_1B15F3:: @ 81B15F3
-	giveitem ITEM_RARE_CANDY, 1, 1
+	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
 Route119_EventScript_1B1600:: @ 81B1600
-	giveitem ITEM_HYPER_POTION, 1, 1
+	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
 Route119_EventScript_1B160D:: @ 81B160D
-	giveitem ITEM_HYPER_POTION, 1, 1
+	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
 Route120_EventScript_1B161A:: @ 81B161A
-	giveitem ITEM_NUGGET, 1, 1
+	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
 Route120_EventScript_1B1627:: @ 81B1627
-	giveitem ITEM_FULL_HEAL, 1, 1
+	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
 Route120_EventScript_1B1634:: @ 81B1634
-	giveitem ITEM_HYPER_POTION, 1, 1
+	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
 Route120_EventScript_1B1641:: @ 81B1641
-	giveitem ITEM_NEST_BALL, 1, 1
+	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
 Route121_EventScript_1B164E:: @ 81B164E
-	giveitem ITEM_CARBOS, 1, 1
+	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
 Route123_EventScript_1B165B:: @ 81B165B
-	giveitem ITEM_CALCIUM, 1, 1
+	giveitem_std ITEM_CALCIUM, 1, 1
 	end
 
 Route123_EventScript_1B1668:: @ 81B1668
-	giveitem ITEM_RARE_CANDY, 1, 1
+	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
 Route123_EventScript_1B1675:: @ 81B1675
-	giveitem ITEM_ULTRA_BALL, 1, 1
+	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
 Route123_EventScript_1B1682:: @ 81B1682
-	giveitem ITEM_ELIXIR, 1, 1
+	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
 Route124_EventScript_1B168F:: @ 81B168F
-	giveitem ITEM_RED_SHARD, 1, 1
+	giveitem_std ITEM_RED_SHARD, 1, 1
 	end
 
 Route124_EventScript_1B169C:: @ 81B169C
-	giveitem ITEM_BLUE_SHARD, 1, 1
+	giveitem_std ITEM_BLUE_SHARD, 1, 1
 	end
 
 Route124_EventScript_1B16A9:: @ 81B16A9
-	giveitem ITEM_YELLOW_SHARD, 1, 1
+	giveitem_std ITEM_YELLOW_SHARD, 1, 1
 	end
 
 Route126_EventScript_1B16B6:: @ 81B16B6
-	giveitem ITEM_GREEN_SHARD, 1, 1
+	giveitem_std ITEM_GREEN_SHARD, 1, 1
 	end
 
 Route127_EventScript_1B16C3:: @ 81B16C3
-	giveitem ITEM_ZINC, 1, 1
+	giveitem_std ITEM_ZINC, 1, 1
 	end
 
 Route127_EventScript_1B16D0:: @ 81B16D0
-	giveitem ITEM_CARBOS, 1, 1
+	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
 Route132_EventScript_1B16DD:: @ 81B16DD
-	giveitem ITEM_RARE_CANDY, 1, 1
+	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
 Route133_EventScript_1B16EA:: @ 81B16EA
-	giveitem ITEM_BIG_PEARL, 1, 1
+	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
 Route133_EventScript_1B16F7:: @ 81B16F7
-	giveitem ITEM_STAR_PIECE, 1, 1
+	giveitem_std ITEM_STAR_PIECE, 1, 1
 	end
 
 PetalburgCity_EventScript_1B1704:: @ 81B1704
-	giveitem ITEM_MAX_REVIVE, 1, 1
+	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
 PetalburgCity_EventScript_1B1711:: @ 81B1711
-	giveitem ITEM_ETHER, 1, 1
+	giveitem_std ITEM_ETHER, 1, 1
 	end
 
 MauvilleCity_EventScript_1B171E:: @ 81B171E
-	giveitem ITEM_X_SPEED, 1, 1
+	giveitem_std ITEM_X_SPEED, 1, 1
 	end
 
 RustboroCity_EventScript_1B172B:: @ 81B172B
-	giveitem ITEM_X_DEFEND, 1, 1
+	giveitem_std ITEM_X_DEFEND, 1, 1
 	end
 
 LilycoveCity_EventScript_1B1738:: @ 81B1738
-	giveitem ITEM_MAX_REPEL, 1, 1
+	giveitem_std ITEM_MAX_REPEL, 1, 1
 	end
 
 MossdeepCity_EventScript_1B1745:: @ 81B1745
-	giveitem ITEM_NET_BALL, 1, 1
+	giveitem_std ITEM_NET_BALL, 1, 1
 	end
 
 PetalburgWoods_EventScript_1B1752:: @ 81B1752
-	giveitem ITEM_X_ATTACK, 1, 1
+	giveitem_std ITEM_X_ATTACK, 1, 1
 	end
 
 PetalburgWoods_EventScript_1B175F:: @ 81B175F
-	giveitem ITEM_GREAT_BALL, 1, 1
+	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
 PetalburgWoods_EventScript_1B176C:: @ 81B176C
-	giveitem ITEM_ETHER, 1, 1
+	giveitem_std ITEM_ETHER, 1, 1
 	end
 
 PetalburgWoods_EventScript_1B1779:: @ 81B1779
-	giveitem ITEM_PARALYZE_HEAL, 1, 1
+	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
 	end
 
 RusturfTunnel_EventScript_1B1786:: @ 81B1786
-	giveitem ITEM_POKE_BALL, 1, 1
+	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
 RusturfTunnel_EventScript_1B1793:: @ 81B1793
-	giveitem ITEM_MAX_ETHER, 1, 1
+	giveitem_std ITEM_MAX_ETHER, 1, 1
 	end
 
 GraniteCave_1F_EventScript_1B17A0:: @ 81B17A0
-	giveitem ITEM_ESCAPE_ROPE, 1, 1
+	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
 GraniteCave_B1F_EventScript_1B17AD:: @ 81B17AD
-	giveitem ITEM_POKE_BALL, 1, 1
+	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
 GraniteCave_B2F_EventScript_1B17BA:: @ 81B17BA
-	giveitem ITEM_REPEL, 1, 1
+	giveitem_std ITEM_REPEL, 1, 1
 	end
 
 GraniteCave_B2F_EventScript_1B17C7:: @ 81B17C7
-	giveitem ITEM_RARE_CANDY, 1, 1
+	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
 JaggedPass_EventScript_1B17D4:: @ 81B17D4
-	giveitem ITEM_BURN_HEAL, 1, 1
+	giveitem_std ITEM_BURN_HEAL, 1, 1
 	end
 
 FieryPath_EventScript_1B17E1:: @ 81B17E1
-	giveitem ITEM_FIRE_STONE, 1, 1
+	giveitem_std ITEM_FIRE_STONE, 1, 1
 	end
 
 FieryPath_EventScript_1B17EE:: @ 81B17EE
-	giveitem ITEM_TM06, 1, 1
+	giveitem_std ITEM_TM06, 1, 1
 	end
 
 MeteorFalls_1F_1R_EventScript_1B17FB:: @ 81B17FB
-	giveitem ITEM_TM23, 1, 1
+	giveitem_std ITEM_TM23, 1, 1
 	end
 
 MeteorFalls_1F_1R_EventScript_1B1808:: @ 81B1808
-	giveitem ITEM_FULL_HEAL, 1, 1
+	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
 MeteorFalls_1F_1R_EventScript_1B1815:: @ 81B1815
-	giveitem ITEM_MOON_STONE, 1, 1
+	giveitem_std ITEM_MOON_STONE, 1, 1
 	end
 
 MeteorFalls_1F_1R_EventScript_1B1822:: @ 81B1822
-	giveitem ITEM_PP_UP, 1, 1
+	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
 MeteorFalls_B1F_2R_EventScript_1B182F:: @ 81B182F
-	giveitem ITEM_TM02, 1, 1
+	giveitem_std ITEM_TM02, 1, 1
 	end
 
 NewMauville_Inside_EventScript_1B183C:: @ 81B183C
-	giveitem ITEM_ULTRA_BALL, 1, 1
+	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
 NewMauville_Inside_EventScript_1B1849:: @ 81B1849
-	giveitem ITEM_ESCAPE_ROPE, 1, 1
+	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
 NewMauville_Inside_EventScript_1B1856:: @ 81B1856
-	giveitem ITEM_THUNDER_STONE, 1, 1
+	giveitem_std ITEM_THUNDER_STONE, 1, 1
 	end
 
 NewMauville_Inside_EventScript_1B1863:: @ 81B1863
-	giveitem ITEM_FULL_HEAL, 1, 1
+	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
 NewMauville_Inside_EventScript_1B1870:: @ 81B1870
-	giveitem ITEM_PARALYZE_HEAL, 1, 1
+	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
 	end
 
 AbandonedShip_Rooms_1F_EventScript_1B187D:: @ 81B187D
-	giveitem ITEM_HARBOR_MAIL, 1, 1
+	giveitem_std ITEM_HARBOR_MAIL, 1, 1
 	end
 
 AbandonedShip_Rooms_B1F_EventScript_1B188A:: @ 81B188A
-	giveitem ITEM_ESCAPE_ROPE, 1, 1
+	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
 AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897
-	giveitem ITEM_DIVE_BALL, 1, 1
+	giveitem_std ITEM_DIVE_BALL, 1, 1
 	end
 
 AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4
-	giveitem ITEM_TM13, 1, 1
+	giveitem_std ITEM_TM13, 1, 1
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1
-	giveitem ITEM_REVIVE, 1, 1
+	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_1B18BE:: @ 81B18BE
-	giveitem ITEM_STORAGE_KEY, 1, 1
+	giveitem_std ITEM_STORAGE_KEY, 1, 1
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_1B18CB:: @ 81B18CB
-	giveitem ITEM_LUXURY_BALL, 1, 1
+	giveitem_std ITEM_LUXURY_BALL, 1, 1
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_1B18D8:: @ 81B18D8
-	giveitem ITEM_SCANNER, 1, 1
+	giveitem_std ITEM_SCANNER, 1, 1
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5
-	giveitem ITEM_WATER_STONE, 1, 1
+	giveitem_std ITEM_WATER_STONE, 1, 1
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2
-	giveitem ITEM_TM18, 1, 1
+	giveitem_std ITEM_TM18, 1, 1
 	end
 
 ScorchedSlab_EventScript_1B18FF:: @ 81B18FF
-	giveitem ITEM_TM11, 1, 1
+	giveitem_std ITEM_TM11, 1, 1
 	end
 
 SafariZone_Northwest_EventScript_1B190C:: @ 81B190C
-	giveitem ITEM_TM22, 1, 1
+	giveitem_std ITEM_TM22, 1, 1
 	end
 
 SafariZone_Northeast_EventScript_1B1919:: @ 81B1919
-	giveitem ITEM_CALCIUM, 1, 1
+	giveitem_std ITEM_CALCIUM, 1, 1
 	end
 
 SafariZone_Southwest_EventScript_1B1926:: @ 81B1926
-	giveitem ITEM_MAX_REVIVE, 1, 1
+	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
 MtPyre_2F_EventScript_1B1933:: @ 81B1933
-	giveitem ITEM_ULTRA_BALL, 1, 1
+	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
 MtPyre_3F_EventScript_1B1940:: @ 81B1940
-	giveitem ITEM_SUPER_REPEL, 1, 1
+	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
 MtPyre_4F_EventScript_1B194D:: @ 81B194D
-	giveitem ITEM_SEA_INCENSE, 1, 1
+	giveitem_std ITEM_SEA_INCENSE, 1, 1
 	end
 
 MtPyre_5F_EventScript_1B195A:: @ 81B195A
-	giveitem ITEM_LAX_INCENSE, 1, 1
+	giveitem_std ITEM_LAX_INCENSE, 1, 1
 	end
 
 MtPyre_6F_EventScript_1B1967:: @ 81B1967
-	giveitem ITEM_TM30, 1, 1
+	giveitem_std ITEM_TM30, 1, 1
 	end
 
 MtPyre_Exterior_EventScript_1B1974:: @ 81B1974
-	giveitem ITEM_MAX_POTION, 1, 1
+	giveitem_std ITEM_MAX_POTION, 1, 1
 	end
 
 MtPyre_Exterior_EventScript_1B1981:: @ 81B1981
-	giveitem ITEM_TM48, 1, 1
+	giveitem_std ITEM_TM48, 1, 1
 	end
 
 AquaHideout_B1F_EventScript_1B198E:: @ 81B198E
-	giveitem ITEM_MASTER_BALL, 1, 1
+	giveitem_std ITEM_MASTER_BALL, 1, 1
 	end
 
 AquaHideout_B1F_EventScript_1B199B:: @ 81B199B
-	giveitem ITEM_NUGGET, 1, 1
+	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
 AquaHideout_B1F_EventScript_1B19A8:: @ 81B19A8
-	giveitem ITEM_MAX_ELIXIR, 1, 1
+	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
 AquaHideout_B2F_EventScript_1B19B5:: @ 81B19B5
-	giveitem ITEM_NEST_BALL, 1, 1
+	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
 MagmaHideout_B1F_EventScript_1B19C2:: @ 81B19C2
-	giveitem ITEM_MASTER_BALL, 1, 1
+	giveitem_std ITEM_MASTER_BALL, 1, 1
 	end
 
 MagmaHideout_B1F_EventScript_1B19CF:: @ 81B19CF
-	giveitem ITEM_NUGGET, 1, 1
+	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
 MagmaHideout_B1F_EventScript_1B19DC:: @ 81B19DC
-	giveitem ITEM_MAX_ELIXIR, 1, 1
+	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
 MagmaHideout_B2F_EventScript_1B19E9:: @ 81B19E9
-	giveitem ITEM_NEST_BALL, 1, 1
+	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_1B19F6:: @ 81B19F6
-	giveitem ITEM_BIG_PEARL, 1, 1
+	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_1B1A03:: @ 81B1A03
-	giveitem ITEM_RARE_CANDY, 1, 1
+	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_1B1A10:: @ 81B1A10
-	giveitem ITEM_ICE_HEAL, 1, 1
+	giveitem_std ITEM_ICE_HEAL, 1, 1
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_1B1A1D:: @ 81B1A1D
-	giveitem ITEM_TM07, 1, 1
+	giveitem_std ITEM_TM07, 1, 1
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A
-	giveitem ITEM_NEVER_MELT_ICE, 1, 1
+	giveitem_std ITEM_NEVER_MELT_ICE, 1, 1
 	end
 
 SeafloorCavern_Room9_EventScript_1B1A37:: @ 81B1A37
-	giveitem ITEM_TM26, 1, 1
+	giveitem_std ITEM_TM26, 1, 1
 	end
 
 CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44
-	giveitem ITEM_HM07, 1, 1
+	giveitem_std ITEM_HM07, 1, 1
 	end
 
 Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51
-	giveitem ITEM_ORANGE_MAIL, 1, 1
+	giveitem_std ITEM_ORANGE_MAIL, 1, 1
 	end
 
 Route110_TrickHousePuzzle2_EventScript_1B1A5E:: @ 81B1A5E
-	giveitem ITEM_HARBOR_MAIL, 1, 1
+	giveitem_std ITEM_HARBOR_MAIL, 1, 1
 	end
 
 Route110_TrickHousePuzzle2_EventScript_1B1A6B:: @ 81B1A6B
-	giveitem ITEM_WAVE_MAIL, 1, 1
+	giveitem_std ITEM_WAVE_MAIL, 1, 1
 	end
 
 Route110_TrickHousePuzzle3_EventScript_1B1A78:: @ 81B1A78
-	giveitem ITEM_SHADOW_MAIL, 1, 1
+	giveitem_std ITEM_SHADOW_MAIL, 1, 1
 	end
 
 Route110_TrickHousePuzzle3_EventScript_1B1A85:: @ 81B1A85
-	giveitem ITEM_WOOD_MAIL, 1, 1
+	giveitem_std ITEM_WOOD_MAIL, 1, 1
 	end
 
 Route110_TrickHousePuzzle4_EventScript_1B1A92:: @ 81B1A92
-	giveitem ITEM_MECH_MAIL, 1, 1
+	giveitem_std ITEM_MECH_MAIL, 1, 1
 	end
 
 Route110_TrickHousePuzzle6_EventScript_1B1A9F:: @ 81B1A9F
-	giveitem ITEM_GLITTER_MAIL, 1, 1
+	giveitem_std ITEM_GLITTER_MAIL, 1, 1
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1B1AAC:: @ 81B1AAC
-	giveitem ITEM_TROPIC_MAIL, 1, 1
+	giveitem_std ITEM_TROPIC_MAIL, 1, 1
 	end
 
 Route110_TrickHousePuzzle8_EventScript_1B1AB9:: @ 81B1AB9
-	giveitem ITEM_BEAD_MAIL, 1, 1
+	giveitem_std ITEM_BEAD_MAIL, 1, 1
 	end
 
 VictoryRoad_1F_EventScript_1B1AC6:: @ 81B1AC6
-	giveitem ITEM_MAX_ELIXIR, 1, 1
+	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
 VictoryRoad_1F_EventScript_1B1AD3:: @ 81B1AD3
-	giveitem ITEM_PP_UP, 1, 1
+	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
 VictoryRoad_B1F_EventScript_1B1AE0:: @ 81B1AE0
-	giveitem ITEM_TM29, 1, 1
+	giveitem_std ITEM_TM29, 1, 1
 	end
 
 VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED
-	giveitem ITEM_FULL_RESTORE, 1, 1
+	giveitem_std ITEM_FULL_RESTORE, 1, 1
 	end
 
 VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA
-	giveitem ITEM_FULL_HEAL, 1, 1
+	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
 @ 81B1B07
-	giveitem ITEM_HM08, 1, 1
+	giveitem_std ITEM_HM08, 1, 1
 	end
diff --git a/data/map_events.s b/data/map_events.s
index 547e6ceb3..e7fb03fb6 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -1,3 +1,4 @@
+#include "constants/flags.h"
 #include "constants/items.h"
 #include "constants/map_objects.h"
 #include "constants/maps.h"
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc
index e33de80a9..72740dc29 100644
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc
@@ -1,6 +1,6 @@
 AbandonedShip_CaptainsOffice_MapObjects:: @ 838E45C
 	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, 1100, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1, 0, 0
 
 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C
 	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
index 46c8eb47a..2e6bb9a3f 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
@@ -1,8 +1,8 @@
 AbandonedShip_HiddenFloorRooms_MapObjects:: @ 838E540
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, 1077, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, 1078, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, 1102, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, 1101, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3, 0, 0
 
 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0
 	warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc
index d60f9ec94..22739c99f 100644
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ b/data/maps/events/AbandonedShip_Room_B1F.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Room_B1F_MapObjects:: @ 838E3AC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, 1098, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1, 0, 0
 
 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4
 	warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc
index 34de5e0af..d68dd776d 100644
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc
@@ -1,7 +1,7 @@
 AbandonedShip_Rooms2_1F_MapObjects:: @ 838E3E8
 	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, 1099, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1, 0, 0
 
 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430
 	warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
index ece0138dd..8f21e82c4 100644
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Rooms2_B1F_MapObjects:: @ 838E324
 	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, 1097, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1, 0, 0
 
 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354
 	warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc
index e41bce58c..8eaae1853 100644
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms_1F.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Rooms_1F_MapObjects:: @ 838E1C4
 	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, 1095, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1, 0, 0
 
 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4
 	warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc
index 455a439cb..cb9ce260f 100644
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Rooms_B1F_MapObjects:: @ 838E2C8
 	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 25, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, 1096, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1, 0, 0
 
 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8
 	warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc
index ebe2147b6..0aa15569e 100644
--- a/data/maps/events/AncientTomb.inc
+++ b/data/maps/events/AncientTomb.inc
@@ -1,5 +1,5 @@
 AncientTomb_MapObjects:: @ 838E6DC
-	object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, 937, 0, 0
+	object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL, 0, 0
 
 AncientTomb_MapWarps:: @ 838E6F4
 	warp_def 8, 29, 3, 0, MAP_ROUTE120
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc
index 0c8ed6773..ff3212aa9 100644
--- a/data/maps/events/AquaHideout_1F.inc
+++ b/data/maps/events/AquaHideout_1F.inc
@@ -1,7 +1,7 @@
 AquaHideout_1F_MapObjects:: @ 838CD0C
-	object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, 821, 0, 0
-	object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, 822, 0, 0
-	object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, 924, 0, 0
+	object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0
+	object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0
+	object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
 
 AquaHideout_1F_MapWarps:: @ 838CD54
 	warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc
index 723586d41..3f4d8e4ec 100644
--- a/data/maps/events/AquaHideout_B1F.inc
+++ b/data/maps/events/AquaHideout_B1F.inc
@@ -1,12 +1,12 @@
 AquaHideout_B1F_MapObjects:: @ 838CD80
-	object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, 924, 0, 0
-	object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, 924, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, 1071, 0, 0
-	object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, 924, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, 1124, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, 977, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, 1132, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, 978, 0, 0
+	object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0
+	object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
 
 AquaHideout_B1F_MapWarps:: @ 838CE40
 	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc
index 570348b57..c4b0abc78 100644
--- a/data/maps/events/AquaHideout_B2F.inc
+++ b/data/maps/events/AquaHideout_B2F.inc
@@ -1,9 +1,9 @@
 AquaHideout_B2F_MapObjects:: @ 838CF1C
-	object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, 924, 0, 0
-	object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, 924, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, 1072, 0, 0
-	object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, 943, 0, 0
-	object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, 924, 0, 0
+	object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0
+	object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0
+	object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
 
 AquaHideout_B2F_MapWarps:: @ 838CF94
 	warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc
index 2f7a46a05..c1b2ad55e 100644
--- a/data/maps/events/BattleTower_BattleRoom.inc
+++ b/data/maps/events/BattleTower_BattleRoom.inc
@@ -1,5 +1,5 @@
 BattleTower_BattleRoom_MapObjects:: @ 8391DAC
-	object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 888, 0, 0
+	object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0
 	object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleTower_BattleRoom_MapWarps:: @ 8391DDC
diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc
index b0a0bf435..a4abdac87 100644
--- a/data/maps/events/BattleTower_Lobby.inc
+++ b/data/maps/events/BattleTower_Lobby.inc
@@ -3,8 +3,8 @@ BattleTower_Lobby_MapObjects:: @ 8391C8C
 	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 12, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160715, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16071E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, 918, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, 941, 0, 0
+	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER, 0, 0
+	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER, 0, 0
 
 BattleTower_Lobby_MapWarps:: @ 8391D1C
 	warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE
diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc
index 8eb114b74..2561dee6a 100644
--- a/data/maps/events/CaveOfOrigin_B3F.inc
+++ b/data/maps/events/CaveOfOrigin_B3F.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_B3F_MapObjects:: @ 838D814
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, 1059, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1, 0, 0
 
 CaveOfOrigin_B3F_MapWarps:: @ 838D82C
 	warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F
diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc
index 35dc61fe8..672604d3e 100644
--- a/data/maps/events/CaveOfOrigin_B4F.inc
+++ b/data/maps/events/CaveOfOrigin_B4F.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_B4F_MapObjects:: @ 838D880
-	object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 825, 0, 0
+	object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0
 
 CaveOfOrigin_B4F_MapWarps:: @ 838D898
 	warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc
index fed9dd8f2..ada0e0be5 100644
--- a/data/maps/events/DesertRuins.inc
+++ b/data/maps/events/DesertRuins.inc
@@ -1,5 +1,5 @@
 DesertRuins_MapObjects:: @ 838BEBC
-	object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, 935, 0, 0
+	object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK, 0, 0
 
 DesertRuins_MapWarps:: @ 838BED4
 	warp_def 8, 29, 3, 1, MAP_ROUTE111
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc
index 47a200874..8ca6fa7a1 100644
--- a/data/maps/events/DewfordTown.inc
+++ b/data/maps/events/DewfordTown.inc
@@ -1,8 +1,8 @@
 DewfordTown_MapObjects:: @ 8380B88
 	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, 740, 0, 0
+	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 0, 0
 	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 12, 0, 14, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, 743, 0, 0
+	object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 0, 0
 	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0
 
 DewfordTown_MapWarps:: @ 8380C00
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc
index dc05cb15e..56f7feb18 100644
--- a/data/maps/events/DewfordTown_Hall.inc
+++ b/data/maps/events/DewfordTown_Hall.inc
@@ -7,7 +7,7 @@ DewfordTown_Hall_MapObjects:: @ 8386088
 	object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 14, 0, 7, 0, 0, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 15, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, 940, 0, 0
+	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL, 0, 0
 
 DewfordTown_Hall_MapWarps:: @ 8386160
 	warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
index 867456c4f..c0e672813 100644
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334
 	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, 240, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 920, 0, 0
-	object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 921, 0, 0
+	object_event 2, 240, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0
+	object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0
 
 EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C
 	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc
index 57d59dac9..755f205bc 100644
--- a/data/maps/events/FallarborTown.inc
+++ b/data/maps/events/FallarborTown.inc
@@ -2,7 +2,7 @@ FallarborTown_MapObjects:: @ 8380E04
 	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 11, 0, 3, 8, 16, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E814, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 9, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 15, 0, 3, 3, 17, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E81D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, 907, 0, 0
+	object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR, 0, 0
 
 FallarborTown_MapWarps:: @ 8380E64
 	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc
index d34bc68d1..811461c02 100644
--- a/data/maps/events/FallarborTown_ContestLobby.inc
+++ b/data/maps/events/FallarborTown_ContestLobby.inc
@@ -3,7 +3,7 @@ FallarborTown_ContestLobby_MapObjects:: @ 83866F0
 	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 2, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, 800, 0, 0
+	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 0, 0
 	object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0
 
 FallarborTown_ContestLobby_MapWarps:: @ 8386780
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc
index 256b8a339..e3104fb1d 100644
--- a/data/maps/events/FallarborTown_House1.inc
+++ b/data/maps/events/FallarborTown_House1.inc
@@ -1,5 +1,5 @@
 FallarborTown_House1_MapObjects:: @ 8386970
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, 928, 0, 0
+	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR, 0, 0
 	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0
 
 FallarborTown_House1_MapWarps:: @ 83869A0
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
index e537f497d..ff2278e29 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
@@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860
 	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, 871, 0, 0
+	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0
 
 FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0
 	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc
index 22f2b403e..575f92bd5 100644
--- a/data/maps/events/FieryPath.inc
+++ b/data/maps/events/FieryPath.inc
@@ -1,12 +1,12 @@
 FieryPath_MapObjects:: @ 838C718
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2, 0, 0
 
 FieryPath_MapWarps:: @ 838C7D8
 	warp_def 26, 36, 3, 4, MAP_ROUTE112
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc
index c25f6f6ed..4c80997f9 100644
--- a/data/maps/events/FortreeCity.inc
+++ b/data/maps/events/FortreeCity.inc
@@ -5,7 +5,7 @@ FortreeCity_MapObjects:: @ 8380020
 	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 14, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, 969, 0, 0
+	object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE, 0, 0
 
 FortreeCity_MapWarps:: @ 83800C8
 	warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc
index 38bdacf44..0a5f81b6c 100644
--- a/data/maps/events/FortreeCity_House4.inc
+++ b/data/maps/events/FortreeCity_House4.inc
@@ -1,7 +1,7 @@
 FortreeCity_House4_MapObjects:: @ 8389308
 	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15817F, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, 933, 0, 0
+	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE, 0, 0
 
 FortreeCity_House4_MapWarps:: @ 8389350
 	warp_def 3, 5, 0, 6, MAP_FORTREE_CITY
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc
index 1728858fb..ade38322f 100644
--- a/data/maps/events/GraniteCave_1F.inc
+++ b/data/maps/events/GraniteCave_1F.inc
@@ -1,6 +1,6 @@
 GraniteCave_1F_MapObjects:: @ 838BF24
 	object_event 1, MAP_OBJ_GFX_HIKER, 0, 36, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, 1050, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1, 0, 0
 
 GraniteCave_1F_MapWarps:: @ 838BF54
 	warp_def 37, 12, 3, 0, MAP_ROUTE106
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc
index bc0cc5dfc..e50fd09af 100644
--- a/data/maps/events/GraniteCave_B1F.inc
+++ b/data/maps/events/GraniteCave_B1F.inc
@@ -1,5 +1,5 @@
 GraniteCave_B1F_MapObjects:: @ 838BF88
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, 1051, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1, 0, 0
 
 GraniteCave_B1F_MapWarps:: @ 838BFA0
 	warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc
index ec4b309a5..c8a7c5554 100644
--- a/data/maps/events/GraniteCave_B2F.inc
+++ b/data/maps/events/GraniteCave_B2F.inc
@@ -1,13 +1,13 @@
 GraniteCave_B2F_MapObjects:: @ 838BFEC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2, 0, 0
+	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
+	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
+	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_17, 0, 0
 
 GraniteCave_B2F_MapWarps:: @ 838C0C4
 	warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc
index 121ae31cd..efab4fa71 100644
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ b/data/maps/events/GraniteCave_StevensRoom.inc
@@ -1,5 +1,5 @@
 GraniteCave_StevensRoom_MapObjects:: @ 838C118
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, 833, 0, 0
+	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0
 
 GraniteCave_StevensRoom_MapWarps:: @ 838C130
 	warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F
diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc
index 372097a07..94fbce914 100644
--- a/data/maps/events/IslandCave.inc
+++ b/data/maps/events/IslandCave.inc
@@ -1,5 +1,5 @@
 IslandCave_MapObjects:: @ 838E674
-	object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, 936, 0, 0
+	object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE, 0, 0
 
 IslandCave_MapWarps:: @ 838E68C
 	warp_def 8, 29, 3, 0, MAP_ROUTE105
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc
index dfcc6cbac..654cbb9ae 100644
--- a/data/maps/events/JaggedPass.inc
+++ b/data/maps/events/JaggedPass.inc
@@ -1,7 +1,7 @@
 JaggedPass_MapObjects:: @ 838C61C
 	object_event 1, MAP_OBJ_GFX_HIKER, 0, 8, 0, 18, 0, 3, 8, 0, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D285, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 16, 0, 22, 0, 3, 14, 0, 0, 1, 0, 2, 0, JaggedPass_EventScript_15D2DA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, 1070, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1, 0, 0
 	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0
 
 JaggedPass_MapWarps:: @ 838C67C
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc
index 406abd6dc..1c63eb83e 100644
--- a/data/maps/events/LavaridgeTown.inc
+++ b/data/maps/events/LavaridgeTown.inc
@@ -5,8 +5,8 @@ LavaridgeTown_MapObjects:: @ 8380C78
 	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 0, 13, 0, 3, 3, 32, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E736, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 0, 4, 0, 3, 18, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 0, 4, 0, 3, 17, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0, 0, 0
-	object_event 7, 243, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 930, 0, 0
-	object_event 8, 240, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, 929, 0, 0
+	object_event 7, 243, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0
+	object_event 8, 240, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0
 	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0
 
 LavaridgeTown_MapWarps:: @ 8380D50
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc
index 5dd100302..8e53d3544 100644
--- a/data/maps/events/LilycoveCity.inc
+++ b/data/maps/events/LilycoveCity.inc
@@ -8,14 +8,14 @@ LilycoveCity_MapObjects:: @ 838016C
 	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0
-	object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, 852, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, 1042, 0, 0
-	object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, 852, 0, 0
-	object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, 852, 0, 0
-	object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, 852, 0, 0
-	object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, 852, 0, 0
+	object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1, 0, 0
+	object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
 	object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0
-	object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, 971, 0, 0
+	object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0
 
 LilycoveCity_MapWarps:: @ 8380304
 	warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc
index b0ea1e677..ccbc645b2 100644
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ b/data/maps/events/LilycoveCity_ContestLobby.inc
@@ -2,14 +2,14 @@ LilycoveCity_ContestLobby_MapObjects:: @ 838984C
 	object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 17, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 774, 0, 0
+	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 0, 0
 	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 10, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_ARTIST, 0, 20, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, 802, 0, 0
+	object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 0, 0
 	object_event 9, MAP_OBJ_GFX_BOY_1, 0, 18, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_GIRL_1, 0, 19, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 895, 0, 0
+	object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 0, 0
 	object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
index 5398693c7..32c1181de 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
@@ -1,10 +1,10 @@
 LilycoveCity_CoveLilyMotel_2F_MapObjects:: @ 83894B8
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, 925, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, 925, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, 925, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, 925, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, 925, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, 925, 0, 0
+	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
 
 LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548
 	warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
index 363800ad2..c5f094b3f 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
@@ -1,7 +1,7 @@
 LilycoveCity_DepartmentStoreRooftop_MapObjects:: @ 838A5A8
 	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, 962, 0, 0
+	object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART, 0, 0
 
 LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0
 	warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc
index fa651e557..3f7c592d1 100644
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ b/data/maps/events/LilycoveCity_Harbor.inc
@@ -1,8 +1,8 @@
 LilycoveCity_Harbor_MapObjects:: @ 8389F94
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, 908, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 861, 0, 0
+	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE, 0, 0
+	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0
 	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 909, 0, 0
+	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE, 0, 0
 
 LilycoveCity_Harbor_MapWarps:: @ 8389FF4
 	warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
index 900cba08f..1ee241c5c 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
@@ -1,14 +1,14 @@
 LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564
 	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 5, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, 775, 0, 0
+	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 0, 0
 	object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 10, 0, 3, 5, 2, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, 776, 0, 0
-	object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, 779, 0, 0
-	object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, 780, 0, 0
-	object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, 778, 0, 0
+	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 0, 0
+	object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 0, 0
+	object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
+	object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0
 
 LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654
 	warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
index 372007d1f..83077f069 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
@@ -1,8 +1,8 @@
 LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740
 	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, 777, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, 780, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, 780, 0, 0
+	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 0, 0
+	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
+	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
 
 LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0
 	warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
index a710e1f5e..59e8e03a3 100644
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
@@ -3,10 +3,10 @@ LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0
 	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, 791, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, 790, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, 792, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, 789, 0, 0
+	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY, 0, 0
+	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY, 0, 0
+	object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY, 0, 0
+	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0
 
 LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70
 	warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc
index 6c1e09430..18d1dcd74 100644
--- a/data/maps/events/LinkContestRoom1.inc
+++ b/data/maps/events/LinkContestRoom1.inc
@@ -11,7 +11,7 @@ LinkContestRoom1_MapObjects:: @ 839149C
 	object_event 10, 249, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 11, 250, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 12, 245, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 86, 0, 0
+	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0
 	object_event 14, 243, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc
index b31b06b61..23debe434 100644
--- a/data/maps/events/LittlerootTown.inc
+++ b/data/maps/events/LittlerootTown.inc
@@ -1,10 +1,10 @@
 LittlerootTown_MapObjects:: @ 83808FC
 	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_3, 0, 16, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6DF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, 868, 0, 0
+	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT, 0, 0
 	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 14, 0, 17, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6D6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, 752, 0, 0
-	object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 761, 0, 0
-	object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 762, 0, 0
+	object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT, 0, 0
+	object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0
+	object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0
 
 LittlerootTown_MapWarps:: @ 838098C
 	warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
index cf0d27876..bb3d3b195 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
@@ -1,9 +1,9 @@
 LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, 758, 0, 0
-	object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, 755, 0, 0
-	object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, 754, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, 784, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0
+	object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 0, 0
+	object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0
+	object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0
+	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM, 0, 0
+	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
 
 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC
 	warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
index ac77a80f9..b7367b1d0 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
@@ -1,18 +1,18 @@
 LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728
-	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, 760, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0
+	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0
 
 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878
 	warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
index 875022b3b..27a0efbed 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
@@ -1,9 +1,9 @@
 LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, 759, 0, 0
-	object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, 754, 0, 0
-	object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, 755, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, 785, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0
+	object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 0, 0
+	object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0
+	object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0
+	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM, 0, 0
+	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
 
 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C
 	warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
index ef2ea416a..fbec5e0e7 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
@@ -1,19 +1,19 @@
 LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978
-	object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, 722, 0, 0
-	object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0
-	object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, 849, 0, 0
+	object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0
+	object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0
+	object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0
 
 LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0
 	warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
index 9a69cfafd..fbe8df720 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
@@ -1,7 +1,7 @@
 LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C
 	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, 721, 0, 0
-	object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0
+	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0
+	object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0
 
 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74
 	warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc
index acd337496..2a41a962f 100644
--- a/data/maps/events/MagmaHideout_1F.inc
+++ b/data/maps/events/MagmaHideout_1F.inc
@@ -1,6 +1,6 @@
 MagmaHideout_1F_MapObjects:: @ 838E9BC
-	object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, 821, 0, 0
-	object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, 822, 0, 0
+	object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0
+	object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0
 	object_event 3, 241, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0
 
 MagmaHideout_1F_MapWarps:: @ 838EA04
diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc
index db457bb45..3ed63b847 100644
--- a/data/maps/events/MagmaHideout_B1F.inc
+++ b/data/maps/events/MagmaHideout_B1F.inc
@@ -2,11 +2,11 @@ MagmaHideout_B1F_MapObjects:: @ 838EA28
 	object_event 1, 241, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0
 	object_event 2, 241, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0
 	object_event 3, 242, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, 1125, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, 1126, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, 977, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, 1134, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, 978, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
 
 MagmaHideout_B1F_MapWarps:: @ 838EAE8
 	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F
diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc
index eb6340758..16ac562b5 100644
--- a/data/maps/events/MagmaHideout_B2F.inc
+++ b/data/maps/events/MagmaHideout_B2F.inc
@@ -1,9 +1,9 @@
 MagmaHideout_B2F_MapObjects:: @ 838EBE4
-	object_event 1, 241, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, 924, 0, 0
-	object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, 924, 0, 0
-	object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 943, 0, 0
-	object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, 924, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, 1127, 0, 0
+	object_event 1, 241, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0
+	object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0
 
 MagmaHideout_B2F_MapWarps:: @ 838EC5C
 	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc
index 4b5b2f17a..fee44bb1e 100644
--- a/data/maps/events/MauvilleCity.inc
+++ b/data/maps/events/MauvilleCity.inc
@@ -4,10 +4,10 @@ MauvilleCity_MapObjects:: @ 837FB90
 	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 18, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, 804, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, 805, 0, 0
-	object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, 912, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0
+	object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0
+	object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0
+	object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE, 0, 0
+	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1, 0, 0
 
 MauvilleCity_MapWarps:: @ 837FC68
 	warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc
index 0987f3389..d30c6b275 100644
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ b/data/maps/events/MauvilleCity_Gym.inc
@@ -1,5 +1,5 @@
 MauvilleCity_Gym_MapObjects:: @ 838821C
-	object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, 913, 0, 0
+	object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM, 0, 0
 	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566FD, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_15672B, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_156714, 0, 0, 0
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc
index 41be1c60b..abccfa283 100644
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ b/data/maps/events/MeteorFalls_1F_1R.inc
@@ -1,14 +1,14 @@
 MeteorFalls_1F_1R_MapObjects:: @ 838BACC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, 1044, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, 1046, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, 1045, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, 1047, 0, 0
-	object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 8, 244, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 9, 244, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, 942, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0
+	object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0
+	object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0
+	object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
+	object_event 8, 244, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
+	object_event 9, 244, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
+	object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0
 
 MeteorFalls_1F_1R_MapWarps:: @ 838BBBC
 	warp_def 27, 18, 4, 0, MAP_ROUTE114
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc
index d892b1ac0..13e39d682 100644
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ b/data/maps/events/MeteorFalls_B1F_2R.inc
@@ -1,5 +1,5 @@
 MeteorFalls_B1F_2R_MapObjects:: @ 838BCF8
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, 1080, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1, 0, 0
 
 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10
 	warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc
index a8162d215..a5b4fa74a 100644
--- a/data/maps/events/MossdeepCity.inc
+++ b/data/maps/events/MossdeepCity.inc
@@ -4,7 +4,7 @@ MossdeepCity_MapObjects:: @ 838042C
 	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 32, 0, 12, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFAE, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 26, 0, 21, 0, 5, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC0, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 45, 0, 18, 0, 7, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, 1043, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1, 0, 0
 	object_event 7, MAP_OBJ_GFX_MAN_1, 0, 53, 0, 5, 0, 7, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 56, 0, 21, 0, 7, 10, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFDB, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc
index a932ce465..6752007d7 100644
--- a/data/maps/events/MossdeepCity_House2.inc
+++ b/data/maps/events/MossdeepCity_House2.inc
@@ -1,7 +1,7 @@
 MossdeepCity_House2_MapObjects:: @ 838A808
 	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, 934, 0, 0
+	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE, 0, 0
 
 MossdeepCity_House2_MapWarps:: @ 838A850
 	warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc
index 0aef37766..1428a7d8a 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ b/data/maps/events/MossdeepCity_StevensHouse.inc
@@ -1,8 +1,8 @@
 MossdeepCity_StevensHouse_MapObjects:: @ 838AA44
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, 967, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, 968, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, 1133, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, 727, 0, 0
+	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1, 0, 0
+	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0
 
 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4
 	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc
index acab0d36b..7bc90433c 100644
--- a/data/maps/events/MtChimney.inc
+++ b/data/maps/events/MtChimney.inc
@@ -1,32 +1,32 @@
 MtChimney_MapObjects:: @ 838C330
-	object_event 1, 247, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, 927, 0, 0
-	object_event 2, 246, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, 926, 0, 0
-	object_event 3, 241, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, 926, 0, 0
-	object_event 4, 241, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0
-	object_event 5, 241, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, 926, 0, 0
-	object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, 927, 0, 0
-	object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, 927, 0, 0
-	object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, 927, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, 877, 0, 0
-	object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0
-	object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0
-	object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0
-	object_event 13, 241, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, 926, 0, 0
-	object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0
-	object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0
-	object_event 16, 241, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, 926, 0, 0
-	object_event 17, 241, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, 926, 0, 0
-	object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0
-	object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0
-	object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0
-	object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0
-	object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, 926, 0, 0
-	object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0
-	object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0
-	object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, 877, 0, 0
-	object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, 877, 0, 0
-	object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, 877, 0, 0
-	object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, 877, 0, 0
+	object_event 1, 247, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 2, 246, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 3, 241, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 4, 241, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 5, 241, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+	object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 13, 241, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 16, 241, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 17, 241, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+	object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+	object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+	object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
 
 MtChimney_MapWarps:: @ 838C5D0
 	warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc
index 1d776173d..16e1d98b0 100644
--- a/data/maps/events/MtPyre_2F.inc
+++ b/data/maps/events/MtPyre_2F.inc
@@ -1,6 +1,6 @@
 MtPyre_2F_MapObjects:: @ 838C888
 	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 6, 0, 6, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_2F_EventScript_15D39B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, 1129, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1, 0, 0
 	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D389, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D392, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3CD, 0, 0, 0
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc
index 0cccd1bb2..818d61533 100644
--- a/data/maps/events/MtPyre_3F.inc
+++ b/data/maps/events/MtPyre_3F.inc
@@ -1,7 +1,7 @@
 MtPyre_3F_MapObjects:: @ 838C954
 	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 1, 0, 4, 0, 3, 18, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D3E9, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_LASS, 0, 12, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D400, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, 1120, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1, 0, 0
 
 MtPyre_3F_MapWarps:: @ 838C99C
 	warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc
index bc6cc02eb..4b954a45e 100644
--- a/data/maps/events/MtPyre_4F.inc
+++ b/data/maps/events/MtPyre_4F.inc
@@ -1,6 +1,6 @@
 MtPyre_4F_MapObjects:: @ 838C9E0
 	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 7, 0, 3, 24, 17, 0, 1, 0, 2, 0, MtPyre_4F_EventScript_15D418, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, 1130, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1, 0, 0
 
 MtPyre_4F_MapWarps:: @ 838CA10
 	warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc
index 340274836..9043c95de 100644
--- a/data/maps/events/MtPyre_5F.inc
+++ b/data/maps/events/MtPyre_5F.inc
@@ -1,6 +1,6 @@
 MtPyre_5F_MapObjects:: @ 838CA54
 	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 3, 0, 7, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_5F_EventScript_15D430, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, 1052, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1, 0, 0
 
 MtPyre_5F_MapWarps:: @ 838CA84
 	warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc
index e0d12d296..67597ff58 100644
--- a/data/maps/events/MtPyre_6F.inc
+++ b/data/maps/events/MtPyre_6F.inc
@@ -1,6 +1,6 @@
 MtPyre_6F_MapObjects:: @ 838CAC0
 	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 6, 0, 3, 0, 3, 23, 17, 0, 1, 0, 2, 0, MtPyre_6F_EventScript_15D448, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, 1089, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1, 0, 0
 
 MtPyre_6F_MapWarps:: @ 838CAF0
 	warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc
index 044ff7fb5..71cb2095a 100644
--- a/data/maps/events/MtPyre_Exterior.inc
+++ b/data/maps/events/MtPyre_Exterior.inc
@@ -1,6 +1,6 @@
 MtPyre_Exterior_MapObjects:: @ 838CB14
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, 1073, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, 1074, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2, 0, 0
 
 MtPyre_Exterior_MapWarps:: @ 838CB44
 	warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc
index 360c0c21e..21217ac8f 100644
--- a/data/maps/events/MtPyre_Summit.inc
+++ b/data/maps/events/MtPyre_Summit.inc
@@ -1,10 +1,10 @@
 MtPyre_Summit_MapObjects:: @ 838CBD8
 	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 22, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0, 0, 0
-	object_event 2, 246, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 916, 0, 0
+	object_event 2, 246, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0
 	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 23, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0, 0, 0
-	object_event 4, 241, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, 917, 0, 0
-	object_event 5, 241, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, 917, 0, 0
-	object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, 917, 0, 0
+	object_event 4, 241, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
+	object_event 5, 241, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
+	object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
 
 MtPyre_Summit_MapWarps:: @ 838CC68
 	warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc
index 826e6a089..a3b7ffbe2 100644
--- a/data/maps/events/NewMauville_Inside.inc
+++ b/data/maps/events/NewMauville_Inside.inc
@@ -1,12 +1,12 @@
 NewMauville_Inside_MapObjects:: @ 838DF08
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, 1075, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, 1076, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, 1110, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, 1122, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, 1123, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, 974, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, 975, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, 976, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0
 
 NewMauville_Inside_MapWarps:: @ 838DFC8
 	warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc
index 3b5fc9150..828ffc986 100644
--- a/data/maps/events/OldaleTown.inc
+++ b/data/maps/events/OldaleTown.inc
@@ -2,7 +2,7 @@ OldaleTown_MapObjects:: @ 8380A78
 	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0
-	object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, 979, 0, 0
+	object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0
 
 OldaleTown_MapWarps:: @ 8380AD8
 	warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc
index 3b6329587..739cbf905 100644
--- a/data/maps/events/PetalburgCity.inc
+++ b/data/maps/events/PetalburgCity.inc
@@ -1,12 +1,12 @@
 PetalburgCity_MapObjects:: @ 837F5F0
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, 728, 0, 0
-	object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 726, 0, 0
+	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0
 	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 811, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 812, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, 1039, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, 1040, 0, 0
+	object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0
+	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2, 0, 0
 	object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0
 
 PetalburgCity_MapWarps:: @ 837F6C8
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc
index 2b09951ee..781de130d 100644
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ b/data/maps/events/PetalburgCity_Gym.inc
@@ -1,5 +1,5 @@
 PetalburgCity_Gym_MapObjects:: @ 8387168
-	object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, 772, 0, 0
+	object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM, 0, 0
 	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 94, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EE6, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 81, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154DF6, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 42, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E32, 0, 0, 0
@@ -7,8 +7,8 @@ PetalburgCity_Gym_MapObjects:: @ 8387168
 	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 68, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E6E, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 16, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F5E, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EAA, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, 781, 0, 0
-	object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 866, 0, 0
+	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0
+	object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0
 
 PetalburgCity_Gym_MapWarps:: @ 8387258
 	warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
index 73a1d4cfb..e80b33c13 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/events/PetalburgWoods.inc
@@ -1,16 +1,16 @@
 PetalburgWoods_MapObjects:: @ 838C14C
-	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
-	object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, 1055, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, 1058, 0, 0
+	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0
+	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3, 0, 0
 	object_event 8, MAP_OBJ_GFX_BOY_2, 0, 15, 0, 19, 0, 3, 3, 33, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CECA, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 7, 0, 32, 0, 3, 22, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF27, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 4, 0, 14, 0, 3, 20, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF3E, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_BOY_3, 0, 30, 0, 34, 0, 3, 2, 18, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CED3, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, 1117, 0, 0
+	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4, 0, 0
 	object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0
 
 PetalburgWoods_MapWarps:: @ 838C284
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
index bad4e3ba9..a527ada51 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/events/Route101.inc
@@ -1,10 +1,10 @@
 Route101_MapObjects:: @ 83810BC
 	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, 720, 0, 0
-	object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, 700, 0, 0
-	object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, 750, 0, 0
-	object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, 897, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0
+	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0
+	object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0
+	object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0
+	object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0
+	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0
 
 Route101_MapCoordEvents:: @ 838114C
 	coord_event 10, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948
diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc
index 7ffa0e191..2736c7a61 100644
--- a/data/maps/events/Route102.inc
+++ b/data/maps/events/Route102.inc
@@ -4,7 +4,7 @@ Route102_MapObjects:: @ 83811FC
 	object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 25, 0, 15, 0, 3, 7, 0, 0, 1, 0, 2, 0, Route102_EventScript_14EB3C, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1, 0, 0
 	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
index 462fe1a3b..580e8a91b 100644
--- a/data/maps/events/Route103.inc
+++ b/data/maps/events/Route103.inc
@@ -1,6 +1,6 @@
 Route103_MapObjects:: @ 8381300
 	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0
-	object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, 723, 0, 0
+	object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0
 	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0
@@ -9,11 +9,11 @@ Route103_MapObjects:: @ 8381300
 	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0
+	object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 0, 0
 	object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
+	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1, 0, 0
+	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
 
 Route103_MapBGEvents:: @ 8381468
 	bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B
diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc
index 8ddfab738..f7034ff26 100644
--- a/data/maps/events/Route104.inc
+++ b/data/maps/events/Route104.inc
@@ -5,8 +5,8 @@ Route104_MapObjects:: @ 8381488
 	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 27, 0, 63, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route104_EventScript_14EF81, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 30, 0, 50, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF8A, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 28, 0, 74, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0
+	object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 0, 0
+	object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104, 0, 0
 	object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0
@@ -19,17 +19,17 @@ Route104_MapObjects:: @ 8381488
 	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0
 	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0
 	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0
-	object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0
+	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1, 0, 0
+	object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 0, 0
 	object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0
 	object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F279, 0, 0, 0
 	object_event 25, MAP_OBJ_GFX_BOY_4, 0, 11, 0, 44, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F1DE, 0, 0, 0
 	object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 25, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F21C, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0
+	object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2, 0, 0
 	object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0
-	object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
-	object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0
+	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3, 0, 0
+	object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4, 0, 0
 	object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0
 
 Route104_MapWarps:: @ 8381788
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc
index f04195c9b..d77b2977a 100644
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ b/data/maps/events/Route104_MrBrineysHouse.inc
@@ -1,6 +1,6 @@
 Route104_MrBrineysHouse_MapObjects:: @ 838B654
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, 739, 0, 0
-	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, 881, 0, 0
+	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 0, 0
+	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0
 
 Route104_MrBrineysHouse_MapWarps:: @ 838B684
 	warp_def 5, 8, 0, 0, MAP_ROUTE104
diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc
index 7cf684e55..45c0866e3 100644
--- a/data/maps/events/Route105.inc
+++ b/data/maps/events/Route105.inc
@@ -3,7 +3,7 @@ Route105_MapObjects:: @ 8381854
 	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 10, 0, 44, 0, 1, 27, 7, 0, 1, 0, 3, 0, Route105_EventScript_14F2E9, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 26, 0, 36, 0, 1, 25, 112, 0, 1, 0, 3, 0, Route105_EventScript_14F300, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 19, 0, 9, 0, 1, 24, 80, 0, 1, 0, 3, 0, Route105_EventScript_14F317, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, 1003, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1, 0, 0
 	object_event 6, MAP_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0
 
 Route105_MapWarps:: @ 83818E4
diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc
index 6af8d92fa..991e12f74 100644
--- a/data/maps/events/Route106.inc
+++ b/data/maps/events/Route106.inc
@@ -3,7 +3,7 @@ Route106_MapObjects:: @ 838190C
 	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 5, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F34F, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 51, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route106_EventScript_14F366, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 65, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F3A4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, 1004, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1, 0, 0
 
 Route106_MapWarps:: @ 8381984
 	warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc
index 3156a5cb3..5924bc0d2 100644
--- a/data/maps/events/Route109.inc
+++ b/data/maps/events/Route109.inc
@@ -1,6 +1,6 @@
 Route109_MapObjects:: @ 8381AFC
-	object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 744, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, 741, 0, 0
+	object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 0, 0
+	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109, 0, 0
 	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 12, 0, 36, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7AD, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 25, 0, 42, 0, 3, 15, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7C4, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 19, 0, 19, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F7DB, 0, 0, 0
@@ -8,7 +8,7 @@ Route109_MapObjects:: @ 8381AFC
 	object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 21, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F809, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 8, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F847, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F705, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, 1005, 0, 0
+	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1, 0, 0
 	object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 29, 0, 32, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F89C, 0, 0, 0
 	object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 31, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F885, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 15, 0, 52, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route109_EventScript_14F8B3, 0, 0, 0
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
index 5c94ac7bc..91531dbe5 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/events/Route110.inc
@@ -17,17 +17,17 @@ Route110_MapObjects:: @ 8381D58
 	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0
 	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0
+	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2, 0, 0
+	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1, 0, 0
 	object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0
-	object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, 900, 0, 0
-	object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, 900, 0, 0
-	object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, 900, 0, 0
-	object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, 900, 0, 0
-	object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 900, 0, 0
+	object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
 	object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0
-	object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, 919, 0, 0
-	object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 922, 0, 0
+	object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0
+	object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0
 	object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 69, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FC10, 0, 0, 0
 	object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0
 
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc
index bedc6357d..8c3cf7e11 100644
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ b/data/maps/events/Route110_TrickHouseEnd.inc
@@ -1,5 +1,5 @@
 Route110_TrickHouseEnd_MapObjects:: @ 83921D0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, 899, 0, 0
+	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END, 0, 0
 
 Route110_TrickHouseEnd_MapWarps:: @ 83921E8
 	warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc
index 59e329d98..9f6e305cc 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ b/data/maps/events/Route110_TrickHouseEntrance.inc
@@ -1,5 +1,5 @@
 Route110_TrickHouseEntrance_MapObjects:: @ 8392140
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, 872, 0, 0
+	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0
 
 Route110_TrickHouseEntrance_MapWarps:: @ 8392158
 	warp_def 5, 7, 3, 1, MAP_ROUTE110
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc
index 8a3bb24a3..61ae942ee 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle1.inc
@@ -2,22 +2,22 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C
 	object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
-	object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
-	object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
-	object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 23, 0, 0
-	object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 22, 0, 0
-	object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 21, 0, 0
-	object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 25, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 24, 0, 0
-	object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 26, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 28, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 27, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 29, 0, 0
-	object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 30, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0
+	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
+	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
+	object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17, 0, 0
+	object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16, 0, 0
+	object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15, 0, 0
+	object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19, 0, 0
+	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18, 0, 0
+	object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A, 0, 0
+	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C, 0, 0
+	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0
+	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0
+	object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 0, 0
+	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1, 0, 0
+	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0
 
 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc
index f92097eec..264465641 100644
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle2.inc
@@ -2,8 +2,8 @@ Route110_TrickHousePuzzle2_MapObjects:: @ 839245C
 	object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle2_EventScript_161E78, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 0, 10, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle2_EventScript_161E8F, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 9, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle2_EventScript_161EA6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, 1062, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, 1061, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1, 0, 0
 
 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc
index 9a666766f..5c360ac6c 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle3.inc
@@ -2,14 +2,14 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C
 	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
+	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2, 0, 0
+	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1, 0, 0
+	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
 
 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc
index 26efce267..6c630a082 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle4.inc
@@ -2,18 +2,18 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC
 	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 8, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_16276B, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
-	object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0
-	object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
+	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
+	object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0
+	object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0
 
 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc
index ad7c26e44..f01d5783d 100644
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle6.inc
@@ -2,7 +2,7 @@ Route110_TrickHousePuzzle6_MapObjects:: @ 8392A2C
 	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_163107, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 14, 0, 12, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_16311E, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route110_TrickHousePuzzle6_EventScript_163135, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, 1067, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1, 0, 0
 
 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc
index f666b4640..5beae5e18 100644
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle7.inc
@@ -2,7 +2,7 @@ Route110_TrickHousePuzzle7_MapObjects:: @ 8392AC4
 	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle7_EventScript_1633D6, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_LASS, 0, 14, 0, 3, 0, 3, 7, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_163404, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 9, 0, 10, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_1633ED, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, 1068, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1, 0, 0
 
 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc
index 0caa0e68d..2df410599 100644
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle8.inc
@@ -2,7 +2,7 @@ Route110_TrickHousePuzzle8_MapObjects:: @ 8392BA8
 	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 21, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163439, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 11, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163467, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle8_EventScript_163450, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, 1069, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1, 0, 0
 
 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc
index 6de5deba0..b282c7a8d 100644
--- a/data/maps/events/Route111.inc
+++ b/data/maps/events/Route111.inc
@@ -1,8 +1,8 @@
 Route111_MapObjects:: @ 83821A0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, 768, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 769, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0
+	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0
+	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0
+	object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 0, 0
+	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE, 0, 0
 	object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0
@@ -11,29 +11,29 @@ Route111_MapObjects:: @ 83821A0
 	object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_CAMPER, 0, 21, 0, 47, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route111_EventScript_1503D5, 0, 0, 0
 	object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
+	object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0
+	object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0
+	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
 	object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0
+	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1, 0, 0
 	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0
 	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0
-	object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0
-	object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0
-	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0
-	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0
-	object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
+	object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0
+	object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0
+	object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0
+	object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0
+	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2, 0, 0
+	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3, 0, 0
+	object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
 	object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0
 	object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0
 	object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0
 	object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 12, 0, 3, 7, 4, 0, 1, 0, 4, 0, Route111_EventScript_1504C4, 0, 0, 0
 	object_event 32, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 27, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_150486, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, 960, 0, 0
-	object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, 963, 0, 0
-	object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, 964, 0, 0
+	object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN, 0, 0
+	object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL, 0, 0
+	object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL, 0, 0
 	object_event 36, MAP_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0
 
 Route111_MapWarps:: @ 8382500
diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc
index 50b300bc9..c739f9d0b 100644
--- a/data/maps/events/Route112.inc
+++ b/data/maps/events/Route112.inc
@@ -1,16 +1,16 @@
 Route112_MapObjects:: @ 8382818
-	object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, 819, 0, 0
+	object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0
 	object_event 2, MAP_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0
-	object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0
+	object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0
 	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0
+	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1, 0, 0
 
 Route112_MapWarps:: @ 8382938
 	warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
index 4e9bd98b5..dec48e2e1 100644
--- a/data/maps/events/Route113.inc
+++ b/data/maps/events/Route113.inc
@@ -4,8 +4,8 @@ Route113_MapObjects:: @ 83829A0
 	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 62, 0, 8, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route113_EventScript_15063B, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 21, 0, 11, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route113_EventScript_150652, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 51, 0, 11, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route113_EventScript_150669, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, 1012, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, 1013, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2, 0, 0
 	object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 3, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506A7, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506E5, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_1506FC, 0, 0, 0
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
index 4717199da..0e4097651 100644
--- a/data/maps/events/Route114.inc
+++ b/data/maps/events/Route114.inc
@@ -7,19 +7,19 @@ Route114_MapObjects:: @ 8382C48
 	object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
+	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1, 0, 0
+	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2, 0, 0
+	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
 	object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0
 	object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0
 	object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
-	object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
-	object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
-	object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
+	object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
+	object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
 	object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0
 	object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0
 
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc
index 40ff30536..3c14720a6 100644
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ b/data/maps/events/Route114_LanettesHouse.inc
@@ -1,5 +1,5 @@
 Route114_LanettesHouse_MapObjects:: @ 838B92C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, 870, 0, 0
+	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE, 0, 0
 
 Route114_LanettesHouse_MapWarps:: @ 838B944
 	warp_def 5, 7, 0, 2, MAP_ROUTE114
diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc
index 23250916c..83c7e97b8 100644
--- a/data/maps/events/Route115.inc
+++ b/data/maps/events/Route115.inc
@@ -8,13 +8,13 @@ Route115_MapObjects:: @ 8382F2C
 	object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0
+	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1, 0, 0
+	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2, 0, 0
+	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3, 0, 0
 	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0
+	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4, 0, 0
 
 Route115_MapWarps:: @ 83830AC
 	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
index 699ed4616..77262f4c1 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/events/Route116.inc
@@ -2,25 +2,25 @@ Route116_MapObjects:: @ 8383170
 	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
+	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
 	object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3, 0, 0
 	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
+	object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0
+	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
 	object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
-	object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0
+	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
+	object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4, 0, 0
 	object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0
 	object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, 947, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, 1001, 0, 0
-	object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, 894, 0, 0
-	object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, 813, 0, 0
+	object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 0, 0
+	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1, 0, 0
+	object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0
+	object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0
 
 Route116_MapWarps:: @ 8383380
 	warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL
diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc
index 67d391044..90f3e1f8f 100644
--- a/data/maps/events/Route117.inc
+++ b/data/maps/events/Route117.inc
@@ -12,9 +12,9 @@ Route117_MapObjects:: @ 8383440
 	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0
 	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0
+	object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1, 0, 0
+	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2, 0, 0
 	object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0
 	object_event 19, MAP_OBJ_GFX_LASS, 0, 46, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150EE2, 0, 0, 0
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
index df887ba1e..2faff5e7d 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/events/Route118.inc
@@ -3,22 +3,22 @@ Route118_MapObjects:: @ 8383684
 	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0
-	object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0
+	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0
+	object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0
 	object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, 901, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
+	object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0
+	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0
+	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0
+	object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0
+	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
 	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0
 	object_event 16, MAP_OBJ_GFX_MAN_6, 0, 56, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route118_EventScript_151150, 0, 0, 0
 	object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 39, 0, 15, 0, 3, 1, 0, 0, 1, 0, 2, 0, Route118_EventScript_1510CD, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_MAN_6, 0, 17, 0, 11, 0, 3, 15, 17, 0, 1, 0, 3, 0, Route118_EventScript_1510FB, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 966, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, 1121, 0, 0
+	object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118, 0, 0
+	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0
 
 Route118_MapCoordEvents:: @ 8383864
 	coord_event 43, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FAE
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
index 491f5b469..506256be0 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/events/Route119.inc
@@ -14,27 +14,27 @@ Route119_MapObjects:: @ 8383914
 	object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0
-	object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 851, 0, 0
-	object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, 1024, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, 1025, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, 1026, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, 1027, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, 1028, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, 1029, 0, 0
-	object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, 890, 0, 0
-	object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0
-	object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0
+	object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0
+	object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1, 0, 0
+	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2, 0, 0
+	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3, 0, 0
+	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4, 0, 0
+	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5, 0, 0
+	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6, 0, 0
+	object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0
 	object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0
 	object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0
 	object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0
 	object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0
 	object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0
 	object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0
+	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7, 0, 0
 	object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0
 	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, 989, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, 990, 0, 0
+	object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0
+	object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2, 0, 0
 	object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0
 
 Route119_MapWarps:: @ 8383C8C
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc
index 58c20fc6e..920439340 100644
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/events/Route119_WeatherInstitute_1F.inc
@@ -1,8 +1,8 @@
 Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0
-	object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, 890, 0, 0
-	object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, 890, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, 892, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, 892, 0, 0
+	object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0
+	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0
 	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0
 
 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc
index b78eb76d6..4a2db97f1 100644
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/events/Route119_WeatherInstitute_2F.inc
@@ -1,10 +1,10 @@
 Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94
-	object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, 890, 0, 0
-	object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, 890, 0, 0
-	object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, 890, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0
+	object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0
 	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0
+	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0
 
 Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24
 	warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
index febefb26a..4ddfe4978 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/events/Route120.inc
@@ -14,32 +14,32 @@ Route120_MapObjects:: @ 8383F30
 	object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, 1030, 0, 0
-	object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, 798, 0, 0
-	object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0
-	object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0
-	object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0
-	object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0
+	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1, 0, 0
+	object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0
+	object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0
+	object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0
+	object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0
+	object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2, 0, 0
 	object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0
 	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0
 	object_event 25, MAP_OBJ_GFX_HIKER, 0, 9, 0, 60, 0, 3, 21, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A8B, 0, 0, 0
 	object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 16, 0, 6, 0, 3, 23, 0, 0, 1, 0, 4, 0, Route120_EventScript_151AA2, 0, 0, 0
 	object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 34, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route120_EventScript_151AB9, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, 1108, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0
-	object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0
-	object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0
-	object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
-	object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
+	object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4, 0, 0
+	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3, 0, 0
+	object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1, 0, 0
+	object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120, 0, 0
+	object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
+	object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
 	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0
 	object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0
-	object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, 982, 0, 0
-	object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, 985, 0, 0
-	object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, 986, 0, 0
-	object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, 988, 0, 0
-	object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, 987, 0, 0
+	object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2, 0, 0
+	object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3, 0, 0
+	object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4, 0, 0
+	object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5, 0, 0
+	object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7, 0, 0
+	object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0
 
 Route120_MapWarps:: @ 8384308
 	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
index 94de6ed39..b97f956c2 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/events/Route121.inc
@@ -10,17 +10,17 @@ Route121_MapObjects:: @ 8384504
 	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0
-	object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
+	object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
+	object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
+	object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
+	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
 	object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0
 	object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0
 	object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0
-	object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
+	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1, 0, 0
+	object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
 
 Route121_MapWarps:: @ 8384714
 	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc
index f29d5d242..ff4f066b8 100644
--- a/data/maps/events/Route123.inc
+++ b/data/maps/events/Route123.inc
@@ -16,11 +16,11 @@ Route123_MapObjects:: @ 83847F8
 	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0
 	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0
 	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
-	object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0
+	object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
+	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1, 0, 0
+	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2, 0, 0
 	object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0
 	object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0
 	object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0
@@ -31,8 +31,8 @@ Route123_MapObjects:: @ 83847F8
 	object_event 30, MAP_OBJ_GFX_PSYCHIC_M, 0, 138, 0, 12, 0, 3, 9, 0, 0, 1, 0, 6, 0, Route123_EventScript_151D16, 0, 0, 0
 	object_event 31, MAP_OBJ_GFX_LASS, 0, 50, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route123_EventScript_151D54, 0, 0, 0
 	object_event 32, MAP_OBJ_GFX_HEX_MANIAC, 0, 87, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route123_EventScript_151DC8, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, 1104, 0, 0
-	object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, 1109, 0, 0
+	object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3, 0, 0
+	object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4, 0, 0
 
 Route123_MapWarps:: @ 8384B28
 	warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE
diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc
index 7001c5928..eb92f81a4 100644
--- a/data/maps/events/Route124.inc
+++ b/data/maps/events/Route124.inc
@@ -4,9 +4,9 @@ Route124_MapObjects:: @ 8384D10
 	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 14, 0, 27, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route124_EventScript_151E26, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 49, 0, 45, 0, 1, 24, 134, 0, 1, 0, 3, 0, Route124_EventScript_151E64, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 60, 0, 74, 0, 1, 28, 7, 0, 1, 0, 2, 0, Route124_EventScript_151E7B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, 1092, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, 1093, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, 1066, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1, 0, 0
 	object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151E92, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0
 
diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc
index 50d1dca52..a8855c41f 100644
--- a/data/maps/events/Route126.inc
+++ b/data/maps/events/Route126.inc
@@ -3,7 +3,7 @@ Route126_MapObjects:: @ 8384F1C
 	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 63, 0, 1, 28, 9, 0, 1, 0, 3, 0, Route126_EventScript_152025, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 49, 0, 1, 7, 0, 0, 1, 0, 3, 0, Route126_EventScript_15203C, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 64, 0, 44, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route126_EventScript_152053, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, 1105, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1, 0, 0
 
 Route126_MapEvents:: @ 8384F94
 	map_events Route126_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc
index b3744194e..d71b15c74 100644
--- a/data/maps/events/Route127.inc
+++ b/data/maps/events/Route127.inc
@@ -1,8 +1,8 @@
 Route127_MapObjects:: @ 8384FA8
 	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 68, 0, 1, 14, 0, 0, 1, 0, 2, 0, Route127_EventScript_15207A, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 44, 0, 1, 21, 0, 0, 1, 0, 4, 0, Route127_EventScript_152091, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, 1034, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, 1035, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2, 0, 0
 	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 53, 0, 13, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520A8, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 52, 0, 25, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520D6, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 64, 0, 19, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520BF, 0, 0, 0
diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc
index 74f99d02c..1f86907bd 100644
--- a/data/maps/events/Route128.inc
+++ b/data/maps/events/Route128.inc
@@ -1,9 +1,9 @@
 Route128_MapObjects:: @ 83850D0
 	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 834, 0, 0
-	object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 944, 0, 0
-	object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 945, 0, 0
+	object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0
+	object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0
+	object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0
 	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 24, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, Route128_EventScript_152337, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0
diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc
index 009604d4b..027519c2d 100644
--- a/data/maps/events/Route130.inc
+++ b/data/maps/events/Route130.inc
@@ -1,7 +1,7 @@
 Route130_MapObjects:: @ 838523C
 	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, 17, 0, 0
+	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, FLAG_TEMP_11, 0, 0
 
 Route130_MapEvents:: @ 8385284
 	map_events Route130_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc
index b19e96363..97fc3d5db 100644
--- a/data/maps/events/Route132.inc
+++ b/data/maps/events/Route132.inc
@@ -1,7 +1,7 @@
 Route132_MapObjects:: @ 8385344
 	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 3, 0, 1, 46, 51, 0, 1, 0, 2, 0, Route132_EventScript_1524E5, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 41, 0, 16, 0, 1, 49, 68, 0, 1, 0, 2, 0, Route132_EventScript_1524FC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, 1036, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1, 0, 0
 	object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 46, 0, 28, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route132_EventScript_15252A, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 9, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route132_EventScript_152513, 0, 0, 0
 
diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc
index 1461293e8..3d73ef1c9 100644
--- a/data/maps/events/Route133.inc
+++ b/data/maps/events/Route133.inc
@@ -2,8 +2,8 @@ Route133_MapObjects:: @ 83853D0
 	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 6, 0, 4, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route133_EventScript_152542, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152570, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 69, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152559, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, 1037, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, 1038, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2, 0, 0
 	object_event 6, MAP_OBJ_GFX_MAN_6, 0, 37, 0, 16, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route133_EventScript_15259E, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route133_EventScript_152587, 0, 0, 0
 
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
index f42fd059c..c16bfcdb0 100644
--- a/data/maps/events/RustboroCity.inc
+++ b/data/maps/events/RustboroCity.inc
@@ -7,12 +7,12 @@ RustboroCity_MapObjects:: @ 837FD14
 	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 26, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3BA, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, 732, 0, 0
-	object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 731, 0, 0
+	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0
+	object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0
 	object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, 1041, 0, 0
+	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1, 0, 0
 	object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0
-	object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, 814, 0, 0
+	object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0
 
 RustboroCity_MapWarps:: @ 837FE64
 	warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc
index 8e2aef57b..41f37c7b1 100644
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc
@@ -1,6 +1,6 @@
 RustboroCity_DevonCorp_3F_MapObjects:: @ 838891C
 	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 17, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, 949, 0, 0
+	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F, 0, 0
 	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0
 
 RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
index 4779473d8..4c25d2131 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/events/RusturfTunnel.inc
@@ -1,14 +1,14 @@
 RusturfTunnel_MapObjects:: @ 838BD2C
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0
-	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 931, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0
-	object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 932, 0, 0
+	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0
+	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 0, 0
+	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1, 0, 0
+	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2, 0, 0
+	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0
+	object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0
+	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0
 	object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0
+	object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0
 
 RusturfTunnel_MapWarps:: @ 838BE1C
 	warp_def 4, 10, 3, 0, MAP_ROUTE116
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc
index 94b84a968..9ca3db288 100644
--- a/data/maps/events/SSTidalCorridor.inc
+++ b/data/maps/events/SSTidalCorridor.inc
@@ -1,8 +1,8 @@
 SSTidalCorridor_MapObjects:: @ 83916F8
 	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 1, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 16, 0, 7, 0, 3, 3, 32, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FE60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, 950, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, 950, 0, 0
+	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0
+	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0
 
 SSTidalCorridor_MapWarps:: @ 8391758
 	warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc
index 82758cc57..af5fdbfa4 100644
--- a/data/maps/events/SSTidalRooms.inc
+++ b/data/maps/events/SSTidalRooms.inc
@@ -6,7 +6,7 @@ SSTidalRooms_MapObjects:: @ 839189C
 	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFBD, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_BOY_4, 0, 22, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FFD8, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 15, 0, 6, 0, 3, 9, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFEF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, 951, 0, 0
+	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL, 0, 0
 
 SSTidalRooms_MapWarps:: @ 839195C
 	warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc
index cea87fb14..68c32e585 100644
--- a/data/maps/events/SafariZone_Northeast.inc
+++ b/data/maps/events/SafariZone_Northeast.inc
@@ -1,13 +1,13 @@
 SafariZone_Northeast_MapObjects:: @ 8391A2C
 	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0
+	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
+	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
+	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1, 0, 0
 
 SafariZone_Northeast_MapEvents:: @ 8391B04
 	map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc
index 0a1846b29..e2cabbd38 100644
--- a/data/maps/events/SafariZone_Northwest.inc
+++ b/data/maps/events/SafariZone_Northwest.inc
@@ -1,6 +1,6 @@
 SafariZone_Northwest_MapObjects:: @ 83919E8
 	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 8, 0, 8, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, 1094, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1, 0, 0
 
 SafariZone_Northwest_MapEvents:: @ 8391A18
 	map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc
index db8420a33..2beec82ae 100644
--- a/data/maps/events/SafariZone_Southwest.inc
+++ b/data/maps/events/SafariZone_Southwest.inc
@@ -1,6 +1,6 @@
 SafariZone_Southwest_MapObjects:: @ 8391B18
 	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, 1131, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST, 0, 0
 
 SafariZone_Southwest_MapWarps:: @ 8391B48
 	warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc
index 9ba2d3098..1a4f4d92d 100644
--- a/data/maps/events/ScorchedSlab.inc
+++ b/data/maps/events/ScorchedSlab.inc
@@ -1,5 +1,5 @@
 ScorchedSlab_MapObjects:: @ 838E988
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, 1079, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1, 0, 0
 
 ScorchedSlab_MapWarps:: @ 838E9A0
 	warp_def 7, 16, 1, 1, MAP_ROUTE120
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc
index c9d62777f..b86a61cb8 100644
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ b/data/maps/events/SeafloorCavern_Room1.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room1_MapObjects:: @ 838D0B8
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
-	object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0
-	object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+	object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room1_MapWarps:: @ 838D130
 	warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc
index 6a276fc3f..e9da0033e 100644
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ b/data/maps/events/SeafloorCavern_Room2.inc
@@ -1,13 +1,13 @@
 SeafloorCavern_Room2_MapObjects:: @ 838D15C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 24, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0
+	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
 
 SeafloorCavern_Room2_MapWarps:: @ 838D234
 	warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc
index 8c6e2b4a2..a78848955 100644
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ b/data/maps/events/SeafloorCavern_Room3.inc
@@ -1,14 +1,14 @@
 SeafloorCavern_Room3_MapObjects:: @ 838D268
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
-	object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
+	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
+	object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room3_MapWarps:: @ 838D358
 	warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc
index 26016edf3..565bcfcae 100644
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ b/data/maps/events/SeafloorCavern_Room4.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room4_MapObjects:: @ 838D384
-	object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, 946, 0, 0
+	object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room4_MapWarps:: @ 838D39C
 	warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc
index c31d31042..887ee1eb9 100644
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ b/data/maps/events/SeafloorCavern_Room5.inc
@@ -1,10 +1,10 @@
 SeafloorCavern_Room5_MapObjects:: @ 838D3D0
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
 
 SeafloorCavern_Room5_MapWarps:: @ 838D460
 	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc
index 93c93e4a0..35d230ff2 100644
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ b/data/maps/events/SeafloorCavern_Room8.inc
@@ -1,16 +1,16 @@
 SeafloorCavern_Room8_MapObjects:: @ 838D4DC
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
+	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
+	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0
+	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0
+	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C, 0, 0
 
 SeafloorCavern_Room8_MapWarps:: @ 838D5FC
 	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc
index 414ab7e07..77719389b 100644
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ b/data/maps/events/SeafloorCavern_Room9.inc
@@ -1,11 +1,11 @@
 SeafloorCavern_Room9_MapObjects:: @ 838D620
-	object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 859, 0, 0
-	object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 828, 0, 0
-	object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 829, 0, 0
-	object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0
-	object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, 1090, 0, 0
-	object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 733, 0, 0
+	object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0
+	object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0
+	object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0
+	object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+	object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0
+	object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room9_MapWarps:: @ 838D6C8
 	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc
index 53d359f53..1ef513e65 100644
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ b/data/maps/events/SecretBase_BlueCave1.inc
@@ -1,19 +1,19 @@
 SecretBase_BlueCave1_MapObjects:: @ 838F18C
-	object_event 1, 255, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BlueCave1_MapWarps:: @ 838F2F4
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc
index ee1d5ddd0..2a2fdb421 100644
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ b/data/maps/events/SecretBase_BlueCave2.inc
@@ -1,19 +1,19 @@
 SecretBase_BlueCave2_MapObjects:: @ 838FAA4
-	object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BlueCave2_MapWarps:: @ 838FC0C
 	warp_def 7, 5, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc
index 453937fc6..8fc65ad54 100644
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ b/data/maps/events/SecretBase_BlueCave3.inc
@@ -1,19 +1,19 @@
 SecretBase_BlueCave3_MapObjects:: @ 83903BC
-	object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BlueCave3_MapWarps:: @ 8390524
 	warp_def 4, 15, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc
index 28cfa89a3..497123d44 100644
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ b/data/maps/events/SecretBase_BlueCave4.inc
@@ -1,19 +1,19 @@
 SecretBase_BlueCave4_MapObjects:: @ 8390CD4
-	object_event 1, 255, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BlueCave4_MapWarps:: @ 8390E3C
 	warp_def 4, 15, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc
index 10adecc59..2db31b4d2 100644
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ b/data/maps/events/SecretBase_BrownCave1.inc
@@ -1,19 +1,19 @@
 SecretBase_BrownCave1_MapObjects:: @ 838F008
-	object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BrownCave1_MapWarps:: @ 838F170
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc
index 098499878..72fb53a86 100644
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ b/data/maps/events/SecretBase_BrownCave2.inc
@@ -1,19 +1,19 @@
 SecretBase_BrownCave2_MapObjects:: @ 838F920
-	object_event 1, 255, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BrownCave2_MapWarps:: @ 838FA88
 	warp_def 1, 7, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc
index 34167d50b..2b320d6bb 100644
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ b/data/maps/events/SecretBase_BrownCave3.inc
@@ -1,19 +1,19 @@
 SecretBase_BrownCave3_MapObjects:: @ 8390238
-	object_event 1, 255, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BrownCave3_MapWarps:: @ 83903A0
 	warp_def 11, 9, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc
index c1e884155..26b0f2537 100644
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ b/data/maps/events/SecretBase_BrownCave4.inc
@@ -1,19 +1,19 @@
 SecretBase_BrownCave4_MapObjects:: @ 8390B50
-	object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BrownCave4_MapWarps:: @ 8390CB8
 	warp_def 2, 8, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc
index b9700b06f..733d4d808 100644
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ b/data/maps/events/SecretBase_RedCave1.inc
@@ -1,19 +1,19 @@
 SecretBase_RedCave1_MapObjects:: @ 838EE84
-	object_event 1, 255, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_RedCave1_MapWarps:: @ 838EFEC
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc
index b13f03a74..84fcd52f0 100644
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ b/data/maps/events/SecretBase_RedCave2.inc
@@ -1,19 +1,19 @@
 SecretBase_RedCave2_MapObjects:: @ 838F79C
-	object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_RedCave2_MapWarps:: @ 838F904
 	warp_def 3, 14, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc
index 209979af3..f129a82fb 100644
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ b/data/maps/events/SecretBase_RedCave3.inc
@@ -1,19 +1,19 @@
 SecretBase_RedCave3_MapObjects:: @ 83900B4
-	object_event 1, 255, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_RedCave3_MapWarps:: @ 839021C
 	warp_def 3, 6, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc
index 93b552df0..97e71648e 100644
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ b/data/maps/events/SecretBase_RedCave4.inc
@@ -1,19 +1,19 @@
 SecretBase_RedCave4_MapObjects:: @ 83909CC
-	object_event 1, 255, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_RedCave4_MapWarps:: @ 8390B34
 	warp_def 2, 12, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc
index 4f3fc1011..7727f5efb 100644
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ b/data/maps/events/SecretBase_Shrub1.inc
@@ -1,19 +1,19 @@
 SecretBase_Shrub1_MapObjects:: @ 838F618
-	object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Shrub1_MapWarps:: @ 838F780
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc
index 43d752db7..32b495b05 100644
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ b/data/maps/events/SecretBase_Shrub2.inc
@@ -1,19 +1,19 @@
 SecretBase_Shrub2_MapObjects:: @ 838FF30
-	object_event 1, 255, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Shrub2_MapWarps:: @ 8390098
 	warp_def 7, 5, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc
index 80bc2a787..173305a86 100644
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ b/data/maps/events/SecretBase_Shrub3.inc
@@ -1,19 +1,19 @@
 SecretBase_Shrub3_MapObjects:: @ 8390848
-	object_event 1, 255, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Shrub3_MapWarps:: @ 83909B0
 	warp_def 6, 9, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc
index 1e72213d8..1920bbd08 100644
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ b/data/maps/events/SecretBase_Shrub4.inc
@@ -1,19 +1,19 @@
 SecretBase_Shrub4_MapObjects:: @ 8391160
-	object_event 1, 255, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Shrub4_MapWarps:: @ 83912C8
 	warp_def 11, 8, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc
index a7e0ff822..a43b1ad76 100644
--- a/data/maps/events/SecretBase_Tree1.inc
+++ b/data/maps/events/SecretBase_Tree1.inc
@@ -1,19 +1,19 @@
 SecretBase_Tree1_MapObjects:: @ 838F494
-	object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Tree1_MapWarps:: @ 838F5FC
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc
index 3d58e58a5..aa0ef4b7d 100644
--- a/data/maps/events/SecretBase_Tree2.inc
+++ b/data/maps/events/SecretBase_Tree2.inc
@@ -1,19 +1,19 @@
 SecretBase_Tree2_MapObjects:: @ 838FDAC
-	object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Tree2_MapWarps:: @ 838FF14
 	warp_def 3, 14, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc
index 18f2e0329..69414c222 100644
--- a/data/maps/events/SecretBase_Tree3.inc
+++ b/data/maps/events/SecretBase_Tree3.inc
@@ -1,19 +1,19 @@
 SecretBase_Tree3_MapObjects:: @ 83906C4
-	object_event 1, 255, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Tree3_MapWarps:: @ 839082C
 	warp_def 8, 6, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc
index c4e1fc225..3ea6c57ea 100644
--- a/data/maps/events/SecretBase_Tree4.inc
+++ b/data/maps/events/SecretBase_Tree4.inc
@@ -1,19 +1,19 @@
 SecretBase_Tree4_MapObjects:: @ 8390FDC
-	object_event 1, 255, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Tree4_MapWarps:: @ 8391144
 	warp_def 7, 12, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc
index 5ae83e9a8..12fd311e3 100644
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ b/data/maps/events/SecretBase_YellowCave1.inc
@@ -1,19 +1,19 @@
 SecretBase_YellowCave1_MapObjects:: @ 838F310
-	object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_YellowCave1_MapWarps:: @ 838F478
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc
index d2dab3900..5e3abde63 100644
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ b/data/maps/events/SecretBase_YellowCave2.inc
@@ -1,19 +1,19 @@
 SecretBase_YellowCave2_MapObjects:: @ 838FC28
-	object_event 1, 255, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_YellowCave2_MapWarps:: @ 838FD90
 	warp_def 12, 7, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc
index ef6c9a406..3a139d2d9 100644
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ b/data/maps/events/SecretBase_YellowCave3.inc
@@ -1,19 +1,19 @@
 SecretBase_YellowCave3_MapObjects:: @ 8390540
-	object_event 1, 255, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_YellowCave3_MapWarps:: @ 83906A8
 	warp_def 5, 9, 0, 126, MAP_NONE
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc
index 9ef977a9a..5812a25e0 100644
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ b/data/maps/events/SecretBase_YellowCave4.inc
@@ -1,19 +1,19 @@
 SecretBase_YellowCave4_MapObjects:: @ 8390E58
-	object_event 1, 255, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, 173, 0, 0
-	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0
+	object_event 1, 255, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_YellowCave4_MapWarps:: @ 8390FC0
 	warp_def 6, 12, 0, 126, MAP_NONE
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
index 33e8b8c6c..8d38fb3ee 100644
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideEntranceRoom_MapObjects:: @ 838DCDC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, 1081, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1, 0, 0
 	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0
 
 ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc
index 7573a7040..6e1b36d08 100644
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc
@@ -1,6 +1,6 @@
 ShoalCave_LowTideIceRoom_MapObjects:: @ 838EDE0
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, 1112, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, 1113, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2, 0, 0
 
 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10
 	warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
index 43a108e66..c699b5e11 100644
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideInnerRoom_MapObjects:: @ 838DD40
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, 1082, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1, 0, 0
 
 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58
 	warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
index 5549afed7..ba5a0f495 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
 	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0
 
 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
index 68f933e2b..f4027a22f 100644
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideStairsRoom_MapObjects:: @ 838DDF4
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, 1083, 0, 0
+	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1, 0, 0
 
 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C
 	warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc
index e7ef67860..5d5fc52d4 100644
--- a/data/maps/events/SkyPillar_Top.inc
+++ b/data/maps/events/SkyPillar_Top.inc
@@ -1,5 +1,5 @@
 SkyPillar_Top_MapObjects:: @ 838EE50
-	object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, 773, 0, 0
+	object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA, 0, 0
 
 SkyPillar_Top_MapWarps:: @ 838EE68
 	warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc
index 35416b72d..adb85b96f 100644
--- a/data/maps/events/SlateportCity.inc
+++ b/data/maps/events/SlateportCity.inc
@@ -3,13 +3,13 @@ SlateportCity_MapObjects:: @ 837F7AC
 	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0
-	object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, 882, 0, 0
+	object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
 	object_event 6, MAP_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, 835, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, 835, 0, 0
-	object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, 840, 0, 0
+	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0
+	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0
+	object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT, 0, 0
 	object_event 12, MAP_OBJ_GFX_SAILOR, 0, 35, 0, 36, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_SAILOR, 0, 28, 0, 46, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 50, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCF4, 0, 0, 0
@@ -17,19 +17,19 @@ SlateportCity_MapObjects:: @ 837F7AC
 	object_event 16, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0
 	object_event 17, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0
-	object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, 882, 0, 0
-	object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, 882, 0, 0
+	object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
 	object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0
 	object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0
 	object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0
 	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, 948, 0, 0
+	object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 0, 0
 	object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0
-	object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, 882, 0, 0
-	object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, 882, 0, 0
-	object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, 882, 0, 0
-	object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, 882, 0, 0
-	object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, 882, 0, 0
+	object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
 
 SlateportCity_MapWarps:: @ 837FA94
 	warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc
index 09e6c23fb..0c701e0ca 100644
--- a/data/maps/events/SlateportCity_ContestLobby.inc
+++ b/data/maps/events/SlateportCity_ContestLobby.inc
@@ -3,7 +3,7 @@ SlateportCity_ContestLobby_MapObjects:: @ 8387788
 	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, 803, 0, 0
+	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 0, 0
 	object_event 6, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc
index c2f2d5afb..801f16779 100644
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ b/data/maps/events/SlateportCity_Harbor.inc
@@ -1,12 +1,12 @@
 SlateportCity_Harbor_MapObjects:: @ 8387F30
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, 905, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, 905, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, 905, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, 841, 0, 0
-	object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 860, 0, 0
-	object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 845, 0, 0
-	object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 846, 0, 0
-	object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 848, 0, 0
+	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
+	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
+	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
+	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0
+	object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0
+	object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0
+	object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0
+	object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0
 
 SlateportCity_Harbor_MapWarps:: @ 8387FF0
 	warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
index ede07b801..a4c92861d 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
@@ -1,18 +1,18 @@
 SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38
 	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0
-	object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, 883, 0, 0
-	object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, 883, 0, 0
-	object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, 883, 0, 0
-	object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, 883, 0, 0
-	object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, 883, 0, 0
+	object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
 	object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0
-	object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, 883, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, 961, 0, 0
-	object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, 961, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, 961, 0, 0
-	object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, 961, 0, 0
-	object_event 13, 241, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, 965, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, 961, 0, 0
+	object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 13, 241, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0
+	object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
 
 SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88
 	warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
index 67d7a6b18..911d8e7e2 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
@@ -1,11 +1,11 @@
 SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, 887, 0, 0
-	object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 886, 0, 0
-	object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 884, 0, 0
-	object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 885, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, 961, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, 961, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0
+	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0
+	object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0
+	object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0
+	object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0
+	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
 
 SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18
 	warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
index 8999b6887..a20a2f1b6 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
@@ -2,7 +2,7 @@ SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698
 	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, 869, 0, 0
+	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0
 
 SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8
 	warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc
index ed78d9136..3bbd87f0b 100644
--- a/data/maps/events/SootopolisCity.inc
+++ b/data/maps/events/SootopolisCity.inc
@@ -1,15 +1,15 @@
 SootopolisCity_MapObjects:: @ 8380608
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, 855, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, 856, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, 854, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, 854, 0, 0
-	object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, 816, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, 854, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, 854, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, 854, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, 854, 0, 0
-	object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, 973, 0, 0
-	object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, 854, 0, 0
+	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 0, 0
+	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS, 0, 0
+	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS, 0, 0
+	object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
 
 SootopolisCity_MapWarps:: @ 8380710
 	warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc
index 6145c4afc..4e655191d 100644
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ b/data/maps/events/SootopolisCity_Gym_1F.inc
@@ -1,5 +1,5 @@
 SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0
-	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, 815, 0, 0
+	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 0, 0
 	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0
 
 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc
index c2990f0da..bab1d1baf 100644
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ b/data/maps/events/SouthernIsland_Interior.inc
@@ -1,6 +1,6 @@
 SouthernIsland_Interior_MapObjects:: @ 8391E60
-	object_event 1, 240, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 910, 0, 0
-	object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 911, 0, 0
+	object_event 1, 240, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0
+	object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0
 
 SouthernIsland_Interior_MapWarps:: @ 8391E90
 	warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc
index 1dff571c3..fa8c12c65 100644
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ b/data/maps/events/Underwater_SeafloorCavern.inc
@@ -1,8 +1,8 @@
 Underwater_SeafloorCavern_MapObjects:: @ 838D018
-	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0
-	object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0
-	object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0
-	object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0
+	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+	object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+	object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+	object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
 
 Underwater_SeafloorCavern_MapWarps:: @ 838D078
 	warp_def 6, 7, 0, 0, MAP_UNDERWATER4
diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc
index 2fe386421..465bb2fde 100644
--- a/data/maps/events/VerdanturfTown_ContestLobby.inc
+++ b/data/maps/events/VerdanturfTown_ContestLobby.inc
@@ -3,7 +3,7 @@ VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00
 	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, 801, 0, 0
+	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 0, 0
 	object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0
 
 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc
index daa90d499..26c178a87 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/events/VerdanturfTown_WandasHouse.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC
-	object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, 806, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, 808, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, 809, 0, 0
+	object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE, 0, 0
+	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0
+	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0
 	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0
+	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0
 
 VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64
 	warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc
index 1d64e4f3a..593f2df02 100644
--- a/data/maps/events/VictoryRoad_1F.inc
+++ b/data/maps/events/VictoryRoad_1F.inc
@@ -2,10 +2,10 @@ VictoryRoad_1F_MapObjects:: @ 838D8E4
 	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 33, 0, 22, 0, 3, 8, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF6F, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, 858, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, 1084, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, 1085, 0, 0
-	object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, 751, 0, 0
+	object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2, 0, 0
+	object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0
 
 VictoryRoad_1F_MapWarps:: @ 838D98C
 	warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc
index 8c3f6d2ff..0c30a96fa 100644
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ b/data/maps/events/VictoryRoad_B1F.inc
@@ -1,23 +1,23 @@
 VictoryRoad_B1F_MapObjects:: @ 838DA04
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 30, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 26, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 27, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 28, 0, 0
-	object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 29, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 31, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0
+	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A, 0, 0
+	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B, 0, 0
+	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C, 0, 0
+	object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D, 0, 0
+	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F, 0, 0
 	object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0
 	object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 32, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0
+	object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0
+	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1, 0, 0
+	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2, 0, 0
 
 VictoryRoad_B1F_MapWarps:: @ 838DBCC
 	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc
index 9ef5d819b..e9d549f04 100644
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ b/data/maps/events/VictoryRoad_B2F.inc
@@ -3,7 +3,7 @@ VictoryRoad_B2F_MapObjects:: @ 838DC18
 	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 43, 0, 14, 0, 3, 7, 17, 0, 1, 0, 4, 0, VictoryRoad_B2F_EventScript_15E012, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 2, 0, 17, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E029, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 35, 0, 22, 0, 3, 9, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E040, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, 1088, 0, 0
+	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1, 0, 0
 
 VictoryRoad_B2F_MapWarps:: @ 838DC90
 	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F
diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s
index 0734a44d7..0d15169d0 100644
--- a/data/pokedex_area_screen.s
+++ b/data/pokedex_area_screen.s
@@ -20,8 +20,8 @@ gUnknown_083F856E:: @ 83F856E
 
 	.align 1
 gUnknown_083F857A:: @ 83F857A
-	.2byte 85, 2142
-	.2byte 68, 2119
+	.2byte 85, 2142 @ FLAG_LANDMARK_SKY_PILLAR
+	.2byte 68, 2119 @ FLAG_LANDMARK_SEAFLOOR_CAVERN
 	.2byte 88,    0
 
 @ XXX: what is this?
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index b6b7401f3..3f47da1da 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -67,18 +67,18 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_setdivewarp             @ 0x40
 	.4byte ScrCmd_setholewarp             @ 0x41
 	.4byte ScrCmd_getplayerxy             @ 0x42
-	.4byte ScrCmd_countpokemon            @ 0x43
-	.4byte ScrCmd_additem                 @ 0x44
-	.4byte ScrCmd_removeitem              @ 0x45
+	.4byte ScrCmd_getpartysize            @ 0x43
+	.4byte ScrCmd_giveitem                @ 0x44
+	.4byte ScrCmd_takeitem                @ 0x45
 	.4byte ScrCmd_checkitemspace          @ 0x46
 	.4byte ScrCmd_checkitem               @ 0x47
 	.4byte ScrCmd_checkitemtype           @ 0x48
-	.4byte ScrCmd_addpcitem               @ 0x49
+	.4byte ScrCmd_givepcitem              @ 0x49
 	.4byte ScrCmd_checkpcitem             @ 0x4A
-	.4byte ScrCmd_adddecor                @ 0x4B
-	.4byte ScrCmd_removedecor             @ 0x4C
-	.4byte ScrCmd_hasdecor                @ 0x4D
-	.4byte ScrCmd_checkdecor              @ 0x4E
+	.4byte ScrCmd_givedecoration          @ 0x4B
+	.4byte ScrCmd_takedecoration          @ 0x4C
+	.4byte ScrCmd_checkdecor              @ 0x4D
+	.4byte ScrCmd_checkdecorspace         @ 0x4E
 	.4byte ScrCmd_applymovement           @ 0x4F
 	.4byte ScrCmd_applymovement_at        @ 0x50
 	.4byte ScrCmd_waitmovement            @ 0x51
@@ -88,14 +88,14 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_addobject               @ 0x55
 	.4byte ScrCmd_addobject_at            @ 0x56
 	.4byte ScrCmd_setobjectxy             @ 0x57
-	.4byte ScrCmd_showobject              @ 0x58
-	.4byte ScrCmd_hideobject              @ 0x59
+	.4byte ScrCmd_showobjectat            @ 0x58
+	.4byte ScrCmd_hideobjectat            @ 0x59
 	.4byte ScrCmd_faceplayer              @ 0x5A
 	.4byte ScrCmd_turnobject              @ 0x5B
 	.4byte ScrCmd_trainerbattle           @ 0x5C
-	.4byte ScrCmd_battlebegin             @ 0x5D
-	.4byte ScrCmd_ontrainerbattleend      @ 0x5E
-	.4byte ScrCmd_ontrainerbattleendgoto  @ 0x5F
+	.4byte ScrCmd_trainerbattlebegin      @ 0x5D
+	.4byte ScrCmd_gotopostbattlescript    @ 0x5E
+	.4byte ScrCmd_gotobeatenscript        @ 0x5F
 	.4byte ScrCmd_checktrainerflag        @ 0x60
 	.4byte ScrCmd_settrainerflag          @ 0x61
 	.4byte ScrCmd_cleartrainerflag        @ 0x62
@@ -109,7 +109,7 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_lock                    @ 0x6A
 	.4byte ScrCmd_releaseall              @ 0x6B
 	.4byte ScrCmd_release                 @ 0x6C
-	.4byte ScrCmd_waitbutton              @ 0x6D
+	.4byte ScrCmd_waitbuttonpress         @ 0x6D
 	.4byte ScrCmd_yesnobox                @ 0x6E
 	.4byte ScrCmd_multichoice             @ 0x6F
 	.4byte ScrCmd_multichoicedefault      @ 0x70
@@ -117,29 +117,29 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_drawbox                 @ 0x72
 	.4byte ScrCmd_erasebox                @ 0x73
 	.4byte ScrCmd_drawboxtext             @ 0x74
-	.4byte ScrCmd_drawpokepic             @ 0x75
-	.4byte ScrCmd_erasepokepic            @ 0x76
+	.4byte ScrCmd_drawmonpic              @ 0x75
+	.4byte ScrCmd_erasemonpic             @ 0x76
 	.4byte ScrCmd_drawcontestwinner       @ 0x77
 	.4byte ScrCmd_braillemessage          @ 0x78
-	.4byte ScrCmd_givepoke                @ 0x79
+	.4byte ScrCmd_givemon                 @ 0x79
 	.4byte ScrCmd_giveegg                 @ 0x7A
-	.4byte ScrCmd_setpokemove             @ 0x7B
-	.4byte ScrCmd_checkpokemove           @ 0x7C
-	.4byte ScrCmd_getspeciesname          @ 0x7D
-	.4byte ScrCmd_getfirstpartypokename   @ 0x7E
-	.4byte ScrCmd_getpartypokename        @ 0x7F
-	.4byte ScrCmd_getitemname             @ 0x80
-	.4byte ScrCmd_getdecorname            @ 0x81
-	.4byte ScrCmd_getmovename             @ 0x82
-	.4byte ScrCmd_getnumberstring         @ 0x83
-	.4byte ScrCmd_getstdstring            @ 0x84
-	.4byte ScrCmd_getstring               @ 0x85
+	.4byte ScrCmd_setmonmove              @ 0x7B
+	.4byte ScrCmd_checkpartymove          @ 0x7C
+	.4byte ScrCmd_bufferspeciesname       @ 0x7D
+	.4byte ScrCmd_bufferleadmonspeciesname @ 0x7E
+	.4byte ScrCmd_bufferpartymonnick      @ 0x7F
+	.4byte ScrCmd_bufferitemname          @ 0x80
+	.4byte ScrCmd_bufferdecorationname    @ 0x81
+	.4byte ScrCmd_buffermovename          @ 0x82
+	.4byte ScrCmd_buffernumberstring      @ 0x83
+	.4byte ScrCmd_bufferstdstring         @ 0x84
+	.4byte ScrCmd_bufferstring            @ 0x85
 	.4byte ScrCmd_pokemart                @ 0x86
-	.4byte ScrCmd_pokemartdecor           @ 0x87
-	.4byte ScrCmd_pokemartbp              @ 0x88
+	.4byte ScrCmd_pokemartdecoration      @ 0x87
+	.4byte ScrCmd_pokemartdecoration2     @ 0x88
 	.4byte ScrCmd_playslotmachine         @ 0x89
-	.4byte ScrCmd_plantberrytree          @ 0x8A
-	.4byte ScrCmd_choosecontestpkmn       @ 0x8B
+	.4byte ScrCmd_setberrytree            @ 0x8A
+	.4byte ScrCmd_choosecontestmon        @ 0x8B
 	.4byte ScrCmd_startcontest            @ 0x8C
 	.4byte ScrCmd_showcontestresults      @ 0x8D
 	.4byte ScrCmd_contestlinktransfer     @ 0x8E
@@ -152,21 +152,21 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_updatemoneybox          @ 0x95
 	.4byte ScrCmd_getpricereduction       @ 0x96
 	.4byte ScrCmd_fadescreen              @ 0x97
-	.4byte ScrCmd_fadescreendelay         @ 0x98
-	.4byte ScrCmd_setdarklevel            @ 0x99
-	.4byte ScrCmd_animdarklevel           @ 0x9A
+	.4byte ScrCmd_fadescreenspeed         @ 0x98
+	.4byte ScrCmd_setflashradius          @ 0x99
+	.4byte ScrCmd_animateflash            @ 0x9A
 	.4byte ScrCmd_messageautoscroll       @ 0x9B
 	.4byte ScrCmd_dofieldeffect           @ 0x9C
-	.4byte ScrCmd_setfieldeffect          @ 0x9D
+	.4byte ScrCmd_setfieldeffectargument  @ 0x9D
 	.4byte ScrCmd_waitfieldeffect         @ 0x9E
-	.4byte ScrCmd_sethealplace            @ 0x9F
+	.4byte ScrCmd_setrespawn              @ 0x9F
 	.4byte ScrCmd_checkplayergender       @ 0xA0
-	.4byte ScrCmd_playpokecry             @ 0xA1
-	.4byte ScrCmd_setmaptile              @ 0xA2
+	.4byte ScrCmd_playmoncry              @ 0xA1
+	.4byte ScrCmd_setmetatile             @ 0xA2
 	.4byte ScrCmd_resetweather            @ 0xA3
 	.4byte ScrCmd_setweather              @ 0xA4
 	.4byte ScrCmd_doweather               @ 0xA5
-	.4byte ScrCmd_tileeffect              @ 0xA6
+	.4byte ScrCmd_setstepcallback         @ 0xA6
 	.4byte ScrCmd_setmaplayoutindex       @ 0xA7
 	.4byte ScrCmd_setobjectpriority       @ 0xA8
 	.4byte ScrCmd_resetobjectpriority     @ 0xA9
@@ -190,14 +190,14 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_vgoto_if                @ 0xBB
 	.4byte ScrCmd_vcall_if                @ 0xBC
 	.4byte ScrCmd_vmessage                @ 0xBD
-	.4byte ScrCmd_vloadword                @ 0xBE
-	.4byte ScrCmd_vgetstring              @ 0xBF
+	.4byte ScrCmd_vloadptr                @ 0xBE
+	.4byte ScrCmd_vbufferstring           @ 0xBF
 	.4byte ScrCmd_showcoinsbox            @ 0xC0
 	.4byte ScrCmd_hidecoinsbox            @ 0xC1
 	.4byte ScrCmd_updatecoinsbox          @ 0xC2
 	.4byte ScrCmd_incrementgamestat       @ 0xC3
 	.4byte ScrCmd_setescapewarp           @ 0xC4
-	.4byte ScrCmd_waitpokecry             @ 0xC5
+	.4byte ScrCmd_waitmoncry              @ 0xC5
 
 gScriptCmdTableEnd::
 	.4byte ScrCmd_nop
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index be1cafbdd..ab700cbc3 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -14,7 +14,7 @@ Route102_EventScript_1A1533:: @ 81A1533
 	lockall
 	message Route102_Text_1A1946
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	end
 
@@ -26,7 +26,7 @@ Route102_EventScript_1A153D:: @ 81A153D
 	goto_if_eq Route102_EventScript_1A1558
 	message Route102_Text_1A16B6
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -45,7 +45,7 @@ Route102_EventScript_1A1577:: @ 81A1577
 	waitstate
 	compare ITEM_ID, 0
 	goto_if_eq Route102_EventScript_1A1593
-	removeitem ITEM_ID, 1
+	takeitem ITEM_ID, 1
 	call Route102_EventScript_1A16A9
 
 Route102_EventScript_1A1593:: @ 81A1593
@@ -56,21 +56,21 @@ Route102_EventScript_1A1595:: @ 81A1595
 	lockall
 	message Route102_Text_1A172C
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15A2:: @ 81A15A2
 	lockall
 	message Route102_Text_1A174B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15AF:: @ 81A15AF
 	lockall
 	message Route102_Text_1A175C
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15BC:: @ 81A15BC
@@ -78,7 +78,7 @@ Route102_EventScript_1A15BC:: @ 81A15BC
 	lockall
 	message Route102_Text_1A177D
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15CE:: @ 81A15CE
@@ -86,19 +86,19 @@ Route102_EventScript_1A15CE:: @ 81A15CE
 	goto_if_eq Route102_EventScript_1A15F2
 	compare 0x8005, 4
 	goto_if_eq Route102_EventScript_1A15EB
-	getstring 1, Route102_Text_1A17B7
+	bufferstring 1, Route102_Text_1A17B7
 	return
 
 Route102_EventScript_1A15EB:: @ 81A15EB
-	getstring 1, Route102_Text_1A179F
+	bufferstring 1, Route102_Text_1A179F
 	return
 
 Route102_EventScript_1A15F2:: @ 81A15F2
-	getstring 1, Route102_Text_1A17B0
+	bufferstring 1, Route102_Text_1A17B0
 	return
 
 Route102_EventScript_1A15F9:: @ 81A15F9
-	getnumberstring 1, 0x8006
+	buffernumberstring 1, 0x8006
 	lock
 	faceplayer
 	msgbox Route102_Text_1A17C0, 5
@@ -116,24 +116,24 @@ Route102_EventScript_1A161D:: @ 81A161D
 	playfanfare 387
 	waitmessage
 	waitfanfare
-	waitbutton
+	waitbuttonpress
 	message Route102_Text_1A181A
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
 Route102_EventScript_1A1642:: @ 81A1642
 	message Route102_Text_1A1881
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
 Route102_EventScript_1A164B:: @ 81A164B
 	message Route102_Text_1A18C5
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -170,7 +170,7 @@ Route102_EventScript_1A1693:: @ 81A1693
 	waitstate
 	message Route102_Text_1A1925
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	end
 
@@ -179,5 +179,5 @@ Route102_EventScript_1A16A9:: @ 81A16A9
 	incrementgamestat GAME_STAT_PLANTED_BERRIES
 	message Route102_Text_1A16FB
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	return
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 279fa0451..0cedcd0d5 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -52,15 +52,15 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3D6A:: @ 81A3D6A
-	setmaptile 5, 3, 514, 0
+	setmetatile 5, 3, 514, 0
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3D74:: @ 81A3D74
-	setmaptile 8, 3, 514, 0
+	setmetatile 8, 3, 514, 0
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3D7E:: @ 81A3D7E
-	setmaptile 11, 3, 514, 0
+	setmetatile 11, 3, 514, 0
 	end
 
 DewfordTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88
@@ -119,7 +119,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C
 OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17
 	lockall
 	call OldaleTown_PokemonCenter_2F_EventScript_1A3E30
-	setmaptile 8, 3, 605, 1
+	setmetatile 8, 3, 605, 1
 	special DrawWholeMapView
 	erasebox 0, 0, 29, 19
 	releaseall
@@ -147,14 +147,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3E7B:: @ 81A3E7B
 	call OldaleTown_PokemonCenter_2F_EventScript_1A3DB2
-	setmaptile 11, 3, 605, 1
+	setmetatile 11, 3, 605, 1
 	special DrawWholeMapView
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D
 	lockall
 	call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA
-	setmaptile 5, 3, 605, 1
+	setmetatile 5, 3, 605, 1
 	special DrawWholeMapView
 	erasebox 0, 0, 29, 19
 	releaseall
@@ -174,7 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
-	checkflag 2049
+	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342
 	copyvar 0x8007, LAST_TALKED
 	lock
@@ -221,7 +221,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
 	copyvar 0x4087, 0x8004
 	messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22
 	waitmessage
-	setmaptile 5, 3, 514, 0
+	setmetatile 5, 3, 514, 0
 	special DrawWholeMapView
 	delay 60
 	applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
@@ -233,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
 	waitdooranim
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
 	waitmovement 0
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 5, 1
 	waitdooranim
 	release
@@ -255,7 +255,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD
 OldaleTown_PokemonCenter_2F_EventScript_1A3FDD:: @ 81A3FDD
 	message OldaleTown_PokemonCenter_2F_Text_1A4696
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	message OldaleTown_PokemonCenter_2F_Text_1A4826
 	waitmessage
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A3EBC
@@ -289,7 +289,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042
 OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056
 	message OldaleTown_PokemonCenter_2F_Text_1A486A
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF
 
 OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062
@@ -307,28 +307,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4C03
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0
 
 OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4BCC
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0
 
 OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4B95
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0
 
 OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4C38
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -346,7 +346,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
-	checkflag 2049
+	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339
 	copyvar 0x8007, LAST_TALKED
 	lock
@@ -386,7 +386,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
 	copyvar 0x4087, 0x8004
 	messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22
 	waitmessage
-	setmaptile 8, 3, 514, 0
+	setmetatile 8, 3, 514, 0
 	special DrawWholeMapView
 	delay 60
 	applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
@@ -398,7 +398,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
 	waitdooranim
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
 	waitmovement 0
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 8, 1
 	waitdooranim
 	release
@@ -417,14 +417,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB
 OldaleTown_PokemonCenter_2F_EventScript_1A41E1:: @ 81A41E1
 	message OldaleTown_PokemonCenter_2F_Text_1A48A3
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	setvar RESULT, 0
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_1A41EE:: @ 81A41EE
 	message OldaleTown_PokemonCenter_2F_Text_1A48DD
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	setvar RESULT, 0
 	return
 
@@ -443,7 +443,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
-	checkflag 2072
+	checkflag FLAG_VISITED_MAUVILLE_CITY
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B
 	copyvar 0x8007, LAST_TALKED
 	lock
@@ -484,7 +484,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
 	copyvar 0x4087, 0x8004
 	messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22
 	waitmessage
-	setmaptile 11, 3, 514, 0
+	setmetatile 11, 3, 514, 0
 	special DrawWholeMapView
 	delay 60
 	applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
@@ -496,7 +496,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
 	waitdooranim
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
 	waitmovement 0
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 11, 1
 	waitdooranim
 	release
@@ -506,7 +506,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4AC8
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -514,7 +514,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4A85
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -522,7 +522,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4A30
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -530,7 +530,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4B1D
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -538,7 +538,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4B59
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -552,7 +552,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4B6C
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -598,7 +598,7 @@ OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361
 gUnknown_081A4363:: @ 81A4363
 	lockall
 	special ShowLinkBattleRecords
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -719,17 +719,17 @@ RecordCorner_EventScript_1A4457:: @ 81A4457
 	end
 
 RecordCorner_EventScript_1A446C:: @ 81A446C
-	getitemname 1, 0x4001
+	bufferitemname 1, 0x4001
 	message RecordCorner_Text_1A4E3B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	end
 
 TradeRoom_ReadTrainerCard1:: @ 81A4479
 	message CableClub_LookAtTrainerCard1
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	fadescreen 1
 	special sub_8083BDC
 	waitstate
@@ -738,7 +738,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479
 TradeRoom_ReadTrainerCard2:: @ 81A4487
 	message CableClub_LookAtTrainerCard2
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	fadescreen 1
 	special sub_8083BDC
 	waitstate
@@ -747,7 +747,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487
 TradeRoom_TooBusyToNotice:: @ 81A4495
 	message CableClub_TooBusyToNotice
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	closemessage
 	end
 
@@ -755,7 +755,7 @@ SingleBattleColosseum_EventScript_1A449E:: @ 81A449E
 	special sub_8064EAC
 	message SingleBattleColosseum_Text_1A4D7E
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special sub_8064ED4
 	closemessage
 	end
@@ -764,7 +764,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD
 	special sub_8064EAC
 	message TradeCenter_Text_1A4DAB
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special sub_8064ED4
 	closemessage
 	end
@@ -775,7 +775,7 @@ RecordCorner_EventScript_1A44BC:: @ 81A44BC
 	special sub_8064EAC
 	message RecordCorner_Text_1A4DD7
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special sub_8064ED4
 	closemessage
 	end
@@ -784,7 +784,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6
 	special sub_8064EAC
 	message RecordCorner_Text_1A4DF7
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	special sub_8064ED4
 	closemessage
 	end
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 1b5c29fee..50202c7d6 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -9,19 +9,19 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92
 	call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD
 	compare 0x408a, 0
 	goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F
-	getstdstring 0, 0x800b
+	bufferstdstring 0, 0x800b
 	msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4
 	checkitem ITEM_CONTEST_PASS, 1
 	compare RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1
-	setflag 1
+	setflag FLAG_TEMP_1
 	goto FallarborTown_ContestLobby_EventScript_1A4F8F
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD
-	clearflag 1
+	clearflag FLAG_TEMP_1
 	return
 
 FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1
@@ -40,12 +40,12 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13
-	checkflag 150
+	checkflag FLAG_RECEIVED_CONTEST_PASS
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44
 	msgbox FallarborTown_ContestLobby_Text_1A6583, 4
-	giveitem ITEM_CONTEST_PASS
-	setflag 150
-	setflag 1
+	giveitem_std ITEM_CONTEST_PASS
+	setflag FLAG_RECEIVED_CONTEST_PASS
+	setflag FLAG_TEMP_1
 	msgbox FallarborTown_ContestLobby_Text_1A5E98, 4
 	goto FallarborTown_ContestLobby_EventScript_1A4F8F
 	end
@@ -62,7 +62,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67
-	giveitem ITEM_LUXURY_BALL
+	giveitem_std ITEM_LUXURY_BALL
 	compare RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86
 	setvar 0x408a, 0
@@ -119,7 +119,7 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E
 
 FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048
 	msgbox FallarborTown_ContestLobby_Text_1A6319, 4
-	choosecontestpkmn
+	choosecontestmon
 	compare 0x8004, 255
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097
 	special sub_80C43F4
@@ -260,8 +260,8 @@ LinkContestRoom1_EventScript_1A523F:: @ 81A523F
 	return
 
 LinkContestRoom1_EventScript_1A5245:: @ 81A5245
-	getstdstring 1, 0x8008
-	getstdstring 2, 0x8009
+	bufferstdstring 1, 0x8008
+	bufferstdstring 2, 0x8009
 	call LinkContestRoom1_EventScript_1A525F
 	lockall
 	applymovement 1, LinkContestRoom1_Movement_1A5D87
@@ -339,7 +339,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311
 LinkContestRoom1_EventScript_1A5323:: @ 81A5323
 	special sub_80C4C64
 	addvar 0x8006, 1
-	getnumberstring 1, 0x8006
+	buffernumberstring 1, 0x8006
 	lockall
 	applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C
 	waitmovement 0
@@ -885,7 +885,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49
 	special sub_80C47F0
 	special sub_80C4858
 	addvar 0x8005, 1
-	getnumberstring 1, 0x8005
+	buffernumberstring 1, 0x8005
 	addvar 0x8005, -1
 	call LinkContestRoom1_EventScript_1A5A75
 	applymovement 0x4003, LinkContestRoom1_Movement_1A5D99
@@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
 	compare 0x4088, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A5C4C
 	call LinkContestRoom1_EventScript_1A5C12
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq LinkContestRoom1_EventScript_1A5BF6
 	msgbox LinkContestRoom1_Text_1A6DC5, 3
 	waitmessage
@@ -1035,14 +1035,14 @@ LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23
 LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32
 	compare CONTEST_RANK, 3
 	goto_if_eq LinkContestRoom1_EventScript_1A5C41
-	setflag 2
+	setflag FLAG_TEMP_2
 	return
 
 LinkContestRoom1_EventScript_1A5C41:: @ 81A5C41
 	return
 
 LinkContestRoom1_EventScript_1A5C42:: @ 81A5C42
-	setflag 270
+	setflag FLAG_CONTEST_SKETCH_CREATED
 	return
 
 LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46
@@ -1134,7 +1134,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D
 	return
 
 LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B
-	giveitem ITEM_LUXURY_BALL
+	giveitem_std ITEM_LUXURY_BALL
 	compare RESULT, 0
 	goto_if_eq LinkContestRoom1_EventScript_1A5D2D
 	msgbox LinkContestRoom1_Text_1A6DF1, 3
@@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B
 LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	special sub_80C44C0
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	setflag 2107
+	setflag FLAG_SYS_RIBBON_GET
 	lockall
 	msgbox LinkContestRoom1_Text_1A6D6A, 4
 	playfanfare 370
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 22d99f2a4..fd3273c78 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -21,7 +21,7 @@ Route117_EventScript_1B2262:: @ 81B2262
 	compare RESULT, 1
 	goto_if_eq Route117_EventScript_1B2298
 	msgbox Route117_Text_1B2745, 4
-	clearflag 134
+	clearflag FLAG_PENDING_DAYCARE_EGG
 	special RejectEggFromDayCare
 	release
 	end
@@ -39,10 +39,10 @@ Route117_EventScript_1B22B2:: @ 81B22B2
 	playfanfare 367
 	waitfanfare
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	msgbox Route117_Text_1B27CD, 4
 	special GiveEggFromDaycare
-	clearflag 134
+	clearflag FLAG_PENDING_DAYCARE_EGG
 	release
 	end
 
@@ -70,7 +70,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE
 	special SetDaycareCompatibilityString
 	special ShowFieldMessageStringVar4
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	setvar 0x8004, 0
 	call Route117_EventScript_1B22CD
 	setvar 0x8004, 1
@@ -110,9 +110,9 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
 	goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD
 	specialvar 0x8005, GetSelectedDaycareMonNickname
 	waitse
-	playpokecry 0x8005, 0
+	playmoncry 0x8005, 0
 	msgbox Route117_PokemonDayCare_Text_1B296E, 4
-	waitpokecry
+	waitmoncry
 	special StoreSelectedPokemonInDaycare
 	incrementgamestat GAME_STAT_USED_DAYCARE
 	specialvar RESULT, GetDaycareState
@@ -211,9 +211,9 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE
 	playse 95
 	msgbox Route117_PokemonDayCare_Text_1B2B75, 4
 	waitse
-	playpokecry RESULT, 0
+	playmoncry RESULT, 0
 	msgbox Route117_PokemonDayCare_Text_1B2B93, 4
-	waitpokecry
+	waitmoncry
 	specialvar RESULT, GetDaycareState
 	compare RESULT, 2
 	goto_if_eq Route117_PokemonDayCare_EventScript_1B2520
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 214c61142..a3d79d09e 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -60,67 +60,67 @@ Route111_EventScript_1AE3D7:: @ 81AE3D7
 	return
 
 Route111_EventScript_1AE3E2:: @ 81AE3E2
-	setflag 796
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1
 	return
 
 Route111_EventScript_1AE3E6:: @ 81AE3E6
-	clearflag 796
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1
 	return
 
 Route111_EventScript_1AE3EA:: @ 81AE3EA
-	setflag 797
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
 	return
 
 Route111_EventScript_1AE3EE:: @ 81AE3EE
-	clearflag 797
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
 	return
 
 Route111_EventScript_1AE3F2:: @ 81AE3F2
-	setflag 798
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
 	return
 
 Route111_EventScript_1AE3F6:: @ 81AE3F6
-	clearflag 798
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
 	return
 
 Route111_EventScript_1AE3FA:: @ 81AE3FA
-	setflag 799
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
 	return
 
 Route111_EventScript_1AE3FE:: @ 81AE3FE
-	clearflag 799
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
 	return
 
 Route111_EventScript_1AE402:: @ 81AE402
-	setflag 901
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
 	return
 
 Route111_EventScript_1AE406:: @ 81AE406
-	clearflag 901
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
 	return
 
 Route111_EventScript_1AE40A:: @ 81AE40A
-	setflag 902
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
 	return
 
 Route111_EventScript_1AE40E:: @ 81AE40E
-	clearflag 902
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
 	return
 
 Route111_EventScript_1AE412:: @ 81AE412
-	setflag 903
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
 	return
 
 Route111_EventScript_1AE416:: @ 81AE416
-	clearflag 903
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
 	return
 
 Route111_EventScript_1AE41A:: @ 81AE41A
-	setflag 904
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
 	return
 
 Route111_EventScript_1AE41E:: @ 81AE41E
-	clearflag 904
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
 	return
 
 Route111_EventScript_1AE422:: @ 81AE422
@@ -208,7 +208,7 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2
 	call_if 1, Route111_EventScript_1AE5EB
 	compare FACING, 4
 	call_if 1, Route111_EventScript_1AE5FD
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq Route111_EventScript_1AE73A
 	msgbox Route111_Text_1AC015, 5
 	goto Route111_EventScript_1AE6F3
@@ -242,7 +242,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F
 	call_if 1, Route111_EventScript_1AE5EB
 	compare FACING, 4
 	call_if 1, Route111_EventScript_1AE5FD
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq Route111_EventScript_1AE73A
 	specialvar RESULT, GabbyAndTyGetLastQuote
 	compare RESULT, 0
@@ -311,13 +311,13 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3
 	goto_if_eq Route111_EventScript_1AE72D
 	msgbox Route111_Text_1AC487, 4
 	special sub_80BDC14
-	setflag 1
+	setflag FLAG_TEMP_1
 	release
 	end
 
 Route111_EventScript_1AE72D:: @ 81AE72D
 	msgbox Route111_Text_1AC553, 4
-	setflag 1
+	setflag FLAG_TEMP_1
 	release
 	end
 
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index f13b319f4..d104b52d4 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -1,14 +1,14 @@
 MtChimney_EventScript_1B2C95:: @ 81B2C95
 	lock
 	faceplayer
-	checkflag 219
+	checkflag FLAG_EVIL_LEADER_PLEASE_STOP
 	call_if 0, MtChimney_EventScript_1B2CB9
-	checkflag 219
+	checkflag FLAG_EVIL_LEADER_PLEASE_STOP
 	call_if 1, MtChimney_EventScript_1B2CC2
 	closemessage
 	applymovement 1, MtChimney_Movement_1A083D
 	waitmovement 0
-	setflag 219
+	setflag FLAG_EVIL_LEADER_PLEASE_STOP
 	release
 	end
 
@@ -63,7 +63,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	removeobject 2
 	removeobject 3
 	removeobject 22
-	setflag 926
+	setflag FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
 	fadescreen 0
 	setobjectxyperm 1, 10, 12
 	addobject 1
@@ -84,10 +84,10 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	compare FACING, 2
 	call_if 1, MtChimney_EventScript_1B2D9E
 	removeobject 1
-	setflag 927
-	setflag 139
-	clearflag 928
-	setflag 942
+	setflag FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
+	clearflag FLAG_HIDE_PROF_COSMO_FALLARBOR
+	setflag FLAG_HIDE_PROF_COSMO_METEOR_FALLS
 	releaseall
 	end
 
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
index eb912028a..2430ba4af 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
@@ -4,12 +4,12 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4
 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5
 	lock
 	faceplayer
-	checkflag 294
+	checkflag FLAG_EXCHANGED_SCANNER
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D
 	checkitem ITEM_SCANNER, 1
 	compare RESULT, 1
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23
-	checkflag 1078
+	checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D
 	msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4
 	release
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
index de3ba5442..c27951abb 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
@@ -8,18 +8,18 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A
 	end
 
 AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3
-	checkflag 239
+	checkflag FLAG_USED_STORAGE_KEY
 	call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6
-	checkflag 239
+	checkflag FLAG_USED_STORAGE_KEY
 	call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6
-	setmaptile 11, 4, 563, 1
+	setmetatile 11, 4, 563, 1
 	return
 
 AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0
-	setmaptile 11, 4, 555, 1
+	setmetatile 11, 4, 555, 1
 	return
 
 AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA
@@ -28,15 +28,15 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA
 
 AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3
 	lockall
-	checkflag 239
+	checkflag FLAG_USED_STORAGE_KEY
 	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14
 	checkitem ITEM_STORAGE_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A
 	msgbox AbandonedShip_Corridors_B1F_Text_198692, 4
 	playse 21
-	removeitem ITEM_STORAGE_KEY, 1
-	setflag 239
+	takeitem ITEM_STORAGE_KEY, 1
+	setflag FLAG_USED_STORAGE_KEY
 	call AbandonedShip_Corridors_B1F_EventScript_15E9C0
 	special DrawWholeMapView
 	releaseall
diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc
index 49f837744..68d872f01 100644
--- a/data/scripts/maps/AbandonedShip_Deck.inc
+++ b/data/scripts/maps/AbandonedShip_Deck.inc
@@ -3,5 +3,5 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A
 	.byte 0
 
 AbandonedShip_Deck_MapScript1_15E960:: @ 815E960
-	setflag 2110
+	setflag FLAG_LANDMARK_ABANDONED_SHIP
 	end
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
index e6c143091..35e86543b 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
@@ -8,67 +8,67 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51
 	end
 
 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A
-	checkflag 240
+	checkflag FLAG_USED_ROOM_1_KEY
 	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB
-	checkflag 241
+	checkflag FLAG_USED_ROOM_2_KEY
 	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5
-	checkflag 242
+	checkflag FLAG_USED_ROOM_4_KEY
 	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF
-	checkflag 243
+	checkflag FLAG_USED_ROOM_6_KEY
 	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9
-	checkflag 240
+	checkflag FLAG_USED_ROOM_1_KEY
 	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
-	checkflag 241
+	checkflag FLAG_USED_ROOM_2_KEY
 	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
-	checkflag 242
+	checkflag FLAG_USED_ROOM_4_KEY
 	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
-	checkflag 243
+	checkflag FLAG_USED_ROOM_6_KEY
 	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3
-	setmaptile 3, 8, 555, 1
+	setmetatile 3, 8, 555, 1
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD:: @ 815EBAD
-	setmaptile 6, 8, 555, 1
+	setmetatile 6, 8, 555, 1
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7:: @ 815EBB7
-	setmaptile 3, 3, 538, 0
+	setmetatile 3, 3, 538, 0
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1:: @ 815EBC1
-	setmaptile 9, 3, 538, 0
+	setmetatile 9, 3, 538, 0
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB:: @ 815EBCB
-	setmaptile 3, 8, 563, 1
+	setmetatile 3, 8, 563, 1
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5:: @ 815EBD5
-	setmaptile 6, 8, 563, 1
+	setmetatile 6, 8, 563, 1
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF:: @ 815EBDF
-	setmaptile 3, 3, 564, 0
+	setmetatile 3, 3, 564, 0
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9
-	setmaptile 9, 3, 564, 0
+	setmetatile 9, 3, 564, 0
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
 	lockall
-	checkflag 240
+	checkflag FLAG_USED_ROOM_1_KEY
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_1_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
 	playse 21
-	removeitem ITEM_ROOM_1_KEY, 1
-	setflag 240
+	takeitem ITEM_ROOM_1_KEY, 1
+	setflag FLAG_USED_ROOM_1_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
 	special DrawWholeMapView
 	releaseall
@@ -76,15 +76,15 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
 	lockall
-	checkflag 241
+	checkflag FLAG_USED_ROOM_2_KEY
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_2_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
 	playse 21
-	removeitem ITEM_ROOM_2_KEY, 1
-	setflag 241
+	takeitem ITEM_ROOM_2_KEY, 1
+	setflag FLAG_USED_ROOM_2_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
 	special DrawWholeMapView
 	releaseall
@@ -92,15 +92,15 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
 	lockall
-	checkflag 242
+	checkflag FLAG_USED_ROOM_4_KEY
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_4_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
 	playse 21
-	removeitem ITEM_ROOM_4_KEY, 1
-	setflag 242
+	takeitem ITEM_ROOM_4_KEY, 1
+	setflag FLAG_USED_ROOM_4_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
 	special DrawWholeMapView
 	releaseall
@@ -108,15 +108,15 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98
 	lockall
-	checkflag 243
+	checkflag FLAG_USED_ROOM_6_KEY
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_6_KEY, 1
 	compare RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
 	playse 21
-	removeitem ITEM_ROOM_6_KEY, 1
-	setflag 243
+	takeitem ITEM_ROOM_6_KEY, 1
+	setflag FLAG_USED_ROOM_6_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
 	special DrawWholeMapView
 	releaseall
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
index eb5c1dccd..c1e77a8c7 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
@@ -39,9 +39,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95
 
 AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
 	delay 20
-	setfieldeffect 0, 10
-	setfieldeffect 1, 10
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 10
+	setfieldeffectargument 1, 10
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	specialvar RESULT, sub_810F4D4
 	compare RESULT, 0
@@ -69,13 +69,13 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA
 
 AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
 	delay 20
-	setfieldeffect 0, 8
-	setfieldeffect 1, 5
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 8
+	setfieldeffectargument 1, 5
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
-	setfieldeffect 0, 11
-	setfieldeffect 1, 3
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 11
+	setfieldeffectargument 1, 3
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	specialvar RESULT, sub_810F4FC
 	compare RESULT, 0
@@ -86,17 +86,17 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
 
 AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
 	delay 20
-	setfieldeffect 0, 16
-	setfieldeffect 1, 3
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 16
+	setfieldeffectargument 1, 3
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
-	setfieldeffect 0, 25
-	setfieldeffect 1, 2
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 25
+	setfieldeffectargument 1, 2
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
-	setfieldeffect 0, 24
-	setfieldeffect 1, 6
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 24
+	setfieldeffectargument 1, 6
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	specialvar RESULT, sub_810F4B0
 	compare RESULT, 0
@@ -109,30 +109,30 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B
-	setfieldeffect 0, 42
-	setfieldeffect 1, 10
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 42
+	setfieldeffectargument 1, 10
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	return
 
 AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B
-	setfieldeffect 0, 20
-	setfieldeffect 1, 5
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 20
+	setfieldeffectargument 1, 5
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	return
 
 AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B
-	setfieldeffect 0, 1
-	setfieldeffect 1, 12
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 1
+	setfieldeffectargument 1, 12
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	return
 
 AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B
-	setfieldeffect 0, 1
-	setfieldeffect 1, 2
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 1
+	setfieldeffectargument 1, 2
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	return
 
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 188691e73..b849f41ba 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -5,7 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE
 	.byte 0
 
 AncientTomb_MapScript1_15EFCE:: @ 815EFCE
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, AncientTomb_EventScript_15EFD8
 	end
 
@@ -14,29 +14,29 @@ AncientTomb_EventScript_15EFD8:: @ 815EFD8
 	return
 
 AncientTomb_MapScript1_15EFDC:: @ 815EFDC
-	setflag 2137
+	setflag FLAG_LANDMARK_ANCIENT_TOMB
 	end
 
 AncientTomb_MapScript1_15EFE0:: @ 815EFE0
-	checkflag 2130
+	checkflag FLAG_SYS_BRAILLE_FLY
 	call_if 0, AncientTomb_EventScript_15EFEA
 	end
 
 AncientTomb_EventScript_15EFEA:: @ 815EFEA
-	setmaptile 7, 19, 553, 1
-	setmaptile 8, 19, 553, 1
-	setmaptile 9, 19, 553, 1
-	setmaptile 7, 20, 565, 1
-	setmaptile 8, 20, 565, 1
-	setmaptile 9, 20, 565, 1
+	setmetatile 7, 19, 553, 1
+	setmetatile 8, 19, 553, 1
+	setmetatile 9, 19, 553, 1
+	setmetatile 7, 20, 565, 1
+	setmetatile 8, 20, 565, 1
+	setmetatile 9, 20, 565, 1
 	return
 
 AncientTomb_EventScript_15F021:: @ 815F021
 	lockall
-	checkflag 2130
+	checkflag FLAG_SYS_BRAILLE_FLY
 	goto_if_eq AncientTomb_EventScript_15F038
 	braillemessage AncientTomb_Braille_1C552E
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -49,7 +49,7 @@ AncientTomb_EventScript_15F038:: @ 815F038
 AncientTomb_EventScript_15F042:: @ 815F042
 	lockall
 	braillemessage AncientTomb_Braille_1C552E
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -58,14 +58,14 @@ AncientTomb_EventScript_15F050:: @ 815F050
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_REGISTEEL, 2
+	playmoncry SPECIES_REGISTEEL, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
-	setflag 937
-	setflag 2145
+	setflag FLAG_HIDE_REGISTEEL
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc
index 2eb2ae7e9..028a0ee7b 100644
--- a/data/scripts/maps/AquaHideout_1F.inc
+++ b/data/scripts/maps/AquaHideout_1F.inc
@@ -10,7 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE
 MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE
 	lock
 	faceplayer
-	checkflag 111
+	checkflag FLAG_MT_PYRE_ORB_STOLEN
 	goto_if_eq AquaHideout_1F_EventScript_15D7E3
 	msgbox AquaHideout_1F_Text_196AFD, 4
 	release
@@ -25,7 +25,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED
 MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED
 	lock
 	faceplayer
-	checkflag 111
+	checkflag FLAG_MT_PYRE_ORB_STOLEN
 	goto_if_eq AquaHideout_1F_EventScript_15D802
 	msgbox AquaHideout_1F_Text_196C83, 4
 	release
diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc
index 0001d7574..82d0c10c5 100644
--- a/data/scripts/maps/AquaHideout_B1F.inc
+++ b/data/scripts/maps/AquaHideout_B1F.inc
@@ -4,7 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831
 	.byte 0
 
 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, AquaHideout_B1F_EventScript_15D846
 	end
 
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc
index 230d0e2db..a587fcc92 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/scripts/maps/AquaHideout_B2F.inc
@@ -64,8 +64,8 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	applymovement 0x8008, AquaHideout_B2F_Movement_1A0839
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_1971AE, 4
-	setflag 112
-	setflag 852
+	setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
+	setflag FLAG_HIDE_GRUNTS_LILYCOVE
 	release
 	end
 
diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc
index ac97aa14b..828d975fc 100644
--- a/data/scripts/maps/BattleTower_Corridor.inc
+++ b/data/scripts/maps/BattleTower_Corridor.inc
@@ -6,13 +6,13 @@ BattleTower_Corridor_MapScripts:: @ 8160845
 BattleTower_Corridor_MapScript1_160850:: @ 8160850
 	compare 0x8006, 1
 	goto_if_eq BattleTower_Corridor_EventScript_16086E
-	setmaptile 12, 0, 519, 0
-	setmaptile 12, 1, 527, 0
+	setmetatile 12, 0, 519, 0
+	setmetatile 12, 1, 527, 0
 	end
 
 BattleTower_Corridor_EventScript_16086E:: @ 816086E
-	setmaptile 15, 0, 519, 0
-	setmaptile 15, 1, 527, 0
+	setmetatile 15, 0, 519, 0
+	setmetatile 15, 1, 527, 0
 	end
 
 BattleTower_Corridor_MapScript2_160881:: @ 8160881
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 5a0e6105c..69db45ede 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -13,14 +13,14 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293
 BattleTower_Lobby_EventScript_16029C:: @ 816029C
 	setvar 0x8004, 10
 	special sub_8135668
-	checkflag 238
+	checkflag FLAG_RECEIVED_GOLD_SHIELD
 	goto_if_eq BattleTower_Lobby_EventScript_1602E4
-	checkflag 237
+	checkflag FLAG_RECEIVED_SILVER_SHIELD
 	goto_if_eq BattleTower_Lobby_EventScript_1602CD
 	specialvar 0x8007, sub_810F404
 	compare 0x8007, 50
 	goto_if 0, BattleTower_Lobby_EventScript_1602E4
-	clearflag 941
+	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
 	special sub_810F8FC
 	return
 
@@ -28,12 +28,12 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
 	specialvar 0x8007, sub_810F404
 	compare 0x8007, 100
 	goto_if 0, BattleTower_Lobby_EventScript_1602E4
-	clearflag 941
+	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
 	special sub_810F8FC
 	return
 
 BattleTower_Lobby_EventScript_1602E4:: @ 81602E4
-	setflag 941
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
 	return
 
 BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8
@@ -379,7 +379,7 @@ BattleTower_Lobby_EventScript_16071E:: @ 816071E
 BattleTower_Lobby_EventScript_160727:: @ 8160727
 	lockall
 	special ShowBattleTowerRecords
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -387,16 +387,16 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727
 BattleTower_Lobby_EventScript_160733:: @ 8160733
 	lock
 	faceplayer
-	checkflag 238
+	checkflag FLAG_RECEIVED_GOLD_SHIELD
 	goto_if_eq BattleTower_Lobby_EventScript_1607C5
-	checkflag 237
+	checkflag FLAG_RECEIVED_SILVER_SHIELD
 	goto_if_eq BattleTower_Lobby_EventScript_160773
 	msgbox BattleTower_Lobby_Text_19A9EE, 4
-	setvar 0x8008, 42
-	givedecoration 42
+	setvar 0x8008, DECOR_SILVER_SHIELD
+	givedecoration_std DECOR_SILVER_SHIELD
 	compare RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1607AF
-	setflag 237
+	setflag FLAG_RECEIVED_SILVER_SHIELD
 	msgbox BattleTower_Lobby_Text_19ABAA, 4
 	release
 	end
@@ -406,17 +406,17 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773
 	compare RESULT, 100
 	goto_if 0, BattleTower_Lobby_EventScript_1607C5
 	msgbox BattleTower_Lobby_Text_19AAC4, 4
-	setvar 0x8008, 43
-	givedecoration 43
+	setvar 0x8008, DECOR_GOLD_SHIELD
+	givedecoration_std DECOR_GOLD_SHIELD
 	compare RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1607AF
-	setflag 238
+	setflag FLAG_RECEIVED_GOLD_SHIELD
 	msgbox BattleTower_Lobby_Text_19ABAA, 4
 	release
 	end
 
 BattleTower_Lobby_EventScript_1607AF:: @ 81607AF
-	getdecorname 1, 0x8008
+	bufferdecorationname 1, 0x8008
 	msgbox BattleTower_Lobby_Text_1A0CEF, 4
 	msgbox BattleTower_Lobby_Text_19ABED, 4
 	release
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc
index a37310d16..e0aba0b9c 100644
--- a/data/scripts/maps/BattleTower_Outside.inc
+++ b/data/scripts/maps/BattleTower_Outside.inc
@@ -3,9 +3,9 @@ BattleTower_Outside_MapScripts:: @ 8160156
 	.byte 0
 
 BattleTower_Outside_MapScript1_16015C:: @ 816015C
-	setflag 2120
+	setflag FLAG_LANDMARK_BATTLE_TOWER
 	setvar 0x40bc, 0
-	setflag 918
+	setflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	end
 
 BattleTower_Outside_EventScript_160168:: @ 8160168
@@ -67,7 +67,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232
 	applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845
 	waitmovement 0
 	delay 30
-	hideobject 5, 26, 4
+	hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE
 	setvar 0x8004, 4
 	call BattleTower_Outside_EventScript_1A047C
 	return
diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc
index 3ad36cc18..6411aad49 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.inc
+++ b/data/scripts/maps/CaveOfOrigin_1F.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C
 	.byte 0
 
 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_1F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc
index c3bbdd45f..b8d4149b6 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B1F.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C
 	.byte 0
 
 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc
index fb65de171..9b014d0e9 100644
--- a/data/scripts/maps/CaveOfOrigin_B2F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B2F.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C
 	.byte 0
 
 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc
index c21b04e91..d6f7bdaf1 100644
--- a/data/scripts/maps/CaveOfOrigin_B3F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B3F.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C
 	.byte 0
 
 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index c6c3cd45e..1b5146760 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -4,7 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC
 	.byte 0
 
 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1
 	end
 
@@ -19,7 +19,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
 	setmaplayoutindex 313
 	.endif
 	call CaveOfOrigin_B4F_EventScript_1A01B5
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3
 	end
 
@@ -38,9 +38,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	special WaitWeather
 	waitstate
 	playse 209
-	setfieldeffect 0, 9
-	setfieldeffect 1, 13
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 9
+	setfieldeffectargument 1, 13
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	waitfieldeffect 54
 	.ifdef SAPPHIRE
@@ -58,26 +58,26 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	delay 60
 	setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE
 	waitse
-	playpokecry SPECIES_GROUDON_OR_KYOGRE, 2
+	playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
 	delay 40
-	waitpokecry
-	setflag 2145
+	waitmoncry
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartGroudonKyogreBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar RESULT, sub_810E300
 	compare RESULT, 1
 	call_if 1, CaveOfOrigin_B4F_EventScript_15DE73
-	setflag 816
-	setflag 855
-	setflag 856
-	clearflag 815
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
 	setvar 0x409b, 1
-	setflag 113
-	clearflag 854
-	clearflag 2090
+	setflag FLAG_LEGENDARY_BATTLE_COMPLETED
+	clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	clearflag FLAG_SYS_WEATHER_CTRL
 	setvar 0x40b9, 2
-	clearflag 916
+	clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
 	releaseall
 	end
 
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index 9f6f7b388..7aa56a82d 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -5,7 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3
 	.byte 0
 
 DesertRuins_MapScript1_15CB03:: @ 815CB03
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, DesertRuins_EventScript_15CB0D
 	end
 
@@ -14,29 +14,29 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D
 	return
 
 DesertRuins_MapScript1_15CB11:: @ 815CB11
-	checkflag 2128
+	checkflag FLAG_SYS_BRAILLE_STRENGTH
 	call_if 0, DesertRuins_EventScript_15CB1B
 	end
 
 DesertRuins_EventScript_15CB1B:: @ 815CB1B
-	setmaptile 7, 19, 553, 1
-	setmaptile 8, 19, 553, 1
-	setmaptile 9, 19, 553, 1
-	setmaptile 7, 20, 565, 1
-	setmaptile 8, 20, 565, 1
-	setmaptile 9, 20, 565, 1
+	setmetatile 7, 19, 553, 1
+	setmetatile 8, 19, 553, 1
+	setmetatile 9, 19, 553, 1
+	setmetatile 7, 20, 565, 1
+	setmetatile 8, 20, 565, 1
+	setmetatile 9, 20, 565, 1
 	return
 
 DesertRuins_MapScript1_15CB52:: @ 815CB52
-	setflag 2134
+	setflag FLAG_LANDMARK_DESERT_RUINS
 	end
 
 DesertRuins_EventScript_15CB56:: @ 815CB56
 	lockall
-	checkflag 2128
+	checkflag FLAG_SYS_BRAILLE_STRENGTH
 	goto_if_eq DesertRuins_EventScript_15CB6D
 	braillemessage DesertRuins_Braille_1C54C8
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -49,7 +49,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D
 DesertRuins_EventScript_15CB77:: @ 815CB77
 	lockall
 	braillemessage DesertRuins_Braille_1C54C8
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -58,14 +58,14 @@ DesertRuins_EventScript_15CB85:: @ 815CB85
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_REGIROCK, 2
+	playmoncry SPECIES_REGIROCK, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
-	setflag 935
-	setflag 2145
+	setflag FLAG_HIDE_REGIROCK
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
index 7f8fe6fef..bb1fdeda4 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/scripts/maps/DewfordTown.inc
@@ -3,13 +3,13 @@ DewfordTown_MapScripts:: @ 814DFF8
 	.byte 0
 
 DewfordTown_MapScript1_14DFFE:: @ 814DFFE
-	setflag 2065
+	setflag FLAG_VISITED_DEWFORD_TOWN
 	end
 
 DewfordTown_EventScript_14E002:: @ 814E002
 	lock
 	faceplayer
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if 0, DewfordTown_EventScript_14E076
 	message DewfordTown_Text_16B522
 	waitmessage
@@ -74,7 +74,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD
 DewfordTown_EventScript_14E0C6:: @ 814E0C6
 	lock
 	faceplayer
-	checkflag 257
+	checkflag FLAG_RECEIVED_OLD_ROD
 	goto_if_eq DewfordTown_EventScript_14E11B
 	msgbox DewfordTown_Text_16B665, 5
 	compare RESULT, 1
@@ -85,8 +85,8 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6
 
 DewfordTown_EventScript_14E0F0:: @ 814E0F0
 	msgbox DewfordTown_Text_16B6A8, 4
-	giveitem ITEM_OLD_ROD
-	setflag 257
+	giveitem_std ITEM_OLD_ROD
+	setflag FLAG_RECEIVED_OLD_ROD
 	msgbox DewfordTown_Text_16B6F9, 4
 	release
 	end
@@ -118,30 +118,30 @@ DewfordTown_EventScript_14E147:: @ 814E147
 
 DewfordTown_EventScript_14E151:: @ 814E151
 	call DewfordTown_EventScript_1A010C
-	setobjectpriority 2, 0, 11, 0
-	setobjectpriority 255, 0, 11, 0
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	setobjectpriority 255, MAP_DEWFORD_TOWN, 0
 	applymovement 2, DewfordTown_Movement_14E40E
 	waitmovement 0
 	removeobject 2
 	applymovement 255, DewfordTown_Movement_14E402
 	waitmovement 0
-	hideobject 255, 0, 11
+	hideobjectat 255, MAP_DEWFORD_TOWN
 	call DewfordTown_EventScript_1A02E7
 	applymovement 4, DewfordTown_Movement_14E293
 	applymovement 255, DewfordTown_Movement_14E293
 	waitmovement 0
-	showobject 255, 0, 19
+	showobjectat 255, MAP_ROUTE104
 	call DewfordTown_EventScript_1A02EF
 	applymovement 255, DewfordTown_Movement_14E405
 	waitmovement 0
-	showobject 255, 0, 19
-	clearflag 739
-	clearflag 881
-	clearflag 742
-	setflag 743
-	hideobject 4, 0, 11
+	showobjectat 255, MAP_ROUTE104
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	hideobjectat 4, MAP_DEWFORD_TOWN
 	setvar 0x408e, 2
-	resetobjectpriority 255, 0, 11
+	resetobjectpriority 255, MAP_DEWFORD_TOWN
 	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
 	copyvar 0x4096, 0x8008
 	waitstate
@@ -150,40 +150,40 @@ DewfordTown_EventScript_14E151:: @ 814E151
 
 DewfordTown_EventScript_14E1D8:: @ 814E1D8
 	call DewfordTown_EventScript_1A010C
-	setobjectpriority 2, 0, 11, 0
-	setobjectpriority 255, 0, 11, 1
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	setobjectpriority 255, MAP_DEWFORD_TOWN, 1
 	applymovement 2, DewfordTown_Movement_14E40E
 	waitmovement 0
 	removeobject 2
 	applymovement 255, DewfordTown_Movement_14E402
 	waitmovement 0
-	hideobject 255, 0, 11
+	hideobjectat 255, MAP_DEWFORD_TOWN
 	call DewfordTown_EventScript_1A02E7
 	applymovement 4, DewfordTown_Movement_14E356
 	applymovement 255, DewfordTown_Movement_14E356
 	waitmovement 0
 	call DewfordTown_EventScript_1A02EF
-	showobject 255, 0, 24
+	showobjectat 255, MAP_ROUTE109
 	applymovement 255, DewfordTown_Movement_14E409
 	waitmovement 0
 	setobjectxyperm 2, 21, 26
 	addobject 2
-	setobjectpriority 2, 0, 24, 0
+	setobjectpriority 2, MAP_ROUTE109, 0
 	applymovement 2, DewfordTown_Movement_14E410
 	waitmovement 0
-	clearflag 741
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE109
 	addobject 1
-	clearflag 744
-	setflag 743
-	hideobject 4, 0, 11
-	checkflag 149
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	hideobjectat 4, MAP_DEWFORD_TOWN
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	call_if 0, DewfordTown_EventScript_14E281
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	call_if 1, DewfordTown_EventScript_14E28A
 	closemessage
 	copyvar 0x4096, 0x8008
-	resetobjectpriority 255, 0, 11
-	resetobjectpriority 2, 0, 24
+	resetobjectpriority 255, MAP_DEWFORD_TOWN
+	resetobjectpriority 2, MAP_ROUTE109
 	moveobjectoffscreen 2
 	release
 	end
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc
index 92776afb1..afd918a96 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -20,23 +20,23 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071
 	goto DewfordTown_Gym_EventScript_1530AE
 
 DewfordTown_Gym_EventScript_1530AA:: @ 81530AA
-	setdarklevel 0
+	setflashradius 0
 	return
 
 DewfordTown_Gym_EventScript_1530AE:: @ 81530AE
-	setdarklevel 1
+	setflashradius 1
 	return
 
 DewfordTown_Gym_EventScript_1530B2:: @ 81530B2
-	setdarklevel 2
+	setflashradius 2
 	return
 
 DewfordTown_Gym_EventScript_1530B6:: @ 81530B6
-	setdarklevel 3
+	setflashradius 3
 	return
 
 DewfordTown_Gym_EventScript_1530BA:: @ 81530BA
-	setdarklevel 4
+	setflashradius 4
 	return
 
 DewfordTown_Gym_EventScript_1530BE:: @ 81530BE
@@ -57,25 +57,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5
 
 DewfordTown_Gym_EventScript_1530F6:: @ 81530F6
 	playse 35
-	animdarklevel 3
+	animateflash 3
 	call DewfordTown_Gym_EventScript_153071
 	return
 
 DewfordTown_Gym_EventScript_153101:: @ 8153101
 	playse 35
-	animdarklevel 2
+	animateflash 2
 	call DewfordTown_Gym_EventScript_153071
 	return
 
 DewfordTown_Gym_EventScript_15310C:: @ 815310C
 	playse 35
-	animdarklevel 1
+	animateflash 1
 	call DewfordTown_Gym_EventScript_153071
 	return
 
 DewfordTown_Gym_EventScript_153117:: @ 8153117
 	playse 35
-	animdarklevel 0
+	animateflash 0
 	call DewfordTown_Gym_EventScript_153071
 	return
 
@@ -100,7 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151
 
 DewfordTown_Gym_EventScript_153152:: @ 8153152
 	trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177
-	checkflag 166
+	checkflag FLAG_RECEIVED_TM08
 	goto_if 0, DewfordTown_Gym_EventScript_1531B5
 	msgbox DewfordTown_Gym_Text_175412, 4
 	release
@@ -112,8 +112,8 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	waitmessage
 	call DewfordTown_Gym_EventScript_1A02C5
 	msgbox DewfordTown_Gym_Text_1752E6, 4
-	setflag 1204
-	setflag 2056
+	setflag FLAG_DEFEATED_DEWFORD_GYM
+	setflag FLAG_BADGE02_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, DewfordTown_Gym_EventScript_1A00FB
@@ -123,11 +123,11 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	end
 
 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5
-	giveitem ITEM_TM08
+	giveitem_std ITEM_TM08
 	compare RESULT, 0
 	goto_if_eq DewfordTown_Gym_EventScript_1A029B
 	msgbox DewfordTown_Gym_Text_1753BF, 4
-	setflag 166
+	setflag FLAG_RECEIVED_TM08
 	release
 	end
 
@@ -164,7 +164,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238
 DewfordTown_Gym_EventScript_15323F:: @ 815323F
 	lock
 	faceplayer
-	checkflag 1204
+	checkflag FLAG_DEFEATED_DEWFORD_GYM
 	goto_if_eq DewfordTown_Gym_EventScript_153254
 	msgbox DewfordTown_Gym_Text_174D98, 4
 	release
@@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254
 
 DewfordTown_Gym_EventScript_15325E:: @ 815325E
 	lockall
-	checkflag 2056
+	checkflag FLAG_BADGE02_GET
 	goto_if_eq DewfordTown_Gym_EventScript_15327E
 	goto DewfordTown_Gym_EventScript_153288
 	end
 
 DewfordTown_Gym_EventScript_15326E:: @ 815326E
 	lockall
-	checkflag 2056
+	checkflag FLAG_BADGE02_GET
 	goto_if_eq DewfordTown_Gym_EventScript_15327E
 	goto DewfordTown_Gym_EventScript_153288
 	end
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
index ea4016147..a3830ebb8 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/scripts/maps/DewfordTown_Hall.inc
@@ -252,13 +252,13 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D
 	lock
 	faceplayer
 	call DewfordTown_Hall_EventScript_1A0102
-	checkflag 230
+	checkflag FLAG_RECEIVED_TM36
 	goto_if_eq DewfordTown_Hall_EventScript_1535D1
 	msgbox DewfordTown_Hall_Text_175E13, 4
-	giveitem ITEM_TM36
+	giveitem_std ITEM_TM36
 	compare RESULT, 0
 	goto_if_eq DewfordTown_Hall_EventScript_1A029B
-	setflag 230
+	setflag FLAG_RECEIVED_TM36
 	release
 	end
 
diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc
index e8897b974..4a112eea2 100644
--- a/data/scripts/maps/DewfordTown_House1.inc
+++ b/data/scripts/maps/DewfordTown_House1.inc
@@ -13,8 +13,8 @@ DewfordTown_House1_EventScript_153001:: @ 8153001
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, 0
 	msgbox DewfordTown_House1_Text_174CC8, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc
index befe47404..e704efa50 100644
--- a/data/scripts/maps/DewfordTown_House2.inc
+++ b/data/scripts/maps/DewfordTown_House2.inc
@@ -4,13 +4,13 @@ DewfordTown_House2_MapScripts:: @ 81535DB
 DewfordTown_House2_EventScript_1535DC:: @ 81535DC
 	lock
 	faceplayer
-	checkflag 289
+	checkflag FLAG_RECEIVED_SILK_SCARF
 	goto_if_eq DewfordTown_House2_EventScript_153615
 	msgbox DewfordTown_House2_Text_175EFE, 4
-	giveitem ITEM_SILK_SCARF
+	giveitem_std ITEM_SILK_SCARF
 	compare RESULT, 0
 	goto_if_eq DewfordTown_House2_EventScript_15360B
-	setflag 289
+	setflag FLAG_RECEIVED_SILK_SCARF
 	release
 	end
 
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
index 70e75492e..c1288078f 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014
 	.byte 0
 
 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A
-	sethealplace 15
+	setrespawn 15
 	call DewfordTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
@@ -11,7 +11,7 @@ DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023
 	setvar 0x800b, 1
 	call DewfordTown_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc
index c9768d006..b4fa64cae 100644
--- a/data/scripts/maps/EverGrandeCity.inc
+++ b/data/scripts/maps/EverGrandeCity.inc
@@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5
 	.byte 0
 
 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, EverGrandeCity_EventScript_1A02C1
 	end
 
@@ -20,6 +20,6 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7
 	end
 
 EverGrandeCity_EventScript_14D500:: @ 814D500
-	setflag 2078
+	setflag FLAG_VISITED_EVER_GRANDE_CITY
 	setvar 0x4001, 1
 	end
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index b13c930cf..d59476417 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
@@ -46,8 +46,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805
 
 EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
 	playse 8
-	setmaptile 6, 1, 838, 0
-	setmaptile 6, 2, 839, 0
+	setmetatile 6, 1, 838, 0
+	setmetatile 6, 2, 839, 0
 	special DrawWholeMapView
 	msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4
 	closemessage
@@ -136,7 +136,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
 	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
 	waitmovement 0
-	setflag 781
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
 	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
 	waitstate
 	releaseall
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
index 3d3d56ff9..f7088e821 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
 	end
 
 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
-	checkflag 1248
+	checkflag FLAG_DEFEATED_ELITE_4_DRAKE
 	call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758
 	compare 0x409c, 4
 	call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E
@@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
 EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
 	lock
 	faceplayer
-	checkflag 1248
+	checkflag FLAG_DEFEATED_ELITE_4_DRAKE
 	goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B
 	playbgm 450, 0
 	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
@@ -57,7 +57,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
 EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
 	setvar 0x8004, 0
 	special sub_810FF60
-	setflag 1248
+	setflag FLAG_DEFEATED_ELITE_4_DRAKE
 	call EverGrandeCity_DrakesRoom_EventScript_1A0693
 	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
index 07f6e8877..be9e7a897 100644
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
-	checkflag 1247
+	checkflag FLAG_DEFEATED_ELITE_4_GLACIA
 	call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
 	compare 0x409c, 3
 	call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4
@@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
 	lock
 	faceplayer
-	checkflag 1247
+	checkflag FLAG_DEFEATED_ELITE_4_GLACIA
 	goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1
 	playbgm 450, 0
 	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
@@ -55,7 +55,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
-	setflag 1247
+	setflag FLAG_DEFEATED_ELITE_4_GLACIA
 	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
 	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
index d9baaee89..904dc7531 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
@@ -51,16 +51,16 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
 	end
 
 EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41
-	sethealplace 1
-	fadescreendelay 1, 24
+	setrespawn 1
+	fadescreenspeed 1, 24
 	special GameClear
 	waitstate
 	releaseall
 	end
 
 EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D
-	sethealplace 2
-	fadescreendelay 1, 24
+	setrespawn 2
+	fadescreenspeed 1, 24
 	special GameClear
 	waitstate
 	releaseall
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
index b7c1618ba..5ffa16d37 100644
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
-	checkflag 1246
+	checkflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624
 	compare 0x409c, 2
 	call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A
@@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
 EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
 	lock
 	faceplayer
-	checkflag 1246
+	checkflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657
 	playbgm 450, 0
 	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
@@ -55,7 +55,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
-	setflag 1246
+	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
 	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
index 57262b211..018658416 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66
 	.byte 0
 
 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C
-	sethealplace 11
+	setrespawn 11
 	end
 
 EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70
@@ -11,7 +11,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70
 	setvar 0x800b, 1
 	call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
index acbdac899..4a8919b98 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
@@ -3,9 +3,9 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
 	.byte 0
 
 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
-	sethealplace 20
-	setflag 2132
-	checkflag 263
+	setrespawn 20
+	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
+	checkflag FLAG_ENTERED_ELITE_FOUR
 	call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B
 	end
 
@@ -18,7 +18,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A
 	setvar 0x800b, 1
 	call EverGrandeCity_PokemonLeague_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -47,7 +47,7 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0
 
 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	lockall
-	checkflag 263
+	checkflag FLAG_ENTERED_ELITE_FOUR
 	goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57
 	getplayerxy 0x4000, 0x4001
 	compare 0x4000, 11
@@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	message EverGrandeCity_PokemonLeague_Text_1916FD
 	waitmessage
 	delay 75
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A
 	closemessage
 	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
@@ -71,7 +71,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	closemessage
 	moveobjectoffscreen 3
 	moveobjectoffscreen 4
-	setflag 263
+	setflag FLAG_ENTERED_ELITE_FOUR
 	releaseall
 	end
 
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
index daca98176..6e958aeed 100644
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
@@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
 	.byte 0
 
 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
-	checkflag 1245
+	checkflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564
 	compare 0x409c, 1
 	call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A
@@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
 	lock
 	faceplayer
-	checkflag 1245
+	checkflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD
 	playbgm 450, 0
 	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
@@ -56,7 +56,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
-	setflag 1245
+	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	call EverGrandeCity_SidneysRoom_EventScript_1A0693
 	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
 	release
diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc
index 13c8a9f2e..8ea580e28 100644
--- a/data/scripts/maps/FallarborTown.inc
+++ b/data/scripts/maps/FallarborTown.inc
@@ -3,16 +3,16 @@ FallarborTown_MapScripts:: @ 814E7E0
 	.byte 0
 
 FallarborTown_MapScript1_14E7E6:: @ 814E7E6
-	setflag 2067
+	setflag FLAG_VISITED_FALLARBOR_TOWN
 	setvar 0x4086, 0
-	setflag 800
-	clearflag 270
+	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	clearflag FLAG_CONTEST_SKETCH_CREATED
 	end
 
 FallarborTown_EventScript_14E7F5:: @ 814E7F5
 	lock
 	faceplayer
-	checkflag 139
+	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	goto_if_eq FallarborTown_EventScript_14E80A
 	msgbox FallarborTown_Text_16C7FF, 4
 	release
@@ -35,9 +35,9 @@ FallarborTown_EventScript_14E826:: @ 814E826
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_AZURILL, 0
+	playmoncry SPECIES_AZURILL, 0
 	msgbox FallarborTown_Text_16C92C, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc
index da19b96a7..72da4cd40 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
@@ -23,14 +23,14 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8
 	applymovement 1, FallarborTown_ContestLobby_Movement_153A7C
 	waitmovement 0
 	playse 71
-	setmaptile 4, 2, 545, 1
-	setmaptile 4, 3, 609, 1
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
 	special DrawWholeMapView
 	applymovement 1, FallarborTown_ContestLobby_Movement_153A7F
 	waitmovement 0
 	playse 71
-	setmaptile 4, 2, 721, 1
-	setmaptile 4, 3, 729, 1
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
 	special DrawWholeMapView
 	delay 20
 	applymovement 1, FallarborTown_ContestLobby_Movement_153A8C
@@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E
 	end
 
 FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97
-	checkflag 270
+	checkflag FLAG_CONTEST_SKETCH_CREATED
 	goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9
 	msgbox FallarborTown_ContestLobby_Text_177246, 2
 	end
@@ -115,7 +115,7 @@ FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB
 FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2
 	lockall
 	special ShowBerryBlenderRecordWindow
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc
index 0228fe25d..17267f926 100644
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/scripts/maps/FallarborTown_House1.inc
@@ -8,7 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4
 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5
 	lock
 	faceplayer
-	checkflag 229
+	checkflag FLAG_RECEIVED_TM27
 	goto_if_eq FallarborTown_House1_EventScript_153C54
 	checkitem ITEM_METEORITE, 1
 	compare RESULT, 1
@@ -18,19 +18,19 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5
 	end
 
 FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 0, FallarborTown_House1_EventScript_153C2D
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 1, FallarborTown_House1_EventScript_153C3E
 	compare RESULT, 0
 	goto_if_eq FallarborTown_House1_EventScript_153C47
 	msgbox FallarborTown_House1_Text_1778C4, 4
-	giveitem ITEM_TM27
+	giveitem_std ITEM_TM27
 	compare RESULT, 0
 	goto_if_eq FallarborTown_House1_EventScript_1A029B
 	setvar 0x8004, 280
 	call FallarborTown_House1_EventScript_1A067F
-	setflag 229
+	setflag FLAG_RECEIVED_TM27
 	msgbox FallarborTown_House1_Text_177910, 4
 	release
 	end
@@ -45,7 +45,7 @@ FallarborTown_House1_EventScript_153C3E:: @ 8153C3E
 	return
 
 FallarborTown_House1_EventScript_153C47:: @ 8153C47
-	setflag 2
+	setflag FLAG_TEMP_2
 	msgbox FallarborTown_House1_Text_17797D, 4
 	release
 	end
@@ -58,9 +58,9 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54
 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E
 	lock
 	faceplayer
-	checkflag 229
+	checkflag FLAG_RECEIVED_TM27
 	goto_if_eq FallarborTown_House1_EventScript_153C86
-	checkflag 139
+	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	goto_if_eq FallarborTown_House1_EventScript_153C7C
 	msgbox FallarborTown_House1_Text_177A2B, 4
 	release
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc
index 3b215a697..001863d5c 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/scripts/maps/FallarborTown_House2.inc
@@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91
 	lockall
 	applymovement 1, FallarborTown_House2_Movement_1A0839
 	waitmovement 0
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq FallarborTown_House2_EventScript_153CB6
 	msgbox FallarborTown_House2_Text_177AF4, 4
-	setflag 1
+	setflag FLAG_TEMP_1
 	goto FallarborTown_House2_EventScript_153CB6
 	end
 
@@ -43,7 +43,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A
 	compare 0x8004, 0
 	goto_if_eq FallarborTown_House2_EventScript_153CE4
 	msgbox FallarborTown_House2_Text_177CC3, 4
-	removeitem ITEM_HEART_SCALE, 1
+	takeitem ITEM_HEART_SCALE, 1
 	goto FallarborTown_House2_EventScript_153D60
 	end
 
diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc
index e6f715697..cfd239e8a 100644
--- a/data/scripts/maps/FallarborTown_Mart.inc
+++ b/data/scripts/maps/FallarborTown_Mart.inc
@@ -41,8 +41,8 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, 0
 	msgbox FallarborTown_Mart_Text_1770D3, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
index 5b1f1c948..dd6e83be3 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3
 	.byte 0
 
 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9
-	sethealplace 17
+	setrespawn 17
 	call FallarborTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
@@ -11,7 +11,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02
 	setvar 0x800b, 1
 	call FallarborTown_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -48,7 +48,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59
 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69
 	playse 18
 	removeobject 4
-	clearflag 870
+	clearflag FLAG_HIDE_LANETTE
 	release
 	end
 
diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc
index bd984ad20..f0bd22071 100644
--- a/data/scripts/maps/FieryPath.inc
+++ b/data/scripts/maps/FieryPath.inc
@@ -3,5 +3,5 @@ FieryPath_MapScripts:: @ 815D318
 	.byte 0
 
 FieryPath_MapScript1_15D31E:: @ 815D31E
-	setflag 2122
+	setflag FLAG_LANDMARK_FIERY_PATH
 	end
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index 6ea89dcb7..239c1410d 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/scripts/maps/FortreeCity.inc
@@ -4,11 +4,11 @@ FortreeCity_MapScripts:: @ 814C943
 	.byte 0
 
 FortreeCity_MapScript1_14C94E:: @ 814C94E
-	setflag 2074
+	setflag FLAG_VISITED_FORTREE_CITY
 	end
 
 FortreeCity_MapScript1_14C952:: @ 814C952
-	tileeffect 2
+	setstepcallback 2
 	end
 
 FortreeCity_EventScript_14C955:: @ 814C955
@@ -18,7 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955
 FortreeCity_EventScript_14C95E:: @ 814C95E
 	lock
 	faceplayer
-	checkflag 295
+	checkflag FLAG_KECLEON_FLED_FORTREE
 	goto_if_eq FortreeCity_EventScript_14C973
 	msgbox FortreeCity_Text_1675C2, 4
 	release
@@ -76,13 +76,13 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4
 	applymovement LAST_TALKED, FortreeCity_Movement_1A0662
 	waitmovement 0
 	waitse
-	playpokecry SPECIES_KECLEON, 2
+	playmoncry SPECIES_KECLEON, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	applymovement LAST_TALKED, FortreeCity_Movement_14CA13
 	waitmovement 0
 	removeobject LAST_TALKED
-	setflag 295
+	setflag FLAG_KECLEON_FLED_FORTREE
 	release
 	end
 
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc
index fca20b866..56a360708 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.inc
+++ b/data/scripts/maps/FortreeCity_DecorationShop.inc
@@ -14,7 +14,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A
 	faceplayer
 	message FortreeCity_DecorationShop_Text_1A0BE4
 	waitmessage
-	pokemartdecor FortreeCity_DecorationShop_Decorations1
+	pokemartdecoration FortreeCity_DecorationShop_Decorations1
 	msgbox FortreeCity_DecorationShop_Text_1A0C02, 4
 	release
 	end
@@ -38,7 +38,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298
 	faceplayer
 	message FortreeCity_DecorationShop_Text_1A0BE4
 	waitmessage
-	pokemartdecor FortreeCity_DecorationShop_Decorations2
+	pokemartdecoration FortreeCity_DecorationShop_Decorations2
 	msgbox FortreeCity_DecorationShop_Text_1A0C02, 4
 	release
 	end
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index 7309be0bb..a0eb6186a 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -17,7 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC
 
 FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0
 	trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15
-	checkflag 170
+	checkflag FLAG_RECEIVED_TM40
 	goto_if 0, FortreeCity_Gym_EventScript_157F3E
 	msgbox FortreeCity_Gym_Text_185F98, 4
 	release
@@ -28,19 +28,19 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15
 	waitmessage
 	call FortreeCity_Gym_EventScript_1A02C5
 	msgbox FortreeCity_Gym_Text_185E73, 4
-	setflag 1225
-	setflag 2060
+	setflag FLAG_DEFEATED_FORTREE_GYM
+	setflag FLAG_BADGE06_GET
 	setvar 0x8008, 6
 	call FortreeCity_Gym_EventScript_1A01C0
 	goto FortreeCity_Gym_EventScript_157F3E
 	end
 
 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E
-	giveitem ITEM_TM40
+	giveitem_std ITEM_TM40
 	compare RESULT, 0
 	goto_if_eq FortreeCity_Gym_EventScript_1A029B
 	msgbox FortreeCity_Gym_Text_185F4A, 4
-	setflag 170
+	setflag FLAG_RECEIVED_TM40
 	release
 	end
 
@@ -67,7 +67,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7
 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE
 	lock
 	faceplayer
-	checkflag 1225
+	checkflag FLAG_DEFEATED_FORTREE_GYM
 	goto_if_eq FortreeCity_Gym_EventScript_157FD3
 	msgbox FortreeCity_Gym_Text_18589C, 4
 	release
@@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3
 
 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD
 	lockall
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	goto_if_eq FortreeCity_Gym_EventScript_157FFD
 	goto FortreeCity_Gym_EventScript_158007
 	end
 
 FortreeCity_Gym_EventScript_157FED:: @ 8157FED
 	lockall
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	goto_if_eq FortreeCity_Gym_EventScript_157FFD
 	goto FortreeCity_Gym_EventScript_158007
 	end
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc
index 7b7ef0b2e..14b9b2c31 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/scripts/maps/FortreeCity_House1.inc
@@ -4,7 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12
 FortreeCity_House1_EventScript_157E13:: @ 8157E13
 	lock
 	faceplayer
-	checkflag 155
+	checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED
 	goto_if_eq FortreeCity_House1_EventScript_157EAD
 	setvar 0x8008, 1
 	copyvar 0x8004, 0x8008
@@ -28,9 +28,9 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13
 	special sub_804DB68
 	special sub_804E174
 	waitstate
-	getspeciesname 0, 0x8009
+	bufferspeciesname 0, 0x8009
 	msgbox FortreeCity_House1_Text_1856F7, 4
-	setflag 155
+	setflag FLAG_FORTREE_NPC_TRADE_COMPLETED
 	release
 	end
 
@@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95
 	end
 
 FortreeCity_House1_EventScript_157E9F:: @ 8157E9F
-	getspeciesname 0, 0x8009
+	bufferspeciesname 0, 0x8009
 	msgbox FortreeCity_House1_Text_185737, 4
 	release
 	end
@@ -58,8 +58,8 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, 0
 	msgbox FortreeCity_House1_Text_185888, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc
index f210dd3ac..ae70b8644 100644
--- a/data/scripts/maps/FortreeCity_House2.inc
+++ b/data/scripts/maps/FortreeCity_House2.inc
@@ -4,9 +4,9 @@ FortreeCity_House2_MapScripts:: @ 81580B3
 FortreeCity_House2_EventScript_1580B4:: @ 81580B4
 	lock
 	faceplayer
-	checkflag 264
+	checkflag FLAG_RECEIVED_TM10
 	goto_if_eq FortreeCity_House2_EventScript_158157
-	checkflag 118
+	checkflag FLAG_MET_HIDDEN_POWER_GIVER
 	call_if 0, FortreeCity_House2_EventScript_15814B
 	msgbox FortreeCity_House2_Text_186360, 4
 	multichoice 21, 8, 54, 1
@@ -21,17 +21,17 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4
 	switch RESULT
 	case 0, FortreeCity_House2_EventScript_158161
 	msgbox FortreeCity_House2_Text_1864C6, 4
-	giveitem ITEM_TM10
+	giveitem_std ITEM_TM10
 	compare RESULT, 0
 	goto_if_eq FortreeCity_House2_EventScript_1A029B
-	setflag 264
+	setflag FLAG_RECEIVED_TM10
 	msgbox FortreeCity_House2_Text_18652F, 4
 	release
 	end
 
 FortreeCity_House2_EventScript_15814B:: @ 815814B
 	msgbox FortreeCity_House2_Text_186306, 4
-	setflag 118
+	setflag FLAG_MET_HIDDEN_POWER_GIVER
 	return
 
 FortreeCity_House2_EventScript_158157:: @ 8158157
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
index b261e14fb..1b1b41877 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/scripts/maps/FortreeCity_House4.inc
@@ -7,16 +7,16 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F
 
 FortreeCity_House4_EventScript_158188:: @ 8158188
 	lockall
-	checkflag 223
+	checkflag FLAG_RECEIVED_MENTAL_HERB
 	goto_if_eq FortreeCity_House4_EventScript_158204
-	checkflag 224
+	checkflag FLAG_WINGULL_DELIVERED_MAIL
 	goto_if_eq FortreeCity_House4_EventScript_1581D6
-	checkflag 222
+	checkflag FLAG_WINGULL_SENT_ON_ERRAND
 	goto_if_eq FortreeCity_House4_EventScript_1581C2
 	msgbox FortreeCity_House4_Text_186835, 4
 	closemessage
-	setflag 222
-	clearflag 934
+	setflag FLAG_WINGULL_SENT_ON_ERRAND
+	clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
 	applymovement 3, FortreeCity_House4_Movement_158218
 	waitmovement 0
 	removeobject 3
@@ -34,10 +34,10 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6
 	applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_186881, 4
-	giveitem ITEM_MENTAL_HERB
+	giveitem_std ITEM_MENTAL_HERB
 	compare RESULT, 0
 	goto_if_eq FortreeCity_House4_EventScript_1A029B
-	setflag 223
+	setflag FLAG_RECEIVED_MENTAL_HERB
 	releaseall
 	end
 
@@ -60,8 +60,8 @@ FortreeCity_House4_EventScript_15821E:: @ 815821E
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, 0
 	msgbox FortreeCity_House4_Text_18695C, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc
index fe10b53b0..888ebe0e2 100644
--- a/data/scripts/maps/FortreeCity_House5.inc
+++ b/data/scripts/maps/FortreeCity_House5.inc
@@ -13,8 +13,8 @@ FortreeCity_House5_EventScript_158244:: @ 8158244
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, 0
 	msgbox FortreeCity_House5_Text_186A4F, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
index 5268cbeed..b82927be1 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
@@ -3,14 +3,14 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011
 	.byte 0
 
 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017
-	sethealplace 7
+	setrespawn 7
 	end
 
 FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B
 	setvar 0x800b, 1
 	call FortreeCity_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc
index f389a774e..33296e510 100644
--- a/data/scripts/maps/GraniteCave_1F.inc
+++ b/data/scripts/maps/GraniteCave_1F.inc
@@ -4,11 +4,11 @@ GraniteCave_1F_MapScripts:: @ 815CBA6
 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7
 	lock
 	faceplayer
-	checkflag 109
+	checkflag FLAG_RECEIVED_HM05
 	goto_if_eq GraniteCave_1F_EventScript_15CBD3
 	msgbox GraniteCave_1F_Text_194917, 4
-	giveitem ITEM_HM05
-	setflag 109
+	giveitem_std ITEM_HM05
+	setflag FLAG_RECEIVED_HM05
 	msgbox GraniteCave_1F_Text_194A3E, 4
 	release
 	end
diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc
index 07a95c3f1..c6be3feca 100644
--- a/data/scripts/maps/GraniteCave_B1F.inc
+++ b/data/scripts/maps/GraniteCave_B1F.inc
@@ -5,6 +5,6 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD
 	.byte 0
 
 GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED
-	tileeffect 7
+	setstepcallback 7
 	setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
 	end
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc
index 070276e58..344ccd479 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
@@ -5,11 +5,11 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
 	lock
 	faceplayer
 	msgbox GraniteCave_StevensRoom_Text_194AE5, 4
-	setvar 0x8004, 274
+	setvar 0x8004, ITEM_LETTER
 	call GraniteCave_StevensRoom_EventScript_1A067F
-	setflag 189
+	setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_194BDD, 4
-	giveitem ITEM_TM47
+	giveitem_std ITEM_TM47
 	compare RESULT, 0
 	call_if 1, GraniteCave_StevensRoom_EventScript_15CC83
 	msgbox GraniteCave_StevensRoom_Text_194C8D, 4
diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc
index 737bacf71..18cfb904d 100644
--- a/data/scripts/maps/InsideOfTruck.inc
+++ b/data/scripts/maps/InsideOfTruck.inc
@@ -4,13 +4,13 @@ InsideOfTruck_MapScripts:: @ 815FBFF
 	.byte 0
 
 InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A
-	setmaptile 4, 1, 520, 0
-	setmaptile 4, 2, 528, 0
-	setmaptile 4, 3, 536, 0
+	setmetatile 4, 1, 520, 0
+	setmetatile 4, 2, 528, 0
+	setmetatile 4, 3, 536, 0
 	end
 
 InsideOfTruck_MapScript1_15FC26:: @ 815FC26
-	tileeffect 5
+	setstepcallback 5
 	end
 
 InsideOfTruck_EventScript_15FC29:: @ 815FC29
@@ -24,24 +24,24 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29
 	end
 
 InsideOfTruck_EventScript_15FC45:: @ 815FC45
-	sethealplace 1
+	setrespawn 1
 	setvar 0x4092, 1
-	setflag 759
-	setflag 762
-	setflag 784
-	setflag 760
+	setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS
+	setflag FLAG_HIDE_MOVING_TRUCK_MAY
+	setflag FLAG_HIDE_BRENDAN_MOM
+	setflag FLAG_HIDE_BRENDAN_UPSTAIRS
 	setvar 0x408c, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
 	releaseall
 	end
 
 InsideOfTruck_EventScript_15FC68:: @ 815FC68
-	sethealplace 2
+	setrespawn 2
 	setvar 0x4092, 2
-	setflag 758
-	setflag 761
-	setflag 785
-	setflag 722
+	setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS
+	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
+	setflag FLAG_HIDE_MAY_MOM
+	setflag FLAG_HIDE_MAY_UPSTAIRS
 	setvar 0x4082, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
 	releaseall
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index 75399bde8..dbc71b6bb 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -5,7 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6
 	.byte 0
 
 IslandCave_MapScript1_15EEC6:: @ 815EEC6
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, IslandCave_EventScript_15EED0
 	end
 
@@ -14,38 +14,38 @@ IslandCave_EventScript_15EED0:: @ 815EED0
 	return
 
 IslandCave_MapScript1_15EED4:: @ 815EED4
-	checkflag 2129
+	checkflag FLAG_SYS_BRAILLE_WAIT
 	call_if 0, IslandCave_EventScript_15EEDE
 	end
 
 IslandCave_EventScript_15EEDE:: @ 815EEDE
-	setmaptile 7, 19, 553, 1
-	setmaptile 8, 19, 553, 1
-	setmaptile 9, 19, 553, 1
-	setmaptile 7, 20, 565, 1
-	setmaptile 8, 20, 565, 1
-	setmaptile 9, 20, 565, 1
+	setmetatile 7, 19, 553, 1
+	setmetatile 8, 19, 553, 1
+	setmetatile 9, 19, 553, 1
+	setmetatile 7, 20, 565, 1
+	setmetatile 8, 20, 565, 1
+	setmetatile 9, 20, 565, 1
 	return
 
 IslandCave_MapScript1_15EF15:: @ 815EF15
-	setflag 2133
+	setflag FLAG_LANDMARK_ISLAND_CAVE
 	end
 
 S_OpenRegiceChamber:: @ 815EF19
-	setmaptile 7, 19, 554, 1
-	setmaptile 8, 19, 555, 1
-	setmaptile 9, 19, 556, 1
-	setmaptile 7, 20, 562, 1
-	setmaptile 8, 20, 563, 0
-	setmaptile 9, 20, 564, 1
+	setmetatile 7, 19, 554, 1
+	setmetatile 8, 19, 555, 1
+	setmetatile 9, 19, 556, 1
+	setmetatile 7, 20, 562, 1
+	setmetatile 8, 20, 563, 0
+	setmetatile 9, 20, 564, 1
 	special DrawWholeMapView
 	playse SE_BAN
-	setflag 2129
+	setflag FLAG_SYS_BRAILLE_WAIT
 	end
 
 IslandCave_EventScript_15EF59:: @ 815EF59
 	lockall
-	checkflag 2129
+	checkflag FLAG_SYS_BRAILLE_WAIT
 	goto_if_eq IslandCave_EventScript_15EF72
 	braillemessage IslandCave_Braille_1C54FC
 	special DoBrailleWait
@@ -61,7 +61,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72
 IslandCave_EventScript_15EF7C:: @ 815EF7C
 	lockall
 	braillemessage IslandCave_Braille_1C54FC
-	checkflag 2129
+	checkflag FLAG_SYS_BRAILLE_WAIT
 	goto_if_eq IslandCave_EventScript_15EF95
 	special DoBrailleWait
 	waitstate
@@ -69,7 +69,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C
 	end
 
 IslandCave_EventScript_15EF95:: @ 815EF95
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -78,14 +78,14 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_REGICE, 2
+	playmoncry SPECIES_REGICE, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
-	setflag 936
-	setflag 2145
+	setflag FLAG_HIDE_REGICE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc
index 6f910d0ad..c7efee318 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/scripts/maps/JaggedPass.inc
@@ -4,7 +4,7 @@ JaggedPass_MapScripts:: @ 815D266
 	.byte 0
 
 JaggedPass_MapScript1_15D271:: @ 815D271
-	tileeffect 1
+	setstepcallback 1
 	end
 
 JaggedPass_MapScript1_15D274:: @ 815D274
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index 5192176a7..8b4384ed8 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -4,8 +4,8 @@ LavaridgeTown_MapScripts:: @ 814E4A3
 	.byte 0
 
 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
-	setflag 2066
-	checkflag 139
+	setflag FLAG_VISITED_LAVARIDGE_TOWN
+	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	call_if 1, LavaridgeTown_EventScript_14E4DF
 	call LavaridgeTown_EventScript_1A014E
 	call LavaridgeTown_EventScript_1A0172
@@ -19,7 +19,7 @@ LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
 	return
 
 LavaridgeTown_EventScript_14E4DF:: @ 814E4DF
-	clearflag 877
+	clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
 	return
 
 LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3
@@ -83,16 +83,16 @@ LavaridgeTown_EventScript_14E575:: @ 814E575
 
 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
 	msgbox LavaridgeTown_Text_16BDA4, 4
-	giveitem ITEM_GO_GOGGLES
-	setflag 221
+	giveitem_std ITEM_GO_GOGGLES
+	setflag FLAG_RECEIVED_GO_GOGGLES
 	msgbox LavaridgeTown_Text_16BE7D, 4
 	goto LavaridgeTown_EventScript_14E5F5
 	end
 
 LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
 	msgbox LavaridgeTown_Text_16BF92, 4
-	giveitem ITEM_GO_GOGGLES
-	setflag 221
+	giveitem_std ITEM_GO_GOGGLES
+	setflag FLAG_RECEIVED_GO_GOGGLES
 	msgbox LavaridgeTown_Text_16C020, 4
 	goto LavaridgeTown_EventScript_14E5F5
 	end
@@ -272,16 +272,16 @@ LavaridgeTown_EventScript_14E751:: @ 814E751
 LavaridgeTown_EventScript_14E75A:: @ 814E75A
 	lock
 	faceplayer
-	checkflag 266
+	checkflag FLAG_RECEIVED_LAVARIDGE_EGG
 	goto_if_eq LavaridgeTown_EventScript_14E79E
 	msgbox LavaridgeTown_Text_16C174, 5
 	compare RESULT, 0
 	goto_if_eq LavaridgeTown_EventScript_14E7B2
-	countpokemon
+	getpartysize
 	compare RESULT, 6
 	goto_if_eq LavaridgeTown_EventScript_14E7A8
 	msgbox LavaridgeTown_Text_16C2B6, 4
-	setflag 266
+	setflag FLAG_RECEIVED_LAVARIDGE_EGG
 	playfanfare 370
 	message LavaridgeTown_Text_16C2EA
 	waitfanfare
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index 2edffe9f0..9dd1ae59d 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
@@ -70,7 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740
 
 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741
 	trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766
-	checkflag 168
+	checkflag FLAG_RECEIVED_TM50
 	goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7
 	msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4
 	release
@@ -81,24 +81,24 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	waitmessage
 	call LavaridgeTown_Gym_1F_EventScript_1A02C5
 	msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4
-	setflag 1213
-	setflag 2058
+	setflag FLAG_DEFEATED_LAVARIDGE_GYM
+	setflag FLAG_BADGE04_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB
 	setvar 0x8008, 4
 	call LavaridgeTown_Gym_1F_EventScript_1A01C0
-	setflag 806
+	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
 	setvar 0x4053, 1
 	goto LavaridgeTown_Gym_1F_EventScript_1537A7
 	end
 
 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7
-	giveitem ITEM_TM50
+	giveitem_std ITEM_TM50
 	compare RESULT, 0
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B
 	msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4
-	setflag 168
+	setflag FLAG_RECEIVED_TM50
 	release
 	end
 
@@ -135,7 +135,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E
 LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859
 	lock
 	faceplayer
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E
 	msgbox LavaridgeTown_Gym_1F_Text_176312, 4
 	release
@@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E
 
 LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878
 	lockall
-	checkflag 2058
+	checkflag FLAG_BADGE04_GET
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898
 	goto LavaridgeTown_Gym_1F_EventScript_1538A2
 	end
 
 LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888
 	lockall
-	checkflag 2058
+	checkflag FLAG_BADGE04_GET
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898
 	goto LavaridgeTown_Gym_1F_EventScript_1538A2
 	end
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc
index 5ec6731d4..913734dd5 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.inc
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc
@@ -28,13 +28,13 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C
 LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655
 	lock
 	faceplayer
-	checkflag 254
+	checkflag FLAG_RECEIVED_CHARCOAL
 	goto_if_eq LavaridgeTown_HerbShop_EventScript_153684
 	msgbox LavaridgeTown_HerbShop_Text_1761A2, 4
-	giveitem ITEM_CHARCOAL
+	giveitem_std ITEM_CHARCOAL
 	compare RESULT, 0
 	goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B
-	setflag 254
+	setflag FLAG_RECEIVED_CHARCOAL
 	release
 	end
 
diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc
index c75cb9e4b..6fc14e0b6 100644
--- a/data/scripts/maps/LavaridgeTown_House.inc
+++ b/data/scripts/maps/LavaridgeTown_House.inc
@@ -9,8 +9,8 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, 0
 	msgbox LavaridgeTown_House_Text_176D94, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
index 9d0f31059..0efda9c1e 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C
 	.byte 0
 
 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912
-	sethealplace 16
+	setrespawn 16
 	call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
@@ -11,7 +11,7 @@ LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B
 	setvar 0x800b, 1
 	call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index cf8e2e07d..6494f2a6f 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -4,10 +4,10 @@ LilycoveCity_MapScripts:: @ 814CA15
 	.byte 0
 
 LilycoveCity_MapScript1_14CA20:: @ 814CA20
-	setflag 2075
+	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar 0x4086, 0
-	setflag 802
-	checkflag 2090
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, LilycoveCity_EventScript_1A02C1
 	call LilycoveCity_EventScript_1A0196
 	call LilycoveCity_EventScript_1A014E
@@ -15,64 +15,64 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20
 
 LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
 	.ifndef SAPPHIRE
-	setmaptile 69, 4, 169, 1
-	setmaptile 70, 4, 680, 1
-	setmaptile 71, 4, 681, 1
-	setmaptile 72, 4, 682, 1
-	setmaptile 69, 5, 145, 1
-	setmaptile 70, 5, 688, 1
-	setmaptile 71, 5, 689, 0
-	setmaptile 72, 5, 690, 1
-	setmaptile 69, 6, 446, 0
-	setmaptile 70, 6, 447, 0
-	setmaptile 71, 6, 368, 0
-	setmaptile 72, 6, 445, 0
+	setmetatile 69, 4, 169, 1
+	setmetatile 70, 4, 680, 1
+	setmetatile 71, 4, 681, 1
+	setmetatile 72, 4, 682, 1
+	setmetatile 69, 5, 145, 1
+	setmetatile 70, 5, 688, 1
+	setmetatile 71, 5, 689, 0
+	setmetatile 72, 5, 690, 1
+	setmetatile 69, 6, 446, 0
+	setmetatile 70, 6, 447, 0
+	setmetatile 71, 6, 368, 0
+	setmetatile 72, 6, 445, 0
 	.endif
-	checkflag 112
+	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	call_if 0, LilycoveCity_EventScript_14CABE
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	call_if 1, LilycoveCity_EventScript_14CB2B
 	end
 
 LilycoveCity_EventScript_14CABE:: @ 814CABE
-	setmaptile 76, 12, 656, 1
-	setmaptile 77, 12, 657, 1
-	setmaptile 76, 13, 672, 1
-	setmaptile 77, 13, 673, 1
-	setmaptile 76, 14, 664, 1
-	setmaptile 77, 14, 665, 1
-	setmaptile 76, 15, 672, 1
-	setmaptile 77, 15, 673, 1
-	setmaptile 77, 16, 664, 1
-	setmaptile 78, 16, 665, 1
-	setmaptile 77, 17, 672, 1
-	setmaptile 78, 17, 673, 1
+	setmetatile 76, 12, 656, 1
+	setmetatile 77, 12, 657, 1
+	setmetatile 76, 13, 672, 1
+	setmetatile 77, 13, 673, 1
+	setmetatile 76, 14, 664, 1
+	setmetatile 77, 14, 665, 1
+	setmetatile 76, 15, 672, 1
+	setmetatile 77, 15, 673, 1
+	setmetatile 77, 16, 664, 1
+	setmetatile 78, 16, 665, 1
+	setmetatile 77, 17, 672, 1
+	setmetatile 78, 17, 673, 1
 	return
 
 LilycoveCity_EventScript_14CB2B:: @ 814CB2B
-	setmaptile 69, 4, 169, 1
-	setmaptile 70, 4, 169, 1
-	setmaptile 71, 4, 169, 1
-	setmaptile 72, 4, 169, 1
-	setmaptile 69, 5, 145, 1
-	setmaptile 70, 5, 145, 1
-	setmaptile 71, 5, 145, 1
-	setmaptile 72, 5, 145, 1
+	setmetatile 69, 4, 169, 1
+	setmetatile 70, 4, 169, 1
+	setmetatile 71, 4, 169, 1
+	setmetatile 72, 4, 169, 1
+	setmetatile 69, 5, 145, 1
+	setmetatile 70, 5, 145, 1
+	setmetatile 71, 5, 145, 1
+	setmetatile 72, 5, 145, 1
 	return
 
 LilycoveCity_EventScript_14CB74:: @ 814CB74
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2255
+	checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
 	goto_if_eq LilycoveCity_EventScript_14CBB4
 	msgbox LilycoveCity_Text_1C5A7A, 4
 	random 10
-	addvar RESULT, 133
-	giveitem RESULT
+	addvar RESULT, ITEM_CHERI_BERRY
+	giveitem_std RESULT
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_1A029B
-	setflag 2255
+	setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
 	msgbox LilycoveCity_Text_1C5B1D, 4
 	release
 	end
@@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE
 LilycoveCity_EventScript_14CBC7:: @ 814CBC7
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq LilycoveCity_EventScript_14CBDC
 	msgbox LilycoveCity_Text_168750, 4
 	release
@@ -107,7 +107,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6
 LilycoveCity_EventScript_14CBEF:: @ 814CBEF
 	lock
 	faceplayer
-	checkflag 112
+	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	goto_if_eq LilycoveCity_EventScript_14CC04
 	msgbox LilycoveCity_Text_1688C1, 4
 	release
@@ -121,7 +121,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04
 LilycoveCity_EventScript_14CC0E:: @ 814CC0E
 	lock
 	faceplayer
-	checkflag 112
+	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	goto_if_eq LilycoveCity_EventScript_14CC23
 	msgbox LilycoveCity_Text_1689BF, 4
 	release
@@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F
 LilycoveCity_EventScript_14CC48:: @ 814CC48
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq LilycoveCity_EventScript_14CC5D
 	msgbox LilycoveCity_Text_168C16, 4
 	release
@@ -186,7 +186,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2
 
 LilycoveCity_EventScript_14CCAC:: @ 814CCAC
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CCC0
 	msgbox LilycoveCity_Text_168EDA, 4
 	releaseall
@@ -211,7 +211,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC
 
 LilycoveCity_EventScript_14CCE5:: @ 814CCE5
 	lockall
-	checkflag 218
+	checkflag FLAG_MET_WAILMER_TRAINER
 	goto_if_eq LilycoveCity_EventScript_14CD18
 	msgbox LilycoveCity_Text_16864A, 4
 	applymovement LAST_TALKED, LilycoveCity_Movement_1A0839
@@ -219,7 +219,7 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5
 	msgbox LilycoveCity_Text_168675, 4
 	applymovement LAST_TALKED, LilycoveCity_Movement_1A083D
 	waitmovement 0
-	setflag 218
+	setflag FLAG_MET_WAILMER_TRAINER
 	releaseall
 	end
 
@@ -256,9 +256,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46
 
 LilycoveCity_EventScript_14CD60:: @ 814CD60
 	playbgm 415, 1
-	checkflag 286
+	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	call_if 1, LilycoveCity_EventScript_14CDB0
-	checkflag 286
+	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	call_if 0, LilycoveCity_EventScript_14CDB9
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_14CDC2
@@ -278,7 +278,7 @@ LilycoveCity_EventScript_14CDB9:: @ 814CDB9
 	return
 
 LilycoveCity_EventScript_14CDC2:: @ 814CDC2
-	setflag 286
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	msgbox LilycoveCity_Text_167AEB, 4
 	savebgm 0
 	fadedefaultbgm
@@ -287,9 +287,9 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2
 
 LilycoveCity_EventScript_14CDD3:: @ 814CDD3
 	playbgm 421, 1
-	checkflag 286
+	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	call_if 1, LilycoveCity_EventScript_14CE23
-	checkflag 286
+	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	call_if 0, LilycoveCity_EventScript_14CE2C
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_14CE35
@@ -309,7 +309,7 @@ LilycoveCity_EventScript_14CE2C:: @ 814CE2C
 	return
 
 LilycoveCity_EventScript_14CE35:: @ 814CE35
-	setflag 286
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	msgbox LilycoveCity_Text_16802C, 4
 	savebgm 0
 	fadedefaultbgm
@@ -349,19 +349,19 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96
 LilycoveCity_EventScript_14CEA6:: @ 814CEA6
 	msgbox LilycoveCity_Text_167C6B, 4
 	setvar RESULT, 0
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	call_if 1, LilycoveCity_EventScript_14CEDE
 	compare RESULT, 0
 	call_if 1, LilycoveCity_EventScript_14CEEE
 	compare RESULT, 1
 	call_if 1, LilycoveCity_EventScript_14CEF7
-	clearflag 722
-	clearflag 849
+	clearflag FLAG_HIDE_MAY_UPSTAIRS
+	clearflag FLAG_HIDE_MAY_PICHU_DOLL
 	goto LilycoveCity_EventScript_14CF6B
 	end
 
 LilycoveCity_EventScript_14CEDE:: @ 814CEDE
-	checkflag 2062
+	checkflag FLAG_BADGE08_GET
 	goto_if_eq LilycoveCity_EventScript_14CEE8
 	return
 
@@ -374,7 +374,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE
 	return
 
 LilycoveCity_EventScript_14CEF7:: @ 814CEF7
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CF09
 	msgbox LilycoveCity_Text_167DDD, 4
 	return
@@ -386,13 +386,13 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09
 LilycoveCity_EventScript_14CF12:: @ 814CF12
 	msgbox LilycoveCity_Text_168149, 4
 	setvar RESULT, 0
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	call_if 1, LilycoveCity_EventScript_14CEDE
 	compare RESULT, 0
 	call_if 1, LilycoveCity_EventScript_14CF47
 	compare RESULT, 1
 	call_if 1, LilycoveCity_EventScript_14CF50
-	clearflag 760
+	clearflag FLAG_HIDE_BRENDAN_UPSTAIRS
 	goto LilycoveCity_EventScript_14CF6B
 	end
 
@@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47
 	return
 
 LilycoveCity_EventScript_14CF50:: @ 814CF50
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CF62
 	msgbox LilycoveCity_Text_168282, 4
 	return
@@ -415,13 +415,13 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B
 	applymovement LAST_TALKED, LilycoveCity_Movement_1A0845
 	waitmovement 0
 	delay 50
-	setfieldeffect 0, 1
+	setfieldeffectargument 0, 1
 	dofieldeffect 30
 	delay 15
 	removeobject LAST_TALKED
 	waitfieldeffect 30
 	savebgm 0
 	fadedefaultbgm
-	setflag 292
+	setflag FLAG_MET_RIVAL_LILYCOVE
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 656516fd6..c97a01989 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -13,7 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877
 	.2byte 0
 
 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889
-	checkflag 775
+	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158898
 	setvar 0x4099, 0
 	end
@@ -97,23 +97,23 @@ LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6
-	clearflag 776
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA
-	clearflag 777
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE
-	clearflag 778
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2
-	clearflag 779
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6
-	clearflag 780
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA
@@ -126,23 +126,23 @@ LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27
-	setflag 160
+	setflag FLAG_COOL_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B
-	setflag 161
+	setflag FLAG_BEAUTY_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F
-	setflag 162
+	setflag FLAG_CUTE_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33
-	setflag 163
+	setflag FLAG_SMART_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37
-	setflag 164
+	setflag FLAG_TOUGH_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B
@@ -188,7 +188,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
-	checkflag 775
+	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A
 	setvar 0x4099, 0
 	end
@@ -307,11 +307,11 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
 	checkitem ITEM_CONTEST_PASS, 1
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE
 	message LilycoveCity_ContestLobby_Text_18848C
 	waitmessage
-	setflag 2
+	setflag FLAG_TEMP_2
 	goto LilycoveCity_ContestLobby_EventScript_158BF0
 	end
 
@@ -334,7 +334,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
 	erasebox 0, 0, 15, 9
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
-	setflag 3
+	setflag FLAG_TEMP_3
 	return
 
 LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0
@@ -354,13 +354,13 @@ LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27
 LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
 	msgbox LilycoveCity_ContestLobby_Text_188559, 4
 	releaseall
-	clearflag 3
+	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
 	msgbox LilycoveCity_ContestLobby_Text_188703, 4
 	setvar CONTEST_RANK, 0
-	choosecontestpkmn
+	choosecontestmon
 	compare 0x8004, 255
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA
 	special sub_80C43F4
@@ -402,7 +402,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
 	end
 
 LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
-	checkflag 3
+	checkflag FLAG_TEMP_3
 	call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4
 	message LilycoveCity_ContestLobby_Text_1886DC
 	waitmessage
@@ -445,7 +445,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
 	msgbox LilycoveCity_ContestLobby_Text_18878D, 4
 	closemessage
 	releaseall
-	clearflag 3
+	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
@@ -453,7 +453,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
 	msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
 	closemessage
 	releaseall
-	clearflag 3
+	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
@@ -461,7 +461,7 @@ LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
 	msgbox LilycoveCity_ContestLobby_Text_18881F, 4
 	closemessage
 	releaseall
-	clearflag 3
+	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
@@ -472,7 +472,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
 	special sub_80C496C
 	addvar 0x8004, 1
-	getnumberstring 1, 32772
+	buffernumberstring 1, 32772
 	messageautoscroll LilycoveCity_ContestLobby_Text_188845
 	waitmessage
 	addvar 0x8004, 65535
@@ -497,14 +497,14 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
 	applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C
 	waitmovement 0
 	playse 71
-	setmaptile 9, 2, 545, 1
-	setmaptile 9, 3, 609, 1
+	setmetatile 9, 2, 545, 1
+	setmetatile 9, 3, 609, 1
 	special DrawWholeMapView
 	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0
 	waitmovement 0
 	playse 71
-	setmaptile 9, 2, 721, 1
-	setmaptile 9, 3, 729, 1
+	setmetatile 9, 2, 721, 1
+	setmetatile 9, 3, 729, 1
 	special DrawWholeMapView
 	delay 20
 	applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE
@@ -583,13 +583,13 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
 	end
 
 LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
-	setflag 775
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	copyvar 0x4094, 0x1
-	additem ITEM_CONTEST_PASS, 1
+	giveitem ITEM_CONTEST_PASS, 1
 	setvar 0x800b, 8
 	setvar CONTEST_RANK, 3
 	setvar 0x4099, 1
-	setflag 2107
+	setflag FLAG_SYS_RIBBON_GET
 	end
 
 LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08
@@ -636,14 +636,14 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
 	applymovement 1, LilycoveCity_ContestLobby_Movement_15900B
 	waitmovement 0
 	playse 71
-	setmaptile 4, 2, 545, 1
-	setmaptile 4, 3, 609, 1
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
 	special DrawWholeMapView
 	applymovement 1, LilycoveCity_ContestLobby_Movement_15900F
 	waitmovement 0
 	playse 71
-	setmaptile 4, 2, 721, 1
-	setmaptile 4, 3, 729, 1
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
 	special DrawWholeMapView
 	delay 20
 	applymovement 1, LilycoveCity_ContestLobby_Movement_15901C
@@ -707,7 +707,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
 	end
 
 LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027
-	checkflag 150
+	checkflag FLAG_RECEIVED_CONTEST_PASS
 	goto_if 0, LilycoveCity_ContestLobby_EventScript_159039
 	msgbox LilycoveCity_ContestLobby_Text_188DDA, 2
 	end
@@ -765,7 +765,7 @@ LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D
 SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D
 	lockall
 	special ShowBerryBlenderRecordWindow
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index 7b602b2c7..3e4caf100 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
@@ -3,9 +3,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index fd9ea8a58..00a10b655 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
 	lock
 	faceplayer
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
 	specialvar RESULT, sub_8090FC0
 	compare RESULT, 1
@@ -19,7 +19,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7
 	return
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
-	setflag 2
+	setflag FLAG_TEMP_2
 	playfanfare 370
 	waitfanfare
 	goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index 0e6bdc140..ca60bbc89 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
@@ -4,7 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B
 LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
 	lock
 	faceplayer
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
 	copyvar 0x8005, 0x4043
 	special sub_810E944
@@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8
 	waitmovement 0
 	special sub_810EBEC
 	waitstate
-	setflag 2
+	setflag FLAG_TEMP_2
 	return
 
 LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
index 29914a9b5..2806b6125 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
@@ -11,11 +11,11 @@ LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F
-	clearflag 962
+	clearflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163
-	setflag 962
+	setflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167
@@ -23,7 +23,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167
 	faceplayer
 	message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4
 	waitmessage
-	pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations
+	pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4
 	release
 	end
@@ -146,12 +146,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260
 	updatemoneybox 0, 0
 	nop
-	getitemname 0, 0x4000
+	bufferitemname 0, 0x4000
 	playse 106
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4
-	additem 0x4000, 1
-	getitemname 1, 0x4000
-	getstdstring 2, 14
+	giveitem 0x4000, 1
+	bufferitemname 1, 0x4000
+	bufferstdstring 2, 14
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4
 	random 64
 	compare RESULT, 0
@@ -161,9 +161,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388
 	playse 106
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4
-	additem 0x4000, 1
-	getitemname 1, 0x4000
-	getstdstring 2, 14
+	giveitem 0x4000, 1
+	bufferitemname 1, 0x4000
+	bufferstdstring 2, 14
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4
 	random 64
 	compare RESULT, 0
@@ -173,9 +173,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388
 	playse 106
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4
-	additem 0x4000, 1
-	getitemname 1, 0x4000
-	getstdstring 2, 14
+	giveitem 0x4000, 1
+	bufferitemname 1, 0x4000
+	bufferstdstring 2, 14
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E
 	end
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index 7acd29523..dbfd79e98 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
@@ -11,12 +11,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	dodailyevents
 	compare 0x4045, 0
 	goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1
-	checkflag 2250
+	checkflag FLAG_DAILY_PICKED_LOTTO_TICKET
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C
 	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56
-	setflag 2250
+	setflag FLAG_DAILY_PICKED_LOTTO_TICKET
 	message LilycoveCity_DepartmentStore_1F_Text_1C4CC6
 	waitmessage
 	special RetrieveLotteryNumber
@@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A
 	compare 0x8006, 1
 	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43
-	getitemname 0, 0x8005
+	bufferitemname 0, 0x8005
 	compare 0x8004, 1
 	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78
 	compare 0x8004, 2
@@ -49,7 +49,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A
 	compare 0x8004, 4
 	call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93
-	giveitem 0x8005
+	giveitem_std 0x8005
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C
 	goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E
@@ -111,7 +111,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7
 
 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1
 	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4
-	giveitem 0x4045
+	giveitem_std 0x4045
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7
 	setvar 0x4045, 0
@@ -134,9 +134,9 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_AZUMARILL, 0
+	playmoncry SPECIES_AZUMARILL, 0
 	msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
index 835a0f48d..184d3b816 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
@@ -6,7 +6,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
 	waitmessage
-	pokemartbp LilycoveCity_DepartmentStore_5F_Items1
+	pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
 	end
@@ -34,7 +34,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
 	waitmessage
-	pokemartbp LilycoveCity_DepartmentStore_5F_Items2
+	pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
 	end
@@ -59,7 +59,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
 	waitmessage
-	pokemartbp LilycoveCity_DepartmentStore_5F_Items3
+	pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
 	end
@@ -84,7 +84,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
 	waitmessage
-	pokemartbp LilycoveCity_DepartmentStore_5F_Items4
+	pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index 4dcc1ba71..9687c73fe 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -16,7 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2
 	end
 
 LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_Harbor_EventScript_1598CD
 	msgbox LilycoveCity_Harbor_Text_18B306, 4
 	release
@@ -79,13 +79,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A
 	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
 	waitmovement 0
 	delay 30
-	hideobject LAST_TALKED, 13, 10
+	hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
 	compare FACING, 2
 	call_if 1, LilycoveCity_Harbor_EventScript_1599D9
 	compare FACING, 4
 	call_if 1, LilycoveCity_Harbor_EventScript_1599CE
 	delay 30
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	setvar 0x8004, 2
 	call LilycoveCity_Harbor_EventScript_1A040E
 	return
@@ -106,18 +106,18 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4
 	end
 
 LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, LilycoveCity_Harbor_EventScript_1598BA
-	checkflag 206
+	checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
 	goto_if_eq LilycoveCity_Harbor_EventScript_1598BA
-	checkflag 2131
+	checkflag FLAG_SYS_HAS_EON_TICKET
 	goto_if 0, LilycoveCity_Harbor_EventScript_1598BA
 	msgbox LilycoveCity_Harbor_Text_1C50F2, 4
 	closemessage
 	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
 	waitmovement 0
 	delay 30
-	hideobject LAST_TALKED, 13, 10
+	hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
 	delay 60
 	addobject 4
 	delay 30
@@ -134,7 +134,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	compare FACING, 4
 	call_if 1, LilycoveCity_Harbor_EventScript_1599CE
 	delay 30
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	special ScrSpecial_HealPlayerParty
 	setvar 0x8004, 2
 	call LilycoveCity_Harbor_EventScript_1A040E
@@ -159,7 +159,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89
 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D
 	lock
 	faceplayer
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_Harbor_EventScript_159AA2
 	msgbox LilycoveCity_Harbor_Text_18B504, 4
 	release
diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc
index 4defe37b8..15535a122 100644
--- a/data/scripts/maps/LilycoveCity_House1.inc
+++ b/data/scripts/maps/LilycoveCity_House1.inc
@@ -9,8 +9,8 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_KECLEON, 0
+	playmoncry SPECIES_KECLEON, 0
 	msgbox LilycoveCity_House1_Text_18B82B, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc
index d3399f5ac..d0065c9e8 100644
--- a/data/scripts/maps/LilycoveCity_House2.inc
+++ b/data/scripts/maps/LilycoveCity_House2.inc
@@ -4,13 +4,13 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2
 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3
 	lock
 	faceplayer
-	checkflag 234
+	checkflag FLAG_RECEIVED_TM44
 	goto_if_eq LilycoveCity_House2_EventScript_159BDA
 	msgbox LilycoveCity_House2_Text_18B83C, 4
-	giveitem ITEM_TM44
+	giveitem_std ITEM_TM44
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_House2_EventScript_1A029B
-	setflag 234
+	setflag FLAG_RECEIVED_TM44
 	msgbox LilycoveCity_House2_Text_18B883, 4
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index a4599f14a..577805fb2 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
@@ -4,61 +4,61 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC
 	.byte 0
 
 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7
-	checkflag 160
+	checkflag FLAG_COOL_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6
-	checkflag 161
+	checkflag FLAG_BEAUTY_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5
-	checkflag 162
+	checkflag FLAG_CUTE_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4
-	checkflag 163
+	checkflag FLAG_SMART_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3
-	checkflag 164
+	checkflag FLAG_TOUGH_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD
-	setmaptile 10, 6, 606, 1
-	setmaptile 11, 6, 607, 1
+	setmetatile 10, 6, 606, 1
+	setmetatile 11, 6, 607, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615
-	setmaptile 18, 6, 604, 1
-	setmaptile 19, 6, 605, 1
+	setmetatile 18, 6, 604, 1
+	setmetatile 19, 6, 605, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D
-	setmaptile 14, 10, 608, 1
-	setmaptile 15, 10, 609, 1
+	setmetatile 14, 10, 608, 1
+	setmetatile 15, 10, 609, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645
-	setmaptile 6, 10, 602, 1
-	setmaptile 7, 10, 603, 1
+	setmetatile 6, 10, 602, 1
+	setmetatile 7, 10, 603, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D
-	setmaptile 2, 6, 610, 1
-	setmaptile 3, 6, 611, 1
+	setmetatile 2, 6, 610, 1
+	setmetatile 3, 6, 611, 1
 	end
 
 LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670
@@ -96,7 +96,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
 	lockall
-	checkflag 236
+	checkflag FLAG_RECEIVED_GLASS_ORNAMENT
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793
 	specialvar 0x8004, sub_80C4D50
 	switch 0x8004
@@ -124,10 +124,10 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735
 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C
 	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4
-	givedecoration 44
+	givedecoration_std DECOR_GLASS_ORNAMENT
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783
-	setflag 236
+	setflag FLAG_RECEIVED_GLASS_ORNAMENT
 	closemessage
 	releaseall
 	end
@@ -146,35 +146,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D
 	lockall
-	checkflag 162
+	checkflag FLAG_CUTE_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0
 	lockall
-	checkflag 164
+	checkflag FLAG_TOUGH_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3
 	lockall
-	checkflag 160
+	checkflag FLAG_COOL_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6
 	lockall
-	checkflag 161
+	checkflag FLAG_BEAUTY_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9
 	lockall
-	checkflag 163
+	checkflag FLAG_SMART_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3
 	end
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
index 20b5c5f13..38428311b 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
@@ -3,14 +3,14 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327
 	.byte 0
 
 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D
-	sethealplace 8
+	setrespawn 8
 	end
 
 LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331
 	setvar 0x800b, 1
 	call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -21,7 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F
 LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D
 	msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4
 	release
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index 3027e1f77..13c18d51e 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -4,10 +4,10 @@ LittlerootTown_MapScripts:: @ 814D509
 	.byte 0
 
 LittlerootTown_MapScript1_14D514:: @ 814D514
-	setflag 2063
+	setflag FLAG_VISITED_LITTLEROOT_TOWN
 	compare 0x4092, 2
 	call_if 1, LittlerootTown_EventScript_14D57B
-	checkflag 82
+	checkflag FLAG_RESCUED_BIRCH
 	call_if 0, LittlerootTown_EventScript_14D583
 	compare 0x4050, 3
 	call_if 1, LittlerootTown_EventScript_14D5A6
@@ -22,12 +22,12 @@ LittlerootTown_MapScript1_14D514:: @ 814D514
 	end
 
 LittlerootTown_EventScript_14D563:: @ 814D563
-	setflag 301
+	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	return
 
 LittlerootTown_EventScript_14D567:: @ 814D567
 	setvar 0x40c7, 2
-	setflag 979
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
 	return
 
 LittlerootTown_EventScript_14D570:: @ 814D570
@@ -52,7 +52,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A
 	return
 
 LittlerootTown_EventScript_14D5A6:: @ 814D5A6
-	clearflag 752
+	clearflag FLAG_HIDE_MOM_LITTLEROOT
 	setobjectmovementtype 4, 8
 	checkplayergender
 	compare RESULT, 0
@@ -80,7 +80,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF
 	setvar 0x8004, 5
 	setvar 0x8005, 8
 	call LittlerootTown_EventScript_14D62B
-	setflag 761
+	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
 	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
 	waitstate
 	releaseall
@@ -91,7 +91,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D
 	setvar 0x8004, 14
 	setvar 0x8005, 8
 	call LittlerootTown_EventScript_14D62B
-	setflag 762
+	setflag FLAG_HIDE_MOVING_TRUCK_MAY
 	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
 	waitstate
 	releaseall
@@ -122,12 +122,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
 	applymovement 4, LittlerootTown_Movement_14D6B5
 	applymovement 255, LittlerootTown_Movement_14D6BD
 	waitmovement 0
-	setflag 752
+	setflag FLAG_HIDE_MOM_LITTLEROOT
 	setvar 0x4092, 3
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 0x8004, 0x8005
 	waitdooranim
-	clearflag 868
+	clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT
 	clearflag 0x4000
 	return
 
@@ -187,9 +187,9 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6
 LittlerootTown_EventScript_14D6DF:: @ 814D6DF
 	lock
 	faceplayer
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	goto_if_eq LittlerootTown_EventScript_14D72F
-	checkflag 82
+	checkflag FLAG_RESCUED_BIRCH
 	goto_if_eq LittlerootTown_EventScript_14D722
 	compare 0x4050, 0
 	goto_if 5, LittlerootTown_EventScript_14D708
@@ -599,7 +599,7 @@ LittlerootTown_EventScript_14DB46:: @ 814DB46
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	return
@@ -611,7 +611,7 @@ LittlerootTown_EventScript_14DB6C:: @ 814DB6C
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	return
@@ -623,7 +623,7 @@ LittlerootTown_EventScript_14DB92:: @ 814DB92
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	return
@@ -635,7 +635,7 @@ LittlerootTown_EventScript_14DBB8:: @ 814DBB8
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	return
@@ -647,7 +647,7 @@ LittlerootTown_EventScript_14DBDE:: @ 814DBDE
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	return
@@ -659,7 +659,7 @@ LittlerootTown_EventScript_14DC04:: @ 814DC04
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	return
@@ -671,7 +671,7 @@ LittlerootTown_EventScript_14DC2A:: @ 814DC2A
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	return
@@ -683,7 +683,7 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	return
@@ -853,7 +853,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14DCE0
 	waitmovement 0
-	hideobject 4, 0, 9
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor 0x8009, 0x800a
 	waitdooranim
 	goto LittlerootTown_EventScript_14DD2B
@@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2
 
 LittlerootTown_EventScript_14DD2B:: @ 814DD2B
 	removeobject 4
-	setflag 2144
+	setflag FLAG_SYS_B_DASH
 	setvar 0x4050, 4
 	release
 	end
@@ -872,7 +872,7 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38
 	message LittlerootTown_Text_16AA32
 	waitfanfare
 	waitmessage
-	setflag 274
+	setflag FLAG_RECEIVED_RUNNING_SHOES
 	msgbox LittlerootTown_Text_16AA5C, 4
 	msgbox LittlerootTown_Text_16AB10, 4
 	closemessage
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index d3694bd22..d4dd94aae 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
@@ -7,13 +7,13 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B
 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B
 	compare 0x4092, 6
 	call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660
-	checkflag 274
+	checkflag FLAG_RECEIVED_RUNNING_SHOES
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660
-	setmaptile 5, 4, 624, 1
-	setmaptile 5, 2, 616, 1
+	setmetatile 5, 4, 624, 1
+	setmetatile 5, 2, 616, 1
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673
@@ -23,7 +23,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680
-	setmaptile 3, 7, 659, 1
+	setmetatile 3, 7, 659, 1
 	return
 
 LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A
@@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744
 	waitmovement 0
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4
-	setflag 87
+	setflag FLAG_MET_RIVAL_MOM
 	setvar 0x4082, 2
 	releaseall
 	end
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index 8ff7f8b81..8f3b07312 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
@@ -4,7 +4,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4
 	.byte 0
 
 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF
-	checkflag 130
+	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
 	call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE
 	compare 0x4092, 4
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index a4d6f2403..e23a05243 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -7,13 +7,13 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879
 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889
 	compare 0x4092, 6
 	call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E
-	checkflag 274
+	checkflag FLAG_RECEIVED_RUNNING_SHOES
 	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E
-	setmaptile 5, 4, 624, 1
-	setmaptile 5, 2, 616, 1
+	setmetatile 5, 4, 624, 1
+	setmetatile 5, 2, 616, 1
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1
@@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE
-	setmaptile 6, 7, 659, 1
+	setmetatile 6, 7, 659, 1
 	return
 
 LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8
@@ -100,7 +100,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982
 	waitmovement 0
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4
-	setflag 87
+	setflag FLAG_MET_RIVAL_MOM
 	setvar 0x408c, 2
 	releaseall
 	end
@@ -135,9 +135,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB
 LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
 	lock
 	faceplayer
-	checkflag 130
+	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21
-	checkflag 301
+	checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17
 	compare 0x408d, 3
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index 68bdf0fcb..020c39eac 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -4,7 +4,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50
 	.byte 0
 
 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
-	checkflag 130
+	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
 	call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A
 	compare 0x4092, 4
 	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950
@@ -30,7 +30,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
 LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
 	lockall
-	checkflag 292
+	checkflag FLAG_MET_RIVAL_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5
 	checkplayergender
 	compare RESULT, 0
@@ -117,18 +117,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB
 	compare RESULT, 1
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED
-	setflag 293
+	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
-	checkflag 293
+	checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
-	checkflag 293
+	checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
 	return
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index e7ccd73f6..6792c5932 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
@@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
 	lockall
-	getfirstpartypokename 0
+	bufferleadmonspeciesname 0
 	message LittlerootTown_ProfessorBirchsLab_Text_173D94
 	waitmessage
 	playfanfare 370
@@ -52,7 +52,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4
-	clearflag 991
+	clearflag FLAG_HIDE_BOY_ROUTE101
 	setvar 0x4084, 3
 	releaseall
 	end
@@ -87,10 +87,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
 	faceplayer
 	compare 0x4084, 3
 	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90
-	checkflag 88
+	checkflag FLAG_BIRCH_AIDE_MET
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4
-	setflag 88
+	setflag FLAG_BIRCH_AIDE_MET
 	release
 	end
 
@@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
 	lock
 	faceplayer
-	checkflag 896
+	checkflag FLAG_UNKNOWN_BIRCH_380
 	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
 	compare 0x4084, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
@@ -129,7 +129,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
 	compare RESULT, 1
 	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40
 	setvar 0x4084, 5
-	setflag 116
+	setflag FLAG_ADVENTURE_STARTED
 	setvar 0x4051, 1
 	setvar 0x408d, 4
 	setvar 0x4050, 3
@@ -138,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4
-	giveitem ITEM_POKE_BALL, 5
+	giveitem_std ITEM_POKE_BALL, 5
 	compare RESULT, 0
 	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4
@@ -147,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4
-	giveitem ITEM_POKE_BALL, 5
+	giveitem_std ITEM_POKE_BALL, 5
 	compare RESULT, 0
 	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4
@@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D
 	message LittlerootTown_ProfessorBirchsLab_Text_17422F
 	waitfanfare
 	waitmessage
-	setflag 2049
+	setflag FLAG_SYS_POKEDEX_GET
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B
diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc
index 780eea4f5..6dbdc0461 100644
--- a/data/scripts/maps/MagmaHideout_B1F.inc
+++ b/data/scripts/maps/MagmaHideout_B1F.inc
@@ -3,7 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8
 	.byte 0
 
 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, MagmaHideout_B1F_EventScript_15F2B8
 	end
 
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index 5c93aa252..6a7e02848 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -3,18 +3,18 @@ MauvilleCity_MapScripts:: @ 814C032
 	.byte 0
 
 MauvilleCity_MapScript1_14C038:: @ 814C038
-	setflag 2072
-	clearflag 961
-	setflag 2098
-	clearflag 99
+	setflag FLAG_VISITED_MAUVILLE_CITY
+	clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	setflag FLAG_SYS_TV_START
+	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	setvar 0x4093, 0
-	checkflag 209
+	checkflag FLAG_RECEIVED_TM24
 	call_if 1, MauvilleCity_EventScript_14C053
 	end
 
 MauvilleCity_EventScript_14C053:: @ 814C053
-	clearflag 913
-	setflag 912
+	clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
+	setflag FLAG_HIDE_WATTSON_MAUVILLE
 	return
 
 MauvilleCity_EventScript_14C05A:: @ 814C05A
@@ -52,10 +52,10 @@ MauvilleCity_EventScript_14C099:: @ 814C099
 MauvilleCity_EventScript_14C0A2:: @ 814C0A2
 	lock
 	faceplayer
-	checkflag 98
+	checkflag FLAG_TV_EXPLAINED
 	goto_if_eq MauvilleCity_EventScript_14C0BA
 	msgbox MauvilleCity_Text_16674A, 4
-	setflag 98
+	setflag FLAG_TV_EXPLAINED
 	release
 	end
 
@@ -67,7 +67,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA
 MauvilleCity_EventScript_14C0C4:: @ 814C0C4
 	lock
 	faceplayer
-	checkflag 284
+	checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
 	goto_if_eq MauvilleCity_EventScript_14C0E4
 	msgbox MauvilleCity_Text_165B76, 4
 	closemessage
@@ -86,7 +86,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4
 
 MauvilleCity_EventScript_14C0F9:: @ 814C0F9
 	lockall
-	checkflag 284
+	checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
 	goto_if_eq MauvilleCity_EventScript_14C292
 	applymovement 6, MauvilleCity_Movement_1A0843
 	waitmovement 0
@@ -156,9 +156,9 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9
 MauvilleCity_EventScript_14C22B:: @ 814C22B
 	removeobject 6
 	removeobject 7
-	clearflag 806
-	clearflag 809
-	setflag 190
+	clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE
+	clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	setflag FLAG_DEFEATED_WALLY_MAUVILLE
 	releaseall
 	end
 
@@ -177,7 +177,7 @@ MauvilleCity_EventScript_14C23C:: @ 814C23C
 	return
 
 MauvilleCity_EventScript_14C285:: @ 814C285
-	setflag 284
+	setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
 	msgbox MauvilleCity_Text_165DE8, 4
 	release
 	end
@@ -284,15 +284,15 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8
 MauvilleCity_EventScript_14C2F2:: @ 814C2F2
 	lock
 	faceplayer
-	checkflag 209
+	checkflag FLAG_RECEIVED_TM24
 	goto_if_eq MauvilleCity_EventScript_14C368
 	compare 0x40ba, 2
 	goto_if_eq MauvilleCity_EventScript_14C33C
-	checkflag 208
+	checkflag FLAG_RECEIVED_BASEMENT_KEY
 	goto_if_eq MauvilleCity_EventScript_14C332
 	msgbox MauvilleCity_Text_1661C1, 4
-	giveitem ITEM_BASEMENT_KEY
-	setflag 208
+	giveitem_std ITEM_BASEMENT_KEY
+	setflag FLAG_RECEIVED_BASEMENT_KEY
 	msgbox MauvilleCity_Text_166331, 4
 	release
 	end
@@ -304,10 +304,10 @@ MauvilleCity_EventScript_14C332:: @ 814C332
 
 MauvilleCity_EventScript_14C33C:: @ 814C33C
 	msgbox MauvilleCity_Text_1663EB, 4
-	giveitem ITEM_TM24
+	giveitem_std ITEM_TM24
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_EventScript_1A029B
-	setflag 209
+	setflag FLAG_RECEIVED_TM24
 	msgbox MauvilleCity_Text_166488, 4
 	release
 	end
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc
index a93ff5170..6c2dc57e1 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/scripts/maps/MauvilleCity_BikeShop.inc
@@ -4,9 +4,9 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795
 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796
 	lock
 	faceplayer
-	checkflag 90
+	checkflag FLAG_RECEIVED_BIKE
 	goto_if_eq MauvilleCity_BikeShop_EventScript_15686E
-	checkflag 89
+	checkflag FLAG_DECLINED_BIKE
 	goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1
 	msgbox MauvilleCity_BikeShop_Text_180F9F, 4
 	msgbox MauvilleCity_BikeShop_Text_181016, 5
@@ -34,25 +34,25 @@ MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0
 	end
 
 MauvilleCity_BikeShop_EventScript_156817:: @ 8156817
-	setflag 89
+	setflag FLAG_DECLINED_BIKE
 	msgbox MauvilleCity_BikeShop_Text_181067, 4
 	release
 	end
 
 MauvilleCity_BikeShop_EventScript_156824:: @ 8156824
-	setflag 90
+	setflag FLAG_RECEIVED_BIKE
 	goto MauvilleCity_BikeShop_EventScript_1567F0
 	end
 
 MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D
 	msgbox MauvilleCity_BikeShop_Text_181332, 4
-	giveitem ITEM_MACH_BIKE
+	giveitem_std ITEM_MACH_BIKE
 	goto MauvilleCity_BikeShop_EventScript_156861
 	end
 
 MauvilleCity_BikeShop_EventScript_156847:: @ 8156847
 	msgbox MauvilleCity_BikeShop_Text_18134A, 4
-	giveitem ITEM_ACRO_BIKE
+	giveitem_std ITEM_ACRO_BIKE
 	goto MauvilleCity_BikeShop_EventScript_156861
 	end
 
@@ -90,16 +90,16 @@ MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF
 MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9
 	incrementgamestat GAME_STAT_TRADED_BIKES
 	msgbox MauvilleCity_BikeShop_Text_181439, 4
-	removeitem ITEM_ACRO_BIKE, 1
-	giveitem ITEM_MACH_BIKE
+	takeitem ITEM_ACRO_BIKE, 1
+	giveitem_std ITEM_MACH_BIKE
 	goto MauvilleCity_BikeShop_EventScript_156861
 	end
 
 MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA
 	incrementgamestat GAME_STAT_TRADED_BIKES
 	msgbox MauvilleCity_BikeShop_Text_181408, 4
-	removeitem ITEM_MACH_BIKE, 1
-	giveitem ITEM_ACRO_BIKE
+	takeitem ITEM_MACH_BIKE, 1
+	giveitem_std ITEM_ACRO_BIKE
 	goto MauvilleCity_BikeShop_EventScript_156861
 	end
 
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc
index 2e0231287..8228238f3 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
@@ -129,17 +129,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6
 
 MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2
 	setvar 0x4001, 1
-	getdecorname 0, 88
+	bufferdecorationname 0, 88
 	goto MauvilleCity_GameCorner_EventScript_156C0C
 
 MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0
 	setvar 0x4001, 2
-	getdecorname 0, 89
+	bufferdecorationname 0, 89
 	goto MauvilleCity_GameCorner_EventScript_156C0C
 
 MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE
 	setvar 0x4001, 3
-	getdecorname 0, 90
+	bufferdecorationname 0, 90
 	goto MauvilleCity_GameCorner_EventScript_156C0C
 
 MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C
@@ -156,12 +156,12 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46
 	checkcoins 16386
 	compare 0x4002, 1000
 	goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4
-	getdecorname 1, 88
-	checkdecor 88
+	bufferdecorationname 1, 88
+	checkdecorspace 88
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156D02
 	takecoins 1000
-	adddecor 88
+	givedecoration 88
 	updatecoinsbox 0, 0
 	playse 95
 	msgbox MauvilleCity_GameCorner_Text_181E49, 4
@@ -172,12 +172,12 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80
 	checkcoins 16386
 	compare 0x4002, 1000
 	goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4
-	getdecorname 1, 89
-	checkdecor 89
+	bufferdecorationname 1, 89
+	checkdecorspace 89
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156D02
 	takecoins 1000
-	adddecor 89
+	givedecoration 89
 	updatecoinsbox 0, 0
 	playse 95
 	msgbox MauvilleCity_GameCorner_Text_181E49, 4
@@ -188,12 +188,12 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA
 	checkcoins 16386
 	compare 0x4002, 1000
 	goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4
-	getdecorname 1, 90
-	checkdecor 90
+	bufferdecorationname 1, 90
+	checkdecorspace 90
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156D02
 	takecoins 1000
-	adddecor 90
+	givedecoration 90
 	updatecoinsbox 0, 0
 	playse 95
 	msgbox MauvilleCity_GameCorner_Text_181E49, 4
@@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54
 
 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6
 	setvar 0x4001, 1
-	getitemname 0, ITEM_TM32
+	bufferitemname 0, ITEM_TM32
 	goto MauvilleCity_GameCorner_EventScript_156DEC
 
 MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4
 	setvar 0x4001, 2
-	getitemname 0, ITEM_TM29
+	bufferitemname 0, ITEM_TM29
 	goto MauvilleCity_GameCorner_EventScript_156DEC
 
 MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2
 	setvar 0x4001, 3
-	getitemname 0, ITEM_TM35
+	bufferitemname 0, ITEM_TM35
 	goto MauvilleCity_GameCorner_EventScript_156DEC
 
 MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0
 	setvar 0x4001, 4
-	getitemname 0, ITEM_TM24
+	bufferitemname 0, ITEM_TM24
 	goto MauvilleCity_GameCorner_EventScript_156DEC
 
 MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE
 	setvar 0x4001, 5
-	getitemname 0, ITEM_TM13
+	bufferitemname 0, ITEM_TM13
 	goto MauvilleCity_GameCorner_EventScript_156DEC
 
 MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC
@@ -295,7 +295,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 1500
-	additem ITEM_TM32, 1
+	giveitem ITEM_TM32, 1
 	updatecoinsbox 0, 0
 	playse 95
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -310,7 +310,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 3500
-	additem ITEM_TM29, 1
+	giveitem ITEM_TM29, 1
 	updatecoinsbox 0, 0
 	playse 95
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -325,7 +325,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 4000
-	additem ITEM_TM35, 1
+	giveitem ITEM_TM35, 1
 	updatecoinsbox 0, 0
 	playse 95
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -340,7 +340,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 4000
-	additem ITEM_TM24, 1
+	giveitem ITEM_TM24, 1
 	updatecoinsbox 0, 0
 	playse 95
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -355,7 +355,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 4000
-	additem ITEM_TM13, 1
+	giveitem ITEM_TM13, 1
 	updatecoinsbox 0, 0
 	playse 95
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -389,7 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D
 MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96
 	lock
 	faceplayer
-	checkflag 226
+	checkflag FLAG_RECEIVED_STARTER_DOLL
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157072
 	msgbox MauvilleCity_GameCorner_Text_181F3D, 5
 	compare RESULT, 0
@@ -401,35 +401,35 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96
 	end
 
 MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB
-	getdecorname 1, 88
-	checkdecor 88
+	bufferdecorationname 1, DECOR_TREECKO_DOLL
+	checkdecorspace DECOR_TREECKO_DOLL
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
 	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration 88
-	setflag 226
+	givedecoration_std DECOR_TREECKO_DOLL
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
 
 MauvilleCity_GameCorner_EventScript_157005:: @ 8157005
-	getdecorname 1, 89
-	checkdecor 89
+	bufferdecorationname 1, DECOR_TORCHIC_DOLL
+	checkdecorspace DECOR_TORCHIC_DOLL
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
 	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration 89
-	setflag 226
+	givedecoration_std DECOR_TORCHIC_DOLL
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
 
 MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F
-	getdecorname 1, 90
-	checkdecor 90
+	bufferdecorationname 1, DECOR_MUDKIP_DOLL
+	checkdecorspace DECOR_MUDKIP_DOLL
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
 	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration 90
-	setflag 226
+	givedecoration_std DECOR_MUDKIP_DOLL
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
 
@@ -460,12 +460,12 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C
 	end
 
 MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C
-	checkflag 225
+	checkflag FLAG_RECEIVED_20_COINS
 	goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA
 	checkcoins 16385
 	compare 0x4001, 1
 	goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA
-	setflag 225
+	setflag FLAG_RECEIVED_20_COINS
 	givecoins 20
 	msgbox MauvilleCity_GameCorner_Text_18208E, 4
 	playse 95
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc
index 5221add7a..799fb0992 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -3,7 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450
 	.byte 0
 
 MauvilleCity_Gym_MapScript1_156456:: @ 8156456
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1565A7
 	switch 0x4093
 	case 0, MauvilleCity_Gym_EventScript_156491
@@ -13,36 +13,36 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456
 	end
 
 MauvilleCity_Gym_EventScript_156491:: @ 8156491
-	checkflag 99
+	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	goto_if_eq MauvilleCity_Gym_EventScript_15649B
 	end
 
 MauvilleCity_Gym_EventScript_15649B:: @ 815649B
-	setmaptile 4, 7, 560, 0
-	setmaptile 4, 8, 568, 0
-	setmaptile 5, 7, 561, 0
-	setmaptile 5, 8, 569, 0
-	setmaptile 3, 8, 578, 1
-	setmaptile 3, 9, 538, 0
-	setmaptile 3, 10, 593, 0
-	setmaptile 1, 10, 546, 0
-	setmaptile 1, 11, 554, 1
-	setmaptile 2, 10, 547, 0
-	setmaptile 2, 11, 555, 1
-	setmaptile 4, 10, 546, 0
-	setmaptile 4, 11, 554, 1
-	setmaptile 5, 10, 547, 0
-	setmaptile 5, 11, 555, 1
-	setmaptile 6, 11, 578, 1
-	setmaptile 6, 12, 538, 0
-	setmaptile 6, 13, 593, 0
-	setmaptile 3, 11, 577, 1
-	setmaptile 3, 12, 585, 1
-	setmaptile 3, 13, 592, 1
-	setmaptile 4, 13, 560, 0
-	setmaptile 4, 14, 568, 0
-	setmaptile 5, 13, 561, 0
-	setmaptile 5, 14, 569, 0
+	setmetatile 4, 7, 560, 0
+	setmetatile 4, 8, 568, 0
+	setmetatile 5, 7, 561, 0
+	setmetatile 5, 8, 569, 0
+	setmetatile 3, 8, 578, 1
+	setmetatile 3, 9, 538, 0
+	setmetatile 3, 10, 593, 0
+	setmetatile 1, 10, 546, 0
+	setmetatile 1, 11, 554, 1
+	setmetatile 2, 10, 547, 0
+	setmetatile 2, 11, 555, 1
+	setmetatile 4, 10, 546, 0
+	setmetatile 4, 11, 554, 1
+	setmetatile 5, 10, 547, 0
+	setmetatile 5, 11, 555, 1
+	setmetatile 6, 11, 578, 1
+	setmetatile 6, 12, 538, 0
+	setmetatile 6, 13, 593, 0
+	setmetatile 3, 11, 577, 1
+	setmetatile 3, 12, 585, 1
+	setmetatile 3, 13, 592, 1
+	setmetatile 4, 13, 560, 0
+	setmetatile 4, 14, 568, 0
+	setmetatile 5, 13, 561, 0
+	setmetatile 5, 14, 569, 0
 	end
 
 MauvilleCity_Gym_EventScript_15657D:: @ 815657D
@@ -69,7 +69,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7
 
 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB
 	trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB
-	checkflag 167
+	checkflag FLAG_RECEIVED_TM34
 	goto_if 0, MauvilleCity_Gym_EventScript_15661D
 	compare 0x40ba, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_156641
@@ -82,8 +82,8 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	waitmessage
 	call MauvilleCity_Gym_EventScript_1A02C5
 	msgbox MauvilleCity_Gym_Text_180DDA, 4
-	setflag 1208
-	setflag 2057
+	setflag FLAG_DEFEATED_MAUVILLE_GYM
+	setflag FLAG_BADGE03_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, MauvilleCity_Gym_EventScript_1A00FB
@@ -96,11 +96,11 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	end
 
 MauvilleCity_Gym_EventScript_15661D:: @ 815661D
-	giveitem ITEM_TM34
+	giveitem_std ITEM_TM34
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_Gym_EventScript_1A029B
 	msgbox MauvilleCity_Gym_Text_180E76, 4
-	setflag 167
+	setflag FLAG_RECEIVED_TM34
 	release
 	end
 
@@ -111,7 +111,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641
 
 MauvilleCity_Gym_EventScript_15664B:: @ 815664B
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -122,7 +122,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B
 
 MauvilleCity_Gym_EventScript_156670:: @ 8156670
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -133,7 +133,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670
 
 MauvilleCity_Gym_EventScript_156695:: @ 8156695
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 3
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -147,9 +147,9 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA
 	special MauvilleGymSpecial1
 	special DrawWholeMapView
 	playse 44
-	checkflag 99
+	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	goto_if_eq MauvilleCity_Gym_EventScript_1566E1
-	checkflag 99
+	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	goto_if 0, MauvilleCity_Gym_EventScript_1566DC
 	releaseall
 	end
@@ -159,12 +159,12 @@ MauvilleCity_Gym_EventScript_1566DA:: @ 81566DA
 	end
 
 MauvilleCity_Gym_EventScript_1566DC:: @ 81566DC
-	setflag 99
+	setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
 MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1
-	clearflag 99
+	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
@@ -191,7 +191,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B
 MauvilleCity_Gym_EventScript_156742:: @ 8156742
 	lock
 	faceplayer
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_156757
 	msgbox MauvilleCity_Gym_Text_180815, 4
 	release
@@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757
 
 MauvilleCity_Gym_EventScript_156761:: @ 8156761
 	lockall
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if_eq MauvilleCity_Gym_EventScript_156781
 	goto MauvilleCity_Gym_EventScript_15678B
 	end
 
 MauvilleCity_Gym_EventScript_156771:: @ 8156771
 	lockall
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if_eq MauvilleCity_Gym_EventScript_156781
 	goto MauvilleCity_Gym_EventScript_15678B
 	end
diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc
index e76564847..210288517 100644
--- a/data/scripts/maps/MauvilleCity_House1.inc
+++ b/data/scripts/maps/MauvilleCity_House1.inc
@@ -4,11 +4,11 @@ MauvilleCity_House1_MapScripts:: @ 81569FC
 MauvilleCity_House1_EventScript_1569FD:: @ 81569FD
 	lock
 	faceplayer
-	checkflag 107
+	checkflag FLAG_RECEIVED_HM06
 	goto_if_eq MauvilleCity_House1_EventScript_156A29
 	msgbox MauvilleCity_House1_Text_181B1A, 4
-	giveitem ITEM_HM06
-	setflag 107
+	giveitem_std ITEM_HM06
+	setflag FLAG_RECEIVED_HM06
 	msgbox MauvilleCity_House1_Text_181B64, 4
 	release
 	end
diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc
index a500a246e..a058003bc 100644
--- a/data/scripts/maps/MauvilleCity_House2.inc
+++ b/data/scripts/maps/MauvilleCity_House2.inc
@@ -4,7 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF
 MauvilleCity_House2_EventScript_1572C0:: @ 81572C0
 	lock
 	faceplayer
-	checkflag 258
+	checkflag FLAG_RECEIVED_COIN_CASE
 	goto_if_eq MauvilleCity_House2_EventScript_15733D
 	msgbox MauvilleCity_House2_Text_18244E, 4
 	checkitem ITEM_HARBOR_MAIL, 1
@@ -28,9 +28,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5
 
 MauvilleCity_House2_EventScript_15731B:: @ 815731B
 	msgbox MauvilleCity_House2_Text_182515, 4
-	removeitem ITEM_HARBOR_MAIL, 1
-	giveitem ITEM_COIN_CASE
-	setflag 258
+	takeitem ITEM_HARBOR_MAIL, 1
+	giveitem_std ITEM_COIN_CASE
+	setflag FLAG_RECEIVED_COIN_CASE
 	goto MauvilleCity_House2_EventScript_15733D
 	end
 
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
index 7122b8c3c..de30e21cd 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351
 	.byte 0
 
 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357
-	sethealplace 5
+	setrespawn 5
 	call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B
 	goto MauvilleCity_PokemonCenter_1F_EventScript_157365
 	end
@@ -16,7 +16,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369
 	setvar 0x800b, 1
 	call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc
index 06abbc8f6..7ce6e3704 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/scripts/maps/MeteorFalls_1F_1R.inc
@@ -77,7 +77,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	removeobject 7
 	removeobject 8
 	removeobject 9
-	setflag 819
+	setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR
 	setvar 0x40bf, 1
 	releaseall
 	end
@@ -215,9 +215,9 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F
 MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656
 	lock
 	faceplayer
-	checkflag 244
+	checkflag FLAG_MET_PROF_COSMO
 	goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E
-	setflag 244
+	setflag FLAG_MET_PROF_COSMO
 	msgbox MeteorFalls_1F_1R_Text_1937EB, 4
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc
index 44deb9d63..f165bd3ef 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/scripts/maps/MossdeepCity.inc
@@ -3,11 +3,11 @@ MossdeepCity_MapScripts:: @ 814CF92
 	.byte 0
 
 MossdeepCity_MapScript1_14CF98:: @ 814CF98
-	clearflag 100
-	clearflag 101
-	clearflag 102
-	clearflag 103
-	checkflag 2090
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, MossdeepCity_EventScript_1A02C1
 	end
 
@@ -52,7 +52,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF
 	end
 
 MossdeepCity_EventScript_14D008:: @ 814D008
-	setflag 2076
+	setflag FLAG_VISITED_MOSSDEEP_CITY
 	setvar 0x4001, 1
 	end
 
@@ -68,16 +68,16 @@ MossdeepCity_EventScript_14D011:: @ 814D011
 MossdeepCity_EventScript_14D027:: @ 814D027
 	lock
 	faceplayer
-	checkflag 276
+	checkflag FLAG_RECEIVED_KINGS_ROCK
 	goto_if_eq MossdeepCity_EventScript_14D069
 	msgbox MossdeepCity_Text_1690A9, 5
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_EventScript_14D073
 	msgbox MossdeepCity_Text_169117, 4
-	giveitem ITEM_KINGS_ROCK
+	giveitem_std ITEM_KINGS_ROCK
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_EventScript_1A029B
-	setflag 276
+	setflag FLAG_RECEIVED_KINGS_ROCK
 	release
 	end
 
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index afc02e82c..75fc3c6b8 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -11,8 +11,8 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62
 	end
 
 MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71
-	setmaptile 3, 0, 653, 1
-	setmaptile 3, 1, 661, 1
+	setmetatile 3, 0, 653, 1
+	setmetatile 3, 1, 661, 1
 	return
 
 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index 94f44e311..12a94154b 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -48,14 +48,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3
 	setvar 0x40c0, 1
 	special ShowFieldMessageStringVar4
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	return
 
 MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE
 	setvar 0x40c0, 2
 	special ShowFieldMessageStringVar4
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	return
 
 MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index 19b3c5045..b1550a4c1 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -3,54 +3,54 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3
 	.byte 0
 
 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9
-	checkflag 100
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	goto_if_eq MossdeepCity_Gym_EventScript_15A510
 	goto MossdeepCity_Gym_EventScript_15A4E8
 	end
 
 MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8
-	checkflag 101
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	goto_if_eq MossdeepCity_Gym_EventScript_15A528
 	goto MossdeepCity_Gym_EventScript_15A4F7
 	end
 
 MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7
-	checkflag 102
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	goto_if_eq MossdeepCity_Gym_EventScript_15A540
 	goto MossdeepCity_Gym_EventScript_15A506
 	end
 
 MossdeepCity_Gym_EventScript_15A506:: @ 815A506
-	checkflag 103
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	goto_if_eq MossdeepCity_Gym_EventScript_15A558
 	end
 
 MossdeepCity_Gym_EventScript_15A510:: @ 815A510
-	setmaptile 5, 5, 516, 0
-	setmaptile 2, 7, 569, 1
+	setmetatile 5, 5, 516, 0
+	setmetatile 2, 7, 569, 1
 	goto MossdeepCity_Gym_EventScript_15A4E8
 	end
 
 MossdeepCity_Gym_EventScript_15A528:: @ 815A528
-	setmaptile 8, 14, 516, 0
-	setmaptile 8, 10, 569, 1
+	setmetatile 8, 14, 516, 0
+	setmetatile 8, 10, 569, 1
 	goto MossdeepCity_Gym_EventScript_15A4F7
 	end
 
 MossdeepCity_Gym_EventScript_15A540:: @ 815A540
-	setmaptile 15, 17, 524, 0
-	setmaptile 17, 15, 569, 1
+	setmetatile 15, 17, 524, 0
+	setmetatile 17, 15, 569, 1
 	goto MossdeepCity_Gym_EventScript_15A506
 	end
 
 MossdeepCity_Gym_EventScript_15A558:: @ 815A558
-	setmaptile 1, 23, 525, 0
-	setmaptile 5, 24, 569, 1
+	setmetatile 1, 23, 525, 0
+	setmetatile 5, 24, 569, 1
 	end
 
 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B
 	trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594
-	checkflag 171
+	checkflag FLAG_RECEIVED_TM04
 	goto_if 0, MossdeepCity_Gym_EventScript_15A5C6
 	msgbox MossdeepCity_Gym_Text_18D273, 4
 	release
@@ -61,34 +61,34 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	waitmessage
 	call MossdeepCity_Gym_EventScript_1A02C5
 	msgbox MossdeepCity_Gym_Text_18D128, 4
-	setflag 1229
-	setflag 2061
-	clearflag 869
-	clearflag 915
+	setflag FLAG_DEFEATED_MOSSDEEP_GYM
+	setflag FLAG_BADGE07_GET
+	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	clearflag FLAG_UNKNOWN_393
 	setvar 0x8008, 7
 	call MossdeepCity_Gym_EventScript_1A01C0
-	clearflag 905
+	clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
 	goto MossdeepCity_Gym_EventScript_15A5C6
 	end
 
 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6
-	giveitem ITEM_TM04
+	giveitem_std ITEM_TM04
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_Gym_EventScript_1A029B
 	msgbox MossdeepCity_Gym_Text_18D1CF, 4
-	setflag 171
+	setflag FLAG_RECEIVED_TM04
 	release
 	end
 
 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA
 	lockall
-	checkflag 100
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	goto_if_eq MossdeepCity_Gym_EventScript_15A621
-	setflag 100
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
-	setmaptile 5, 5, 516, 0
-	setmaptile 2, 7, 569, 1
+	setmetatile 5, 5, 516, 0
+	setmetatile 2, 7, 569, 1
 	goto MossdeepCity_Gym_EventScript_15A619
 	end
 
@@ -99,74 +99,74 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619
 	end
 
 MossdeepCity_Gym_EventScript_15A621:: @ 815A621
-	clearflag 100
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
-	setmaptile 5, 5, 524, 0
-	setmaptile 2, 7, 568, 1
+	setmetatile 5, 5, 524, 0
+	setmetatile 2, 7, 568, 1
 	goto MossdeepCity_Gym_EventScript_15A619
 	end
 
 MossdeepCity_Gym_EventScript_15A646:: @ 815A646
 	lockall
-	checkflag 101
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	goto_if_eq MossdeepCity_Gym_EventScript_15A675
-	setflag 101
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
-	setmaptile 8, 14, 516, 0
-	setmaptile 8, 10, 569, 1
+	setmetatile 8, 14, 516, 0
+	setmetatile 8, 10, 569, 1
 	goto MossdeepCity_Gym_EventScript_15A619
 	end
 
 MossdeepCity_Gym_EventScript_15A675:: @ 815A675
-	clearflag 101
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
-	setmaptile 8, 14, 517, 0
-	setmaptile 8, 10, 568, 1
+	setmetatile 8, 14, 517, 0
+	setmetatile 8, 10, 568, 1
 	goto MossdeepCity_Gym_EventScript_15A619
 	end
 
 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A
 	lockall
-	checkflag 102
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	goto_if_eq MossdeepCity_Gym_EventScript_15A6C9
-	setflag 102
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
-	setmaptile 15, 17, 524, 0
-	setmaptile 17, 15, 569, 1
+	setmetatile 15, 17, 524, 0
+	setmetatile 17, 15, 569, 1
 	goto MossdeepCity_Gym_EventScript_15A619
 	end
 
 MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9
-	clearflag 102
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
-	setmaptile 15, 17, 516, 0
-	setmaptile 17, 15, 568, 1
+	setmetatile 15, 17, 516, 0
+	setmetatile 17, 15, 568, 1
 	goto MossdeepCity_Gym_EventScript_15A619
 	end
 
 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE
 	lockall
-	checkflag 103
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	goto_if_eq MossdeepCity_Gym_EventScript_15A71D
-	setflag 103
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
-	setmaptile 1, 23, 525, 0
-	setmaptile 5, 24, 569, 1
+	setmetatile 1, 23, 525, 0
+	setmetatile 5, 24, 569, 1
 	goto MossdeepCity_Gym_EventScript_15A619
 	end
 
 MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D
-	clearflag 103
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
-	setmaptile 1, 23, 516, 0
-	setmaptile 5, 24, 568, 1
+	setmetatile 1, 23, 516, 0
+	setmetatile 5, 24, 568, 1
 	goto MossdeepCity_Gym_EventScript_15A619
 	end
 
@@ -210,7 +210,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1
 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8
 	lock
 	faceplayer
-	checkflag 1229
+	checkflag FLAG_DEFEATED_MOSSDEEP_GYM
 	goto_if_eq MossdeepCity_Gym_EventScript_15A7ED
 	msgbox MossdeepCity_Gym_Text_18C7E3, 4
 	release
@@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7
 
 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA
 	lockall
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq MossdeepCity_Gym_EventScript_15A81A
 	goto MossdeepCity_Gym_EventScript_15A824
 	end
 
 MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A
 	lockall
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq MossdeepCity_Gym_EventScript_15A81A
 	goto MossdeepCity_Gym_EventScript_15A824
 	end
diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc
index 62edffc8b..97a5fc452 100644
--- a/data/scripts/maps/MossdeepCity_House1.inc
+++ b/data/scripts/maps/MossdeepCity_House1.inc
@@ -4,7 +4,7 @@ MossdeepCity_House1_MapScripts:: @ 815A82E
 MossdeepCity_House1_EventScript_15A82F:: @ 815A82F
 	lock
 	faceplayer
-	getfirstpartypokename 0
+	bufferleadmonspeciesname 0
 	msgbox MossdeepCity_House1_Text_18D465, 4
 	specialvar RESULT, GetPokeblockNameByMonNature
 	compare RESULT, 0
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
index f7f66b843..1da204ff0 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/scripts/maps/MossdeepCity_House2.inc
@@ -13,12 +13,12 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, 0
 	msgbox MossdeepCity_House2_Text_18D61E, 4
-	waitpokecry
+	waitmoncry
 	closemessage
-	setflag 224
-	clearflag 933
+	setflag FLAG_WINGULL_DELIVERED_MAIL
+	clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE
 	compare FACING, 2
 	call_if 1, MossdeepCity_House2_EventScript_15A8AE
 	compare FACING, 3
diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc
index 8f9bf4dc5..6632ac793 100644
--- a/data/scripts/maps/MossdeepCity_House3.inc
+++ b/data/scripts/maps/MossdeepCity_House3.inc
@@ -4,14 +4,14 @@ MossdeepCity_House3_MapScripts:: @ 815A971
 MossdeepCity_House3_EventScript_15A972:: @ 815A972
 	lock
 	faceplayer
-	checkflag 152
+	checkflag FLAG_RECEIVED_SUPER_ROD
 	goto_if_eq MossdeepCity_House3_EventScript_15A9B1
 	msgbox MossdeepCity_House3_Text_18D909, 5
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_House3_EventScript_15A9BB
 	msgbox MossdeepCity_House3_Text_18D9A9, 4
-	giveitem ITEM_SUPER_ROD
-	setflag 152
+	giveitem_std ITEM_SUPER_ROD
+	setflag FLAG_RECEIVED_SUPER_ROD
 	msgbox MossdeepCity_House3_Text_18D9E3, 4
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc
index fd173899d..856ee1287 100644
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ b/data/scripts/maps/MossdeepCity_House4.inc
@@ -4,7 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30
 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31
 	lock
 	faceplayer
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq MossdeepCity_House4_EventScript_15AB46
 	msgbox MossdeepCity_House4_Text_18E0E3, 4
 	release
@@ -35,8 +35,8 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, 0
 	msgbox MossdeepCity_House4_Text_18E1E1, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
index 4ed3ea57e..c26238102 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
@@ -3,14 +3,14 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0
 	.byte 0
 
 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6
-	sethealplace 9
+	setrespawn 9
 	end
 
 MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA
 	setvar 0x800b, 1
 	call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
index 260cb4b6e..884124567 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
@@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B
 	faceplayer
 	dodailyevents
 	specialvar RESULT, GetWeekCount
-	getnumberstring 0, RESULT
+	buffernumberstring 0, RESULT
 	compare RESULT, 0
 	call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA
 	compare RESULT, 1
@@ -32,13 +32,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC
 MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5
 	lock
 	faceplayer
-	checkflag 192
+	checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C
 	msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4
-	giveitem ITEM_SUN_STONE
+	giveitem_std ITEM_SUN_STONE
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B
-	setflag 192
+	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index 8bf899780..7e08cfa69 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -5,12 +5,12 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5
 	.byte 0
 
 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF
 	end
 
 MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF
-	setmaptile 6, 4, 753, 1
+	setmetatile 6, 4, 753, 1
 	return
 
 MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9
@@ -39,9 +39,9 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
 	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E
 	waitmovement 0
 	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
-	giveitem ITEM_HM08
-	setflag 123
-	setflag 302
+	giveitem_std ITEM_HM08
+	setflag FLAG_RECEIVED_HM08
+	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
 	closemessage
 	delay 20
@@ -74,7 +74,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	msgbox MossdeepCity_StevensHouse_Text_18DD12, 5
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6
-	countpokemon
+	getpartysize
 	compare RESULT, 6
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC
 	copyvar 0x8004, RESULT
@@ -83,13 +83,13 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	message MossdeepCity_StevensHouse_Text_18DD61
 	waitfanfare
 	waitmessage
-	givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
-	getspeciesname 1, SPECIES_BELDUM
+	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
+	bufferspeciesname 1, SPECIES_BELDUM
 	msgbox MossdeepCity_StevensHouse_Text_1A1102, 5
 	compare RESULT, 1
 	call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678
-	setflag 968
-	setflag 298
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
 
@@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
 
 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
 	lockall
-	checkflag 302
+	checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16
 	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
 	releaseall
@@ -125,6 +125,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16
 	end
 
 MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20
-	giveitem ITEM_HM08, 1, 1
-	setflag 123
+	giveitem_std ITEM_HM08, 1, 1
+	setflag FLAG_RECEIVED_HM08
 	end
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
index a8eec9a32..a51695b59 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/scripts/maps/MtChimney.inc
@@ -9,7 +9,7 @@ MtChimney_MapScript1_15CF87:: @ 815CF87
 	end
 
 MtChimney_MapScript1_15CF92:: @ 815CF92
-	tileeffect 1
+	setstepcallback 1
 	end
 
 MtChimney_EventScript_15CF95:: @ 815CF95
@@ -27,7 +27,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95
 	checkitemspace ITEM_LAVA_COOKIE, 1
 	compare RESULT, 1
 	call_if 1, MtChimney_EventScript_15D000
-	giveitem ITEM_LAVA_COOKIE
+	giveitem_std ITEM_LAVA_COOKIE
 	compare RESULT, 0
 	goto_if_eq MtChimney_EventScript_15CFF3
 	hidemoneybox 0, 0
@@ -406,16 +406,16 @@ MtChimney_EventScript_15D174:: @ 815D174
 
 MtChimney_EventScript_15D17D:: @ 815D17D
 	lockall
-	checkflag 139
+	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	goto_if 0, MtChimney_EventScript_15D1D0
-	checkflag 115
+	checkflag FLAG_RECEIVED_METEORITE
 	goto_if_eq MtChimney_EventScript_15D1C6
 	msgbox MtChimney_Text_195870, 5
 	compare RESULT, 0
 	goto_if_eq MtChimney_EventScript_15D1BC
 	msgbox MtChimney_Text_1958C6, 4
-	giveitem ITEM_METEORITE
-	setflag 115
+	giveitem_std ITEM_METEORITE
+	setflag FLAG_RECEIVED_METEORITE
 	releaseall
 	end
 
diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc
index 026d54bfe..7073000d5 100644
--- a/data/scripts/maps/MtPyre_1F.inc
+++ b/data/scripts/maps/MtPyre_1F.inc
@@ -4,13 +4,13 @@ MtPyre_1F_MapScripts:: @ 815D322
 MtPyre_1F_EventScript_15D323:: @ 815D323
 	lock
 	faceplayer
-	checkflag 282
+	checkflag FLAG_RECEIVED_CLEANSE_TAG
 	goto_if_eq MtPyre_1F_EventScript_15D352
 	msgbox MtPyre_1F_Text_196151, 4
-	giveitem ITEM_CLEANSE_TAG
+	giveitem_std ITEM_CLEANSE_TAG
 	compare RESULT, 0
 	goto_if_eq MtPyre_1F_EventScript_1A029B
-	setflag 282
+	setflag FLAG_RECEIVED_CLEANSE_TAG
 	release
 	end
 
diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc
index 90ad1d9cc..1d2368597 100644
--- a/data/scripts/maps/MtPyre_2F.inc
+++ b/data/scripts/maps/MtPyre_2F.inc
@@ -5,7 +5,7 @@ MtPyre_2F_MapScripts:: @ 815D36E
 	.byte 0
 
 MtPyre_2F_MapScript1_15D37E:: @ 815D37E
-	tileeffect 7
+	setstepcallback 7
 	setholewarp MAP_MT_PYRE_1F, 255, 0, 0
 	end
 
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
index 533fb6e90..73e2e4d97 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/scripts/maps/MtPyre_Summit.inc
@@ -47,8 +47,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	removeobject 4
 	removeobject 5
 	removeobject 6
-	setflag 916
-	setflag 917
+	setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
+	setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
 	fadescreen 0
 	delay 20
 	call MtPyre_Summit_EventScript_15D57A
@@ -63,16 +63,16 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	.else
 	msgbox MtPyre_Summit_Text_1B5FE6, 4
 	.endif
-	giveitem ITEM_RED_OR_BLUE_ORB
-	setflag 212
+	giveitem_std ITEM_RED_OR_BLUE_ORB
+	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
 	releaseall
 	end
 
 MtPyre_Summit_EventScript_15D57A:: @ 815D57A
-	setflag 111
+	setflag FLAG_MT_PYRE_ORB_STOLEN
 	setvar 0x4058, 1
-	clearflag 840
-	clearflag 835
+	clearflag FLAG_HIDE_STERN_SLATEPORT
+	clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
 	setvar 0x40a0, 1
 	setvar 0x40b9, 1
 	return
@@ -169,11 +169,11 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A
 MtPyre_Summit_EventScript_15D623:: @ 815D623
 	lock
 	faceplayer
-	checkflag 259
+	checkflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	goto_if_eq MtPyre_Summit_EventScript_15D6C4
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq MtPyre_Summit_EventScript_15D64A
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if_eq MtPyre_Summit_EventScript_15D6BA
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B54BE, 4
@@ -210,7 +210,7 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669
 	.else
 	msgbox MtPyre_Summit_Text_1B639C, 4
 	.endif
-	setflag 259
+	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	release
 	end
 
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc
index 6429ff2f9..a88b35087 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/scripts/maps/NewMauville_Entrance.inc
@@ -9,16 +9,16 @@ NewMauville_Entrance_MapScript1_15E495:: @ 815E495
 	end
 
 NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1
-	setmaptile 3, 0, 788, 1
-	setmaptile 4, 0, 789, 1
-	setmaptile 5, 0, 790, 1
-	setmaptile 3, 1, 796, 1
-	setmaptile 4, 1, 797, 1
-	setmaptile 5, 1, 798, 1
+	setmetatile 3, 0, 788, 1
+	setmetatile 4, 0, 789, 1
+	setmetatile 5, 0, 790, 1
+	setmetatile 3, 1, 796, 1
+	setmetatile 4, 1, 797, 1
+	setmetatile 5, 1, 798, 1
 	return
 
 NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8
-	setflag 2112
+	setflag FLAG_LANDMARK_NEW_MAUVILLE
 	end
 
 NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC
@@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC
 	compare RESULT, 0
 	goto_if_eq NewMauville_Entrance_EventScript_15E55D
 	msgbox NewMauville_Entrance_Text_1982EA, 4
-	setmaptile 3, 0, 707, 0
-	setmaptile 4, 0, 708, 0
-	setmaptile 5, 0, 709, 0
-	setmaptile 3, 1, 715, 1
-	setmaptile 4, 1, 716, 0
-	setmaptile 5, 1, 717, 1
+	setmetatile 3, 0, 707, 0
+	setmetatile 4, 0, 708, 0
+	setmetatile 5, 0, 709, 0
+	setmetatile 3, 1, 715, 1
+	setmetatile 4, 1, 716, 0
+	setmetatile 5, 1, 717, 1
 	special DrawWholeMapView
 	playse 20
 	setvar 0x40ba, 1
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc
index 2d2a46ab4..aefb23c61 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/scripts/maps/NewMauville_Inside.inc
@@ -9,7 +9,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F
 	call_if 1, NewMauville_Inside_EventScript_15E5DA
 	compare 0x4002, 1
 	call_if 1, NewMauville_Inside_EventScript_15E728
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, NewMauville_Inside_EventScript_15E58F
 	end
 
@@ -48,83 +48,83 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2
 	end
 
 NewMauville_Inside_EventScript_15E5DA:: @ 815E5DA
-	setmaptile 23, 34, 617, 1
-	setmaptile 23, 35, 625, 1
-	setmaptile 23, 36, 621, 0
-	setmaptile 23, 37, 641, 0
-	setmaptile 10, 16, 617, 1
-	setmaptile 10, 17, 625, 1
-	setmaptile 10, 18, 621, 0
-	setmaptile 10, 19, 641, 0
-	setmaptile 10, 0, 617, 1
-	setmaptile 10, 1, 625, 1
-	setmaptile 10, 2, 621, 0
-	setmaptile 10, 3, 641, 0
-	setmaptile 37, 33, 694, 1
-	setmaptile 37, 34, 702, 1
-	setmaptile 37, 35, 710, 1
-	setmaptile 37, 36, 718, 1
-	setmaptile 28, 22, 694, 1
-	setmaptile 28, 23, 702, 1
-	setmaptile 28, 24, 710, 1
-	setmaptile 28, 25, 718, 1
-	setmaptile 10, 24, 694, 1
-	setmaptile 10, 25, 702, 1
-	setmaptile 10, 26, 710, 1
-	setmaptile 10, 27, 718, 1
-	setmaptile 21, 2, 694, 1
-	setmaptile 21, 3, 702, 1
-	setmaptile 21, 4, 710, 1
-	setmaptile 21, 5, 718, 1
-	setmaptile 6, 11, 591, 0
-	setmaptile 13, 10, 591, 0
-	setmaptile 16, 22, 591, 0
-	setmaptile 4, 26, 591, 0
-	setmaptile 30, 38, 591, 0
-	setmaptile 2, 11, 558, 0
-	setmaptile 17, 10, 558, 0
-	setmaptile 25, 18, 558, 0
-	setmaptile 18, 36, 558, 0
+	setmetatile 23, 34, 617, 1
+	setmetatile 23, 35, 625, 1
+	setmetatile 23, 36, 621, 0
+	setmetatile 23, 37, 641, 0
+	setmetatile 10, 16, 617, 1
+	setmetatile 10, 17, 625, 1
+	setmetatile 10, 18, 621, 0
+	setmetatile 10, 19, 641, 0
+	setmetatile 10, 0, 617, 1
+	setmetatile 10, 1, 625, 1
+	setmetatile 10, 2, 621, 0
+	setmetatile 10, 3, 641, 0
+	setmetatile 37, 33, 694, 1
+	setmetatile 37, 34, 702, 1
+	setmetatile 37, 35, 710, 1
+	setmetatile 37, 36, 718, 1
+	setmetatile 28, 22, 694, 1
+	setmetatile 28, 23, 702, 1
+	setmetatile 28, 24, 710, 1
+	setmetatile 28, 25, 718, 1
+	setmetatile 10, 24, 694, 1
+	setmetatile 10, 25, 702, 1
+	setmetatile 10, 26, 710, 1
+	setmetatile 10, 27, 718, 1
+	setmetatile 21, 2, 694, 1
+	setmetatile 21, 3, 702, 1
+	setmetatile 21, 4, 710, 1
+	setmetatile 21, 5, 718, 1
+	setmetatile 6, 11, 591, 0
+	setmetatile 13, 10, 591, 0
+	setmetatile 16, 22, 591, 0
+	setmetatile 4, 26, 591, 0
+	setmetatile 30, 38, 591, 0
+	setmetatile 2, 11, 558, 0
+	setmetatile 17, 10, 558, 0
+	setmetatile 25, 18, 558, 0
+	setmetatile 18, 36, 558, 0
 	return
 
 NewMauville_Inside_EventScript_15E728:: @ 815E728
-	setmaptile 23, 34, 695, 1
-	setmaptile 23, 35, 703, 1
-	setmaptile 23, 36, 711, 1
-	setmaptile 23, 37, 719, 1
-	setmaptile 10, 16, 695, 1
-	setmaptile 10, 17, 703, 1
-	setmaptile 10, 18, 711, 1
-	setmaptile 10, 19, 719, 1
-	setmaptile 10, 0, 695, 1
-	setmaptile 10, 1, 703, 1
-	setmaptile 10, 2, 711, 1
-	setmaptile 10, 3, 719, 1
-	setmaptile 37, 33, 617, 1
-	setmaptile 37, 34, 625, 1
-	setmaptile 37, 35, 621, 0
-	setmaptile 37, 36, 641, 0
-	setmaptile 28, 22, 617, 1
-	setmaptile 28, 23, 625, 1
-	setmaptile 28, 24, 621, 0
-	setmaptile 28, 25, 641, 0
-	setmaptile 10, 24, 617, 1
-	setmaptile 10, 25, 625, 1
-	setmaptile 10, 26, 621, 0
-	setmaptile 10, 27, 641, 0
-	setmaptile 21, 2, 617, 1
-	setmaptile 21, 3, 625, 1
-	setmaptile 21, 4, 621, 0
-	setmaptile 21, 5, 641, 0
-	setmaptile 2, 11, 591, 0
-	setmaptile 17, 10, 591, 0
-	setmaptile 25, 18, 591, 0
-	setmaptile 18, 36, 591, 0
-	setmaptile 6, 11, 566, 0
-	setmaptile 13, 10, 566, 0
-	setmaptile 16, 22, 566, 0
-	setmaptile 4, 26, 566, 0
-	setmaptile 30, 38, 566, 0
+	setmetatile 23, 34, 695, 1
+	setmetatile 23, 35, 703, 1
+	setmetatile 23, 36, 711, 1
+	setmetatile 23, 37, 719, 1
+	setmetatile 10, 16, 695, 1
+	setmetatile 10, 17, 703, 1
+	setmetatile 10, 18, 711, 1
+	setmetatile 10, 19, 719, 1
+	setmetatile 10, 0, 695, 1
+	setmetatile 10, 1, 703, 1
+	setmetatile 10, 2, 711, 1
+	setmetatile 10, 3, 719, 1
+	setmetatile 37, 33, 617, 1
+	setmetatile 37, 34, 625, 1
+	setmetatile 37, 35, 621, 0
+	setmetatile 37, 36, 641, 0
+	setmetatile 28, 22, 617, 1
+	setmetatile 28, 23, 625, 1
+	setmetatile 28, 24, 621, 0
+	setmetatile 28, 25, 641, 0
+	setmetatile 10, 24, 617, 1
+	setmetatile 10, 25, 625, 1
+	setmetatile 10, 26, 621, 0
+	setmetatile 10, 27, 641, 0
+	setmetatile 21, 2, 617, 1
+	setmetatile 21, 3, 625, 1
+	setmetatile 21, 4, 621, 0
+	setmetatile 21, 5, 641, 0
+	setmetatile 2, 11, 591, 0
+	setmetatile 17, 10, 591, 0
+	setmetatile 25, 18, 591, 0
+	setmetatile 18, 36, 591, 0
+	setmetatile 6, 11, 566, 0
+	setmetatile 13, 10, 566, 0
+	setmetatile 16, 22, 566, 0
+	setmetatile 4, 26, 566, 0
+	setmetatile 30, 38, 566, 0
 	return
 
 NewMauville_Inside_EventScript_15E876:: @ 815E876
@@ -136,15 +136,15 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876
 	end
 
 NewMauville_Inside_EventScript_15E88B:: @ 815E88B
-	setmaptile 33, 6, 591, 0
-	setmaptile 32, 2, 752, 1
-	setmaptile 33, 2, 753, 1
-	setmaptile 34, 2, 754, 1
-	setmaptile 35, 2, 755, 1
-	setmaptile 32, 3, 756, 1
-	setmaptile 33, 3, 757, 1
-	setmaptile 34, 3, 758, 1
-	setmaptile 35, 3, 759, 1
+	setmetatile 33, 6, 591, 0
+	setmetatile 32, 2, 752, 1
+	setmetatile 33, 2, 753, 1
+	setmetatile 34, 2, 754, 1
+	setmetatile 35, 2, 755, 1
+	setmetatile 32, 3, 756, 1
+	setmetatile 33, 3, 757, 1
+	setmetatile 34, 3, 758, 1
+	setmetatile 35, 3, 759, 1
 	special DrawWholeMapView
 	return
 
@@ -166,13 +166,13 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playpokecry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, 2
 	delay 40
-	waitpokecry
-	setflag 974
-	setflag 2145
+	waitmoncry
+	setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -181,13 +181,13 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playpokecry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, 2
 	delay 40
-	waitpokecry
-	setflag 975
-	setflag 2145
+	waitmoncry
+	setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -196,12 +196,12 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playpokecry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, 2
 	delay 40
-	waitpokecry
-	setflag 976
-	setflag 2145
+	waitmoncry
+	setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index e80df2cd2..465cbcfc6 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -4,12 +4,12 @@ OldaleTown_MapScripts:: @ 814DD62
 
 OldaleTown_MapScript1_14DD68:: @ 814DD68
 	call OldaleTown_EventScript_1A014E
-	setflag 2064
-	checkflag 116
+	setflag FLAG_VISITED_OLDALE_TOWN
+	checkflag FLAG_ADVENTURE_STARTED
 	call_if 0, OldaleTown_EventScript_14DD92
-	checkflag 132
+	checkflag FLAG_RECEIVED_POTION_OLDALE
 	call_if 0, OldaleTown_EventScript_14DD9E
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	call_if 1, OldaleTown_EventScript_14DD8C
 	end
 
@@ -38,11 +38,11 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3
 OldaleTown_EventScript_14DDBC:: @ 814DDBC
 	lock
 	faceplayer
-	checkflag 132
+	checkflag FLAG_RECEIVED_POTION_OLDALE
 	goto_if_eq OldaleTown_EventScript_14DE79
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq OldaleTown_EventScript_14DE79
-	setflag 1
+	setflag FLAG_TEMP_1
 	playbgm 420, 0
 	msgbox OldaleTown_Text_16AEF2, 4
 	closemessage
@@ -75,11 +75,11 @@ OldaleTown_EventScript_14DE35:: @ 814DE35
 
 OldaleTown_EventScript_14DE4C:: @ 814DE4C
 	msgbox OldaleTown_Text_16AF2F, 4
-	giveitem ITEM_POTION
+	giveitem_std ITEM_POTION
 	compare RESULT, 0
 	goto_if_eq OldaleTown_EventScript_14DE83
 	msgbox OldaleTown_Text_16AFE1, 4
-	setflag 132
+	setflag FLAG_RECEIVED_POTION_OLDALE
 	fadedefaultbgm
 	release
 	end
@@ -195,7 +195,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB
 OldaleTown_EventScript_14DEDF:: @ 814DEDF
 	lock
 	faceplayer
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	goto_if_eq OldaleTown_EventScript_14DF26
 	msgbox OldaleTown_Text_16B0CC, 4
 	closemessage
@@ -279,7 +279,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6
 	waitmovement 0
 	removeobject 4
 	setvar 0x40c7, 2
-	setflag 979
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
 	releaseall
 	end
 
diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc
index b9698b58f..f90c787c2 100644
--- a/data/scripts/maps/OldaleTown_Mart.inc
+++ b/data/scripts/maps/OldaleTown_Mart.inc
@@ -6,7 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79
 	faceplayer
 	message OldaleTown_Mart_Text_1A0BE4
 	waitmessage
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	goto_if_eq OldaleTown_Mart_EventScript_152FA8
 	pokemart OldaleTown_Mart_Items1
 	msgbox OldaleTown_Mart_Text_1A0C02, 4
@@ -43,7 +43,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8
 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6
 	lock
 	faceplayer
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	goto_if_eq OldaleTown_Mart_EventScript_152FDB
 	msgbox OldaleTown_Mart_Text_174A8A, 4
 	release
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
index 494f109fe..cbf3acd27 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08
 	.byte 0
 
 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E
-	sethealplace 14
+	setrespawn 14
 	call OldaleTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
@@ -11,7 +11,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17
 	setvar 0x800b, 1
 	call OldaleTown_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
@@ -26,7 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E
 OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37
 	lock
 	faceplayer
-	checkflag 2049
+	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C
 	msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4
 	release
diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc
index c7cfb08df..d7ac80a0a 100644
--- a/data/scripts/maps/PacifidlogTown.inc
+++ b/data/scripts/maps/PacifidlogTown.inc
@@ -4,11 +4,11 @@ PacifidlogTown_MapScripts:: @ 814E8EE
 	.byte 0
 
 PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9
-	setflag 2069
+	setflag FLAG_VISITED_PACIFIDLOG_TOWN
 	end
 
 PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD
-	tileeffect 3
+	setstepcallback 3
 	end
 
 PacifidlogTown_EventScript_14E900:: @ 814E900
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc
index e04a8caae..f073201ca 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
@@ -6,13 +6,13 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	faceplayer
 	dodailyevents
 	call PacifidlogTown_House2_EventScript_1541B4
-	checkflag 299
+	checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	goto_if_eq PacifidlogTown_House2_EventScript_154254
-	checkflag 300
+	checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	call_if 1, PacifidlogTown_House2_EventScript_1541CE
-	checkflag 300
+	checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	call_if 0, PacifidlogTown_House2_EventScript_1541D7
-	setflag 300
+	setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	specialvar RESULT, GetLeadMonFriendshipScore
 	compare RESULT, 4
 	goto_if 4, PacifidlogTown_House2_EventScript_1541EC
@@ -23,7 +23,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	end
 
 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4
-	checkflag 299
+	checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	goto_if 0, PacifidlogTown_House2_EventScript_1A14DC
 	specialvar RESULT, sub_810F908
 	compare RESULT, 0
@@ -40,15 +40,15 @@ PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7
 	return
 
 PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8
-	clearflag 299
+	clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	return
 
 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
 	msgbox PacifidlogTown_House2_Text_179169, 4
-	giveitem ITEM_TM27
+	giveitem_std ITEM_TM27
 	compare RESULT, 0
 	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
-	setflag 299
+	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special sub_810F950
 	msgbox PacifidlogTown_House2_Text_179283, 4
 	release
@@ -61,10 +61,10 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B
 
 PacifidlogTown_House2_EventScript_154225:: @ 8154225
 	msgbox PacifidlogTown_House2_Text_17922D, 4
-	giveitem ITEM_TM21
+	giveitem_std ITEM_TM21
 	compare RESULT, 0
 	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
-	setflag 299
+	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special sub_810F950
 	msgbox PacifidlogTown_House2_Text_179283, 4
 	release
@@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225
 
 PacifidlogTown_House2_EventScript_154254:: @ 8154254
 	specialvar RESULT, sub_810F908
-	getnumberstring 0, RESULT
+	buffernumberstring 0, RESULT
 	msgbox PacifidlogTown_House2_Text_1792F2, 4
 	release
 	end
@@ -81,9 +81,9 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_AZURILL, 0
+	playmoncry SPECIES_AZURILL, 0
 	msgbox PacifidlogTown_House2_Text_17938B, 4
-	waitpokecry
+	waitmoncry
 	msgbox PacifidlogTown_House2_Text_17939B, 4
 	release
 	end
@@ -92,9 +92,9 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_AZURILL, 2
+	playmoncry SPECIES_AZURILL, 2
 	msgbox PacifidlogTown_House2_Text_1793CC, 4
-	waitpokecry
+	waitmoncry
 	msgbox PacifidlogTown_House2_Text_1793DD, 4
 	release
 	end
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc
index 28b9dbd80..624a221d5 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/scripts/maps/PacifidlogTown_House3.inc
@@ -4,7 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D
 PacifidlogTown_House3_EventScript_15429E:: @ 815429E
 	lock
 	faceplayer
-	checkflag 154
+	checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED
 	goto_if_eq PacifidlogTown_House3_EventScript_154338
 	setvar 0x8008, 2
 	copyvar 0x8004, 0x8008
@@ -28,9 +28,9 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E
 	special sub_804DB68
 	special sub_804E174
 	waitstate
-	getspeciesname 0, 0x8009
+	bufferspeciesname 0, 0x8009
 	msgbox PacifidlogTown_House3_Text_1794C4, 4
-	setflag 154
+	setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED
 	release
 	end
 
@@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320
 	end
 
 PacifidlogTown_House3_EventScript_15432A:: @ 815432A
-	getspeciesname 0, 0x8009
+	bufferspeciesname 0, 0x8009
 	msgbox PacifidlogTown_House3_Text_1794DF, 4
 	release
 	end
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
index 64dd5008c..95d5448e8 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
@@ -3,14 +3,14 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF
 	.byte 0
 
 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105
-	sethealplace 19
+	setrespawn 19
 	end
 
 @ 8154109
 	setvar 0x800b, 1
 	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index b4548ddce..45cdce991 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -4,7 +4,7 @@ PetalburgCity_MapScripts:: @ 814B70C
 	.byte 0
 
 PetalburgCity_MapScript1_14B717:: @ 814B717
-	setflag 2070
+	setflag FLAG_VISITED_PETALBURG_CITY
 	compare 0x4057, 0
 	call_if 1, PetalburgCity_EventScript_14B731
 	compare 0x4057, 2
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 6c92316d6..add786bf0 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -48,7 +48,7 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B
 	call_if 1, PetalburgCity_Gym_EventScript_15453B
 	compare 0x4085, 6
 	call_if 0, PetalburgCity_Gym_EventScript_154543
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 1, PetalburgCity_Gym_EventScript_15454B
 	end
 
@@ -86,7 +86,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C
 	waitmovement 0
 	playse 9
 	removeobject 10
-	setflag 726
+	setflag FLAG_HIDE_WALLY_PETALBURG
 	delay 30
 	applymovement 255, PetalburgCity_Gym_Movement_1A0841
 	waitmovement 0
@@ -205,12 +205,12 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	compare 0x8008, 3
 	call_if 1, PetalburgCity_Gym_EventScript_154872
 	removeobject 10
-	setflag 728
+	setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1
 	setvar 0x4085, 1
 	setvar 0x4057, 2
-	clearflag 726
-	clearflag 866
-	setflag 889
+	clearflag FLAG_HIDE_WALLY_PETALBURG
+	clearflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
 	special InitBirchState
 	warp MAP_PETALBURG_CITY, 255, 15, 8
 	waitstate
@@ -354,9 +354,9 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D
 	call PetalburgCity_Gym_EventScript_154969
 	compare RESULT, 1
 	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
-	checkflag 169
+	checkflag FLAG_RECEIVED_TM42
 	goto_if 0, PetalburgCity_Gym_EventScript_154A2C
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq PetalburgCity_Gym_EventScript_154B69
 	msgbox PetalburgCity_Gym_Text_17AA6B, 4
 	release
@@ -383,7 +383,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2
 	return
 
 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8
-	giveitem ITEM_ENIGMA_BERRY
+	giveitem_std ITEM_ENIGMA_BERRY
 	compare RESULT, 0
 	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
 	setvar 0x402d, 0
@@ -397,25 +397,25 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	waitmessage
 	call PetalburgCity_Gym_EventScript_1A02C5
 	msgbox PetalburgCity_Gym_Text_17A805, 4
-	setflag 1217
+	setflag FLAG_DEFEATED_PETALBURG_GYM
 	setvar 0x4085, 7
-	setflag 2059
+	setflag FLAG_BADGE05_GET
 	call PetalburgCity_Gym_EventScript_1A0424
-	setflag 913
-	clearflag 912
+	setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
+	clearflag FLAG_HIDE_WATTSON_MAUVILLE
 	setvar 0x8008, 5
 	call PetalburgCity_Gym_EventScript_1A01C0
-	clearflag 940
+	clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
 	call PetalburgCity_Gym_EventScript_1544ED
 	special DrawWholeMapView
 	goto PetalburgCity_Gym_EventScript_154A2C
 	end
 
 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
-	giveitem ITEM_TM42
+	giveitem_std ITEM_TM42
 	compare RESULT, 0
 	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
-	setflag 169
+	setflag FLAG_RECEIVED_TM42
 	msgbox PetalburgCity_Gym_Text_17A8CF, 4
 	msgbox PetalburgCity_Gym_Text_17A976, 4
 	closemessage
@@ -765,7 +765,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
 
 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
 	trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154E29
 	msgbox PetalburgCity_Gym_Text_17AE30, 6
 	end
@@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
 
 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
 	trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154E65
 	msgbox PetalburgCity_Gym_Text_17AFD3, 6
 	end
@@ -801,7 +801,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
 
 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
 	trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154EA1
 	msgbox PetalburgCity_Gym_Text_17B12C, 6
 	end
@@ -819,7 +819,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
 
 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
 	trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154EDD
 	msgbox PetalburgCity_Gym_Text_17B2E4, 6
 	end
@@ -837,7 +837,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
 
 PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
 	trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F19
 	msgbox PetalburgCity_Gym_Text_17B46F, 6
 	end
@@ -855,7 +855,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
 
 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
 	trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F55
 	msgbox PetalburgCity_Gym_Text_17B5EA, 6
 	end
@@ -873,7 +873,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
 
 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
 	trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F91
 	msgbox PetalburgCity_Gym_Text_17B749, 6
 	end
@@ -962,51 +962,51 @@ PetalburgCity_Gym_EventScript_155081:: @ 8155081
 	return
 
 PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2
-	setmaptile 6, 85, 528, 0
-	setmaptile 7, 85, 529, 0
-	setmaptile 1, 98, 528, 0
-	setmaptile 2, 98, 529, 0
+	setmetatile 6, 85, 528, 0
+	setmetatile 7, 85, 529, 0
+	setmetatile 1, 98, 528, 0
+	setmetatile 2, 98, 529, 0
 	return
 
 PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7
-	setmaptile 6, 46, 528, 0
-	setmaptile 7, 46, 529, 0
-	setmaptile 1, 59, 528, 0
-	setmaptile 2, 59, 529, 0
+	setmetatile 6, 46, 528, 0
+	setmetatile 7, 46, 529, 0
+	setmetatile 1, 59, 528, 0
+	setmetatile 2, 59, 529, 0
 	return
 
 PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC
-	setmaptile 6, 59, 528, 0
-	setmaptile 7, 59, 529, 0
-	setmaptile 1, 72, 528, 0
-	setmaptile 2, 72, 529, 0
+	setmetatile 6, 59, 528, 0
+	setmetatile 7, 59, 529, 0
+	setmetatile 1, 72, 528, 0
+	setmetatile 2, 72, 529, 0
 	return
 
 PetalburgCity_Gym_EventScript_155111:: @ 8155111
-	setmaptile 1, 20, 528, 0
-	setmaptile 2, 20, 529, 0
+	setmetatile 1, 20, 528, 0
+	setmetatile 2, 20, 529, 0
 	return
 
 PetalburgCity_Gym_EventScript_155124:: @ 8155124
-	setmaptile 6, 20, 528, 0
-	setmaptile 7, 20, 529, 0
-	setmaptile 1, 33, 528, 0
-	setmaptile 2, 33, 529, 0
+	setmetatile 6, 20, 528, 0
+	setmetatile 7, 20, 529, 0
+	setmetatile 1, 33, 528, 0
+	setmetatile 2, 33, 529, 0
 	return
 
 PetalburgCity_Gym_EventScript_155149:: @ 8155149
-	setmaptile 6, 33, 528, 0
-	setmaptile 7, 33, 529, 0
+	setmetatile 6, 33, 528, 0
+	setmetatile 7, 33, 529, 0
 	return
 
 PetalburgCity_Gym_EventScript_15515C:: @ 815515C
-	setmaptile 1, 7, 528, 0
-	setmaptile 2, 7, 529, 0
+	setmetatile 1, 7, 528, 0
+	setmetatile 2, 7, 529, 0
 	return
 
 PetalburgCity_Gym_EventScript_15516F:: @ 815516F
-	setmaptile 6, 7, 528, 0
-	setmaptile 7, 7, 529, 0
+	setmetatile 6, 7, 528, 0
+	setmetatile 7, 7, 529, 0
 	return
 
 PetalburgCity_Gym_EventScript_155182:: @ 8155182
@@ -1021,7 +1021,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187
 PetalburgCity_Gym_EventScript_15518B:: @ 815518B
 	lock
 	faceplayer
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_1551A0
 	msgbox PetalburgCity_Gym_Text_17AB96, 4
 	release
@@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
 
 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA
 	lockall
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	goto_if_eq PetalburgCity_Gym_EventScript_1551CA
 	goto PetalburgCity_Gym_EventScript_1551D4
 	end
 
 PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
 	lockall
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	goto_if_eq PetalburgCity_Gym_EventScript_1551CA
 	goto PetalburgCity_Gym_EventScript_1551D4
 	end
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc
index e4186eaae..66e247323 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/scripts/maps/PetalburgCity_Mart.inc
@@ -6,7 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0
 	faceplayer
 	message PetalburgCity_Mart_Text_1A0BE4
 	waitmessage
-	checkflag 296
+	checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	goto_if_eq PetalburgCity_Mart_EventScript_1552EA
 	pokemart PetalburgCity_Mart_Items1
 	msgbox PetalburgCity_Mart_Text_1A0C02, 4
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
index e2013a1d6..1dc99159a 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204
 	.byte 0
 
 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A
-	sethealplace 3
+	setrespawn 3
 	call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B
 	end
 
@@ -11,7 +11,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213
 	setvar 0x800b, 1
 	call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc
index d8e95d8c6..08bbcb0c7 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc
@@ -4,29 +4,29 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3
 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4
 	lock
 	faceplayer
-	checkflag 126
+	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7
-	checkflag 122
+	checkflag FLAG_RECEIVED_HM03
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154427
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154406
-	checkflag 135
+	checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B
 	msgbox PetalburgCity_WallysHouse_Text_179805, 4
-	setflag 135
+	setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY
 	release
 	end
 
 PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7
-	checkflag 122
+	checkflag FLAG_RECEIVED_HM03
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154431
 	goto PetalburgCity_WallysHouse_EventScript_154406
 	end
 
 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406
 	msgbox PetalburgCity_WallysHouse_Text_179996, 4
-	giveitem ITEM_HM03
-	setflag 122
+	giveitem_std ITEM_HM03
+	setflag FLAG_RECEIVED_HM03
 	msgbox PetalburgCity_WallysHouse_Text_179B14, 4
 	release
 	end
@@ -49,9 +49,9 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B
 PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445
 	lock
 	faceplayer
-	checkflag 122
+	checkflag FLAG_RECEIVED_HM03
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154463
 	msgbox PetalburgCity_WallysHouse_Text_179C2C, 4
 	release
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index 0b0c72f70..be74cbf4c 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -90,7 +90,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA
 	applymovement 255, PetalburgWoods_Movement_1A0845
 	waitmovement 0
 	msgbox PetalburgWoods_Text_19507E, 4
-	giveitem ITEM_GREAT_BALL
+	giveitem_std ITEM_GREAT_BALL
 	compare RESULT, 0
 	goto_if_eq PetalburgWoods_EventScript_15CE3F
 	goto PetalburgWoods_EventScript_15CE4D
@@ -241,13 +241,13 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3
 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
 	lock
 	faceplayer
-	checkflag 297
+	checkflag FLAG_RECEIVED_MIRACLE_SEED
 	goto_if_eq PetalburgWoods_EventScript_15CF0B
 	msgbox PetalburgWoods_Text_19549E, 4
-	giveitem ITEM_MIRACLE_SEED
+	giveitem_std ITEM_MIRACLE_SEED
 	compare RESULT, 0
 	goto_if_eq PetalburgWoods_EventScript_1A029B
-	setflag 297
+	setflag FLAG_RECEIVED_MIRACLE_SEED
 	release
 	end
 
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 747b56197..1810a6495 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -217,8 +217,8 @@ Route101_EventScript_14EA76:: @ 814EA76
 Route101_EventScript_14EA7F:: @ 814EA7F
 	lock
 	faceplayer
-	setflag 2048
-	setflag 82
+	setflag FLAG_SYS_POKEMON_GET
+	setflag FLAG_RESCUED_BIRCH
 	fadescreen 1
 	removeobject 4
 	setobjectxy 255, 6, 13
@@ -230,9 +230,9 @@ Route101_EventScript_14EA7F:: @ 814EA7F
 	waitmovement 0
 	msgbox Route101_Text_16D191, 4
 	special ScrSpecial_HealPlayerParty
-	setflag 720
-	clearflag 721
-	setflag 700
+	setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_BIRCH_STARTERS_BAG
 	setvar 0x4084, 2
 	setvar 0x4060, 3
 	clearflag 0x4000
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index ff0ccce30..ee9decedc 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -119,10 +119,10 @@ Route103_EventScript_14ED46:: @ 814ED46
 	removeobject 2
 	setvar 0x4062, 1
 	setvar 0x4084, 4
-	clearflag 889
-	setflag 130
+	clearflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_DEFEATED_RIVAL_ROUTE103
 	setvar 0x40c7, 1
-	clearflag 979
+	clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN
 	savebgm 0
 	fadedefaultbgm
 	releaseall
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index 651f2afb4..a04dcd86d 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -17,27 +17,27 @@ Route104_MapScript1_14EEA8:: @ 814EEA8
 	end
 
 Route104_EventScript_14EEAE:: @ 814EEAE
-	checkflag 127
+	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	goto_if 0, Route104_EventScript_14EEC4
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if 0, Route104_EventScript_14EEC4
-	clearflag 906
+	clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
 	return
 
 Route104_EventScript_14EEC4:: @ 814EEC4
-	setflag 906
+	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
 	return
 
 Route104_EventScript_14EEC8:: @ 814EEC8
 	lock
 	faceplayer
-	checkflag 246
+	checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104
 	goto_if_eq Route104_EventScript_14EEFF
 	msgbox Route104_Text_1C55B9, 4
-	giveitem ITEM_CHESTO_BERRY
+	giveitem_std ITEM_CHESTO_BERRY
 	compare RESULT, 0
 	goto_if_eq Route104_EventScript_1A029B
-	setflag 246
+	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104
 	msgbox Route104_Text_1C5665, 4
 	release
 	end
@@ -50,13 +50,13 @@ Route104_EventScript_14EEFF:: @ 814EEFF
 Route104_EventScript_14EF09:: @ 814EF09
 	lock
 	faceplayer
-	checkflag 279
+	checkflag FLAG_RECEIVED_WHITE_HERB
 	goto_if_eq Route104_EventScript_14EF38
 	msgbox Route104_Text_16DD91, 4
-	giveitem ITEM_WHITE_HERB
+	giveitem_std ITEM_WHITE_HERB
 	compare RESULT, 0
 	goto_if_eq Route104_EventScript_1A029B
-	setflag 279
+	setflag FLAG_RECEIVED_WHITE_HERB
 	release
 	end
 
@@ -104,13 +104,13 @@ Route104_EventScript_14EF8A:: @ 814EF8A
 Route104_EventScript_14EF93:: @ 814EF93
 	lock
 	faceplayer
-	checkflag 262
+	checkflag FLAG_RECEIVED_TM09
 	goto_if_eq Route104_EventScript_14EFC2
 	msgbox Route104_Text_16DC5F, 4
-	giveitem ITEM_TM09
+	giveitem_std ITEM_TM09
 	compare RESULT, 0
 	goto_if_eq Route104_EventScript_1A029B
-	setflag 262
+	setflag FLAG_RECEIVED_TM09
 	release
 	end
 
@@ -124,14 +124,14 @@ Route104_EventScript_14EFCC:: @ 814EFCC
 	end
 
 Route104_EventScript_14EFD5:: @ 814EFD5
-	setobjectpriority 8, 0, 19, 0
-	setobjectpriority 255, 0, 19, 0
+	setobjectpriority 8, MAP_ROUTE104, 0
+	setobjectpriority 255, MAP_ROUTE104, 0
 	applymovement 8, Route104_Movement_14F16C
 	waitmovement 0
 	removeobject 8
 	applymovement 255, Route104_Movement_14F162
 	waitmovement 0
-	hideobject 255, 0, 19
+	hideobjectat 255, MAP_ROUTE104
 	call Route104_EventScript_1A02E7
 	applymovement 7, Route104_Movement_14F09F
 	applymovement 255, Route104_Movement_14F09F
@@ -139,28 +139,28 @@ Route104_EventScript_14EFD5:: @ 814EFD5
 	applymovement 255, Route104_Movement_14F166
 	waitmovement 0
 	call Route104_EventScript_1A02EF
-	showobject 255, 0, 11
+	showobjectat 255, MAP_DEWFORD_TOWN
 	applymovement 255, Route104_Movement_14F168
 	waitmovement 0
 	setobjectxyperm 2, 12, 8
 	addobject 2
-	setobjectpriority 2, 0, 11, 0
-	clearflag 740
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	applymovement 2, Route104_Movement_14F16F
 	waitmovement 0
 	addobject 4
-	clearflag 743
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	call Route104_EventScript_1A02EF
-	setflag 742
-	hideobject 7, 0, 19
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	hideobjectat 7, MAP_ROUTE104
 	copyvar 0x4096, 0x8008
-	resetobjectpriority 255, 0, 19
-	resetobjectpriority 2, 0, 11
+	resetobjectpriority 255, MAP_ROUTE104
+	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	moveobjectoffscreen 2
 	setvar 0x408e, 0
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if 0, Route104_EventScript_14F08B
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if_eq Route104_EventScript_14F095
 	end
 
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc
index a4c360bc0..4eb1d9705 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
@@ -3,15 +3,15 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2
 	.byte 0
 
 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8
-	setflag 2109
+	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
 	compare 0x4090, 1
 	call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4
-	checkflag 188
+	checkflag FLAG_RECEIVED_POKENAV
 	call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0
 	end
 
 Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0
-	setflag 814
+	setflag FLAG_HIDE_RIVAL_RUSTBORO
 	return
 
 Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4
@@ -24,17 +24,17 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4
 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB
 	lock
 	faceplayer
-	checkflag 147
+	checkflag FLAG_MR_BRINEY_SAILING_INTRO
 	call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E
 	goto Route104_MrBrineysHouse_EventScript_15BD32
 	end
 
 Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E
-	setflag 147
+	setflag FLAG_MR_BRINEY_SAILING_INTRO
 	msgbox Route104_MrBrineysHouse_Text_191A82, 4
 	msgbox Route104_MrBrineysHouse_Text_191AAD, 5
 	compare RESULT, 0
@@ -80,9 +80,9 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB
 	msgbox Route104_MrBrineysHouse_Text_191BFD, 4
 	call Route104_MrBrineysHouse_EventScript_1A010C
 	setvar 0x408e, 1
-	clearflag 738
-	setflag 739
-	setflag 881
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	warp MAP_ROUTE104, 255, 13, 51
 	waitstate
 	releaseall
@@ -92,8 +92,8 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, 0
 	msgbox Route104_MrBrineysHouse_Text_191FB9, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 4c5becf88..2de6bf51f 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -3,12 +3,12 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4
 	.byte 0
 
 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA
-	setflag 2108
-	checkflag 127
+	setflag FLAG_LANDMARK_FLOWER_SHOP
+	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
-	setflag 1
+	setflag FLAG_TEMP_1
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03
@@ -18,12 +18,12 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03
 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B
 	lock
 	faceplayer
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4
-	checkflag 127
+	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A
-	setflag 127
+	setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5
 	compare RESULT, 1
 	call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A
@@ -52,7 +52,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73
 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C
 	message Route104_PrettyPetalFlowerShop_Text_1A0C42
 	waitmessage
-	pokemartbp Route104_PrettyPetalFlowerShop_Items
+	pokemartdecoration2 Route104_PrettyPetalFlowerShop_Items
 	msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4
 	release
 	end
@@ -72,7 +72,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94
 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4
 	lock
 	faceplayer
-	checkflag 94
+	checkflag FLAG_RECEIVED_WAILMER_PAIL
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4
 	release
@@ -80,9 +80,9 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4
 
 Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4
-	giveitem ITEM_WAILMER_PAIL
+	giveitem_std ITEM_WAILMER_PAIL
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4
-	setflag 94
+	setflag FLAG_RECEIVED_WAILMER_PAIL
 	release
 	end
 
@@ -90,15 +90,15 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2256
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4
 	random 8
-	addvar RESULT, 133
-	giveitem RESULT
+	addvar RESULT, ITEM_CHERI_BERRY
+	giveitem_std RESULT
 	compare RESULT, 0
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B
-	setflag 2256
+	setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4
 	release
 	end
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc
index 3c218747a..b3b256d79 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/scripts/maps/Route104_Prototype.inc
@@ -16,9 +16,9 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B
 	goto_if 0, Route104_Prototype_EventScript_160C99
 	checktrainerflag OPPONENT_MIKE_1
 	goto_if 0, Route104_Prototype_EventScript_160C99
-	setflag 215
+	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
 	msgbox Route104_Prototype_Text_19B267, 4
-	checkflag 216
+	checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
 	goto_if_eq Route104_Prototype_EventScript_160CFB
 	release
 	end
@@ -43,9 +43,9 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3
 	goto_if 0, Route104_Prototype_EventScript_160CF1
 	checktrainerflag OPPONENT_MIKE_1
 	goto_if 0, Route104_Prototype_EventScript_160CF1
-	setflag 216
+	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
 	msgbox Route104_Prototype_Text_19B2E9, 4
-	checkflag 215
+	checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
 	goto_if_eq Route104_Prototype_EventScript_160CFB
 	release
 	end
diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc
index 1182dae7e..30157e52f 100644
--- a/data/scripts/maps/Route105.inc
+++ b/data/scripts/maps/Route105.inc
@@ -3,13 +3,13 @@ Route105_MapScripts:: @ 814F298
 	.byte 0
 
 Route105_MapScript1_14F29E:: @ 814F29E
-	checkflag 228
+	checkflag FLAG_REGI_DOORS_OPENED
 	call_if 0, Route105_EventScript_14F2A8
 	end
 
 Route105_EventScript_14F2A8:: @ 814F2A8
-	setmaptile 9, 19, 124, 1
-	setmaptile 9, 20, 145, 1
+	setmetatile 9, 19, 124, 1
+	setmetatile 9, 20, 145, 1
 	return
 
 Route105_EventScript_14F2BB:: @ 814F2BB
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index 9f0ef8c8d..a9fa7d906 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -3,8 +3,8 @@ Route109_MapScripts:: @ 814F4D2
 
 Route109_EventScript_14F4D3:: @ 814F4D3
 	call Route109_EventScript_1A010C
-	setobjectpriority 2, 0, 24, 0
-	setobjectpriority 255, 0, 24, 0
+	setobjectpriority 2, MAP_ROUTE109, 0
+	setobjectpriority 255, MAP_ROUTE109, 0
 	applymovement 2, Route109_Movement_14F67B
 	waitmovement 0
 	removeobject 2
@@ -33,30 +33,30 @@ Route109_EventScript_14F538:: @ 814F538
 	end
 
 Route109_EventScript_14F548:: @ 814F548
-	hideobject 255, 0, 24
+	hideobjectat 255, MAP_ROUTE109
 	call Route109_EventScript_1A02E7
 	applymovement 1, Route109_Movement_14F5BF
 	applymovement 255, Route109_Movement_14F5BF
 	waitmovement 0
 	call Route109_EventScript_1A02EF
-	showobject 255, 0, 11
+	showobjectat 255, MAP_DEWFORD_TOWN
 	applymovement 255, Route109_Movement_14F670
 	waitmovement 0
 	addobject 4
-	clearflag 743
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	setobjectxyperm 2, 12, 8
 	addobject 2
-	setobjectpriority 2, 0, 11, 0
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
 	applymovement 2, Route109_Movement_14F67D
 	waitmovement 0
-	clearflag 740
-	setflag 744
-	hideobject 1, 0, 24
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	hideobjectat 1, MAP_ROUTE109
 	msgbox Route109_Text_16B4B5, 4
 	closemessage
 	copyvar 0x4096, 0x8008
-	resetobjectpriority 255, 0, 24
-	resetobjectpriority 2, 0, 11
+	resetobjectpriority 255, MAP_ROUTE109
+	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	moveobjectoffscreen 2
 	release
 	end
@@ -271,7 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D
 Route109_EventScript_14F680:: @ 814F680
 	lock
 	faceplayer
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	goto_if 0, Route109_EventScript_14F691
 	goto Route109_EventScript_14F6AF
 	end
@@ -328,16 +328,16 @@ Route109_EventScript_14F725:: @ 814F725
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
-	checkflag 280
+	checkflag FLAG_RECEIVED_SOFT_SAND
 	goto_if_eq Route109_EventScript_14F762
 	msgbox Route109_Text_16E433, 4
-	giveitem ITEM_SOFT_SAND
+	giveitem_std ITEM_SOFT_SAND
 	compare RESULT, 0
 	goto_if_eq Route109_EventScript_1A029B
 	closemessage
 	applymovement LAST_TALKED, Route109_Movement_1A083D
 	waitmovement 0
-	setflag 280
+	setflag FLAG_RECEIVED_SOFT_SAND
 	release
 	end
 
@@ -360,9 +360,9 @@ Route109_EventScript_14F788:: @ 814F788
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, 0
 	msgbox Route109_Text_16E5CA, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc
index 4d8d363aa..7a12f5850 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
@@ -3,20 +3,20 @@ Route109_SeashoreHouse_MapScripts:: @ 8160DCA
 	.byte 0
 
 Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0
-	setflag 2111
+	setflag FLAG_LANDMARK_SEASHORE_HOUSE
 	end
 
 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4
 	lock
 	faceplayer
-	checkflag 140
+	checkflag FLAG_RECEIVED_6_SODA_POP
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E36
-	checkflag 141
+	checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E08
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq Route109_SeashoreHouse_EventScript_160DFE
 	msgbox Route109_SeashoreHouse_Text_19B4D9, 4
-	setflag 2
+	setflag FLAG_TEMP_2
 	release
 	end
 
@@ -27,10 +27,10 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE
 
 Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08
 	msgbox Route109_SeashoreHouse_Text_19B609, 4
-	giveitem ITEM_SODA_POP, 6
+	giveitem_std ITEM_SODA_POP, 6
 	compare RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E2C
-	setflag 140
+	setflag FLAG_RECEIVED_6_SODA_POP
 	release
 	end
 
@@ -61,7 +61,7 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A
 	takemoney 0x12c, 0
 	updatemoneybox 0, 0
 	nop
-	giveitem ITEM_SODA_POP
+	giveitem_std ITEM_SODA_POP
 	hidemoneybox 0, 0
 	release
 	end
@@ -100,7 +100,7 @@ Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09
 	goto_if 0, Route109_SeashoreHouse_EventScript_160F29
 	checktrainerflag OPPONENT_SIMON
 	goto_if 0, Route109_SeashoreHouse_EventScript_160F29
-	setflag 141
+	setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS
 	release
 	end
 
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index 146be5959..5e10782e9 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -420,7 +420,7 @@ Route110_EventScript_14FE8A:: @ 814FE8A
 	end
 
 Route110_EventScript_14FEA5:: @ 814FEA5
-	giveitem ITEM_ITEMFINDER
+	giveitem_std ITEM_ITEMFINDER
 	return
 
 Route110_EventScript_14FEB2:: @ 814FEB2
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index c60bc366e..8e33517ca 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
@@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7
 	call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D
 	compare RESULT, 0
 	goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523
-	setflag 2091
+	setflag FLAG_SYS_CYCLING_ROAD
 	setvar 0x4001, 1
 	releaseall
 	end
@@ -55,7 +55,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A
 @ Coord event directly in front of the gatesman heading right to left
 	lockall
 	setvar 0x40a9, 0
-	clearflag 2091
+	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar 0x4001, 0
 	releaseall
 	end
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
index cf18a8e36..51cab5ddd 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
@@ -13,7 +13,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B
 	specialvar RESULT, GetPlayerAvatarBike
 	compare RESULT, 0
 	goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6
-	setflag 2091
+	setflag FLAG_SYS_CYCLING_ROAD
 	setvar 0x4001, 1
 	releaseall
 	end
@@ -32,7 +32,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD
 	lockall
-	clearflag 2091
+	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar 0x4001, 0
 	releaseall
 	end
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc
index 12309207c..813cbb9e9 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
@@ -22,7 +22,7 @@ Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965
 
 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F
 	addobject 1
-	showobject 1, 29, 1
+	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END
 	turnobject 1, 4
 	end
 
@@ -37,7 +37,7 @@ Route110_TrickHouseEnd_EventScript_161986:: @ 8161986
 	end
 
 Route110_TrickHouseEnd_EventScript_161994:: @ 8161994
-	setmaptile 10, 1, 539, 1
+	setmetatile 10, 1, 539, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E
@@ -60,7 +60,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B
 	msgbox Route110_TrickHouseEnd_Text_19C2B2, 4
 	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
 	setvar 0x40c1, 0
-	giveitem ITEM_RARE_CANDY
+	giveitem_std ITEM_RARE_CANDY
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
@@ -73,7 +73,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47
 	msgbox Route110_TrickHouseEnd_Text_19C333, 4
 	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
 	setvar 0x40c1, 0
-	giveitem ITEM_TIMER_BALL
+	giveitem_std ITEM_TIMER_BALL
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
@@ -86,7 +86,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83
 	msgbox Route110_TrickHouseEnd_Text_19C3A7, 4
 	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
 	setvar 0x40c1, 0
-	giveitem ITEM_HARD_STONE
+	giveitem_std ITEM_HARD_STONE
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
@@ -99,7 +99,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF
 	msgbox Route110_TrickHouseEnd_Text_19C41F, 4
 	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
 	setvar 0x40c1, 0
-	giveitem ITEM_SMOKE_BALL
+	giveitem_std ITEM_SMOKE_BALL
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
@@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB
 	msgbox Route110_TrickHouseEnd_Text_19C491, 4
 	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
 	setvar 0x40c1, 0
-	giveitem ITEM_TM12
+	giveitem_std ITEM_TM12
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
@@ -125,7 +125,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37
 	msgbox Route110_TrickHouseEnd_Text_19C515, 4
 	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
 	setvar 0x40c1, 0
-	giveitem ITEM_MAGNET
+	giveitem_std ITEM_MAGNET
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
@@ -138,7 +138,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73
 	msgbox Route110_TrickHouseEnd_Text_19C567, 4
 	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
 	setvar 0x40c1, 0
-	giveitem ITEM_PP_MAX
+	giveitem_std ITEM_PP_MAX
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
@@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
 	msgbox Route110_TrickHouseEnd_Text_19C691, 4
 	setvar 0x40c1, 0
 	.ifdef SAPPHIRE
-	givedecoration 32
+	givedecoration_std 32
 	.else
-	givedecoration 31
+	givedecoration_std 31
 	.endc
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C61
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 7d2c77645..b9582b64c 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B
 	.byte 0
 
 Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
-	setflag 2114
+	setflag FLAG_LANDMARK_TRICK_HOUSE
 	compare 0x40b5, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE
 	compare 0x40c1, 1
@@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE
 	return
 
 Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046
-	checkflag 2058
+	checkflag FLAG_BADGE04_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E
-	checkflag 2062
+	checkflag FLAG_BADGE08_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
@@ -139,14 +139,14 @@ Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2
 
 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4
 	addobject 1
-	showobject 1, 29, 0
+	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	turnobject 1, 4
 	turnobject 255, 3
 	end
 
 Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105
 	addobject 1
-	hideobject 1, 29, 0
+	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	switch 0x4044
 	case 0, Route110_TrickHouseEntrance_EventScript_16116B
 	case 1, Route110_TrickHouseEntrance_EventScript_161173
@@ -368,7 +368,7 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E
 	end
 
 Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE
-	giveitem ITEM_RARE_CANDY
+	giveitem_std ITEM_RARE_CANDY
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
@@ -378,7 +378,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE
 	end
 
 Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA
-	giveitem ITEM_TIMER_BALL
+	giveitem_std ITEM_TIMER_BALL
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
@@ -388,7 +388,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA
 	end
 
 Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426
-	giveitem ITEM_HARD_STONE
+	giveitem_std ITEM_HARD_STONE
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
@@ -398,7 +398,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426
 	end
 
 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
-	giveitem ITEM_SMOKE_BALL
+	giveitem_std ITEM_SMOKE_BALL
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
@@ -408,7 +408,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
 	end
 
 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
-	giveitem ITEM_TM12
+	giveitem_std ITEM_TM12
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
@@ -418,7 +418,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
 	end
 
 Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA
-	giveitem ITEM_MAGNET
+	giveitem_std ITEM_MAGNET
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
@@ -428,7 +428,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA
 	end
 
 Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6
-	giveitem ITEM_PP_MAX
+	giveitem_std ITEM_PP_MAX
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
@@ -450,9 +450,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
 	waitmovement 0
 	msgbox Route110_TrickHouseEntrance_Text_19C128, 4
 	.ifdef SAPPHIRE
-	givedecoration 32
+	givedecoration_std 32
 	.else
-	givedecoration 31
+	givedecoration_std 31
 	.endif
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161551
@@ -501,7 +501,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7
 	end
 
 Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
-	setmaptile 5, 1, 537, 0
+	setmetatile 5, 1, 537, 0
 	special DrawWholeMapView
 	delay 20
 	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856
@@ -607,7 +607,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
 	msgbox UnknownString_819CAD1, 4
 	playse SE_PIN
 	setvar 0x40AB, 2
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -618,7 +618,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
 	msgbox UnknownString_819CCCB, 4
 	playse SE_PIN
 	setvar 0x40AC, 2
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -629,7 +629,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
 	msgbox UnknownString_819CEF9, 4
 	playse SE_PIN
 	setvar 0x40AD, 2
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -640,7 +640,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
 	msgbox UnknownString_819D164, 4
 	playse SE_PIN
 	setvar 0x40AE, 2
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -651,7 +651,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
 	msgbox UnknownString_819D3A5, 4
 	playse SE_PIN
 	setvar 0x40AF, 2
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -662,7 +662,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
 	msgbox UnknownString_819DC0A, 4
 	playse SE_PIN
 	setvar 0x40B0, 2
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -673,7 +673,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
 	msgbox UnknownString_819DE8D, 4
 	playse SE_PIN
 	setvar 0x40B1, 2
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -684,7 +684,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
 	msgbox UnknownString_819E0FF, 4
 	playse SE_PIN
 	setvar 0x40B2, 2
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -757,9 +757,9 @@ Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B
 	return
 
 Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920
-	setfieldeffect 0, 32772
-	setfieldeffect 1, 32773
-	setfieldeffect 2, 32774
+	setfieldeffectargument 0, 32772
+	setfieldeffectargument 1, 32773
+	setfieldeffectargument 2, 32774
 	dofieldeffect 54
 	waitfieldeffect 54
 	delay 10
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc
index 3a89c2db1..4fffd9914 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc
@@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE
 	end
 
 Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A
-	setmaptile 13, 1, 523, 0
+	setmetatile 13, 1, 523, 0
 	end
 
 Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
index f71a9611a..6425d05cb 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
@@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19
 	end
 
 Route110_TrickHousePuzzle2_EventScript_161E2C:: @ 8161E2C
-	setmaptile 14, 21, 601, 0
-	setmaptile 1, 12, 618, 0
+	setmetatile 14, 21, 601, 0
+	setmetatile 1, 12, 618, 0
 	return
 
 Route110_TrickHousePuzzle2_EventScript_161E3F:: @ 8161E3F
-	setmaptile 8, 17, 601, 0
-	setmaptile 12, 13, 618, 0
+	setmetatile 8, 17, 601, 0
+	setmetatile 12, 13, 618, 0
 	return
 
 Route110_TrickHousePuzzle2_EventScript_161E52:: @ 8161E52
-	setmaptile 4, 10, 601, 0
-	setmaptile 8, 4, 618, 0
+	setmetatile 4, 10, 601, 0
+	setmetatile 8, 4, 618, 0
 	return
 
 Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65
-	setmaptile 5, 2, 601, 0
-	setmaptile 12, 5, 618, 0
+	setmetatile 5, 2, 601, 0
+	setmetatile 12, 5, 618, 0
 	return
 
 Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
index a50ecd3ce..54cea16c9 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
@@ -24,13 +24,13 @@ Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4
 	end
 
 Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12
-	setmaptile 5, 20, 600, 0
-	setmaptile 4, 12, 600, 0
-	setmaptile 11, 10, 600, 0
-	setmaptile 3, 8, 600, 0
-	setmaptile 13, 7, 600, 0
-	setmaptile 1, 3, 600, 0
-	setmaptile 10, 2, 600, 0
+	setmetatile 5, 20, 600, 0
+	setmetatile 4, 12, 600, 0
+	setmetatile 11, 10, 600, 0
+	setmetatile 3, 8, 600, 0
+	setmetatile 13, 7, 600, 0
+	setmetatile 1, 3, 600, 0
+	setmetatile 10, 2, 600, 0
 	compare 0x4008, 1
 	call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F
 	compare 0x4008, 2
@@ -48,201 +48,201 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F
-	setmaptile 5, 20, 601, 0
+	setmetatile 5, 20, 601, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161FA9:: @ 8161FA9
-	setmaptile 4, 12, 601, 0
+	setmetatile 4, 12, 601, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161FB3:: @ 8161FB3
-	setmaptile 11, 10, 601, 0
+	setmetatile 11, 10, 601, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161FBD:: @ 8161FBD
-	setmaptile 3, 8, 601, 0
+	setmetatile 3, 8, 601, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161FC7:: @ 8161FC7
-	setmaptile 13, 7, 601, 0
+	setmetatile 13, 7, 601, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161FD1:: @ 8161FD1
-	setmaptile 1, 3, 601, 0
+	setmetatile 1, 3, 601, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161FDB:: @ 8161FDB
-	setmaptile 10, 2, 601, 0
+	setmetatile 10, 2, 601, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5
-	setmaptile 1, 6, 587, 0
-	setmaptile 2, 6, 588, 0
-	setmaptile 1, 7, 595, 0
-	setmaptile 2, 7, 596, 0
-	setmaptile 4, 9, 587, 0
-	setmaptile 5, 9, 588, 0
-	setmaptile 4, 10, 595, 0
-	setmaptile 5, 10, 596, 0
-	setmaptile 4, 18, 587, 0
-	setmaptile 5, 18, 588, 0
-	setmaptile 4, 19, 595, 0
-	setmaptile 5, 19, 596, 0
-	setmaptile 7, 3, 587, 0
-	setmaptile 8, 3, 588, 0
-	setmaptile 7, 4, 595, 0
-	setmaptile 8, 4, 596, 0
-	setmaptile 7, 9, 587, 0
-	setmaptile 8, 9, 588, 0
-	setmaptile 7, 10, 595, 0
-	setmaptile 8, 10, 596, 0
-	setmaptile 7, 18, 587, 0
-	setmaptile 8, 18, 588, 0
-	setmaptile 7, 19, 595, 0
-	setmaptile 8, 19, 596, 0
-	setmaptile 13, 3, 587, 0
-	setmaptile 14, 3, 588, 0
-	setmaptile 13, 4, 595, 0
-	setmaptile 14, 4, 596, 0
-	setmaptile 13, 9, 587, 0
-	setmaptile 14, 9, 588, 0
-	setmaptile 13, 10, 595, 0
-	setmaptile 14, 10, 596, 0
-	setmaptile 13, 15, 587, 0
-	setmaptile 14, 15, 588, 0
-	setmaptile 13, 16, 595, 0
-	setmaptile 14, 16, 596, 0
-	setmaptile 3, 13, 589, 1
-	setmaptile 3, 14, 597, 0
-	setmaptile 6, 7, 589, 1
-	setmaptile 6, 8, 597, 0
-	setmaptile 9, 16, 589, 1
-	setmaptile 9, 17, 597, 0
-	setmaptile 12, 4, 589, 1
-	setmaptile 12, 5, 597, 0
-	setmaptile 12, 10, 589, 1
-	setmaptile 12, 11, 597, 0
-	setmaptile 1, 15, 568, 0
-	setmaptile 2, 15, 569, 0
-	setmaptile 1, 16, 576, 1
-	setmaptile 2, 16, 577, 1
-	setmaptile 4, 6, 568, 0
-	setmaptile 5, 6, 569, 0
-	setmaptile 4, 7, 576, 1
-	setmaptile 5, 7, 577, 1
-	setmaptile 7, 12, 568, 0
-	setmaptile 8, 12, 569, 0
-	setmaptile 7, 13, 576, 1
-	setmaptile 8, 13, 577, 1
-	setmaptile 10, 12, 568, 0
-	setmaptile 11, 12, 569, 0
-	setmaptile 10, 13, 576, 1
-	setmaptile 11, 13, 577, 1
-	setmaptile 10, 18, 568, 0
-	setmaptile 11, 18, 569, 0
-	setmaptile 10, 19, 576, 1
-	setmaptile 11, 19, 577, 1
-	setmaptile 3, 4, 570, 1
-	setmaptile 3, 5, 578, 1
-	setmaptile 6, 10, 570, 1
-	setmaptile 6, 11, 578, 1
-	setmaptile 6, 13, 570, 1
-	setmaptile 6, 14, 578, 1
-	setmaptile 6, 16, 570, 1
-	setmaptile 6, 17, 578, 1
-	setmaptile 9, 4, 570, 1
-	setmaptile 9, 5, 578, 1
-	setmaptile 9, 7, 570, 1
-	setmaptile 9, 8, 578, 1
-	setmaptile 12, 13, 570, 1
-	setmaptile 12, 14, 578, 1
-	setmaptile 12, 16, 570, 1
-	setmaptile 12, 17, 578, 1
+	setmetatile 1, 6, 587, 0
+	setmetatile 2, 6, 588, 0
+	setmetatile 1, 7, 595, 0
+	setmetatile 2, 7, 596, 0
+	setmetatile 4, 9, 587, 0
+	setmetatile 5, 9, 588, 0
+	setmetatile 4, 10, 595, 0
+	setmetatile 5, 10, 596, 0
+	setmetatile 4, 18, 587, 0
+	setmetatile 5, 18, 588, 0
+	setmetatile 4, 19, 595, 0
+	setmetatile 5, 19, 596, 0
+	setmetatile 7, 3, 587, 0
+	setmetatile 8, 3, 588, 0
+	setmetatile 7, 4, 595, 0
+	setmetatile 8, 4, 596, 0
+	setmetatile 7, 9, 587, 0
+	setmetatile 8, 9, 588, 0
+	setmetatile 7, 10, 595, 0
+	setmetatile 8, 10, 596, 0
+	setmetatile 7, 18, 587, 0
+	setmetatile 8, 18, 588, 0
+	setmetatile 7, 19, 595, 0
+	setmetatile 8, 19, 596, 0
+	setmetatile 13, 3, 587, 0
+	setmetatile 14, 3, 588, 0
+	setmetatile 13, 4, 595, 0
+	setmetatile 14, 4, 596, 0
+	setmetatile 13, 9, 587, 0
+	setmetatile 14, 9, 588, 0
+	setmetatile 13, 10, 595, 0
+	setmetatile 14, 10, 596, 0
+	setmetatile 13, 15, 587, 0
+	setmetatile 14, 15, 588, 0
+	setmetatile 13, 16, 595, 0
+	setmetatile 14, 16, 596, 0
+	setmetatile 3, 13, 589, 1
+	setmetatile 3, 14, 597, 0
+	setmetatile 6, 7, 589, 1
+	setmetatile 6, 8, 597, 0
+	setmetatile 9, 16, 589, 1
+	setmetatile 9, 17, 597, 0
+	setmetatile 12, 4, 589, 1
+	setmetatile 12, 5, 597, 0
+	setmetatile 12, 10, 589, 1
+	setmetatile 12, 11, 597, 0
+	setmetatile 1, 15, 568, 0
+	setmetatile 2, 15, 569, 0
+	setmetatile 1, 16, 576, 1
+	setmetatile 2, 16, 577, 1
+	setmetatile 4, 6, 568, 0
+	setmetatile 5, 6, 569, 0
+	setmetatile 4, 7, 576, 1
+	setmetatile 5, 7, 577, 1
+	setmetatile 7, 12, 568, 0
+	setmetatile 8, 12, 569, 0
+	setmetatile 7, 13, 576, 1
+	setmetatile 8, 13, 577, 1
+	setmetatile 10, 12, 568, 0
+	setmetatile 11, 12, 569, 0
+	setmetatile 10, 13, 576, 1
+	setmetatile 11, 13, 577, 1
+	setmetatile 10, 18, 568, 0
+	setmetatile 11, 18, 569, 0
+	setmetatile 10, 19, 576, 1
+	setmetatile 11, 19, 577, 1
+	setmetatile 3, 4, 570, 1
+	setmetatile 3, 5, 578, 1
+	setmetatile 6, 10, 570, 1
+	setmetatile 6, 11, 578, 1
+	setmetatile 6, 13, 570, 1
+	setmetatile 6, 14, 578, 1
+	setmetatile 6, 16, 570, 1
+	setmetatile 6, 17, 578, 1
+	setmetatile 9, 4, 570, 1
+	setmetatile 9, 5, 578, 1
+	setmetatile 9, 7, 570, 1
+	setmetatile 9, 8, 578, 1
+	setmetatile 12, 13, 570, 1
+	setmetatile 12, 14, 578, 1
+	setmetatile 12, 16, 570, 1
+	setmetatile 12, 17, 578, 1
 	return
 
 Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8
-	setmaptile 1, 6, 571, 0
-	setmaptile 2, 6, 572, 0
-	setmaptile 1, 7, 579, 1
-	setmaptile 2, 7, 580, 1
-	setmaptile 4, 9, 571, 0
-	setmaptile 5, 9, 572, 0
-	setmaptile 4, 10, 579, 1
-	setmaptile 5, 10, 580, 1
-	setmaptile 4, 18, 571, 0
-	setmaptile 5, 18, 572, 0
-	setmaptile 4, 19, 579, 1
-	setmaptile 5, 19, 580, 1
-	setmaptile 7, 3, 571, 0
-	setmaptile 8, 3, 572, 0
-	setmaptile 7, 4, 579, 1
-	setmaptile 8, 4, 580, 1
-	setmaptile 7, 9, 571, 0
-	setmaptile 8, 9, 572, 0
-	setmaptile 7, 10, 579, 1
-	setmaptile 8, 10, 580, 1
-	setmaptile 7, 18, 571, 0
-	setmaptile 8, 18, 572, 0
-	setmaptile 7, 19, 579, 1
-	setmaptile 8, 19, 580, 1
-	setmaptile 13, 3, 571, 0
-	setmaptile 14, 3, 572, 0
-	setmaptile 13, 4, 579, 1
-	setmaptile 14, 4, 580, 1
-	setmaptile 13, 9, 571, 0
-	setmaptile 14, 9, 572, 0
-	setmaptile 13, 10, 579, 1
-	setmaptile 14, 10, 580, 1
-	setmaptile 13, 15, 571, 0
-	setmaptile 14, 15, 572, 0
-	setmaptile 13, 16, 579, 1
-	setmaptile 14, 16, 580, 1
-	setmaptile 3, 13, 573, 1
-	setmaptile 3, 14, 581, 1
-	setmaptile 6, 7, 573, 1
-	setmaptile 6, 8, 581, 1
-	setmaptile 9, 16, 573, 1
-	setmaptile 9, 17, 581, 1
-	setmaptile 12, 4, 573, 1
-	setmaptile 12, 5, 581, 1
-	setmaptile 12, 10, 573, 1
-	setmaptile 12, 11, 581, 1
-	setmaptile 1, 15, 584, 0
-	setmaptile 2, 15, 585, 0
-	setmaptile 1, 16, 592, 0
-	setmaptile 2, 16, 593, 0
-	setmaptile 4, 6, 584, 0
-	setmaptile 5, 6, 585, 0
-	setmaptile 4, 7, 592, 0
-	setmaptile 5, 7, 593, 0
-	setmaptile 7, 12, 584, 0
-	setmaptile 8, 12, 585, 0
-	setmaptile 7, 13, 592, 0
-	setmaptile 8, 13, 593, 0
-	setmaptile 10, 12, 584, 0
-	setmaptile 11, 12, 585, 0
-	setmaptile 10, 13, 592, 0
-	setmaptile 11, 13, 593, 0
-	setmaptile 10, 18, 584, 0
-	setmaptile 11, 18, 585, 0
-	setmaptile 10, 19, 592, 0
-	setmaptile 11, 19, 593, 0
-	setmaptile 3, 4, 586, 1
-	setmaptile 3, 5, 594, 0
-	setmaptile 6, 10, 586, 1
-	setmaptile 6, 11, 594, 0
-	setmaptile 6, 13, 586, 1
-	setmaptile 6, 14, 594, 0
-	setmaptile 6, 16, 586, 1
-	setmaptile 6, 17, 594, 0
-	setmaptile 9, 4, 586, 1
-	setmaptile 9, 5, 594, 0
-	setmaptile 9, 7, 586, 1
-	setmaptile 9, 8, 594, 0
-	setmaptile 12, 13, 586, 1
-	setmaptile 12, 14, 594, 0
-	setmaptile 12, 16, 586, 1
-	setmaptile 12, 17, 594, 0
+	setmetatile 1, 6, 571, 0
+	setmetatile 2, 6, 572, 0
+	setmetatile 1, 7, 579, 1
+	setmetatile 2, 7, 580, 1
+	setmetatile 4, 9, 571, 0
+	setmetatile 5, 9, 572, 0
+	setmetatile 4, 10, 579, 1
+	setmetatile 5, 10, 580, 1
+	setmetatile 4, 18, 571, 0
+	setmetatile 5, 18, 572, 0
+	setmetatile 4, 19, 579, 1
+	setmetatile 5, 19, 580, 1
+	setmetatile 7, 3, 571, 0
+	setmetatile 8, 3, 572, 0
+	setmetatile 7, 4, 579, 1
+	setmetatile 8, 4, 580, 1
+	setmetatile 7, 9, 571, 0
+	setmetatile 8, 9, 572, 0
+	setmetatile 7, 10, 579, 1
+	setmetatile 8, 10, 580, 1
+	setmetatile 7, 18, 571, 0
+	setmetatile 8, 18, 572, 0
+	setmetatile 7, 19, 579, 1
+	setmetatile 8, 19, 580, 1
+	setmetatile 13, 3, 571, 0
+	setmetatile 14, 3, 572, 0
+	setmetatile 13, 4, 579, 1
+	setmetatile 14, 4, 580, 1
+	setmetatile 13, 9, 571, 0
+	setmetatile 14, 9, 572, 0
+	setmetatile 13, 10, 579, 1
+	setmetatile 14, 10, 580, 1
+	setmetatile 13, 15, 571, 0
+	setmetatile 14, 15, 572, 0
+	setmetatile 13, 16, 579, 1
+	setmetatile 14, 16, 580, 1
+	setmetatile 3, 13, 573, 1
+	setmetatile 3, 14, 581, 1
+	setmetatile 6, 7, 573, 1
+	setmetatile 6, 8, 581, 1
+	setmetatile 9, 16, 573, 1
+	setmetatile 9, 17, 581, 1
+	setmetatile 12, 4, 573, 1
+	setmetatile 12, 5, 581, 1
+	setmetatile 12, 10, 573, 1
+	setmetatile 12, 11, 581, 1
+	setmetatile 1, 15, 584, 0
+	setmetatile 2, 15, 585, 0
+	setmetatile 1, 16, 592, 0
+	setmetatile 2, 16, 593, 0
+	setmetatile 4, 6, 584, 0
+	setmetatile 5, 6, 585, 0
+	setmetatile 4, 7, 592, 0
+	setmetatile 5, 7, 593, 0
+	setmetatile 7, 12, 584, 0
+	setmetatile 8, 12, 585, 0
+	setmetatile 7, 13, 592, 0
+	setmetatile 8, 13, 593, 0
+	setmetatile 10, 12, 584, 0
+	setmetatile 11, 12, 585, 0
+	setmetatile 10, 13, 592, 0
+	setmetatile 11, 13, 593, 0
+	setmetatile 10, 18, 584, 0
+	setmetatile 11, 18, 585, 0
+	setmetatile 10, 19, 592, 0
+	setmetatile 11, 19, 593, 0
+	setmetatile 3, 4, 586, 1
+	setmetatile 3, 5, 594, 0
+	setmetatile 6, 10, 586, 1
+	setmetatile 6, 11, 594, 0
+	setmetatile 6, 13, 586, 1
+	setmetatile 6, 14, 594, 0
+	setmetatile 6, 16, 586, 1
+	setmetatile 6, 17, 594, 0
+	setmetatile 9, 4, 586, 1
+	setmetatile 9, 5, 594, 0
+	setmetatile 9, 7, 586, 1
+	setmetatile 9, 8, 594, 0
+	setmetatile 12, 13, 586, 1
+	setmetatile 12, 14, 594, 0
+	setmetatile 12, 16, 586, 1
+	setmetatile 12, 17, 594, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
index 1841b025f..4ff925639 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
@@ -10,76 +10,76 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_163195
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195
-	setmaptile 13, 17, 610, 0
-	setmaptile 12, 16, 575, 1
+	setmetatile 13, 17, 610, 0
+	setmetatile 12, 16, 575, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_1631A8:: @ 81631A8
-	setmaptile 12, 13, 610, 0
-	setmaptile 12, 11, 575, 1
+	setmetatile 12, 13, 610, 0
+	setmetatile 12, 11, 575, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_1631BB:: @ 81631BB
-	setmaptile 7, 12, 610, 0
-	setmaptile 5, 10, 575, 1
+	setmetatile 7, 12, 610, 0
+	setmetatile 5, 10, 575, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_1631CE:: @ 81631CE
-	setmaptile 6, 6, 636, 0
-	setmaptile 4, 4, 575, 1
+	setmetatile 6, 6, 636, 0
+	setmetatile 4, 4, 575, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_1631E1:: @ 81631E1
-	setmaptile 8, 4, 609, 0
-	setmaptile 7, 5, 575, 1
+	setmetatile 8, 4, 609, 0
+	setmetatile 7, 5, 575, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_1631F4:: @ 81631F4
-	setmaptile 13, 17, 611, 0
-	setmaptile 12, 16, 574, 1
+	setmetatile 13, 17, 611, 0
+	setmetatile 12, 16, 574, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_163207:: @ 8163207
-	setmaptile 12, 13, 609, 0
-	setmaptile 12, 11, 574, 1
+	setmetatile 12, 13, 609, 0
+	setmetatile 12, 11, 574, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_16321A:: @ 816321A
-	setmaptile 7, 12, 611, 0
-	setmaptile 5, 10, 574, 1
+	setmetatile 7, 12, 611, 0
+	setmetatile 5, 10, 574, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_16322D:: @ 816322D
-	setmaptile 6, 6, 635, 0
-	setmaptile 4, 4, 574, 1
+	setmetatile 6, 6, 635, 0
+	setmetatile 4, 4, 574, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240
-	setmaptile 8, 4, 608, 0
-	setmaptile 7, 5, 574, 1
+	setmetatile 8, 4, 608, 0
+	setmetatile 7, 5, 574, 1
 	return
 
 Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253
 	compare 0x40b6, 1
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E
-	clearflag 194
-	clearflag 195
-	clearflag 196
-	clearflag 197
-	clearflag 198
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	end
 
 Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E
@@ -121,125 +121,125 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8
 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9
 	lockall
 	delay 32
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_163195
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4
 	special DrawWholeMapView
 	playse 36
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8
 	lockall
 	delay 32
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_163207
 	special DrawWholeMapView
 	playse 36
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317
 	lockall
 	delay 32
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A
 	special DrawWholeMapView
 	playse 36
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346
 	lockall
 	delay 32
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D
 	special DrawWholeMapView
 	playse 36
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375
 	lockall
 	delay 32
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_163240
 	special DrawWholeMapView
 	playse 36
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4
-	setflag 194
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633A9:: @ 81633A9
-	clearflag 194
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633AE:: @ 81633AE
-	setflag 195
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633B3:: @ 81633B3
-	clearflag 195
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633B8:: @ 81633B8
-	setflag 196
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633BD:: @ 81633BD
-	clearflag 196
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633C2:: @ 81633C2
-	setflag 197
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633C7:: @ 81633C7
-	clearflag 197
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633CC:: @ 81633CC
-	setflag 198
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1
-	clearflag 198
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 545e62921..0a7e6befc 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -4,13 +4,13 @@ Route111_MapScripts:: @ 814FF91
 	.byte 0
 
 Route111_MapScript1_14FF9C:: @ 814FF9C
-	checkflag 228
+	checkflag FLAG_REGI_DOORS_OPENED
 	call_if 0, Route111_EventScript_14FFA6
 	end
 
 Route111_EventScript_14FFA6:: @ 814FFA6
-	setmaptile 29, 86, 124, 1
-	setmaptile 29, 87, 145, 1
+	setmetatile 29, 86, 124, 1
+	setmetatile 29, 87, 145, 1
 	return
 
 Route111_MapScript1_14FFB9:: @ 814FFB9
@@ -40,10 +40,10 @@ Route111_EventScript_15000C:: @ 815000C
 	return
 
 Route111_EventScript_15000D:: @ 815000D
-	clearflag 768
-	setflag 769
-	setflag 770
-	setflag 771
+	clearflag FLAG_HIDE_VICTOR_WINSTRATE
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
 	cleartrainerflag OPPONENT_VICTOR
 	cleartrainerflag OPPONENT_VICTORIA
 	cleartrainerflag OPPONENT_VIVI
@@ -54,10 +54,10 @@ Route111_EventScript_150023:: @ 8150023
 	msgbox Route111_Text_16FA54, 5
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_15005F
-	giveitem ITEM_ROOT_FOSSIL
+	giveitem_std ITEM_ROOT_FOSSIL
 	closemessage
-	setflag 963
-	setflag 964
+	setflag FLAG_HIDE_ROOT_FOSSIL
+	setflag FLAG_HIDE_CLAW_FOSSIL
 	removeobject 34
 	delay 30
 	applymovement 35, Route111_Movement_1500AF
@@ -76,10 +76,10 @@ Route111_EventScript_150069:: @ 8150069
 	msgbox Route111_Text_16FAED, 5
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1500A5
-	giveitem ITEM_CLAW_FOSSIL
+	giveitem_std ITEM_CLAW_FOSSIL
 	closemessage
-	setflag 964
-	setflag 963
+	setflag FLAG_HIDE_CLAW_FOSSIL
+	setflag FLAG_HIDE_ROOT_FOSSIL
 	removeobject 35
 	delay 30
 	applymovement 34, Route111_Movement_1500AF
@@ -121,13 +121,13 @@ Route111_EventScript_1500C5:: @ 81500C5
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2252
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
 	goto_if_eq Route111_EventScript_150100
 	msgbox Route111_Text_1C56F0, 4
-	giveitem ITEM_RAZZ_BERRY
+	giveitem_std ITEM_RAZZ_BERRY
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1A029B
-	setflag 2252
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
 	special GetPlayerBigGuyGirlString
 	msgbox Route111_Text_1C5781, 4
 	release
@@ -236,7 +236,7 @@ Route111_EventScript_1501C9:: @ 81501C9
 Route111_EventScript_1501D1:: @ 81501D1
 	lock
 	faceplayer
-	setflag 2115
+	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
 	msgbox Route111_Text_16F705, 5
 	compare RESULT, 1
 	goto_if_eq Route111_EventScript_1501F3
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc
index 5576a44ff..c0fb6f489 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/scripts/maps/Route111_OldLadysRestStop.inc
@@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 815BFD1
 	.byte 0
 
 Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7
-	setflag 2113
+	setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
 	end
 
 Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
index d9a94ce75..981971e41 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
@@ -13,13 +13,13 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A
 	lock
 	faceplayer
 	setvar 0x8008, 3
-	checkflag 277
+	checkflag FLAG_RECEIVED_MACHO_BRACE
 	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72
 	msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4
-	giveitem ITEM_MACHO_BRACE
+	giveitem_std ITEM_MACHO_BRACE
 	compare RESULT, 0
 	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B
-	setflag 277
+	setflag FLAG_RECEIVED_MACHO_BRACE
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
@@ -40,10 +40,10 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95
 	lock
 	faceplayer
 	setvar 0x8008, 4
-	checkflag 4
+	checkflag FLAG_TEMP_4
 	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6
 	msgbox Route111_WinstrateFamilysHouse_Text_192219, 4
-	setflag 4
+	setflag FLAG_TEMP_4
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc
index 2eb34cdf3..37fd0ed3f 100644
--- a/data/scripts/maps/Route113.inc
+++ b/data/scripts/maps/Route113.inc
@@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81505CC
 	.byte 0
 
 Route113_MapScript1_1505D7:: @ 81505D7
-	tileeffect 1
+	setstepcallback 1
 	end
 
 Route113_MapScript1_1505DA:: @ 81505DA
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc
index d0b608339..8d853b88d 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
@@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A
 	.byte 0
 
 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550
-	setflag 2116
+	setflag FLAG_LANDMARK_GLASS_WORKSHOP
 	compare 0x40be, 1
 	call_if 1, Route113_GlassWorkshop_EventScript_16355F
 	end
@@ -22,7 +22,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565
 	compare 0x40be, 1
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635AB
 	msgbox Route113_GlassWorkshop_Text_19E4E6, 4
-	giveitem ITEM_SOOT_SACK
+	giveitem_std ITEM_SOOT_SACK
 	setvar 0x40be, 1
 	msgbox Route113_GlassWorkshop_Text_19E59B, 4
 	release
@@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE
 
 Route113_GlassWorkshop_EventScript_163660:: @ 8163660
 	setvar 0x8008, 39
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	setvar 0x800a, 250
 	compare 0x4048, 250
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
@@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660
 
 Route113_GlassWorkshop_EventScript_16369C:: @ 816369C
 	setvar 0x8008, 40
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	setvar 0x800a, 500
 	compare 0x4048, 500
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
@@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C
 
 Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8
 	setvar 0x8008, 41
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	setvar 0x800a, 500
 	compare 0x4048, 500
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
@@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8
 
 Route113_GlassWorkshop_EventScript_163714:: @ 8163714
 	setvar 0x8008, 43
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	setvar 0x800a, 1000
 	compare 0x4048, 1000
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
@@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714
 
 Route113_GlassWorkshop_EventScript_163750:: @ 8163750
 	setvar 0x8008, 42
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	setvar 0x800a, 1000
 	compare 0x4048, 1000
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
@@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750
 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C
 	setvar 0x8009, 1
 	setvar 0x8008, 13
-	getdecorname 0, 0x8008
+	bufferdecorationname 0, 0x8008
 	setvar 0x800a, 6000
 	compare 0x4048, 6000
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
@@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C
 Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD
 	setvar 0x8009, 1
 	setvar 0x8008, 6
-	getdecorname 0, 0x8008
+	bufferdecorationname 0, 0x8008
 	setvar 0x800a, 8000
 	compare 0x4048, 8000
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
@@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E
 Route113_GlassWorkshop_EventScript_163818:: @ 8163818
 	setvar 0x800a, 250
 	subvar 0x800a, 16456
-	getnumberstring 0, 32778
+	buffernumberstring 0, 32778
 	msgbox Route113_GlassWorkshop_Text_19E697, 4
 	release
 	end
 
 Route113_GlassWorkshop_EventScript_163830:: @ 8163830
 	subvar 0x800a, 16456
-	getnumberstring 1, 32778
+	buffernumberstring 1, 32778
 	message Route113_GlassWorkshop_Text_19E890
 	waitmessage
 	goto Route113_GlassWorkshop_EventScript_1635EE
@@ -210,13 +210,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851
 	end
 
 Route113_GlassWorkshop_EventScript_163889:: @ 8163889
-	giveitem 0x8008
+	giveitem_std 0x8008
 	compare RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_1638B4
 	return
 
 Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1
-	givedecoration 0x8008
+	givedecoration_std 0x8008
 	compare RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_1638C3
 	return
@@ -247,49 +247,49 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2
 Route113_GlassWorkshop_EventScript_163925:: @ 8163925
 	setvar 0x8009, 0
 	setvar 0x8008, 39
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	goto Route113_GlassWorkshop_EventScript_1639B1
 	end
 
 Route113_GlassWorkshop_EventScript_163939:: @ 8163939
 	setvar 0x8009, 0
 	setvar 0x8008, 40
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	goto Route113_GlassWorkshop_EventScript_1639B1
 	end
 
 Route113_GlassWorkshop_EventScript_16394D:: @ 816394D
 	setvar 0x8009, 0
 	setvar 0x8008, 41
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	goto Route113_GlassWorkshop_EventScript_1639B1
 	end
 
 Route113_GlassWorkshop_EventScript_163961:: @ 8163961
 	setvar 0x8009, 0
 	setvar 0x8008, 43
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	goto Route113_GlassWorkshop_EventScript_1639B1
 	end
 
 Route113_GlassWorkshop_EventScript_163975:: @ 8163975
 	setvar 0x8009, 0
 	setvar 0x8008, 42
-	getitemname 0, 0x8008
+	bufferitemname 0, 0x8008
 	goto Route113_GlassWorkshop_EventScript_1639B1
 	end
 
 Route113_GlassWorkshop_EventScript_163989:: @ 8163989
 	setvar 0x8009, 1
 	setvar 0x8008, 13
-	getdecorname 0, 13
+	bufferdecorationname 0, 13
 	goto Route113_GlassWorkshop_EventScript_1639B1
 	end
 
 Route113_GlassWorkshop_EventScript_16399D:: @ 816399D
 	setvar 0x8009, 1
 	setvar 0x8008, 6
-	getdecorname 0, 6
+	bufferdecorationname 0, 6
 	goto Route113_GlassWorkshop_EventScript_1639B1
 	end
 
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc
index 0730db23a..302c162b0 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/scripts/maps/Route114.inc
@@ -5,16 +5,16 @@ Route114_EventScript_150733:: @ 8150733
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2251
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114
 	goto_if_eq Route114_EventScript_150778
 	msgbox Route114_Text_1C5803, 4
 	random 5
 	addvar RESULT, 15
 	addvar RESULT, 133
-	giveitem RESULT
+	giveitem_std RESULT
 	compare RESULT, 0
 	goto_if_eq Route114_EventScript_1A029B
-	setflag 2251
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114
 	msgbox Route114_Text_1C5861, 4
 	release
 	end
@@ -27,13 +27,13 @@ Route114_EventScript_150778:: @ 8150778
 Route114_EventScript_150782:: @ 8150782
 	lock
 	faceplayer
-	checkflag 231
+	checkflag FLAG_RECEIVED_TM05
 	goto_if_eq Route114_EventScript_1507B9
 	msgbox Route114_Text_170154, 4
-	giveitem ITEM_TM05
+	giveitem_std ITEM_TM05
 	compare RESULT, 0
 	goto_if_eq Route114_EventScript_1A029B
-	setflag 231
+	setflag FLAG_RECEIVED_TM05
 	msgbox Route114_Text_1701C5, 4
 	release
 	end
@@ -47,9 +47,9 @@ Route114_EventScript_1507C3:: @ 81507C3
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_POOCHYENA, 2
+	playmoncry SPECIES_POOCHYENA, 2
 	msgbox Route114_Text_1701F9, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc
index b217f24c4..1a1445fde 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc
@@ -3,19 +3,19 @@ Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9
 	.byte 0
 
 Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF
-	setflag 2135
+	setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
 	end
 
 Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3
 	lock
 	faceplayer
-	checkflag 261
+	checkflag FLAG_RECEIVED_TM28
 	goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2
 	msgbox Route114_FossilManiacsHouse_Text_1925E1, 4
-	giveitem ITEM_TM28
+	giveitem_std ITEM_TM28
 	compare RESULT, 0
 	goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B
-	setflag 261
+	setflag FLAG_RECEIVED_TM28
 	release
 	end
 
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
index 13843f758..2ce9c1bfa 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
@@ -4,7 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E
 Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F
 	lock
 	faceplayer
-	checkflag 267
+	checkflag FLAG_RECEIVED_FOSSIL_MON
 	goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E
 	checkitem ITEM_ROOT_FOSSIL, 1
 	compare RESULT, 1
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc
index e4334647c..f8ff5de73 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/scripts/maps/Route114_LanettesHouse.inc
@@ -3,24 +3,24 @@ Route114_LanettesHouse_MapScripts:: @ 815C258
 	.byte 0
 
 Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E
-	setflag 2117
+	setflag FLAG_LANDMARK_LANETTES_HOUSE
 	end
 
 Route114_LanettesHouse_EventScript_15C262:: @ 815C262
 	lock
 	faceplayer
-	checkflag 131
+	checkflag FLAG_RECEIVED_DOLL_LANETTE
 	goto_if_eq Route114_LanettesHouse_EventScript_15C28F
-	setflag 2123
+	setflag FLAG_SYS_PC_LANETTE
 	msgbox Route114_LanettesHouse_Text_192A0D, 4
 	.ifdef SAPPHIRE
-	givedecoration 99
+	givedecoration_std DECOR_LOTAD_DOLL
 	.else
-	givedecoration 100
+	givedecoration_std DECOR_SEEDOT_DOLL
 	.endif
 	compare RESULT, 0
 	goto_if_eq Route114_LanettesHouse_EventScript_1A02AE
-	setflag 131
+	setflag FLAG_RECEIVED_DOLL_LANETTE
 	release
 	end
 
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index beb01e083..9aadedb32 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -3,7 +3,7 @@ Route116_MapScripts:: @ 8150A31
 	.byte 0
 
 Route116_MapScript1_150A37:: @ 8150A37
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	call_if 1, Route116_EventScript_150A41
 	end
 
@@ -14,9 +14,9 @@ Route116_EventScript_150A41:: @ 8150A41
 Route116_EventScript_150A49:: @ 8150A49
 	lock
 	faceplayer
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	goto_if_eq Route116_EventScript_150A67
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq Route116_EventScript_150A71
 	msgbox Route116_Text_1703CF, 4
 	release
@@ -35,15 +35,15 @@ Route116_EventScript_150A71:: @ 8150A71
 Route116_EventScript_150A7B:: @ 8150A7B
 	lock
 	faceplayer
-	checkflag 287
+	checkflag FLAG_MET_DEVON_EMPLOYEE
 	goto_if_eq Route116_EventScript_150B04
 	msgbox Route116_Text_1705AE, 4
 	goto Route116_EventScript_150A94
 	end
 
 Route116_EventScript_150A94:: @ 8150A94
-	setflag 287
-	giveitem ITEM_REPEAT_BALL
+	setflag FLAG_MET_DEVON_EMPLOYEE
+	giveitem_std ITEM_REPEAT_BALL
 	compare RESULT, 0
 	goto_if_eq Route116_EventScript_150B12
 	msgbox Route116_Text_1707B8, 4
@@ -57,8 +57,8 @@ Route116_EventScript_150A94:: @ 8150A94
 	compare FACING, 4
 	call_if 1, Route116_EventScript_150AF9
 	removeobject LAST_TALKED
-	clearflag 949
-	setflag 256
+	clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
+	setflag FLAG_RECEIVED_REPEAT_BALL
 	release
 	end
 
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc
index 10991c38c..24091c4ac 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc
@@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE
 	.byte 0
 
 Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4
-	setflag 2138
+	setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
 	end
 
 Route116_TunnelersRestHouse_EventScript_15C2E8:: @ 815C2E8
@@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1
 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA
 	lock
 	faceplayer
-	checkflag 199
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F
 	msgbox Route116_TunnelersRestHouse_Text_193135, 4
 	release
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc
index 40affd3fd..44c4c156c 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/scripts/maps/Route117.inc
@@ -7,7 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40
 	end
 
 Route117_EventScript_150D46:: @ 8150D46
-	checkflag 134
+	checkflag FLAG_PENDING_DAYCARE_EGG
 	goto_if 0, Route117_EventScript_150D56
 	setobjectxyperm 3, 47, 6
 
diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc
index 2a3ee79e1..9ad740b4e 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.inc
+++ b/data/scripts/maps/Route117_PokemonDayCare.inc
@@ -3,5 +3,5 @@ Route117_PokemonDayCare_MapScripts:: @ 815C319
 	.byte 0
 
 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F
-	setflag 2118
+	setflag FLAG_LANDMARK_POKEMON_DAYCARE
 	end
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index b96346f15..ca69e01c4 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -9,7 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E
 Route118_EventScript_150F34:: @ 8150F34
 	lock
 	faceplayer
-	checkflag 227
+	checkflag FLAG_RECEIVED_GOOD_ROD
 	goto_if_eq Route118_EventScript_150F89
 	msgbox Route118_Text_170F12, 5
 	compare RESULT, 1
@@ -20,8 +20,8 @@ Route118_EventScript_150F34:: @ 8150F34
 
 Route118_EventScript_150F5E:: @ 8150F5E
 	msgbox Route118_Text_170F46, 4
-	giveitem ITEM_GOOD_ROD
-	setflag 227
+	giveitem_std ITEM_GOOD_ROD
+	setflag FLAG_RECEIVED_GOOD_ROD
 	msgbox Route118_Text_170F7E, 4
 	release
 	end
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 2179a7e18..aff1254a9 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -4,7 +4,7 @@ Route119_MapScripts:: @ 8151167
 	.byte 0
 
 Route119_MapScript1_151172:: @ 8151172
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, Route119_EventScript_15117C
 	end
 
@@ -33,8 +33,8 @@ Route119_MapScript1_15119B:: @ 815119B
 	end
 
 Route119_EventScript_1511B9:: @ 81511B9
-	setflag 893
-	clearflag 892
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
 	setvar 0x40b3, 2
 	return
 
@@ -148,8 +148,8 @@ Route119_EventScript_151337:: @ 8151337
 	end
 
 Route119_EventScript_151352:: @ 8151352
-	giveitem ITEM_HM02
-	setflag 110
+	giveitem_std ITEM_HM02
+	setflag FLAG_RECEIVED_HM02
 	return
 
 Route119_EventScript_151362:: @ 8151362
diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc
index 42cc89068..76763c68e 100644
--- a/data/scripts/maps/Route119_House.inc
+++ b/data/scripts/maps/Route119_House.inc
@@ -9,8 +9,8 @@ Route119_House_EventScript_163DE7:: @ 8163DE7
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, 0
 	msgbox Route119_House_Text_19F406, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index ac64904a2..991725b8c 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
@@ -39,10 +39,10 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
 	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4
 	closemessage
 	setvar 0x40b3, 1
-	clearflag 893
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
 	fadedefaultbgm
 	fadescreen 1
-	setflag 890
+	setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
 	removeobject 1
 	removeobject 2
 	removeobject 3
@@ -55,15 +55,15 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
 
 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
 	msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4
-	countpokemon
+	getpartysize
 	compare RESULT, 6
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4
 	playfanfare 370
 	message Route119_WeatherInstitute_2F_Text_19F267
 	waitfanfare
 	waitmessage
-	givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
-	setflag 151
+	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	setflag FLAG_RECEIVED_CASTFORM
 	msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4
 	release
 	end
@@ -87,7 +87,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
 	lock
 	faceplayer
-	checkflag 151
+	checkflag FLAG_RECEIVED_CASTFORM
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE
 	goto Route119_WeatherInstitute_2F_EventScript_163D7A
 	end
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index 868d00324..cd84f95af 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -5,7 +5,7 @@ Route120_MapScripts:: @ 815160E
 	.byte 0
 
 Route120_MapScript1_15161E:: @ 815161E
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, Route120_EventScript_151628
 	end
 
@@ -50,24 +50,24 @@ Route120_EventScript_151682:: @ 8151682
 	return
 
 Route120_MapScript1_151686:: @ 8151686
-	checkflag 228
+	checkflag FLAG_REGI_DOORS_OPENED
 	call_if 0, Route120_EventScript_1516A2
-	checkflag 285
+	checkflag FLAG_RECEIVED_DEVON_SCOPE
 	call_if 1, Route120_EventScript_1516B5
-	checkflag 285
+	checkflag FLAG_RECEIVED_DEVON_SCOPE
 	call_if 0, Route120_EventScript_1516DA
 	end
 
 Route120_EventScript_1516A2:: @ 81516A2
-	setmaptile 7, 54, 124, 1
-	setmaptile 7, 55, 145, 1
+	setmetatile 7, 54, 124, 1
+	setmetatile 7, 55, 145, 1
 	return
 
 Route120_EventScript_1516B5:: @ 81516B5
-	setmaptile 13, 15, 663, 0
-	setmaptile 12, 16, 671, 0
-	setmaptile 12, 17, 161, 0
-	setmaptile 13, 17, 161, 0
+	setmetatile 13, 15, 663, 0
+	setmetatile 12, 16, 671, 0
+	setmetatile 12, 17, 161, 0
+	setmetatile 13, 17, 161, 0
 	return
 
 Route120_EventScript_1516DA:: @ 81516DA
@@ -113,7 +113,7 @@ Route120_EventScript_151739:: @ 8151739
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2254
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
 	goto_if_eq Route120_EventScript_151837
 	msgbox Route120_Text_1C58F1, 5
 	compare RESULT, 1
@@ -135,35 +135,35 @@ Route120_EventScript_151739:: @ 8151739
 	end
 
 Route120_EventScript_1517DC:: @ 81517DC
-	setvar 0x8004, 143
+	setvar 0x8004, ITEM_FIGY_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517E7:: @ 81517E7
-	setvar 0x8004, 144
+	setvar 0x8004, ITEM_WIKI_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517F2:: @ 81517F2
-	setvar 0x8004, 145
+	setvar 0x8004, ITEM_MAGO_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517FD:: @ 81517FD
-	setvar 0x8004, 146
+	setvar 0x8004, ITEM_AGUAV_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_151808:: @ 8151808
-	setvar 0x8004, 147
+	setvar 0x8004, ITEM_IAPAPA_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_151813:: @ 8151813
-	giveitem 0x8004
+	giveitem_std 0x8004
 	compare RESULT, 0
 	goto_if_eq Route120_EventScript_1A029B
-	setflag 2254
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
 	msgbox Route120_Text_1C5A0B, 4
 	release
 	end
@@ -184,7 +184,7 @@ Route120_EventScript_15184A:: @ 815184A
 Route120_EventScript_151853:: @ 8151853
 	lock
 	faceplayer
-	checkflag 290
+	checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
 	goto_if_eq Route120_EventScript_151884
 	msgbox Route120_Text_171827, 5
 	compare RESULT, 0
@@ -194,7 +194,7 @@ Route120_EventScript_151853:: @ 8151853
 
 Route120_EventScript_151877:: @ 8151877
 	msgbox Route120_Text_17193D, 4
-	setflag 290
+	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
 	release
 	end
 
@@ -222,14 +222,14 @@ Route120_EventScript_15189D:: @ 815189D
 	applymovement 30, Route120_Movement_1A0662
 	waitmovement 0
 	waitse
-	playpokecry SPECIES_KECLEON, 2
+	playmoncry SPECIES_KECLEON, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
 	setvar 0x8004, 0
-	setflag 2145
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	goto Route120_EventScript_151908
 	end
 
@@ -238,22 +238,22 @@ Route120_EventScript_151908:: @ 8151908
 	applymovement 255, Route120_Movement_1A0841
 	waitmovement 0
 	msgbox Route120_Text_171A40, 4
-	giveitem ITEM_DEVON_SCOPE
-	setflag 285
+	giveitem_std ITEM_DEVON_SCOPE
+	setflag FLAG_RECEIVED_DEVON_SCOPE
 	msgbox Route120_Text_171B0E, 4
 	closemessage
 	applymovement 31, Route120_Movement_1A0845
 	waitmovement 0
 	delay 50
-	setfieldeffect 0, 1
+	setfieldeffectargument 0, 1
 	dofieldeffect 30
 	delay 15
 	removeobject 31
 	waitfieldeffect 30
-	setmaptile 13, 15, 663, 0
-	setmaptile 12, 16, 671, 0
-	setmaptile 12, 17, 161, 0
-	setmaptile 13, 17, 161, 0
+	setmetatile 13, 15, 663, 0
+	setmetatile 12, 16, 671, 0
+	setmetatile 12, 17, 161, 0
+	setmetatile 13, 17, 161, 0
 	special DrawWholeMapView
 	release
 	end
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index 9f8753b76..431444dae 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
@@ -87,7 +87,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
 	end
 
 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425
-	countpokemon
+	getpartysize
 	compare RESULT, 6
 	goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F
 	specialvar RESULT, CheckFreePokemonStorageSpace
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc
index 14c5a2dba..adfebfe08 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/scripts/maps/Route123.inc
@@ -9,17 +9,17 @@ Route123_MapScript1_151C59:: @ 8151C59
 Route123_EventScript_151C5D:: @ 8151C5D
 	lock
 	faceplayer
-	checkflag 232
+	checkflag FLAG_RECEIVED_TM19
 	goto_if_eq Route123_EventScript_151CAC
 	msgbox Route123_Text_171D83, 4
 	special IsGrassTypeInParty
 	compare RESULT, 0
 	goto_if_eq Route123_EventScript_151CAA
 	msgbox Route123_Text_171DC2, 4
-	giveitem ITEM_TM19
+	giveitem_std ITEM_TM19
 	compare RESULT, 0
 	goto_if_eq Route123_EventScript_1A029B
-	setflag 232
+	setflag FLAG_RECEIVED_TM19
 	msgbox Route123_Text_171E34, 4
 	release
 	end
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc
index 64888759d..6948bff87 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/scripts/maps/Route123_BerryMastersHouse.inc
@@ -3,28 +3,28 @@ Route123_BerryMastersHouse_MapScripts:: @ 81639DF
 	.byte 0
 
 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5
-	setflag 2147
+	setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
 	end
 
 Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2253
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A
 	msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4
 	random 10
 	addvar RESULT, 20
 	addvar RESULT, 133
-	giveitem RESULT
+	giveitem_std RESULT
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 2253
+	setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER
 	msgbox Route123_BerryMastersHouse_Text_1C5C66, 4
 	random 10
 	addvar RESULT, 20
 	addvar RESULT, 133
-	giveitem RESULT
+	giveitem_std RESULT
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
 	msgbox Route123_BerryMastersHouse_Text_1C5C83, 4
@@ -40,7 +40,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2257
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163C13
 	msgbox Route123_BerryMastersHouse_Text_1C5D24, 4
 	setvar 0x8004, 13
@@ -77,8 +77,8 @@ Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD
 Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4
 	random 10
-	addvar RESULT, 133
-	giveitem RESULT
+	addvar RESULT, ITEM_CHERI_BERRY
+	giveitem_std RESULT
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
 	goto Route123_BerryMastersHouse_EventScript_163C1D
@@ -86,57 +86,57 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0
 	end
 
 Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E
-	checkflag 248
+	checkflag FLAG_RECEIVED_SPELON_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem ITEM_SPELON_BERRY
+	giveitem_std ITEM_SPELON_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 248
+	setflag FLAG_RECEIVED_SPELON_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F
-	checkflag 249
+	checkflag FLAG_RECEIVED_PAMTRE_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem ITEM_PAMTRE_BERRY
+	giveitem_std ITEM_PAMTRE_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 249
+	setflag FLAG_RECEIVED_PAMTRE_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80
-	checkflag 250
+	checkflag FLAG_RECEIVED_WATMEL_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem ITEM_WATMEL_BERRY
+	giveitem_std ITEM_WATMEL_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 250
+	setflag FLAG_RECEIVED_WATMEL_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1
-	checkflag 251
+	checkflag FLAG_RECEIVED_DURIN_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem ITEM_DURIN_BERRY
+	giveitem_std ITEM_DURIN_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 251
+	setflag FLAG_RECEIVED_DURIN_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2
-	checkflag 252
+	checkflag FLAG_RECEIVED_BELUE_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem ITEM_BELUE_BERRY
+	giveitem_std ITEM_BELUE_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 252
+	setflag FLAG_RECEIVED_BELUE_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
@@ -146,7 +146,7 @@ Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13
 	end
 
 Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D
-	setflag 2257
+	setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE
 	msgbox Route123_BerryMastersHouse_Text_1C5E59, 4
 	release
 	end
diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc
index ffe4cef97..3e062bfdc 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/scripts/maps/Route124.inc
@@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF
 	.byte 0
 
 Route124_MapScript1_151DE5:: @ 8151DE5
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route124_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
index 7421e94e0..4902d9f08 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
@@ -3,16 +3,16 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA
 	.byte 0
 
 Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00
-	setflag 2139
+	setflag FLAG_LANDMARK_HUNTERS_HOUSE
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04
 	lock
 	faceplayer
-	checkflag 217
+	checkflag FLAG_MET_DIVING_TREASURE_HUNTER
 	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20
 	msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4
-	setflag 217
+	setflag FLAG_MET_DIVING_TREASURE_HUNTER
 	goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E
 	end
 
@@ -244,8 +244,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283
 	goto Route124_DivingTreasureHuntersHouse_EventScript_164292
 
 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292
-	getitemname 0, 0x8008
-	getitemname 1, 0x8009
+	bufferitemname 0, 0x8008
+	bufferitemname 1, 0x8009
 	msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5
 	compare RESULT, 0
 	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F
@@ -259,8 +259,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3
-	removeitem 0x8008, 1
-	giveitem 0x8009
+	takeitem 0x8008, 1
+	giveitem_std 0x8009
 	msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4
 	call Route124_DivingTreasureHuntersHouse_EventScript_163E44
 	compare 0x4001, 0
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc
index 489a7314b..ea24434e2 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/scripts/maps/Route125.inc
@@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E
 	.byte 0
 
 Route125_MapScript1_151F24:: @ 8151F24
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route125_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc
index 729922681..a89087994 100644
--- a/data/scripts/maps/Route126.inc
+++ b/data/scripts/maps/Route126.inc
@@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE
 	.byte 0
 
 Route126_MapScript1_152004:: @ 8152004
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route126_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc
index 284d1fbd4..5fb122821 100644
--- a/data/scripts/maps/Route127.inc
+++ b/data/scripts/maps/Route127.inc
@@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A
 	.byte 0
 
 Route127_MapScript1_152070:: @ 8152070
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route127_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
index 615662fc1..a81e73c3e 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/scripts/maps/Route128.inc
@@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B
 	.byte 0
 
 Route128_MapScript1_152126:: @ 8152126
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route128_EventScript_1A02C1
 	call Route128_EventScript_1A0196
 	end
@@ -52,7 +52,7 @@ Route128_EventScript_15213F:: @ 815213F
 	removeobject 5
 	removeobject 4
 	delay 100
-	setfieldeffect 0, 1
+	setfieldeffectargument 0, 1
 	dofieldeffect 30
 	waitfieldeffect 30
 	addobject 3
@@ -77,7 +77,7 @@ Route128_EventScript_15213F:: @ 815213F
 	applymovement 3, Route128_Movement_1A0845
 	waitmovement 0
 	delay 50
-	setfieldeffect 0, 1
+	setfieldeffectargument 0, 1
 	dofieldeffect 30
 	delay 15
 	removeobject 3
diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc
index 69da29471..b0381969d 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/scripts/maps/Route130.inc
@@ -6,22 +6,22 @@ Route130_MapScript1_1523C8:: @ 81523C8
 	specialvar RESULT, IsMirageIslandPresent
 	compare RESULT, 1
 	goto_if_eq Route130_EventScript_15240C
-	setflag 17
-	setflag 18
-	setflag 19
-	setflag 20
-	setflag 21
-	setflag 22
-	setflag 23
-	setflag 24
-	setflag 25
-	setflag 26
-	setflag 27
-	setflag 28
-	setflag 29
-	setflag 30
-	setflag 31
-	setflag 32
+	setflag FLAG_TEMP_11
+	setflag FLAG_TEMP_12
+	setflag FLAG_TEMP_13
+	setflag FLAG_TEMP_14
+	setflag FLAG_TEMP_15
+	setflag FLAG_TEMP_16
+	setflag FLAG_TEMP_17
+	setflag FLAG_TEMP_18
+	setflag FLAG_TEMP_19
+	setflag FLAG_TEMP_1A
+	setflag FLAG_TEMP_1B
+	setflag FLAG_TEMP_1C
+	setflag FLAG_TEMP_1D
+	setflag FLAG_TEMP_1E
+	setflag FLAG_TEMP_1F
+	setflag FLAG_TEMP_20
 	setmaplayoutindex 264
 	end
 
diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc
index 50ad4222b..efa26ecd2 100644
--- a/data/scripts/maps/Route131.inc
+++ b/data/scripts/maps/Route131.inc
@@ -3,7 +3,7 @@ Route131_MapScripts:: @ 815243E
 	.byte 0
 
 Route131_MapScript1_152444:: @ 8152444
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 1, Route131_EventScript_15244E
 	end
 
diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
index 3be6be562..c45389b9f 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/scripts/maps/RustboroCity.inc
@@ -3,7 +3,7 @@ RustboroCity_MapScripts:: @ 814C372
 	.byte 0
 
 RustboroCity_MapScript1_14C378:: @ 814C378
-	setflag 2073
+	setflag FLAG_VISITED_RUSTBORO_CITY
 	call RustboroCity_EventScript_1A0196
 	call RustboroCity_EventScript_1A014E
 	end
@@ -11,7 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378
 RustboroCity_EventScript_14C386:: @ 814C386
 	lock
 	faceplayer
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq RustboroCity_EventScript_14C39B
 	msgbox RustboroCity_Text_16689D, 4
 	release
@@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1
 RustboroCity_EventScript_14C3BA:: @ 814C3BA
 	lock
 	faceplayer
-	checkflag 2055
+	checkflag FLAG_BADGE01_GET
 	goto_if_eq RustboroCity_EventScript_14C3CF
 	msgbox RustboroCity_Text_16696D, 4
 	release
@@ -50,7 +50,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF
 RustboroCity_EventScript_14C3D9:: @ 814C3D9
 	lock
 	faceplayer
-	checkflag 188
+	checkflag FLAG_RECEIVED_POKENAV
 	goto_if_eq RustboroCity_EventScript_14C3EE
 	msgbox RustboroCity_Text_166B86, 4
 	release
@@ -178,16 +178,16 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	waitmovement 0
 	removeobject 9
 	setobjectxyperm 9, 30, 10
-	clearflag 732
-	setflag 142
+	clearflag FLAG_HIDE_DEVON_RUSTBORO
+	setflag FLAG_DEVON_GOODS_STOLEN
 	setvar 0x405a, 2
 	setvar 0x409a, 2
 	setvar 0x406f, 1
-	clearflag 891
-	clearflag 880
-	clearflag 878
-	setflag 739
-	setflag 881
+	clearflag FLAG_HIDE_BRINEY_ROUTE116
+	clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	releaseall
 	end
 
@@ -326,7 +326,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7
 RustboroCity_EventScript_14C5FF:: @ 814C5FF
 	lock
 	faceplayer
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	goto_if_eq RustboroCity_EventScript_14C614
 	msgbox RustboroCity_Text_166F6B, 4
 	release
@@ -371,7 +371,7 @@ RustboroCity_EventScript_14C650:: @ 814C650
 	call_if 1, RustboroCity_EventScript_14C6E9
 	compare 0x4001, 3
 	call_if 1, RustboroCity_EventScript_14C715
-	setflag 159
+	setflag FLAG_UNKNOWN_9F
 	setvar 0x405a, 3
 	moveobjectoffscreen 9
 	msgbox RustboroCity_Text_166EA5, 4
@@ -468,13 +468,13 @@ RustboroCity_EventScript_14C77D:: @ 814C77D
 	compare 0x4001, 4
 	call_if 1, RustboroCity_EventScript_14C8B8
 	msgbox RustboroCity_Text_166FB4, 4
-	giveitem ITEM_GREAT_BALL
+	giveitem_std ITEM_GREAT_BALL
 	compare RESULT, 0
 	call_if 1, RustboroCity_EventScript_14C7F5
 	msgbox RustboroCity_Text_16707F, 4
 	closemessage
-	setflag 144
-	setflag 732
+	setflag FLAG_RETURNED_DEVON_GOODS
+	setflag FLAG_HIDE_DEVON_RUSTBORO
 	setvar 0x405a, 5
 	delay 30
 	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
@@ -549,7 +549,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8
 RustboroCity_EventScript_14C8DA:: @ 814C8DA
 	lock
 	faceplayer
-	checkflag 288
+	checkflag FLAG_MET_RIVAL_RUSTBORO
 	goto_if_eq RustboroCity_EventScript_14C917
 	checkplayergender
 	compare RESULT, 0
@@ -559,13 +559,13 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA
 	end
 
 RustboroCity_EventScript_14C8FD:: @ 814C8FD
-	setflag 288
+	setflag FLAG_MET_RIVAL_RUSTBORO
 	msgbox RustboroCity_Text_1670A7, 4
 	release
 	end
 
 RustboroCity_EventScript_14C90A:: @ 814C90A
-	setflag 288
+	setflag FLAG_MET_RIVAL_RUSTBORO
 	msgbox RustboroCity_Text_167213, 4
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc
index 3e98746f3..3371005c0 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.inc
+++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc
@@ -4,11 +4,11 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26
 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27
 	lock
 	faceplayer
-	checkflag 137
+	checkflag FLAG_RECEIVED_HM01
 	goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53
 	msgbox RustboroCity_CuttersHouse_Text_18509C, 4
-	giveitem ITEM_HM01
-	setflag 137
+	giveitem_std ITEM_HM01
+	setflag FLAG_RECEIVED_HM01
 	msgbox RustboroCity_CuttersHouse_Text_1851C9, 4
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
index 48d8aaf9f..f9e902763 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
@@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406
 	.byte 0
 
 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C
-	checkflag 144
+	checkflag FLAG_RETURNED_DEVON_GOODS
 	call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416
 	end
 
@@ -15,9 +15,9 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416
 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422
 	lock
 	faceplayer
-	checkflag 144
+	checkflag FLAG_RETURNED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440
 	msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4
 	release
@@ -36,11 +36,11 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A
 RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454
 	lock
 	faceplayer
-	checkflag 144
+	checkflag FLAG_RETURNED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485
 	msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4
 	release
@@ -59,11 +59,11 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485
 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F
 	lock
 	faceplayer
-	checkflag 144
+	checkflag FLAG_RETURNED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0
 	msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4
 	release
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
index f40c1b87b..89d59258d 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
@@ -25,7 +25,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
 	faceplayer
 	compare 0x40c4, 1
 	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
-	checkflag 287
+	checkflag FLAG_MET_DEVON_EMPLOYEE
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519
 	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
 	release
@@ -41,7 +41,7 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
 	faceplayer
 	compare 0x40c4, 1
 	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
-	checkflag 188
+	checkflag FLAG_RECEIVED_POKENAV
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543
 	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
 	release
@@ -88,9 +88,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
 	msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5
 	compare RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
-	getitemname 0, ITEM_ROOT_FOSSIL
+	bufferitemname 0, ITEM_ROOT_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	removeitem ITEM_ROOT_FOSSIL, 1
+	takeitem ITEM_ROOT_FOSSIL, 1
 	setvar 0x40c4, 1
 	setvar 0x40c5, 1
 	release
@@ -106,9 +106,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE
 	msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5
 	compare RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
-	getitemname 0, ITEM_CLAW_FOSSIL
+	bufferitemname 0, ITEM_CLAW_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	removeitem ITEM_CLAW_FOSSIL, 1
+	takeitem ITEM_CLAW_FOSSIL, 1
 	setvar 0x40c4, 1
 	setvar 0x40c5, 2
 	release
@@ -132,19 +132,19 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
-	getspeciesname 1, SPECIES_LILEEP
+	bufferspeciesname 1, SPECIES_LILEEP
 	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
-	countpokemon
+	getpartysize
 	compare RESULT, 6
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
 	copyvar 0x8004, RESULT
 	setvar 0x40c4, 0
-	setflag 267
+	setflag FLAG_RECEIVED_FOSSIL_MON
 	playfanfare 370
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
 	waitmessage
-	givepoke SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5
 	compare RESULT, 1
 	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678
@@ -152,19 +152,19 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
-	getspeciesname 1, SPECIES_ANORITH
+	bufferspeciesname 1, SPECIES_ANORITH
 	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
-	countpokemon
+	getpartysize
 	compare RESULT, 6
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
 	copyvar 0x8004, RESULT
 	setvar 0x40c4, 0
-	setflag 267
+	setflag FLAG_RECEIVED_FOSSIL_MON
 	playfanfare 370
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
 	waitmessage
-	givepoke SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5
 	compare RESULT, 1
 	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 6f0152e60..e2e70d4c0 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -48,22 +48,22 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835
 	waitmovement 0
 	msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4
-	giveitem ITEM_LETTER
+	giveitem_std ITEM_LETTER
 	msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4
 	playfanfare 370
 	message RustboroCity_DevonCorp_3F_Text_183422
 	waitfanfare
 	waitmessage
-	setflag 2050
-	setflag 188
+	setflag FLAG_SYS_POKENAV_GET
+	setflag FLAG_RECEIVED_POKENAV
 	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
-	setflag 894
-	clearflag 807
-	clearflag 983
-	clearflag 739
-	clearflag 881
+	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
+	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	setvar 0x4096, 1
-	clearflag 814
+	clearflag FLAG_HIDE_RIVAL_RUSTBORO
 	setvar 0x408f, 1
 	releaseall
 	end
@@ -146,9 +146,9 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
 	lock
 	faceplayer
-	checkflag 272
+	checkflag FLAG_RECEIVED_EXP_SHARE
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864
 	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
 	closemessage
@@ -159,10 +159,10 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
 
 RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
 	msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4
-	giveitem ITEM_EXP_SHARE
+	giveitem_std ITEM_EXP_SHARE
 	compare RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
-	setflag 272
+	setflag FLAG_RECEIVED_EXP_SHARE
 	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
 	closemessage
 	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
@@ -181,7 +181,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
 RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
 	lock
 	faceplayer
-	checkflag 256
+	checkflag FLAG_RECEIVED_REPEAT_BALL
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5
 	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
 	release
diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc
index b6b8b41b1..a6ba54ce7 100644
--- a/data/scripts/maps/RustboroCity_Flat2_1F.inc
+++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc
@@ -9,8 +9,8 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, 0
 	msgbox RustboroCity_Flat2_1F_Text_185410, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc
index 0dfec5cfa..3a2242c7a 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.inc
+++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc
@@ -8,13 +8,13 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97
 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0
 	lock
 	faceplayer
-	checkflag 213
+	checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO
 	goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF
 	msgbox RustboroCity_Flat2_2F_Text_185461, 4
-	giveitem ITEM_PREMIER_BALL
+	giveitem_std ITEM_PREMIER_BALL
 	compare RESULT, 0
 	goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B
-	setflag 213
+	setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO
 	release
 	end
 
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc
index b1bbfb8d8..0dc403ec7 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/scripts/maps/RustboroCity_Gym.inc
@@ -3,7 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8
 
 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9
 	trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE
-	checkflag 165
+	checkflag FLAG_RECEIVED_TM39
 	goto_if 0, RustboroCity_Gym_EventScript_15793C
 	msgbox RustboroCity_Gym_Text_184252, 4
 	release
@@ -14,8 +14,8 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	waitmessage
 	call RustboroCity_Gym_EventScript_1A02C5
 	msgbox RustboroCity_Gym_Text_1840D5, 4
-	setflag 1201
-	setflag 2055
+	setflag FLAG_DEFEATED_RUSTBORO_GYM
+	setflag FLAG_BADGE01_GET
 	setvar 0x405a, 1
 	addvar 0x4085, 1
 	setvar 0x8008, 1
@@ -26,10 +26,10 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	end
 
 RustboroCity_Gym_EventScript_15793C:: @ 815793C
-	giveitem ITEM_TM39
+	giveitem_std ITEM_TM39
 	compare RESULT, 0
 	goto_if_eq RustboroCity_Gym_EventScript_1A029B
-	setflag 165
+	setflag FLAG_RECEIVED_TM39
 	msgbox RustboroCity_Gym_Text_184170, 4
 	release
 	end
@@ -47,7 +47,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977
 RustboroCity_Gym_EventScript_15798E:: @ 815798E
 	lock
 	faceplayer
-	checkflag 1201
+	checkflag FLAG_DEFEATED_RUSTBORO_GYM
 	goto_if_eq RustboroCity_Gym_EventScript_1579A3
 	msgbox RustboroCity_Gym_Text_183A4B, 4
 	release
@@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3
 
 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD
 	lockall
-	checkflag 2055
+	checkflag FLAG_BADGE01_GET
 	goto_if_eq RustboroCity_Gym_EventScript_1579CD
 	goto RustboroCity_Gym_EventScript_1579D7
 	end
 
 RustboroCity_Gym_EventScript_1579BD:: @ 81579BD
 	lockall
-	checkflag 2055
+	checkflag FLAG_BADGE01_GET
 	goto_if_eq RustboroCity_Gym_EventScript_1579CD
 	goto RustboroCity_Gym_EventScript_1579D7
 	end
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc
index b983617e0..0cad33204 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/scripts/maps/RustboroCity_House1.inc
@@ -4,7 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C
 RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
 	lock
 	faceplayer
-	checkflag 153
+	checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
 	goto_if_eq RustboroCity_House1_EventScript_157D13
 	setvar 0x8008, 0
 	copyvar 0x8004, 0x8008
@@ -29,7 +29,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
 	special sub_804E174
 	waitstate
 	msgbox RustboroCity_House1_Text_184F6B, 4
-	setflag 153
+	setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
 	release
 	end
 
@@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB
 	end
 
 RustboroCity_House1_EventScript_157D05:: @ 8157D05
-	getspeciesname 0, 0x8009
+	bufferspeciesname 0, 0x8009
 	msgbox RustboroCity_House1_Text_184F8F, 4
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc
index a5088175e..86d77c18e 100644
--- a/data/scripts/maps/RustboroCity_House3.inc
+++ b/data/scripts/maps/RustboroCity_House3.inc
@@ -13,8 +13,8 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_PIKACHU, 0
+	playmoncry SPECIES_PIKACHU, 0
 	msgbox RustboroCity_House3_Text_18567D, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc
index cb722a6af..69f977e79 100644
--- a/data/scripts/maps/RustboroCity_Mart.inc
+++ b/data/scripts/maps/RustboroCity_Mart.inc
@@ -6,9 +6,9 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4
 	faceplayer
 	message RustboroCity_Mart_Text_1A0BE4
 	waitmessage
-	checkflag 287
+	checkflag FLAG_MET_DEVON_EMPLOYEE
 	goto_if 0, RustboroCity_Mart_EventScript_157BEF
-	checkflag 287
+	checkflag FLAG_MET_DEVON_EMPLOYEE
 	goto_if_eq RustboroCity_Mart_EventScript_157C18
 	end
 
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
index 53b481832..a1c0ac31b 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79
 	.byte 0
 
 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F
-	sethealplace 6
+	setrespawn 6
 	call RustboroCity_PokemonCenter_1F_EventScript_19FD1B
 	end
 
@@ -11,7 +11,7 @@ RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88
 	setvar 0x800b, 1
 	call RustboroCity_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc
index 73b364f5e..21fdf3d3b 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc
@@ -77,20 +77,20 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5
 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
 	lock
 	faceplayer
-	checkflag 275
+	checkflag FLAG_RECEIVED_QUICK_CLAW
 	goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34
 	compare FACING, 4
 	call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E
 	compare FACING, 3
 	call_if 1, RustboroCity_PokemonSchool_EventScript_157B29
 	msgbox RustboroCity_PokemonSchool_Text_1846A2, 4
-	giveitem ITEM_QUICK_CLAW
+	giveitem_std ITEM_QUICK_CLAW
 	compare RESULT, 0
 	goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B
 	closemessage
 	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
 	waitmovement 0
-	setflag 275
+	setflag FLAG_RECEIVED_QUICK_CLAW
 	release
 	end
 
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
index 28f6f0ad4..64fce8118 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -32,9 +32,9 @@ RusturfTunnel_EventScript_15C782:: @ 815C782
 RusturfTunnel_EventScript_15C799:: @ 815C799
 	lock
 	faceplayer
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq RusturfTunnel_EventScript_15C7BC
-	setflag 1
+	setflag FLAG_TEMP_1
 	msgbox RusturfTunnel_Text_1944C5, 4
 	closemessage
 	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
@@ -64,8 +64,8 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	call_if 1, RusturfTunnel_EventScript_15C8EB
 	compare 0x4001, 3
 	call_if 1, RusturfTunnel_EventScript_15C8EB
-	giveitem ITEM_HM04
-	setflag 106
+	giveitem_std ITEM_HM04
+	setflag FLAG_RECEIVED_HM04
 	msgbox RusturfTunnel_Text_194693, 4
 	closemessage
 	compare 0x4001, 1
@@ -300,9 +300,9 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, 0
 	msgbox RusturfTunnel_Text_194188, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
@@ -313,7 +313,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	msgbox RusturfTunnel_Text_19419B, 4
 	trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
 	msgbox RusturfTunnel_Text_194274, 4
-	giveitem ITEM_DEVON_GOODS
+	giveitem_std ITEM_DEVON_GOODS
 	closemessage
 	applymovement 255, RusturfTunnel_Movement_15CA99
 	applymovement 6, RusturfTunnel_Movement_15CAA2
@@ -332,20 +332,20 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	message RusturfTunnel_Text_19434F
 	waitmessage
 	waitse
-	playpokecry SPECIES_WINGULL, 0
-	waitbutton
-	waitpokecry
+	playmoncry SPECIES_WINGULL, 0
+	waitbuttonpress
+	waitmoncry
 	closemessage
 	applymovement 5, RusturfTunnel_Movement_15CAB4
 	applymovement 7, RusturfTunnel_Movement_15CAC3
 	waitmovement 0
 	removeobject 5
 	removeobject 7
-	clearflag 142
-	setflag 143
+	clearflag FLAG_DEVON_GOODS_STOLEN
+	setflag FLAG_RECOVERED_DEVON_GOODS
 	setvar 0x405a, 4
 	setvar 0x4090, 1
-	setflag 891
+	setflag FLAG_HIDE_BRINEY_ROUTE116
 	release
 	end
 
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
index 59ab89112..8e9a404a2 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/scripts/maps/SSTidalCorridor.inc
@@ -88,9 +88,9 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, 0
 	msgbox SSTidalCorridor_Text_199388, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
@@ -122,9 +122,9 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6
 	end
 
 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
-	sethealplace 8
+	setrespawn 8
 	msgbox SSTidalCorridor_Text_1991F4, 4
-	checkflag 260
+	checkflag FLAG_RECEIVED_TM49
 	call_if 1, SSTidalCorridor_EventScript_15FE36
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
@@ -132,9 +132,9 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 	end
 
 SSTidalCorridor_EventScript_15FE17:: @ 815FE17
-	sethealplace 4
+	setrespawn 4
 	msgbox SSTidalCorridor_Text_1991F4, 4
-	checkflag 260
+	checkflag FLAG_RECEIVED_TM49
 	call_if 1, SSTidalCorridor_EventScript_15FE36
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
@@ -142,7 +142,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17
 	end
 
 SSTidalCorridor_EventScript_15FE36:: @ 815FE36
-	setflag 951
+	setflag FLAG_HIDE_TM_49_GIVER_SS_TIDAL
 	return
 
 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A
@@ -163,7 +163,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B
 SSTidalCorridor_EventScript_15FE60:: @ 815FE60
 	lock
 	faceplayer
-	checkflag 247
+	checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
 	goto_if_eq SSTidalCorridor_EventScript_15FE7A
 	call SSTidalCorridor_EventScript_15FE84
 	msgbox SSTidalCorridor_Text_199203, 4
@@ -192,7 +192,7 @@ SSTidalCorridor_EventScript_15FE84:: @ 815FE84
 	goto_if 0, SSTidalCorridor_EventScript_15FED5
 	checktrainerflag OPPONENT_ANETTE
 	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	setflag 247
+	setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
 	goto SSTidalCorridor_EventScript_15FE7A
 	return
 
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc
index c7cd4447d..0390177de 100644
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/scripts/maps/SSTidalRooms.inc
@@ -4,13 +4,13 @@ SSTidalRooms_MapScripts:: @ 815FF05
 SSTidalRooms_EventScript_15FF06:: @ 815FF06
 	lock
 	faceplayer
-	checkflag 260
+	checkflag FLAG_RECEIVED_TM49
 	goto_if_eq SSTidalRooms_EventScript_15FF3D
 	msgbox SSTidalRooms_Text_199B65, 4
-	giveitem ITEM_TM49
+	giveitem_std ITEM_TM49
 	compare RESULT, 0
 	goto_if_eq SSTidalRooms_EventScript_1A029B
-	setflag 260
+	setflag FLAG_RECEIVED_TM49
 	msgbox SSTidalRooms_Text_199C1A, 4
 	release
 	end
diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc
index 112289083..f0ed9c005 100644
--- a/data/scripts/maps/ScorchedSlab.inc
+++ b/data/scripts/maps/ScorchedSlab.inc
@@ -3,5 +3,5 @@ ScorchedSlab_MapScripts:: @ 815F29D
 	.byte 0
 
 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3
-	setflag 2136
+	setflag FLAG_LANDMARK_SCORCHED_SLAB
 	end
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index 26cb2321a..b31e8fc25 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -79,9 +79,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	setvar RESULT, 0
 	.endif
 	playse 209
-	setfieldeffect 0, 16
-	setfieldeffect 1, 42
-	setfieldeffect 2, 0
+	setfieldeffectargument 0, 16
+	setfieldeffectargument 1, 42
+	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	waitfieldeffect 54
 	.ifdef SAPPHIRE
@@ -192,24 +192,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4
 	.endif
 	setvar 0x407b, 1
-	clearflag 855
-	clearflag 856
-	clearflag 816
-	clearflag 973
+	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS
 	setvar 0x405e, 1
-	clearflag 944
-	clearflag 945
-	setflag 2090
-	setflag 854
-	setflag 129
-	setflag 967
+	clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_SYS_WEATHER_CTRL
+	setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE
 	setvar 0x40c6, 1
 	setvar 0x40a2, 1
-	setflag 828
-	setflag 829
-	setflag 831
-	setflag 859
-	setflag 946
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
 	warp MAP_ROUTE128, 255, 38, 22
 	waitstate
 	releaseall
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc
index 526ada367..cd778202c 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/scripts/maps/SealedChamber_InnerRoom.inc
@@ -4,9 +4,9 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7
 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_1C53C1
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
-	checkflag 228
+	checkflag FLAG_REGI_DOORS_OPENED
 	goto_if_eq SealedChamber_InnerRoom_EventScript_15F247
 	specialvar RESULT, CheckRelicanthWailord
 	compare RESULT, 0
@@ -31,7 +31,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
 	msgbox SealedChamber_InnerRoom_Text_1A138B, 4
 	closemessage
 	fadeinbgm 0
-	setflag 228
+	setflag FLAG_REGI_DOORS_OPENED
 	releaseall
 	end
 
@@ -42,7 +42,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247
 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_1C53F2
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -50,7 +50,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249
 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_1C5414
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -58,7 +58,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257
 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_1C5435
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -66,7 +66,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265
 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_1C545C
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -74,7 +74,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273
 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_1C5470
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -82,7 +82,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281
 SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_1C549B
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc
index 5ff94be19..ad17819c2 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
@@ -10,27 +10,27 @@ SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6
 	end
 
 SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7
-	setflag 2140
+	setflag FLAG_LANDMARK_SEALED_CHAMBER
 	end
 
 SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB
-	checkflag 2127
+	checkflag FLAG_SYS_BRAILLE_DIG
 	call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5
 	end
 
 SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5
-	setmaptile 9, 1, 553, 1
-	setmaptile 10, 1, 553, 1
-	setmaptile 11, 1, 553, 1
-	setmaptile 9, 2, 565, 1
-	setmaptile 10, 2, 565, 1
-	setmaptile 11, 2, 565, 1
+	setmetatile 9, 1, 553, 1
+	setmetatile 10, 1, 553, 1
+	setmetatile 11, 1, 553, 1
+	setmetatile 9, 2, 565, 1
+	setmetatile 10, 2, 565, 1
+	setmetatile 11, 2, 565, 1
 	return
 
 SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C534F
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -38,7 +38,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C
 SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C5359
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -46,7 +46,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A
 SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C5363
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -54,7 +54,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148
 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C536D
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -62,7 +62,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156
 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C5377
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -70,7 +70,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164
 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C5381
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -78,7 +78,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172
 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C538B
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -86,7 +86,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180
 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C5396
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -94,7 +94,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E
 SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C539E
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -102,17 +102,17 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C
 SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C53A9
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8
 	lockall
-	checkflag 2127
+	checkflag FLAG_SYS_BRAILLE_DIG
 	goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF
 	braillemessage SealedChamber_OuterRoom_Braille_1C53B1
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -125,7 +125,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF
 SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_1C53B1
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc
index 302bc3930..f72c3d76e 100644
--- a/data/scripts/maps/SecretBase_YellowCave4.inc
+++ b/data/scripts/maps/SecretBase_YellowCave4.inc
@@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 815F337
 	.byte 0
 
 SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C
-	tileeffect 6
+	setstepcallback 6
 	end
 
 SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 52d430db5..533c46850 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
@@ -4,7 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057
 
 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D
 	special UpdateShoalTideFlag
-	checkflag 2106
+	checkflag FLAG_SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E
 	goto ShoalCave_LowTideEntranceRoom_EventScript_15E072
 
@@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2143
+	checkflag FLAG_SYS_SHOAL_ITEM
 	call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176
 	checkitem ITEM_SHOAL_SALT, 4
 	compare RESULT, 0
@@ -37,13 +37,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
 	compare RESULT, 2
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E
 	msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4
-	removeitem ITEM_SHOAL_SALT, 4
-	removeitem ITEM_SHOAL_SHELL, 4
-	giveitem ITEM_SHELL_BELL
+	takeitem ITEM_SHOAL_SALT, 4
+	takeitem ITEM_SHOAL_SHELL, 4
+	giveitem_std ITEM_SHELL_BELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B
 	msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4
-	setflag 2
+	setflag FLAG_TEMP_2
 	release
 	end
 
@@ -90,13 +90,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E16C:: @ 815E16C
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176
-	clearflag 952
-	clearflag 953
-	clearflag 954
-	clearflag 955
-	clearflag 956
-	clearflag 957
-	clearflag 958
-	clearflag 959
-	clearflag 2143
+	clearflag FLAG_HIDE_TOOK_SHOAL_SALT_1
+	clearflag FLAG_HIDE_TOOK_SHOAL_SALT_2
+	clearflag FLAG_HIDE_TOOK_SHOAL_SALT_3
+	clearflag FLAG_HIDE_TOOK_SHOAL_SALT_4
+	clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
+	clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
+	clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
+	clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
+	clearflag FLAG_SYS_SHOAL_ITEM
 	return
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index ada997023..b6aba9523 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
@@ -4,7 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192
 	.byte 0
 
 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D
-	checkflag 2106
+	checkflag FLAG_SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF
 
@@ -21,48 +21,48 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9
-	checkflag 952
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
-	checkflag 2106
+	checkflag FLAG_SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
-	setmaptile 31, 8, 856, 1
+	setmetatile 31, 8, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA
-	checkflag 953
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
-	checkflag 2106
+	checkflag FLAG_SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
-	setmaptile 14, 26, 856, 1
+	setmetatile 14, 26, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB
-	checkflag 956
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213
-	setmaptile 41, 20, 857, 1
+	setmetatile 41, 20, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E213
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213
-	checkflag 957
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B
-	setmaptile 41, 10, 857, 1
+	setmetatile 41, 10, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E22B
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B
-	checkflag 958
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243
-	setmaptile 6, 9, 857, 1
+	setmetatile 6, 9, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E243
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243
-	checkflag 959
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256
-	setmaptile 16, 13, 857, 1
+	setmetatile 16, 13, 857, 1
 	return
 
 ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256
@@ -70,14 +70,14 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256
 
 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257
 	lockall
-	checkflag 956
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
-	giveitem ITEM_SHOAL_SHELL
+	giveitem_std ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
-	setmaptile 41, 20, 859, 0
+	setmetatile 41, 20, 859, 0
 	special DrawWholeMapView
-	setflag 956
+	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
 	releaseall
 	end
 
@@ -88,53 +88,53 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289
 
 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
 	lockall
-	checkflag 957
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
-	giveitem ITEM_SHOAL_SHELL
+	giveitem_std ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
-	setmaptile 41, 10, 859, 0
+	setmetatile 41, 10, 859, 0
 	special DrawWholeMapView
-	setflag 957
+	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
 	lockall
-	checkflag 958
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
-	giveitem ITEM_SHOAL_SHELL
+	giveitem_std ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
-	setmaptile 6, 9, 859, 0
+	setmetatile 6, 9, 859, 0
 	special DrawWholeMapView
-	setflag 958
+	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
 	lockall
-	checkflag 959
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
-	giveitem ITEM_SHOAL_SHELL
+	giveitem_std ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
-	setmaptile 16, 13, 859, 0
+	setmetatile 16, 13, 859, 0
 	special DrawWholeMapView
-	setflag 959
+	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329
 	lockall
-	checkflag 952
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B
-	giveitem ITEM_SHOAL_SALT
+	giveitem_std ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
-	setmaptile 31, 8, 858, 0
+	setmetatile 31, 8, 858, 0
 	special DrawWholeMapView
-	setflag 952
+	setflag FLAG_HIDE_TOOK_SHOAL_SALT_1
 	releaseall
 	end
 
@@ -145,13 +145,13 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B
 
 ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365
 	lockall
-	checkflag 953
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B
-	giveitem ITEM_SHOAL_SALT
+	giveitem_std ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
-	setmaptile 14, 26, 858, 0
+	setmetatile 14, 26, 858, 0
 	special DrawWholeMapView
-	setflag 953
+	setflag FLAG_HIDE_TOOK_SHOAL_SALT_2
 	releaseall
 	end
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
index db5779efe..c7cb08a9b 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
@@ -7,9 +7,9 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9
 	end
 
 ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF
-	checkflag 955
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412
-	setmaptile 18, 2, 856, 1
+	setmetatile 18, 2, 856, 1
 	return
 
 ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412
@@ -17,14 +17,14 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412
 
 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413
 	lockall
-	checkflag 955
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445
-	giveitem ITEM_SHOAL_SALT
+	giveitem_std ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B
-	setmaptile 18, 2, 858, 0
+	setmetatile 18, 2, 858, 0
 	special DrawWholeMapView
-	setflag 955
+	setflag FLAG_HIDE_TOOK_SHOAL_SALT_4
 	releaseall
 	end
 
@@ -36,13 +36,13 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445
 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F
 	lock
 	faceplayer
-	checkflag 283
+	checkflag FLAG_RECEIVED_FOCUS_BAND
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E
 	msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4
-	giveitem ITEM_FOCUS_BAND
+	giveitem_std ITEM_FOCUS_BAND
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B
-	setflag 283
+	setflag FLAG_RECEIVED_FOCUS_BAND
 	release
 	end
 
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
index bffb7bd49..efcad59d3 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
@@ -7,9 +7,9 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3
-	checkflag 954
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3
 	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6
-	setmaptile 11, 11, 856, 1
+	setmetatile 11, 11, 856, 1
 	return
 
 ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6
@@ -17,14 +17,14 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6
 
 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7
 	lockall
-	checkflag 954
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3
 	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9
-	giveitem ITEM_SHOAL_SALT
+	giveitem_std ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B
-	setmaptile 11, 11, 858, 0
+	setmetatile 11, 11, 858, 0
 	special DrawWholeMapView
-	setflag 954
+	setflag FLAG_HIDE_TOOK_SHOAL_SALT_3
 	releaseall
 	end
 
diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc
index 3f388127b..bd87e8562 100644
--- a/data/scripts/maps/SkyPillar_2F.inc
+++ b/data/scripts/maps/SkyPillar_2F.inc
@@ -5,6 +5,6 @@ SkyPillar_2F_MapScripts:: @ 815F2C9
 	.byte 0
 
 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9
-	tileeffect 7
+	setstepcallback 7
 	setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0
 	end
diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc
index f0b9a6f85..860f35b48 100644
--- a/data/scripts/maps/SkyPillar_4F.inc
+++ b/data/scripts/maps/SkyPillar_4F.inc
@@ -5,6 +5,6 @@ SkyPillar_4F_MapScripts:: @ 815F2E5
 	.byte 0
 
 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5
-	tileeffect 7
+	setstepcallback 7
 	setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0
 	end
diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc
index 7a3927332..ab991d845 100644
--- a/data/scripts/maps/SkyPillar_Entrance.inc
+++ b/data/scripts/maps/SkyPillar_Entrance.inc
@@ -3,5 +3,5 @@ SkyPillar_Entrance_MapScripts:: @ 815F2BD
 	.byte 0
 
 SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3
-	setflag 2142
+	setflag FLAG_LANDMARK_SKY_PILLAR
 	end
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index 1dee6e9c4..07a78d2c4 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -3,7 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302
 	.byte 0
 
 SkyPillar_Top_MapScript1_15F308:: @ 815F308
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, SkyPillar_Top_EventScript_15F312
 	end
 
@@ -16,13 +16,13 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316
 	faceplayer
 	setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE
 	waitse
-	playpokecry SPECIES_RAYQUAZA, 2
+	playmoncry SPECIES_RAYQUAZA, 2
 	delay 40
-	waitpokecry
-	setflag 773
-	setflag 2145
+	waitmoncry
+	setflag FLAG_HIDE_RAYQUAZA
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRayquazaBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 600cfc959..56fc0e59b 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -17,9 +17,9 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C
 	end
 
 SlateportCity_EventScript_14BA5C:: @ 814BA5C
-	setflag 2071
+	setflag FLAG_VISITED_SLATEPORT_CITY
 	setvar 0x4086, 0
-	setflag 803
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
 	return
 
 SlateportCity_EventScript_14BA68:: @ 814BA68
@@ -64,7 +64,7 @@ SlateportCity_Items1:: @ 814BAD0
 SlateportCity_EventScript_14BAE0:: @ 814BAE0
 	lock
 	faceplayer
-	getfirstpartypokename 0
+	bufferleadmonspeciesname 0
 	msgbox SlateportCity_Text_164682, 4
 	specialvar RESULT, LeadMonHasEffortRibbon
 	compare RESULT, 1
@@ -125,7 +125,7 @@ SlateportCity_EventScript_14BB81:: @ 814BB81
 	faceplayer
 	compare 0x4058, 1
 	call_if 1, SlateportCity_EventScript_14BBA1
-	checkflag 96
+	checkflag FLAG_RECEIVED_SECRET_POWER
 	goto_if_eq SlateportCity_EventScript_14BBAB
 	msgbox SlateportCity_Text_164937, 4
 	release
@@ -182,7 +182,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A
 SlateportCity_EventScript_14BC14:: @ 814BC14
 	lock
 	faceplayer
-	checkflag 148
+	checkflag FLAG_DOCK_REJECTED_DEVON_GOODS
 	goto_if_eq SlateportCity_EventScript_14BC29
 	msgbox SlateportCity_Text_164BBF, 4
 	release
@@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33
 
 SlateportCity_EventScript_14BC3C:: @ 814BC3C
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_EventScript_14BC63
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq SlateportCity_EventScript_14BC59
 	msgbox SlateportCity_Text_1658A0, 4
 	releaseall
@@ -235,7 +235,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88
 
 SlateportCity_EventScript_14BC91:: @ 814BC91
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_EventScript_14BCA5
 	msgbox SlateportCity_Text_165A8B, 4
 	releaseall
@@ -388,7 +388,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2
 	faceplayer
 	message SlateportCity_Text_1A0BE4
 	waitmessage
-	pokemartdecor SlateportCity_Decorations1
+	pokemartdecoration SlateportCity_Decorations1
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
 	end
@@ -410,11 +410,11 @@ SlateportCity_EventScript_14BE16:: @ 814BE16
 SlateportCity_EventScript_14BE20:: @ 814BE20
 	lock
 	faceplayer
-	checkflag 96
+	checkflag FLAG_RECEIVED_SECRET_POWER
 	goto_if 0, SlateportCity_EventScript_14BE16
 	message SlateportCity_Text_1A0BE4
 	waitmessage
-	pokemartdecor SlateportCity_Decorations2
+	pokemartdecoration SlateportCity_Decorations2
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
 	end
@@ -442,11 +442,11 @@ SlateportCity_Decorations2:: @ 814BE40
 @ 814BE60
 	lock
 	faceplayer
-	checkflag 96
+	checkflag FLAG_RECEIVED_SECRET_POWER
 	goto_if 0, SlateportCity_EventScript_14BE16
 	message SlateportCity_Text_1A0BE4
 	waitmessage
-	pokemartdecor SlateportCity_Decorations3
+	pokemartdecoration SlateportCity_Decorations3
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
 	end
@@ -533,10 +533,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC
 	applymovement 255, SlateportCity_Movement_14C008
 	waitmovement 0
 	removeobject 11
-	clearflag 841
-	clearflag 848
-	clearflag 845
-	clearflag 846
+	clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
 	setvar 0x4058, 2
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
 	waitstate
diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc
index f8070f1a1..0a6f40c75 100644
--- a/data/scripts/maps/SlateportCity_ContestHall.inc
+++ b/data/scripts/maps/SlateportCity_ContestHall.inc
@@ -12,13 +12,13 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555
 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E
 	lock
 	faceplayer
-	checkflag 265
+	checkflag FLAG_RECEIVED_TM41
 	goto_if_eq SlateportCity_ContestHall_EventScript_155595
 	msgbox SlateportCity_ContestHall_Text_17CCE2, 4
-	giveitem ITEM_TM41
+	giveitem_std ITEM_TM41
 	compare RESULT, 0
 	goto_if_eq SlateportCity_ContestHall_EventScript_1A029B
-	setflag 265
+	setflag FLAG_RECEIVED_TM41
 	msgbox SlateportCity_ContestHall_Text_17CE28, 4
 	release
 	end
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc
index 85a8fe40e..c4a44d9c9 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
@@ -23,14 +23,14 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448
 	applymovement 1, SlateportCity_ContestLobby_Movement_1554CC
 	waitmovement 0
 	playse 71
-	setmaptile 4, 2, 545, 1
-	setmaptile 4, 3, 609, 1
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
 	special DrawWholeMapView
 	applymovement 1, SlateportCity_ContestLobby_Movement_1554CF
 	waitmovement 0
 	playse 71
-	setmaptile 4, 2, 721, 1
-	setmaptile 4, 3, 729, 1
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
 	special DrawWholeMapView
 	delay 20
 	applymovement 1, SlateportCity_ContestLobby_Movement_1554DC
@@ -101,13 +101,13 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0
 
 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9
 	lockall
-	checkflag 95
+	checkflag FLAG_RECEIVED_POKEBLOCK_CASE
 	goto_if_eq SlateportCity_ContestLobby_EventScript_155526
 	applymovement 7, SlateportCity_ContestLobby_Movement_1A0839
 	waitmovement 0
 	msgbox SlateportCity_ContestLobby_Text_17CA67, 4
-	giveitem ITEM_POKEBLOCK_CASE
-	setflag 95
+	giveitem_std ITEM_POKEBLOCK_CASE
+	setflag FLAG_RECEIVED_POKEBLOCK_CASE
 	releaseall
 	end
 
@@ -129,7 +129,7 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536
 @ 815553F
 	lockall
 	special ShowBerryBlenderRecordWindow
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index 34d927753..304013b08 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -7,19 +7,19 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
 	setvar 0x4001, 0
 	compare 0x40a0, 1
 	call_if 1, SlateportCity_Harbor_EventScript_155F89
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 1, SlateportCity_Harbor_EventScript_155F85
 	end
 
 SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
-	clearflag 860
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
 	return
 
 SlateportCity_Harbor_EventScript_155F89:: @ 8155F89
 	savebgm BGM_EVIL_TEAM
 	setobjectxyperm 4, 12, 13
 	setobjectmovementtype 4, 9
-	setflag 905
+	setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
 	return
 
 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B
@@ -73,8 +73,8 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
 	call_if 1, SlateportCity_Harbor_EventScript_156086
 	msgbox SlateportCity_Harbor_Text_17FE60, 4
 	closemessage
-	setflag 821
-	setflag 822
+	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
+	setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
 	moveobjectoffscreen 4
 	setobjectmovementtype 4, 10
 	releaseall
@@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
 	lock
 	faceplayer
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_Harbor_EventScript_1560D9
 	msgbox SlateportCity_Harbor_Text_17FA0A, 4
 	release
@@ -222,13 +222,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196
 	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841
 	waitmovement 0
 	delay 30
-	hideobject LAST_TALKED, 9, 8
+	hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
 	compare FACING, 2
 	call_if 1, SlateportCity_Harbor_EventScript_1561EF
 	compare FACING, 4
 	call_if 1, SlateportCity_Harbor_EventScript_1561E4
 	delay 30
-	hideobject 255, 0, 0
+	hideobjectat 255, MAP_PETALBURG_CITY
 	setvar 0x8004, 5
 	call SlateportCity_Harbor_EventScript_1A040E
 	return
@@ -268,11 +268,11 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208
 SlateportCity_Harbor_EventScript_156211:: @ 8156211
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq SlateportCity_Harbor_EventScript_15626F
-	checkflag 271
+	checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
 	goto_if_eq SlateportCity_Harbor_EventScript_156265
-	checkflag 112
+	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	goto_if_eq SlateportCity_Harbor_EventScript_156258
 	compare 0x40a0, 2
 	goto_if_eq SlateportCity_Harbor_EventScript_15624E
@@ -289,7 +289,7 @@ SlateportCity_Harbor_EventScript_15624E:: @ 815624E
 	end
 
 SlateportCity_Harbor_EventScript_156258:: @ 8156258
-	setflag 271
+	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
 	msgbox SlateportCity_Harbor_Text_17FF35, 4
 	release
 	end
@@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F
 	checkitem ITEM_SCANNER, 1
 	compare RESULT, 1
 	goto_if_eq SlateportCity_Harbor_EventScript_1562A7
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_Harbor_EventScript_15629D
 	msgbox SlateportCity_Harbor_Text_18017B, 4
 	release
@@ -335,12 +335,12 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA
 	msgbox SlateportCity_Harbor_Text_1803DD, 5
 	compare RESULT, 0
 	goto_if_eq SlateportCity_Harbor_EventScript_156374
-	giveitem ITEM_DEEP_SEA_TOOTH
+	giveitem_std ITEM_DEEP_SEA_TOOTH
 	compare RESULT, 0
 	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
-	removeitem ITEM_SCANNER, 1
+	takeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag 294
+	setflag FLAG_EXCHANGED_SCANNER
 	goto SlateportCity_Harbor_EventScript_156380
 	end
 
@@ -348,12 +348,12 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A
 	msgbox SlateportCity_Harbor_Text_180412, 5
 	compare RESULT, 0
 	goto_if_eq SlateportCity_Harbor_EventScript_156374
-	giveitem ITEM_DEEP_SEA_SCALE
+	giveitem_std ITEM_DEEP_SEA_SCALE
 	compare RESULT, 0
 	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
-	removeitem ITEM_SCANNER, 1
+	takeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag 294
+	setflag FLAG_EXCHANGED_SCANNER
 	goto SlateportCity_Harbor_EventScript_156380
 	end
 
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 1ee8ff39b..9e002e61e 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -57,7 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4
 	closemessage
@@ -164,10 +164,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
 	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4
-	giveitem ITEM_TM46
+	giveitem_std ITEM_TM46
 	compare RESULT, 0
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2
-	setflag 269
+	setflag FLAG_RECEIVED_TM46
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4
 	closemessage
 	compare FACING, 2
@@ -179,7 +179,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
 SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98
 	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3
 	waitmovement 0
-	setflag 965
+	setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
 	playse 9
 	removeobject 13
 	release
@@ -188,7 +188,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98
 SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD
 	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC
 	waitmovement 0
-	setflag 965
+	setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
 	playse 9
 	removeobject 13
 	release
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
index e379c633d..7fcd0fff1 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
@@ -74,7 +74,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	removeobject 4
 	fadescreen 0
 	delay 30
-	setflag 883
+	setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
 	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4
@@ -86,10 +86,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	waitmovement 0
 	playse 9
 	removeobject 1
-	setflag 900
-	setflag 149
-	clearflag 947
-	setflag 949
+	setflag FLAG_HIDE_EVIL_TEAM_ROUTE110
+	setflag FLAG_DELIVERED_DEVON_GOODS
+	clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
 	release
 	end
 
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
index 9aa326f70..ac4e8f240 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF
 	.byte 0
 
 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5
-	sethealplace 4
+	setrespawn 4
 	call SlateportCity_PokemonCenter_1F_EventScript_19FD1B
 	end
 
@@ -11,7 +11,7 @@ SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE
 	setvar 0x800b, 1
 	call SlateportCity_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
index 4195ad43a..593e18fee 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
@@ -23,15 +23,15 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795
 
 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8
 	setvar 0x4002, 0
-	checkflag 204
+	checkflag FLAG_RECEIVED_YELLOW_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag 203
+	checkflag FLAG_RECEIVED_GREEN_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag 202
+	checkflag FLAG_RECEIVED_PINK_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag 201
+	checkflag FLAG_RECEIVED_BLUE_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag 200
+	checkflag FLAG_RECEIVED_RED_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
 	compare 0x4002, 5
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D
@@ -49,17 +49,17 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE
 SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808
 	msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4
 	setvar 0x4001, 0
-	checkflag 204
+	checkflag FLAG_RECEIVED_YELLOW_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE
-	checkflag 203
+	checkflag FLAG_RECEIVED_GREEN_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7
-	checkflag 202
+	checkflag FLAG_RECEIVED_PINK_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0
-	checkflag 201
+	checkflag FLAG_RECEIVED_BLUE_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9
-	checkflag 200
+	checkflag FLAG_RECEIVED_RED_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2
-	getfirstpartypokename 0
+	bufferleadmonspeciesname 0
 	switch 0x4001
 	case 0, SlateportCity_PokemonFanClub_EventScript_155899
 	case 1, SlateportCity_PokemonFanClub_EventScript_1558A3
@@ -88,8 +88,8 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 200
-	giveitem ITEM_RED_SCARF
+	setflag FLAG_RECEIVED_RED_SCARF
+	giveitem_std ITEM_RED_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4
 	release
 	end
@@ -99,8 +99,8 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 201
-	giveitem ITEM_BLUE_SCARF
+	setflag FLAG_RECEIVED_BLUE_SCARF
+	giveitem_std ITEM_BLUE_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4
 	release
 	end
@@ -110,8 +110,8 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 202
-	giveitem ITEM_PINK_SCARF
+	setflag FLAG_RECEIVED_PINK_SCARF
+	giveitem_std ITEM_PINK_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4
 	release
 	end
@@ -121,8 +121,8 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 203
-	giveitem ITEM_GREEN_SCARF
+	setflag FLAG_RECEIVED_GREEN_SCARF
+	giveitem_std ITEM_GREEN_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4
 	release
 	end
@@ -132,8 +132,8 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 204
-	giveitem ITEM_YELLOW_SCARF
+	setflag FLAG_RECEIVED_YELLOW_SCARF
+	giveitem_std ITEM_YELLOW_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4
 	release
 	end
@@ -196,7 +196,7 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F
 SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15
 	lock
 	faceplayer
-	checkflag 278
+	checkflag FLAG_RECEIVED_SOOTHE_BELL
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75
 	msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4
 	specialvar RESULT, GetLeadMonFriendshipScore
@@ -212,10 +212,10 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A
 	applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835
 	waitmovement 0
 	msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4
-	giveitem ITEM_SOOTHE_BELL
+	giveitem_std ITEM_SOOTHE_BELL
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B
-	setflag 278
+	setflag FLAG_RECEIVED_SOOTHE_BELL
 	release
 	end
 
@@ -236,9 +236,9 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, 0
 	msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
@@ -246,9 +246,9 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, 0
 	msgbox SlateportCity_PokemonFanClub_Text_17E164, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
@@ -256,8 +256,8 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_AZUMARILL, 0
+	playmoncry SPECIES_AZUMARILL, 0
 	msgbox SlateportCity_PokemonFanClub_Text_17E178, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
index 9fe7f1f1a..46dc8419c 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
@@ -3,13 +3,13 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335
 
 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF
-	checkflag 148
+	checkflag FLAG_DOCK_REJECTED_DEVON_GOODS
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0
 	msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
@@ -18,8 +18,8 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	closemessage
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D
 	waitmovement 0
-	setflag 148
-	setflag 882
+	setflag FLAG_DOCK_REJECTED_DEVON_GOODS
+	setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT
 	releaseall
 	end
 
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 994e33197..f4842bd40 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -5,39 +5,39 @@ SootopolisCity_MapScripts:: @ 814D07D
 	.byte 0
 
 SootopolisCity_MapScript1_14D08D:: @ 814D08D
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	call_if 0, SootopolisCity_EventScript_14D0A0
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	call_if 1, SootopolisCity_EventScript_14D0B1
 	end
 
 SootopolisCity_EventScript_14D0A0:: @ 814D0A0
 	setobjectxyperm 3, 31, 18
-	setmaptile 31, 32, 592, 1
+	setmetatile 31, 32, 592, 1
 	return
 
 SootopolisCity_EventScript_14D0B1:: @ 814D0B1
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 0, SootopolisCity_EventScript_14D0BB
 	return
 
 SootopolisCity_EventScript_14D0BB:: @ 814D0BB
-	setmaptile 9, 6, 584, 1
-	setmaptile 9, 17, 584, 1
-	setmaptile 9, 26, 584, 1
-	setmaptile 44, 17, 584, 1
-	setmaptile 8, 35, 584, 1
-	setmaptile 53, 28, 584, 1
-	setmaptile 45, 6, 584, 1
-	setmaptile 48, 25, 584, 1
-	setmaptile 31, 32, 592, 1
+	setmetatile 9, 6, 584, 1
+	setmetatile 9, 17, 584, 1
+	setmetatile 9, 26, 584, 1
+	setmetatile 44, 17, 584, 1
+	setmetatile 8, 35, 584, 1
+	setmetatile 53, 28, 584, 1
+	setmetatile 45, 6, 584, 1
+	setmetatile 48, 25, 584, 1
+	setmetatile 31, 32, 592, 1
 	return
 
 SootopolisCity_MapScript1_14D10D:: @ 814D10D
-	setflag 2077
-	checkflag 113
+	setflag FLAG_VISITED_SOOTOPOLIS_CITY
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, SootopolisCity_EventScript_14D159
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, SootopolisCity_EventScript_14D123
 	end
 
@@ -68,7 +68,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165
 SootopolisCity_EventScript_14D16E:: @ 814D16E
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D183
 	msgbox SootopolisCity_Text_1696A4, 4
 	release
@@ -92,16 +92,16 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F
 	faceplayer
 	dodailyevents
 	special GetPlayerBigGuyGirlString
-	checkflag 2258
+	checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
 	goto_if_eq SootopolisCity_EventScript_14D241
 	msgbox SootopolisCity_Text_1C63F2, 4
 	random 10
 	addvar RESULT, 20
-	addvar RESULT, 133
-	giveitem RESULT
+	addvar RESULT, ITEM_CHERI_BERRY
+	giveitem_std RESULT
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_EventScript_1A029B
-	setflag 2258
+	setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
 	msgbox SootopolisCity_Text_1C64D0, 4
 	random 2
 	compare RESULT, 0
@@ -111,7 +111,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F
 	end
 
 SootopolisCity_EventScript_14D1FF:: @ 814D1FF
-	giveitem ITEM_FIGY_BERRY
+	giveitem_std ITEM_FIGY_BERRY
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_EventScript_1A029B
 	msgbox SootopolisCity_Text_1C650B, 4
@@ -119,7 +119,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF
 	end
 
 SootopolisCity_EventScript_14D220:: @ 814D220
-	giveitem ITEM_IAPAPA_BERRY
+	giveitem_std ITEM_IAPAPA_BERRY
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_EventScript_1A029B
 	msgbox SootopolisCity_Text_1C650B, 4
@@ -142,7 +142,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E
 SootopolisCity_EventScript_14D268:: @ 814D268
 	lock
 	faceplayer
-	checkflag 1236
+	checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	goto_if_eq SootopolisCity_EventScript_14D27D
 	msgbox SootopolisCity_Text_16A4D6, 4
 	release
@@ -156,7 +156,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D
 SootopolisCity_EventScript_14D287:: @ 814D287
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D29C
 	msgbox SootopolisCity_Text_169813, 4
 	release
@@ -170,7 +170,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C
 SootopolisCity_EventScript_14D2A6:: @ 814D2A6
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D2BB
 	msgbox SootopolisCity_Text_1698A0, 4
 	release
@@ -184,7 +184,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB
 SootopolisCity_EventScript_14D2C5:: @ 814D2C5
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D2DA
 	msgbox SootopolisCity_Text_1697A7, 4
 	release
@@ -445,7 +445,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F
 SootopolisCity_EventScript_14D498:: @ 814D498
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D4AD
 	.ifdef SAPPHIRE
 	msgbox SootopolisCity_Text_169DA6, 4
@@ -461,7 +461,7 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD
 	applymovement LAST_TALKED, SootopolisCity_Movement_1A0845
 	waitmovement 0
 	delay 50
-	setfieldeffect 0, 1
+	setfieldeffectargument 0, 1
 	dofieldeffect 30
 	delay 15
 	removeobject LAST_TALKED
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index 29b62402f..65ed13d87 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -10,7 +10,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C
 	end
 
 SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22
-	tileeffect 4
+	setstepcallback 4
 	end
 
 SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25
@@ -25,16 +25,16 @@ SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E
 	goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73
 	compare 0x4022, 69
 	goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61
-	setmaptile 8, 4, 519, 0
-	setmaptile 8, 5, 519, 0
+	setmetatile 8, 4, 519, 0
+	setmetatile 8, 5, 519, 0
 
 SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61
-	setmaptile 8, 10, 519, 0
-	setmaptile 8, 11, 519, 0
+	setmetatile 8, 10, 519, 0
+	setmetatile 8, 11, 519, 0
 
 SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73
-	setmaptile 8, 15, 519, 0
-	setmaptile 8, 16, 519, 0
+	setmetatile 8, 15, 519, 0
+	setmetatile 8, 16, 519, 0
 
 SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85
 	return
@@ -87,9 +87,9 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD
 
 SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF
 	trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D
-	checkflag 172
+	checkflag FLAG_RECEIVED_TM03
 	goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A
 	msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4
 	release
@@ -100,19 +100,19 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
 	waitmessage
 	call SootopolisCity_Gym_1F_EventScript_1A02C5
 	msgbox SootopolisCity_Gym_1F_Text_18F36B, 4
-	setflag 1236
-	setflag 2062
+	setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
+	setflag FLAG_BADGE08_GET
 	setvar 0x8008, 8
 	call SootopolisCity_Gym_1F_EventScript_1A01C0
 	goto SootopolisCity_Gym_1F_EventScript_15B056
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056
-	giveitem ITEM_TM03
+	giveitem_std ITEM_TM03
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B
 	msgbox SootopolisCity_Gym_1F_Text_18F466, 4
-	setflag 172
+	setflag FLAG_RECEIVED_TM03
 	release
 	end
 
@@ -124,7 +124,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A
 SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084
 	lock
 	faceplayer
-	checkflag 1236
+	checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099
 	msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4
 	release
@@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099
 
 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3
 	lockall
-	checkflag 2062
+	checkflag FLAG_BADGE08_GET
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3
 	goto SootopolisCity_Gym_1F_EventScript_15B0CD
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3
 	lockall
-	checkflag 2062
+	checkflag FLAG_BADGE08_GET
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3
 	goto SootopolisCity_Gym_1F_EventScript_15B0CD
 	end
diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc
index 4877d6d6e..074c9a179 100644
--- a/data/scripts/maps/SootopolisCity_House1.inc
+++ b/data/scripts/maps/SootopolisCity_House1.inc
@@ -4,11 +4,11 @@ SootopolisCity_House1_MapScripts:: @ 815B29A
 SootopolisCity_House1_EventScript_15B29B:: @ 815B29B
 	lock
 	faceplayer
-	checkflag 121
+	checkflag FLAG_RECEIVED_TM31
 	goto_if_eq SootopolisCity_House1_EventScript_15B2C7
 	msgbox SootopolisCity_House1_Text_18F991, 4
-	giveitem ITEM_TM31
-	setflag 121
+	giveitem_std ITEM_TM31
+	setflag FLAG_RECEIVED_TM31
 	msgbox SootopolisCity_House1_Text_18FA03, 4
 	release
 	end
@@ -22,8 +22,8 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_KECLEON, 0
+	playmoncry SPECIES_KECLEON, 0
 	msgbox SootopolisCity_House1_Text_18FA50, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc
index c192a0340..b552cc6d6 100644
--- a/data/scripts/maps/SootopolisCity_House4.inc
+++ b/data/scripts/maps/SootopolisCity_House4.inc
@@ -13,8 +13,8 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_AZUMARILL, 0
+	playmoncry SPECIES_AZUMARILL, 0
 	msgbox SootopolisCity_House4_Text_18FDD8, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc
index a0fdc5ca4..fb91202f3 100644
--- a/data/scripts/maps/SootopolisCity_House6.inc
+++ b/data/scripts/maps/SootopolisCity_House6.inc
@@ -4,16 +4,16 @@ SootopolisCity_House6_MapScripts:: @ 815B385
 SootopolisCity_House6_EventScript_15B386:: @ 815B386
 	lock
 	faceplayer
-	checkflag 245
+	checkflag FLAG_RECEIVED_WAILMER_DOLL
 	goto_if_eq SootopolisCity_House6_EventScript_15B3CD
 	msgbox SootopolisCity_House6_Text_18FEA1, 5
 	compare RESULT, 0
 	call_if 1, SootopolisCity_House6_EventScript_15B3C3
 	msgbox SootopolisCity_House6_Text_18FF12, 4
-	givedecoration 117
+	givedecoration_std DECOR_WAILMER_DOLL
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_House6_EventScript_15B3D7
-	setflag 245
+	setflag FLAG_RECEIVED_WAILMER_DOLL
 	release
 	end
 
@@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD
 	end
 
 SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7
-	getdecorname 1, 117
+	bufferdecorationname 1, DECOR_WAILMER_DOLL
 	msgbox SootopolisCity_House6_Text_1A0CEF, 4
 	msgbox SootopolisCity_House6_Text_18FF28, 4
 	release
diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc
index df536004e..bdff79375 100644
--- a/data/scripts/maps/SootopolisCity_House8.inc
+++ b/data/scripts/maps/SootopolisCity_House8.inc
@@ -38,7 +38,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C
 
 SootopolisCity_House8_EventScript_15B466:: @ 815B466
 	msgbox SootopolisCity_House8_Text_19021D, 4
-	giveitem ITEM_ELIXIR
+	giveitem_std ITEM_ELIXIR
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_House8_EventScript_15B488
 	closemessage
@@ -87,7 +87,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED
 
 SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7
 	msgbox SootopolisCity_House8_Text_190536, 4
-	giveitem ITEM_ELIXIR
+	giveitem_std ITEM_ELIXIR
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_House8_EventScript_15B519
 	closemessage
diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc
index b88347002..115ed0453 100644
--- a/data/scripts/maps/SootopolisCity_Mart.inc
+++ b/data/scripts/maps/SootopolisCity_Mart.inc
@@ -29,9 +29,9 @@ SootopolisCity_Mart_Items:: @ 815B234
 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_Mart_EventScript_15B268
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if 0, SootopolisCity_Mart_EventScript_15B268
 	msgbox SootopolisCity_Mart_Text_18F8D7, 4
 	release
@@ -45,9 +45,9 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268
 SootopolisCity_Mart_EventScript_15B272:: @ 815B272
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_Mart_EventScript_15B290
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if 0, SootopolisCity_Mart_EventScript_15B290
 	msgbox SootopolisCity_Mart_Text_18F96B, 4
 	release
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
index cb09d8856..7b87bc7fc 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
@@ -3,23 +3,23 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190
 	.byte 0
 
 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196
-	sethealplace 10
+	setrespawn 10
 	end
 
 @ 815B19A
 	setvar 0x800B, 1
 	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
 	msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4
 	release
@@ -33,9 +33,9 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6
 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
 	msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4
 	release
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
index 4ee0d0ec3..f62becf08 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
@@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6
 	.byte 0
 
 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC
-	setflag 2121
+	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
 	end
 
 SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0
@@ -17,7 +17,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0
 	applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845
 	waitmovement 0
 	delay 30
-	hideobject 1, 26, 9
+	hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR
 	setvar 0x8004, 2
 	call SouthernIsland_Exterior_EventScript_1A047C
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index bcb316f96..ea2f852f4 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -4,7 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53
 	.byte 0
 
 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, SouthernIsland_Interior_EventScript_160B68
 	end
 
@@ -44,19 +44,19 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B
 	end
 
 SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
-	checkflag 206
+	checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
 	goto_if_eq SouthernIsland_Interior_EventScript_160C08
-	checkflag 2131
+	checkflag FLAG_SYS_HAS_EON_TICKET
 	goto_if 0, SouthernIsland_Interior_EventScript_160C08
-	setflag 206
+	setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
 	special SpawnCameraDummy
 	applymovement 127, SouthernIsland_Interior_Movement_160C12
 	waitmovement 0
 	delay 50
 	waitse
-	playpokecry SPECIES_LATIAS_OR_LATIOS, 0
+	playmoncry SPECIES_LATIAS_OR_LATIOS, 0
 	delay 30
-	waitpokecry
+	waitmoncry
 	addobject 2
 	delay 30
 	applymovement 127, SouthernIsland_Interior_Movement_160C16
@@ -65,11 +65,11 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	delay 50
 	special RemoveCameraDummy
 	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
-	setflag 911
-	setflag 2145
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartSouthernIslandBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	releaseall
 	end
 
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc
index ce2de5124..d991a7096 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/scripts/maps/Underwater_SeafloorCavern.inc
@@ -5,33 +5,33 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E
 	.byte 0
 
 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE
-	setflag 2119
-	checkflag 129
+	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB
 	end
 
 Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB
-	setflag 980
+	setflag FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION
 	end
 
 Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9
 	end
 
 Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9
-	setmaptile 5, 3, 542, 1
-	setmaptile 6, 3, 542, 1
-	setmaptile 7, 3, 542, 1
-	setmaptile 8, 3, 542, 1
-	setmaptile 5, 4, 552, 0
-	setmaptile 6, 4, 552, 0
-	setmaptile 7, 4, 552, 0
-	setmaptile 8, 4, 552, 0
-	setmaptile 5, 5, 552, 0
-	setmaptile 6, 5, 552, 0
-	setmaptile 7, 5, 552, 0
-	setmaptile 8, 5, 552, 0
+	setmetatile 5, 3, 542, 1
+	setmetatile 6, 3, 542, 1
+	setmetatile 7, 3, 542, 1
+	setmetatile 8, 3, 542, 1
+	setmetatile 5, 4, 552, 0
+	setmetatile 6, 4, 552, 0
+	setmetatile 7, 4, 552, 0
+	setmetatile 8, 4, 552, 0
+	setmetatile 5, 5, 552, 0
+	setmetatile 6, 5, 552, 0
+	setmetatile 7, 5, 552, 0
+	setmetatile 8, 5, 552, 0
 	return
 
 Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36
diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc
index 733a060c3..cb5c713ee 100644
--- a/data/scripts/maps/Underwater_SealedChamber.inc
+++ b/data/scripts/maps/Underwater_SealedChamber.inc
@@ -21,7 +21,7 @@ Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF
 Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8
 	lockall
 	braillemessage Underwater_SealedChamber_Braille_1C533D
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
index 213a3609a..1e0f14728 100644
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ b/data/scripts/maps/UnknownMap_25_34.inc
@@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A
 	end
 
 LinkContestRoom1_EventScript_15F625:: @ 815F625
-	hideobject 255, 0, 9
+	hideobjectat 255, MAP_LITTLEROOT_TOWN
 	call LinkContestRoom1_EventScript_15F919
 	end
 
diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc
index 3e8f02302..b9e9b85a5 100644
--- a/data/scripts/maps/VerdanturfTown.inc
+++ b/data/scripts/maps/VerdanturfTown.inc
@@ -3,15 +3,15 @@ VerdanturfTown_MapScripts:: @ 814E854
 	.byte 0
 
 VerdanturfTown_MapScript1_14E85A:: @ 814E85A
-	setflag 2068
+	setflag FLAG_VISITED_VERDANTURF_TOWN
 	setvar 0x4086, 0
-	setflag 801
+	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
 	end
 
 VerdanturfTown_EventScript_14E866:: @ 814E866
 	lock
 	faceplayer
-	checkflag 199
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq VerdanturfTown_EventScript_14E885
 	msgbox VerdanturfTown_Text_16CAEB, 4
 	applymovement 2, VerdanturfTown_Movement_1A083D
@@ -37,7 +37,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2
 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB
 	lock
 	faceplayer
-	checkflag 199
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq VerdanturfTown_EventScript_14E8C0
 	msgbox VerdanturfTown_Text_16CD4D, 4
 	release
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 67554d26b..3694f089d 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
@@ -23,14 +23,14 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1
 	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25
 	waitmovement 0
 	playse 71
-	setmaptile 4, 2, 545, 1
-	setmaptile 4, 3, 609, 1
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
 	special DrawWholeMapView
 	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28
 	waitmovement 0
 	playse 71
-	setmaptile 4, 2, 721, 1
-	setmaptile 4, 3, 729, 1
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
 	special DrawWholeMapView
 	delay 20
 	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35
@@ -101,13 +101,13 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E
 VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47
 	lock
 	faceplayer
-	checkflag 235
+	checkflag FLAG_RECEIVED_TM45
 	goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76
 	msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4
-	giveitem ITEM_TM45
+	giveitem_std ITEM_TM45
 	compare RESULT, 0
 	goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B
-	setflag 235
+	setflag FLAG_RECEIVED_TM45
 	release
 	end
 
@@ -123,7 +123,7 @@ VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80
 VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89
 	lockall
 	special ShowBerryBlenderRecordWindow
-	waitbutton
+	waitbuttonpress
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
index 1cfa785d3..ed60ec1c7 100644
--- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
@@ -56,8 +56,8 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_PIKACHU, 0
+	playmoncry SPECIES_PIKACHU, 0
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
index a0b1f87de..598c3f60b 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
@@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09
 	.byte 0
 
 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F
-	sethealplace 18
+	setrespawn 18
 	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
@@ -12,7 +12,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18
 	setvar 0x800b, 1
 	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	release
 	end
 
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
index fad64292b..205a4315c 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
@@ -4,10 +4,10 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A
 VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B
 	lock
 	faceplayer
-	checkflag 193
+	checkflag FLAG_WALLY_SPEECH
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73
 	msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4
-	setflag 193
+	setflag FLAG_WALLY_SPEECH
 	release
 	end
 
@@ -19,9 +19,9 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73
 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D
 	lock
 	faceplayer
-	checkflag 126
+	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B
 	msgbox VerdanturfTown_WandasHouse_Text_17859A, 4
 	release
@@ -44,9 +44,9 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF
 VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8
 	lock
 	faceplayer
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0
-	checkflag 190
+	checkflag FLAG_DEFEATED_WALLY_MAUVILLE
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6
 	msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4
 	release
@@ -65,11 +65,11 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0
 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA
 	lock
 	faceplayer
-	checkflag 126
+	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B
-	checkflag 199
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011
 	msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4
 	release
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
index fe775d793..7e48d3d90 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/scripts/maps/VictoryRoad_1F.inc
@@ -3,12 +3,12 @@ VictoryRoad_1F_MapScripts:: @ 815DE83
 	.byte 0
 
 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89
-	checkflag 126
+	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	call_if 1, VictoryRoad_1F_EventScript_15DE93
 	end
 
 VictoryRoad_1F_EventScript_15DE93:: @ 815DE93
-	setflag 858
+	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
 	return
 
 VictoryRoad_1F_EventScript_15DE97:: @ 815DE97
@@ -41,9 +41,9 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3
 	msgbox VictoryRoad_1F_Text_19782B, 4
 	trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943
 	msgbox VictoryRoad_1F_Text_197967, 4
-	clearflag 858
+	clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
 	moveobjectoffscreen 4
-	setflag 126
+	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	setvar 0x40c3, 1
 	releaseall
 	end
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 465c61d1a..3ccfbeb29 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -84,7 +84,7 @@ dont_write_lyrics:
 SpeakToHipster:
 	lock
 	faceplayer
-	setflag 2054
+	setflag FLAG_SYS_HIPSTER_MEET
 	msgbox gTextHipster_TheyCallMeTheHipster, 4
 	special ScrSpecial_GetHipsterSpokenFlag
 	compare RESULT, FALSE
@@ -233,7 +233,7 @@ choose_story:
 	setvar 0x8008, 1
 	special ScrSpecial_StorytellerDisplayStory
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	specialvar RESULT, ScrSpecial_StorytellerUpdateStat
 	compare RESULT, FALSE
 	goto_if_eq no_stat_update
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index df097fc19..d8f628709 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -1,7 +1,7 @@
 PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14
 	lock
 	faceplayer
-	checkflag 2053
+	checkflag FLAG_SYS_CHAT_USED
 	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4
 	goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D
@@ -97,11 +97,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
-	checkflag 2124
+	checkflag FLAG_SYS_EXDATA_ENABLE
 	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
-	setflag 2124
+	setflag FLAG_SYS_EXDATA_ENABLE
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3
 	release
 	end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 69a4dc3e9..ea8128ee3 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -59,15 +59,15 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF
 
 LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB
 LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB
-	checkflag 81
+	checkflag FLAG_SET_WALL_CLOCK
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91
 	msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4
 	call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B
 	delay 30
 	setvar 0x4092, 6
-	setflag 81
-	setflag 754
-	setflag 755
+	setflag FLAG_SET_WALL_CLOCK
+	setflag FLAG_HIDE_MACHOKE_MOVER_1
+	setflag FLAG_HIDE_MACHOKE_MOVER_2
 	checkplayergender
 	compare RESULT, 0
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31
@@ -222,7 +222,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
 	fadedefaultbgm
 	special TurnOffTVScreen
-	setflag 2096
+	setflag FLAG_SYS_TV_HOME
 	delay 35
 	return
 
@@ -256,9 +256,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
 	compare 0x408c, 4
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D
-	checkflag 82
+	checkflag FLAG_RESCUED_BIRCH
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
 	compare 0x4001, 1
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80
@@ -274,14 +274,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D
-	checkflag 133
+	checkflag FLAG_RECEIVED_AMULET_COIN
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4
-	giveitem ITEM_AMULET_COIN
+	giveitem_std ITEM_AMULET_COIN
 	compare RESULT, 0
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4
-	setflag 133
+	setflag FLAG_RECEIVED_AMULET_COIN
 	release
 	end
 
@@ -313,9 +313,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_MACHOKE, 0
+	playmoncry SPECIES_MACHOKE, 0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
@@ -324,9 +324,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9
 	lock
 	faceplayer
 	waitse
-	playpokecry SPECIES_MACHOKE, 0
+	playmoncry SPECIES_MACHOKE, 0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172831, 4
-	waitpokecry
+	waitmoncry
 	release
 	end
 
@@ -383,7 +383,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	compare 0x8008, 1
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8
 	msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4
-	giveitem ITEM_SS_TICKET
+	giveitem_std ITEM_SS_TICKET
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4
 	closemessage
 	compare 0x8008, 0
@@ -398,7 +398,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B
 	playse 8
 	removeobject 0x8009
-	setflag 291
+	setflag FLAG_RECEIVED_SS_TICKET
 	setvar 0x4082, 4
 	setvar 0x408c, 4
 	releaseall
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 6fe754097..42e73e17c 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF
 FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E
 	msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4
 	dodailyevents
-	checkflag 2241
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F
 	goto FallarborTown_ContestLobby_EventScript_1B7759
 	end
@@ -106,8 +106,8 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F
 
 FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759
 	msgbox FallarborTown_ContestLobby_Text_1B704A, 4
-	giveitem ITEM_PECHA_BERRY
-	setflag 2241
+	giveitem_std ITEM_PECHA_BERRY
+	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto FallarborTown_ContestLobby_EventScript_1B76EF
 	end
 
@@ -162,7 +162,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC
 
 FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6
 	dodailyevents
-	checkflag 2241
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6
 	goto FallarborTown_ContestLobby_EventScript_1B7800
 	end
@@ -174,8 +174,8 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6
 
 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800
 	msgbox FallarborTown_ContestLobby_Text_1B74B4, 4
-	giveitem ITEM_PECHA_BERRY
-	setflag 2241
+	giveitem_std ITEM_PECHA_BERRY
+	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	msgbox FallarborTown_ContestLobby_Text_1B753A, 4
 	release
 	end
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 385f93d22..892630ac8 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -27,7 +27,7 @@ gUnknown_081C3448:: @ 81C3448
 	playse 73
 	message UnknownString_81C34E4
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	goto EventScript_1C341B
 
@@ -36,7 +36,7 @@ gUnknown_081C3459:: @ 81C3459
 	playse 73
 	message UnknownString_81C3514
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	goto EventScript_1C341B
 
@@ -62,13 +62,13 @@ EventScript_1C348E:
 EventScript_1C34A0:
 	message UnknownString_81C35A9
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	end
 
 EventScript_1C34A9:
 	message UnknownString_81C3583
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	releaseall
 	end
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index f3c03a853..deb30187f 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -9,13 +9,13 @@ Route111_EventScript_1A3858:: @ 81A3858
 	end
 
 Route111_EventScript_1A3877:: @ 81A3877
-	giveitem ITEM_TM43
+	giveitem_std ITEM_TM43
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1A38D9
 	msgbox Route111_Text_1A35C5, 4
 	closemessage
-	setflag 96
-	clearflag 948
+	setflag FLAG_RECEIVED_SECRET_POWER
+	clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
 	compare FACING, 3
 	call_if 1, Route111_EventScript_1A38C3
 	compare FACING, 4
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 425f42a85..cf5fb26c5 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -7,9 +7,9 @@ Event_TV:: @ 81A6E72
 	goto_if_eq EventScript_1A6F01
 	compare RESULT, 1
 	goto_if_eq EventScript_1A6F0B
-	checkflag 2098
+	checkflag FLAG_SYS_TV_START
 	goto_if 0, EventScript_1A6EF1
-	checkflag 2097
+	checkflag FLAG_SYS_TV_WATCH
 	goto_if_eq EventScript_1A6EF1
 	specialvar RESULT, IsTVShowInSearchOfTrainersAiring
 	compare RESULT, 1
@@ -49,8 +49,8 @@ EventScript_1A6F0B:
 	msgbox UnknownString_8172C50, 4
 	.endif
 	special InitRoamer
-	clearflag 2141
-	setflag 255
+	clearflag FLAG_SYS_TV_LATI
+	setflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	special TurnOffTVScreen
 	releaseall
 	end
@@ -58,7 +58,7 @@ EventScript_1A6F0B:
 EventScript_1A6F21:
 	special DoTVShow
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	compare RESULT, 1
 	goto_if 5, EventScript_1A6F21
 	goto EventScript_1A6F37
@@ -66,7 +66,7 @@ EventScript_1A6F21:
 
 EventScript_1A6F37:
 	special TurnOffTVScreen
-	setflag 2097
+	setflag FLAG_SYS_TV_WATCH
 	releaseall
 	end
 
@@ -81,14 +81,14 @@ EventScript_1A6F50:
 	compare RESULT, 0
 	goto_if_eq EventScript_1A6EBB
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	goto EventScript_1A6F37
 	end
 
 EventScript_1A6F66:
 	special DoTVShowInSearchOfTrainers
 	waitmessage
-	waitbutton
+	waitbuttonpress
 	compare RESULT, 0
 	goto_if_eq EventScript_1A6F66
 	goto EventScript_1A6F37
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 835d85966..eff147fb8 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1,92 +1,804 @@
 #ifndef GUARD_CONSTANTS_FLAGS_H
 #define GUARD_CONSTANTS_FLAGS_H
 
+// temporary flags
+// These temporary are are cleared every time a map is loaded. They are used for
+// things like shortening an NPCs introduction text if the player already spoke
+// to them once.
+#define FLAG_TEMP_1   0x1
+#define FLAG_TEMP_2   0x2
+#define FLAG_TEMP_3   0x3
+#define FLAG_TEMP_4   0x4
+#define FLAG_TEMP_5   0x5
+#define FLAG_TEMP_6   0x6
+#define FLAG_TEMP_7   0x7
+#define FLAG_TEMP_8   0x8
+#define FLAG_TEMP_9   0x9
+#define FLAG_TEMP_A   0xA
+#define FLAG_TEMP_B   0xB
+#define FLAG_TEMP_C   0xC
+#define FLAG_TEMP_D   0xD
+#define FLAG_TEMP_E   0xE
+#define FLAG_TEMP_F   0xF
+#define FLAG_TEMP_10  0x10
+#define FLAG_TEMP_11  0x11
+#define FLAG_TEMP_12  0x12
+#define FLAG_TEMP_13  0x13
+#define FLAG_TEMP_14  0x14
+#define FLAG_TEMP_15  0x15
+#define FLAG_TEMP_16  0x16
+#define FLAG_TEMP_17  0x17
+#define FLAG_TEMP_18  0x18
+#define FLAG_TEMP_19  0x19
+#define FLAG_TEMP_1A  0x1A
+#define FLAG_TEMP_1B  0x1B
+#define FLAG_TEMP_1C  0x1C
+#define FLAG_TEMP_1D  0x1D
+#define FLAG_TEMP_1E  0x1E
+#define FLAG_TEMP_1F  0x1F
+// FLAG_TEMP_20 was supposed to be used as a temporary flag (see above), but there
+// was either an oversight or off-by-one error.
+#define FLAG_TEMP_20  0x20
+#define FLAG_VICTORY_ROAD_ROCK FLAG_TEMP_20
+
 // scripts
-#define FLAG_PENDING_DAYCARE_EGG 0x86
+#define FLAG_SET_WALL_CLOCK                 0x51
+#define FLAG_RESCUED_BIRCH                  0x52
+
+#define FLAG_LINK_CONTEST_ROOM_POKEBALL     0x56
+#define FLAG_MET_RIVAL_MOM                  0x57
+#define FLAG_BIRCH_AIDE_MET                 0x58
+#define FLAG_DECLINED_BIKE                  0x59
+#define FLAG_RECEIVED_BIKE                  0x5A
+
+#define FLAG_RECEIVED_WAILMER_PAIL          0x5E
+#define FLAG_RECEIVED_POKEBLOCK_CASE        0x5F
+#define FLAG_RECEIVED_SECRET_POWER          0x60
+
+#define FLAG_TV_EXPLAINED                   0x62
+#define FLAG_MAUVILLE_GYM_BARRIERS_STATE    0x63
+#define FLAG_MOSSDEEP_GYM_SWITCH_1          0x64
+#define FLAG_MOSSDEEP_GYM_SWITCH_2          0x65
+#define FLAG_MOSSDEEP_GYM_SWITCH_3          0x66
+#define FLAG_MOSSDEEP_GYM_SWITCH_4          0x67
+
+#define FLAG_OCEANIC_MUSEUM_MET_REPORTER    0x69
+#define FLAG_RECEIVED_HM04                  0x6A
+#define FLAG_RECEIVED_HM06                  0x6B
+
+#define FLAG_RECEIVED_HM05                  0x6D
+#define FLAG_RECEIVED_HM02                  0x6E
+#define FLAG_MT_PYRE_ORB_STOLEN             0x6F
+#define FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE 0x70
+#define FLAG_LEGENDARY_BATTLE_COMPLETED     0x71 // defeated or caught Groudon/Kyogre in Cave of Origin
+
+#define FLAG_RECEIVED_METEORITE             0x73
+#define FLAG_ADVENTURE_STARTED              0x74 // received pokedex and set loose
+
+#define FLAG_MET_HIDDEN_POWER_GIVER         0x76
+
+#define FLAG_RECEIVED_TM31                  0x79
+#define FLAG_RECEIVED_HM03                  0x7A
+#define FLAG_RECEIVED_HM08                  0x7B
+
+#define FLAG_DEFEATED_WALLY_VICTORY_ROAD    0x7E
+#define FLAG_MET_PRETTY_PETAL_SHOP_OWNER    0x7F
+
+#define FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN 0x81
+#define FLAG_DEFEATED_RIVAL_ROUTE103        0x82
+#define FLAG_RECEIVED_DOLL_LANETTE          0x83
+#define FLAG_RECEIVED_POTION_OLDALE         0x84
+#define FLAG_RECEIVED_AMULET_COIN           0x85
+#define FLAG_PENDING_DAYCARE_EGG            0x86
+#define FLAG_THANKED_FOR_PLAYING_WITH_WALLY 0x87
+
+#define FLAG_RECEIVED_HM01                  0x89
+
+#define FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY  0x8B
+#define FLAG_RECEIVED_6_SODA_POP            0x8C
+#define FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS 0x8D
+#define FLAG_DEVON_GOODS_STOLEN             0x8E
+#define FLAG_RECOVERED_DEVON_GOODS          0x8F
+#define FLAG_RETURNED_DEVON_GOODS           0x90
+
+#define FLAG_MR_BRINEY_SAILING_INTRO        0x93
+#define FLAG_DOCK_REJECTED_DEVON_GOODS      0x94
+#define FLAG_DELIVERED_DEVON_GOODS          0x95
+#define FLAG_RECEIVED_CONTEST_PASS          0x96
+#define FLAG_RECEIVED_CASTFORM              0x97
+#define FLAG_RECEIVED_SUPER_ROD             0x98
+#define FLAG_RUSTBORO_NPC_TRADE_COMPLETED   0x99
+#define FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED 0x9A
+#define FLAG_FORTREE_NPC_TRADE_COMPLETED    0x9B
+
+#define FLAG_UNKNOWN_9F                     0x9F
+#define FLAG_COOL_PAINTING_MADE             0xA0
+#define FLAG_BEAUTY_PAINTING_MADE           0xA1
+#define FLAG_CUTE_PAINTING_MADE             0xA2
+#define FLAG_SMART_PAINTING_MADE            0xA3
+#define FLAG_TOUGH_PAINTING_MADE            0xA4
+#define FLAG_RECEIVED_TM39                  0xA5
+#define FLAG_RECEIVED_TM08                  0xA6
+#define FLAG_RECEIVED_TM34                  0xA7
+#define FLAG_RECEIVED_TM50                  0xA8
+#define FLAG_RECEIVED_TM42                  0xA9
+#define FLAG_RECEIVED_TM40                  0xAA
+#define FLAG_RECEIVED_TM04                  0xAB
+#define FLAG_RECEIVED_TM03                  0xAC
+#define FLAG_DECORATION_1                   0xAD
+#define FLAG_DECORATION_2                   0xAE
+#define FLAG_DECORATION_3                   0xAF
+#define FLAG_DECORATION_4                   0xB0
+#define FLAG_DECORATION_5                   0xB1
+#define FLAG_DECORATION_6                   0xB2
+#define FLAG_DECORATION_7                   0xB3
+#define FLAG_DECORATION_8                   0xB4
+#define FLAG_DECORATION_9                   0xB5
+#define FLAG_DECORATION_10                  0xB6
+#define FLAG_DECORATION_11                  0xB7
+#define FLAG_DECORATION_12                  0xB8
+#define FLAG_DECORATION_13                  0xB9
+#define FLAG_DECORATION_14                  0xBA
+#define FLAG_DECORATION_15                  0xBB
+#define FLAG_RECEIVED_POKENAV               0xBC
+#define FLAG_DELIVERED_STEVEN_LETTER        0xBD
+#define FLAG_DEFEATED_WALLY_MAUVILLE        0xBE
+
+#define FLAG_RECEIVED_SUN_STONE_MOSSDEEP    0xC0
+#define FLAG_WALLY_SPEECH                   0xC1
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1  0xC2
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2  0xC3
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3  0xC4
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4  0xC5
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5  0xC6
+#define FLAG_RUSTURF_TUNNEL_OPENED          0xC7
+#define FLAG_RECEIVED_RED_SCARF             0xC8
+#define FLAG_RECEIVED_BLUE_SCARF            0xC9
+#define FLAG_RECEIVED_PINK_SCARF            0xCA
+#define FLAG_RECEIVED_GREEN_SCARF           0xCB
+#define FLAG_RECEIVED_YELLOW_SCARF          0xCC
+
+#define FLAG_ECOUNTERED_LATIAS_OR_LATIOS    0xCE
+
+#define FLAG_RECEIVED_BASEMENT_KEY          0xD0
+#define FLAG_RECEIVED_TM24                  0xD1
+
+#define FLAG_RECEIVED_RED_OR_BLUE_ORB       0xD4
+#define FLAG_RECEIVED_PREMIER_BALL_RUSTBORO 0xD5
+
+#define FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 0xD7
+#define FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 0xD8
+#define FLAG_MET_DIVING_TREASURE_HUNTER     0xD9
+#define FLAG_MET_WAILMER_TRAINER            0xDA
+#define FLAG_EVIL_LEADER_PLEASE_STOP        0xDB
+
+#define FLAG_RECEIVED_GO_GOGGLES            0xDD
+#define FLAG_WINGULL_SENT_ON_ERRAND         0xDE
+#define FLAG_RECEIVED_MENTAL_HERB           0xDF
+#define FLAG_WINGULL_DELIVERED_MAIL         0xE0
+#define FLAG_RECEIVED_20_COINS              0xE1
+#define FLAG_RECEIVED_STARTER_DOLL          0xE2
+#define FLAG_RECEIVED_GOOD_ROD              0xE3
+#define FLAG_REGI_DOORS_OPENED              0xE4
+#define FLAG_RECEIVED_TM27                  0xE5
+#define FLAG_RECEIVED_TM36                  0xE6
+#define FLAG_RECEIVED_TM05                  0xE7
+#define FLAG_RECEIVED_TM19                  0xE8
+
+#define FLAG_RECEIVED_TM44                  0xEA
+#define FLAG_RECEIVED_TM45                  0xEB
+#define FLAG_RECEIVED_GLASS_ORNAMENT        0xEC
+#define FLAG_RECEIVED_SILVER_SHIELD         0xED
+#define FLAG_RECEIVED_GOLD_SHIELD           0xEE
+#define FLAG_USED_STORAGE_KEY               0xEF
+#define FLAG_USED_ROOM_1_KEY                0xF0
+#define FLAG_USED_ROOM_2_KEY                0xF1
+#define FLAG_USED_ROOM_4_KEY                0xF2
+#define FLAG_USED_ROOM_6_KEY                0xF3
+#define FLAG_MET_PROF_COSMO                 0xF4
+#define FLAG_RECEIVED_WAILMER_DOLL          0xF5
+#define FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 0xF6
+#define FLAG_DEFEATED_SS_TIDAL_TRAINERS     0xF7
+#define FLAG_RECEIVED_SPELON_BERRY          0xF8
+#define FLAG_RECEIVED_PAMTRE_BERRY          0xF9
+#define FLAG_RECEIVED_WATMEL_BERRY          0xFA
+#define FLAG_RECEIVED_DURIN_BERRY           0xFB
+#define FLAG_RECEIVED_BELUE_BERRY           0xFC
+
+#define FLAG_RECEIVED_CHARCOAL              0xFE
+#define FLAG_LATIOS_OR_LATIAS_ROAMING       0xFF
+#define FLAG_RECEIVED_REPEAT_BALL           0x100
+#define FLAG_RECEIVED_OLD_ROD               0x101
+#define FLAG_RECEIVED_COIN_CASE             0x102
+#define FLAG_RETURNED_RED_OR_BLUE_ORB       0x103
+#define FLAG_RECEIVED_TM49                  0x104
+#define FLAG_RECEIVED_TM28                  0x105
+#define FLAG_RECEIVED_TM09                  0x106
+#define FLAG_ENTERED_ELITE_FOUR             0x107
+#define FLAG_RECEIVED_TM10                  0x108
+#define FLAG_RECEIVED_TM41                  0x109
+#define FLAG_RECEIVED_LAVARIDGE_EGG         0x10A
+#define FLAG_RECEIVED_FOSSIL_MON            0x10B
+#define FLAG_DECORATION_16                  0x10C
+#define FLAG_RECEIVED_TM46                  0x10D
+#define FLAG_CONTEST_SKETCH_CREATED         0x10E
+#define FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE  0x10F
+#define FLAG_RECEIVED_EXP_SHARE             0x110
+#define FLAG_POKERUS_EXPLAINED              0x111
+#define FLAG_RECEIVED_RUNNING_SHOES         0x112
+#define FLAG_RECEIVED_QUICK_CLAW            0x113
+#define FLAG_RECEIVED_KINGS_ROCK            0x114
+#define FLAG_RECEIVED_MACHO_BRACE           0x115
+#define FLAG_RECEIVED_SOOTHE_BELL           0x116
+#define FLAG_RECEIVED_WHITE_HERB            0x117
+#define FLAG_RECEIVED_SOFT_SAND             0x118
+
+#define FLAG_RECEIVED_CLEANSE_TAG           0x11A
+#define FLAG_RECEIVED_FOCUS_BAND            0x11B
+#define FLAG_DECLINED_WALLY_BATTLE_MAUVILLE 0x11C
+#define FLAG_RECEIVED_DEVON_SCOPE           0x11D
+#define FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE 0x11E
+#define FLAG_MET_DEVON_EMPLOYEE             0x11F
+#define FLAG_MET_RIVAL_RUSTBORO             0x120
+#define FLAG_RECEIVED_SILK_SCARF            0x121
+#define FLAG_NOT_READY_FOR_BATTLE_ROUTE120  0x122
+#define FLAG_RECEIVED_SS_TICKET             0x123
+#define FLAG_MET_RIVAL_LILYCOVE             0x124
+#define FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE 0x125
+#define FLAG_EXCHANGED_SCANNER              0x126
+#define FLAG_KECLEON_FLED_FORTREE           0x127
+#define FLAG_PETALBURG_MART_EXPANDED_ITEMS  0x128
+#define FLAG_RECEIVED_MIRACLE_SEED          0x129
+#define FLAG_RECEIVED_BELDUM                0x12A
+#define FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK  0x12B
+#define FLAG_MET_FANCLUB_YOUNGER_BROTHER    0x12C
+#define FLAG_RIVAL_LEFT_FOR_ROUTE103        0x12D
+#define FLAG_OMIT_DIVE_FROM_STEVEN_LETTER   0x12E
+
+#define FLAG_UNKNOWN_2B8                    0x2B8 // TODO: pokemon storage system?
+
+#define FLAG_HIDE_BIRCH_STARTERS_BAG        0x2BC
+
+#define FLAG_HIDE_BIRCH_BATTLE_POOCHYENA    0x2D0
+#define FLAG_HIDE_BIRCH_IN_LAB              0x2D1
+#define FLAG_HIDE_MAY_UPSTAIRS              0x2D2
+#define FLAG_HIDE_RIVAL_ROUTE103            0x2D3
+#define FLAG_HIDE_DEVON_PETALBURG_WOODS     0x2D4
+#define FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS 0x2D5
+#define FLAG_HIDE_WALLY_PETALBURG           0x2D6
+#define FLAG_HIDE_STEVENS_LETTER            0x2D7
+#define FLAG_HIDE_WALLY_MOM_PETALBURG_1     0x2D8
+
+#define FLAG_HIDE_GRUNT_RUSTBORO            0x2DB
+#define FLAG_HIDE_DEVON_RUSTBORO            0x2DC
+#define FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN 0x2DD
+#define FLAG_HIDE_NORMAN_LITTLEROOT         0x2DE
+
+#define FLAG_UNKNOWN_2E1                    0x2E1
+#define FLAG_HIDE_MR_BRINEY_ROUTE104        0x2E2
+#define FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE  0x2E3
+#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN    0x2E4
+#define FLAG_HIDE_MR_BRINEY_ROUTE109        0x2E5
+#define FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104   0x2E6
+#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD    0x2E7
+#define FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109   0x2E8
+
+#define FLAG_UNKNOWN_2EB                    0x2EB
+#define FLAG_UNKNOWN_2EC                    0x2EC
+#define FLAG_UNKNOWN_2ED                    0x2ED
+#define FLAG_HIDE_POOCHYENA_ROUTE101        0x2EE
+#define FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD 0x2EF
+#define FLAG_HIDE_MOM_LITTLEROOT            0x2F0
+
+#define FLAG_HIDE_MACHOKE_MOVER_1           0x2F2
+#define FLAG_HIDE_MACHOKE_MOVER_2           0x2F3
+#define FLAG_UNKNOWN_2F4                    0x2F4
+#define FLAG_HIDE_MOM_UPSTAIRS              0x2F5
+#define FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS    0x2F6
+#define FLAG_HIDE_MAY_MOM_DOWNSTAIRS        0x2F7
+#define FLAG_HIDE_BRENDAN_UPSTAIRS          0x2F8
+#define FLAG_HIDE_MOVING_TRUCK_BRENDAN      0x2F9
+#define FLAG_HIDE_MOVING_TRUCK_MAY          0x2FA
+
+#define FLAG_HIDE_VICTOR_WINSTRATE          0x300
+#define FLAG_HIDE_VICTORIA_WINSTRATE        0x301
+#define FLAG_HIDE_VIVI_WINSTRATE            0x302
+#define FLAG_HIDE_VICKI_WINSTRATE           0x303
+#define FLAG_HIDE_NORMAN_PETALBURG_GYM      0x304
+#define FLAG_HIDE_RAYQUAZA                  0x305
+#define FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 0x306
+#define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR   0x307
+#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY 0x308
+#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL 0x309
+#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN 0x30A
+#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER   0x30B
+#define FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS  0x30C
+#define FLAG_HIDE_PETALBURG_GYM_GUIDE       0x30D
+#define FLAG_UNKNOWN_30E                    0x30E
+#define FLAG_UNKNOWN_30F                    0x30F
+#define FLAG_HIDE_BRENDAN_MOM               0x310
+#define FLAG_HIDE_MAY_MOM                   0x311
+
+#define FLAG_HIDE_FANCLUB_OLD_LADY          0x315
+#define FLAG_HIDE_FANCLUB_BOY               0x316
+#define FLAG_HIDE_FANCLUB_LITTLE_BOY        0x317
+#define FLAG_HIDE_FANCLUB_LADY              0x318
+
+#define FLAG_HIDE_GABBY_AND_TY_ROUTE111_1   0x31C
+#define FLAG_HIDE_GABBY_AND_TY_ROUTE118_1   0x31D
+#define FLAG_HIDE_GABBY_AND_TY_ROUTE120_1   0x31E
+#define FLAG_HIDE_GABBY_AND_TY_ROUTE111_2   0x31F
+#define FLAG_HIDE_CONTEST_REPORTER_FALLARBOR  0x320
+#define FLAG_HIDE_CONTEST_REPORTER_VERDANTURF 0x321
+#define FLAG_HIDE_CONTEST_REPORTER_LILYCOVE   0x322
+#define FLAG_HIDE_CONTEST_REPORTER_SLATEPORT  0x323
+#define FLAG_HIDE_WALLY_MAUVILLE            0x324
+#define FLAG_HIDE_WALLY_FATHER_MAUVILLE     0x325
+#define FLAG_HIDE_WALLY_WANDAS_HOUSE        0x326
+#define FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL  0x327
+#define FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE    0x328
+#define FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE 0x329
+
+#define FLAG_HIDE_WALLY_FATHER_PETALBURG    0x32B
+#define FLAG_HIDE_WALLY_MOTHER_PETALBURG    0x32C
+#define FLAG_HIDE_LOST_GLASSES_MAN          0x32D
+#define FLAG_HIDE_RIVAL_RUSTBORO            0x32E
+#define FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM    0x32F
+#define FLAG_HIDE_WALLACE_SOOTOPOLIS        0x330
+
+#define FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR 0x333
+
+#define FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT  0x335
+#define FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT  0x336
+#define FLAG_UNKNOWN_337                    0x337
+
+#define FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN 0x339
+
+#define FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN  0x33C
+#define FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN 0x33D
+
+#define FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN 0x33F
+
+#define FLAG_HIDE_STEVEN_GRANITE_CAVE       0x341
+#define FLAG_HIDE_STEVEN_ROUTE128           0x342
+#define FLAG_HIDE_GABBY_AND_TY_SLATEPORT    0x343
+
+#define FLAG_HIDE_STERN_SLATEPORT           0x348
+#define FLAG_HIDE_STERN_SLATEPORT_HARBOR    0x349
+
+#define FLAG_UNKNOWN_34B                    0x34B
+#define FLAG_UNKNOWN_34C                    0x34C
+#define FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR  0x34D
+#define FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR  0x34E
+#define FLAG_UNKNOWN_34F                    0x34F
+#define FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR 0x350
+#define FLAG_HIDE_MAY_PICHU_DOLL            0x351
+
+#define FLAG_HIDE_RIVAL_ROUTE119            0x353
+#define FLAG_HIDE_GRUNTS_LILYCOVE           0x354
+
+#define FLAG_HIDE_SOOTOPOLIS_RESIDENTS      0x356
+#define FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 0x357
+#define FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 0x358
+
+#define FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD 0x35A
+#define FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN 0x35B
+#define FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR 0x35C
+#define FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR  0x35D
+
+#define FLAG_HIDE_WALLY_PETALBURG_GYM       0x362
+#define FLAG_UNKNOWN_363                    0x363
+#define FLAG_HIDE_FAT_MAN_LITTLEROOT        0x364
+#define FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD 0x365
+#define FLAG_HIDE_LANETTE                   0x366
+#define FLAG_HIDE_LANETTE_FALLARBOR         0x367
+#define FLAG_HIDE_TRICKMASTER_ENTRANCE      0x368
+
+#define FLAG_HIDE_MT_CHIMNEY_PEOPLE         0x36D
+#define FLAG_HIDE_GRUNT_RUSTURF_TUNNEL      0x36E
+#define FLAG_HIDE_BRINEY_RUSTURF_TUNNEL     0x36F
+#define FLAG_HIDE_PEEKO_RUSTURF_TUNNEL      0x370
+#define FLAG_HIDE_PEEKO_BRINEY_HOUSE        0x371
+#define FLAG_HIDE_EVIL_TEAM_SLATEPORT       0x372
+#define FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM  0x373
+#define FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F 0x374
+#define FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F 0x375
+#define FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F 0x376
+#define FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F   0x377
+#define FLAG_HIDE_BATTLE_TOWER_OPPONENT     0x378
+#define FLAG_HIDE_RIVAL_BIRCH_LAB           0x379
+#define FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE  0x37A
+#define FLAG_HIDE_BRINEY_ROUTE116              0x37B
+#define FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F 0x37C
+#define FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F 0x37D
+#define FLAG_HIDE_TUNNER_DIGGER_ROUTE116    0x37E
+#define FLAG_HIDE_ARTIST_LILCOVE_CONTEST    0x37F
+#define FLAG_UNKNOWN_BIRCH_380              0x380 // TODO: what should this be called?
+#define FLAG_HIDE_BIRCH_ROUTE101            0x381
+#define FLAG_HIDE_BIRCH_ROUTE103            0x382
+#define FLAG_HIDE_TRICKMASTER_END           0x383
+#define FLAG_HIDE_EVIL_TEAM_ROUTE110        0x384
+#define FLAG_HIDE_GABBY_AND_TY_ROUTE118_2   0x385
+#define FLAG_HIDE_GABBY_AND_TY_ROUTE120_2   0x386
+#define FLAG_HIDE_GABBY_AND_TY_ROUTE111_3   0x387
+#define FLAG_HIDE_GABBY_AND_TY_ROUTE118_3   0x388
+#define FLAG_HIDE_WORKERS_SLATEPORT_HARBOR  0x389
+#define FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE 0x38A
+#define FLAG_HIDE_AZURILL_FALLARBOR         0x38B
+#define FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE  0x38C
+#define FLAG_HIDE_FERRY_SAILOR_LILYCOVE     0x38D
+#define FLAG_HIDE_LATIOS_OR_LATIAS_FLYING   0x38E
+#define FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY 0x38F
+#define FLAG_HIDE_WATTSON_MAUVILLE          0x390
+#define FLAG_HIDE_WATTSON_MAUVILLE_GYM      0x391
+#define FLAG_HIDE_GRUNTS_ROUTE121           0x392
+#define FLAG_UNKNOWN_393                    0x393
+#define FLAG_HIDE_LEADER_MT_PYRE_SUMMIT     0x394
+#define FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT     0x395
+#define FLAG_HIDE_REPORTER_BATTLE_TOWER     0x396
+#define FLAG_HIDE_RIVAL_ROUTE110            0x397
+#define FLAG_HIDE_RIVAL_CHAMPIONS_ROOM      0x398
+#define FLAG_HIDE_BIRCH_CHAMPIONS_ROOM      0x399
+#define FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110    0x39A
+#define FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE    0x39B
+#define FLAG_HIDE_GRUNTS_HIDEOUTS           0x39C
+#define FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE     0x39D
+#define FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY      0x39E
+#define FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY     0x39F
+#define FLAG_HIDE_PROF_COSMO_FALLARBOR      0x3A0
+#define FLAG_HIDE_RIVAL_LAVARIDGE_1         0x3A1
+#define FLAG_HIDE_RIVAL_LAVARIDGE_2         0x3A2
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1     0x3A3
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2     0x3A4
+#define FLAG_HIDE_WINGULL_FORTREE_HOUSE     0x3A5
+#define FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE    0x3A6
+#define FLAG_HIDE_REGIROCK                  0x3A7
+#define FLAG_HIDE_REGICE                    0x3A8
+#define FLAG_HIDE_REGISTEEL                 0x3A9
+#define FLAG_HIDE_GRUNTS_METEOR_FALLS_1F    0x3AA
+#define FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F 0x3AB
+#define FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL 0x3AC
+#define FLAG_HIDE_AWARD_MAN_BATTLE_TOWER    0x3AD
+#define FLAG_HIDE_PROF_COSMO_METEOR_FALLS   0x3AE
+#define FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT  0x3AF
+#define FLAG_HIDE_EVIL_LEADER_ROUTE128      0x3B0
+#define FLAG_HIDE_OTHER_LEADER_ROUTE128     0x3B1
+#define FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN 0x3B2
+#define FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116   0x3B3
+#define FLAG_HIDE_TM_SALESMAN_SLATEPORT     0x3B4
+#define FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F    0x3B5
+#define FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL 0x3B6
+#define FLAG_HIDE_TM_49_GIVER_SS_TIDAL      0x3B7
+#define FLAG_HIDE_TOOK_SHOAL_SALT_1         0x3B8
+#define FLAG_HIDE_TOOK_SHOAL_SALT_2         0x3B9
+#define FLAG_HIDE_TOOK_SHOAL_SALT_3         0x3BA
+#define FLAG_HIDE_TOOK_SHOAL_SALT_4         0x3BB
+#define FLAG_HIDE_TOOK_SHOAL_SHELL_1        0x3BC
+#define FLAG_HIDE_TOOK_SHOAL_SHELL_2        0x3BD
+#define FLAG_HIDE_TOOK_SHOAL_SHELL_3        0x3BE
+#define FLAG_HIDE_TOOK_SHOAL_SHELL_4        0x3BF
+#define FLAG_HIDE_SECRET_POWER_MAN          0x3C0
+#define FLAG_HIDE_OCEANIC_MUSEUM_VISITORS   0x3C1
+#define FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART 0x3C2
+#define FLAG_HIDE_ROOT_FOSSIL               0x3C3
+#define FLAG_HIDE_CLAW_FOSSIL               0x3C4
+#define FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM 0x3C5
+#define FLAG_HIDE_STEVEN_ROUTE118           0x3C6
+#define FLAG_HIDE_STEVEN_STEVENS_HOUSE      0x3C7
+#define FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE 0x3C8
+#define FLAG_HIDE_KECLEON_FORTREE           0x3C9
+#define FLAG_HIDE_KECLEON_ROUTE120_1        0x3CA
+#define FLAG_HIDE_RIVAL_LILYCOVE_MART       0x3CB
+#define FLAG_HIDE_STEVEN_ROUTE120           0x3CC
+#define FLAG_HIDE_STEVEN_SOOTOPOLIS         0x3CD
+#define FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE    0x3CE
+#define FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE    0x3CF
+#define FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE    0x3D0
+#define FLAG_HIDE_ELECTRODE_1_HIDEOUT       0x3D1
+#define FLAG_HIDE_ELECTRODE_2_HIDEOUT       0x3D2
+#define FLAG_HIDE_RIVAL_OLDALE_TOWN         0x3D3
+#define FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION 0x3D4
+#define FLAG_HIDE_KECLEON_ROUTE120_2        0x3D5
+#define FLAG_HIDE_KECLEON_ROUTE120_3        0x3D6
+#define FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL 0x3D7
+#define FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE   0x3D8
+#define FLAG_HIDE_KECLEON_ROUTE120_4        0x3D9
+#define FLAG_HIDE_KECLEON_ROUTE120_5        0x3DA
+#define FLAG_HIDE_KECLEON_ROUTE120_6        0x3DB
+#define FLAG_HIDE_KECLEON_ROUTE120_7        0x3DC
+#define FLAG_HIDE_KECLEON_ROUTE119_1        0x3DD
+#define FLAG_HIDE_KECLEON_ROUTE119_2        0x3DE
+#define FLAG_HIDE_BOY_ROUTE101              0x3DF
+
+#define FLAG_ITEM_ROUTE102_1                0x3E8
+#define FLAG_ITEM_ROUTE116_1                0x3E9
+#define FLAG_ITEM_ROUTE104_1                0x3EA
+#define FLAG_ITEM_ROUTE105_1                0x3EB
+#define FLAG_ITEM_ROUTE106_1                0x3EC
+#define FLAG_ITEM_ROUTE109_1                0x3ED
+#define FLAG_ITEM_ROUTE110_1                0x3EE
+#define FLAG_ITEM_ROUTE110_2                0x3EF
+#define FLAG_ITEM_ROUTE111_1                0x3F0
+#define FLAG_ITEM_ROUTE111_2                0x3F1
+#define FLAG_ITEM_ROUTE111_3                0x3F2
+#define FLAG_ITEM_ROUTE112_1                0x3F3
+#define FLAG_ITEM_ROUTE113_1                0x3F4
+#define FLAG_ITEM_ROUTE113_2                0x3F5
+#define FLAG_ITEM_ROUTE114_1                0x3F6
+#define FLAG_ITEM_ROUTE114_2                0x3F7
+#define FLAG_ITEM_ROUTE115_1                0x3F8
+#define FLAG_ITEM_ROUTE115_2                0x3F9
+#define FLAG_ITEM_ROUTE115_3                0x3FA
+#define FLAG_ITEM_ROUTE116_2                0x3FB
+#define FLAG_ITEM_ROUTE116_3                0x3FC
+#define FLAG_ITEM_ROUTE116_4                0x3FD
+#define FLAG_ITEM_ROUTE117_1                0x3FE
+#define FLAG_ITEM_ROUTE117_2                0x3FF
+#define FLAG_ITEM_ROUTE119_1                0x400
+#define FLAG_ITEM_ROUTE119_2                0x401
+#define FLAG_ITEM_ROUTE119_3                0x402
+#define FLAG_ITEM_ROUTE119_4                0x403
+#define FLAG_ITEM_ROUTE119_5                0x404
+#define FLAG_ITEM_ROUTE119_6                0x405
+#define FLAG_ITEM_ROUTE120_1                0x406
+#define FLAG_ITEM_ROUTE120_2                0x407
+#define FLAG_ITEM_ROUTE123_1                0x408
+#define FLAG_ITEM_ROUTE123_2                0x409
+#define FLAG_ITEM_ROUTE127_1                0x40A
+#define FLAG_ITEM_ROUTE127_2                0x40B
+#define FLAG_ITEM_ROUTE132_1                0x40C
+#define FLAG_ITEM_ROUTE133_1                0x40D
+#define FLAG_ITEM_ROUTE133_2                0x40E
+#define FLAG_ITEM_PETALBURG_1               0x40F
+#define FLAG_ITEM_PETALBURG_2               0x410
+#define FLAG_ITEM_RUSTBORO_1                0x411
+#define FLAG_ITEM_LILYCOVE_1                0x412
+#define FLAG_ITEM_MOSSDEEP_1                0x413
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_1      0x414
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_2      0x415
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_3      0x416
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_4      0x417
+#define FLAG_ITEM_RUSTURF_TUNNEL_1          0x418
+#define FLAG_ITEM_RUSTURF_TUNNEL_2          0x419
+#define FLAG_ITEM_GRANITE_CAVE_1F_1         0x41A
+#define FLAG_ITEM_GRANITE_CAVE_B1F_1        0x41B
+#define FLAG_ITEM_MT_PYRE_5F_1              0x41C
+#define FLAG_ITEM_GRANITE_CAVE_B2F_1        0x41D
+#define FLAG_ITEM_GRANITE_CAVE_B2F_2        0x41E
+#define FLAG_ITEM_PETALBURG_WOODS_1         0x41F
+#define FLAG_ITEM_PETALBURG_WOODS_2         0x420
+#define FLAG_ITEM_ROUTE104_2                0x421
+#define FLAG_ITEM_PETALBURG_WOODS_3         0x422
+#define FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1      0x423
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1    0x424
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1    0x425
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2    0x426
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1    0x427
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2    0x428
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1    0x429
+#define FLAG_ITEM_ROUTE124_1                0x42A
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1    0x42B
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1    0x42C
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1    0x42D
+#define FLAG_ITEM_JAGGED_PASS_1             0x42E
+#define FLAG_ITEM_AQUA_HIDEOUT_B1F_1        0x42F
+#define FLAG_ITEM_AQUA_HIDEOUT_B2F_1        0x430
+#define FLAG_ITEM_MT_PYRE_EXTERIOR_1        0x431
+#define FLAG_ITEM_MT_PYRE_EXTERIOR_2        0x432
+#define FLAG_ITEM_NEW_MAUVILLE_INSIDE_1     0x433
+#define FLAG_ITEM_NEW_MAUVILLE_INSIDE_2     0x434
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 0x435
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 0x436
+#define FLAG_ITEM_SCORCHED_SLAB_1           0x437
+#define FLAG_ITEM_METEOR_FALLS_B1F_2R_1     0x438
+#define FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 0x439
+#define FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1 0x43A
+#define FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1 0x43B
+#define FLAG_ITEM_VICTORY_ROAD_1F_1         0x43C
+#define FLAG_ITEM_VICTORY_ROAD_1F_2         0x43D
+#define FLAG_ITEM_VICTORY_ROAD_B1F_1        0x43E
+#define FLAG_ITEM_VICTORY_ROAD_B1F_2        0x43F
+#define FLAG_ITEM_VICTORY_ROAD_B2F_1        0x440
+#define FLAG_ITEM_MT_PYRE_6F_1              0x441
+#define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1  0x442
+#define FLAG_ITEM_FIERY_PATH_1              0x443
+#define FLAG_ITEM_ROUTE124_2                0x444
+#define FLAG_ITEM_ROUTE124_3                0x445
+#define FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1   0x446
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 0x447
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 0x448
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 0x449
+#define FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1  0x44A
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 0x44B
+#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 0x44C
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 0x44D
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 0x44E
+#define FLAG_ITEM_ROUTE121_1                0x44F
+#define FLAG_ITEM_ROUTE123_3                0x450
+#define FLAG_ITEM_ROUTE126_1                0x451
+#define FLAG_ITEM_ROUTE119_7                0x452
+#define FLAG_ITEM_ROUTE120_3                0x453
+#define FLAG_ITEM_ROUTE120_4                0x454
+#define FLAG_ITEM_ROUTE123_4                0x455
+#define FLAG_ITEM_NEW_MAUVILLE_INSIDE_3     0x456
+#define FLAG_ITEM_FIERY_PATH_2              0x457
+#define FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1 0x458
+#define FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2 0x459
+#define FLAG_ITEM_ROUTE103_1                0x45A
+#define FLAG_ITEM_ROUTE104_3                0x45B
+#define FLAG_ITEM_MAUVILLE_1                0x45C
+#define FLAG_ITEM_PETALBURG_WOODS_4         0x45D
+#define FLAG_ITEM_ROUTE115_4                0x45E
+#define FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1   0x45F
+#define FLAG_ITEM_MT_PYRE_3F_1              0x460
+#define FLAG_ITEM_ROUTE118_1                0x461
+#define FLAG_ITEM_NEW_MAUVILLE_INSIDE_4     0x462
+#define FLAG_ITEM_NEW_MAUVILLE_INSIDE_5     0x463
+#define FLAG_ITEM_AQUA_HIDEOUT_B1F_2        0x464
+#define FLAG_ITEM_MAGMA_HIDEOUT_B1F_1       0x465
+#define FLAG_ITEM_MAGMA_HIDEOUT_B1F_2       0x466
+#define FLAG_ITEM_MAGMA_HIDEOUT_B2F_1       0x467
+
+#define FLAG_ITEM_MT_PYRE_2F_1              0x469
+#define FLAG_ITEM_MT_PYRE_4F_1              0x46A
+#define FLAG_ITEM_SAFARI_ZONE_SOUTHWEST     0x46B
+#define FLAG_ITEM_AQUA_HIDEOUT_B1F_3        0x46C
+#define FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1  0x46D
+#define FLAG_ITEM_MAGMA_HIDEOUT_B1F_3       0x46E
+#define FLAG_ITEM_ROUTE104_4                0x46F
+
+#define FLAG_DEFEATED_RUSTBORO_GYM          0x4B1
+
+#define FLAG_DEFEATED_DEWFORD_GYM           0x4B4
+
+#define FLAG_DEFEATED_MAUVILLE_GYM          0x4B8
+
+#define FLAG_DEFEATED_LAVARIDGE_GYM         0x4BD
+
+#define FLAG_DEFEATED_PETALBURG_GYM         0x4C1
+
+#define FLAG_DEFEATED_FORTREE_GYM           0x4C9
+
+#define FLAG_DEFEATED_MOSSDEEP_GYM          0x4CD
+
+#define FLAG_DEFEATED_SOOTOPOLIS_GYM        0x4D4
+
+#define FLAG_DEFEATED_ELITE_4_SYDNEY        0x4DD
+#define FLAG_DEFEATED_ELITE_4_PHOEBE        0x4DE
+#define FLAG_DEFEATED_ELITE_4_GLACIA        0x4DF
+#define FLAG_DEFEATED_ELITE_4_DRAKE         0x4E0
+
 
 #define TRAINER_FLAG_START 0x500
 
+
 // SYSTEM FLAGS
 
-#define SYS_POKEMON_GET  0x800
-#define SYS_POKEDEX_GET  0x801
-#define SYS_POKENAV_GET  0x802
-#define SYS_GAME_CLEAR   0x804
-#define SYS_CHAT_USED    0x805
-#define SYS_HIPSTER_MEET 0x806
+#define NUMBER_OF_TRAINERS  693
+#define SYSTEM_FLAGS        (TRAINER_FLAG_START + NUMBER_OF_TRAINERS + 0x4B) // 0x800
+
+#define FLAG_SYS_POKEMON_GET  (SYSTEM_FLAGS + 0x00)
+#define FLAG_SYS_POKEDEX_GET  (SYSTEM_FLAGS + 0x01)
+#define FLAG_SYS_POKENAV_GET  (SYSTEM_FLAGS + 0x02)
+#define FLAG_SYS_GAME_CLEAR   (SYSTEM_FLAGS + 0x04)
+#define FLAG_SYS_CHAT_USED    (SYSTEM_FLAGS + 0x05)
+#define FLAG_SYS_HIPSTER_MEET (SYSTEM_FLAGS + 0x06)
 
 // badges
-#define BADGE01_GET 0x807
-#define BADGE02_GET 0x808
-#define BADGE03_GET 0x809
-#define BADGE04_GET 0x80A
-#define BADGE05_GET 0x80B
-#define BADGE06_GET 0x80C
-#define BADGE07_GET 0x80D
-#define BADGE08_GET 0x80E
+#define FLAG_BADGE01_GET (SYSTEM_FLAGS + 0x07)
+#define FLAG_BADGE02_GET (SYSTEM_FLAGS + 0x08)
+#define FLAG_BADGE03_GET (SYSTEM_FLAGS + 0x09)
+#define FLAG_BADGE04_GET (SYSTEM_FLAGS + 0x0A)
+#define FLAG_BADGE05_GET (SYSTEM_FLAGS + 0x0B)
+#define FLAG_BADGE06_GET (SYSTEM_FLAGS + 0x0C)
+#define FLAG_BADGE07_GET (SYSTEM_FLAGS + 0x0D)
+#define FLAG_BADGE08_GET (SYSTEM_FLAGS + 0x0E)
 
 // cities and towns 
-#define FLAG_VISITED_LITTLEROOT_TOWN  0x80F
-#define FLAG_VISITED_OLDALE_TOWN      0x810
-#define FLAG_VISITED_DEWFORD_TOWN     0x811
-#define FLAG_VISITED_LAVARIDGE_TOWN   0x812
-#define FLAG_VISITED_FALLARBOR_TOWN   0x813
-#define FLAG_VISITED_VERDANTURF_TOWN  0x814
-#define FLAG_VISITED_PACIFIDLOG_TOWN  0x815
-#define FLAG_VISITED_PETALBURG_CITY   0x816
-#define FLAG_VISITED_SLATEPORT_CITY   0x817
-#define FLAG_VISITED_MAUVILLE_CITY    0x818
-#define FLAG_VISITED_RUSTBORO_CITY    0x819
-#define FLAG_VISITED_FORTREE_CITY     0x81A
-#define FLAG_VISITED_LILYCOVE_CITY    0x81B
-#define FLAG_VISITED_MOSSDEEP_CITY    0x81C
-#define FLAG_VISITED_SOOTOPOLIS_CITY  0x81D
-#define FLAG_VISITED_EVER_GRANDE_CITY 0x81E
-
-#define SYS_USE_FLASH        0x828
-#define SYS_USE_STRENGTH     0x829
-#define SYS_WEATHER_CTRL     0x82A
-#define SYS_CYCLING_ROAD     0x82B
-#define SYS_SAFARI_MODE      0x82C
-#define SYS_CRUISE_MODE      0x82D
-
-#define SYS_TV_HOME          0x830
-#define SYS_TV_WATCH         0x831
-#define SYS_TV_START         0x832
-#define SYS_POPWORD_INPUT    0x833
-#define SYS_MIX_RECORD       0x834
-#define SYS_CLOCK_SET        0x835
-#define SYS_NATIONAL_DEX     0x836
-#define SYS_CAVE_SHIP        0x837
-#define SYS_CAVE_WONDER      0x838
-#define SYS_CAVE_BATTLE      0x839
-#define SYS_SHOAL_TIDE       0x83A
-#define SYS_RIBBON_GET       0x83B
-
-#define FLAG_UNLOCK_BATTLE_TOWER    0x848
-#define FLAG_UNLOCK_SOUTHERN_ISLAND 0x849
-
-#define SYS_PC_LANETTE       0x84B
-#define SYS_EXDATA_ENABLE    0x84C
-#define SYS_ENC_UP_ITEM      0x84D
-#define SYS_ENC_DOWN_ITEM    0x84E
-#define SYS_BRAILLE_DIG      0x84F
-#define SYS_BRAILLE_STRENGTH 0x850
-#define SYS_BRAILLE_WAIT     0x851
-#define SYS_BRAILLE_FLY      0x852
-#define SYS_HAS_EON_TICKET   0x853
-
-#define SYS_POKEMON_LEAGUE_FLY 0x854
-
-#define SYS_TV_LATI          0x85D
-
-#define SYS_SHOAL_ITEM       0x85F
-#define SYS_B_DASH           0x860 // got Running Shoes
-#define SYS_CTRL_OBJ_DELETE  0x861
-#define SYS_RESET_RTC_ENABLE 0x862
+#define FLAG_VISITED_LITTLEROOT_TOWN  (SYSTEM_FLAGS + 0x0F)
+#define FLAG_VISITED_OLDALE_TOWN      (SYSTEM_FLAGS + 0x10)
+#define FLAG_VISITED_DEWFORD_TOWN     (SYSTEM_FLAGS + 0x11)
+#define FLAG_VISITED_LAVARIDGE_TOWN   (SYSTEM_FLAGS + 0x12)
+#define FLAG_VISITED_FALLARBOR_TOWN   (SYSTEM_FLAGS + 0x13)
+#define FLAG_VISITED_VERDANTURF_TOWN  (SYSTEM_FLAGS + 0x14)
+#define FLAG_VISITED_PACIFIDLOG_TOWN  (SYSTEM_FLAGS + 0x15)
+#define FLAG_VISITED_PETALBURG_CITY   (SYSTEM_FLAGS + 0x16)
+#define FLAG_VISITED_SLATEPORT_CITY   (SYSTEM_FLAGS + 0x17)
+#define FLAG_VISITED_MAUVILLE_CITY    (SYSTEM_FLAGS + 0x18)
+#define FLAG_VISITED_RUSTBORO_CITY    (SYSTEM_FLAGS + 0x19)
+#define FLAG_VISITED_FORTREE_CITY     (SYSTEM_FLAGS + 0x1A)
+#define FLAG_VISITED_LILYCOVE_CITY    (SYSTEM_FLAGS + 0x1B)
+#define FLAG_VISITED_MOSSDEEP_CITY    (SYSTEM_FLAGS + 0x1C)
+#define FLAG_VISITED_SOOTOPOLIS_CITY  (SYSTEM_FLAGS + 0x1D)
+#define FLAG_VISITED_EVER_GRANDE_CITY (SYSTEM_FLAGS + 0x1E)
+
+#define FLAG_SYS_USE_FLASH        (SYSTEM_FLAGS + 0x28)
+#define FLAG_SYS_USE_STRENGTH     (SYSTEM_FLAGS + 0x29)
+#define FLAG_SYS_WEATHER_CTRL     (SYSTEM_FLAGS + 0x2A)
+#define FLAG_SYS_CYCLING_ROAD     (SYSTEM_FLAGS + 0x2B)
+#define FLAG_SYS_SAFARI_MODE      (SYSTEM_FLAGS + 0x2C)
+#define FLAG_SYS_CRUISE_MODE      (SYSTEM_FLAGS + 0x2D)
+
+#define FLAG_SYS_TV_HOME          (SYSTEM_FLAGS + 0x30)
+#define FLAG_SYS_TV_WATCH         (SYSTEM_FLAGS + 0x31)
+#define FLAG_SYS_TV_START         (SYSTEM_FLAGS + 0x32)
+#define FLAG_SYS_POPWORD_INPUT    (SYSTEM_FLAGS + 0x33)
+#define FLAG_SYS_MIX_RECORD       (SYSTEM_FLAGS + 0x34)
+#define FLAG_SYS_CLOCK_SET        (SYSTEM_FLAGS + 0x35)
+#define FLAG_SYS_NATIONAL_DEX     (SYSTEM_FLAGS + 0x36)
+#define FLAG_SYS_CAVE_SHIP        (SYSTEM_FLAGS + 0x37)
+#define FLAG_SYS_CAVE_WONDER      (SYSTEM_FLAGS + 0x38)
+#define FLAG_SYS_CAVE_BATTLE      (SYSTEM_FLAGS + 0x39)
+#define FLAG_SYS_SHOAL_TIDE       (SYSTEM_FLAGS + 0x3A)
+#define FLAG_SYS_RIBBON_GET       (SYSTEM_FLAGS + 0x3B)
+
+#define FLAG_LANDMARK_FLOWER_SHOP        (SYSTEM_FLAGS + 0x3C)
+#define FLAG_LANDMARK_MR_BRINEY_HOUSE    (SYSTEM_FLAGS + 0x3D)
+#define FLAG_LANDMARK_ABANDONED_SHIP     (SYSTEM_FLAGS + 0x3E)
+#define FLAG_LANDMARK_SEASHORE_HOUSE     (SYSTEM_FLAGS + 0x3F)
+#define FLAG_LANDMARK_NEW_MAUVILLE       (SYSTEM_FLAGS + 0x40)
+#define FLAG_LANDMARK_OLD_LADY_REST_SHOP (SYSTEM_FLAGS + 0x41)
+#define FLAG_LANDMARK_TRICK_HOUSE        (SYSTEM_FLAGS + 0x42)
+#define FLAG_LANDMARK_WINSTRATE_FAMILY   (SYSTEM_FLAGS + 0x43)
+#define FLAG_LANDMARK_GLASS_WORKSHOP     (SYSTEM_FLAGS + 0x44)
+#define FLAG_LANDMARK_LANETTES_HOUSE     (SYSTEM_FLAGS + 0x45)
+#define FLAG_LANDMARK_POKEMON_DAYCARE    (SYSTEM_FLAGS + 0x46)
+#define FLAG_LANDMARK_SEAFLOOR_CAVERN    (SYSTEM_FLAGS + 0x47)
+#define FLAG_LANDMARK_BATTLE_TOWER       (SYSTEM_FLAGS + 0x48)
+#define FLAG_LANDMARK_SOUTHERN_ISLAND    (SYSTEM_FLAGS + 0x49)
+#define FLAG_LANDMARK_FIERY_PATH         (SYSTEM_FLAGS + 0x4A)
+
+#define FLAG_SYS_PC_LANETTE       (SYSTEM_FLAGS + 0x4B)
+#define FLAG_SYS_EXDATA_ENABLE    (SYSTEM_FLAGS + 0x4C)
+#define FLAG_SYS_ENC_UP_ITEM      (SYSTEM_FLAGS + 0x4D)
+#define FLAG_SYS_ENC_DOWN_ITEM    (SYSTEM_FLAGS + 0x4E)
+#define FLAG_SYS_BRAILLE_DIG      (SYSTEM_FLAGS + 0x4F)
+#define FLAG_SYS_BRAILLE_STRENGTH (SYSTEM_FLAGS + 0x50)
+#define FLAG_SYS_BRAILLE_WAIT     (SYSTEM_FLAGS + 0x51)
+#define FLAG_SYS_BRAILLE_FLY      (SYSTEM_FLAGS + 0x52)
+#define FLAG_SYS_HAS_EON_TICKET   (SYSTEM_FLAGS + 0x53)
+#define FLAG_SYS_POKEMON_LEAGUE_FLY (SYSTEM_FLAGS + 0x54)
+
+#define FLAG_LANDMARK_ISLAND_CAVE          (SYSTEM_FLAGS + 0x55)
+#define FLAG_LANDMARK_DESERT_RUINS         (SYSTEM_FLAGS + 0x56)
+#define FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE (SYSTEM_FLAGS + 0x57)
+#define FLAG_LANDMARK_SCORCHED_SLAB        (SYSTEM_FLAGS + 0x58)
+#define FLAG_LANDMARK_ANCIENT_TOMB         (SYSTEM_FLAGS + 0x59)
+#define FLAG_LANDMARK_TUNNELERS_REST_HOUSE (SYSTEM_FLAGS + 0x5A)
+#define FLAG_LANDMARK_HUNTERS_HOUSE        (SYSTEM_FLAGS + 0x5B)
+#define FLAG_LANDMARK_SEALED_CHAMBER       (SYSTEM_FLAGS + 0x5C)
+
+#define FLAG_SYS_TV_LATI          (SYSTEM_FLAGS + 0x5D)
+
+#define FLAG_LANDMARK_SKY_PILLAR (SYSTEM_FLAGS + 0x5E)
+
+#define FLAG_SYS_SHOAL_ITEM       (SYSTEM_FLAGS + 0x5F)
+#define FLAG_SYS_B_DASH           (SYSTEM_FLAGS + 0x60) // got Running Shoes
+#define FLAG_SYS_CTRL_OBJ_DELETE  (SYSTEM_FLAGS + 0x61)
+#define FLAG_SYS_RESET_RTC_ENABLE (SYSTEM_FLAGS + 0x62)
+
+#define FLAG_LANDMARK_BERRY_MASTERS_HOUSE (SYSTEM_FLAGS + 0x63)
+
+
+// Daily Flags. These 64 flags are cleared once per day.
+#define DAILY_FLAGS_START (SYSTEM_FLAGS + 0xC0)
+
+#define FLAG_DAILY_RECEIVED_BERRY_FALLARBOR   (SYSTEM_FLAGS + 0xC1)
+#define FLAG_DAILY_UNKNOWN_8C2                (SYSTEM_FLAGS + 0xC2)
+
+#define FLAG_DAILY_PICKED_LOTTO_TICKET        (SYSTEM_FLAGS + 0xCA)
+#define FLAG_DAILY_RECEIVED_BERRY_ROUTE114    (SYSTEM_FLAGS + 0xCB)
+#define FLAG_DAILY_RECEIVED_BERRY_ROUTE111    (SYSTEM_FLAGS + 0xCC)
+#define FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER (SYSTEM_FLAGS + 0xCD)
+#define FLAG_DAILY_RECEIVED_BERRY_ROUTE120    (SYSTEM_FLAGS + 0xCE)
+#define FLAG_DAILY_RECEIVED_BERRY_LILYCOVE    (SYSTEM_FLAGS + 0xCF)
+#define FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP (SYSTEM_FLAGS + 0xD0)
+#define FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE (SYSTEM_FLAGS + 0xD1)
+#define FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS  (SYSTEM_FLAGS + 0xD2)
+// Daily flags end at 0x8FF
 
 // SPECIAL FLAGS (unknown purpose)
 
-#define SPECIAL_FLAG_1 0x4001
+#define FLAG_SPECIAL_FLAG_1 0x4001
 
 #endif // GUARD_CONSTANTS_FLAGS_H
diff --git a/include/event_data.h b/include/event_data.h
index a5420b9b4..5656ab8dc 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -6,7 +6,7 @@
 
 void InitEventData(void);
 void ClearTempFieldEventData(void);
-void ClearUpperFlags(void);
+void ClearDailyFlags(void);
 void DisableNationalPokedex(void);
 void EnableNationalPokedex(void);
 bool32 IsNationalPokedexEnabled(void);
@@ -37,8 +37,8 @@ extern u16 gSpecialVar_0x8008;
 extern u16 gSpecialVar_0x8009;
 extern u16 gSpecialVar_0x800A;
 extern u16 gSpecialVar_0x800B;
-extern u16 gScriptResult;
-extern u16 gScriptLastTalked;
-extern u16 gScriptFacing;
+extern u16 gSpecialVar_Result;
+extern u16 gSpecialVar_LastTalked;
+extern u16 gSpecialVar_Facing;
 
 #endif // GUARD_EVENT_DATA_H
diff --git a/include/item_use.h b/include/item_use.h
index 227c0c9ee..ee7939824 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_ITEM_USE_H
 #define GUARD_ITEM_USE_H
 
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 
 void ItemUseOutOfBattle_Mail(u8);
 void ItemUseOutOfBattle_Bike(u8);
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index cd89c92a2..70bd6fe5a 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -12,6 +12,12 @@ enum
     ANIM_BANK_DEF_PARTNER
 };
 
+struct Struct_sub_8078914 {
+    u8 *field_0;
+    u8 *field_4;
+    u8 field_8;
+};
+
 u8 sub_8077ABC(u8, u8);
 u8 sub_8077E44(u8 slot, u16 species, u8 a3);
 u8 GetAnimBankSpriteId(u8 side);
@@ -54,7 +60,7 @@ void sub_80797EC(struct Task *task);
 void sub_8079814(u8 taskId);
 void sub_8079A64(u8 sprite);
 u16 sub_8079B10(u8 sprite);
-void sub_8079BF4(s16 *bottom, s16 *top, void *ptr);
+void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr);
 void *sub_8079BFC(s16 bottom, s16 top);
 void sub_8079E24();
 u8 sub_8079E90(u8 slot);
@@ -93,11 +99,13 @@ u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4);
 s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1);
 void obj_delete_but_dont_free_vram(struct Sprite *sprite);
 void sub_8079108(u16 a1, bool8 a2);
-void sub_80798F4(struct Task *task, u8 a2, void *a3);
+void sub_80798F4(struct Task *task, u8 a2, const void *a3);
 bool8 sub_807992C(struct Task *task);
 u8 sub_8077FC0(u8 slot);
 void move_anim_8074EE0(struct Sprite *sprite);
 bool8 sub_8078718(struct Sprite *sprite);
 bool8 sub_8078CE8(struct Sprite *sprite);
+void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
+void sub_8078BD4(struct Sprite *sprite);
 
 #endif // GUARD_ROM_8077ABC_H
diff --git a/include/sprite.h b/include/sprite.h
index ba68b7e42..9937a0797 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -222,6 +222,14 @@ struct Sprite
     /*0x43*/ u8 subpriority;
 };
 
+struct OamMatrix
+{
+    s16 a;
+    s16 b;
+    s16 c;
+    s16 d;
+};
+
 extern const struct OamData gDummyOamData;
 extern const union AnimCmd *const gDummySpriteAnimTable[];
 extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
diff --git a/ld_script.txt b/ld_script.txt
index c4e5b9fd6..07334bd2c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -264,28 +264,29 @@ SECTIONS {
         src/battle/anim/perceive.o(.text);
         src/battle/anim/angel.o(.text);
         src/battle/anim/angel_kiss.o(.text);
-        asm/devil.o(.text);
-        asm/swipe.o(.text);
-        asm/struggle.o(.text);
-        asm/uproar.o(.text);
-        asm/noise.o(.text);
-        asm/note_spin.o(.text);
-        asm/guard.o(.text);
-        asm/fury_cutter_count.o(.text);
-        asm/rain.o(.text);
-        asm/bubble.o(.text);
-        asm/aurora.o(.text);
-        asm/liquid_ball.o(.text);
+        src/battle/anim/devil.o(.text);
+        src/battle/anim/swipe.o(.text);
+        src/battle/anim/struggle.o(.text);
+        src/battle/anim/uproar.o(.text);
+        src/battle/anim/noise.o(.text);
+        src/battle/anim/note_spin.o(.text);
+        src/battle/anim/guard.o(.text);
+        src/battle/anim/fury_cutter_count.o(.text);
+        src/battle/anim/rain.o(.text);
+        src/battle/anim/bubble.o(.text);
+        src/battle/anim/aurora.o(.text);
+        src/battle/anim/energy_wave.o(.text);
+        src/battle/anim/water.o(.text);
         asm/water.o(.text);
         asm/fire.o(.text);
-        asm/sunlight.o(.text);
+        src/battle/anim/sunlight.o(.text);
         asm/fire_2.o(.text);
-        asm/heated_rock.o(.text);
-        asm/wisp_orb.o(.text);
+        src/battle/anim/heated_rock.o(.text);
+        src/battle/anim/wisp_orb.o(.text);
         asm/wisp_fire.o(.text);
-        asm/thunder.o(.text);
-        asm/beta_beat_up.o(.text);
-        asm/shock.o(.text);
+        src/battle/anim/thunder.o(.text);
+        src/battle/anim/beta_beat_up.o(.text);
+        src/battle/anim/shock.o(.text);
         asm/current.o(.text);
         asm/ice.o(.text);
         asm/fight.o(.text);
diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c
new file mode 100644
index 000000000..1ca5e649f
--- /dev/null
+++ b/src/battle/anim/aurora.c
@@ -0,0 +1,72 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "palette.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+#include "task.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D344C(struct Sprite *);
+static void sub_80D34D4(u8);
+
+void sub_80D33B4(struct Sprite *sprite)
+{
+    s16 r6;
+
+    sub_80787B0(sprite, 1);
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+        r6 = -gBattleAnimArgs[2];
+    else
+        r6 = gBattleAnimArgs[2];
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r6;
+    sprite->data[3] = sprite->pos1.y;
+    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3];
+    obj_translate_based_on_private_1_2_3_4(sprite);
+    sprite->callback = sub_80D344C;
+    sprite->affineAnimPaused = TRUE;
+    sprite->callback(sprite);
+}
+
+static void sub_80D344C(struct Sprite *sprite)
+{
+    if ((u16)gBattleAnimArgs[7] == 0xFFFF)
+    {
+        StartSpriteAnim(sprite, 1);
+        sprite->affineAnimPaused = FALSE;
+    }
+    if (sub_8078B5C(sprite) != 0)
+        move_anim_8072740(sprite);
+}
+
+void sub_80D3490(u8 taskId)
+{
+    gTasks[taskId].data[0] = gBattleAnimArgs[0];
+    gTasks[taskId].data[2] = 0x100 + IndexOfSpritePaletteTag(0x279C) * 16;
+    gTasks[taskId].func = sub_80D34D4;
+}
+
+static void sub_80D34D4(u8 taskId)
+{
+    gTasks[taskId].data[10]++;
+    if (gTasks[taskId].data[10] == 3)
+    {
+        u16 r5;
+        u16 r6;
+        s32 i;
+
+        gTasks[taskId].data[10] = 0;
+        r5 = gTasks[taskId].data[2] + 1;
+        r6 = gPlttBufferFaded[r5];
+        for (i = 1; i < 8; i++)
+            gPlttBufferFaded[r5 + i - 1] = gPlttBufferFaded[r5 + i];
+        gPlttBufferFaded[r5 + 7] = r6;
+    }
+    gTasks[taskId].data[11]++;
+    if (gTasks[taskId].data[11] == gTasks[taskId].data[0])
+        DestroyAnimVisualTask(taskId);
+}
diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c
new file mode 100644
index 000000000..499e52a80
--- /dev/null
+++ b/src/battle/anim/beta_beat_up.c
@@ -0,0 +1,34 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D6278(struct Sprite *);
+
+// beta_beat_up
+
+void sub_80D6234(struct Sprite *sprite)
+{
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    {
+        sprite->pos1.x -= gBattleAnimArgs[0];
+    }
+    else
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+    }
+
+    sprite->callback = sub_80D6278;
+}
+
+static void sub_80D6278(struct Sprite *sprite)
+{
+    if (sprite->affineAnimEnded)
+    {
+        move_anim_8074EE0(sprite);
+    }
+}
diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c
new file mode 100644
index 000000000..5da0d9929
--- /dev/null
+++ b/src/battle/anim/bubble.c
@@ -0,0 +1,102 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+#include "util.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D32E8(struct Sprite *sprite);
+static void sub_80D3370(struct Sprite *sprite);
+static void sub_80D3398(struct Sprite *sprite);
+
+// bubble (indidivual bubble that floats around)
+// Used in Bubble and Bubblebeam
+
+void sub_80D31C8(struct Sprite* sprite)
+{
+    u8 newSpriteId;
+
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    {
+        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - gBattleAnimArgs[0];
+        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[1];
+    }
+    else
+    {
+        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0];
+        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[1];
+    }
+
+    sprite->animPaused = 1;
+
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    {
+        gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+    }
+
+    sprite->data[0] = gBattleAnimArgs[6];
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->data[3] = sprite->pos1.y;
+    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+
+    obj_translate_based_on_private_1_2_3_4(sprite);
+
+    newSpriteId = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
+    sprite->data[5] = newSpriteId;
+
+    sprite->pos1.x -= Sin((u8)gBattleAnimArgs[4], gBattleAnimArgs[2]);
+    sprite->pos1.y -= Cos((u8)gBattleAnimArgs[4], gBattleAnimArgs[3]);
+
+    gSprites[newSpriteId].data[0] = gBattleAnimArgs[2];
+    gSprites[newSpriteId].data[1] = gBattleAnimArgs[3];
+    gSprites[newSpriteId].data[2] = gBattleAnimArgs[5];
+    gSprites[newSpriteId].data[3] = (u8)gBattleAnimArgs[4] * 256;
+    gSprites[newSpriteId].data[4] = gBattleAnimArgs[6];
+
+    sprite->callback = sub_80D32E8;
+    sprite->callback(sprite);
+}
+
+static void sub_80D32E8(struct Sprite *sprite)
+{
+    u8 spriteId = sprite->data[5];
+
+    u8 counter = gSprites[spriteId].data[4];
+    u16 index = gSprites[spriteId].data[3];
+
+    sprite->data[0] = 1;
+    sub_8078B5C(sprite);
+
+    sprite->pos2.x += Sin(index / 256, gSprites[spriteId].data[0]);
+    sprite->pos2.y += Cos(index / 256, gSprites[spriteId].data[1]);
+
+    gSprites[spriteId].data[3] = gSprites[spriteId].data[2] + index;
+
+    if (--counter != 0)
+    {
+        gSprites[spriteId].data[4] = counter;
+    }
+    else
+    {
+        sprite->callback = sub_80D3370;
+        DestroySprite(&gSprites[spriteId]);
+    }
+}
+
+static void sub_80D3370(struct Sprite *sprite)
+{
+    sprite->animPaused = 0;
+    sprite->callback = sub_8078600;
+    StoreSpriteCallbackInData(sprite, sub_80D3398);
+}
+
+static void sub_80D3398(struct Sprite *sprite)
+{
+    sprite->data[0] = 10;
+    sprite->callback = sub_80782D8;
+    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+}
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c
new file mode 100644
index 000000000..345ee53ea
--- /dev/null
+++ b/src/battle/anim/devil.c
@@ -0,0 +1,37 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankTarget;
+
+void sub_80D2ABC(struct Sprite *sprite)
+{
+    if (sprite->data[3] == 0)
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+        StartSpriteAnim(sprite, 0);
+        sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1;
+        sprite->data[2] = 1;
+    }
+    sprite->data[0] += sprite->data[2];
+    sprite->data[1] = (sprite->data[0] * 4) % 256;
+    if (sprite->data[1] < 0)
+        sprite->data[1] = 0;
+    sprite->pos2.x = Cos(sprite->data[1], 30 - sprite->data[0] / 4);
+    sprite->pos2.y = Sin(sprite->data[1], 10 - sprite->data[0] / 8);
+    if (sprite->data[1] > 128 && sprite->data[2] > 0)
+        sprite->data[2] = -1;
+    if (sprite->data[1] == 0 && sprite->data[2] < 0)
+        sprite->data[2] = 1;
+    sprite->data[3]++;
+    if (sprite->data[3] < 10 || sprite->data[3] > 0x50)
+        sprite->invisible = sprite->data[0] % 2;
+    else
+        sprite->invisible = FALSE;
+    if (sprite->data[3] > 0x5A)
+        move_anim_8072740(sprite);
+}
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
new file mode 100644
index 000000000..ffba5c300
--- /dev/null
+++ b/src/battle/anim/energy_wave.c
@@ -0,0 +1,162 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern const struct SpriteTemplate gSpriteTemplate_83D9130[];
+
+static void sub_80D35DC(struct Sprite *);
+static void sub_80D365C(u8);
+static void sub_80D370C(struct Sprite *);
+
+// energy_wave (animates steady "waves" of energy)
+// Used in Hydro Pump, Mud Shot, Signal Beam, Flamethrower, Psywave, and
+// Hydro Cannon.
+
+void sub_80D3554(struct Sprite *sprite)
+{
+    sub_80787B0(sprite, 1);
+
+    sprite->data[0] = 30;
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->data[3] = sprite->pos1.y;
+    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+
+    obj_translate_based_on_private_1_2_3_4(sprite);
+
+    sprite->data[5] = 0xD200 / sprite->data[0];
+    sprite->data[7] = gBattleAnimArgs[3];
+
+    if (gBattleAnimArgs[7] > 127)
+    {
+        sprite->data[6] = (gBattleAnimArgs[7] - 127) << 8;
+        sprite->data[7] = -sprite->data[7];
+    }
+    else
+    {
+        sprite->data[6] = gBattleAnimArgs[7] << 8;
+    }
+
+    sprite->callback = sub_80D35DC;
+    sprite->callback(sprite);
+}
+
+static void sub_80D35DC(struct Sprite *sprite)
+{
+    if (sub_8078B5C(sprite))
+    {
+        move_anim_8072740(sprite);
+    }
+
+    sprite->pos2.y += Sin(sprite->data[6] >> 8, sprite->data[7]);
+    if (((sprite->data[6] + sprite->data[5]) >> 8) > 127)
+    {
+        sprite->data[6] = 0;
+        sprite->data[7] = -sprite->data[7];
+    }
+    else
+    {
+        sprite->data[6] += sprite->data[5];
+    }
+}
+
+void sub_80D3630(u8 taskId)
+{
+    gTasks[taskId].data[0] = gBattleAnimArgs[0];
+    gBattleAnimArgs[7] = 0;
+    gTasks[taskId].func = sub_80D365C;
+}
+
+static void sub_80D365C(u8 taskId)
+{
+    gBattleAnimArgs[7] = (gBattleAnimArgs[7] + 3) & 0xFF;
+    if (--gTasks[taskId].data[0] == 0)
+    {
+        DestroyAnimVisualTask(taskId);
+    }
+}
+
+void sub_80D3698(struct Sprite *sprite)
+{
+    u8 subpriority;
+
+    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0);
+    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1);
+    sprite->pos2.y = -10;
+
+    subpriority = sub_8079E90(gBattleAnimBankAttacker);
+
+    if (!NotInBattle())
+    {
+        if (GetBankSide(gBattleAnimBankAttacker) == 0)
+        {
+            sprite->pos2.x = 10;
+            sprite->subpriority = subpriority + 2;
+        }
+        else
+        {
+            sprite->pos2.x = -10;
+            sprite->subpriority = subpriority - 2;
+        }
+    }
+    else
+    {
+        sprite->pos2.x = -10;
+        sprite->subpriority = subpriority + 2;
+    }
+
+    sprite->callback = sub_80D370C;
+}
+
+static void sub_80D370C(struct Sprite *sprite)
+{
+    if (sprite->affineAnimEnded)
+    {
+        move_anim_8072740(sprite);
+    }
+}
+
+void sub_80D3728(struct Sprite *sprite)
+{
+    int var1, var2;
+
+    if (GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget))
+    {
+        gBattleAnimArgs[0] *= -1;
+
+        if (GetBankIdentity(gBattleAnimBankAttacker) == 0 || GetBankIdentity(gBattleAnimBankAttacker) == 1)
+        {
+            gBattleAnimArgs[0] *= -1;
+        }
+
+    }
+
+    if ((gBattleAnimArgs[5] & 0xFF00) == 0)
+        var1 = 1;
+    else
+        var1 = 0;
+
+    if ((u8)gBattleAnimArgs[5] == 0)
+        var2 = 3;
+    else
+        var2 = 1;
+
+    sub_80787B0(sprite, var1);
+
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    {
+        gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+    }
+
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, var2) + gBattleAnimArgs[3];
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+}
diff --git a/src/battle/anim/fury_cutter_count.c b/src/battle/anim/fury_cutter_count.c
new file mode 100644
index 000000000..17b084585
--- /dev/null
+++ b/src/battle/anim/fury_cutter_count.c
@@ -0,0 +1,20 @@
+#include "global.h"
+#include "battle_anim.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 *gDisableStructMoveAnim; // TODO: this is declared with a different type in different files
+
+// fury_cutter (updates the direction and count of the fury cutter animation)
+// Used in Fury Cutter.
+
+void UpdateFuryCutterAnimDirection(u8 taskId)
+{
+    gBattleAnimArgs[7] = gDisableStructMoveAnim[16] & 1;
+    DestroyAnimVisualTask(taskId);
+}
+
+void UpdateFuryCutterAnimCount(u8 taskId)
+{
+    gBattleAnimArgs[7] = gDisableStructMoveAnim[16];
+    DestroyAnimVisualTask(taskId);
+}
diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
new file mode 100644
index 000000000..4769db2e4
--- /dev/null
+++ b/src/battle/anim/guard.c
@@ -0,0 +1,34 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern u16 gBattleTypeFlags;
+
+// guard (moves guard rings upwards)
+// Used in Safeguard.
+
+void sub_80D3014(struct Sprite *sprite)
+{
+    if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+    {
+        sub_807A3FC(gBattleAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+        sprite->pos1.y += 40;
+
+        StartSpriteAffineAnim(sprite, 1);
+    }
+    else
+    {
+        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0);
+        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + 40;
+    }
+
+    sprite->data[0] = 13;
+    sprite->data[2] = sprite->pos1.x;
+    sprite->data[4] = sprite->pos1.y - 72;
+
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+}
diff --git a/src/battle/anim/heated_rock.c b/src/battle/anim/heated_rock.c
new file mode 100644
index 000000000..1d59669cf
--- /dev/null
+++ b/src/battle/anim/heated_rock.c
@@ -0,0 +1,205 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern u16 gBattleTypeFlags;
+
+void sub_80D59B0(struct Sprite *);
+static void sub_80D5A74(struct Sprite *);
+
+// heated_rock (moves heated rock sprites)
+// Used in Eruption.
+
+void sub_80D58FC(struct Sprite *sprite)
+{
+    sub_80D59B0(sprite);
+
+    if (sprite->invisible)
+    {
+        gTasks[sprite->data[6]].data[sprite->data[7]]--;
+        DestroySprite(sprite);
+    }
+}
+
+u16 sub_80D5940(u8 spriteId)
+{
+    u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY;
+
+    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    {
+        var1 = ((var1 << 16) + 0x4A0000) >> 16;
+    }
+    else
+    {
+        var1 = ((var1 << 16) + 0x2C0000) >> 16;
+    }
+
+    return var1;
+}
+
+void sub_80D5994(struct Sprite *sprite, s16 x, s16 y)
+{
+    sprite->data[0] = 0;
+    sprite->data[1] = 0;
+    sprite->data[2] = (u16)sprite->pos1.x * 8;
+    sprite->data[3] = (u16)sprite->pos1.y * 8;
+    sprite->data[4] = x * 8;
+    sprite->data[5] = y * 8;
+}
+
+#ifdef NONMATCHING
+void sub_80D59B0(struct Sprite *sprite)
+{
+    int var1;
+    int var2;
+
+    if (++sprite->data[0] > 2)
+    {
+        sprite->data[0] = 0;
+        ++sprite->data[1];
+        sprite->data[3] += ((u16)sprite->data[1] * (u16)sprite->data[1]);
+    }
+
+    var1 = (u16)sprite->data[4] + (u16)sprite->data[2];
+    sprite->data[2] = var1;
+    var1 = (s16)var1 >> 3;
+    sprite->pos1.x = var1;
+
+    var2 = (u16)sprite->data[5] + (u16)sprite->data[3];
+    sprite->data[3] = var2;
+    var2 = (s16)var2 >> 3;
+    sprite->pos1.y = var2;
+
+    if ((u32)((var1 + 8) << 16) > 0x1000000 || var2 < -8 || var2 > 120)
+    {
+        sprite->invisible = 1;
+    }
+}
+#else
+__attribute__((naked))
+void sub_80D59B0(struct Sprite *sprite)
+{
+    asm(".syntax unified\n\
+    push {lr}\n\
+    adds r2, r0, 0\n\
+    ldrh r0, [r2, 0x2E]\n\
+    adds r0, 0x1\n\
+    strh r0, [r2, 0x2E]\n\
+    lsls r0, 16\n\
+    asrs r0, 16\n\
+    cmp r0, 0x2\n\
+    ble _080D59DA\n\
+    movs r0, 0\n\
+    strh r0, [r2, 0x2E]\n\
+    ldrh r0, [r2, 0x30]\n\
+    adds r0, 0x1\n\
+    strh r0, [r2, 0x30]\n\
+    ldrh r0, [r2, 0x30]\n\
+    adds r1, r0, 0\n\
+    muls r1, r0\n\
+    adds r0, r1, 0\n\
+    ldrh r3, [r2, 0x34]\n\
+    adds r0, r3\n\
+    strh r0, [r2, 0x34]\n\
+_080D59DA:\n\
+    ldrh r0, [r2, 0x36]\n\
+    ldrh r1, [r2, 0x32]\n\
+    adds r0, r1\n\
+    strh r0, [r2, 0x32]\n\
+    lsls r0, 16\n\
+    asrs r0, 19\n\
+    strh r0, [r2, 0x20]\n\
+    ldrh r1, [r2, 0x38]\n\
+    ldrh r3, [r2, 0x34]\n\
+    adds r1, r3\n\
+    strh r1, [r2, 0x34]\n\
+    lsls r1, 16\n\
+    asrs r3, r1, 19\n\
+    strh r3, [r2, 0x22]\n\
+    adds r0, 0x8\n\
+    lsls r0, 16\n\
+    movs r1, 0x80\n\
+    lsls r1, 17\n\
+    cmp r0, r1\n\
+    bhi _080D5A10\n\
+    adds r1, r3, 0\n\
+    movs r0, 0x8\n\
+    negs r0, r0\n\
+    cmp r1, r0\n\
+    blt _080D5A10\n\
+    cmp r1, 0x78\n\
+    ble _080D5A1C\n\
+_080D5A10:\n\
+    adds r0, r2, 0\n\
+    adds r0, 0x3E\n\
+    ldrb r1, [r0]\n\
+    movs r2, 0x4\n\
+    orrs r1, r2\n\
+    strb r1, [r0]\n\
+_080D5A1C:\n\
+    pop {r0}\n\
+    bx r0\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING
+
+void sub_80D5A20(struct Sprite *sprite)
+{
+    sprite->pos1.x = gBattleAnimArgs[0];
+    sprite->pos1.y = gBattleAnimArgs[1];
+
+    sprite->data[0] = 0;
+    sprite->data[1] = 0;
+    sprite->data[2] = 0;
+    sprite->data[6] = gBattleAnimArgs[2];
+    sprite->data[7] = gBattleAnimArgs[3];
+
+    sprite->oam.tileNum += gBattleAnimArgs[4] * 16;
+    sprite->callback = sub_80D5A74;
+}
+
+static void sub_80D5A74(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        if (sprite->data[6] != 0)
+        {
+            sprite->data[6]--;
+            return;
+        }
+
+        sprite->data[0]++;
+        // fall through
+    case 1:
+        sprite->pos1.y += 8;
+        if (sprite->pos1.y >= sprite->data[7])
+        {
+            sprite->pos1.y = sprite->data[7];
+            sprite->data[0]++;
+        }
+        break;
+    case 2:
+        if (++sprite->data[1] > 1)
+        {
+            sprite->data[1] = 0;
+            if ((++sprite->data[2] & 1) != 0)
+            {
+                sprite->pos2.y = -3;
+            }
+            else
+            {
+                sprite->pos2.y = 3;
+            }
+        }
+
+        if (++sprite->data[3] > 16)
+        {
+            move_anim_8072740(sprite);
+        }
+        break;
+    }
+}
diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c
index c5659463e..1e49b536c 100755
--- a/src/battle/anim/love_bg.c
+++ b/src/battle/anim/love_bg.c
@@ -6,13 +6,6 @@
 #include "decompress.h"
 #include "palette.h"
 
-struct Struct_sub_8078914
-{
-    u8 *field_0;
-    u8 *field_4;
-    u8 field_8;
-};
-
 extern s16 gBattleAnimArgs[];
 extern u8 gBattleAnimBankAttacker;
 extern u8 gBattleAnimBankTarget;
diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c
new file mode 100644
index 000000000..78953d96a
--- /dev/null
+++ b/src/battle/anim/noise.c
@@ -0,0 +1,56 @@
+#include "global.h"
+#include "rom_8077ABC.h"
+#include "battle_anim.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D2E30(struct Sprite *);
+
+// noise (moving music note)
+// Used in Uproar.
+
+void sub_80D2D68(struct Sprite* sprite)
+{
+    int var1;
+    u8 slot = gBattleAnimArgs[0] == 0 ? gBattleAnimBankAttacker : gBattleAnimBankTarget;
+
+    if (GetBankSide(slot) == 1)
+    {
+        gBattleAnimArgs[1] *= -1;
+    }
+
+    sprite->pos1.x = sub_8077ABC(slot, 2)  + gBattleAnimArgs[1];
+    sprite->pos1.y = sub_8077ABC(slot, 3) + gBattleAnimArgs[2];
+    sprite->data[0] = 0;
+    sprite->data[1] = (u16)sprite->pos1.x << 3;
+    sprite->data[2] = (u16)sprite->pos1.y << 3;
+
+    var1 = gBattleAnimArgs[1] << 3;
+    if (var1 < 0)
+        var1 += 7;
+    sprite->data[3] = var1 >> 3;
+
+    var1 = gBattleAnimArgs[2] << 3;
+    if (var1 < 0)
+        var1 += 7;
+    sprite->data[4] = var1 >> 3;
+
+    sprite->oam.tileNum += gBattleAnimArgs[3] * 16;
+    sprite->callback = sub_80D2E30;
+}
+
+static void sub_80D2E30(struct Sprite *sprite)
+{
+    sprite->data[1] += sprite->data[3];
+    sprite->data[2] += sprite->data[4];
+
+    sprite->pos1.x = sprite->data[1] >> 3;
+    sprite->pos1.y = sprite->data[2] >> 3;
+
+    if (++sprite->data[0] > 16)
+    {
+        move_anim_8072740(sprite);
+    } 
+}
diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c
new file mode 100644
index 000000000..bdc0f4615
--- /dev/null
+++ b/src/battle/anim/note_spin.c
@@ -0,0 +1,110 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D2F80(struct Sprite *);
+static void sub_80D2FA4(struct Sprite *);
+
+// note_spin (spins music notes around, and rotates them)
+// Used in Perish Song.
+
+void sub_80D2E68(struct Sprite *sprite)
+{
+    if (sprite->data[0] == 0)
+    {
+        sprite->data[1] = 120 - gBattleAnimArgs[0];
+        sprite->invisible = 1;
+    }
+
+    if (++sprite->data[0] == sprite->data[1])
+    {
+        sub_8079108(sprite->oam.paletteNum + 16, 0);
+    }
+
+    if (sprite->data[0] == sprite->data[1] + 80)
+    {
+        move_anim_8072740(sprite);
+    }
+}
+
+void sub_80D2EC8(struct Sprite *sprite)
+{
+    int index;
+    int var2;
+
+    if (sprite->data[0] == 0)
+    {
+        sprite->pos1.x = 120;
+        sprite->pos1.y = (gBattleAnimArgs[0] + (((u16)gBattleAnimArgs[0]) >> 31)) / 2 - 15;
+
+        StartSpriteAnim(sprite, gBattleAnimArgs[1]);
+
+        sprite->data[5] = 120;
+        sprite->data[3] = gBattleAnimArgs[2];
+    }
+
+    sprite->data[0]++;
+
+    sprite->data[1] = (sprite->data[0] + ((u16)sprite->data[0] >> 31)) / 2;
+    index = ((sprite->data[0] * 3) + (u16)sprite->data[3]);
+    var2 = 0xFF;
+    sprite->data[6] = (sprite->data[6] + 10) & 0xFF;
+
+    index &= var2;
+    sprite->pos2.x = Cos(index, 100);
+
+    sprite->pos2.y = sprite->data[1] + Sin(index, 10) + Cos(sprite->data[6], 4);
+
+    if (sprite->data[0] > sprite->data[5])
+    {
+        sprite->callback = sub_80D2F80;
+
+        sprite->data[0] = 0;
+        oamt_add_pos2_onto_pos1(sprite);
+        sprite->data[2] = 5;
+        sprite->data[4] = 0;
+        sprite->data[3] = 0;
+
+        StartSpriteAffineAnim(sprite, 1);
+    }
+}
+
+static void sub_80D2F80(struct Sprite *sprite)
+{
+    if (++sprite->data[0] > 10)
+    {
+        sprite->data[0] = 0;
+        sprite->callback = sub_80D2FA4;
+    }
+}
+
+static void sub_80D2FA4(struct Sprite *sprite)
+{
+    sprite->data[3] += sprite->data[2];
+    sprite->pos2.y = sprite->data[3];
+
+    sprite->data[2]++;
+
+    if (sprite->data[3] > 48 && sprite->data[2] > 0)
+    {
+        sprite->data[2] = sprite->data[4] - 5;
+        sprite->data[4]++;
+    }
+
+    if (sprite->data[4] > 3)
+    {
+        int var1 = sprite->data[2];
+        sprite->invisible = var1 - (((s32)(var1 + ((u32)var1 >> 31)) >> 1) << 1);
+        move_anim_8072740(sprite);
+    }
+
+    if (sprite->data[4] == 4)
+    {
+        move_anim_8072740(sprite);
+    }
+}
diff --git a/src/battle/anim/rain.c b/src/battle/anim/rain.c
new file mode 100644
index 000000000..b38233e3c
--- /dev/null
+++ b/src/battle/anim/rain.c
@@ -0,0 +1,56 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "random.h"
+#include "sprite.h"
+#include "task.h"
+
+extern s16 gBattleAnimArgs[8];
+extern const struct SpriteTemplate gSpriteTemplate_83D9130[];
+
+static void MoveAnimRaindrop(struct Sprite *);
+
+// rain (spawns and animates raindrops)
+// Used in Rain Dance and general rain animation.
+
+void CreateAnimRaindrops(u8 taskId)
+{
+    if (gTasks[taskId].data[0] == 0)
+    {
+        gTasks[taskId].data[1] = gBattleAnimArgs[0];
+        gTasks[taskId].data[2] = gBattleAnimArgs[1];
+        gTasks[taskId].data[3] = gBattleAnimArgs[2];
+    }
+
+    gTasks[taskId].data[0]++;
+
+    if (gTasks[taskId].data[0] % gTasks[taskId].data[2] == 1)
+    {
+        u8 x = Random() % 240;
+        u8 y = Random() % 80;
+        CreateSprite(gSpriteTemplate_83D9130, x,  y, 4);
+    }
+
+    if (gTasks[taskId].data[0] == gTasks[taskId].data[3])
+    {
+        DestroyAnimVisualTask(taskId);
+    }
+}
+
+void SetAnimRaindropCallback(struct Sprite *sprite)
+{
+    sprite->callback = MoveAnimRaindrop;
+}
+
+static void MoveAnimRaindrop(struct Sprite *sprite)
+{
+    if (++sprite->data[0] <= 13)
+    {
+        sprite->pos2.x++;
+        sprite->pos2.y += 4;
+    }
+
+    if (sprite->animEnded)
+    {
+        DestroySprite(sprite);
+    }
+}
diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c
index 9f1dfd7d0..0c5056704 100755
--- a/src/battle/anim/scary_face.c
+++ b/src/battle/anim/scary_face.c
@@ -6,13 +6,6 @@
 #include "decompress.h"
 #include "palette.h"
 
-struct Struct_sub_8078914
-{
-    u8 *field_0;
-    u8 *field_4;
-    u8 field_8;
-};
-
 extern s16 gBattleAnimArgs[];
 extern u8 gBattleAnimBankAttacker;
 extern u8 gBattleAnimBankTarget;
diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c
new file mode 100644
index 000000000..35c380f23
--- /dev/null
+++ b/src/battle/anim/shock.c
@@ -0,0 +1,106 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern struct OamMatrix gOamMatrices[];
+
+extern void sub_80DA48C(struct Sprite *);
+
+// shock (moves the little electricity lines)
+// Used in Shock.
+
+void sub_80D6294(struct Sprite *sprite)
+{
+    sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    {
+        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->pos1.y -= gBattleAnimArgs[1];
+    }
+    else
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+    }
+
+    sprite->data[0] = 0;
+    sprite->data[1] = gBattleAnimArgs[2];
+    sprite->data[2] = gBattleAnimArgs[3];
+    sprite->data[3] = gBattleAnimArgs[4];
+
+    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    sprite->callback = sub_8078114;
+}
+
+void sub_80D6328(struct Sprite *sprite)
+{
+    u8 slot;
+    u32 matrixNum;
+    s16 sineVal;
+
+    switch (gBattleAnimArgs[4])
+    {
+    case 0:
+        slot = gBattleAnimBankAttacker;
+        break;
+    case 1:
+    default:
+        slot = gBattleAnimBankTarget;
+        break;
+    case 2:
+        if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+        {
+            slot = gBattleAnimBankAttacker;
+        }
+        else
+        {
+            slot = gBattleAnimBankAttacker ^ 2;
+        }
+        break;
+    case 3:
+        if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+        {
+            slot = gBattleAnimBankTarget ^ 2;
+        }
+        else
+        {
+            slot = gBattleAnimBankTarget;
+        }
+        break;
+    }
+
+    if (gBattleAnimArgs[5] == 0)
+    {
+        sprite->pos1.x = sub_8077ABC(slot, 0);
+        sprite->pos1.y = sub_8077ABC(slot, 1);
+    }
+    else
+    {
+        sprite->pos1.x = sub_8077ABC(slot, 2);
+        sprite->pos1.y = sub_8077ABC(slot, 3);
+    }
+
+    sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;
+    sprite->pos2.y = (gSineTable[gBattleAnimArgs[0] + 64] * gBattleAnimArgs[1]) >> 8;
+
+    if (gBattleAnimArgs[6] & 1)
+    {
+        sprite->oam.priority = sub_8079ED4(slot) + 1;
+    }
+
+    matrixNum = sprite->oam.matrixNum;
+    sineVal = gSineTable[gBattleAnimArgs[2]];
+
+    gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d =  gSineTable[gBattleAnimArgs[2] + 64];
+    gOamMatrices[matrixNum].b =  sineVal;
+    gOamMatrices[matrixNum].c = -sineVal;
+
+    sprite->data[0] = gBattleAnimArgs[3];
+    sprite->callback = sub_80DA48C;
+}
diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c
new file mode 100644
index 000000000..63a01a79e
--- /dev/null
+++ b/src/battle/anim/struggle.c
@@ -0,0 +1,52 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D2CC4(struct Sprite *);
+
+void sub_80D2C38(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[2] == 0)
+    {
+        move_anim_8072740(sprite);
+    }
+    else
+    {
+        if (gBattleAnimArgs[0] == 0)
+        {
+            sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
+            sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+        }
+        else
+        {
+            sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2);
+            sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+        }
+
+        if (gBattleAnimArgs[1] == 0)
+            sprite->pos1.x += 32;
+        else
+            sprite->pos1.x -= 32;
+
+        sprite->data[0] = gBattleAnimArgs[2];
+        sprite->data[1] = gBattleAnimArgs[1];
+        StartSpriteAnim(sprite, sprite->data[1]);
+        sprite->callback = sub_80D2CC4;
+    }
+}
+
+static void sub_80D2CC4(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        if (--sprite->data[0] != 0)
+            StartSpriteAnim(sprite, sprite->data[1]);
+        else
+            move_anim_8072740(sprite);
+    }
+}
diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c
new file mode 100644
index 000000000..f6cb8a077
--- /dev/null
+++ b/src/battle/anim/sunlight.c
@@ -0,0 +1,17 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+
+// sunlight (creates sunlight orbs)
+// Used in Sunny Day
+
+void sub_80D517C(struct Sprite *sprite)
+{
+    sprite->pos1.x = 0;
+    sprite->pos1.y = 0;
+    sprite->data[0] = 60;
+    sprite->data[2] = 140;
+    sprite->data[4] = 80;
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+}
diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c
new file mode 100644
index 000000000..15bee06ee
--- /dev/null
+++ b/src/battle/anim/swipe.c
@@ -0,0 +1,20 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "sprite.h"
+
+extern s16 gBattleAnimArgs[8];
+
+void sub_80D2BE8(struct Sprite *sprite)
+{
+    if (sprite->data[0] == 0)
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+        StartSpriteAnim(sprite, gBattleAnimArgs[2]);
+        sprite->data[0]++;
+    }
+    else if (sprite->animEnded)
+    {
+        move_anim_8072740(sprite);
+    }
+}
diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c
new file mode 100644
index 000000000..5064148ef
--- /dev/null
+++ b/src/battle/anim/thunder.c
@@ -0,0 +1,36 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern u16 gBattleTypeFlags;
+
+static void sub_80D6218(struct Sprite *);
+
+// thunder (positions the lightning bolts)
+// Used in Thunder, Thunder Punch, and Tri Attack.
+
+void sub_80D61C8(struct Sprite *sprite)
+{
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    {
+        sprite->pos1.x -= gBattleAnimArgs[0];
+    }
+    else
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+    }
+
+    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->callback = sub_80D6218;
+}
+
+static void sub_80D6218(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        move_anim_8072740(sprite);
+    }
+}
diff --git a/src/battle/anim/uproar.c b/src/battle/anim/uproar.c
new file mode 100644
index 000000000..03cc65bc0
--- /dev/null
+++ b/src/battle/anim/uproar.c
@@ -0,0 +1,25 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+#include "task.h"
+
+extern s16 gBattleAnimArgs[8];
+
+extern const union AffineAnimCmd gUnknown_083D7CA8[];
+
+void sub_80D2D3C(u8);
+
+void sub_80D2CF8(u8 taskId)
+{
+    u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+
+    sub_80798F4(&gTasks[taskId], spriteId, gUnknown_083D7CA8);
+    gTasks[taskId].func = sub_80D2D3C;
+}
+
+void sub_80D2D3C(u8 taskId)
+{
+    if (!sub_807992C(&gTasks[taskId]))
+        DestroyAnimVisualTask(taskId);
+}
diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c
new file mode 100644
index 000000000..396a4637d
--- /dev/null
+++ b/src/battle/anim/water.c
@@ -0,0 +1,371 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+#include "util.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D3874(struct Sprite *);
+
+void sub_80D37FC(struct Sprite *sprite)
+{
+    sub_8078764(sprite, 1);
+
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
+    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4];
+
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+}
+
+void sub_80D3838(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[3] != 0)
+    {
+        sub_8078764(sprite, 1);
+    }
+    else
+    {
+        sub_80787B0(sprite, 1);
+    }
+
+    sprite->data[7] = gBattleAnimArgs[2];
+    sprite->callback = sub_80D3874;
+}
+
+static void sub_80D3874(struct Sprite *sprite)
+{
+    sprite->data[0] = (sprite->data[0] + 11) & 0xFF;
+    sprite->pos2.x = Sin(sprite->data[0], 4);
+
+    sprite->data[1] += 48;
+    sprite->pos2.y = -(sprite->data[1] >> 8);
+
+    if (--sprite->data[7] == -1)
+    {
+        move_anim_8072740(sprite);
+    }
+}
+
+__attribute__((naked))
+void sub_80D38BC(u8 taskId)
+{
+    asm(".syntax unified\n\
+    .equ REG_BLDCNT, 0x4000050\n\
+    .equ REG_BG1CNT, 0x400000A\n\
+    .equ REG_BG1HOFS, 0x4000014\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x14\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r10, r0\n\
+    ldr r1, _080D398C @ =REG_BLDCNT\n\
+    ldr r2, _080D3990 @ =0x00003f42\n\
+    adds r0, r2, 0\n\
+    strh r0, [r1]\n\
+    adds r1, 0x2\n\
+    movs r3, 0x80\n\
+    lsls r3, 5\n\
+    adds r0, r3, 0\n\
+    strh r0, [r1]\n\
+    ldr r2, _080D3994 @ =REG_BG1CNT\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0x4\n\
+    negs r0, r0\n\
+    ands r0, r1\n\
+    movs r1, 0x1\n\
+    orrs r0, r1\n\
+    strb r0, [r2]\n\
+    ldrb r1, [r2, 0x1]\n\
+    movs r0, 0x3F\n\
+    ands r0, r1\n\
+    movs r1, 0x40\n\
+    orrs r0, r1\n\
+    strb r0, [r2, 0x1]\n\
+    mov r0, sp\n\
+    bl sub_8078914\n\
+    ldr r2, [sp]\n\
+    movs r3, 0x80\n\
+    lsls r3, 6\n\
+    add r6, sp, 0x10\n\
+    add r0, sp, 0xC\n\
+    mov r12, r0\n\
+    movs r5, 0\n\
+    ldr r1, _080D3998 @ =0x040000d4\n\
+    movs r4, 0x80\n\
+    lsls r4, 5\n\
+    mov r8, r6\n\
+    ldr r7, _080D399C @ =0x85000400\n\
+    movs r0, 0x85\n\
+    lsls r0, 24\n\
+    mov r9, r0\n\
+_080D3920:\n\
+    str r5, [sp, 0x10]\n\
+    mov r0, r8\n\
+    str r0, [r1]\n\
+    str r2, [r1, 0x4]\n\
+    str r7, [r1, 0x8]\n\
+    ldr r0, [r1, 0x8]\n\
+    adds r2, r4\n\
+    subs r3, r4\n\
+    cmp r3, r4\n\
+    bhi _080D3920\n\
+    str r5, [sp, 0x10]\n\
+    str r6, [r1]\n\
+    str r2, [r1, 0x4]\n\
+    lsrs r0, r3, 2\n\
+    mov r2, r9\n\
+    orrs r0, r2\n\
+    str r0, [r1, 0x8]\n\
+    ldr r0, [r1, 0x8]\n\
+    movs r0, 0\n\
+    mov r3, r12\n\
+    strb r0, [r3]\n\
+    strb r0, [r3]\n\
+    ldr r1, [sp, 0x4]\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x10]\n\
+    ldr r0, _080D3998 @ =0x040000d4\n\
+    str r6, [r0]\n\
+    str r1, [r0, 0x4]\n\
+    ldr r1, _080D399C @ =0x85000400\n\
+    str r1, [r0, 0x8]\n\
+    ldr r0, [r0, 0x8]\n\
+    bl NotInBattle\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080D39B8\n\
+    ldr r2, _080D3994 @ =REG_BG1CNT\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xD\n\
+    negs r0, r0\n\
+    ands r0, r1\n\
+    movs r1, 0x4\n\
+    orrs r0, r1\n\
+    strb r0, [r2]\n\
+    ldr r0, _080D39A0 @ =gBattleAnimBankAttacker\n\
+    ldrb r0, [r0]\n\
+    bl GetBankSide\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0x1\n\
+    bne _080D39A8\n\
+    ldr r0, _080D39A4 @ =gUnknown_08E70968\n\
+    b _080D39AA\n\
+    .align 2, 0\n\
+_080D398C: .4byte REG_BLDCNT\n\
+_080D3990: .4byte 0x00003f42\n\
+_080D3994: .4byte REG_BG1CNT\n\
+_080D3998: .4byte 0x040000d4\n\
+_080D399C: .4byte 0x85000400\n\
+_080D39A0: .4byte gBattleAnimBankAttacker\n\
+_080D39A4: .4byte gUnknown_08E70968\n\
+_080D39A8:\n\
+    ldr r0, _080D39B4 @ =gUnknown_08E70C38\n\
+_080D39AA:\n\
+    ldr r1, [sp, 0x4]\n\
+    bl LZDecompressVram\n\
+    b _080D39CE\n\
+    .align 2, 0\n\
+_080D39B4: .4byte gUnknown_08E70C38\n\
+_080D39B8:\n\
+    ldr r0, _080D39F0 @ =gUnknown_08E70F0C\n\
+    ldr r1, [sp, 0x4]\n\
+    bl LZDecompressVram\n\
+    mov r0, sp\n\
+    ldrb r0, [r0, 0x8]\n\
+    ldr r1, [sp, 0x4]\n\
+    movs r2, 0\n\
+    movs r3, 0x1\n\
+    bl sub_80763FC\n\
+_080D39CE:\n\
+    ldr r0, _080D39F4 @ =gBattleAnimBackgroundImage_Surf\n\
+    ldr r1, [sp]\n\
+    bl LZDecompressVram\n\
+    ldr r0, _080D39F8 @ =gBattleAnimArgs\n\
+    movs r1, 0\n\
+    ldrsh r0, [r0, r1]\n\
+    cmp r0, 0\n\
+    bne _080D3A00\n\
+    ldr r0, _080D39FC @ =gBattleAnimBackgroundPalette_Surf\n\
+    mov r1, sp\n\
+    ldrb r1, [r1, 0x8]\n\
+    lsls r1, 4\n\
+    movs r2, 0x20\n\
+    bl LoadCompressedPalette\n\
+    b _080D3A0E\n\
+    .align 2, 0\n\
+_080D39F0: .4byte gUnknown_08E70F0C\n\
+_080D39F4: .4byte gBattleAnimBackgroundImage_Surf\n\
+_080D39F8: .4byte gBattleAnimArgs\n\
+_080D39FC: .4byte gBattleAnimBackgroundPalette_Surf\n\
+_080D3A00:\n\
+    ldr r0, _080D3A78 @ =gBattleAnimBackgroundImageMuddyWater_Pal\n\
+    mov r1, sp\n\
+    ldrb r1, [r1, 0x8]\n\
+    lsls r1, 4\n\
+    movs r2, 0x20\n\
+    bl LoadCompressedPalette\n\
+_080D3A0E:\n\
+    ldr r0, _080D3A7C @ =sub_80D3D68\n\
+    ldr r4, _080D3A80 @ =gTasks\n\
+    mov r2, r10\n\
+    lsls r5, r2, 2\n\
+    adds r1, r5, r2\n\
+    lsls r1, 3\n\
+    adds r6, r1, r4\n\
+    ldrb r1, [r6, 0x7]\n\
+    adds r1, 0x1\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    bl CreateTask\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
+    movs r3, 0\n\
+    mov r9, r3\n\
+    mov r0, r8\n\
+    strh r0, [r6, 0x26]\n\
+    mov r1, r8\n\
+    lsls r0, r1, 2\n\
+    add r0, r8\n\
+    lsls r0, 3\n\
+    adds r7, r0, r4\n\
+    mov r2, r9\n\
+    strh r2, [r7, 0x8]\n\
+    movs r0, 0x80\n\
+    lsls r0, 5\n\
+    strh r0, [r7, 0xA]\n\
+    strh r0, [r7, 0xC]\n\
+    bl NotInBattle\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    cmp r4, 0\n\
+    beq _080D3A94\n\
+    ldr r3, _080D3A84 @ =0x0000ffb0\n\
+    adds r0, r3, 0\n\
+    ldr r1, _080D3A88 @ =gUnknown_030042C0\n\
+    strh r0, [r1]\n\
+    ldr r2, _080D3A8C @ =0x0000ffd0\n\
+    adds r0, r2, 0\n\
+    ldr r3, _080D3A90 @ =gUnknown_030041B4\n\
+    strh r0, [r3]\n\
+    movs r0, 0x2\n\
+    strh r0, [r6, 0x8]\n\
+    movs r0, 0x1\n\
+    strh r0, [r6, 0xA]\n\
+    mov r0, r9\n\
+    strh r0, [r7, 0xE]\n\
+    b _080D3AEE\n\
+    .align 2, 0\n\
+_080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal\n\
+_080D3A7C: .4byte sub_80D3D68\n\
+_080D3A80: .4byte gTasks\n\
+_080D3A84: .4byte 0x0000ffb0\n\
+_080D3A88: .4byte gUnknown_030042C0\n\
+_080D3A8C: .4byte 0x0000ffd0\n\
+_080D3A90: .4byte gUnknown_030041B4\n\
+_080D3A94:\n\
+    ldr r0, _080D3AC4 @ =gBattleAnimBankAttacker\n\
+    ldrb r0, [r0]\n\
+    bl GetBankSide\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r1, 0x1\n\
+    bne _080D3AD8\n\
+    ldr r2, _080D3AC8 @ =0x0000ff20\n\
+    adds r0, r2, 0\n\
+    ldr r3, _080D3ACC @ =gUnknown_030042C0\n\
+    strh r0, [r3]\n\
+    movs r2, 0x80\n\
+    lsls r2, 1\n\
+    adds r0, r2, 0\n\
+    ldr r3, _080D3AD0 @ =gUnknown_030041B4\n\
+    strh r0, [r3]\n\
+    movs r0, 0x2\n\
+    strh r0, [r6, 0x8]\n\
+    ldr r0, _080D3AD4 @ =0x0000ffff\n\
+    strh r0, [r6, 0xA]\n\
+    strh r1, [r7, 0xE]\n\
+    b _080D3AEE\n\
+    .align 2, 0\n\
+_080D3AC4: .4byte gBattleAnimBankAttacker\n\
+_080D3AC8: .4byte 0x0000ff20\n\
+_080D3ACC: .4byte gUnknown_030042C0\n\
+_080D3AD0: .4byte gUnknown_030041B4\n\
+_080D3AD4: .4byte 0x0000ffff\n\
+_080D3AD8:\n\
+    ldr r0, _080D3B1C @ =gUnknown_030042C0\n\
+    strh r4, [r0]\n\
+    ldr r1, _080D3B20 @ =0x0000ffd0\n\
+    adds r0, r1, 0\n\
+    ldr r2, _080D3B24 @ =gUnknown_030041B4\n\
+    strh r0, [r2]\n\
+    ldr r0, _080D3B28 @ =0x0000fffe\n\
+    strh r0, [r6, 0x8]\n\
+    movs r0, 0x1\n\
+    strh r0, [r6, 0xA]\n\
+    strh r4, [r7, 0xE]\n\
+_080D3AEE:\n\
+    ldr r1, _080D3B2C @ =REG_BG1HOFS\n\
+    ldr r3, _080D3B1C @ =gUnknown_030042C0\n\
+    ldrh r0, [r3]\n\
+    strh r0, [r1]\n\
+    adds r1, 0x2\n\
+    ldr r2, _080D3B24 @ =gUnknown_030041B4\n\
+    ldrh r0, [r2]\n\
+    strh r0, [r1]\n\
+    ldr r1, _080D3B30 @ =gTasks\n\
+    mov r3, r8\n\
+    lsls r0, r3, 2\n\
+    add r0, r8\n\
+    lsls r0, 3\n\
+    adds r2, r0, r1\n\
+    movs r3, 0xE\n\
+    ldrsh r0, [r2, r3]\n\
+    cmp r0, 0\n\
+    bne _080D3B34\n\
+    movs r0, 0x30\n\
+    strh r0, [r2, 0x10]\n\
+    movs r0, 0x70\n\
+    b _080D3B38\n\
+    .align 2, 0\n\
+_080D3B1C: .4byte gUnknown_030042C0\n\
+_080D3B20: .4byte 0x0000ffd0\n\
+_080D3B24: .4byte gUnknown_030041B4\n\
+_080D3B28: .4byte 0x0000fffe\n\
+_080D3B2C: .4byte REG_BG1HOFS\n\
+_080D3B30: .4byte gTasks\n\
+_080D3B34:\n\
+    movs r0, 0\n\
+    strh r0, [r2, 0x10]\n\
+_080D3B38:\n\
+    strh r0, [r2, 0x12]\n\
+    mov r2, r10\n\
+    adds r0, r5, r2\n\
+    lsls r0, 3\n\
+    adds r0, r1\n\
+    movs r1, 0x1\n\
+    strh r1, [r0, 0x14]\n\
+    ldr r1, _080D3B5C @ =sub_80D3B60\n\
+    str r1, [r0]\n\
+    add sp, 0x14\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_080D3B5C: .4byte sub_80D3B60\n\
+    .syntax divided\n");
+}
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
new file mode 100644
index 000000000..0e13fa119
--- /dev/null
+++ b/src/battle/anim/wisp_orb.c
@@ -0,0 +1,105 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "constants/songs.h"
+#include "rom_8077ABC.h"
+#include "sound.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern u16 gBattleTypeFlags;
+extern u8 gUnknown_0202F7D2;
+
+static void sub_80D5C5C(struct Sprite *);
+
+// wisp_orb (animates the wisp orbs)
+// Used in Will-O-Wisp
+
+void sub_80D5B0C(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        sub_80787B0(sprite, 0);
+        StartSpriteAnim(sprite, gBattleAnimArgs[2]);
+        sprite->data[7] = gBattleAnimArgs[2];
+
+        if (GetBankSide(gBattleAnimBankAttacker) != 0)
+        {
+            sprite->data[4] = 4;
+        }
+        else
+        {
+            sprite->data[4] = -4;
+        }
+
+        sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget);
+        sprite->data[0]++;
+        break;
+    case 1:
+        sprite->data[1] += 192;
+        if (GetBankSide(gBattleAnimBankAttacker) != 0)
+        {
+            sprite->pos2.y = -(sprite->data[1] >> 8);
+        }
+        else
+        {
+            sprite->pos2.y = sprite->data[1] >> 8;
+        }
+
+        sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]);
+        sprite->data[2] = (sprite->data[2] + 4) & 0xFF;
+
+        if (++sprite->data[3] == 1)
+        {
+            sprite->data[3] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 2:
+        sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]);
+        sprite->data[2] = (sprite->data[2] + 4) & 0xFF;
+        
+        if (++sprite->data[3] == 31)
+        {
+            sprite->pos1.x += sprite->pos2.x;
+            sprite->pos1.y += sprite->pos2.y;
+            sprite->pos2.y = 0;
+            sprite->pos2.x = 0;
+
+            sprite->data[0] = 256;
+            sprite->data[1] = sprite->pos1.x;
+            sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+            sprite->data[3] = sprite->pos1.y;
+            sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+
+            sub_8078BD4(sprite);
+            sprite->callback = sub_80D5C5C;
+        }
+        break;
+    }
+}
+
+static void sub_80D5C5C(struct Sprite *sprite)
+{
+    s16 initialData5;
+    s16 newData5;
+
+    if (!sub_8078B5C(sprite))
+    {
+        sprite->pos2.x += Sin(sprite->data[5], 16);
+        initialData5 = sprite->data[5];
+        sprite->data[5] = (sprite->data[5] + 4) & 0xFF;
+        newData5 = sprite->data[5];
+
+        if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0)
+        {
+            PlaySE12WithPanning(SE_W172, gUnknown_0202F7D2);
+        }
+    }
+    else
+    {
+        move_anim_8072740(sprite);
+    }
+}
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index 342395c34..f627e50f0 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -3137,15 +3137,15 @@ u8 IsPokeDisobedient(void)
     if (gBattleTypeFlags & BATTLE_TYPE_LINK
      || GetBankSide(gBankAttacker) == 1
      || !IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName)
-     || FlagGet(BADGE08_GET))
+     || FlagGet(FLAG_BADGE08_GET))
         return 0;
 
     obedienceLevel = 10;
-    if (FlagGet(BADGE02_GET))
+    if (FlagGet(FLAG_BADGE02_GET))
         obedienceLevel = 30;
-    if (FlagGet(BADGE04_GET))
+    if (FlagGet(FLAG_BADGE04_GET))
         obedienceLevel = 50;
-    if (FlagGet(BADGE06_GET))
+    if (FlagGet(FLAG_BADGE06_GET))
         obedienceLevel = 70;
 
     if (gBattleMons[gBankAttacker].level <= obedienceLevel)
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 653f0938c..c2d34db0d 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -162,7 +162,7 @@ extern u8 gUnknown_0300434C[];
 extern u8 gUnknown_0202E8F4;
 extern u8 gUnknown_0202E8F5;
 extern u8 gUnknown_02038470[];
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gDisplayedStringBattle[];
 extern const u8 BattleText_LinkStandby[];
 
@@ -1522,7 +1522,7 @@ void sub_802E03C(void)
 {
     if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
     {
-        Emitcmd35(1, gScriptItemId);
+        Emitcmd35(1, gSpecialVar_ItemId);
         PlayerBufferExecCompleted();
     }
 }
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 3dcfca948..6f6286945 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -31,7 +31,7 @@ extern u8 gObjectBankIDs[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u16 gBattleTypeFlags;
 extern u32 gBattleExecBuffer;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern MainCallback gPreBattleCallback1;
 extern u8 gBankInMenu;
 extern u8 gHealthboxIDs[];
@@ -315,7 +315,7 @@ void sub_812B758(void)
 {
     if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
     {
-        Emitcmd35(1, gScriptItemId);
+        Emitcmd35(1, gSpecialVar_ItemId);
         SafariBufferExecCompleted();
     }
 }
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 0d698d9a5..d81c43381 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -367,7 +367,7 @@ void sub_81374FC(void)
     if (gMain.callback2 == sub_800F808
      && !gPaletteFade.active)
     {
-        Emitcmd35(1, gScriptItemId);
+        Emitcmd35(1, gSpecialVar_ItemId);
         WallyBufferExecCompleted();
     }
 }
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index fb045c8a7..6faa3ace3 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -762,7 +762,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                 HANDLE_NICKNAME_STRING_CASE(BATTLE_STRUCT->scriptingActive, BATTLE_STRUCT->unk1605E)
                 break;
             case 35: // lanette pc
-                if (FlagGet(SYS_PC_LANETTE))
+                if (FlagGet(FLAG_SYS_PC_LANETTE))
                     toCpy = BattleText_Lanette;
                 else
                     toCpy = BattleText_Someone;
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index 5decf8a7b..d4dcae0ca 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -426,7 +426,7 @@ bool8 SetUpBattlePartyMenu(void)
     case 10:
         if (gUnknown_02038473 == 3)
         {
-            if (GetItemEffectType(gScriptItemId) == 10)
+            if (GetItemEffectType(gSpecialVar_ItemId) == 10)
                 ewram1B000.promptTextId = 0xFF;
             else
                 ewram1B000.promptTextId = 3;
@@ -464,9 +464,9 @@ void HandleBattlePartyMenu(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        if (gUnknown_02038473 == 3 && GetItemEffectType(gScriptItemId) == 10)
+        if (gUnknown_02038473 == 3 && GetItemEffectType(gSpecialVar_ItemId) == 10)
         {
-            gUnknown_03004AE4(taskId, gScriptItemId, Task_80952E4);
+            gUnknown_03004AE4(taskId, gSpecialVar_ItemId, Task_80952E4);
             return;
         }
 
@@ -480,7 +480,7 @@ void HandleBattlePartyMenu(u8 taskId)
                 else
                 {
                     sub_806D5A4();
-                    gUnknown_03004AE4(taskId, gScriptItemId, Task_80952E4);
+                    gUnknown_03004AE4(taskId, gSpecialVar_ItemId, Task_80952E4);
                 }
             }
             else
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 9f51c2878..f71aad090 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -33,7 +33,7 @@
 #include "text.h"
 #include "trainer.h"
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 extern void (*gFieldCallback)(void);
 
@@ -48,7 +48,7 @@ EWRAM_DATA static u8 *sTrainerBattleScriptRetAddr = NULL;
 EWRAM_DATA static u8 *sTrainerBattleEndScript = NULL;
 
 extern u16 gBattleTypeFlags;
-extern u16 gScriptLastTalked;
+extern u16 gSpecialVar_LastTalked;
 extern u8 gBattleOutcome;
 
 extern struct MapObject gMapObjects[];
@@ -441,7 +441,17 @@ const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
     },
 };
 
-static const u16 sBadgeFlags[] = {BADGE01_GET, BADGE02_GET, BADGE03_GET, BADGE04_GET, BADGE05_GET, BADGE06_GET, BADGE07_GET, BADGE08_GET};
+static const u16 sBadgeFlags[] =
+{
+    FLAG_BADGE01_GET,
+    FLAG_BADGE02_GET,
+    FLAG_BADGE03_GET,
+    FLAG_BADGE04_GET,
+    FLAG_BADGE05_GET,
+    FLAG_BADGE06_GET,
+    FLAG_BADGE07_GET,
+    FLAG_BADGE08_GET,
+};
 
 static void DoStandardWildBattle(void);
 static void DoSafariBattle(void);
@@ -848,8 +858,8 @@ static void CB2_GiveStarter(void)
 {
     u16 starterPoke;
 
-    *GetVarPointer(0x4023) = gScriptResult;
-    starterPoke = GetStarterPokemon(gScriptResult);
+    *GetVarPointer(0x4023) = gSpecialVar_Result;
+    starterPoke = GetStarterPokemon(gSpecialVar_Result);
     ScriptGiveMon(starterPoke, 5, 0, 0, 0, 0);
     ResetTasks();
     sub_80408BC();
@@ -970,7 +980,7 @@ static void battle_80801F0(void)
 {
     if (sTrainerMapObjectLocalId)
     {
-        gScriptLastTalked = sTrainerMapObjectLocalId;
+        gSpecialVar_LastTalked = sTrainerMapObjectLocalId;
         gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
     }
 }
@@ -1019,7 +1029,7 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
 void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript)
 {
     gSelectedMapObject = trainerMapObjId;
-    gScriptLastTalked = gMapObjects[trainerMapObjId].localId;
+    gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId;
     BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
     ScriptContext1_SetupScript(gUnknown_0819F80B);
     ScriptContext2_Enable();
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index f9ac03075..5c91b3657 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
@@ -90,7 +90,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             && gTrainerBattleOpponent != 1024
-            && FlagGet(BADGE01_GET)
+            && FlagGet(FLAG_BADGE01_GET)
             && !GetBankSide(bankAtk))
             attack = (110 * attack) / 100;
     }
@@ -98,7 +98,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             && gTrainerBattleOpponent != 1024
-            && FlagGet(BADGE05_GET)
+            && FlagGet(FLAG_BADGE05_GET)
             && !GetBankSide(bankDef))
             defense = (110 * defense) / 100;
     }
@@ -106,7 +106,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             && gTrainerBattleOpponent != 1024
-            && FlagGet(BADGE07_GET)
+            && FlagGet(FLAG_BADGE07_GET)
             && !GetBankSide(bankAtk))
             spAttack = (110 * spAttack) / 100;
     }
@@ -114,7 +114,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             && gTrainerBattleOpponent != 1024
-            && FlagGet(BADGE07_GET)
+            && FlagGet(FLAG_BADGE07_GET)
             && !GetBankSide(bankDef))
             spDefense = (110 * spDefense) / 100;
     }
diff --git a/src/battle/post_battle_event_funcs.c b/src/battle/post_battle_event_funcs.c
index 27d7022fe..0617763f6 100644
--- a/src/battle/post_battle_event_funcs.c
+++ b/src/battle/post_battle_event_funcs.c
@@ -16,14 +16,14 @@ int GameClear(void)
 
     ScrSpecial_HealPlayerParty();
 
-    if (FlagGet(SYS_GAME_CLEAR) == TRUE)
+    if (FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE)
     {
         gUnknown_02039324 = 1;
     }
     else
     {
         gUnknown_02039324 = 0;
-        FlagSet(SYS_GAME_CLEAR);
+        FlagSet(FLAG_SYS_GAME_CLEAR);
     }
 
     if (!GetGameStat(1))
@@ -55,7 +55,7 @@ int GameClear(void)
     if (ribbonGet == TRUE)
     {
         IncrementGameStat(42);
-        FlagSet(SYS_RIBBON_GET);
+        FlagSet(FLAG_SYS_RIBBON_GET);
     }
 
     SetMainCallback2(sub_8141F90);
diff --git a/src/contest.c b/src/contest.c
index 6eb684526..10f02642b 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -206,8 +206,8 @@ struct UnknownContestStruct6
 #define shared19348_ (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348))
 
 extern struct MusicPlayerInfo gMPlay_SE1;
-extern u16 gScriptContestCategory;
-extern u16 gScriptContestRank;
+extern u16 gSpecialVar_ContestCategory;
+extern u16 gSpecialVar_ContestRank;
 extern u8 gBattleMonForms[];
 extern u8 gDisplayedStringBattle[];
 extern u16 gBattleTypeFlags;
@@ -2265,7 +2265,7 @@ u8 sub_80AE47C(struct Pokemon *pkmn)
         return 3;
     if (GetMonData(pkmn, MON_DATA_HP) == 0)
         return 4;
-    switch (gScriptContestCategory)
+    switch (gSpecialVar_ContestCategory)
     {
     case 0:
         ribbon = GetMonData(pkmn, MON_DATA_COOL_RIBBON);
@@ -2289,9 +2289,9 @@ u8 sub_80AE47C(struct Pokemon *pkmn)
     // Couldn't get this to match any other way.
     // Returns 2, 1, or 0 respectively if ribbon's rank is above, equal, or below
     // the current contest rank.
-    if (ribbon > gScriptContestRank)
+    if (ribbon > gSpecialVar_ContestRank)
         retVal = 2;
-    else if (ribbon >= gScriptContestRank)
+    else if (ribbon >= gSpecialVar_ContestRank)
         retVal = 1;
     else
         retVal = 0;
@@ -4822,7 +4822,7 @@ void unref_sub_80B19D0(void)
 
 s8 Contest_GetMoveExcitement(u16 move)
 {
-    return gContestExcitementTable[gScriptContestCategory][gContestMoves[move].contestCategory];
+    return gContestExcitementTable[gSpecialVar_ContestCategory][gContestMoves[move].contestCategory];
 }
 
 u8 sub_80B1A2C(void)
@@ -5477,7 +5477,7 @@ bool8 sub_80B2A7C(u8 a)
     }
     if (a == 0xFF && i != gContestPlayerMonIndex)
         return FALSE;
-    switch (gScriptContestCategory)
+    switch (gSpecialVar_ContestCategory)
     {
     case 0:
         r7 += 0;
@@ -5505,7 +5505,7 @@ bool8 sub_80B2A7C(u8 a)
         StringCopy(gSaveBlock1.contestWinners[r4].nickname, gContestMons[i].nickname);
         StringCopy(gSaveBlock1.contestWinners[r4].trainerName, gContestMons[i].trainerName);
         if (a != 0xFF)
-            gSaveBlock1.contestWinners[r4].contestCategory = gScriptContestCategory;
+            gSaveBlock1.contestWinners[r4].contestCategory = gSpecialVar_ContestCategory;
         else
             gSaveBlock1.contestWinners[r4].contestCategory = r7;
     }
@@ -5548,7 +5548,7 @@ u8 sub_80B2C4C(u8 a, u8 b)
         }
         return 5;
     default:
-        switch (gScriptContestCategory)
+        switch (gSpecialVar_ContestCategory)
         {
         case 0:
             return 8;
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 246d2895c..036925c7f 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -26,8 +26,8 @@ extern u8 gUnknown_02038694;
 extern u8 gIsLinkContest;
 extern u8 gUnknown_0203869B;
 extern u8 gContestPlayerMonIndex;
-extern u16 gScriptContestCategory;
-extern u16 gScriptContestRank;
+extern u16 gSpecialVar_ContestCategory;
+extern u16 gSpecialVar_ContestRank;
 
 extern u16 gUnknown_030042A4;
 extern u16 gUnknown_030042A0;
@@ -359,7 +359,7 @@ static void sub_80A9D58(u8 taskId)
        dest[i] = gTasks[taskId].data[5 + i];
 
    gUnknown_0203869B = sub_80C4B34(dest);
-   sub_80AE82C((u8)gScriptContestCategory);
+   sub_80AE82C((u8)gSpecialVar_ContestCategory);
    sub_80B0F28(0);
    SetTaskFuncWithFollowupFunc(taskId, sub_80C8EBC, sub_80A9DBC);
 }
@@ -551,10 +551,10 @@ static void sub_80AA10C(void)
             gMatsudaDebugMenuContestTopLeft[i][1]);
     }
 
-    gScriptContestCategory = gScriptContestRank = 0;
+    gSpecialVar_ContestCategory = gSpecialVar_ContestRank = 0;
     zero = 0; // it's possible this was some assignment that matsuda used to quickly edit and test things without changing whats passed to the later functions.
     sub_80AA5BC(zero);
-    sub_80AA5E8(gScriptContestRank);
+    sub_80AA5E8(gSpecialVar_ContestRank);
     sub_8003460(&gMenuWindow, gMatsudaDebugMenu_GoBackText, 0xD6, 0x12, 0x12);
     sub_8003460(&gMenuWindow, gMatsudaDebugMenu_BattlePointsText, 0xDC, zero, 0xC);
     LoadSpriteSheet(gUnknown_083C92B4);
@@ -867,8 +867,8 @@ void sub_80AABF0(struct Sprite *sprite, s8 var2)
         r4 = 4;
     sub_80AA5BC(r4);
     sprite->data[3] = r4;
-    gScriptContestCategory = sprite->data[3];
-    sub_80AE398(sprite->data[3], gScriptContestRank);
+    gSpecialVar_ContestCategory = sprite->data[3];
+    sub_80AE398(sprite->data[3], gSpecialVar_ContestRank);
     sub_80AA280(sprite->data[2]);
     sub_80AA658(sprite->data[2]);
 }
@@ -876,13 +876,13 @@ void sub_80AABF0(struct Sprite *sprite, s8 var2)
 void sub_80AAC5C(struct Sprite *sprite, s8 var2)
 {
     if (var2 > 0)
-        gScriptContestRank++;
-    else if (gScriptContestRank != 0)
-        gScriptContestRank--;
-    if (gScriptContestRank > 3)
-        gScriptContestRank = 3;
-    sub_80AA5E8(gScriptContestRank);
-    sub_80AE398(gScriptContestCategory, gScriptContestRank);
+        gSpecialVar_ContestRank++;
+    else if (gSpecialVar_ContestRank != 0)
+        gSpecialVar_ContestRank--;
+    if (gSpecialVar_ContestRank > 3)
+        gSpecialVar_ContestRank = 3;
+    sub_80AA5E8(gSpecialVar_ContestRank);
+    sub_80AE398(gSpecialVar_ContestCategory, gSpecialVar_ContestRank);
     sub_80AA280(sprite->data[2]);
     sub_80AA658(sprite->data[2]);
 }
@@ -917,7 +917,7 @@ void sub_80AAD44(struct Sprite *sprite, s8 var2)
 
         SetDebugMonForContest();
         for (i = 0; i < 4; i++)
-            gUnknown_02038670[i] = sub_80AE770(i, gScriptContestCategory);
+            gUnknown_02038670[i] = sub_80AE770(i, gSpecialVar_ContestCategory);
         SetMainCallback2(sub_805469C);
     }
 }
@@ -1198,7 +1198,7 @@ u8 MatsudaDebugMenu_SetArtMuseumItems(void)
     CreatePlayerContestMon(0);
     for (i = 3; i > -1; i--)
         gUnknown_02038690[i] = 3 - i;
-    for (gScriptContestCategory = 0; gScriptContestCategory < 5; gScriptContestCategory++)
+    for (gSpecialVar_ContestCategory = 0; gSpecialVar_ContestCategory < 5; gSpecialVar_ContestCategory++)
         sub_80B2A7C(0xFF);
     CloseMenu();
     return 1;
diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c
index 4dda372f4..3187de7ed 100644
--- a/src/engine/cable_club.c
+++ b/src/engine/cable_club.c
@@ -23,7 +23,7 @@
 #include "text.h"
 #include "trainer_card.h"
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern struct TrainerCard gTrainerCards[4];
 extern u8 gUnknown_03004860;
 extern u8 gFieldLinkPlayerCount;
@@ -343,8 +343,8 @@ static void sub_8083188(u8 taskId)
     }
     else
     {
-        gScriptResult = sub_8082D9C(local1, local2);
-        if (gScriptResult != 0)
+        gSpecialVar_Result = sub_8082D9C(local1, local2);
+        if (gSpecialVar_Result != 0)
             gTasks[taskId].func = sub_8083288;
     }
 }
@@ -360,10 +360,10 @@ void sub_80831F8(u8 taskId)
      || sub_8082DF4(taskId) == TRUE)
         return;
 
-    gScriptResult = sub_8082D9C(local1, local2);
-    if (gScriptResult == 0)
+    gSpecialVar_Result = sub_8082D9C(local1, local2);
+    if (gSpecialVar_Result == 0)
         return;
-    if (gScriptResult == 3)
+    if (gSpecialVar_Result == 3)
     {
         sub_800832C();
         HideFieldMessageBox();
@@ -384,7 +384,7 @@ static void sub_8083288(u8 taskId)
     if (sub_8082DF4(taskId) == TRUE)
         return;
 
-    if (gScriptResult == 3)
+    if (gSpecialVar_Result == 3)
     {
         sub_800832C();
         HideFieldMessageBox();
@@ -425,7 +425,7 @@ static void sub_8083314(u8 taskId)
     ResetBlockReceivedFlags();
     HideFieldMessageBox();
 
-    if (gScriptResult == 1)
+    if (gSpecialVar_Result == 1)
     {
 #if ENGLISH
         u16 linkType;
@@ -461,7 +461,7 @@ static void sub_80833C4(u8 taskId)
 
 static void sub_80833EC(u8 taskId)
 {
-    gScriptResult = 5;
+    gSpecialVar_Result = 5;
     sub_8082D4C();
     HideFieldMessageBox();
     EnableBothScriptContexts();
@@ -470,7 +470,7 @@ static void sub_80833EC(u8 taskId)
 
 static void sub_8083418(u8 taskId)
 {
-    gScriptResult = 6;
+    gSpecialVar_Result = 6;
     sub_8082D4C();
     HideFieldMessageBox();
     EnableBothScriptContexts();
@@ -523,7 +523,7 @@ void sub_80834E4(void)
 
 void sub_808350C(void)
 {
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     gLinkType = 0x3311;
     gBattleTypeFlags = 0;
     sub_8082CD4(2, 4);
@@ -537,14 +537,14 @@ static void sub_808353C(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        if (gScriptResult == 1)
+        if (gSpecialVar_Result == 1)
         {
             playerCount = GetLinkPlayerCount();
             for (i = 0; i < playerCount; i++)
             {
                 if (gLinkPlayers[i].language == LANGUAGE_JAPANESE)
                 {
-                    gScriptResult = 7;
+                    gSpecialVar_Result = 7;
                     sub_8008480();
                     gTasks[taskId].data[0] = 1;
                     return;
diff --git a/src/engine/clock.c b/src/engine/clock.c
index cb8af64a8..416aaa6bb 100644
--- a/src/engine/clock.c
+++ b/src/engine/clock.c
@@ -20,7 +20,7 @@ static void ReturnFromStartWallClock(void);
 
 static void InitTimeBasedEvents(void)
 {
-    FlagSet(SYS_CLOCK_SET);
+    FlagSet(FLAG_SYS_CLOCK_SET);
     RtcCalcLocalTime();
     gSaveBlock2.lastBerryTreeUpdate = gLocalTime;
     VarSet(VAR_DAYS, gLocalTime.days);
@@ -28,7 +28,7 @@ static void InitTimeBasedEvents(void)
 
 void DoTimeBasedEvents(void)
 {
-    if (FlagGet(SYS_CLOCK_SET))
+    if (FlagGet(FLAG_SYS_CLOCK_SET))
     {
         RtcCalcLocalTime();
         UpdatePerDay(&gLocalTime);
@@ -45,7 +45,7 @@ static void UpdatePerDay(struct Time *time)
     if (days != time->days && days <= time->days)
     {
         newDays = time->days - days;
-        ClearUpperFlags();
+        ClearDailyFlags();
         UpdateDewfordTrendPerDay(newDays);
         UpdateTVShowsPerDay(newDays);
         UpdateWeatherPerDay(newDays);
diff --git a/src/engine/link.c b/src/engine/link.c
index 27afef937..28323207c 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -635,7 +635,7 @@ static void BuildSendCmd(u16 code)
         break;
     case 0xAAAB:
         gSendCmd[0] = 0xAAAB;
-        gSendCmd[1] = gScriptItemId;
+        gSendCmd[1] = gSpecialVar_ItemId;
         break;
     case 0xCCCC:
         gSendCmd[0] = 0xCCCC;
diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 2624837c7..6cb1e54b2 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -131,7 +131,7 @@ void Task_RecordMixing_Main(u8 taskId)
         if (!gTasks[data[10]].isActive)
         {
             tState = 2;
-            FlagSet(SYS_MIX_RECORD);
+            FlagSet(FLAG_SYS_MIX_RECORD);
             DestroyRecordMixingSprite();
             DestroyTask(tSndEffTaskId);
         }
@@ -1019,7 +1019,7 @@ void sub_80B9F3C(u16 *a, u8 b)
                 VarSet(VAR_0x4001, *a);
                 StringCopy(gStringVar1, gLinkPlayers[0].name);
                 if (*a == ITEM_EON_TICKET)
-                    FlagSet(SYS_HAS_EON_TICKET);
+                    FlagSet(FLAG_SYS_HAS_EON_TICKET);
             }
             else
             {
diff --git a/src/engine/save_menu_util.c b/src/engine/save_menu_util.c
index a2d17bd36..771cb72c7 100644
--- a/src/engine/save_menu_util.c
+++ b/src/engine/save_menu_util.c
@@ -15,7 +15,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top)
     if (IsResizeSaveWindowEnabled())
         width = 13;
 
-    if (FlagGet(SYS_POKEDEX_GET))
+    if (FlagGet(FLAG_SYS_POKEDEX_GET))
     {
         // print info + dex information.
         MenuDrawTextWindow(left, top, left + width, top + 11);
@@ -44,7 +44,7 @@ void HandleCloseSaveWindow(u16 left, u16 top)
     if (IsResizeSaveWindowEnabled())
         width = 13;
 
-    if (FlagGet(SYS_POKEDEX_GET))
+    if (FlagGet(FLAG_SYS_POKEDEX_GET))
         MenuZeroFillWindowRect(left, top, left + width, top + 11);
     else
         MenuZeroFillWindowRect(left, top, left + width, top + 9);
@@ -106,7 +106,7 @@ u8 GetBadgeCount(void)
     u8 badgeCount = 0;
     int badgeFlag;
 
-    for (badgeFlag = BADGE01_GET; badgeFlag <= BADGE08_GET; badgeFlag++)
+    for (badgeFlag = FLAG_BADGE01_GET; badgeFlag <= FLAG_BADGE08_GET; badgeFlag++)
         if (FlagGet(badgeFlag))
             badgeCount++;
 
diff --git a/src/engine/sprite.c b/src/engine/sprite.c
index 69fa860c1..c1bb36917 100644
--- a/src/engine/sprite.c
+++ b/src/engine/sprite.c
@@ -26,14 +26,6 @@
 
 #define SPRITE_TILE_IS_ALLOCATED(n) ((gSpriteTileAllocBitmap[(n) / 8] >> ((n) % 8)) & 1)
 
-struct OamMatrix
-{
-    s16 a;
-    s16 b;
-    s16 c;
-    s16 d;
-};
-
 struct SpriteCopyRequest
 {
     const u8 *src;
diff --git a/src/engine/time_events.c b/src/engine/time_events.c
index 831048add..3e3054aa3 100644
--- a/src/engine/time_events.c
+++ b/src/engine/time_events.c
@@ -85,9 +85,9 @@ void UpdateShoalTideFlag(void)
     {
         RtcCalcLocalTime();
         if (tide[gLocalTime.hours])
-            FlagSet(SYS_SHOAL_TIDE);
+            FlagSet(FLAG_SYS_SHOAL_TIDE);
         else
-            FlagClear(SYS_SHOAL_TIDE);
+            FlagClear(FLAG_SYS_SHOAL_TIDE);
     }
 }
 
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 06a6b96c7..0567b4d2f 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -5696,7 +5696,7 @@ static void sub_804E1DC(void)
         numRibbons += GetMonData(&gEnemyParty[gUnknown_020297D8[1] % 6], MON_DATA_CHAMPION_RIBBON + i);
     }
     if (numRibbons != 0)
-        FlagSet(SYS_RIBBON_GET);
+        FlagSet(FLAG_SYS_RIBBON_GET);
 }
 
 void sub_804E22C(void)
diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index 468890ca5..207fa5f77 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -323,7 +323,7 @@ void sub_8093390(struct TrainerCard *trainerCard)
     trainerCard->firstHallOfFameB = (playTime >> 8) & 0xFF;
     trainerCard->firstHallOfFameC = playTime & 0xFF;
 
-    trainerCard->hasPokedex = FlagGet(SYS_POKEDEX_GET);
+    trainerCard->hasPokedex = FlagGet(FLAG_SYS_POKEDEX_GET);
     trainerCard->var_3 = sub_8090FC0();
     trainerCard->pokedexSeen = GetPokedexSeenCount();
 
@@ -543,14 +543,14 @@ void sub_80936D4(void)
         u32 badgeFlag;
         int i = 0;
 
-        badgeFlag = BADGE01_GET;
+        badgeFlag = FLAG_BADGE01_GET;
         while (1)
         {
             if (FlagGet(badgeFlag))
                 ewram0_2.var_e[i]++;
             badgeFlag++;
             i++;
-            if (badgeFlag > BADGE08_GET)
+            if (badgeFlag > FLAG_BADGE08_GET)
             {
                 break;
             }
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index db822f71b..6b6064c16 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -350,7 +350,7 @@ bool8 ShouldBattleEReaderTrainer(u8 levelType, u16 winStreak)
 
     ValidateEReaderTrainer();
 
-    if (gScriptResult != 0 || gSaveBlock2.battleTower.ereaderTrainer.winStreak != winStreak)
+    if (gSpecialVar_Result != 0 || gSaveBlock2.battleTower.ereaderTrainer.winStreak != winStreak)
     {
         return FALSE;
     }
@@ -1516,7 +1516,7 @@ void CheckPartyBattleTowerBanlist(void)
         level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
         hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
 
-        CheckMonBattleTowerBanlist(species2, heldItem, hp, gScriptResult, level, validPartySpecies, validPartyHeldItems, &counter);
+        CheckMonBattleTowerBanlist(species2, heldItem, hp, gSpecialVar_Result, level, validPartySpecies, validPartyHeldItems, &counter);
     }
 
     if (counter < 3)
@@ -1549,7 +1549,7 @@ void CheckPartyBattleTowerBanlist(void)
     else
     {
         gSpecialVar_0x8004 = 0;
-        gSaveBlock2.battleTower.battleTowerLevelType = gScriptResult;
+        gSaveBlock2.battleTower.battleTowerLevelType = gSpecialVar_Result;
     }
 }
 
@@ -1700,7 +1700,7 @@ void sub_8135668(void)
 
         gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType]++;
         sub_8135A3C();
-        gScriptResult = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType];
+        gSpecialVar_Result = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType];
 
         gStringVar1[0] = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType] + 0xA1;
         gStringVar1[1] = 0xFF;
@@ -1712,7 +1712,7 @@ void sub_8135668(void)
         }
 
         sub_8135A3C();
-        gScriptResult = gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType];
+        gSpecialVar_Result = gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType];
         break;
     case 8:
         gSaveBlock2.battleTower.unk_554 = gSpecialVar_0x8005;
@@ -1747,29 +1747,29 @@ void sub_81358A4(void)
     switch (gSpecialVar_0x8004)
     {
     case 0:
-        gScriptResult = gSaveBlock2.battleTower.var_4AE[battleTowerLevelType];
+        gSpecialVar_Result = gSaveBlock2.battleTower.var_4AE[battleTowerLevelType];
         break;
     case 1:
-        gScriptResult = gSaveBlock2.battleTower.battleTowerLevelType;
+        gSpecialVar_Result = gSaveBlock2.battleTower.battleTowerLevelType;
         break;
     case 2:
-        gScriptResult = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType];
+        gSpecialVar_Result = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType];
         break;
     case 3:
-        gScriptResult = gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType];
+        gSpecialVar_Result = gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType];
         break;
     case 4:
-        gScriptResult = gSaveBlock2.battleTower.battleTowerTrainerId;
+        gSpecialVar_Result = gSaveBlock2.battleTower.battleTowerTrainerId;
         break;
     case 5:
     case 6:
     case 7:
         break;
     case 8:
-        gScriptResult = gSaveBlock2.battleTower.unk_554;
+        gSpecialVar_Result = gSaveBlock2.battleTower.unk_554;
         break;
     case 9:
-        gScriptResult = GetCurrentBattleTowerWinStreak(battleTowerLevelType);
+        gSpecialVar_Result = GetCurrentBattleTowerWinStreak(battleTowerLevelType);
         break;
     case 10:
         SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, gSaveBlock2.battleTower.bestBattleTowerWinStreak);
@@ -2149,11 +2149,11 @@ void GiveBattleTowerPrize(void)
     if (AddBagItem(gSaveBlock2.battleTower.prizeItem, 1) == TRUE)
     {
         CopyItemName(gSaveBlock2.battleTower.prizeItem, gStringVar1);
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     }
     else
     {
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = 6;
     }
 }
@@ -2172,7 +2172,7 @@ void AwardBattleTowerRibbons(void)
         ribbonType = MON_DATA_VICTORY_RIBBON;
     }
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
 
     if (GetCurrentBattleTowerWinStreak(battleTowerLevelType) > 55)
     {
@@ -2182,13 +2182,13 @@ void AwardBattleTowerRibbons(void)
             pokemon = &gPlayerParty[partyIndex];
             if (!GetMonData(pokemon, ribbonType))
             {
-                gScriptResult = 1;
-                SetMonData(pokemon, ribbonType, &gScriptResult);
+                gSpecialVar_Result = 1;
+                SetMonData(pokemon, ribbonType, &gSpecialVar_Result);
             }
         }
     }
 
-    if (gScriptResult != 0)
+    if (gSpecialVar_Result != 0)
     {
         IncrementGameStat(GAME_STAT_RECEIVED_RIBBONS);
     }
@@ -2266,7 +2266,7 @@ void ValidateEReaderTrainer(void)
     u32 checksum;
     struct BattleTowerEReaderTrainer *ereaderTrainer;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     ereaderTrainer = &gSaveBlock2.battleTower.ereaderTrainer;
 
     checksum = 0;
@@ -2277,7 +2277,7 @@ void ValidateEReaderTrainer(void)
 
     if (checksum == 0)
     {
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
         return;
     }
 
@@ -2290,7 +2290,7 @@ void ValidateEReaderTrainer(void)
     if (gSaveBlock2.battleTower.ereaderTrainer.checksum != checksum)
     {
         ClearEReaderTrainer(&gSaveBlock2.battleTower.ereaderTrainer);
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     }
 }
 
diff --git a/src/field/berry.c b/src/field/berry.c
index 874a60aa7..088267ad0 100644
--- a/src/field/berry.c
+++ b/src/field/berry.c
@@ -981,7 +981,7 @@ const struct Berry gBerries[] =
 static const struct BerryTree gBlankBerryTree = {0};
 
 extern u8 S_BerryTree[];
-extern u16 gScriptLastTalked;
+extern u16 gSpecialVar_LastTalked;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
 extern u16 gSpecialVar_0x8006;
@@ -1368,7 +1368,7 @@ void FieldObjectInteractionGetBerryTreeData(void)
     id = FieldObjectGetBerryTreeId(gSelectedMapObject);
     berry = GetBerryTypeByBerryTreeId(id);
     ResetBerryTreeSparkleFlag(id);
-    localId = gScriptLastTalked;
+    localId = gSpecialVar_LastTalked;
     num = gSaveBlock1.location.mapNum;
     group = gSaveBlock1.location.mapGroup;
     if (IsBerryTreeSparkling(localId, num, group))
@@ -1392,7 +1392,7 @@ void Berry_FadeAndGoToBerryBagMenu(void)
 
 void FieldObjectInteractionPlantBerryTree(void)
 {
-    u8 berry = ItemIdToBerryType(gScriptItemId);
+    u8 berry = ItemIdToBerryType(gSpecialVar_ItemId);
 
     PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, TRUE);
     FieldObjectInteractionGetBerryTreeData();
@@ -1409,7 +1409,7 @@ void FieldObjectInteractionPickBerryTree(void)
 void FieldObjectInteractionRemoveBerryTree(void)
 {
     RemoveBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject));
-    sub_8060288(gScriptLastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+    sub_8060288(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
 }
 
 bool8 PlayerHasBerries(void)
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index 694599680..2abbac287 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -133,12 +133,12 @@ static bool8 sub_8146058(void)
         gMain.state += 1;
         break;
     case 8:
-        berry = gScriptItemId + OFFSET_7B;
+        berry = gSpecialVar_ItemId + OFFSET_7B;
         gUnknown_0203932C = CreateBerrySprite(berry, 56, 64);
         gMain.state += 1;
         break;
     case 9:
-        sub_8146600(gScriptItemId + OFFSET_7B);
+        sub_8146600(gSpecialVar_ItemId + OFFSET_7B);
         gMain.state += 1;
         break;
     case 10:
@@ -277,9 +277,9 @@ static void sub_81464E4(void)
     u8 buffer[16];
 #endif
 
-    berryInfo = GetBerryInfo(gScriptItemId + OFFSET_7B + 1);
+    berryInfo = GetBerryInfo(gSpecialVar_ItemId + OFFSET_7B + 1);
 
-    ConvertIntToDecimalStringN(gStringVar1, gScriptItemId - FIRST_BERRY + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
+    ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_ItemId - FIRST_BERRY + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
     MenuPrint(gStringVar1, 12, 4);
 
 #if ENGLISH
@@ -437,7 +437,7 @@ static void sub_8146810(s8 berry)
             gBagPocketScrollStates[berryPocket].cursorPos += berry;
         }
     }
-    gScriptItemId = gCurrentBagPocketItemSlots[gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos].itemId;
+    gSpecialVar_ItemId = gCurrentBagPocketItemSlots[gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos].itemId;
     DestroySprite(&gSprites[gUnknown_0203932C]);
     sub_81466A0();
     sub_80A7DD4();
@@ -449,7 +449,7 @@ static void sub_81468BC(void)
     sub_81464E4();
 
     // center of berry sprite
-    gUnknown_0203932C = CreateBerrySprite(gScriptItemId + OFFSET_7B, 56, 64);
+    gUnknown_0203932C = CreateBerrySprite(gSpecialVar_ItemId + OFFSET_7B, 56, 64);
 
-    sub_8146600(gScriptItemId + OFFSET_7B);
+    sub_8146600(gSpecialVar_ItemId + OFFSET_7B);
 }
diff --git a/src/field/braille_puzzles.c b/src/field/braille_puzzles.c
index e6ab316d2..0d304714d 100644
--- a/src/field/braille_puzzles.c
+++ b/src/field/braille_puzzles.c
@@ -24,7 +24,7 @@ extern u8 S_OpenRegiceChamber[]; // regiice event script
 
 bool8 ShouldDoBrailleDigEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_DIG)
+    if (!FlagGet(FLAG_SYS_BRAILLE_DIG)
      && (gSaveBlock1.location.mapGroup == MAP_GROUP(SEALED_CHAMBER_OUTER_ROOM)
      && gSaveBlock1.location.mapNum == MAP_NUM(SEALED_CHAMBER_OUTER_ROOM)))
     {
@@ -49,7 +49,7 @@ void DoBrailleDigEffect(void)
     MapGridSetMetatileIdAt(18, 9, 3636);
     DrawWholeMapView();
     PlaySE(SE_BAN);
-    FlagSet(SYS_BRAILLE_DIG);
+    FlagSet(FLAG_SYS_BRAILLE_DIG);
     ScriptContext2_Disable();
 }
 
@@ -68,7 +68,7 @@ bool8 CheckRelicanthWailord(void)
 
 bool8 ShouldDoBrailleStrengthEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1.location.mapNum == MAP_NUM(DESERT_RUINS)))
+    if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1.location.mapNum == MAP_NUM(DESERT_RUINS)))
     {
         if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23)
             return TRUE;
@@ -92,13 +92,13 @@ void DoBrailleStrengthEffect(void)
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
     PlaySE(SE_BAN);
-    FlagSet(SYS_BRAILLE_STRENGTH);
+    FlagSet(FLAG_SYS_BRAILLE_STRENGTH);
     ScriptContext2_Disable();
 }
 
 bool8 ShouldDoBrailleFlyEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP(ANCIENT_TOMB) && gSaveBlock1.location.mapNum == MAP_NUM(ANCIENT_TOMB)))
+    if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP(ANCIENT_TOMB) && gSaveBlock1.location.mapNum == MAP_NUM(ANCIENT_TOMB)))
     {
         if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25)
             return TRUE;
@@ -138,13 +138,13 @@ void UseFlyAncientTomb_Finish(void)
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
     PlaySE(SE_BAN);
-    FlagSet(SYS_BRAILLE_FLY);
+    FlagSet(FLAG_SYS_BRAILLE_FLY);
     ScriptContext2_Disable();
 }
 
 void DoBrailleWait(void)
 {
-    if (!FlagGet(SYS_BRAILLE_WAIT))
+    if (!FlagGet(FLAG_SYS_BRAILLE_WAIT))
         CreateTask(Task_BrailleWait, 0x50);
 }
 
diff --git a/src/field/daycare.c b/src/field/daycare.c
index 9ac63b3c7..c28bc65ca 100644
--- a/src/field/daycare.c
+++ b/src/field/daycare.c
@@ -1758,7 +1758,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId)
     {
         HandleDestroyMenuCursors();
         PlaySE(SE_SELECT);
-        gLastFieldPokeMenuOpened = gScriptResult = gTasks[taskId].data[0];
+        gLastFieldPokeMenuOpened = gSpecialVar_Result = gTasks[taskId].data[0];
         DestroyTask(taskId);
         MenuZeroFillWindowRect(15, 6, 29, 13);
         EnableBothScriptContexts();
@@ -1766,7 +1766,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId)
     else if (gMain.newKeys & B_BUTTON)
     {
         HandleDestroyMenuCursors();
-        gLastFieldPokeMenuOpened = gScriptResult = 2;
+        gLastFieldPokeMenuOpened = gSpecialVar_Result = 2;
         DestroyTask(taskId);
         MenuZeroFillWindowRect(15, 6, 29, 13);
         EnableBothScriptContexts();
diff --git a/src/field/decoration.c b/src/field/decoration.c
index c7647f98d..8b774afc3 100644
--- a/src/field/decoration.c
+++ b/src/field/decoration.c
@@ -2322,12 +2322,12 @@ void sub_80FF474(void)
     u8 j;
     for (i=0; i<14; i++)
     {
-        if (FlagGet(i + 0xae) == 1)
+        if (FlagGet(i + FLAG_DECORATION_2) == 1)
         {
-            FlagClear(i + 0xae);
+            FlagClear(i + FLAG_DECORATION_2);
             for (j=0; j<gMapHeader.events->mapObjectCount; j++)
             {
-                if (gMapHeader.events->mapObjects[j].flagId == i + 0xae)
+                if (gMapHeader.events->mapObjects[j].flagId == i + FLAG_DECORATION_2)
                 {
                     break;
                 }
@@ -3647,10 +3647,10 @@ void sub_8100A7C(void)
 {
     u16 i;
     gSpecialVar_0x8005 = 0;
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     if (gSpecialVar_0x8004 == gUnknown_02039234)
     {
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     } else if (gDecorations[ewram_1f000.items[gUnknown_020391B4[gSpecialVar_0x8004].decorId]].permission == DECORPERM_SOLID_MAT)
     {
         gSpecialVar_0x8005 = gUnknown_020391B4[gSpecialVar_0x8004].flagId;
diff --git a/src/field/dewford_trend.c b/src/field/dewford_trend.c
index 90ea74f77..b67f3a2bd 100644
--- a/src/field/dewford_trend.c
+++ b/src/field/dewford_trend.c
@@ -8,7 +8,7 @@
 #include "text.h"
 #include "ewram.h"
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern u16 gSpecialVar_0x8004;
 
 static void sub_80FA46C(struct EasyChatPair *s, u16 b, u8 c);
@@ -101,10 +101,10 @@ bool8 sub_80FA364(u16 *a)
 
     if (!SB1ContainsWords(a))
     {
-        if (!FlagGet(SYS_POPWORD_INPUT))
+        if (!FlagGet(FLAG_SYS_POPWORD_INPUT))
         {
-            FlagSet(SYS_POPWORD_INPUT);
-            if (!FlagGet(SYS_MIX_RECORD))
+            FlagSet(FLAG_SYS_POPWORD_INPUT);
+            if (!FlagGet(FLAG_SYS_MIX_RECORD))
             {
                 gSaveBlock1.easyChatPairs[0].words[0] = a[0];
                 gSaveBlock1.easyChatPairs[0].words[1] = a[1];
@@ -219,12 +219,12 @@ void sub_80FA5E4(void)
         if (!gSaveBlock1.easyChatPairs[0].unk1_6 && gSaveBlock1.easyChatPairs[1].unk1_6)
             result = 1;
     }
-    gScriptResult = result;
+    gSpecialVar_Result = result;
 }
 
 void sub_80FA648(void)
 {
-    gScriptResult = (gSaveBlock1.easyChatPairs[0].words[0] + gSaveBlock1.easyChatPairs[0].words[1]) & 7;
+    gSpecialVar_Result = (gSaveBlock1.easyChatPairs[0].words[0] + gSaveBlock1.easyChatPairs[0].words[1]) & 7;
 }
 
 static bool8 sub_80FA670(struct EasyChatPair *a, struct EasyChatPair *b, u8 c)
diff --git a/src/field/event_data.c b/src/field/event_data.c
index 43d49c417..587da8138 100644
--- a/src/field/event_data.c
+++ b/src/field/event_data.c
@@ -3,7 +3,7 @@
 #include "pokedex.h"
 
 #define TEMP_FLAGS_SIZE 0x4
-#define TEMP_UPPER_FLAGS_SIZE 0x8
+#define DAILY_FLAGS_SIZE 0x8
 #define TEMP_VARS_SIZE 0x20
 
 EWRAM_DATA u16 gSpecialVar_0x8000 = 0;
@@ -18,9 +18,9 @@ EWRAM_DATA u16 gSpecialVar_0x8008 = 0;
 EWRAM_DATA u16 gSpecialVar_0x8009 = 0;
 EWRAM_DATA u16 gSpecialVar_0x800A = 0;
 EWRAM_DATA u16 gSpecialVar_0x800B = 0;
-EWRAM_DATA u16 gScriptResult = 0;
-EWRAM_DATA u16 gScriptLastTalked = 0;
-EWRAM_DATA u16 gScriptFacing = 0;
+EWRAM_DATA u16 gSpecialVar_Result = 0;
+EWRAM_DATA u16 gSpecialVar_LastTalked = 0;
+EWRAM_DATA u16 gSpecialVar_Facing = 0;
 EWRAM_DATA u8 gUnknown_0202E8E2[16] = {0};
 
 extern u16 *gSpecialVars[];
@@ -36,16 +36,16 @@ void ClearTempFieldEventData(void)
 {
     memset(gSaveBlock1.flags, 0, TEMP_FLAGS_SIZE);
     memset(gSaveBlock1.vars, 0, TEMP_VARS_SIZE);
-    FlagClear(SYS_ENC_UP_ITEM);
-    FlagClear(SYS_ENC_DOWN_ITEM);
-    FlagClear(SYS_USE_STRENGTH);
-    FlagClear(SYS_CTRL_OBJ_DELETE);
+    FlagClear(FLAG_SYS_ENC_UP_ITEM);
+    FlagClear(FLAG_SYS_ENC_DOWN_ITEM);
+    FlagClear(FLAG_SYS_USE_STRENGTH);
+    FlagClear(FLAG_SYS_CTRL_OBJ_DELETE);
 }
 
 // probably had different flag splits at one point.
-void ClearUpperFlags(void)
+void ClearDailyFlags(void)
 {
-    memset(gSaveBlock1.flags + 0x118, 0, TEMP_UPPER_FLAGS_SIZE);
+    memset(gSaveBlock1.flags + (DAILY_FLAGS_START / 8), 0, DAILY_FLAGS_SIZE);
 }
 
 void DisableNationalPokedex(void)
@@ -53,7 +53,7 @@ void DisableNationalPokedex(void)
     u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
     gSaveBlock2.pokedex.nationalMagic = 0;
     *nationalDexVar = 0;
-    FlagClear(SYS_NATIONAL_DEX);
+    FlagClear(FLAG_SYS_NATIONAL_DEX);
 }
 
 void EnableNationalPokedex(void)
@@ -61,7 +61,7 @@ void EnableNationalPokedex(void)
     u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
     gSaveBlock2.pokedex.nationalMagic = 0xDA;
     *nationalDexVar = 0x302;
-    FlagSet(SYS_NATIONAL_DEX);
+    FlagSet(FLAG_SYS_NATIONAL_DEX);
     gSaveBlock2.pokedex.unknown1 = 1;
     gSaveBlock2.pokedex.order = 0;
     sub_808C0A0();
@@ -69,7 +69,7 @@ void EnableNationalPokedex(void)
 
 bool32 IsNationalPokedexEnabled(void)
 {
-    if (gSaveBlock2.pokedex.nationalMagic == 0xDA && VarGet(VAR_NATIONAL_DEX) == 0x302 && FlagGet(SYS_NATIONAL_DEX))
+    if (gSaveBlock2.pokedex.nationalMagic == 0xDA && VarGet(VAR_NATIONAL_DEX) == 0x302 && FlagGet(FLAG_SYS_NATIONAL_DEX))
         return TRUE;
     else
         return FALSE;
@@ -77,34 +77,34 @@ bool32 IsNationalPokedexEnabled(void)
 
 void DisableMysteryGift(void)
 {
-    FlagClear(SYS_EXDATA_ENABLE);
+    FlagClear(FLAG_SYS_EXDATA_ENABLE);
 }
 
 void EnableMysteryGift(void)
 {
-    FlagSet(SYS_EXDATA_ENABLE);
+    FlagSet(FLAG_SYS_EXDATA_ENABLE);
 }
 
 bool32 IsMysteryGiftEnabled(void)
 {
-    return FlagGet(SYS_EXDATA_ENABLE);
+    return FlagGet(FLAG_SYS_EXDATA_ENABLE);
 }
 
 void DisableResetRTC(void)
 {
     VarSet(VAR_RESET_RTC_ENABLE, 0);
-    FlagClear(SYS_RESET_RTC_ENABLE);
+    FlagClear(FLAG_SYS_RESET_RTC_ENABLE);
 }
 
 void EnableResetRTC(void)
 {
     VarSet(VAR_RESET_RTC_ENABLE, 0x920);
-    FlagSet(SYS_RESET_RTC_ENABLE);
+    FlagSet(FLAG_SYS_RESET_RTC_ENABLE);
 }
 
 bool32 CanResetRTC(void)
 {
-    if (FlagGet(SYS_RESET_RTC_ENABLE) && VarGet(VAR_RESET_RTC_ENABLE) == 0x920)
+    if (FlagGet(FLAG_SYS_RESET_RTC_ENABLE) && VarGet(VAR_RESET_RTC_ENABLE) == 0x920)
         return TRUE;
     else
         return FALSE;
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index c4e53b13f..cd7d3a2e2 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -30,8 +30,8 @@ struct Coords32
     s32 y;
 };
 
-extern u16 gScriptLastTalked;
-extern u16 gScriptFacing;
+extern u16 gSpecialVar_LastTalked;
+extern u16 gSpecialVar_Facing;
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -295,8 +295,8 @@ u8 *sub_80682A8(struct MapPosition *position, u8 unused, u8 c)
             return NULL;
     }
     gSelectedMapObject = r3;
-    gScriptLastTalked = gMapObjects[r3].localId;
-    gScriptFacing = c;
+    gSpecialVar_LastTalked = gMapObjects[r3].localId;
+    gSpecialVar_Facing = c;
     return GetFieldObjectScriptPointerByFieldObjectId(r3);
 }
 
@@ -316,10 +316,10 @@ static u8 *sub_8068364(struct MapPosition *position, u8 b, u8 c)
     }
     //_080683E8
     gSelectedMapObject = r3;
-    gScriptLastTalked = gMapObjects[r3].localId;
-    gScriptFacing = c;
+    gSpecialVar_LastTalked = gMapObjects[r3].localId;
+    gSpecialVar_Facing = c;
     script = GetFieldObjectScriptPointerByFieldObjectId(r3);
-    script = GetRamScript(gScriptLastTalked, script);
+    script = GetRamScript(gSpecialVar_LastTalked, script);
     return script;
 }
 
@@ -423,11 +423,11 @@ static u8 *sub_8068500(struct MapPosition *position, u8 b, u8 c)
 
 static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2)
 {
-    if (FlagGet(BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
+    if (FlagGet(FLAG_BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
         return UseSurfScript;
     if (MetatileBehavior_IsWaterfall(b) == TRUE)
     {
-        if (FlagGet(BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE)
+        if (FlagGet(FLAG_BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE)
             return S_UseWaterfall;
         else
             return S_CannotUseWaterfall;
@@ -437,7 +437,7 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2)
 
 static bool32 sub_8068770(void)
 {
-    if (FlagGet(BADGE07_GET) && sub_8068F18() == 2)
+    if (FlagGet(FLAG_BADGE07_GET) && sub_8068F18() == 2)
     {
         ScriptContext1_SetupScript(UseDiveScript);
         return TRUE;
@@ -447,7 +447,7 @@ static bool32 sub_8068770(void)
 
 static bool32 sub_80687A4(void)
 {
-    if (FlagGet(BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1)
+    if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1)
     {
         ScriptContext1_SetupScript(S_UseDiveUnderwater);
         return TRUE;
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index 437d16208..d80076be4 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -490,7 +490,7 @@ void sub_8058D0C(u8 direction, u16 heldKeys)
             PlayerGoSpeed2(direction);
             return;
         }
-        if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_4) && (heldKeys & B_BUTTON) && FlagGet(SYS_B_DASH)
+        if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_4) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH)
          && IsRunningDisallowed(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E) == 0)
         {
             sub_805940C(direction);
@@ -563,7 +563,7 @@ static bool8 ShouldJumpLedge(s16 a, s16 b, u8 c)
 
 static u8 sub_8058F6C(s16 a, s16 b, u8 c)
 {
-    if (FlagGet(SYS_USE_STRENGTH))
+    if (FlagGet(FLAG_SYS_USE_STRENGTH))
     {
         u8 mapObjectId = GetFieldObjectIdByXY(a, b);
 
diff --git a/src/field/field_poison.c b/src/field/field_poison.c
index 74d70cb36..49678f269 100644
--- a/src/field/field_poison.c
+++ b/src/field/field_poison.c
@@ -9,7 +9,7 @@
 #include "task.h"
 #include "text.h"
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern u8 fieldPoisonText_PokemonFainted[];
 
 bool32 CheckMonIsValid(struct Pokemon *pkmn)
@@ -93,9 +93,9 @@ void Task_WhiteOut(u8 taskId)
         break;
     case 2: //Done checking Pokemon
         if (AllMonsFainted())
-            gScriptResult = 1;
+            gSpecialVar_Result = 1;
         else
-            gScriptResult = 0;
+            gSpecialVar_Result = 0;
         EnableBothScriptContexts();
         DestroyTask(taskId);
         break;
diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c
index a18190809..a472d5a9c 100644
--- a/src/field/field_screen_effect.c
+++ b/src/field/field_screen_effect.c
@@ -283,17 +283,17 @@ void sub_80818A4(void)
     u8 taskId = CreateTask(sub_80816A8, 80);
     s16 *data = gTasks[taskId].data;
 
-    if (gScriptResult == 0)
+    if (gSpecialVar_Result == 0)
     {
         data[1] = 0;
         data[2] = 104;
     }
-    else if (gScriptResult == 1)
+    else if (gSpecialVar_Result == 1)
     {
         data[1] = 1;
         data[2] = 104;
     }
-    else if (gScriptResult == 2)
+    else if (gSpecialVar_Result == 2)
     {
         data[1] = 0;
         data[2] = 120;
diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c
index 6ef98f5e9..0b7fe336e 100644
--- a/src/field/field_special_scene.c
+++ b/src/field/field_special_scene.c
@@ -373,7 +373,7 @@ void sub_80C791C(void)
 
 void sub_80C7958(void)
 {
-    FlagSet(SYS_CRUISE_MODE);
+    FlagSet(FLAG_SYS_CRUISE_MODE);
     FlagSet(0x4001);
     FlagSet(0x4000);
     saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1);
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index d654d10f5..87a9e2d5d 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -46,7 +46,7 @@ extern struct WarpData gUnknown_020297F0;
 extern u8 gBattleOutcome;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 extern u8 *const gUnknown_083D1464[3];
 
@@ -169,7 +169,7 @@ static void DetermineCyclingRoadResults(u32 arg0, u8 arg1)
     }
 
 
-    gScriptResult = result;
+    gSpecialVar_Result = result;
 }
 
 void FinishCyclingRoadChallenge(void) {
@@ -221,18 +221,18 @@ void UpdateCyclingRoadState(void) {
 
 void SetSSTidalFlag(void)
 {
-    FlagSet(SYS_CRUISE_MODE);
+    FlagSet(FLAG_SYS_CRUISE_MODE);
     *GetVarPointer(VAR_CRUISE_STEP_COUNT) = 0;
 }
 
 void ResetSSTidalFlag(void)
 {
-    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(FLAG_SYS_CRUISE_MODE);
 }
 
 bool32 CountSSTidalStep(u16 delta)
 {
-    if (!FlagGet(SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) <= 0xcc)
+    if (!FlagGet(FLAG_SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) <= 0xcc)
     {
         return FALSE;
     }
@@ -1112,17 +1112,17 @@ void sub_810E984(u8 taskId)
         saved_warp2_set_2(0, gUnknown_03000760[gUnknown_0203925B].var1, gUnknown_03000760[gUnknown_0203925B].var2, -1, 2, 1);
         if (gSpecialVar_0x8005 == gUnknown_0203925B)
         {
-            gScriptResult = 0;
+            gSpecialVar_Result = 0;
             PlaySE(SE_SELECT);
             MenuZeroFillWindowRect(0, 0, 29, 12);
             sub_810EC9C(taskId);
         }
         else
         {
-            gScriptResult = 1;
+            gSpecialVar_Result = 1;
             gSpecialVar_0x8005 = gUnknown_0203925B;
             sub_810EBEC();
-            FieldObjectTurnByLocalIdAndMap(gScriptLastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH);
+            FieldObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH);
             sub_810EEDC();
             MenuZeroFillScreen();
             DestroyTask(taskId);
@@ -1130,7 +1130,7 @@ void sub_810E984(u8 taskId)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         PlaySE(SE_SELECT);
         sub_810EEDC();
         MenuZeroFillWindowRect(0, 0, 29, 12);
@@ -1516,12 +1516,12 @@ void IsGrassTypeInParty(void)
             species = GetMonData(pokemon, MON_DATA_SPECIES);
             if (gBaseStats[species].type1 == TYPE_GRASS || gBaseStats[species].type2 == TYPE_GRASS)
             {
-                gScriptResult = TRUE;
+                gSpecialVar_Result = TRUE;
                 return;
             }
         }
     }
-    gScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
 }
 
 const u8 *const gUnknown_083F83C0[] = {
@@ -1579,7 +1579,7 @@ void sub_810F118(u8 taskId)
     if (gMain.newKeys & A_BUTTON)
     {
         HandleDestroyMenuCursors();
-        gScriptResult = gUnknown_0203925B;
+        gSpecialVar_Result = gUnknown_0203925B;
         PlaySE(SE_SELECT);
         sub_810EEDC();
         MenuZeroFillWindowRect(0, 0, 29, 12);
@@ -1588,7 +1588,7 @@ void sub_810F118(u8 taskId)
     if (gMain.newKeys & B_BUTTON)
     {
         HandleDestroyMenuCursors();
-        gScriptResult = 0x7f;
+        gSpecialVar_Result = 0x7f;
         PlaySE(SE_SELECT);
         sub_810EEDC();
         MenuZeroFillWindowRect(0, 0, 29, 12);
@@ -1865,7 +1865,7 @@ void GivLeadMonEffortRibbon(void)
 {
     bool8 ribbonSet;
     IncrementGameStat(GAME_STAT_RECEIVED_RIBBONS);
-    FlagSet(SYS_RIBBON_GET);
+    FlagSet(FLAG_SYS_RIBBON_GET);
     ribbonSet = TRUE;
     SetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_EFFORT_RIBBON, &ribbonSet);
 }
@@ -1881,14 +1881,14 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
 
 u8 sub_810F5BC(void)
 {
-    if (!FlagGet(0xc7) && gSaveBlock1.location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
+    if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1.location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
     {
-        if (FlagGet(0x3a3))
+        if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1))
         {
             VarSet(VAR_0x409a, 4);
             return TRUE;
         }
-        else if (FlagGet(0x3a4))
+        else if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2))
         {
             VarSet(VAR_0x409a, 5);
             return TRUE;
@@ -2002,7 +2002,7 @@ static void sub_810F814(u8 taskId)
 
 bool8 sub_810F828(void)
 {
-    return FlagGet(0x2b8);
+    return FlagGet(FLAG_UNKNOWN_2B8);
 }
 
 void SetRoute119Weather(void)
@@ -2077,27 +2077,27 @@ bool8 sub_810F96C(void)
 
 void sub_810F9AC(void)
 {
-    if (gScriptResult >= 10000)
+    if (gSpecialVar_Result >= 10000)
     {
-        sub_80BF088(0, gScriptResult);
+        sub_80BF088(0, gSpecialVar_Result);
     }
-    else if (gScriptResult >= 1000)
+    else if (gSpecialVar_Result >= 1000)
     {
         gStringVar1[0] = CHAR_0;
-        ConvertIntToDecimalStringN(gStringVar1 + 1, gScriptResult, 0, sub_80BF0B8(gScriptResult));
+        ConvertIntToDecimalStringN(gStringVar1 + 1, gSpecialVar_Result, 0, sub_80BF0B8(gSpecialVar_Result));
     }
-    else if (gScriptResult >= 100)
+    else if (gSpecialVar_Result >= 100)
     {
         gStringVar1[0] = CHAR_0;
         gStringVar1[1] = CHAR_0;
-        ConvertIntToDecimalStringN(gStringVar1 + 2, gScriptResult, 0, sub_80BF0B8(gScriptResult));
+        ConvertIntToDecimalStringN(gStringVar1 + 2, gSpecialVar_Result, 0, sub_80BF0B8(gSpecialVar_Result));
     }
-    else if (gScriptResult >= 10)
+    else if (gSpecialVar_Result >= 10)
     {
         gStringVar1[0] = CHAR_0;
         gStringVar1[1] = CHAR_0;
         gStringVar1[2] = CHAR_0;
-        ConvertIntToDecimalStringN(gStringVar1 + 3, gScriptResult, 0, sub_80BF0B8(gScriptResult));
+        ConvertIntToDecimalStringN(gStringVar1 + 3, gSpecialVar_Result, 0, sub_80BF0B8(gSpecialVar_Result));
     }
     else
     {
@@ -2105,7 +2105,7 @@ void sub_810F9AC(void)
         gStringVar1[1] = CHAR_0;
         gStringVar1[2] = CHAR_0;
         gStringVar1[3] = CHAR_0;
-        ConvertIntToDecimalStringN(gStringVar1 + 4, gScriptResult, 0, sub_80BF0B8(gScriptResult));
+        ConvertIntToDecimalStringN(gStringVar1 + 4, gSpecialVar_Result, 0, sub_80BF0B8(gSpecialVar_Result));
     }
 }
 
diff --git a/src/field/fldeff_decoration.c b/src/field/fldeff_decoration.c
index 7c8ff44db..37f024b9f 100644
--- a/src/field/fldeff_decoration.c
+++ b/src/field/fldeff_decoration.c
@@ -344,21 +344,21 @@ void GetShieldToyTVDecorationInfo(void)
     case 822:
         ConvertIntToDecimalStringN(gStringVar1, 100, STR_CONV_MODE_LEFT_ALIGN, 3);
         StringCopy(gStringVar2, gSecretBaseText_GoldRank);
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         break;
     case 734:
         ConvertIntToDecimalStringN(gStringVar1, 50, STR_CONV_MODE_LEFT_ALIGN, 2);
         StringCopy(gStringVar2, gSecretBaseText_SilverRank);
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         break;
     case 756:
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
         break;
     case 757:
-        gScriptResult = 2;
+        gSpecialVar_Result = 2;
         break;
     case 758:
-        gScriptResult = 3;
+        gSpecialVar_Result = 3;
         break;
     }
 }
diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c
index 920791ce2..22f170184 100644
--- a/src/field/fldeff_flash.c
+++ b/src/field/fldeff_flash.c
@@ -73,7 +73,7 @@ static const u8 gCaveTransitionTiles[] = INCBIN_U8("graphics/misc/cave_transitio
 
 bool8 SetUpFieldMove_Flash(void)
 {
-    if (gMapHeader.cave == TRUE && !FlagGet(SYS_USE_FLASH))
+    if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH))
     {
         gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_810CBFC;
@@ -94,7 +94,7 @@ void sub_810CBFC(void)
 void sub_810CC34(void)
 {
     PlaySE(SE_W115);
-    FlagSet(SYS_USE_FLASH);
+    FlagSet(FLAG_SYS_USE_FLASH);
     ScriptContext1_SetupScript(gUnknown_081B694A);
 }
 
diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c
index 9bcfaa8c4..bf8e98403 100644
--- a/src/field/fldeff_secretpower.c
+++ b/src/field/fldeff_secretpower.c
@@ -249,7 +249,7 @@ bool8 SetUpFieldMove_SecretPower(void)
 
     sub_80BB63C();
 
-    if (gScriptResult == 1 || player_get_direction_lower_nybble() != DIR_NORTH)
+    if (gSpecialVar_Result == 1 || player_get_direction_lower_nybble() != DIR_NORTH)
         return FALSE;
 
     GetXYCoordsOneStepInFrontOfPlayer(&gUnknown_0203923C.x, &gUnknown_0203923C.y);
diff --git a/src/field/fldeff_strength.c b/src/field/fldeff_strength.c
index d9603d094..565ac1651 100644
--- a/src/field/fldeff_strength.c
+++ b/src/field/fldeff_strength.c
@@ -14,7 +14,7 @@ static void sub_811AA38(void);
 static void sub_811AA9C(void);
 
 extern u8 gLastFieldPokeMenuOpened;
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern void (*gFieldCallback)(void);
 extern void (*gUnknown_03005CE4)(void);
 
@@ -24,7 +24,7 @@ bool8 SetUpFieldMove_Strength(void)
 {
     if (ShouldDoBrailleStrengthEffect())
     {
-        gScriptResult = gLastFieldPokeMenuOpened;
+        gSpecialVar_Result = gLastFieldPokeMenuOpened;
         gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_811AA38;
     }
@@ -32,7 +32,7 @@ bool8 SetUpFieldMove_Strength(void)
     {
         if (npc_before_player_of_type(87) != TRUE)
             return 0;
-        gScriptResult = gLastFieldPokeMenuOpened;
+        gSpecialVar_Result = gLastFieldPokeMenuOpened;
         gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_811AA18;
     }
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 8f7cb3d90..4e283ffe9 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -138,7 +138,7 @@ EWRAM_DATA static s8 sCurrentBagPocket = 0;
 EWRAM_DATA static u8 gUnknown_0203855A = 0;
 EWRAM_DATA static s8 gUnknown_0203855B = 0;
 EWRAM_DATA static s8 gUnknown_0203855C = 0;
-EWRAM_DATA u16 gScriptItemId = 0;
+EWRAM_DATA u16 gSpecialVar_ItemId = 0;
 EWRAM_DATA u8 gUnknown_02038560 = 0;
 EWRAM_DATA u8 gUnknown_02038561 = 0;
 EWRAM_DATA static u8 gUnknown_02038562 = 0;
@@ -1662,7 +1662,7 @@ static void sub_80A4BF0(u16 *a)
                 const u8 *text;
 
                 if (i == 0)
-                    text = sub_80A4B90(gScriptItemId);
+                    text = sub_80A4B90(gSpecialVar_ItemId);
                 else
                     text = sItemPopupMenuActions[sPopupMenuActionList[i]].text;
                 MenuPrint(text, 1 + (i / 2) * 6, 8 + (i % 2) * 2);
@@ -1849,7 +1849,7 @@ static void sub_80A50C8(u8 taskId)
             {
                 if (r5[10] == 0)
                 {
-                    gScriptItemId = 0;
+                    gSpecialVar_ItemId = 0;
                     gUnknown_083C16BC[sReturnLocation].onBagClose(taskId);
                 }
                 else
@@ -1864,7 +1864,7 @@ static void sub_80A50C8(u8 taskId)
                 {
                     PlaySE(SE_SELECT);
                     gUnknown_02038560 = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + gBagPocketScrollStates[sCurrentBagPocket].cursorPos;
-                    gScriptItemId = gCurrentBagPocketItemSlots[gUnknown_02038560].itemId;
+                    gSpecialVar_ItemId = gCurrentBagPocketItemSlots[gUnknown_02038560].itemId;
                     gUnknown_083C16BC[sReturnLocation].onItemSelect(taskId);
                     sub_80F98A4(0);
                     sub_80F98A4(1);
@@ -1887,7 +1887,7 @@ static void sub_80A50C8(u8 taskId)
             {
                 if (sReturnLocation != RETURN_TO_FIELD_5)
                 {
-                    gScriptItemId = 0;
+                    gSpecialVar_ItemId = 0;
                     gUnknown_083C16BC[sReturnLocation].onBagClose(taskId);
                 }
             }
@@ -2527,7 +2527,7 @@ static void sub_80A57C4(void)
         gUnknown_02038564 = 1;
         r5 = 9;
     }
-    else if (sub_80F92F4(gScriptItemId) == 0)
+    else if (sub_80F92F4(gSpecialVar_ItemId) == 0)
     {
         sPopupMenuActionList = gUnknown_083C16AE[4];
         gUnknown_02038564 = 1;
@@ -2654,10 +2654,10 @@ void sub_80A5B40(void)
 
 static void HandlePopupMenuAction_UseOnField(u8 taskId)
 {
-    if (ItemId_GetFieldFunc(gScriptItemId) != NULL)
+    if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL)
     {
         PlaySE(SE_SELECT);
-        if (CalculatePlayerPartyCount() == 0 && ItemId_GetType(gScriptItemId) == 1)
+        if (CalculatePlayerPartyCount() == 0 && ItemId_GetType(gSpecialVar_ItemId) == 1)
         {
             sub_80A5BF8(taskId);
         }
@@ -2665,7 +2665,7 @@ static void HandlePopupMenuAction_UseOnField(u8 taskId)
         {
             gTasks[taskId].data[2] = 0;
             if (sCurrentBagPocket != BAG_POCKET_BERRIES)
-                ItemId_GetFieldFunc(gScriptItemId)(taskId);
+                ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
             else
                 sub_80C9C7C(taskId);
         }
@@ -2793,7 +2793,7 @@ static void sub_80A5EA0(u8 taskId)
     if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
-        sub_80A5DA0(gScriptItemId, gTasks[taskId].data[1]);
+        sub_80A5DA0(gSpecialVar_ItemId, gTasks[taskId].data[1]);
         DoYesNoFuncWithChoice(taskId, &gUnknown_083C16F4);
     }
     else if (gMain.newKeys & B_BUTTON)
@@ -2827,7 +2827,7 @@ static void sub_80A5F80(u8 taskId)
 static void HandlePopupMenuAction_Register(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    if (gSaveBlock1.registeredItem == gScriptItemId)
+    if (gSaveBlock1.registeredItem == gSpecialVar_ItemId)
     {
         // Un-register the registered item
         RemoveSelectIconFromRegisteredItem();
@@ -2836,7 +2836,7 @@ static void HandlePopupMenuAction_Register(u8 taskId)
     else
     {
         AddSelectIconToRegisteredItem();
-        gSaveBlock1.registeredItem = gScriptItemId;
+        gSaveBlock1.registeredItem = gSpecialVar_ItemId;
     }
     sub_80A7528(0);
     sub_80A41D4(taskId);
@@ -2865,7 +2865,7 @@ static void sub_80A6024(u8 taskId)
 static void DisplayCannotBeHeldMessage(u8 taskId)
 {
     sub_80A73FC();
-    CopyItemName(gScriptItemId, gStringVar1);
+    CopyItemName(gSpecialVar_ItemId, gStringVar1);
     StringExpandPlaceholders(gStringVar4, gOtherText_CantBeHeld);
     sub_80A7590();
     DisplayCannotUseItemMessage(taskId, gStringVar4, sub_80A6024, 1);
@@ -2874,13 +2874,13 @@ static void DisplayCannotBeHeldMessage(u8 taskId)
 static void HandlePopupMenuAction_Give(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    if (sub_80F931C(gScriptItemId) == 0)
+    if (sub_80F931C(gSpecialVar_ItemId) == 0)
     {
         sub_80A73FC();
         sub_80A7590();
         DisplayCannotUseItemMessage(taskId, gOtherText_CantWriteMail, sub_80A6024, 1);
     }
-    else if (ItemId_GetImportance(gScriptItemId) == 0)
+    else if (ItemId_GetImportance(gSpecialVar_ItemId) == 0)
     {
         if (CalculatePlayerPartyCount() == 0)
         {
@@ -2931,21 +2931,21 @@ static void OnItemSelect_PkmnList(u8 taskId)
 {
     u8 r6 = sCurrentBagPocket + 1;
 
-    if (sub_80F931C(gScriptItemId) == 0)
+    if (sub_80F931C(gSpecialVar_ItemId) == 0)
     {
         sub_80A73FC();
         sub_80A7590();
         DisplayCannotUseItemMessage(taskId, gOtherText_CantWriteMail, sub_80A6024, 1);
     }
-    else if (sub_80F92F4(gScriptItemId) == 0)
+    else if (sub_80F92F4(gSpecialVar_ItemId) == 0)
     {
         sub_80A73FC();
-        CopyItemName(gScriptItemId, gStringVar1);
+        CopyItemName(gSpecialVar_ItemId, gStringVar1);
         StringExpandPlaceholders(gStringVar4, gOtherText_CantBeHeldHere);
         sub_80A7590();
         DisplayCannotUseItemMessage(taskId, gStringVar4, sub_80A6024, 1);
     }
-    else if (r6 != 5 && ItemId_GetImportance(gScriptItemId) == 0)
+    else if (r6 != 5 && ItemId_GetImportance(gSpecialVar_ItemId) == 0)
     {
         gTasks[taskId].data[8] = (u32)sub_808A3F8 >> 16;
         gTasks[taskId].data[9] = (u32)sub_808A3F8;
@@ -2983,8 +2983,8 @@ static void OnItemSelect_Shop(u8 taskId)
     gTasks[taskId].data[10] = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + gBagPocketScrollStates[sCurrentBagPocket].cursorPos + 1;
     sub_80A48E8(taskId, gBagPocketScrollStates[sCurrentBagPocket].cursorPos, gBagPocketScrollStates[sCurrentBagPocket].cursorPos);
     sub_80A73FC();
-    CopyItemName(gScriptItemId, gStringVar2);
-    if (ItemId_GetPrice(gScriptItemId) == 0)
+    CopyItemName(gSpecialVar_ItemId, gStringVar2);
+    if (ItemId_GetPrice(gSpecialVar_ItemId) == 0)
     {
         StringExpandPlaceholders(gStringVar4, gOtherText_CantBuyThat);
         DisplayCannotUseItemMessage(taskId, gStringVar4, sub_80A6444, 1);
@@ -3025,7 +3025,7 @@ static void sub_80A648C(u8 taskId)
         sub_80A418C(1, 1, 1, 11, 3);
     else
         sub_80A418C(1, 1, 1, 11, 2);
-    BuyMenuDisplayMessage(gScriptItemId, 1);
+    BuyMenuDisplayMessage(gSpecialVar_ItemId, 1);
     sub_80A683C();
 }
 
@@ -3047,7 +3047,7 @@ static void sub_80A6548(u8 taskId)
 static void sub_80A6574(u8 taskId)
 {
     PlaySE(SE_REGI);
-    sub_80A6870(gScriptItemId, gTasks[taskId].data[1]);
+    sub_80A6870(gSpecialVar_ItemId, gTasks[taskId].data[1]);
     gTasks[taskId].func = sub_80A6548;
 }
 
@@ -3055,7 +3055,7 @@ static void sub_80A65AC(u8 taskId)
 {
     MenuZeroFillWindowRect(7, 6, 13, 12);
     sub_80A36B8(gBGTilemapBuffers[1], 7, 6, 6, 6);
-    CopyItemName(gScriptItemId, gStringVar2);
+    CopyItemName(gSpecialVar_ItemId, gStringVar2);
     StringExpandPlaceholders(gStringVar4, gOtherText_SoldItem);
     DisplayCannotUseItemMessage(taskId, gStringVar4, sub_80A6574, 1);
     sub_80A3D5C(taskId);
@@ -3079,14 +3079,14 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId)
     if (sub_80A5350(taskId) == TRUE)
     {
         MenuZeroFillWindowRect(6, 11, 12, 11);
-        BuyMenuDisplayMessage(gScriptItemId, gTasks[taskId].data[1]);
+        BuyMenuDisplayMessage(gSpecialVar_ItemId, gTasks[taskId].data[1]);
     }
     else if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
         MenuZeroFillWindowRect(0, 10, 13, 13);
         sub_80A36B8(gBGTilemapBuffers[1], 0, 10, 13, 3);
-        ConvertIntToDecimalStringN(gStringVar1, ItemId_GetPrice(gScriptItemId) / 2 * gTasks[taskId].data[1], STR_CONV_MODE_LEFT_ALIGN, 6);
+        ConvertIntToDecimalStringN(gStringVar1, ItemId_GetPrice(gSpecialVar_ItemId) / 2 * gTasks[taskId].data[1], STR_CONV_MODE_LEFT_ALIGN, 6);
         StringExpandPlaceholders(gStringVar4, gOtherText_CanPay);
         DisplayCannotUseItemMessage(taskId, gStringVar4, sub_80A6650, 1);
     }
@@ -3227,7 +3227,7 @@ static void sub_80A6A84(u8 taskId)
     s16 *taskData = gTasks[taskId].data;
 
     sub_80A4DA4(gBGTilemapBuffers[1]);
-    CopyItemName(gScriptItemId, gStringVar1);
+    CopyItemName(gSpecialVar_ItemId, gStringVar1);
     ConvertIntToDecimalStringN(gStringVar2, taskData[1], STR_CONV_MODE_LEFT_ALIGN, 3);
     MenuZeroFillWindowRect(7, 6, 11, 13);
     sub_80A7528(7);
@@ -3250,14 +3250,14 @@ static void sub_80A6B64(u8 taskId)
 {
     s16 *taskData = gTasks[taskId].data;
 
-    if (ItemId_GetImportance(gScriptItemId) == 2)
+    if (ItemId_GetImportance(gSpecialVar_ItemId) == 2)
     {
         gTasks[taskId].func = sub_80A6B00;
         sub_80A7528(9);
     }
     else
     {
-        if (AddPCItem(gScriptItemId, taskData[1]) == TRUE)
+        if (AddPCItem(gSpecialVar_ItemId, taskData[1]) == TRUE)
         {
             sub_80A6A84(taskId);
         }
@@ -3325,7 +3325,7 @@ bool32 sub_80A6D1C(void)
             FreezeMapObjects();
             sub_80594C0();
             sub_80597F4();
-            gScriptItemId = gSaveBlock1.registeredItem;
+            gSpecialVar_ItemId = gSaveBlock1.registeredItem;
             taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1.registeredItem), 8);
             gTasks[taskId].data[2] = 1;
             return TRUE;
@@ -3415,7 +3415,7 @@ static const u8 gUnknown_083C170A[] = {5, 0};
 
 static void sub_80A6FDC(void)
 {
-    if (ItemId_GetBattleUsage(gScriptItemId) != 0)
+    if (ItemId_GetBattleUsage(gSpecialVar_ItemId) != 0)
     {
         sPopupMenuActionList = gUnknown_083C1708;
         gUnknown_02038564 = 2;
@@ -3454,10 +3454,10 @@ static void OnBagClose_Battle(u8 taskId)
 
 static void HandlePopupMenuAction_UseInBattle(u8 taskId)
 {
-    if (ItemId_GetBattleFunc(gScriptItemId) != NULL)
+    if (ItemId_GetBattleFunc(gSpecialVar_ItemId) != NULL)
     {
         PlaySE(SE_SELECT);
-        ItemId_GetBattleFunc(gScriptItemId)(taskId);
+        ItemId_GetBattleFunc(gSpecialVar_ItemId)(taskId);
     }
 }
 
@@ -3525,7 +3525,7 @@ static void sub_80A7230(u8 taskId)
         PlaySE(SE_SELECT);
         sub_80F98A4(2);
         sub_80F98A4(3);
-        gScriptItemId = ITEM_POKE_BALL;
+        gSpecialVar_ItemId = ITEM_POKE_BALL;
         sPopupMenuActionList = gUnknown_083C1708;
         gUnknown_02038564 = 2;
         gTasks[taskId].data[10] = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + gBagPocketScrollStates[sCurrentBagPocket].cursorPos + 1;
@@ -3824,7 +3824,7 @@ static void sub_80A7768(void)
                 int var;
 
                 if (r4->unk1 == 1)
-                    text = sub_80A4B90(gScriptItemId);
+                    text = sub_80A4B90(gSpecialVar_ItemId);
                 else
                     text = sItemPopupMenuActions[sPopupMenuActionList[r4->unk1 - 1]].text;
                 var = r4->unk1 - 1;
diff --git a/src/field/item_use.c b/src/field/item_use.c
index 48b159c1c..37cd8ba78 100644
--- a/src/field/item_use.c
+++ b/src/field/item_use.c
@@ -80,10 +80,10 @@ void ExecuteSwitchToOverworldFromItemUse(u8 taskId)
 {
     u8 taskData;
 
-    if (gScriptItemId == 0xAF)
+    if (gSpecialVar_ItemId == 0xAF)
         taskData = gTasks[taskId].data[15] - 1;
     else
-        taskData = ItemId_GetType(gScriptItemId) - 1;
+        taskData = ItemId_GetType(gSpecialVar_ItemId) - 1;
 
     gTasks[taskId].data[8] = (u32)gExitToOverworldFuncList[taskData] >> 16;
     gTasks[taskId].data[9] = (u32)gExitToOverworldFuncList[taskData];
@@ -157,7 +157,7 @@ void ItemMenu_ReadMail(u8 taskId)
 
     if (!gPaletteFade.active)
     {
-        mailStruct.itemId = gScriptItemId;
+        mailStruct.itemId = gSpecialVar_ItemId;
         HandleReadMail(&mailStruct, sub_80A5D04, 0);
         DestroyTask(taskId);
     }
@@ -177,7 +177,7 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
     PlayerGetDestCoords(&x, &y);
     tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
 
-    if (FlagGet(SYS_CYCLING_ROAD) == TRUE // on cycling road?
+    if (FlagGet(FLAG_SYS_CYCLING_ROAD) == TRUE // on cycling road?
         || MetatileBehavior_IsVerticalRail(tileBehavior) == TRUE
         || MetatileBehavior_IsHorizontalRail(tileBehavior) == TRUE
         || MetatileBehavior_IsIsolatedVerticalRail(tileBehavior) == TRUE
@@ -199,9 +199,9 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
 
 void ItemUseOnFieldCB_Bike(u8 taskId)
 {
-    if (ItemId_GetSecondaryId(gScriptItemId) == 0)
+    if (ItemId_GetSecondaryId(gSpecialVar_ItemId) == 0)
         GetOnOffBike(2);
-    if (ItemId_GetSecondaryId(gScriptItemId) == 1)
+    if (ItemId_GetSecondaryId(gSpecialVar_ItemId) == 1)
         GetOnOffBike(4);
 
     sub_8064E2C();
@@ -252,7 +252,7 @@ void ItemUseOutOfBattle_Rod(u8 taskId)
 
 void ItemUseOnFieldCB_Rod(u8 taskId)
 {
-    StartFishing(ItemId_GetSecondaryId(gScriptItemId));
+    StartFishing(ItemId_GetSecondaryId(gSpecialVar_ItemId));
     DestroyTask(taskId);
 }
 
@@ -770,11 +770,11 @@ void ItemUseOutOfBattle_SSTicket(u8 taskId)
     if (gTasks[taskId].data[2] == 0)
     {
         MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
-        DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)], sub_80C9BB8, 1);
+        DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gSpecialVar_ItemId)], sub_80C9BB8, 1);
     }
     else
     {
-        DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)], sub_80C9BD8, 0);
+        DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gSpecialVar_ItemId)], sub_80C9BD8, 0);
     }
 }
 
@@ -791,13 +791,13 @@ void sub_80C9C7C(u8 taskId)
     }
     else
     {
-        ItemId_GetFieldFunc(gScriptItemId)(taskId);
+        ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
     }
 }
 
 void sub_80C9D00(u8 taskId)
 {
-    RemoveBagItem(gScriptItemId, 1);
+    RemoveBagItem(gSpecialVar_ItemId, 1);
     ScriptContext2_Enable();
     ScriptContext1_SetupScript(gUnknown_081A1654);
     DestroyTask(taskId);
@@ -876,7 +876,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId)
 {
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if (gScriptItemId >= ITEM_HM01)
+    if (gSpecialVar_ItemId >= ITEM_HM01)
         DisplayItemMessageOnField(taskId, gOtherText_BootedHM, sub_80C9EE4, 1); // HM
     else
         DisplayItemMessageOnField(taskId, gOtherText_BootedTM, sub_80C9EE4, 1); // TM
@@ -892,7 +892,7 @@ void sub_80C9F10(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
     {
-        StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gScriptItemId)]);
+        StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gSpecialVar_ItemId)]);
         StringExpandPlaceholders(gStringVar4, gOtherText_ContainsMove);
         DisplayItemMessageOnField(taskId, gStringVar4, sub_80C9F80, 1);
     }
@@ -913,9 +913,9 @@ void sub_80C9FC0(u8 var)
 
 static void PrepareItemUseMessage(void)
 {
-    RemoveBagItem(gScriptItemId, 1);
+    RemoveBagItem(gSpecialVar_ItemId, 1);
     sub_80A3E0C();
-    CopyItemName(gScriptItemId, gStringVar2);
+    CopyItemName(gSpecialVar_ItemId, gStringVar2);
     StringExpandPlaceholders(gStringVar4, gOtherText_UsedItem);
 }
 
@@ -923,7 +923,7 @@ void ItemUseOutOfBattle_Repel(u8 var)
 {
     if (VarGet(VAR_REPEL_STEP_COUNT) == FALSE)
     {
-        VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gScriptItemId));
+        VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId));
         PrepareItemUseMessage();
         DisplayItemMessageOnField(var, gStringVar4, CleanUpItemMenuMessage, 1);
     }
@@ -936,7 +936,7 @@ void ItemUseOutOfBattle_Repel(u8 var)
 void sub_80CA07C(void)
 {
     sub_80A3E0C();
-    CopyItemName(gScriptItemId, gStringVar2);
+    CopyItemName(gSpecialVar_ItemId, gStringVar2);
 }
 
 void sub_80CA098(u8 taskId)
@@ -950,19 +950,19 @@ void sub_80CA098(u8 taskId)
 
 void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId)
 {
-    if (gScriptItemId == ITEM_WHITE_FLUTE)
+    if (gSpecialVar_ItemId == ITEM_WHITE_FLUTE)
     {
-        FlagSet(SYS_ENC_UP_ITEM);
-        FlagClear(SYS_ENC_DOWN_ITEM);
+        FlagSet(FLAG_SYS_ENC_UP_ITEM);
+        FlagClear(FLAG_SYS_ENC_DOWN_ITEM);
         sub_80CA07C();
         StringExpandPlaceholders(gStringVar4, gOtherText_UsedFlute);
         gTasks[taskId].func = sub_80CA098;
         gTasks[taskId].data[15] = 0;
     }
-    else if (gScriptItemId == ITEM_BLACK_FLUTE)
+    else if (gSpecialVar_ItemId == ITEM_BLACK_FLUTE)
     {
-        FlagSet(SYS_ENC_DOWN_ITEM);
-        FlagClear(SYS_ENC_UP_ITEM);
+        FlagSet(FLAG_SYS_ENC_DOWN_ITEM);
+        FlagClear(FLAG_SYS_ENC_UP_ITEM);
         sub_80CA07C();
         StringExpandPlaceholders(gStringVar4, gOtherText_UsedRepel);
         gTasks[taskId].func = sub_80CA098;
@@ -1016,7 +1016,7 @@ void ItemUseInBattle_PokeBall(u8 var)
 {
     if (PlayerPartyAndPokemonStorageFull() == FALSE) // have room for mon?
     {
-        RemoveBagItem(gScriptItemId, 1);
+        RemoveBagItem(gSpecialVar_ItemId, 1);
         sub_80A7094(var);
     }
     else
@@ -1037,8 +1037,8 @@ void sub_80CA2BC(u8 taskId)
     if(++gTasks[taskId].data[15] > 7)
     {
         PlaySE(SE_KAIFUKU);
-        RemoveBagItem(gScriptItemId, 1);
-        DisplayItemMessageOnField(taskId, sub_803F378(gScriptItemId), sub_80CA294, 1);
+        RemoveBagItem(gSpecialVar_ItemId, 1);
+        DisplayItemMessageOnField(taskId, sub_803F378(gSpecialVar_ItemId), sub_80CA294, 1);
     }
 }
 
@@ -1048,7 +1048,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId)
 
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gScriptItemId, partyId, 0) != FALSE)
+    if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE)
     {
         DisplayItemMessageOnField(taskId, gOtherText_WontHaveAnyEffect, CleanUpItemMenuMessage, 1);
     }
@@ -1097,9 +1097,9 @@ void unref_sub_80CA448(u8 var)
 {
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if (ExecuteTableBasedItemEffect__(0, gScriptItemId, 0) == FALSE)
+    if (ExecuteTableBasedItemEffect__(0, gSpecialVar_ItemId, 0) == FALSE)
     {
-        RemoveBagItem(gScriptItemId, 1);
+        RemoveBagItem(gSpecialVar_ItemId, 1);
         GetMonNickname(&gPlayerParty[0], gStringVar1);
         StringExpandPlaceholders(gStringVar4, gOtherText_SnapConfusion);
         DisplayItemMessageOnField(var, gStringVar4, sub_80A7094, 1);
@@ -1127,7 +1127,7 @@ void ItemUseInBattle_Escape(u8 taskId)
 
 void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
 {
-    switch (GetItemEffectType(gScriptItemId) - 1)
+    switch (GetItemEffectType(gSpecialVar_ItemId) - 1)
     {
     case 1:
     case 2:
@@ -1170,7 +1170,7 @@ void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
 
 void ItemUseInBattle_EnigmaBerry(u8 taskId)
 {
-    switch (GetItemEffectType(gScriptItemId))
+    switch (GetItemEffectType(gSpecialVar_ItemId))
     {
     case 0:
         ItemUseInBattle_StatIncrease(taskId);
diff --git a/src/field/landmark.c b/src/field/landmark.c
index 1b7805e96..476821ec6 100644
--- a/src/field/landmark.c
+++ b/src/field/landmark.c
@@ -54,43 +54,43 @@ extern const u8 gLandmarkName_FossilManiacsHouse[];
 extern const u8 gLandmarkName_HuntersHouse[];
 extern const u8 gLandmarkName_SkyPillar[];
 
-static const struct Landmark Landmark_FlowerShop = {gLandmarkName_FlowerShop, 2108};
+static const struct Landmark Landmark_FlowerShop = {gLandmarkName_FlowerShop, FLAG_LANDMARK_FLOWER_SHOP};
 static const struct Landmark Landmark_PetalburgWoods = {gLandmarkName_PetalburgWoods, -1};
-static const struct Landmark Landmark_MrBrineysCottage = {gLandmarkName_MrBrineysCottage, 2109};
-static const struct Landmark Landmark_AbandonedShip = {gLandmarkName_AbandonedShip, 2110};
-static const struct Landmark Landmark_SeashoreHouse = {gLandmarkName_SeashoreHouse, 2111};
+static const struct Landmark Landmark_MrBrineysCottage = {gLandmarkName_MrBrineysCottage, FLAG_LANDMARK_MR_BRINEY_HOUSE};
+static const struct Landmark Landmark_AbandonedShip = {gLandmarkName_AbandonedShip, FLAG_LANDMARK_ABANDONED_SHIP};
+static const struct Landmark Landmark_SeashoreHouse = {gLandmarkName_SeashoreHouse, FLAG_LANDMARK_SEASHORE_HOUSE};
 static const struct Landmark Landmark_SlateportBeach = {gLandmarkName_SlateportBeach, -1};
 static const struct Landmark Landmark_CyclingRoad = {gLandmarkName_CyclingRoad, -1};
-static const struct Landmark Landmark_NewMauville = {gLandmarkName_NewMauville, 2112};
-static const struct Landmark Landmark_TrickHouse = {gLandmarkName_TrickHouse, 2114};
-static const struct Landmark Landmark_OldLadysRestShop = {gLandmarkName_OldLadysRestShop, 2113};
+static const struct Landmark Landmark_NewMauville = {gLandmarkName_NewMauville, FLAG_LANDMARK_NEW_MAUVILLE};
+static const struct Landmark Landmark_TrickHouse = {gLandmarkName_TrickHouse, FLAG_LANDMARK_TRICK_HOUSE};
+static const struct Landmark Landmark_OldLadysRestShop = {gLandmarkName_OldLadysRestShop, FLAG_LANDMARK_OLD_LADY_REST_SHOP};
 static const struct Landmark Landmark_Desert = {gLandmarkName_Desert, -1};
-static const struct Landmark Landmark_WinstrateFamily = {gLandmarkName_WinstrateFamily, 2115};
+static const struct Landmark Landmark_WinstrateFamily = {gLandmarkName_WinstrateFamily, FLAG_LANDMARK_WINSTRATE_FAMILY};
 static const struct Landmark Landmark_CableCar = {gLandmarkName_CableCar, -1};
-static const struct Landmark Landmark_GlassWorkshop = {gLandmarkName_GlassWorkshop, 2116};
+static const struct Landmark Landmark_GlassWorkshop = {gLandmarkName_GlassWorkshop, FLAG_LANDMARK_GLASS_WORKSHOP};
 static const struct Landmark Landmark_WeatherInstitute = {gLandmarkName_WeatherInstitute, -1};
 static const struct Landmark Landmark_MeteorFalls = {gLandmarkName_MeteorFalls, -1};
-static const struct Landmark Landmark_TunnelersRestHouse = {gLandmarkName_TunnelersRestHouse, 2138};
+static const struct Landmark Landmark_TunnelersRestHouse = {gLandmarkName_TunnelersRestHouse, FLAG_LANDMARK_TUNNELERS_REST_HOUSE};
 static const struct Landmark Landmark_RusturfTunnel = {gLandmarkName_RusturfTunnel, -1};
-static const struct Landmark Landmark_PokemonDayCare = {gLandmarkName_PokemonDayCare, 2118};
+static const struct Landmark Landmark_PokemonDayCare = {gLandmarkName_PokemonDayCare, FLAG_LANDMARK_POKEMON_DAYCARE};
 static const struct Landmark Landmark_SafariZoneEntrance = {gLandmarkName_SafariZoneEntrance, -1};
 static const struct Landmark Landmark_MtPyre = {gLandmarkName_MtPyre, -1};
 static const struct Landmark Landmark_ShoalCave = {gLandmarkName_ShoalCave, -1};
-static const struct Landmark Landmark_SeafloorCavern = {gLandmarkName_SeafloorCavern, 2119};
+static const struct Landmark Landmark_SeafloorCavern = {gLandmarkName_SeafloorCavern, FLAG_LANDMARK_SEAFLOOR_CAVERN};
 static const struct Landmark Landmark_GraniteCave = {gLandmarkName_GraniteCave, -1};
 static const struct Landmark Landmark_OceanCurrent = {gLandmarkName_OceanCurrent, -1};
-static const struct Landmark Landmark_LanettesHouse = {gLandmarkName_LanettesHouse, 2117};
-static const struct Landmark Landmark_FieryPath = {gLandmarkName_FieryPath, 2122};
+static const struct Landmark Landmark_LanettesHouse = {gLandmarkName_LanettesHouse, FLAG_LANDMARK_LANETTES_HOUSE};
+static const struct Landmark Landmark_FieryPath = {gLandmarkName_FieryPath, FLAG_LANDMARK_FIERY_PATH};
 static const struct Landmark Landmark_JaggedPass = {gLandmarkName_JaggedPass, -1};
-static const struct Landmark Landmark_BerryMastersHouse = {gLandmarkName_BerryMastersHouse, 2147};
-static const struct Landmark Landmark_IslandCave = {gLandmarkName_IslandCave, 2133};
-static const struct Landmark Landmark_DesertRuins = {gLandmarkName_DesertRuins, 2134};
-static const struct Landmark Landmark_ScorchedSlab = {gLandmarkName_ScorchedSlab, 2136};
-static const struct Landmark Landmark_AncientTomb = {gLandmarkName_AncientTomb, 2137};
-static const struct Landmark Landmark_SealedChamber = {gLandmarkName_SealedChamber, 2140};
-static const struct Landmark Landmark_FossilManiacsHouse = {gLandmarkName_FossilManiacsHouse, 2135};
-static const struct Landmark Landmark_HuntersHouse = {gLandmarkName_HuntersHouse, 2139};
-static const struct Landmark Landmark_SkyPillar = {gLandmarkName_SkyPillar, 2142};
+static const struct Landmark Landmark_BerryMastersHouse = {gLandmarkName_BerryMastersHouse, FLAG_LANDMARK_BERRY_MASTERS_HOUSE};
+static const struct Landmark Landmark_IslandCave = {gLandmarkName_IslandCave, FLAG_LANDMARK_ISLAND_CAVE};
+static const struct Landmark Landmark_DesertRuins = {gLandmarkName_DesertRuins, FLAG_LANDMARK_DESERT_RUINS};
+static const struct Landmark Landmark_ScorchedSlab = {gLandmarkName_ScorchedSlab, FLAG_LANDMARK_SCORCHED_SLAB};
+static const struct Landmark Landmark_AncientTomb = {gLandmarkName_AncientTomb, FLAG_LANDMARK_ANCIENT_TOMB};
+static const struct Landmark Landmark_SealedChamber = {gLandmarkName_SealedChamber, FLAG_LANDMARK_SEALED_CHAMBER};
+static const struct Landmark Landmark_FossilManiacsHouse = {gLandmarkName_FossilManiacsHouse, FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE};
+static const struct Landmark Landmark_HuntersHouse = {gLandmarkName_HuntersHouse, FLAG_LANDMARK_HUNTERS_HOUSE};
+static const struct Landmark Landmark_SkyPillar = {gLandmarkName_SkyPillar, FLAG_LANDMARK_SKY_PILLAR};
 
 static const struct Landmark *const Landmarks_Route104_0[]  =
 {
diff --git a/src/field/lottery_corner.c b/src/field/lottery_corner.c
index 2cfdb7f88..83febc56e 100644
--- a/src/field/lottery_corner.c
+++ b/src/field/lottery_corner.c
@@ -7,7 +7,7 @@
 #include "string_util.h"
 #include "text.h"
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern u16 gSpecialVar_0x8004;
 extern struct PokemonStorage gPokemonStorage;
 extern u16 gSpecialVar_0x8005;
@@ -46,7 +46,7 @@ void SetRandomLotteryNumber(u16 i)
 void RetrieveLotteryNumber(void)
 {
     u16 lottoNumber = GetLotteryNumber();
-    gScriptResult = lottoNumber;
+    gSpecialVar_Result = lottoNumber;
 }
 
 void PickLotteryCornerTicket(void)
@@ -70,7 +70,7 @@ void PickLotteryCornerTicket(void)
             if (!GetMonData(pkmn, MON_DATA_IS_EGG))
             {
                 u32 otId = GetMonData(pkmn, MON_DATA_OT_ID);
-                u8 numMatchingDigits = GetMatchingDigits(gScriptResult, otId);
+                u8 numMatchingDigits = GetMatchingDigits(gSpecialVar_Result, otId);
 
                 if (numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1)
                 {
@@ -97,7 +97,7 @@ void PickLotteryCornerTicket(void)
             !GetBoxMonData(pkmn, MON_DATA_IS_EGG))
             {
                 u32 otId = GetBoxMonData(pkmn, MON_DATA_OT_ID);
-                u8 numMatchingDigits = GetMatchingDigits(gScriptResult, otId);
+                u8 numMatchingDigits = GetMatchingDigits(gSpecialVar_Result, otId);
 
                 if (numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1)
                 {
diff --git a/src/field/map_obj_lock.c b/src/field/map_obj_lock.c
index 91feaf177..954fcb446 100644
--- a/src/field/map_obj_lock.c
+++ b/src/field/map_obj_lock.c
@@ -6,7 +6,7 @@
 #include "script_movement.h"
 #include "task.h"
 
-extern u16 gScriptFacing;
+extern u16 gSpecialVar_Facing;
 
 bool8 walkrun_is_standing_still(void)
 {
@@ -109,7 +109,7 @@ void unref_sub_8064E5C(void)
 
 void sub_8064EAC(void)
 {
-    FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gScriptFacing);
+    FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gSpecialVar_Facing);
 }
 
 void sub_8064ED4(void)
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index fad6674db..30f6f5233 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -21,7 +21,7 @@
 
 extern struct MusicPlayerInfo gMPlay_SE2;
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern u16 gSpecialVar_0x8004;
 
 extern const u8 gTextStoryteller_Story1Title[];
@@ -258,12 +258,12 @@ static u8 GetCurrentMauvilleOldMan(void)
 
 void ScrSpecial_GetCurrentMauvilleMan(void)
 {
-    gScriptResult = GetCurrentMauvilleOldMan();
+    gSpecialVar_Result = GetCurrentMauvilleOldMan();
 }
 
 void ScrSpecial_HasBardSongBeenChanged(void)
 {
-    u16 *scriptResult = &gScriptResult; // why??
+    u16 *scriptResult = &gSpecialVar_Result; // why??
     struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
 
     *scriptResult = bard->hasChangedSong;
@@ -350,7 +350,7 @@ void ScrSpecial_PlayBardSong(void)
 
 void ScrSpecial_GetHipsterSpokenFlag(void)
 {
-    u16 *scriptResult = &gScriptResult; // again??
+    u16 *scriptResult = &gSpecialVar_Result; // again??
     struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
 
     *scriptResult = hipster->alreadySpoken;
@@ -369,12 +369,12 @@ void ScrSpecial_HipsterTeachWord(void)
 
     if (var == 0xFFFF)
     {
-        gScriptResult = FALSE;
+        gSpecialVar_Result = FALSE;
     }
     else
     {
         EasyChat_GetWordText(gStringVar1, var);
-        gScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
 }
 
@@ -384,12 +384,12 @@ void ScrSpecial_GiddyShouldTellAnotherTale(void)
 
     if (giddy->taleCounter == 10)
     {
-        gScriptResult = FALSE;
+        gSpecialVar_Result = FALSE;
         giddy->taleCounter = 0;
     }
     else
     {
-        gScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
 }
 
@@ -421,7 +421,7 @@ void ScrSpecial_GenerateGiddyLine(void)
     else
         giddy->taleCounter++;
 
-    gScriptResult = TRUE;
+    gSpecialVar_Result = TRUE;
 }
 
 #ifdef NONMATCHING
@@ -1251,11 +1251,11 @@ static void Task_StoryListMenu(u8 taskId)
             break;
         if (selection == -1 || selection == GetFreeStorySlot())
         {
-            gScriptResult = 0;
+            gSpecialVar_Result = 0;
         }
         else
         {
-            gScriptResult = 1;
+            gSpecialVar_Result = 1;
             gUnknown_03000748 = selection;
         }
         HandleDestroyMenuCursors();
@@ -1266,7 +1266,7 @@ static void Task_StoryListMenu(u8 taskId)
     }
 }
 
-// Sets gScriptResult to TRUE if player selected a story
+// Sets gSpecialVar_Result to TRUE if player selected a story
 void ScrSpecial_StorytellerStoryListMenu(void)
 {
     CreateTask(Task_StoryListMenu, 0x50);
diff --git a/src/field/overworld.c b/src/field/overworld.c
index 21f3f98ef..834a2afa4 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -203,47 +203,47 @@ static void DoWhiteOut(void)
 void Overworld_ResetStateAfterFly(void)
 {
     player_avatar_init_params_reset();
-    FlagClear(SYS_CYCLING_ROAD);
-    FlagClear(SYS_CRUISE_MODE);
-    FlagClear(SYS_SAFARI_MODE);
-    FlagClear(SYS_USE_STRENGTH);
-    FlagClear(SYS_USE_FLASH);
+    FlagClear(FLAG_SYS_CYCLING_ROAD);
+    FlagClear(FLAG_SYS_CRUISE_MODE);
+    FlagClear(FLAG_SYS_SAFARI_MODE);
+    FlagClear(FLAG_SYS_USE_STRENGTH);
+    FlagClear(FLAG_SYS_USE_FLASH);
 }
 
 void Overworld_ResetStateAfterTeleport(void)
 {
     player_avatar_init_params_reset();
-    FlagClear(SYS_CYCLING_ROAD);
-    FlagClear(SYS_CRUISE_MODE);
-    FlagClear(SYS_SAFARI_MODE);
-    FlagClear(SYS_USE_STRENGTH);
-    FlagClear(SYS_USE_FLASH);
+    FlagClear(FLAG_SYS_CYCLING_ROAD);
+    FlagClear(FLAG_SYS_CRUISE_MODE);
+    FlagClear(FLAG_SYS_SAFARI_MODE);
+    FlagClear(FLAG_SYS_USE_STRENGTH);
+    FlagClear(FLAG_SYS_USE_FLASH);
     ScriptContext2_RunNewScript(gUnknown_0819FC9F);
 }
 
 void Overworld_ResetStateAfterDigEscRope(void)
 {
     player_avatar_init_params_reset();
-    FlagClear(SYS_CYCLING_ROAD);
-    FlagClear(SYS_CRUISE_MODE);
-    FlagClear(SYS_SAFARI_MODE);
-    FlagClear(SYS_USE_STRENGTH);
-    FlagClear(SYS_USE_FLASH);
+    FlagClear(FLAG_SYS_CYCLING_ROAD);
+    FlagClear(FLAG_SYS_CRUISE_MODE);
+    FlagClear(FLAG_SYS_SAFARI_MODE);
+    FlagClear(FLAG_SYS_USE_STRENGTH);
+    FlagClear(FLAG_SYS_USE_FLASH);
 }
 
 void Overworld_ResetStateAfterWhiteOut(void)
 {
     player_avatar_init_params_reset();
-    FlagClear(SYS_CYCLING_ROAD);
-    FlagClear(SYS_CRUISE_MODE);
-    FlagClear(SYS_SAFARI_MODE);
-    FlagClear(SYS_USE_STRENGTH);
-    FlagClear(SYS_USE_FLASH);
+    FlagClear(FLAG_SYS_CYCLING_ROAD);
+    FlagClear(FLAG_SYS_CRUISE_MODE);
+    FlagClear(FLAG_SYS_SAFARI_MODE);
+    FlagClear(FLAG_SYS_USE_STRENGTH);
+    FlagClear(FLAG_SYS_USE_FLASH);
 }
 
 void sub_805308C(void)
 {
-    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(FLAG_SYS_SAFARI_MODE);
     ChooseAmbientCrySpecies();
     ResetCyclingRoadChallengeData();
     UpdateLocationHistoryForRoamer();
@@ -641,7 +641,7 @@ void sub_8053994(u32 a1)
     SetSav1WeatherFromCurrMapHeader();
     ChooseAmbientCrySpecies();
     if (v2)
-        FlagClear(SYS_USE_FLASH);
+        FlagClear(FLAG_SYS_USE_FLASH);
     SetDefaultFlashLevel();
     Overworld_ClearSavedMusic();
     mapheader_run_script_with_tag_x3();
@@ -691,7 +691,7 @@ struct UnkPlayerStruct *sub_8053AA8(void)
 
 u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3)
 {
-    if (a3 != 8 && FlagGet(SYS_CRUISE_MODE))
+    if (a3 != 8 && FlagGet(FLAG_SYS_CRUISE_MODE))
         return 1;
     if (a3 == 5)
         return 16;
@@ -708,7 +708,7 @@ u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3)
 
 u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8 a2, u16 a3, u8 a4)
 {
-    if (FlagGet(SYS_CRUISE_MODE) && a4 == 6)
+    if (FlagGet(FLAG_SYS_CRUISE_MODE) && a4 == 6)
         return 4;
     if (MetatileBehavior_IsDeepSouthWarp(a3) == TRUE)
         return 2;
@@ -766,7 +766,7 @@ void SetDefaultFlashLevel(void)
 {
     if (!gMapHeader.cave)
         gSaveBlock1.flashLevel = 0;
-    else if (FlagGet(SYS_USE_FLASH))
+    else if (FlagGet(FLAG_SYS_USE_FLASH))
         gSaveBlock1.flashLevel = 1;
     else
         gSaveBlock1.flashLevel = gMaxFlashLevel;
@@ -792,7 +792,7 @@ void sub_8053D14(u16 mapDataId)
 
 static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
 {
-    if (!FlagGet(SYS_WEATHER_CTRL))
+    if (!FlagGet(FLAG_SYS_WEATHER_CTRL))
         return FALSE;
     if (warp->mapGroup == 0)
     {
@@ -912,7 +912,7 @@ void Overworld_ClearSavedMusic(void)
 
 void sub_8053F0C(void)
 {
-    if (FlagGet(SPECIAL_FLAG_1) != TRUE)
+    if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE)
     {
         u16 newMusic = GetWarpDestinationMusic();
         u16 currentMusic = GetCurrentMapMusic();
@@ -959,7 +959,7 @@ u8 GetMapMusicFadeoutSpeed(void)
 void sub_8053FF8(void)
 {
     u16 music = GetWarpDestinationMusic();
-    if (FlagGet(SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic())
+    if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic())
     {
         u8 speed = GetMapMusicFadeoutSpeed();
         FadeOutMapMusic(speed);
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index dc817f8c9..089f93f9e 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -4314,7 +4314,7 @@ void TaughtMove(u8 taskId)
         u16 r4;
 
         gTasks[taskId].func = TaskDummy;
-        sub_806E8D0(taskId, gScriptItemId, sub_808B508);
+        sub_806E8D0(taskId, gSpecialVar_ItemId, sub_808B508);
         moveIndex = sub_809FA30();
         r4 = GetMonData(ewram1C000.pokemon, MON_DATA_MOVE1 + moveIndex);
         GetMonNickname(ewram1C000.pokemon, gStringVar1);
@@ -4340,7 +4340,7 @@ void StopTryingToTeachMove_806F588(u8 taskId)
     if (!gPaletteFade.active)
     {
         gTasks[taskId].func = TaskDummy;
-        sub_806E8D0(taskId, gScriptItemId, sub_808B508);
+        sub_806E8D0(taskId, gSpecialVar_ItemId, sub_808B508);
         StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]);
         StringExpandPlaceholders(gStringVar4, gOtherText_StopTryingTo);
         sub_806E834(gStringVar4, 1);
@@ -5643,7 +5643,7 @@ _08070F8A:\n\
 
 void unref_sub_8070F90(void)
 {
-    FlagSet(SYS_POKEDEX_GET);
-    FlagSet(SYS_POKEMON_GET);
-    FlagSet(SYS_POKENAV_GET);
+    FlagSet(FLAG_SYS_POKEDEX_GET);
+    FlagSet(FLAG_SYS_POKEMON_GET);
+    FlagSet(FLAG_SYS_POKENAV_GET);
 }
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index 3b70e7d76..4a904fbb1 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -664,7 +664,7 @@ static void sub_810BF7C(u8 taskId)
             PlaySE(SE_SELECT);
             if (gUnknown_02039248.unk1 + gUnknown_02039248.unk0 == gUnknown_02039248.unk2)
             {
-                gScriptResult = 0xffff;
+                gSpecialVar_Result = 0xffff;
                 sub_810C31C(taskId);
             }
             else
@@ -675,7 +675,7 @@ static void sub_810BF7C(u8 taskId)
         else if (gMain.newKeys & B_BUTTON)
         {
             PlaySE(SE_SELECT);
-            gScriptResult = 0xffff;
+            gSpecialVar_Result = 0xffff;
             sub_810C31C(taskId);
         }
     }
@@ -800,7 +800,7 @@ static void sub_810C31C(u8 taskId)
     BeginNormalPaletteFade(-1, 0, 0, 16, 0);
     if (gUnknown_02039244 > 1)
     {
-        gScriptItemId = ITEM_NONE;
+        gSpecialVar_ItemId = ITEM_NONE;
     }
     gTasks[taskId].func = sub_810C2C8;
 }
@@ -816,7 +816,7 @@ static void sub_810C368(u8 taskId)
     MenuDrawTextWindow(7, v0 + 4, 13, 11);
     PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758);
     InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5);
-    gScriptItemId = gUnknown_02039248.unk0 + gUnknown_02039248.unk1;
+    gSpecialVar_ItemId = gUnknown_02039248.unk0 + gUnknown_02039248.unk1;
     gTasks[taskId].func = sub_810C40C;
 }
 
@@ -855,7 +855,7 @@ static void sub_810C4C4(u8 taskId)
     if (!gPaletteFade.active)
     {
         sub_810C2B0();
-        sub_8136130(&gSaveBlock1.pokeblocks[gScriptItemId], sub_810B96C);
+        sub_8136130(&gSaveBlock1.pokeblocks[gSpecialVar_ItemId], sub_810B96C);
         DestroyTask(taskId);
     }
 }
@@ -939,21 +939,21 @@ static void sub_810C748(u8 taskId)
 
 static void sub_810C788(u8 taskId)
 {
-    s16 v0 = PokeblockGetGain(GetNature(&gEnemyParty[0]), &gSaveBlock1.pokeblocks[gScriptItemId]);
-    StringCopy(gBattleTextBuff1, gPokeblockNames[gSaveBlock1.pokeblocks[gScriptItemId].color]);
-    PokeblockClearIfExists(gScriptItemId);
-    gScriptItemId = gSaveBlock1.pokeblocks[gScriptItemId].color << 8;
+    s16 v0 = PokeblockGetGain(GetNature(&gEnemyParty[0]), &gSaveBlock1.pokeblocks[gSpecialVar_ItemId]);
+    StringCopy(gBattleTextBuff1, gPokeblockNames[gSaveBlock1.pokeblocks[gSpecialVar_ItemId].color]);
+    PokeblockClearIfExists(gSpecialVar_ItemId);
+    gSpecialVar_ItemId = gSaveBlock1.pokeblocks[gSpecialVar_ItemId].color << 8;
     if (v0 == 0)
     {
-        gScriptItemId += 1;
+        gSpecialVar_ItemId += 1;
     }
     if (v0 > 0)
     {
-        gScriptItemId += 2;
+        gSpecialVar_ItemId += 2;
     }
     if (v0 < 0)
     {
-        gScriptItemId += 3;
+        gSpecialVar_ItemId += 3;
     }
     BeginNormalPaletteFade(-1, 0, 0, 16, 0);
     gTasks[taskId].func = sub_810C2C8;
@@ -961,10 +961,10 @@ static void sub_810C788(u8 taskId)
 
 static void sub_810C854(u8 taskId)
 {
-    SafariZoneActivatePokeblockFeeder(gScriptItemId);
-    StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gScriptItemId].color]);
-    gScriptResult = gScriptItemId;
-    PokeblockClearIfExists(gScriptItemId);
+    SafariZoneActivatePokeblockFeeder(gSpecialVar_ItemId);
+    StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gSpecialVar_ItemId].color]);
+    gSpecialVar_Result = gSpecialVar_ItemId;
+    PokeblockClearIfExists(gSpecialVar_ItemId);
     BeginNormalPaletteFade(-1, 0, 0, 16, 0);
     gTasks[taskId].func = sub_810C2C8;
 }
diff --git a/src/field/region_map.c b/src/field/region_map.c
index f2e4b3251..07e77e389 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -916,9 +916,9 @@ static u16 sub_80FB758(u16 mapSectionId)
         return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? 2 : 3;
 
     case MAPSEC_BATTLE_TOWER:
-        return FlagGet(FLAG_UNLOCK_BATTLE_TOWER) ? 4 : 0;
+        return FlagGet(FLAG_LANDMARK_BATTLE_TOWER) ? 4 : 0;
     case MAPSEC_SOUTHERN_ISLAND:
-        return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? 1 : 0;
+        return FlagGet(FLAG_LANDMARK_SOUTHERN_ISLAND) ? 1 : 0;
     default:
         return 1;
     }
@@ -1422,7 +1422,7 @@ static const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, Other
 
 static const struct UnknownStruct4 sUnknown_083E79C0[1] =
 {
-    {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, SYS_POKEMON_LEAGUE_FLY},
+    {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY},
 };
 
 // XXX: what is this?
@@ -1822,7 +1822,7 @@ static void sub_80FC69C(void)
                 sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13);
                 break;
             case MAPSEC_EVER_GRANDE_CITY:
-                sub_8053538((FlagGet(0x854) && ewram0_3.regionMap.everGrandeCityArea == 0) ? 20 : 11);
+                sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && ewram0_3.regionMap.everGrandeCityArea == 0) ? 20 : 11);
                 break;
             default:
                 if (sUnknown_083E7920[ewram0_3.regionMap.mapSectionId][2] != 0)
diff --git a/src/field/safari_zone.c b/src/field/safari_zone.c
index 14fd1ddc4..e9ca3a9f9 100644
--- a/src/field/safari_zone.c
+++ b/src/field/safari_zone.c
@@ -37,21 +37,21 @@ extern u8 gUnknown_081C3448;
 extern u8 gUnknown_081C3459;
 extern u8 *gPokeblockNames[];
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 bool32 GetSafariZoneFlag(void)
 {
-    return FlagGet(SYS_SAFARI_MODE);
+    return FlagGet(FLAG_SYS_SAFARI_MODE);
 }
 
 void SetSafariZoneFlag(void)
 {
-    FlagSet(SYS_SAFARI_MODE);
+    FlagSet(FLAG_SYS_SAFARI_MODE);
 }
 
 void ResetSafariZoneFlag(void)
 {
-    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(FLAG_SYS_SAFARI_MODE);
 }
 
 void EnterSafariMode(void)
@@ -137,13 +137,13 @@ void SafariZoneGetPokeblockNameInFeeder(void)
          && gPokeblockFeeders[i].x == x
          && gPokeblockFeeders[i].y == y)
         {
-            gScriptResult = i;
+            gSpecialVar_Result = i;
             StringCopy(gStringVar1, gPokeblockNames[gPokeblockFeeders[i].pokeblock.color]);
             return;
         }
     }
 
-    gScriptResult = -1;
+    gSpecialVar_Result = -1;
 }
 
 static void GetPokeblockFeederWithinRange(void)
@@ -166,23 +166,23 @@ static void GetPokeblockFeederWithinRange(void)
                 y *= -1;
             if ((x + y) <= 5)
             {
-                gScriptResult = i;
+                gSpecialVar_Result = i;
                 return;
             }
         }
     }
 
-    gScriptResult = -1;
+    gSpecialVar_Result = -1;
 }
 
 struct Pokeblock *unref_sub_80C8418(void)
 {
     SafariZoneGetPokeblockNameInFeeder();
 
-    if (gScriptResult == 0xFFFF)
+    if (gSpecialVar_Result == 0xFFFF)
         return NULL;
     else
-        return &gPokeblockFeeders[gScriptResult].pokeblock;
+        return &gPokeblockFeeders[gSpecialVar_Result].pokeblock;
 }
 
 
@@ -190,10 +190,10 @@ struct Pokeblock *SafariZoneGetActivePokeblock(void)
 {
     GetPokeblockFeederWithinRange();
 
-    if (gScriptResult == 0xFFFF)
+    if (gSpecialVar_Result == 0xFFFF)
         return NULL;
     else
-        return &gPokeblockFeeders[gScriptResult].pokeblock;
+        return &gPokeblockFeeders[gSpecialVar_Result].pokeblock;
 }
 
 
@@ -240,13 +240,13 @@ bool8 unref_sub_80C853C(void)
 {
     SafariZoneGetPokeblockNameInFeeder();
 
-    if (gScriptResult == 0xFFFF)
+    if (gSpecialVar_Result == 0xFFFF)
     {
         return FALSE;
     }
 
     ConvertIntToDecimalStringN(gStringVar2,
-        gPokeblockFeeders[gScriptResult].stepCounter,
+        gPokeblockFeeders[gSpecialVar_Result].stepCounter,
         STR_CONV_MODE_LEADING_ZEROS, 3);
 
     return TRUE;
diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index e6305d9c4..d5fc56e8d 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -61,9 +61,9 @@ extern u16 gSpecialVar_0x8001;
 extern u16 gSpecialVar_0x8002;
 extern u16 gSpecialVar_0x8004;
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
-extern u16 gScriptContestCategory;
+extern u16 gSpecialVar_ContestCategory;
 
 extern SpecialFunc gSpecials[];
 extern u8 *gStdScripts[];
@@ -479,25 +479,25 @@ bool8 ScrCmd_random(struct ScriptContext *ctx)
 {
     u16 max = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = Random() % max;
+    gSpecialVar_Result = Random() % max;
     return FALSE;
 }
 
-bool8 ScrCmd_additem(struct ScriptContext *ctx)
+bool8 ScrCmd_giveitem(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = AddBagItem(itemId, (u8)quantity);
+    gSpecialVar_Result = AddBagItem(itemId, (u8)quantity);
     return FALSE;
 }
 
-bool8 ScrCmd_removeitem(struct ScriptContext *ctx)
+bool8 ScrCmd_takeitem(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = RemoveBagItem(itemId, (u8)quantity);
+    gSpecialVar_Result = RemoveBagItem(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -506,7 +506,7 @@ bool8 ScrCmd_checkitemspace(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = CheckBagHasSpace(itemId, (u8)quantity);
+    gSpecialVar_Result = CheckBagHasSpace(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -515,7 +515,7 @@ bool8 ScrCmd_checkitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = CheckBagHasItem(itemId, (u8)quantity);
+    gSpecialVar_Result = CheckBagHasItem(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -523,16 +523,16 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = GetPocketByItemId(itemId);
+    gSpecialVar_Result = GetPocketByItemId(itemId);
     return FALSE;
 }
 
-bool8 ScrCmd_addpcitem(struct ScriptContext *ctx)
+bool8 ScrCmd_givepcitem(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u16 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = AddPCItem(itemId, quantity);
+    gSpecialVar_Result = AddPCItem(itemId, quantity);
     return FALSE;
 }
 
@@ -541,39 +541,39 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u16 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = CheckPCHasItem(itemId, quantity);
+    gSpecialVar_Result = CheckPCHasItem(itemId, quantity);
     return FALSE;
 }
 
-bool8 ScrCmd_adddecor(struct ScriptContext *ctx)
+bool8 ScrCmd_givedecoration(struct ScriptContext *ctx)
 {
-    u32 decorId = VarGet(ScriptReadHalfword(ctx));
+    u32 decoration = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = IsThereStorageSpaceForDecoration(decorId);
+    gSpecialVar_Result = IsThereStorageSpaceForDecoration(decoration);
     return FALSE;
 }
 
-bool8 ScrCmd_removedecor(struct ScriptContext *ctx)
+bool8 ScrCmd_takedecoration(struct ScriptContext *ctx)
 {
-    u32 decorId = VarGet(ScriptReadHalfword(ctx));
+    u32 decoration = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = sub_81340A8(decorId);
+    gSpecialVar_Result = sub_81340A8(decoration);
     return FALSE;
 }
 
-bool8 ScrCmd_checkdecor(struct ScriptContext *ctx)
+bool8 ScrCmd_checkdecorspace(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = sub_8134074(decorId);
+    gSpecialVar_Result = sub_8134074(decorId);
     return FALSE;
 }
 
-bool8 ScrCmd_hasdecor(struct ScriptContext *ctx)
+bool8 ScrCmd_checkdecor(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = sub_8133FE4(decorId);
+    gSpecialVar_Result = sub_8133FE4(decorId);
     return FALSE;
 }
 
@@ -601,14 +601,14 @@ bool8 ScrCmd_incrementgamestat(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_animdarklevel(struct ScriptContext *ctx)
+bool8 ScrCmd_animateflash(struct ScriptContext *ctx)
 {
     sub_8081594(ScriptReadByte(ctx));
     ScriptContext1_Stop();
     return TRUE;
 }
 
-bool8 ScrCmd_setdarklevel(struct ScriptContext *ctx)
+bool8 ScrCmd_setflashradius(struct ScriptContext *ctx)
 {
     u16 flashLevel = VarGet(ScriptReadHalfword(ctx));
 
@@ -631,7 +631,7 @@ bool8 ScrCmd_fadescreen(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_fadescreendelay(struct ScriptContext *ctx)
+bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
 {
     u8 duration = ScriptReadByte(ctx);
     u8 delay = ScriptReadByte(ctx);
@@ -641,7 +641,7 @@ bool8 ScrCmd_fadescreendelay(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 s28_pause_asm()
+bool8 RunPauseTimer()
 {
     sPauseCounter--;
 
@@ -654,7 +654,7 @@ bool8 s28_pause_asm()
 bool8 ScrCmd_delay(struct ScriptContext *ctx)
 {
     sPauseCounter = ScriptReadHalfword(ctx);
-    SetupNativeScript(ctx, s28_pause_asm);
+    SetupNativeScript(ctx, RunPauseTimer);
     return TRUE;
 }
 
@@ -702,7 +702,7 @@ bool8 ScrCmd_doweather(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_tileeffect(struct ScriptContext *ctx)
+bool8 ScrCmd_setstepcallback(struct ScriptContext *ctx)
 {
     ActivatePerStepCallback(ScriptReadByte(ctx));
     return FALSE;
@@ -859,9 +859,9 @@ bool8 ScrCmd_getplayerxy(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_countpokemon(struct ScriptContext *ctx)
+bool8 ScrCmd_getpartysize(struct ScriptContext *ctx)
 {
-    gScriptResult = CalculatePlayerPartyCount();
+    gSpecialVar_Result = CalculatePlayerPartyCount();
     return FALSE;
 }
 
@@ -871,7 +871,7 @@ bool8 ScrCmd_playse(struct ScriptContext *ctx)
     return FALSE;
 }
 
-static bool8 WaitForSoundEffectFinish()
+static bool8 WaitForSoundEffectFinish(void)
 {
     if (!IsSEPlaying())
         return TRUE;
@@ -891,7 +891,7 @@ bool8 ScrCmd_playfanfare(struct ScriptContext *ctx)
     return FALSE;
 }
 
-static bool8 WaitForFanfareFinish()
+static bool8 WaitForFanfareFinish(void)
 {
     return IsFanfareTaskInactive();
 }
@@ -1073,7 +1073,7 @@ bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_showobject(struct ScriptContext *ctx)
+bool8 ScrCmd_showobjectat(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 mapGroup = ScriptReadByte(ctx);
@@ -1083,7 +1083,7 @@ bool8 ScrCmd_showobject(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_hideobject(struct ScriptContext *ctx)
+bool8 ScrCmd_hideobjectat(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 mapGroup = ScriptReadByte(ctx);
@@ -1267,7 +1267,7 @@ static bool8 WaitForAorBPress(void)
     return FALSE;
 }
 
-bool8 ScrCmd_waitbutton(struct ScriptContext *ctx)
+bool8 ScrCmd_waitbuttonpress(struct ScriptContext *ctx)
 {
     SetupNativeScript(ctx, WaitForAorBPress);
     return TRUE;
@@ -1386,7 +1386,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx)
     }
 }
 
-bool8 ScrCmd_drawpokepic(struct ScriptContext *ctx)
+bool8 ScrCmd_drawmonpic(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u8 x = ScriptReadByte(ctx);
@@ -1396,7 +1396,7 @@ bool8 ScrCmd_drawpokepic(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_erasepokepic(struct ScriptContext *ctx)
+bool8 ScrCmd_erasemonpic(struct ScriptContext *ctx)
 {
     bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc();
 
@@ -1441,7 +1441,7 @@ bool8 ScrCmd_vmessage(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getspeciesname(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferspeciesname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 species = VarGet(ScriptReadHalfword(ctx));
@@ -1450,7 +1450,7 @@ bool8 ScrCmd_getspeciesname(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getfirstpartypokename(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferleadmonspeciesname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
 
@@ -1461,7 +1461,7 @@ bool8 ScrCmd_getfirstpartypokename(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getpartypokename(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferpartymonnick(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
@@ -1471,7 +1471,7 @@ bool8 ScrCmd_getpartypokename(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getitemname(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferitemname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
@@ -1480,7 +1480,7 @@ bool8 ScrCmd_getitemname(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getdecorname(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferdecorationname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 decorId = VarGet(ScriptReadHalfword(ctx));
@@ -1489,7 +1489,7 @@ bool8 ScrCmd_getdecorname(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getmovename(struct ScriptContext *ctx)
+bool8 ScrCmd_buffermovename(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 moveId = VarGet(ScriptReadHalfword(ctx));
@@ -1498,7 +1498,7 @@ bool8 ScrCmd_getmovename(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getnumberstring(struct ScriptContext *ctx)
+bool8 ScrCmd_buffernumberstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 v1 = VarGet(ScriptReadHalfword(ctx));
@@ -1508,7 +1508,7 @@ bool8 ScrCmd_getnumberstring(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getstdstring(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferstdstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 index = VarGet(ScriptReadHalfword(ctx));
@@ -1517,7 +1517,7 @@ bool8 ScrCmd_getstdstring(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getstring(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u8 *text = (u8 *)ScriptReadWord(ctx);
@@ -1526,7 +1526,7 @@ bool8 ScrCmd_getstring(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_vloadword(struct ScriptContext *ctx)
+bool8 ScrCmd_vloadptr(struct ScriptContext *ctx)
 {
     u8 *ptr = (u8 *)(ScriptReadWord(ctx) - gUnknown_0202E8B0);
 
@@ -1534,7 +1534,7 @@ bool8 ScrCmd_vloadword(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_vgetstring(struct ScriptContext *ctx)
+bool8 ScrCmd_vbufferstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u32 addr = ScriptReadWord(ctx);
@@ -1545,7 +1545,7 @@ bool8 ScrCmd_vgetstring(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_givepoke(struct ScriptContext *ctx)
+bool8 ScrCmd_givemon(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u8 level = ScriptReadByte(ctx);
@@ -1554,7 +1554,7 @@ bool8 ScrCmd_givepoke(struct ScriptContext *ctx)
     u32 unkParam2 = ScriptReadWord(ctx);
     u8 unkParam3 = ScriptReadByte(ctx);
 
-    gScriptResult = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3);
+    gSpecialVar_Result = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3);
     return FALSE;
 }
 
@@ -1562,11 +1562,11 @@ bool8 ScrCmd_giveegg(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = ScriptGiveEgg(species);
+    gSpecialVar_Result = ScriptGiveEgg(species);
     return FALSE;
 }
 
-bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
+bool8 ScrCmd_setmonmove(struct ScriptContext *ctx)
 {
     u8 partyIndex = ScriptReadByte(ctx);
     u8 slot = ScriptReadByte(ctx);
@@ -1576,13 +1576,13 @@ bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_checkpokemove(struct ScriptContext *ctx)
+bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx)
 {
     u8 i;
     u16 moveId = ScriptReadHalfword(ctx);
 
-    gScriptResult = 6;
-    for (i = 0; i < 6; i++)
+    gSpecialVar_Result = 6;
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, NULL);
         if (!species)
@@ -1590,7 +1590,7 @@ bool8 ScrCmd_checkpokemove(struct ScriptContext *ctx)
         // UB: GetMonData() arguments don't match function definition
         if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) && pokemon_has_move(&gPlayerParty[i], moveId) == TRUE)
         {
-            gScriptResult = i;
+            gSpecialVar_Result = i;
             gSpecialVar_0x8004 = species;
             break;
         }
@@ -1624,7 +1624,7 @@ bool8 ScrCmd_checkmoney(struct ScriptContext *ctx)
     u8 ignore = ScriptReadByte(ctx);
 
     if (!ignore)
-        gScriptResult = IsEnoughMoney(gSaveBlock1.money, amount);
+        gSpecialVar_Result = IsEnoughMoney(gSaveBlock1.money, amount);
     return FALSE;
 }
 
@@ -1692,19 +1692,19 @@ bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_battlebegin(struct ScriptContext *ctx)
+bool8 ScrCmd_trainerbattlebegin(struct ScriptContext *ctx)
 {
     BattleSetup_StartTrainerBattle();
     return TRUE;
 }
 
-bool8 ScrCmd_ontrainerbattleend(struct ScriptContext *ctx)
+bool8 ScrCmd_gotopostbattlescript(struct ScriptContext *ctx)
 {
     ctx->scriptPtr = BattleSetup_GetScriptAddrAfterBattle();
     return FALSE;
 }
 
-bool8 ScrCmd_ontrainerbattleendgoto(struct ScriptContext *ctx)
+bool8 ScrCmd_gotobeatenscript(struct ScriptContext *ctx)
 {
     ctx->scriptPtr = BattleSetup_GetTrainerPostBattleScript();
     return FALSE;
@@ -1760,7 +1760,7 @@ bool8 ScrCmd_pokemart(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_pokemartdecor(struct ScriptContext *ctx)
+bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx)
 {
     void *ptr = (void *)ScriptReadWord(ctx);
 
@@ -1769,7 +1769,7 @@ bool8 ScrCmd_pokemartdecor(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_pokemartbp(struct ScriptContext *ctx)
+bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx)
 {
     void *ptr = (void *)ScriptReadWord(ctx);
 
@@ -1787,7 +1787,7 @@ bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_plantberrytree(struct ScriptContext *ctx)
+bool8 ScrCmd_setberrytree(struct ScriptContext *ctx)
 {
     u8 treeId = ScriptReadByte(ctx);
     u8 berry = ScriptReadByte(ctx);
@@ -1804,11 +1804,11 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
 {
     u16 value = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = GetPriceReduction(value);
+    gSpecialVar_Result = GetPriceReduction(value);
     return FALSE;
 }
 
-bool8 ScrCmd_choosecontestpkmn(struct ScriptContext *ctx)
+bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
 {
     sub_80F99CC();
     ScriptContext1_Stop();
@@ -1831,7 +1831,7 @@ bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx)
 
 bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx)
 {
-    sub_80C4980(gScriptContestCategory);
+    sub_80C4980(gSpecialVar_ContestCategory);
     ScriptContext1_Stop();
     return TRUE;
 }
@@ -1845,7 +1845,7 @@ bool8 ScrCmd_dofieldeffect(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_setfieldeffect(struct ScriptContext *ctx)
+bool8 ScrCmd_setfieldeffectargument(struct ScriptContext *ctx)
 {
     u8 argNum = ScriptReadByte(ctx);
 
@@ -1868,7 +1868,7 @@ bool8 ScrCmd_waitfieldeffect(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_sethealplace(struct ScriptContext *ctx)
+bool8 ScrCmd_setrespawn(struct ScriptContext *ctx)
 {
     u16 healLocationId = VarGet(ScriptReadHalfword(ctx));
 
@@ -1878,11 +1878,11 @@ bool8 ScrCmd_sethealplace(struct ScriptContext *ctx)
 
 bool8 ScrCmd_checkplayergender(struct ScriptContext *ctx)
 {
-    gScriptResult = gSaveBlock2.playerGender;
+    gSpecialVar_Result = gSaveBlock2.playerGender;
     return FALSE;
 }
 
-bool8 ScrCmd_playpokecry(struct ScriptContext *ctx)
+bool8 ScrCmd_playmoncry(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u16 mode = VarGet(ScriptReadHalfword(ctx));
@@ -1891,25 +1891,25 @@ bool8 ScrCmd_playpokecry(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_waitpokecry(struct ScriptContext *ctx)
+bool8 ScrCmd_waitmoncry(struct ScriptContext *ctx)
 {
     SetupNativeScript(ctx, IsCryFinished);
     return TRUE;
 }
 
-bool8 ScrCmd_setmaptile(struct ScriptContext *ctx)
+bool8 ScrCmd_setmetatile(struct ScriptContext *ctx)
 {
     u16 x = VarGet(ScriptReadHalfword(ctx));
     u16 y = VarGet(ScriptReadHalfword(ctx));
-    u16 tileId = VarGet(ScriptReadHalfword(ctx));
+    u16 metatileId = VarGet(ScriptReadHalfword(ctx));
     u16 v8 = VarGet(ScriptReadHalfword(ctx));
 
     x += 7;
     y += 7;
     if (!v8)
-        MapGridSetMetatileIdAt(x, y, tileId);
+        MapGridSetMetatileIdAt(x, y, metatileId);
     else
-        MapGridSetMetatileIdAt(x, y, tileId | 0xC00);
+        MapGridSetMetatileIdAt(x, y, metatileId | 0xC00);
     return FALSE;
 }
 
@@ -2002,9 +2002,9 @@ bool8 ScrCmd_givecoins(struct ScriptContext *ctx)
     u16 coins = VarGet(ScriptReadHalfword(ctx));
 
     if (GiveCoins(coins) == TRUE)
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
     else
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     return FALSE;
 }
 
@@ -2013,8 +2013,8 @@ bool8 ScrCmd_takecoins(struct ScriptContext *ctx)
     u16 coins = VarGet(ScriptReadHalfword(ctx));
 
     if (TakeCoins(coins) == TRUE)
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
     else
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     return FALSE;
 }
diff --git a/src/field/script_menu.c b/src/field/script_menu.c
index caa1d7562..9f3ab75cc 100644
--- a/src/field/script_menu.c
+++ b/src/field/script_menu.c
@@ -580,7 +580,7 @@ const u8 *const gUnknown_083CE048[] =
 
 extern u8 gPCText_WhichPCShouldBeAccessed[];
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 static void Task_HandleMultichoiceInput(u8);
 static void Task_HandleYesNoInput(u8);
@@ -599,7 +599,7 @@ bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress)
     }
     else
     {
-        gScriptResult = 0xFF;
+        gSpecialVar_Result = 0xFF;
         DrawMultichoiceMenu(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress, 0);
         return TRUE;
     }
@@ -613,7 +613,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, u8 ig
     }
     else
     {
-        gScriptResult = 0xFF;
+        gSpecialVar_Result = 0xFF;
         DrawMultichoiceMenu(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress, defaultChoice);
         return TRUE;
     }
@@ -698,11 +698,11 @@ static void Task_HandleMultichoiceInput(u8 taskId)
                 if (gTasks[taskId].tIgnoreBPress)
                     return;
                 PlaySE(SE_SELECT);
-                gScriptResult = 127;
+                gSpecialVar_Result = 127;
             }
             else
             {
-                gScriptResult = selection;
+                gSpecialVar_Result = selection;
             }
             HandleDestroyMenuCursors();
             MenuZeroFillWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom);
@@ -720,7 +720,7 @@ bool8 Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress)
     }
     else
     {
-        gScriptResult = 0xFF;
+        gSpecialVar_Result = 0xFF;
         sub_80B53B4(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress);
         return TRUE;
     }
@@ -760,7 +760,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top)
     }
     else
     {
-        gScriptResult = 0xFF;
+        gSpecialVar_Result = 0xFF;
         DisplayYesNoMenu(left, top, 1);
         taskId = CreateTask(Task_HandleYesNoInput, 0x50);
         gTasks[taskId].tLeft = left;
@@ -772,7 +772,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top)
 // unused
 bool8 IsScriptActive(void)
 {
-    if (gScriptResult == 0xFF)
+    if (gSpecialVar_Result == 0xFF)
         return FALSE;
     else
         return TRUE;
@@ -795,10 +795,10 @@ static void Task_HandleYesNoInput(u8 taskId)
     case -1:
     case 1:
         PlaySE(SE_SELECT);
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         break;
     case 0:
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
         break;
     }
 
@@ -823,7 +823,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr
         u8 taskId;
         u8 width;
 
-        gScriptResult = 0xFF;
+        gSpecialVar_Result = 0xFF;
 
         sub_807274C(left, top, gMultichoiceLists[multichoiceId].count, 0, gMultichoiceLists[multichoiceId].list, columnCount, 0);
 
@@ -860,11 +860,11 @@ static void Task_HandleMultichoiceGridInput(u8 taskId)
             if (gTasks[taskId].tIgnoreBPress)
                 return;
             PlaySE(SE_SELECT);
-            gScriptResult = 127;
+            gSpecialVar_Result = 127;
         }
         else
         {
-            gScriptResult = selection;
+            gSpecialVar_Result = selection;
         }
         HandleDestroyMenuCursors();
         MenuZeroFillWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom);
@@ -888,7 +888,7 @@ bool8 ScrSpecial_CreatePCMenu(void)
     }
     else
     {
-        gScriptResult = 0xFF;
+        gSpecialVar_Result = 0xFF;
         ScriptMenu_CreatePCMenu();
         return TRUE;
     }
@@ -906,7 +906,7 @@ void ScriptMenu_CreatePCMenu(void)
     else
         width = 8;
 
-    if (FlagGet(SYS_GAME_CLEAR)) // player has cleared game?
+    if (FlagGet(FLAG_SYS_GAME_CLEAR)) // player has cleared game?
     {
         numChoices = 4;
         MenuDrawTextWindow(0, 0, width + 2, 9);
@@ -920,7 +920,7 @@ void ScriptMenu_CreatePCMenu(void)
         MenuPrint(gPCText_LogOff, 1, 5);
     }
 
-    if (FlagGet(SYS_PC_LANETTE)) // player met lanette?
+    if (FlagGet(FLAG_SYS_PC_LANETTE)) // player met lanette?
         MenuPrint(gPCText_LanettesPC, 1, 1);
     else
         MenuPrint(gPCText_SomeonesPC, 1, 1);
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index fee79a18c..7589ab1e3 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -175,11 +175,11 @@ void sub_80BB5D0(void)
 void sub_80BB5E4(void)
 {
     u16 i;
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     for (i = 0; i < MAX_SECRET_BASES; i++) {
         if (gUnknown_020387DC != gSaveBlock1.secretBases[i].secretBaseId)
             continue;
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
         VarSet(VAR_0x4054, i);
         break;
     }
@@ -188,9 +188,9 @@ void sub_80BB5E4(void)
 void sub_80BB63C(void) // 80bb63c
 {
     if (gSaveBlock1.secretBases[0].secretBaseId)
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     else
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
 }
 
 u8 sub_80BB66C(void) // 80bb66c
@@ -462,13 +462,13 @@ void sub_80BBDD0(void)
                 gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF;
                 metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
                 if (sub_80572D8(metatile) == TRUE || sub_80572EC(metatile) == TRUE) {
-                    gScriptResult = gMapHeader.events->mapObjects[objid].graphicsId + VAR_0x3F20;
-                    VarSet(gScriptResult, gDecorations[roomdecor[decidx]].tiles[0]);
-                    gScriptResult = gMapHeader.events->mapObjects[objid].localId;
+                    gSpecialVar_Result = gMapHeader.events->mapObjects[objid].graphicsId + VAR_0x3F20;
+                    VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]);
+                    gSpecialVar_Result = gMapHeader.events->mapObjects[objid].localId;
                     FlagClear(gSpecialVar_0x8004 + 0xAE);
-                    show_sprite(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
-                    sub_805C0F8(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
-                    sub_805C78C(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+                    show_sprite(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+                    sub_805C0F8(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
+                    sub_805C78C(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
                     gSpecialVar_0x8004 ++;
                 }
             }
@@ -504,7 +504,7 @@ bool8 sub_80BC050(void)
 {
     sub_80BB5D0();
     sub_80BB5E4();
-    if (gScriptResult == 1)
+    if (gSpecialVar_Result == 1)
         return FALSE;
     return TRUE;
 }
@@ -539,9 +539,9 @@ void sub_80BC0F8(void) {
 
 void sub_80BC114(void) {
     if (gSaveBlock1.secretBases[0].secretBaseId != gUnknown_020387DC)
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     else
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
 }
 
 u8 sub_80BC14C(u8 sbid)
@@ -862,22 +862,22 @@ void sub_80BC56C(void)
     u8 secretBaseIndex = sub_80BC14C(gUnknown_020387DC);
     if (sub_80BC268(secretBaseIndex) == TRUE)
     {
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     }
     else if (sub_80BC538() > 9)
     {
-        gScriptResult = 2;
+        gSpecialVar_Result = 2;
     }
     else
     {
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
     }
 }
 
 void sub_80BC5BC(void)
 {
     gSaveBlock1.secretBases[sub_80BC14C(gUnknown_020387DC)].sbr_field_1_6 ^= 1;
-    FlagSet(0x10C);
+    FlagSet(FLAG_DECORATION_16);
 }
 
 void SecretBasePC_Decoration(void)
@@ -1237,14 +1237,14 @@ void sub_80BCE1C(void)
 
 void sub_80BCE4C()
 {
-    gSaveBlock1.secretBases[VarGet(VAR_0x4054)].sbr_field_1_5 = gScriptResult;
+    gSaveBlock1.secretBases[VarGet(VAR_0x4054)].sbr_field_1_5 = gSpecialVar_Result;
 }
 
 void sub_80BCE90()
 {
     u16 curBaseIndex = VarGet(VAR_0x4054);
 
-    if (!FlagGet(0x8C2))
+    if (!FlagGet(FLAG_DAILY_UNKNOWN_8C2))
     {
         u8 i;
 
@@ -1253,11 +1253,11 @@ void sub_80BCE90()
             gSaveBlock1.secretBases[i].sbr_field_1_5 = 0;
         }
 
-        FlagSet(0x8C2);
+        FlagSet(FLAG_DAILY_UNKNOWN_8C2);
     }
 
     gSpecialVar_0x8004 = sub_80BCCA4(curBaseIndex);
-    gScriptResult = gSaveBlock1.secretBases[curBaseIndex].sbr_field_1_5;
+    gSpecialVar_Result = gSaveBlock1.secretBases[curBaseIndex].sbr_field_1_5;
 }
 
 void sub_80BCF1C(u8 taskId)
@@ -1650,7 +1650,7 @@ void sub_80BD610(struct SecretBaseRecord *basesA, struct SecretBaseRecord *bases
 
 void sub_80BD674(void *playerRecords, u32 size, u8 c)
 {
-    if (FlagGet(0x60))
+    if (FlagGet(FLAG_RECEIVED_SECRET_POWER))
     {
         u16 i;
         u8 numLinkedPlayers = GetLinkPlayerCount();
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 7913e5527..dccf1714e 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -50,7 +50,7 @@ static bool8 savingComplete;
 
 extern bool8 gDifferentSaveFile;
 extern u16 gSaveFileStatus;
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 extern u8 gUnknown_03004860;
 
@@ -154,12 +154,12 @@ static void AddStartMenuAction(u8 action)
 
 static void BuildStartMenuActions_Normal(void)
 {
-    if (FlagGet(SYS_POKEDEX_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKEDEX);
-    if (FlagGet(SYS_POKEMON_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKEMON);
     AddStartMenuAction(MENU_ACTION_BAG);
-    if (FlagGet(SYS_POKENAV_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKENAV);
     AddStartMenuAction(MENU_ACTION_PLAYER);
     AddStartMenuAction(MENU_ACTION_SAVE);
@@ -182,7 +182,7 @@ static void BuildStartMenuActions_Link(void)
 {
     AddStartMenuAction(MENU_ACTION_POKEMON);
     AddStartMenuAction(MENU_ACTION_BAG);
-    if (FlagGet(SYS_POKENAV_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKENAV);
     AddStartMenuAction(MENU_ACTION_PLAYER_LINK);
     AddStartMenuAction(MENU_ACTION_OPTION);
@@ -528,10 +528,10 @@ static void Task_SaveDialog(u8 taskId)
     {
     case SAVE_CANCELED:
     case SAVE_ERROR:
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         break;
     case SAVE_SUCCESS:
-        gScriptResult = status;
+        gSpecialVar_Result = status;
         break;
     case SAVE_IN_PROGRESS:
         return;
diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c
index 149eaa03d..701d4087a 100644
--- a/src/field/starter_choose.c
+++ b/src/field/starter_choose.c
@@ -16,7 +16,7 @@
 #include "trig.h"
 #include "unknown_task.h"
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern struct SpriteTemplate gUnknown_02024E8C;
 
 //--------------------------------------------------
@@ -439,7 +439,7 @@ static void Task_StarterChoose5(u8 taskId)
     {
     case 0:  // YES
         //Return the starter choice and exit.
-        gScriptResult = gTasks[taskId].tStarterSelection;
+        gSpecialVar_Result = gTasks[taskId].tStarterSelection;
         SetMainCallback2(gMain.savedCallback);
         break;
     case 1:  // NO
diff --git a/src/field/trader.c b/src/field/trader.c
index c4fe73ba1..61cb0b4a2 100644
--- a/src/field/trader.c
+++ b/src/field/trader.c
@@ -179,7 +179,7 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
 void ScrSpecial_GetTraderTradedFlag(void)
 {
     struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
-    gScriptResult = trader->alreadyTraded;
+    gSpecialVar_Result = trader->alreadyTraded;
 }
 
 void ScrSpecial_DoesPlayerHaveNoDecorations(void)
@@ -190,21 +190,21 @@ void ScrSpecial_DoesPlayerHaveNoDecorations(void)
     {
         if (sub_8134194(i))
         {
-            gScriptResult = FALSE;
+            gSpecialVar_Result = FALSE;
             return;
         }
     }
-    gScriptResult = TRUE;
+    gSpecialVar_Result = TRUE;
 }
 
 void ScrSpecial_IsDecorationFull(void)
 {
-    gScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
         && sub_8133F9C(gDecorations[gSpecialVar_0x8004].category) == -1)
     {
         sub_80FE7D4(gStringVar2, gDecorations[gSpecialVar_0x8004].category);
-        gScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
 }
 
diff --git a/src/field/tv.c b/src/field/tv.c
index 71d6455bd..1d5bf929c 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -68,10 +68,10 @@ extern struct TVSaleItem gUnknown_02038724[3];
 
 struct UnkTvStruct gUnknown_03005D38;
 
-extern u16 gScriptLastTalked;
+extern u16 gSpecialVar_LastTalked;
 
-extern u8 gScriptContestCategory;
-extern u8 gScriptContestRank;
+extern u8 gSpecialVar_ContestCategory;
+extern u8 gSpecialVar_ContestRank;
 extern u8 gUnknown_03004316[11];
 extern u8 gBattleOutcome;
 
@@ -447,8 +447,8 @@ void ClearTVShowData(void)
 
 bool8 sub_80BF1B4(u8);
 void sub_80BF20C(void);
-extern u8 gScriptContestCategory;
-extern u8 gScriptContestRank;
+extern u8 gSpecialVar_ContestCategory;
+extern u8 gSpecialVar_ContestRank;
 extern u8 gUnknown_03004316[11];
 extern u8 gBattleOutcome;
 
@@ -542,7 +542,7 @@ bool8 IsTVShowInSearchOfTrainersAiring(void);
 
 void UpdateTVScreensOnMap(int width, int height)
 {
-    FlagSet(SYS_TV_WATCH);
+    FlagSet(FLAG_SYS_TV_WATCH);
     switch (CheckForBigMovieOrEmergencyNewsOnTV())
     {
     case 1:
@@ -556,9 +556,9 @@ void UpdateTVScreensOnMap(int width, int height)
         {
             SetTVMetatilesOnMap(width, height, 0x3);
         }
-        else if (FlagGet(SYS_TV_START) && (sub_80BD8B8() != 0xff || sub_80BECA0() != 0xff || IsTVShowInSearchOfTrainersAiring()))
+        else if (FlagGet(FLAG_SYS_TV_START) && (sub_80BD8B8() != 0xff || sub_80BECA0() != 0xff || IsTVShowInSearchOfTrainersAiring()))
         {
-            FlagClear(SYS_TV_WATCH);
+            FlagClear(FLAG_SYS_TV_WATCH);
             SetTVMetatilesOnMap(width, height, 0x3);
         }
         break;
@@ -674,7 +674,7 @@ void GabbyAndTyBeforeInterview(void)
 
     TakeTVShowInSearchOfTrainersOffTheAir();
     if (gSaveBlock1.gabbyAndTyData.lastMove == 0)
-        FlagSet(1);
+        FlagSet(FLAG_TEMP_1);
 }
 
 void sub_80BDC14(void)
@@ -983,8 +983,8 @@ void sub_80BE284(u8 a0)
     if (gUnknown_03005D38.var0 != -1)
     {
         bravoTrainer->contestResult = a0;
-        bravoTrainer->contestCategory = gScriptContestCategory;
-        bravoTrainer->contestRank = gScriptContestRank;
+        bravoTrainer->contestCategory = gSpecialVar_ContestCategory;
+        bravoTrainer->contestRank = gSpecialVar_ContestRank;
         bravoTrainer->species = GetMonData(&gPlayerParty[gUnknown_02038694], MON_DATA_SPECIES, NULL);
         GetMonData(&gPlayerParty[gUnknown_02038694], MON_DATA_NICKNAME, bravoTrainer->pokemonNickname);
     }
@@ -1047,7 +1047,7 @@ void sub_80BE3BC(void)
 void sub_80BE478(void)
 {
     sub_80BF478();
-    if (gScriptResult == 1)
+    if (gSpecialVar_Result == 1)
         return;
 
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
@@ -1138,7 +1138,7 @@ void nullsub_21(void)
 
 void sub_80BE778(void)
 {
-    if (FlagGet(SYS_GAME_CLEAR))
+    if (FlagGet(FLAG_SYS_GAME_CLEAR))
     {
         u8 i;
 
@@ -1331,7 +1331,7 @@ void sub_80BEB20(void)
 {
     u16 rval;
 
-    if (FlagGet(SYS_GAME_CLEAR) != 0)
+    if (FlagGet(FLAG_SYS_GAME_CLEAR) != 0)
     {
         gUnknown_03005D38.var0 = sub_80BEBC8(gSaveBlock1.unknown_2ABC);
         if (gUnknown_03005D38.var0 != -1 && sub_80BF77C(0x28f) != 1)
@@ -1414,7 +1414,7 @@ void sub_80BECE8(void)
     arg0 = sub_80BECA0();
     if (arg0 == 0xff)
     {
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         return;
     }
     if (gSaveBlock1.unknown_2ABC[arg0].val2 == 0)
@@ -1433,7 +1433,7 @@ void sub_80BECE8(void)
         gSaveBlock1.unknown_2ABC[arg0].val1 = 0;
         ShowFieldMessage(gTVNewsTextGroup1[gSaveBlock1.unknown_2ABC[arg0].val0]);
     }
-    gScriptResult = 1;
+    gSpecialVar_Result = 1;
 }
 
 bool8 GetPriceReduction(u8 arg0)
@@ -1462,7 +1462,7 @@ bool8 IsPriceDiscounted(u8 arg0)
     case 1:
         if (gSaveBlock1.location.mapGroup == MAP_GROUP(SLATEPORT_CITY)
          && gSaveBlock1.location.mapNum == MAP_NUM(SLATEPORT_CITY)
-         && gScriptLastTalked == 0x1a)
+         && gSpecialVar_LastTalked == 0x1a)
             return TRUE;
         else
             return FALSE;
@@ -1507,7 +1507,7 @@ void sub_80BEE84(u16 var0)
             }
             else
             {
-                if (!gSaveBlock1.unknown_2ABC[i].val1 && FlagGet(SYS_GAME_CLEAR) == 1)
+                if (!gSaveBlock1.unknown_2ABC[i].val1 && FlagGet(FLAG_SYS_GAME_CLEAR) == 1)
                     gSaveBlock1.unknown_2ABC[i].val1 = 1;
                 gSaveBlock1.unknown_2ABC[i].val2 -= var0;
             }
@@ -1660,7 +1660,7 @@ void sub_80BF25C(u8 showType)
         {
             if(gSaveBlock1.tvShows[i].common.var01 == 1)
             {
-                gScriptResult = 1;
+                gSpecialVar_Result = 1;
             }
             else
             {
@@ -1676,7 +1676,7 @@ void sub_80BF25C(u8 showType)
 
 void sub_80BF2C4(void)
 {
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     switch (gSpecialVar_0x8005)
     {
     case TVSHOW_FAN_CLUB_LETTER:
@@ -1708,7 +1708,7 @@ void sub_80BF334(void)
     struct TVShowFanClubLetter *fanclubLetter;
 
     sub_80BF25C(TVSHOW_FAN_CLUB_LETTER);
-    if (gScriptResult == 0)
+    if (gSpecialVar_Result == 0)
     {
         StringCopy(gStringVar1, gSpeciesNames[GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SPECIES, 0)]);
         fanclubLetter = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].fanclubLetter;
@@ -1721,7 +1721,7 @@ void sub_80BF3A4(void)
     struct TVShowRecentHappenings *recentHappenings;
 
     sub_80BF25C(TVSHOW_RECENT_HAPPENINGS);
-    if (gScriptResult == 0)
+    if (gSpecialVar_Result == 0)
     {
         recentHappenings = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].recentHappenings;
         sub_80EB6FC(recentHappenings->var04, 6);
@@ -1733,7 +1733,7 @@ void sub_80BF3DC(void)
     struct TVShowFanclubOpinions *fanclubOpinions;
 
     sub_80BF25C(TVSHOW_PKMN_FAN_CLUB_OPINIONS);
-    if (gScriptResult == 0)
+    if (gSpecialVar_Result == 0)
     {
         StringCopy(gStringVar1, gSpeciesNames[GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SPECIES, 0)]);
         GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_NICKNAME, gStringVar2);
@@ -1745,7 +1745,7 @@ void sub_80BF3DC(void)
 
 void sub_80BF46C(void)
 {
-    gScriptResult = 1;
+    gSpecialVar_Result = 1;
 }
 
 void sub_80BF478(void)
@@ -1758,7 +1758,7 @@ void sub_80BF484(void)
     struct TVShowBravoTrainerPokemonProfiles *bravoTrainer;
 
     sub_80BF25C(TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE);
-    if (gScriptResult == 0)
+    if (gSpecialVar_Result == 0)
     {
         bravoTrainer = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].bravoTrainer;
         sub_80EB6FC(bravoTrainer->var04, 2);
@@ -1770,7 +1770,7 @@ void sub_80BF4BC(void)
     struct TVShowBravoTrainerBattleTowerSpotlight *bravoTrainerTower;
 
     sub_80BF25C(TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE);
-    if (gScriptResult == 0)
+    if (gSpecialVar_Result == 0)
     {
         bravoTrainerTower = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].bravoTrainerTower;
         sub_80EB6FC(bravoTrainerTower->var18, 1); // wrong struct ident, fix later
@@ -1898,9 +1898,9 @@ void sub_80BF6D8(void)
     gUnknown_03005D38.var0 = sub_80BF720(gSaveBlock1.tvShows);
     gSpecialVar_0x8006 = gUnknown_03005D38.var0;
     if (gUnknown_03005D38.var0 == -1)
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
     else
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
 }
 
 s8 sub_80BF720(TVShow tvShow[])
@@ -2095,9 +2095,9 @@ void sub_80BFAE0(void)
 void sub_80BFB10(void)
 {
     if (GetPlayerTrainerId() == GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_OT_ID, 0))
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
     else
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
 }
 
 u8 sub_80BFB54(u8 arg0)
@@ -2133,9 +2133,9 @@ u8 CheckForBigMovieOrEmergencyNewsOnTV(void)
         if (gSaveBlock1.location.mapNum != MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F))
             return 0;
     }
-    if (FlagGet(SYS_TV_LATI) == 1)
+    if (FlagGet(FLAG_SYS_TV_LATI) == 1)
         return 1;
-    if (FlagGet(SYS_TV_HOME) == 1)
+    if (FlagGet(FLAG_SYS_TV_HOME) == 1)
         return 2;
     return 1;
 }
@@ -2650,7 +2650,7 @@ void sub_80C0408(void)
 {
     u16 i;
 
-    if (FlagGet(SYS_GAME_CLEAR) == TRUE)
+    if (FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE)
         return;
     for (i = 0; i < 24; i++)
     {
@@ -2801,7 +2801,7 @@ void sub_80C0788(void)
 {
     u8 i;
 
-    if (FlagGet(SYS_GAME_CLEAR) != 1)
+    if (FlagGet(FLAG_SYS_GAME_CLEAR) != 1)
     {
         for (i = 0; i < 16; i++)
             gSaveBlock1.unknown_2ABC[i].val1 = 0;
@@ -2869,7 +2869,7 @@ void DoTVShowBravoTrainerPokemonProfile(void)
     struct TVShowBravoTrainerPokemonProfiles *bravoTrainer = &gSaveBlock1.tvShows[gSpecialVar_0x8004].bravoTrainer;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch(state)
     {
@@ -2940,7 +2940,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
     struct TVShowBravoTrainerBattleTowerSpotlight *bravoTrainerTower = &gSaveBlock1.tvShows[gSpecialVar_0x8004].bravoTrainerTower;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch(state)
     {
@@ -3029,7 +3029,7 @@ void DoTVShowTodaysSmartShopper(void)
     struct TVShowSmartShopper *smartShopper = &gSaveBlock1.tvShows[gSpecialVar_0x8004].smartshopperShow;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch(state)
     {
@@ -3117,7 +3117,7 @@ void DoTVShowTheNameRaterShow(void)
     struct TVShowNameRaterShow *nameRaterShow = &gSaveBlock1.tvShows[gSpecialVar_0x8004].nameRaterShow;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch (state)
     {
@@ -3213,7 +3213,7 @@ void DoTVShowPokemonTodaySuccessfulCapture(void)
     struct TVShowPokemonToday *pokemonToday = &gSaveBlock1.tvShows[gSpecialVar_0x8004].pokemonToday;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch (state)
     {
@@ -3282,7 +3282,7 @@ void DoTVShowPokemonTodayFailedCapture(void)
     struct TVShowPokemonTodayFailed *pokemonTodayFailed = &gSaveBlock1.tvShows[gSpecialVar_0x8004].pokemonTodayFailed;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch (state)
     {
@@ -3327,7 +3327,7 @@ void DoTVShowPokemonFanClubLetter(void)
     u8 state;
     u16 rval;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch (state)
     {
@@ -3379,7 +3379,7 @@ void DoTVShowRecentHappenings(void)
     struct TVShowRecentHappenings *recentHappenings = &gSaveBlock1.tvShows[gSpecialVar_0x8004].recentHappenings;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch (state)
     {
@@ -3413,7 +3413,7 @@ void DoTVShowPokemonFanClubOpinions(void)
     struct TVShowFanclubOpinions *fanclubOpinions = &gSaveBlock1.tvShows[gSpecialVar_0x8004].fanclubOpinions;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch (state)
     {
@@ -3459,7 +3459,7 @@ void DoTVShowInSearchOfTrainers(void)
 {
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch (state)
     {
@@ -3501,7 +3501,7 @@ void DoTVShowInSearchOfTrainers(void)
         EasyChat_GetWordText(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
         StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]);
         StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]);
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
         gUnknown_020387E8 = 0;;
         TakeTVShowInSearchOfTrainersOffTheAir();
         break;
@@ -3514,7 +3514,7 @@ void DoTVShowPokemonAngler(void)
     struct TVShowPokemonAngler *pokemonAngler = &gSaveBlock1.tvShows[gSpecialVar_0x8004].pokemonAngler;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     if (pokemonAngler->var02 < pokemonAngler->var03)
         gUnknown_020387E8 = 0;
     else
@@ -3543,7 +3543,7 @@ void DoTVShowTheWorldOfMasters(void)
     struct TVShowWorldOfMasters *worldOfMasters = &gSaveBlock1.tvShows[gSpecialVar_0x8004].worldOfMasters;
     u8 state;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     state = gUnknown_020387E8;
     switch (state)
     {
@@ -3571,7 +3571,7 @@ void DoTVShowTheWorldOfMasters(void)
 
 void TVShowDone(void)
 {
-    gScriptResult = 1;
+    gSpecialVar_Result = 1;
     gUnknown_020387E8 = 0;
     gSaveBlock1.tvShows[gSpecialVar_0x8004].common.var01 = 0;
 }
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c
index 8155b4216..7253ac901 100644
--- a/src/field/use_pokeblock.c
+++ b/src/field/use_pokeblock.c
@@ -105,7 +105,7 @@ EWRAM_DATA u8 gPokeblockMonID = 0;
 EWRAM_DATA s16 gPokeblockGain = 0;
 
 extern u16 gKeyRepeatStartDelay;
-extern u16 gScriptItemId; // FIXME: remove after merge of #349 Pokeblock
+extern u16 gSpecialVar_ItemId; // FIXME: remove after merge of #349 Pokeblock
 
 static void launch_c3_walk_stairs_and_run_once(void (*const)(void));
 static void sub_81361E4(void);
@@ -574,7 +574,7 @@ static void sub_81369CC(void)
         case 5:
             if (gMain.newKeys & (A_BUTTON | B_BUTTON) && !sub_8136D00())
             {
-                PokeblockClearIfExists((u8)gScriptItemId);
+                PokeblockClearIfExists((u8)gSpecialVar_ItemId);
                 launch_c3_walk_stairs_and_run_once(sub_8136B44);
             }
             break;
diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index 64c88694c..4bf83cad8 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -3695,7 +3695,7 @@ const u16 gRoute119WaterTileData[] =
 	0x5C, 0x8B, 0x12A,
 };
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern u8 S_RepelWoreOff[];
 
 EWRAM_DATA static u8 sWildEncountersDisabled = 0;
@@ -4167,18 +4167,18 @@ void ScrSpecial_RockSmashWildEncounter(void)
 
         if (wildPokemonInfo == NULL)
         {
-            gScriptResult = 0;
+            gSpecialVar_Result = 0;
             return;
         }
         else if (DoWildEncounterTest(wildPokemonInfo->encounterRate, 1) == TRUE
          && GenerateWildMon(wildPokemonInfo, 2, TRUE) == TRUE)
         {
             BattleSetup_StartWildBattle();
-            gScriptResult = 1;
+            gSpecialVar_Result = 1;
             return;
         }
     }
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     return;
 }
 
@@ -4353,9 +4353,9 @@ static bool8 IsWildLevelAllowedByRepel(u8 wildLevel)
 
 static void ApplyFluteEncounterRateMod(u32 *encRate)
 {
-    if (FlagGet(SYS_ENC_UP_ITEM) == TRUE)
+    if (FlagGet(FLAG_SYS_ENC_UP_ITEM) == TRUE)
         *encRate += *encRate / 2;
-    else if (FlagGet(SYS_ENC_DOWN_ITEM) == TRUE)
+    else if (FlagGet(FLAG_SYS_ENC_DOWN_ITEM) == TRUE)
         *encRate = *encRate / 2;
 }
 
diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c
index 389c4bb25..8e3adda12 100644
--- a/src/pokemon/pokeblock_feed.c
+++ b/src/pokemon/pokeblock_feed.c
@@ -645,7 +645,7 @@ static bool8 sub_8147B20(struct Pokemon* mon)
         ewram1FFFF++;
         break;
     case 5:
-        SetPokeblockFeedSpritePal(gScriptItemId);
+        SetPokeblockFeedSpritePal(gSpecialVar_ItemId);
         LoadCompressedObjectPalette(&sPokeblockFeedSpritePal);
         ewram1FFFF++;
         break;
@@ -722,7 +722,7 @@ static void Task_WaitForAtePokeblockText(u8 taskID)
 static void Task_PrintAtePokeblockText(u8 taskID)
 {
     struct Pokemon* mon = &gPlayerParty[gPokeblockMonID];
-    struct Pokeblock* pokeblock = &gSaveBlock1.pokeblocks[gScriptItemId];
+    struct Pokeblock* pokeblock = &gSaveBlock1.pokeblocks[gSpecialVar_ItemId];
 
     gPokeblockGain = PokeblockGetGain(GetNature(mon), pokeblock);
     GetMonNickname(mon, gStringVar1);
diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c
index ea33cd3e6..d2a5197a0 100644
--- a/src/pokemon/pokemon_menu.c
+++ b/src/pokemon/pokemon_menu.c
@@ -435,7 +435,7 @@ static void sub_808A1E0(u8 taskID)
 
 static void sub_808A228(u8 taskID)
 {
-    if (ItemIsMail(gScriptItemId) && gUnknown_0202E8F4 != 0)
+    if (ItemIsMail(gSpecialVar_ItemId) && gUnknown_0202E8F4 != 0)
     {
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
         gTasks[taskID].func = sub_808A180;
@@ -451,7 +451,7 @@ static void sub_808A228(u8 taskID)
 static void sub_808A2AC(u8 taskID)
 {
     if (!gPaletteFade.active)
-        PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808A228);
+        PartyMenuTryGiveMonHeldItem(taskID, gSpecialVar_ItemId, sub_808A228);
 }
 
 static void sub_808A2DC(u8 taskID)
@@ -463,7 +463,7 @@ static void sub_808A2DC(u8 taskID)
 
 static void sub_808A330(u8 taskID)
 {
-    PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808A2DC);
+    PartyMenuTryGiveMonHeldItem(taskID, gSpecialVar_ItemId, sub_808A2DC);
 }
 
 static void sub_808A34C(void)
@@ -507,7 +507,7 @@ static void sub_808A3A4(void)
 
 void sub_808A3F8(void)
 {
-    if (ItemIsMail(gScriptItemId))
+    if (ItemIsMail(gSpecialVar_ItemId))
     {
         u8 taskID = CreateTask(sub_808A330, 0);
         gPaletteFade.bufferTransferDisabled = 1;
@@ -523,7 +523,7 @@ void sub_808A3F8(void)
             DestroyTask(taskID);
     }
     gPaletteFade.bufferTransferDisabled = 1;
-    if (gScriptItemId)
+    if (gSpecialVar_ItemId)
     {
         SetPartyMenuSettings(PARTY_MENU_TYPE_STANDARD, 0xFF, sub_808A2AC, 0xFF);
         SetMainCallback2(sub_808A358);
@@ -554,7 +554,7 @@ static void sub_808A4D4(void)
 void sub_808A520(void)
 {
     gPaletteFade.bufferTransferDisabled = 1;
-    if (gScriptResult == 0)
+    if (gSpecialVar_Result == 0)
     {
         if (gUnknown_0202E8F8)
             RemoveBagItem(gUnknown_0202E8F8, 1);
@@ -572,7 +572,7 @@ static void sub_808A5BC(u8 taskID)
 {
     if (!gPaletteFade.active)
     {
-        DisplayGiveHeldItemMessage(gLastFieldPokeMenuOpened, gScriptItemId, 0);
+        DisplayGiveHeldItemMessage(gLastFieldPokeMenuOpened, gSpecialVar_ItemId, 0);
         gTasks[taskID].func = sub_808A1E0;
     }
 }
@@ -722,7 +722,7 @@ static void PokemonMenu_FieldMove(u8 taskID)
             PrintPartyMenuPromptText(sFieldMoveFuncs[tFieldMoveId].field_1, 0);
         gTasks[taskID].func = sub_808ABF4;
     }
-    else if (tFieldMoveId <= 7 && FlagGet(BADGE01_GET + tFieldMoveId) != TRUE)
+    else if (tFieldMoveId <= 7 && FlagGet(FLAG_BADGE01_GET + tFieldMoveId) != TRUE)
     {
         // can't use a field HM move without a proper badge
         MenuZeroFillWindowRect(19, 0, 29, 19);
@@ -915,7 +915,7 @@ static bool8 SetUpFieldMove_Waterfall(void)
 static void sub_808AE8C(void)
 {
     u8 i;
-    u8 arg = gScriptItemId - 33;
+    u8 arg = gSpecialVar_ItemId - 33;
     for (i = 0; i < 6; i++)
     {
         if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
@@ -923,7 +923,7 @@ static void sub_808AE8C(void)
             sub_806D668(i);
             if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !CanMonLearnTMHM(&gPlayerParty[i], arg))
                 sub_806BC3C(i, 0x9A);
-            else if (pokemon_has_move(&gPlayerParty[i], ItemIdToBattleMoveId(gScriptItemId)))
+            else if (pokemon_has_move(&gPlayerParty[i], ItemIdToBattleMoveId(gSpecialVar_ItemId)))
                 sub_806BC3C(i, 0xA8);
             else
                 sub_806BC3C(i, 0x8C);
@@ -938,7 +938,7 @@ static void sub_808AF20(void)
     {
         if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
         {
-            if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !GetEvolutionTargetSpecies(&gPlayerParty[i], 3, gScriptItemId))
+            if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !GetEvolutionTargetSpecies(&gPlayerParty[i], 3, gSpecialVar_ItemId))
             {
                 sub_806D668(i);
                 sub_806BC3C(i, 0);
@@ -955,7 +955,7 @@ static void sub_808AF80(void)
         {
             if (gUnknown_02038561 == 0)
             {
-                switch (CheckIfItemIsTMHMOrEvolutionStone(gScriptItemId))
+                switch (CheckIfItemIsTMHMOrEvolutionStone(gSpecialVar_ItemId))
                 {
                 case 1:
                     sub_808AE8C();
@@ -983,7 +983,7 @@ void sub_808B020(void)
     switch (gUnknown_02038561)
     {
     case 0:
-        if (CheckIfItemIsTMHMOrEvolutionStone(gScriptItemId) == 1)
+        if (CheckIfItemIsTMHMOrEvolutionStone(gSpecialVar_ItemId) == 1)
             SetPartyMenuSettings(PARTY_MENU_TYPE_STANDARD, 0, sub_808B0C0, 20);
         else
             SetPartyMenuSettings(PARTY_MENU_TYPE_STANDARD, 0, sub_808B0C0, 3);
@@ -1013,11 +1013,11 @@ void sub_808B0C0(u8 taskID)
             {
                 sub_806D5A4();
                 if (gUnknown_02038561 == 0)
-                    gUnknown_03004AE4(taskID, gScriptItemId, sub_808B224);
+                    gUnknown_03004AE4(taskID, gSpecialVar_ItemId, sub_808B224);
                 if (gUnknown_02038561 == 1)
                 {
                     PlaySE(SE_SELECT);
-                    PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808B2EC);
+                    PartyMenuTryGiveMonHeldItem(taskID, gSpecialVar_ItemId, sub_808B2EC);
                 }
                 if (gUnknown_02038561 == 3)
                 {
@@ -1042,7 +1042,7 @@ void sub_808B0C0(u8 taskID)
 static void sub_808B1EC(u8 taskID)
 {
     if (!gPaletteFade.active)
-        gUnknown_03004AE4(taskID, gScriptItemId, sub_808B224);
+        gUnknown_03004AE4(taskID, gSpecialVar_ItemId, sub_808B224);
 }
 
 static void sub_808B224(u8 taskID)
@@ -1120,7 +1120,7 @@ static void sub_808B3EC(void)
     IntrCallback callback;
 
     gPaletteFade.bufferTransferDisabled = 1;
-    if (gScriptResult == 0)
+    if (gSpecialVar_Result == 0)
     {
         if (gUnknown_0202E8F8)
             RemoveBagItem(gUnknown_0202E8F8, 1);
@@ -1143,7 +1143,7 @@ static void sub_808B4A4(u8 taskID)
 {
     if (!gPaletteFade.active)
     {
-        DisplayGiveHeldItemMessage(gLastFieldPokeMenuOpened, gScriptItemId, 1);
+        DisplayGiveHeldItemMessage(gLastFieldPokeMenuOpened, gSpecialVar_ItemId, 1);
         gTasks[taskID].func = sub_808B4EC;
     }
 }
diff --git a/src/pokemon/pokemon_size_record.c b/src/pokemon/pokemon_size_record.c
index 260396de0..f92a95bfb 100644
--- a/src/pokemon/pokemon_size_record.c
+++ b/src/pokemon/pokemon_size_record.c
@@ -15,7 +15,7 @@ struct UnknownStruct
     u16 unk4;
 };
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 static const struct UnknownStruct sBigMonSizeTable[] =
 {
@@ -104,13 +104,13 @@ static void FormatMonSizeRecord(u8 *string, u32 size)
 
 static u8 CompareMonSize(u16 species, u16 *sizeRecord)
 {
-    if (gScriptResult == 0xFF)
+    if (gSpecialVar_Result == 0xFF)
     {
         return 0;
     }
     else
     {
-        struct Pokemon *pkmn = &gPlayerParty[gScriptResult];
+        struct Pokemon *pkmn = &gPlayerParty[gSpecialVar_Result];
 
         // UB: Too few arguments for function 'GetMonData'
         if (GetMonData(pkmn, MON_DATA_IS_EGG) == TRUE || GetMonData(pkmn, MON_DATA_SPECIES) != species)
@@ -169,7 +169,7 @@ void CompareShroomishSize(void)
 {
     u16 *sizeRecord = GetVarPointer(VAR_SHROOMISH_SIZE_RECORD);
 
-    gScriptResult = CompareMonSize(SPECIES_SHROOMISH, sizeRecord);
+    gSpecialVar_Result = CompareMonSize(SPECIES_SHROOMISH, sizeRecord);
 }
 
 void InitBarboachSizeRecord(void)
@@ -188,7 +188,7 @@ void CompareBarboachSize(void)
 {
     u16 *sizeRecord = GetVarPointer(VAR_BARBOACH_SIZE_RECORD);
 
-    gScriptResult = CompareMonSize(SPECIES_BARBOACH, sizeRecord);
+    gSpecialVar_Result = CompareMonSize(SPECIES_BARBOACH, sizeRecord);
 }
 
 void GiveGiftRibbonToParty(u8 index, u8 ribbonId)
@@ -212,6 +212,6 @@ void GiveGiftRibbonToParty(u8 index, u8 ribbonId)
             }
         }
         if (gotRibbon)
-            FlagSet(SYS_RIBBON_GET);
+            FlagSet(FLAG_SYS_RIBBON_GET);
     }
 }
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index bab6648de..6e83c6f97 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -401,7 +401,7 @@ void sub_80EBCA8() {
 	ewram0_10.var6db2[1] = 2;
 	ewram0_10.var6db2[2] = 3;
 
-	if (FlagGet(SYS_RIBBON_GET)) {
+	if (FlagGet(FLAG_SYS_RIBBON_GET)) {
 		ewram0_10.var6db2[3] = 4;
 	}
 	else {
diff --git a/src/rom6.c b/src/rom6.c
index c25f0f9f5..e71484b0a 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -13,7 +13,7 @@
 #include "sprite.h"
 #include "task.h"
 
-extern u16 gScriptLastTalked;
+extern u16 gSpecialVar_LastTalked;
 extern void (*gFieldCallback)(void);
 extern u8 gLastFieldPokeMenuOpened;
 extern void (*gUnknown_03005CE4)(void);
@@ -43,7 +43,7 @@ bool8 npc_before_player_of_type(u8 a)
     }
     else
     {
-        gScriptLastTalked = gMapObjects[mapObjId].localId;
+        gSpecialVar_LastTalked = gMapObjects[mapObjId].localId;
         return TRUE;
     }
 }
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 165e5e308..347f113c3 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -51,13 +51,6 @@ struct Struct_gUnknown_0837F578 {
     u8 field_1;
 };
 
-struct OamMatrix {
-    s16 a;
-    s16 b;
-    s16 c;
-    s16 d;
-};
-
 struct Struct_2017810 {
     u8 filler_0[6];
     u8 field_6;
@@ -70,12 +63,6 @@ struct Color {
     u16 b:5;
 };
 
-struct Struct_sub_8078914 {
-    u8 *field_0;
-    u8 *field_4;
-    u8 field_8;
-};
-
 struct BGCnt {
     u16 priority:2;
     u16 charBase:2;
@@ -1435,7 +1422,7 @@ void sub_80798AC(u8 task) {
     sub_80797EC(&gTasks[task]);
 }
 
-void sub_80798F4(struct Task *task, u8 a2, void *a3) {
+void sub_80798F4(struct Task *task, u8 a2, const void *a3) {
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[9] = 0;
@@ -1564,7 +1551,7 @@ u16 sub_8079B10(u8 sprite) {
     return 0x40;
 }
 
-void sub_8079BF4(s16 *bottom, s16 *top, void *ptr) {
+void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr) {
     *bottom = ((intptr_t) ptr) & 0xffff;
     *top = (((intptr_t) ptr) >> 16) & 0xffff;
 }
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 47ed314a8..d147d11ce 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -208,7 +208,7 @@ extern void de_sub_8073110();
 
 extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_BGM;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gUnknown_020297ED;
 extern u8 byte_3002A68;
 
@@ -1192,7 +1192,7 @@ static void sub_804E9F8(void)
     case 8:
         gBerryBlenderData->field_0++;
         gBerryBlenderData->field_13C = 0;
-        Blender_CopyBerryData(&gBerryBlenderData->blendedBerries[0], gScriptItemId);
+        Blender_CopyBerryData(&gBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId);
         memcpy(gBlockSendBuffer, &gBerryBlenderData->blendedBerries[0], sizeof(struct BlenderBerry));
         sub_80084A4();
         gBerryBlenderData->framesToWait = 0;
@@ -1438,9 +1438,9 @@ static void sub_804F378(void)
     {
     case 0:
         sub_804F0F4();
-        Blender_SetBankBerryData(0, gScriptItemId);
-        Blender_CopyBerryData(&gBerryBlenderData->blendedBerries[0], gScriptItemId);
-        sub_804F1BC(gScriptItemId, gBerryBlenderData->playersNo, &gBerryBlenderData->blendedBerries[0]);
+        Blender_SetBankBerryData(0, gSpecialVar_ItemId);
+        Blender_CopyBerryData(&gBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId);
+        sub_804F1BC(gSpecialVar_ItemId, gBerryBlenderData->playersNo, &gBerryBlenderData->blendedBerries[0]);
         for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
         {
             gBerryBlenderData->field_70[i] = 0;
@@ -3431,7 +3431,7 @@ static bool8 Blender_PrintBlendingResults(void)
         Blender_PrintMadePokeblockString(&pokeblock, gBerryBlenderData->stringVar);
         CreateTask(sub_8052BD0, 6);
         MenuPrintMessage(gBerryBlenderData->stringVar, 1, 15);
-        RemoveBagItem(gScriptItemId, 1);
+        RemoveBagItem(gSpecialVar_ItemId, 1);
         sub_810CA34(&pokeblock);
         gBerryBlenderData->field_0++;
         break;
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index c555a88bf..0c82448bd 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -38,9 +38,9 @@ extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
 extern u16 gSpecialVar_0x8006;
 
-extern u16 gScriptContestCategory;
-extern u16 gScriptContestRank;
-extern u16 gScriptResult;
+extern u16 gSpecialVar_ContestCategory;
+extern u16 gSpecialVar_ContestRank;
+extern u16 gSpecialVar_Result;
 
 extern u32 gUnknown_03005D28;
 
@@ -91,7 +91,7 @@ void sub_80C4C78(void)
     u16 var;
     u16 returnVar;
 
-    switch(gScriptContestCategory)
+    switch(gSpecialVar_ContestCategory)
     {
     case 0:
         var = 8;
@@ -127,7 +127,7 @@ void sub_80C4CEC(void)
 void sub_80C4CF8(void)
 {
     if(!gUnknown_02038690[gContestPlayerMonIndex]
-    && gScriptContestRank == 3
+    && gSpecialVar_ContestRank == 3
     && (s16)gUnknown_02038678[gContestPlayerMonIndex] >= 800)
     {
         gSpecialVar_0x8004 = 1;
@@ -388,7 +388,7 @@ bool8 GiveMonArtistRibbon(void)
 
     if(ribbon == FALSE
     && gUnknown_02038690[gContestPlayerMonIndex] == 0
-    && gScriptContestRank == 3
+    && gSpecialVar_ContestRank == 3
     && (s16)gUnknown_02038678[gContestPlayerMonIndex] >= 800)
     {
         ribbon = TRUE;
@@ -488,9 +488,9 @@ void sub_80C5190(u8 taskId)
 void ScriptGetMultiplayerId(void)
 {
     if(gIsLinkContest & 1)
-        gScriptResult = GetMultiplayerId();
+        gSpecialVar_Result = GetMultiplayerId();
     else
-        gScriptResult = 4;
+        gSpecialVar_Result = 4;
 }
 
 void ScriptRandom(void)
@@ -502,11 +502,11 @@ void ScriptRandom(void)
     {
         gUnknown_03005D28 = 1103515245 * gUnknown_03005D28 + 24691;
         random = gUnknown_03005D28 >> 16;
-        scriptPtr = &gScriptResult;
+        scriptPtr = &gSpecialVar_Result;
     }
     else
     {
-        scriptPtr = &gScriptResult;
+        scriptPtr = &gSpecialVar_Result;
         random = Random();
     }
     *scriptPtr = random % *scriptPtr;
@@ -587,13 +587,13 @@ void CheckForAlivePartyMons(void)
     switch(var)
     {
     case 1:
-        gScriptResult = var;
+        gSpecialVar_Result = var;
         break;
     case 0:
-        gScriptResult = var;
+        gSpecialVar_Result = var;
         break;
     case 2:
-        gScriptResult = var;
+        gSpecialVar_Result = var;
         break;
     }
 }
@@ -657,10 +657,10 @@ void sub_80C5580(void)
     switch(var)
     {
     case 0:
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         break;
     default:
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
         break;
     }
 
@@ -681,11 +681,11 @@ void SetBattleTowerPlayerParty(void)
     {
     case 0: // player quit battle tower?
         LoadPlayerParty();
-        gScriptResult = 0;
+        gSpecialVar_Result = 0;
         break;
     default: // load battle tower.
         ReducePlayerPartyToThree();
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
         break;
     }
 
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index aed11bb7e..33e7620f7 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -23,7 +23,7 @@ extern u8 gPlayerPartyCount;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
 extern u8 gUnknown_02038694;
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 extern void (*gFieldCallback)(void);
 
@@ -281,11 +281,11 @@ void ScrSpecial_CountPokemonMoves(void) // count pokemon moves
 {
     u8 i;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
 
     for (i = 0; i < 4; i++) // checks MOVE1-MOVE4
         if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_MOVE1 + i))
-            gScriptResult++;
+            gSpecialVar_Result++;
 }
 
 void ScrSpecial_GetPokemonNicknameAndMoveName(void)
@@ -437,8 +437,8 @@ void sub_80FA0DC(void)
 void sub_80FA148(void)
 {
     struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004];
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
 
     if (GetMonData(party, MON_DATA_IS_EGG))
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
 }
diff --git a/sym_ewram.txt b/sym_ewram.txt
index b3bf568ac..5524b00db 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -494,10 +494,10 @@ gIsLinkContest: @ 203869A
 gUnknown_0203869B: @ 203869B
 	.space 0x1
 
-gScriptContestCategory: @ 203869C
+gSpecialVar_ContestCategory: @ 203869C
 	.space 0x2
 
-gScriptContestRank: @ 203869E
+gSpecialVar_ContestRank: @ 203869E
 	.space 0x2
 
 	.include "src/field/shop.o"
diff --git a/tools/gbagfx/convert_png.c b/tools/gbagfx/convert_png.c
index 37904318c..cdfa39a7a 100644
--- a/tools/gbagfx/convert_png.c
+++ b/tools/gbagfx/convert_png.c
@@ -45,6 +45,40 @@ static FILE *PngReadOpen(char *path, png_structp *pngStruct, png_infop *pngInfo)
     return fp;
 }
 
+static unsigned char *ConvertBitDepth(unsigned char *src, int srcBitDepth, int destBitDepth, int numPixels)
+{
+    // Round the number of bits up to the next 8 and divide by 8 to get the number of bytes.
+    int srcSize = ((numPixels * srcBitDepth + 7) & ~7) / 8;
+    int destSize = ((numPixels * destBitDepth + 7) & ~7) / 8;
+    unsigned char *output = calloc(destSize, 1);
+    unsigned char *dest = output;
+    int i;
+    int j;
+    int destBit = 8 - destBitDepth;
+
+    for (i = 0; i < srcSize; i++)
+    {
+        unsigned char srcByte = src[i];
+
+        for (j = 8 - srcBitDepth; j >= 0; j -= srcBitDepth)
+        {
+            unsigned char pixel = (srcByte >> j) % (1 << srcBitDepth);
+
+            if (pixel >= (1 << destBitDepth))
+                FATAL_ERROR("Image exceeds the maximum color value for a %ibpp image.\n", destBitDepth);
+            *dest |= pixel << destBit;
+            destBit -= destBitDepth;
+            if (destBit < 0)
+            {
+                dest++;
+                destBit = 8 - destBitDepth;
+            }
+        }
+    }
+
+    return output;
+}
+
 void ReadPng(char *path, struct Image *image)
 {
     png_structp png_ptr;
@@ -54,9 +88,6 @@ void ReadPng(char *path, struct Image *image)
 
     int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
 
-    if (bit_depth != image->bitDepth)
-        FATAL_ERROR("\"%s\" has a bit depth of %d, but the expected bit depth is %d.\n", path, bit_depth, image->bitDepth);
-
     int color_type = png_get_color_type(png_ptr, info_ptr);
 
     if (color_type != PNG_COLOR_TYPE_GRAY && color_type != PNG_COLOR_TYPE_PALETTE)
@@ -93,6 +124,17 @@ void ReadPng(char *path, struct Image *image)
 
     free(row_pointers);
     fclose(fp);
+
+    if (bit_depth != image->bitDepth)
+    {
+        unsigned char *src = image->pixels;
+
+        if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 && bit_depth != 8)
+            FATAL_ERROR("Bit depth of image must be 1, 2, 4, or 8.\n");
+        image->pixels = ConvertBitDepth(image->pixels, bit_depth, image->bitDepth, image->width * image->height);
+        free(src);
+        image->bitDepth = bit_depth;
+    }
 }
 
 void ReadPngPalette(char *path, struct Palette *palette)