Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise

422 files changed, 7636 insertions, 13009 deletions

diff --git a/INSTALL.md b/INSTALL.md
index bb5e9849d..041f6b8e9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -93,4 +93,3 @@ If you've only changed `.c` or `.s` files, you can turn off the dependency scann
 
 `make NODEP=1`
 
-
diff --git a/asm/contest_link_81D9DE4.s b/asm/contest_link_81D9DE4.s
index 35191e10f..3969be9a2 100644
--- a/asm/contest_link_81D9DE4.s
+++ b/asm/contest_link_81D9DE4.s
@@ -97,7 +97,7 @@ _081D9EB4:
 	ldrb r1, [r1]
 	adds r0, 0x2C
 	strb r1, [r0]
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	lsrs r0, 24
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index e99c885cc..c73224807 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -7951,7 +7951,7 @@ sub_811EA28: @ 811EA28
 	bgt _0811EA48
 	cmp r0, 0x11
 	blt _0811EA66
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	b _0811EA60
 	.pool
@@ -9131,7 +9131,7 @@ _0811F2FE:
 	adds r3, 0x1
 	cmp r3, 0x10
 	ble _0811F2FE
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	cmp r0, 0
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
deleted file mode 100644
index 65e8ed8b4..000000000
--- a/asm/field_control_avatar.s
+++ /dev/null
@@ -1,2512 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start FieldClearPlayerInput
-FieldClearPlayerInput: @ 809BEDC
-	push {r4,r5,lr}
-	movs r1, 0x2
-	negs r1, r1
-	movs r3, 0x3
-	negs r3, r3
-	movs r4, 0x5
-	negs r4, r4
-	movs r5, 0x9
-	negs r5, r5
-	movs r2, 0
-	strb r2, [r0]
-	ldrb r2, [r0, 0x1]
-	ands r1, r2
-	ands r1, r3
-	ands r1, r4
-	ands r1, r5
-	strb r1, [r0, 0x1]
-	movs r1, 0
-	strb r1, [r0, 0x2]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldClearPlayerInput
-
-	thumb_func_start FieldGetPlayerInput
-@ void FieldGetPlayerInput(overworld_input_data *input_data, char buttons_new, char buttons_held)
-FieldGetPlayerInput: @ 809BF08
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	adds r4, r0, 0
-	lsls r1, 16
-	lsrs r5, r1, 16
-	lsls r2, 16
-	lsrs r2, 16
-	mov r8, r2
-	ldr r0, =gPlayerAvatar
-	ldrb r6, [r0, 0x3]
-	ldrb r0, [r0, 0x2]
-	mov r9, r0
-	bl cur_mapdata_block_role_at_player_pos
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsForcedMovementTile
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r6, 0x2
-	bne _0809BF3C
-	cmp r7, 0
-	beq _0809BF40
-_0809BF3C:
-	cmp r6, 0
-	bne _0809BFA2
-_0809BF40:
-	bl GetPlayerSpeed
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	beq _0809BF8C
-	movs r0, 0x8
-	ands r0, r5
-	cmp r0, 0
-	beq _0809BF5C
-	ldrb r0, [r4]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4]
-_0809BF5C:
-	movs r0, 0x4
-	ands r0, r5
-	cmp r0, 0
-	beq _0809BF6C
-	ldrb r0, [r4]
-	movs r1, 0x8
-	orrs r0, r1
-	strb r0, [r4]
-_0809BF6C:
-	movs r0, 0x1
-	ands r0, r5
-	cmp r0, 0
-	beq _0809BF7C
-	ldrb r0, [r4]
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r4]
-_0809BF7C:
-	movs r0, 0x2
-	ands r0, r5
-	cmp r0, 0
-	beq _0809BF8C
-	ldrb r0, [r4]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r4]
-_0809BF8C:
-	movs r0, 0xF0
-	mov r1, r8
-	ands r0, r1
-	cmp r0, 0
-	beq _0809BFA2
-	ldrb r0, [r4]
-	movs r1, 0x10
-	orrs r0, r1
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r4]
-_0809BFA2:
-	cmp r7, 0
-	bne _0809BFC8
-	cmp r6, 0x2
-	bne _0809BFB8
-	mov r0, r9
-	cmp r0, 0x2
-	bne _0809BFB8
-	ldrb r0, [r4]
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r4]
-_0809BFB8:
-	cmp r7, 0
-	bne _0809BFC8
-	cmp r6, 0x2
-	bne _0809BFC8
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-_0809BFC8:
-	movs r0, 0x40
-	mov r1, r8
-	ands r0, r1
-	cmp r0, 0
-	beq _0809BFDC
-	movs r0, 0x2
-	b _0809C004
-	.pool
-_0809BFDC:
-	movs r0, 0x80
-	mov r1, r8
-	ands r0, r1
-	cmp r0, 0
-	beq _0809BFEA
-	movs r0, 0x1
-	b _0809C004
-_0809BFEA:
-	movs r0, 0x20
-	mov r1, r8
-	ands r0, r1
-	cmp r0, 0
-	beq _0809BFF8
-	movs r0, 0x3
-	b _0809C004
-_0809BFF8:
-	movs r0, 0x10
-	mov r1, r8
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C006
-	movs r0, 0x4
-_0809C004:
-	strb r0, [r4, 0x2]
-_0809C006:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldGetPlayerInput
-
-	thumb_func_start ProcessPlayerFieldInput
-@ int ProcessPlayerFieldInput(overworld_input_data *input_data)
-ProcessPlayerFieldInput: @ 809C014
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r5, r0, 0
-	ldr r0, =gSpecialVar_LastTalked
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gSelectedEventObject
-	strb r1, [r0]
-	bl GetPlayerFacingDirection
-	lsls r0, 24
-	lsrs r6, r0, 24
-	mov r4, sp
-	mov r0, sp
-	bl player_get_pos_to_and_height
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 16
-	lsrs r4, r0, 16
-	bl CheckForTrainersWantingBattle
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C14E
-	bl mapheader_run_first_tag2_script_list_match
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C14E
-	ldrb r1, [r5]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C070
-	bl sub_809C89C
-	cmp r0, 0x1
-	beq _0809C14E
-_0809C070:
-	ldrb r1, [r5]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C096
-	movs r0, 0x5
-	bl IncrementGameStat
-	bl increment_var_x4026_on_birth_island_modulo_100
-	mov r0, sp
-	adds r1, r4, 0
-	adds r2, r6, 0
-	bl sub_809C8DC
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C14E
-_0809C096:
-	ldrb r1, [r5]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C0AE
-	adds r0, r4, 0
-	bl is_it_battle_time_3
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C14E
-_0809C0AE:
-	ldrb r1, [r5]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C0D0
-	ldrb r0, [r5, 0x2]
-	cmp r0, r6
-	bne _0809C0D0
-	mov r0, sp
-	adds r1, r4, 0
-	adds r2, r6, 0
-	bl mapheader_run_first_tag2_script_list_match_conditionally
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C14E
-_0809C0D0:
-	mov r4, sp
-	mov r0, sp
-	bl player_get_next_pos_and_height
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldrb r1, [r5]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C106
-	mov r0, sp
-	adds r1, r4, 0
-	adds r2, r6, 0
-	bl sub_809C1FC
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C14E
-_0809C106:
-	ldrb r1, [r5]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C128
-	ldrb r0, [r5, 0x2]
-	cmp r0, r6
-	bne _0809C128
-	mov r0, sp
-	adds r1, r4, 0
-	adds r2, r6, 0
-	bl map_warp_consider_2_to_inside
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C14E
-_0809C128:
-	ldrb r1, [r5]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C13A
-	bl sub_809C868
-	cmp r0, 0x1
-	beq _0809C14E
-_0809C13A:
-	ldrb r1, [r5]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C15C
-	movs r0, 0x6
-	bl PlaySE
-	bl ShowStartMenu
-_0809C14E:
-	movs r0, 0x1
-	b _0809C172
-	.pool
-_0809C15C:
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C170
-	bl UseRegisteredKeyItemOnField
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C14E
-_0809C170:
-	movs r0, 0
-_0809C172:
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end ProcessPlayerFieldInput
-
-	thumb_func_start player_get_pos_to_and_height
-player_get_pos_to_and_height: @ 809C17C
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r1, r4, 0x2
-	bl PlayerGetDestCoords
-	bl PlayerGetZCoord
-	strb r0, [r4, 0x4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end player_get_pos_to_and_height
-
-	thumb_func_start player_get_next_pos_and_height
-player_get_next_pos_and_height: @ 809C194
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r1, r5, 0x2
-	bl GetXYCoordsOneStepInFrontOfPlayer
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _0809C1C6
-	bl PlayerGetZCoord
-_0809C1C6:
-	strb r0, [r5, 0x4]
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end player_get_next_pos_and_height
-
-	thumb_func_start cur_mapdata_block_role_at_player_pos
-cur_mapdata_block_role_at_player_pos: @ 809C1D0
-	push {r4,lr}
-	sub sp, 0x4
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 16
-	lsrs r0, 16
-	add sp, 0x4
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end cur_mapdata_block_role_at_player_pos
-
-	thumb_func_start sub_809C1FC
-sub_809C1FC: @ 809C1FC
-	push {r4,lr}
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r1, 24
-	lsrs r1, 24
-	bl TryGetScriptOnPressingA
-	adds r4, r0, 0
-	cmp r4, 0
-	bne _0809C214
-	movs r0, 0
-	b _0809C24C
-_0809C214:
-	ldr r0, =gUnknown_081F860D
-	cmp r4, r0
-	beq _0809C244
-	ldr r0, =gUnknown_081F9553
-	cmp r4, r0
-	beq _0809C244
-	ldr r0, =gUnknown_0823B4BB
-	cmp r4, r0
-	beq _0809C244
-	ldr r0, =gUnknown_0823B589
-	cmp r4, r0
-	beq _0809C244
-	ldr r0, =EventScript_2766A2
-	cmp r4, r0
-	beq _0809C244
-	ldr r0, =EventScript_2766A6
-	cmp r4, r0
-	beq _0809C244
-	ldr r0, =EventScript_271D92
-	cmp r4, r0
-	beq _0809C244
-	movs r0, 0x5
-	bl PlaySE
-_0809C244:
-	adds r0, r4, 0
-	bl ScriptContext1_SetupScript
-	movs r0, 0x1
-_0809C24C:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_809C1FC
-
-	thumb_func_start TryGetScriptOnPressingA
-TryGetScriptOnPressingA: @ 809C270
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	mov r8, r5
-	lsls r2, 24
-	lsrs r4, r2, 24
-	adds r7, r4, 0
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl TryGetEventObjectScript
-	cmp r0, 0
-	bne _0809C2BC
-	adds r0, r6, 0
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl TryGetInvisibleEventObjectScript
-	cmp r0, 0
-	bne _0809C2BC
-	adds r0, r6, 0
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl TryGetMetatileBehaviorScript
-	cmp r0, 0
-	bne _0809C2BC
-	adds r0, r6, 0
-	mov r1, r8
-	adds r2, r7, 0
-	bl TryGetFieldMoveScript
-	cmp r0, 0
-	bne _0809C2BC
-	movs r0, 0
-_0809C2BC:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end TryGetScriptOnPressingA
-
-	thumb_func_start sub_809C2C8
-sub_809C2C8: @ 809C2C8
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r2, 24
-	lsrs r6, r2, 24
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsCounter
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809C2F0
-	ldrh r0, [r4]
-	ldrh r1, [r4, 0x2]
-	b _0809C30E
-_0809C2F0:
-	ldr r1, =gDirectionToVectors
-	lsls r2, r6, 3
-	adds r0, r2, r1
-	ldr r3, [r0]
-	ldrh r0, [r4]
-	adds r0, r3
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, 0x4
-	adds r2, r1
-	ldr r2, [r2]
-	ldrh r1, [r4, 0x2]
-	adds r1, r2
-	lsls r1, 16
-	lsrs r1, 16
-_0809C30E:
-	ldrb r2, [r4, 0x4]
-	bl GetEventObjectIdByXYZ
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x10
-	beq _0809C32E
-	ldr r1, =gEventObjects
-	lsls r2, r3, 3
-	adds r0, r2, r3
-	lsls r0, 2
-	adds r0, r1
-	ldrb r0, [r0, 0x8]
-	adds r5, r1, 0
-	cmp r0, 0xFF
-	bne _0809C33C
-_0809C32E:
-	movs r0, 0
-	b _0809C36E
-	.pool
-_0809C33C:
-	movs r4, 0
-	ldr r1, =gLinkPlayerEventObjects
-_0809C340:
-	ldrb r0, [r1]
-	cmp r0, 0x1
-	bne _0809C34C
-	ldrb r0, [r1, 0x2]
-	cmp r0, r3
-	beq _0809C32E
-_0809C34C:
-	adds r1, 0x4
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _0809C340
-	ldr r0, =gSelectedEventObject
-	strb r3, [r0]
-	ldr r1, =gSpecialVar_LastTalked
-	adds r0, r2, r3
-	lsls r0, 2
-	adds r0, r5
-	ldrb r0, [r0, 0x8]
-	strh r0, [r1]
-	ldr r0, =gSpecialVar_Facing
-	strh r6, [r0]
-	adds r0, r3, 0
-	bl GetEventObjectScriptPointerByEventObjectId
-_0809C36E:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_809C2C8
-
-	thumb_func_start TryGetEventObjectScript
-TryGetEventObjectScript: @ 809C384
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	lsls r1, 24
-	lsrs r6, r1, 24
-	lsls r2, 24
-	lsrs r7, r2, 24
-	ldrh r0, [r5]
-	ldrh r1, [r5, 0x2]
-	ldrb r2, [r5, 0x4]
-	bl GetEventObjectIdByXYZ
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x10
-	beq _0809C3B4
-	ldr r1, =gEventObjects
-	lsls r2, r4, 3
-	adds r0, r2, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrb r0, [r0, 0x8]
-	adds r3, r1, 0
-	cmp r0, 0xFF
-	bne _0809C40C
-_0809C3B4:
-	adds r0, r6, 0
-	bl MetatileBehavior_IsCounter
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C400
-	ldr r1, =gDirectionToVectors
-	lsls r2, r7, 3
-	adds r0, r2, r1
-	ldr r3, [r0]
-	ldrh r0, [r5]
-	adds r0, r3
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, 0x4
-	adds r2, r1
-	ldr r2, [r2]
-	ldrh r1, [r5, 0x2]
-	adds r1, r2
-	lsls r1, 16
-	lsrs r1, 16
-	ldrb r2, [r5, 0x4]
-	bl GetEventObjectIdByXYZ
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x10
-	beq _0809C400
-	ldr r1, =gEventObjects
-	lsls r2, r4, 3
-	adds r0, r2, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrb r0, [r0, 0x8]
-	adds r3, r1, 0
-	cmp r0, 0xFF
-	bne _0809C40C
-_0809C400:
-	movs r0, 0
-	b _0809C44E
-	.pool
-_0809C40C:
-	ldr r0, =gSelectedEventObject
-	strb r4, [r0]
-	ldr r1, =gSpecialVar_LastTalked
-	adds r0, r2, r4
-	lsls r0, 2
-	adds r0, r3
-	ldrb r0, [r0, 0x8]
-	strh r0, [r1]
-	ldr r0, =gSpecialVar_Facing
-	strh r7, [r0]
-	bl InTrainerHill
-	cmp r0, 0x1
-	bne _0809C43C
-	bl sub_81D62AC
-	b _0809C442
-	.pool
-_0809C43C:
-	adds r0, r4, 0
-	bl GetEventObjectScriptPointerByEventObjectId
-_0809C442:
-	adds r1, r0, 0
-	ldr r0, =gSpecialVar_LastTalked
-	ldrb r0, [r0]
-	bl GetRamScript
-	adds r1, r0, 0
-_0809C44E:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end TryGetEventObjectScript
-
-	thumb_func_start TryGetInvisibleEventObjectScript
-@ signed int TryGetInvisibleEventObjectScript(int a1, int a2, u8 playerFacingDirection)
-TryGetInvisibleEventObjectScript: @ 809C458
-	push {r4,r5,lr}
-	lsls r2, 24
-	lsrs r5, r2, 24
-	ldr r4, =gMapHeader
-	ldrh r1, [r0]
-	subs r1, 0x7
-	lsls r1, 16
-	lsrs r1, 16
-	ldrh r2, [r0, 0x2]
-	subs r2, 0x7
-	lsls r2, 16
-	lsrs r2, 16
-	ldrb r3, [r0, 0x4]
-	adds r0, r4, 0
-	bl FindInvisibleEventObjectByPosition
-	cmp r0, 0
-	beq _0809C4CC
-	ldr r2, [r0, 0x8]
-	cmp r2, 0
-	bne _0809C490
-	ldr r0, =EventScript_TestSignpostMsg
-	b _0809C532
-	.pool
-_0809C490:
-	ldrb r0, [r0, 0x5]
-	cmp r0, 0x8
-	bhi _0809C530
-	lsls r0, 2
-	ldr r1, =_0809C4A4
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0809C4A4:
-	.4byte _0809C530
-	.4byte _0809C4C8
-	.4byte _0809C4D0
-	.4byte _0809C4D6
-	.4byte _0809C4DC
-	.4byte _0809C4E2
-	.4byte _0809C4E2
-	.4byte _0809C4E2
-	.4byte _0809C510
-_0809C4C8:
-	cmp r5, 0x2
-	beq _0809C530
-_0809C4CC:
-	movs r0, 0
-	b _0809C532
-_0809C4D0:
-	cmp r5, 0x1
-	beq _0809C530
-	b _0809C4CC
-_0809C4D6:
-	cmp r5, 0x4
-	beq _0809C530
-	b _0809C4CC
-_0809C4DC:
-	cmp r5, 0x3
-	beq _0809C530
-	b _0809C4CC
-_0809C4E2:
-	ldr r1, =gSpecialVar_0x8004
-	lsrs r0, r2, 16
-	movs r3, 0xFA
-	lsls r3, 1
-	adds r0, r3
-	strh r0, [r1]
-	ldr r0, =gSpecialVar_0x8005
-	strh r2, [r0]
-	ldrh r0, [r1]
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C4CC
-	ldr r0, =EventScript_271CB7
-	b _0809C532
-	.pool
-_0809C510:
-	cmp r5, 0x2
-	bne _0809C4CC
-	ldr r0, =gSpecialVar_0x8004
-	strh r2, [r0]
-	bl sub_80E9680
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809C4CC
-	ldr r0, =EventScript_2759F1
-	b _0809C532
-	.pool
-_0809C530:
-	adds r0, r2, 0
-_0809C532:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end TryGetInvisibleEventObjectScript
-
-	thumb_func_start TryGetMetatileBehaviorScript
-TryGetMetatileBehaviorScript: @ 809C538
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	lsls r2, 24
-	lsrs r4, r2, 24
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl MetatileBehavior_IsPlayerFacingTVScreen
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C55C
-	ldr r0, =EventScript_27EE0B
-	b _0809C7E4
-	.pool
-_0809C55C:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsPC
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C574
-	ldr r0, =EventScript_271D92
-	b _0809C7E4
-	.pool
-_0809C574:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsClosedSootopolisGymDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C58C
-	ldr r0, =SootopolisCity_EventScript_1E615D
-	b _0809C7E4
-	.pool
-_0809C58C:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsUnknownClosedDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C5A4
-	ldr r0, =SkyPillar_Outside_EventScript_2393F9
-	b _0809C7E4
-	.pool
-_0809C5A4:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsCableBoxResults1
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C5B4
-	b _0809C6E4
-_0809C5B4:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsPokeblockFeeder
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C5CC
-	ldr r0, =EventScript_2A4BAC
-	b _0809C7E4
-	.pool
-_0809C5CC:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsTrickHousePuzzleDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C5E4
-	ldr r0, =Route110_TrickHouseEntrance_EventScript_26A22A
-	b _0809C7E4
-	.pool
-_0809C5E4:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsRegionMap
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C5FC
-	ldr r0, =EventScript_27208F
-	b _0809C7E4
-	.pool
-_0809C5FC:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsRunningShoesInstruction
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C614
-	ldr r0, =EventScript_292DE5
-	b _0809C7E4
-	.pool
-_0809C614:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsPictureBookShelf
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C62C
-	ldr r0, =EventScript_2725CE
-	b _0809C7E4
-	.pool
-_0809C62C:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsBookShelf
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C644
-	ldr r0, =EventScript_2725D7
-	b _0809C7E4
-	.pool
-_0809C644:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsPokeCenterBookShelf
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C65C
-	ldr r0, =EventScript_2725E0
-	b _0809C7E4
-	.pool
-_0809C65C:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsVase
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C674
-	ldr r0, =EventScript_2725E9
-	b _0809C7E4
-	.pool
-_0809C674:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsTrashCan
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C68C
-	ldr r0, =EventScript_2725F2
-	b _0809C7E4
-	.pool
-_0809C68C:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsShopShelf
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C6A4
-	ldr r0, =EventScript_2725FB
-	b _0809C7E4
-	.pool
-_0809C6A4:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsBlueprint
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C6BC
-	ldr r0, =EventScript_272604
-	b _0809C7E4
-	.pool
-_0809C6BC:
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl MetatileBehavior_IsPlayerFacingWirelessBoxResults
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C6D4
-	ldr r0, =OldaleTown_PokemonCenter_2F_EventScript_277B8A
-	b _0809C7E4
-	.pool
-_0809C6D4:
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl MetatileBehavior_IsCableBoxResults2
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C6EC
-_0809C6E4:
-	ldr r0, =gUnknown_08277365
-	b _0809C7E4
-	.pool
-_0809C6EC:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsQuestionnaire
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C704
-	ldr r0, =EventScript_27381B
-	b _0809C7E4
-	.pool
-_0809C704:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsTrainerHillTimer
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C71C
-	ldr r0, =TrainerHill_1F_EventScript_2C8393
-	b _0809C7E4
-	.pool
-_0809C71C:
-	movs r4, 0x4
-	ldrsb r4, [r6, r4]
-	movs r1, 0
-	ldrsh r0, [r6, r1]
-	movs r2, 0x2
-	ldrsh r1, [r6, r2]
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	bne _0809C7D0
-	adds r0, r5, 0
-	bl MetatileBehavior_IsSecretBasePC
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C74C
-	ldr r0, =gUnknown_0823B4BB
-	b _0809C7E4
-	.pool
-_0809C74C:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsSecretBaseRegisterPC
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C764
-	ldr r0, =gUnknown_0823B589
-	b _0809C7E4
-	.pool
-_0809C764:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsSecretBaseSandOrnament
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C77C
-	ldr r0, =gUnknown_0823B684
-	b _0809C7E4
-	.pool
-_0809C77C:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsSecretBaseTvOrShield
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C794
-	ldr r0, =gUnknown_0823B68C
-	b _0809C7E4
-	.pool
-_0809C794:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsMB_C6
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C7A8
-	bl sub_80EB56C
-	b _0809C7E2
-_0809C7A8:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsLargeMatCenter
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C7BC
-	bl sub_80EB9E0
-	b _0809C7E2
-_0809C7BC:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsSecretBaseLargeMatEdge
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C7E2
-	bl sub_80EBB28
-	b _0809C7E2
-_0809C7D0:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsSecretBasePoster
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C7E2
-	bl sub_80EB498
-_0809C7E2:
-	movs r0, 0
-_0809C7E4:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end TryGetMetatileBehaviorScript
-
-	thumb_func_start TryGetFieldMoveScript
-TryGetFieldMoveScript: @ 809C7EC
-	push {r4,lr}
-	lsls r1, 24
-	lsrs r4, r1, 24
-	ldr r0, =0x0000086b
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C824
-	bl PartyHasMonWithSurf
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C824
-	bl IsPlayerFacingSurfableFishableWater
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C824
-	ldr r0, =EventScript_271EA0
-	b _0809C862
-	.pool
-_0809C824:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsWaterfall
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C860
-	ldr r0, =0x0000086e
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C858
-	bl IsPlayerSurfingNorth
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C858
-	ldr r0, =EventScript_290A49
-	b _0809C862
-	.pool
-_0809C858:
-	ldr r0, =EventScript_290A83
-	b _0809C862
-	.pool
-_0809C860:
-	movs r0, 0
-_0809C862:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end TryGetFieldMoveScript
-
-	thumb_func_start sub_809C868
-sub_809C868: @ 809C868
-	push {lr}
-	ldr r0, =0x0000086d
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809C894
-	bl sub_809D1E8
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x2
-	bne _0809C894
-	ldr r0, =EventScript_290B0F
-	bl ScriptContext1_SetupScript
-	movs r0, 0x1
-	b _0809C896
-	.pool
-_0809C894:
-	movs r0, 0
-_0809C896:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809C868
-
-	thumb_func_start sub_809C89C
-sub_809C89C: @ 809C89C
-	push {lr}
-	ldr r0, =0x0000086d
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809C8D4
-	ldr r0, =gMapHeader
-	ldrb r0, [r0, 0x17]
-	cmp r0, 0x5
-	bne _0809C8D4
-	bl sub_809D1E8
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C8D4
-	ldr r0, =EventScript_290B5A
-	bl ScriptContext1_SetupScript
-	movs r0, 0x1
-	b _0809C8D6
-	.pool
-_0809C8D4:
-	movs r0, 0
-_0809C8D6:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809C89C
-
-	thumb_func_start sub_809C8DC
-sub_809C8DC: @ 809C8DC
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	lsls r1, 16
-	lsrs r4, r1, 16
-	adds r6, r4, 0
-	bl mapheader_trigger_activate_at__run_now
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C92E
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_809CC9C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C92E
-	adds r0, r4, 0
-	bl sub_809C96C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C92E
-	adds r0, r6, 0
-	bl per_step_scripts
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C92E
-	bl UpdateRepelCounter
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809C92E
-	movs r0, 0
-	b _0809C930
-_0809C92E:
-	movs r0, 0x1
-_0809C930:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809C8DC
-
-	thumb_func_start mapheader_trigger_activate_at__run_now
-mapheader_trigger_activate_at__run_now: @ 809C938
-	push {r4,lr}
-	ldr r4, =gMapHeader
-	ldrh r1, [r0]
-	subs r1, 0x7
-	lsls r1, 16
-	lsrs r1, 16
-	ldrh r2, [r0, 0x2]
-	subs r2, 0x7
-	lsls r2, 16
-	lsrs r2, 16
-	ldrb r3, [r0, 0x4]
-	adds r0, r4, 0
-	bl mapheader_trigger_activate_at
-	cmp r0, 0
-	beq _0809C964
-	bl ScriptContext1_SetupScript
-	movs r0, 0x1
-	b _0809C966
-	.pool
-_0809C964:
-	movs r0, 0
-_0809C966:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end mapheader_trigger_activate_at__run_now
-
-	thumb_func_start sub_809C96C
-sub_809C96C: @ 809C96C
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl MetatileBehavior_IsCrackedFloorHole
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809C988
-	ldr r0, =gUnknown_082A8337
-	b _0809C996
-	.pool
-_0809C988:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsBattlePyramidWarp
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809C9A4
-	ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8
-_0809C996:
-	bl ScriptContext1_SetupScript
-	movs r0, 0x1
-	b _0809C9EA
-	.pool
-_0809C9A4:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsSecretBaseGlitterMat
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C9B8
-	bl sub_80FA9D0
-	b _0809C9E8
-_0809C9B8:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsSecretBaseSoundMat
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809C9E8
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileIdAt
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_80FA970
-_0809C9E8:
-	movs r0, 0
-_0809C9EA:
-	add sp, 0x4
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809C96C
-
-	thumb_func_start per_step_scripts
-per_step_scripts: @ 809C9F4
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	bl InUnionRoom
-	cmp r0, 0x1
-	bne _0809CA04
-	b _0809CB24
-_0809CA04:
-	bl IncrementRematchStepCounter
-	bl AdjustFriendship_step
-	bl sub_81D4998
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _0809CAF8
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsForcedMovementTile
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809CAF8
-	bl overworld_poison_step
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CA48
-	ldr r0, =EventScript_2736BC
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CA48:
-	bl DoEggActions_CheckHatch
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809CA64
-	movs r0, 0xD
-	bl IncrementGameStat
-	ldr r0, =Route117_PokemonDayCare_EventScript_291FC0
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CA64:
-	bl sub_813B3B0
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CA7C
-	ldr r0, =gUnknown_08273D1F
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CA7C:
-	bl ShouldDoBrailleRegicePuzzle
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CA94
-	ldr r0, =IslandCave_EventScript_238EAF
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CA94:
-	bl is_tile_that_overrides_player_control
-	cmp r0, 0x1
-	bne _0809CAA8
-	ldr r0, =MauvilleCity_EventScript_1DF7BA
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CAA8:
-	bl sub_8138120
-	cmp r0, 0x1
-	bne _0809CABC
-	ldr r0, =Route119_EventScript_1F49EC
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CABC:
-	bl sub_8138168
-	cmp r0, 0x1
-	bne _0809CAD0
-	ldr r0, =LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CAD0:
-	bl sub_81381B0
-	cmp r0, 0x1
-	bne _0809CAE4
-	ldr r0, =RustboroCity_Gym_EventScript_21307B
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CAE4:
-	bl sub_81381F8
-	cmp r0, 0x1
-	bne _0809CAF8
-	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224175
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CAF8:
-	bl SafariZoneTakeStep
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CB28
-	movs r0, 0x1
-	bl CountSSTidalStep
-	cmp r0, 0x1
-	bne _0809CB1C
-	ldr r0, =SSTidalCorridor_EventScript_23C050
-	bl ScriptContext1_SetupScript
-	b _0809CB28
-	.pool
-_0809CB1C:
-	bl sub_8196034
-	cmp r0, 0
-	bne _0809CB28
-_0809CB24:
-	movs r0, 0
-	b _0809CB2A
-_0809CB28:
-	movs r0, 0x1
-_0809CB2A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end per_step_scripts
-
-	thumb_func_start sub_809CB30
-sub_809CB30: @ 809CB30
-	push {lr}
-	ldr r0, =0x0000402a
-	movs r1, 0
-	bl VarSet
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809CB30
-
-	thumb_func_start AdjustFriendship_step
-AdjustFriendship_step: @ 809CB44
-	push {r4,r5,lr}
-	ldr r0, =0x0000402a
-	bl GetVarPointer
-	ldrh r1, [r0]
-	adds r1, 0x1
-	strh r1, [r0]
-	ldrh r1, [r0]
-	movs r2, 0x7F
-	ands r1, r2
-	strh r1, [r0]
-	cmp r1, 0
-	bne _0809CB72
-	ldr r5, =gPlayerParty
-	movs r4, 0x5
-_0809CB62:
-	adds r0, r5, 0
-	movs r1, 0x5
-	bl AdjustFriendship
-	adds r5, 0x64
-	subs r4, 0x1
-	cmp r4, 0
-	bge _0809CB62
-_0809CB72:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end AdjustFriendship_step
-
-	thumb_func_start ResetPoisonStepCounter
-ResetPoisonStepCounter: @ 809CB80
-	push {lr}
-	ldr r0, =0x0000402b
-	movs r1, 0
-	bl VarSet
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ResetPoisonStepCounter
-
-	thumb_func_start overworld_poison_step
-overworld_poison_step: @ 809CB94
-	push {lr}
-	ldr r0, =gMapHeader
-	ldrb r0, [r0, 0x17]
-	cmp r0, 0x9
-	beq _0809CBD4
-	ldr r0, =0x0000402b
-	bl GetVarPointer
-	ldrh r1, [r0]
-	adds r1, 0x1
-	strh r1, [r0]
-	ldrh r1, [r0]
-	movs r2, 0x3
-	ands r1, r2
-	strh r1, [r0]
-	cmp r1, 0
-	bne _0809CBD4
-	bl DoPoisonFieldEffect
-	cmp r0, 0x1
-	beq _0809CBD4
-	cmp r0, 0x1
-	ble _0809CBD4
-	cmp r0, 0x2
-	bne _0809CBD4
-	movs r0, 0x1
-	b _0809CBD6
-	.pool
-_0809CBD4:
-	movs r0, 0
-_0809CBD6:
-	pop {r1}
-	bx r1
-	thumb_func_end overworld_poison_step
-
-	thumb_func_start prev_quest_postbuffer_cursor_backup_reset
-prev_quest_postbuffer_cursor_backup_reset: @ 809CBDC
-	ldr r1, =gUnknown_020375D4
-	movs r0, 0
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end prev_quest_postbuffer_cursor_backup_reset
-
-	thumb_func_start is_it_battle_time_3
-is_it_battle_time_3: @ 809CBE8
-	push {r4-r7,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r7, r4, 0
-	ldr r6, =gUnknown_020375D4
-	ldrb r0, [r6]
-	cmp r0, 0x3
-	bhi _0809CC0C
-	adds r0, 0x1
-	strb r0, [r6]
-	ldr r0, =gUnknown_020375D6
-	strh r4, [r0]
-	movs r0, 0
-	b _0809CC30
-	.pool
-_0809CC0C:
-	ldr r5, =gUnknown_020375D6
-	ldrh r1, [r5]
-	adds r0, r4, 0
-	bl StandardWildEncounter
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CC28
-	strh r4, [r5]
-	movs r0, 0
-	b _0809CC30
-	.pool
-_0809CC28:
-	movs r0, 0
-	strb r0, [r6]
-	strh r7, [r5]
-	movs r0, 0x1
-_0809CC30:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end is_it_battle_time_3
-
-	thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally
-mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r7, r0, 0
-	adds r4, r1, 0
-	adds r5, r2, 0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r0, =gMapHeader
-	mov r8, r0
-	adds r1, r7, 0
-	bl map_warp_check_packed
-	lsls r0, 24
-	lsrs r6, r0, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl is_non_stair_warp_tile
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CC90
-	lsls r0, r6, 24
-	asrs r4, r0, 24
-	movs r0, 0x1
-	negs r0, r0
-	cmp r4, r0
-	beq _0809CC90
-	bl StoreInitialPlayerAvatarState
-	mov r0, r8
-	adds r1, r4, 0
-	adds r2, r7, 0
-	bl sub_809CEB0
-	bl sub_80AF734
-	movs r0, 0x1
-	b _0809CC92
-	.pool
-_0809CC90:
-	movs r0, 0
-_0809CC92:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end mapheader_run_first_tag2_script_list_match_conditionally
-
-	thumb_func_start sub_809CC9C
-sub_809CC9C: @ 809CC9C
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	lsls r1, 16
-	lsrs r5, r1, 16
-	ldr r7, =gMapHeader
-	adds r0, r7, 0
-	adds r1, r6, 0
-	bl map_warp_check_packed
-	lsls r0, 24
-	asrs r4, r0, 24
-	movs r0, 0x1
-	negs r0, r0
-	cmp r4, r0
-	beq _0809CD8A
-	adds r0, r5, 0
-	bl is_warp_tile
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CD8A
-	bl StoreInitialPlayerAvatarState
-	adds r0, r7, 0
-	adds r1, r4, 0
-	adds r2, r6, 0
-	bl sub_809CEB0
-	lsls r0, r5, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl MetatileBehavior_IsEscalator
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CCF8
-	adds r0, r4, 0
-	bl sub_80AF80C
-	movs r0, 0x1
-	b _0809CD8C
-	.pool
-_0809CCF8:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsLavaridgeB1FWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CD0E
-	bl sub_80AF828
-	movs r0, 0x1
-	b _0809CD8C
-_0809CD0E:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsLavaridge1FWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CD24
-	bl sub_80AF838
-	movs r0, 0x1
-	b _0809CD8C
-_0809CD24:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsAquaHideoutWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CD3A
-	bl sub_80AF848
-	movs r0, 0x1
-	b _0809CD8C
-_0809CD3A:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsWarpOrBridge
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CD50
-	bl sub_80B0268
-	movs r0, 0x1
-	b _0809CD8C
-_0809CD50:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsMtPyreHole
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CD6C
-	ldr r0, =gUnknown_082A8350
-	bl ScriptContext1_SetupScript
-	movs r0, 0x1
-	b _0809CD8C
-	.pool
-_0809CD6C:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsMossdeepGymWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CD82
-	bl sub_80AF87C
-	movs r0, 0x1
-	b _0809CD8C
-_0809CD82:
-	bl sub_80AF734
-	movs r0, 0x1
-	b _0809CD8C
-_0809CD8A:
-	movs r0, 0
-_0809CD8C:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809CC9C
-
-	thumb_func_start is_warp_tile
-is_warp_tile: @ 809CD94
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl MetatileBehavior_IsWarpDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsLadder
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsEscalator
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsNonAnimDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsLavaridgeB1FWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsLavaridge1FWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsAquaHideoutWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsMtPyreHole
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsMossdeepGymWarp
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	adds r0, r4, 0
-	bl MetatileBehavior_IsWarpOrBridge
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0809CE2A
-	movs r0, 0
-	b _0809CE2C
-_0809CE2A:
-	movs r0, 0x1
-_0809CE2C:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end is_warp_tile
-
-	thumb_func_start is_non_stair_warp_tile
-is_non_stair_warp_tile: @ 809CE34
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 24
-	lsrs r1, 24
-	adds r2, r1, 0
-	cmp r1, 0x2
-	beq _0809CE58
-	cmp r1, 0x2
-	bgt _0809CE4E
-	cmp r1, 0x1
-	beq _0809CE62
-	b _0809CE84
-_0809CE4E:
-	cmp r2, 0x3
-	beq _0809CE6C
-	cmp r2, 0x4
-	beq _0809CE76
-	b _0809CE84
-_0809CE58:
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsNorthArrowWarp
-	b _0809CE7E
-_0809CE62:
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsSouthArrowWarp
-	b _0809CE7E
-_0809CE6C:
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsWestArrowWarp
-	b _0809CE7E
-_0809CE76:
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsEastArrowWarp
-_0809CE7E:
-	lsls r0, 24
-	lsrs r0, 24
-	b _0809CE86
-_0809CE84:
-	movs r0, 0
-_0809CE86:
-	pop {r1}
-	bx r1
-	thumb_func_end is_non_stair_warp_tile
-
-	thumb_func_start map_warp_check_packed
-map_warp_check_packed: @ 809CE8C
-	push {lr}
-	adds r3, r1, 0
-	ldrh r1, [r3]
-	subs r1, 0x7
-	lsls r1, 16
-	lsrs r1, 16
-	ldrh r2, [r3, 0x2]
-	subs r2, 0x7
-	lsls r2, 16
-	lsrs r2, 16
-	ldrb r3, [r3, 0x4]
-	bl map_warp_check
-	lsls r0, 24
-	asrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end map_warp_check_packed
-
-	thumb_func_start sub_809CEB0
-sub_809CEB0: @ 809CEB0
-	push {r4-r7,lr}
-	adds r7, r2, 0
-	lsls r1, 24
-	lsrs r4, r1, 24
-	bl GetCurrentTrainerHillMapId
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r6, r5, 0
-	cmp r5, 0
-	beq _0809CF00
-	bl sub_81D6490
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r5, r0
-	bne _0809CEF0
-	lsls r0, r4, 24
-	adds r4, r0, 0
-	cmp r4, 0
-	bne _0809CEE8
-	ldr r0, =gMapHeader
-	ldr r0, [r0, 0x4]
-	ldr r5, [r0, 0x8]
-	b _0809CF0E
-	.pool
-_0809CEE8:
-	bl sub_81D6120
-	adds r5, r0, 0
-	b _0809CF0E
-_0809CEF0:
-	cmp r6, 0x5
-	bne _0809CF00
-	lsls r4, 24
-	lsrs r0, r4, 24
-	bl sub_81D6134
-	adds r5, r0, 0
-	b _0809CF0E
-_0809CF00:
-	ldr r0, =gMapHeader
-	ldr r0, [r0, 0x4]
-	lsls r2, r4, 24
-	asrs r1, r2, 21
-	ldr r0, [r0, 0x8]
-	adds r5, r0, r1
-	adds r4, r2, 0
-_0809CF0E:
-	ldrb r0, [r5, 0x6]
-	cmp r0, 0x7F
-	bne _0809CF20
-	ldrb r0, [r5, 0x5]
-	bl copy_saved_warp2_bank_and_enter_x_to_warp1
-	b _0809CF6E
-	.pool
-_0809CF20:
-	movs r0, 0x7
-	ldrsb r0, [r5, r0]
-	movs r1, 0x6
-	ldrsb r1, [r5, r1]
-	movs r2, 0x5
-	ldrsb r2, [r5, r2]
-	bl warp1_set_2
-	movs r1, 0
-	ldrsh r0, [r7, r1]
-	movs r2, 0x2
-	ldrsh r1, [r7, r2]
-	bl sub_8084D5C
-	ldrb r0, [r5, 0x7]
-	ldrb r1, [r5, 0x6]
-	bl Overworld_GetMapHeaderByGroupAndId
-	ldr r1, [r0, 0x4]
-	ldrb r0, [r5, 0x5]
-	ldr r1, [r1, 0x8]
-	lsls r0, 3
-	adds r0, r1
-	ldrb r0, [r0, 0x6]
-	cmp r0, 0x7F
-	bne _0809CF6E
-	asrs r3, r4, 24
-	lsls r0, r3, 3
-	adds r0, r1
-	ldrb r0, [r0, 0x5]
-	ldr r1, =gSaveBlock1Ptr
-	ldr r2, [r1]
-	movs r1, 0x4
-	ldrsb r1, [r2, r1]
-	ldrb r2, [r2, 0x5]
-	lsls r2, 24
-	asrs r2, 24
-	bl saved_warp2_set
-_0809CF6E:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809CEB0
-
-	thumb_func_start map_warp_consider_2_to_inside
-map_warp_consider_2_to_inside: @ 809CF78
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	lsls r1, 16
-	lsrs r0, r1, 16
-	adds r7, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	cmp r2, 0x2
-	bne _0809CFFC
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl MetatileBehavior_IsOpenSecretBaseDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CFB0
-	ldr r0, =gMapHeader
-	ldr r1, [r0, 0x4]
-	adds r0, r5, 0
-	bl sub_80E9668
-	movs r0, 0x1
-	b _0809CFFE
-	.pool
-_0809CFB0:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsWarpDoor
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CFFC
-	ldr r6, =gMapHeader
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl map_warp_check_packed
-	lsls r0, 24
-	asrs r4, r0, 24
-	movs r0, 0x1
-	negs r0, r0
-	cmp r4, r0
-	beq _0809CFFC
-	adds r0, r7, 0
-	bl is_warp_tile
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809CFFC
-	bl StoreInitialPlayerAvatarState
-	adds r0, r6, 0
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_809CEB0
-	bl sub_80AF7D0
-	movs r0, 0x1
-	b _0809CFFE
-	.pool
-_0809CFFC:
-	movs r0, 0
-_0809CFFE:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end map_warp_consider_2_to_inside
-
-	thumb_func_start map_warp_check
-map_warp_check: @ 809D004
-	push {r4-r6,lr}
-	lsls r1, 16
-	lsrs r6, r1, 16
-	lsls r2, 16
-	lsrs r5, r2, 16
-	lsls r3, 24
-	lsrs r4, r3, 24
-	ldr r0, [r0, 0x4]
-	ldr r1, [r0, 0x8]
-	ldrb r3, [r0, 0x1]
-	movs r2, 0
-	cmp r2, r3
-	bge _0809D042
-_0809D01E:
-	ldrh r0, [r1]
-	cmp r0, r6
-	bne _0809D03A
-	ldrh r0, [r1, 0x2]
-	cmp r0, r5
-	bne _0809D03A
-	ldrb r0, [r1, 0x4]
-	cmp r0, r4
-	beq _0809D034
-	cmp r0, 0
-	bne _0809D03A
-_0809D034:
-	lsls r0, r2, 24
-	asrs r0, 24
-	b _0809D046
-_0809D03A:
-	adds r2, 0x1
-	adds r1, 0x8
-	cmp r2, r3
-	blt _0809D01E
-_0809D042:
-	movs r0, 0x1
-	negs r0, r0
-_0809D046:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end map_warp_check
-
-	thumb_func_start trigger_activate
-trigger_activate: @ 809D04C
-	push {r4,lr}
-	adds r4, r0, 0
-	cmp r4, 0
-	beq _0809D082
-	ldr r1, [r4, 0xC]
-	cmp r1, 0
-	bne _0809D062
-	ldrb r0, [r4, 0x6]
-	bl DoCoordEventWeather
-	b _0809D082
-_0809D062:
-	ldrh r0, [r4, 0x6]
-	cmp r0, 0
-	beq _0809D07C
-	ldrh r0, [r4, 0x6]
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	ldrb r1, [r4, 0x8]
-	cmp r0, r1
-	bne _0809D082
-	ldr r0, [r4, 0xC]
-	b _0809D084
-_0809D07C:
-	adds r0, r1, 0
-	bl ScriptContext2_RunNewScript
-_0809D082:
-	movs r0, 0
-_0809D084:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end trigger_activate
-
-	thumb_func_start mapheader_trigger_activate_at
-mapheader_trigger_activate_at: @ 809D08C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r1, 16
-	lsrs r1, 16
-	mov r10, r1
-	lsls r2, 16
-	lsrs r2, 16
-	mov r9, r2
-	lsls r3, 24
-	lsrs r3, 24
-	mov r8, r3
-	ldr r0, [r0, 0x4]
-	ldr r1, [r0, 0xC]
-	ldrb r7, [r0, 0x2]
-	movs r6, 0
-	cmp r6, r7
-	bge _0809D0E2
-	adds r5, r1, 0
-	adds r4, r5, 0
-_0809D0B8:
-	ldrh r0, [r4]
-	cmp r0, r10
-	bne _0809D0D8
-	ldrh r0, [r4, 0x2]
-	cmp r0, r9
-	bne _0809D0D8
-	ldrb r0, [r4, 0x4]
-	cmp r0, r8
-	beq _0809D0CE
-	cmp r0, 0
-	bne _0809D0D8
-_0809D0CE:
-	adds r0, r5, 0
-	bl trigger_activate
-	cmp r0, 0
-	bne _0809D0E4
-_0809D0D8:
-	adds r4, 0x10
-	adds r5, 0x10
-	adds r6, 0x1
-	cmp r6, r7
-	blt _0809D0B8
-_0809D0E2:
-	movs r0, 0
-_0809D0E4:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end mapheader_trigger_activate_at
-
-	thumb_func_start sub_809D0F4
-sub_809D0F4: @ 809D0F4
-	push {r4,lr}
-	ldr r4, =gMapHeader
-	ldrh r1, [r0]
-	subs r1, 0x7
-	lsls r1, 16
-	lsrs r1, 16
-	ldrh r2, [r0, 0x2]
-	subs r2, 0x7
-	lsls r2, 16
-	lsrs r2, 16
-	ldrb r3, [r0, 0x4]
-	adds r0, r4, 0
-	bl mapheader_trigger_activate_at
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_809D0F4
-
-	thumb_func_start FindInvisibleEventObjectByPosition
-@ int FindInvisibleEventObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
-FindInvisibleEventObjectByPosition: @ 809D11C
-	push {r4-r7,lr}
-	lsls r1, 16
-	lsrs r7, r1, 16
-	lsls r2, 16
-	lsrs r6, r2, 16
-	lsls r3, 24
-	lsrs r5, r3, 24
-	ldr r0, [r0, 0x4]
-	ldr r4, [r0, 0x10]
-	ldrb r3, [r0, 0x3]
-	movs r2, 0
-	cmp r2, r3
-	bcs _0809D162
-_0809D136:
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0, r4
-	ldrh r0, [r1]
-	cmp r0, r7
-	bne _0809D158
-	ldrh r0, [r1, 0x2]
-	cmp r0, r6
-	bne _0809D158
-	ldrb r0, [r1, 0x4]
-	cmp r0, r5
-	beq _0809D154
-	cmp r0, 0
-	bne _0809D158
-_0809D154:
-	adds r0, r1, 0
-	b _0809D164
-_0809D158:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, r3
-	bcc _0809D136
-_0809D162:
-	movs r0, 0
-_0809D164:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end FindInvisibleEventObjectByPosition
-
-	thumb_func_start dive_warp
-dive_warp: @ 809D16C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r1, 16
-	lsrs r5, r1, 16
-	ldr r0, =gMapHeader
-	ldrb r0, [r0, 0x17]
-	cmp r0, 0x5
-	bne _0809D1A4
-	lsls r0, r5, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsUnableToEmerge
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809D1A4
-	ldrh r0, [r4]
-	subs r0, 0x7
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r4, 0x2]
-	subs r1, 0x7
-	lsls r1, 16
-	lsrs r1, 16
-	bl SetDiveWarpEmerge
-	b _0809D1C8
-	.pool
-_0809D1A4:
-	lsls r0, r5, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsDiveable
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809D1E0
-	ldrh r0, [r4]
-	subs r0, 0x7
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r4, 0x2]
-	subs r1, 0x7
-	lsls r1, 16
-	lsrs r1, 16
-	bl SetDiveWarpDive
-_0809D1C8:
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809D1E0
-	bl StoreInitialPlayerAvatarState
-	bl sp13E_warp_to_last_warp
-	movs r0, 0xE9
-	bl PlaySE
-	movs r0, 0x1
-	b _0809D1E2
-_0809D1E0:
-	movs r0, 0
-_0809D1E2:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end dive_warp
-
-	thumb_func_start sub_809D1E8
-sub_809D1E8: @ 809D1E8
-	push {r4,r5,lr}
-	sub sp, 0x4
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, =gMapHeader
-	ldrb r0, [r0, 0x17]
-	cmp r0, 0x5
-	bne _0809D244
-	adds r0, r5, 0
-	bl MetatileBehavior_IsUnableToEmerge
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809D244
-	mov r0, sp
-	ldrh r0, [r0]
-	subs r0, 0x7
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r4]
-	subs r1, 0x7
-	lsls r1, 16
-	lsrs r1, 16
-	bl SetDiveWarpEmerge
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809D274
-	movs r0, 0x1
-	b _0809D276
-	.pool
-_0809D244:
-	adds r0, r5, 0
-	bl MetatileBehavior_IsDiveable
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809D274
-	mov r0, sp
-	ldrh r0, [r0]
-	subs r0, 0x7
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r4]
-	subs r1, 0x7
-	lsls r1, 16
-	lsrs r1, 16
-	bl SetDiveWarpDive
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809D274
-	movs r0, 0x2
-	b _0809D276
-_0809D274:
-	movs r0, 0
-_0809D276:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809D1E8
-
-	thumb_func_start GetEventObjectScriptPointerForComparison
-@ u8 *GetEventObjectScriptPointerForComparison()
-GetEventObjectScriptPointerForComparison: @ 809D280
-	push {r4,r5,lr}
-	sub sp, 0x8
-	bl GetPlayerMovementDirection
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	mov r5, sp
-	mov r0, sp
-	bl player_get_next_pos_and_height
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0x2
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r0, sp
-	adds r2, r4, 0
-	bl TryGetEventObjectScript
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end GetEventObjectScriptPointerForComparison
-
-	thumb_func_start sub_809D2BC
-sub_809D2BC: @ 809D2BC
-	push {r4,lr}
-	sub sp, 0x8
-	bl GetPlayerMovementDirection
-	mov r4, sp
-	mov r0, sp
-	bl player_get_pos_to_and_height
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	ldr r4, =gMapHeader
-	adds r0, r4, 0
-	mov r1, sp
-	bl map_warp_check_packed
-	adds r1, r0, 0
-	lsls r1, 24
-	asrs r1, 24
-	adds r0, r4, 0
-	mov r2, sp
-	bl sub_809CEB0
-	movs r0, 0
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_809D2BC
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
deleted file mode 100644
index e404a90a0..000000000
--- a/asm/field_player_avatar.s
+++ /dev/null
@@ -1,4180 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start IsPlayerCollidingWithFarawayIslandMew
-@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
-IsPlayerCollidingWithFarawayIslandMew: @ 808B324
-	push {r4-r6,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerAvatar
-	ldrb r2, [r1, 0x5]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	ldr r5, =gEventObjects
-	adds r3, r1, r5
-	ldrh r2, [r3, 0x10]
-	mov r1, sp
-	strh r2, [r1]
-	ldrh r1, [r3, 0x12]
-	mov r4, sp
-	adds r4, 0x2
-	strh r1, [r4]
-	mov r1, sp
-	adds r2, r4, 0
-	bl MoveCoords
-	movs r0, 0x1
-	movs r1, 0x39
-	movs r2, 0x1A
-	bl GetEventObjectIdByLocalIdAndMap
-	lsls r0, 24
-	lsrs r1, r0, 24
-	adds r6, r4, 0
-	cmp r1, 0x10
-	beq _0808B3C0
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0, r5
-	mov r0, sp
-	movs r1, 0x14
-	ldrsh r2, [r3, r1]
-	movs r4, 0
-	ldrsh r0, [r0, r4]
-	cmp r2, r0
-	bne _0808B3C0
-	movs r5, 0x16
-	ldrsh r1, [r3, r5]
-	movs r4, 0
-	ldrsh r0, [r6, r4]
-	ldrh r4, [r3, 0x16]
-	cmp r1, r0
-	bne _0808B398
-	movs r5, 0x10
-	ldrsh r0, [r3, r5]
-	cmp r0, r2
-	bne _0808B398
-	movs r2, 0x12
-	ldrsh r0, [r3, r2]
-	cmp r0, r1
-	beq _0808B3C0
-_0808B398:
-	mov r0, sp
-	movs r5, 0x14
-	ldrsh r1, [r3, r5]
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	cmp r1, r0
-	bne _0808B3C0
-	lsls r0, r4, 16
-	asrs r0, 16
-	movs r4, 0
-	ldrsh r1, [r6, r4]
-	cmp r0, r1
-	bne _0808B3C0
-	movs r0, 0x1
-	b _0808B3C2
-	.pool
-_0808B3C0:
-	movs r0, 0
-_0808B3C2:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end IsPlayerCollidingWithFarawayIslandMew
-
-	thumb_func_start SetPlayerAvatarTransitionFlags
-@ void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
-SetPlayerAvatarTransitionFlags: @ 808B3CC
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r2, =gPlayerAvatar
-	ldrb r1, [r2, 0x1]
-	orrs r0, r1
-	strb r0, [r2, 0x1]
-	bl DoPlayerAvatarTransition
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SetPlayerAvatarTransitionFlags
-
-	thumb_func_start DoPlayerAvatarTransition
-@ void DoPlayerAvatarTransition()
-DoPlayerAvatarTransition: @ 808B3E8
-	push {r4,r5,lr}
-	ldr r0, =gPlayerAvatar
-	ldrb r4, [r0, 0x1]
-	cmp r4, 0
-	beq _0808B428
-	movs r5, 0
-_0808B3F4:
-	movs r0, 0x1
-	ands r0, r4
-	cmp r0, 0
-	beq _0808B416
-	ldr r0, =gUnknown_084974B8
-	lsls r2, r5, 2
-	adds r2, r0
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r0, r1
-	ldr r1, [r2]
-	bl _call_via_r1
-_0808B416:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsrs r4, 1
-	cmp r5, 0x7
-	bls _0808B3F4
-	ldr r1, =gPlayerAvatar
-	movs r0, 0
-	strb r0, [r1, 0x1]
-_0808B428:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DoPlayerAvatarTransition
-
-	thumb_func_start PlayerAvatarTransition_Dummy
-@ void PlayerAvatarTransition_Dummy(struct npc_state *eventObject)
-PlayerAvatarTransition_Dummy: @ 808B43C
-	bx lr
-	thumb_func_end PlayerAvatarTransition_Dummy
-
-	thumb_func_start PlayerAvatarTransition_Normal
-@ void PlayerAvatarTransition_Normal(struct npc_state *eventObject)
-PlayerAvatarTransition_Normal: @ 808B440
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r1, [r4, 0x18]
-	lsrs r1, 4
-	adds r0, r4, 0
-	bl EventObjectTurn
-	movs r0, 0x1
-	bl SetPlayerAvatarStateMask
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerAvatarTransition_Normal
-
-	thumb_func_start PlayerAvatarTransition_MachBike
-@ void PlayerAvatarTransition_MachBike(struct npc_state *eventObject)
-PlayerAvatarTransition_MachBike: @ 808B46C
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x1
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r1, [r4, 0x18]
-	lsrs r1, 4
-	adds r0, r4, 0
-	bl EventObjectTurn
-	movs r0, 0x2
-	bl SetPlayerAvatarStateMask
-	movs r0, 0
-	movs r1, 0
-	bl BikeClearState
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerAvatarTransition_MachBike
-
-	thumb_func_start PlayerAvatarTransition_AcroBike
-@ void PlayerAvatarTransition_AcroBike(struct npc_state *eventObject)
-PlayerAvatarTransition_AcroBike: @ 808B4A0
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x2
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r1, [r4, 0x18]
-	lsrs r1, 4
-	adds r0, r4, 0
-	bl EventObjectTurn
-	movs r0, 0x4
-	bl SetPlayerAvatarStateMask
-	movs r0, 0
-	movs r1, 0
-	bl BikeClearState
-	bl Bike_HandleBumpySlopeJump
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerAvatarTransition_AcroBike
-
-	thumb_func_start PlayerAvatarTransition_Surfing
-@ void PlayerAvatarTransition_Surfing(struct npc_state *eventObject)
-PlayerAvatarTransition_Surfing: @ 808B4D8
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x3
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r1, [r4, 0x18]
-	lsrs r1, 4
-	adds r0, r4, 0
-	bl EventObjectTurn
-	movs r0, 0x8
-	bl SetPlayerAvatarStateMask
-	ldr r1, =gFieldEffectArguments
-	movs r2, 0x10
-	ldrsh r0, [r4, r2]
-	str r0, [r1]
-	movs r2, 0x12
-	ldrsh r0, [r4, r2]
-	str r0, [r1, 0x4]
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	str r0, [r1, 0x8]
-	movs r0, 0x8
-	bl FieldEffectStart
-	lsls r0, 24
-	lsrs r0, 24
-	strb r0, [r4, 0x1A]
-	movs r1, 0x1
-	bl sub_81555AC
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PlayerAvatarTransition_Surfing
-
-	thumb_func_start PlayerAvatarTransition_Underwater
-@ void PlayerAvatarTransition_Underwater(struct npc_state *eventObject)
-PlayerAvatarTransition_Underwater: @ 808B534
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x4
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r1, [r4, 0x18]
-	lsrs r1, 4
-	adds r0, r4, 0
-	bl EventObjectTurn
-	movs r0, 0x10
-	bl SetPlayerAvatarStateMask
-	ldrb r0, [r4, 0x4]
-	bl sub_8155800
-	strb r0, [r4, 0x1A]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerAvatarTransition_Underwater
-
-	thumb_func_start PlayerAvatarTransition_ReturnToField
-@ void PlayerAvatarTransition_ReturnToField(struct npc_state *eventObject)
-PlayerAvatarTransition_ReturnToField: @ 808B568
-	ldr r2, =gPlayerAvatar
-	ldrb r1, [r2]
-	movs r0, 0x20
-	orrs r0, r1
-	strb r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end PlayerAvatarTransition_ReturnToField
-
-	thumb_func_start sub_808B578
-sub_808B578: @ 808B578
-	push {r4,lr}
-	ldr r4, =gPlayerAvatar
-	movs r0, 0
-	strb r0, [r4, 0x3]
-	bl PlayerIsAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808B5B6
-	bl PlayerCheckIfAnimFinishedOrInactive
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808B5A8
-	bl player_is_anim_in_certain_ranges
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808B5B6
-	movs r0, 0x1
-	b _0808B5B4
-	.pool
-_0808B5A8:
-	bl sub_808B618
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808B5B6
-	movs r0, 0x2
-_0808B5B4:
-	strb r0, [r4, 0x3]
-_0808B5B6:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808B578
-
-	thumb_func_start player_is_anim_in_certain_ranges
-player_is_anim_in_certain_ranges: @ 808B5BC
-	push {lr}
-	ldr r2, =gEventObjects
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x1C]
-	cmp r1, 0x3
-	bls _0808B602
-	adds r0, r1, 0
-	subs r0, 0x10
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x4
-	bls _0808B602
-	adds r0, r1, 0
-	subs r0, 0x19
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xF
-	bls _0808B602
-	adds r0, r1, 0
-	subs r0, 0x64
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xB
-	bls _0808B602
-	adds r0, r1, 0
-	subs r0, 0x7C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bhi _0808B610
-_0808B602:
-	movs r0, 0x1
-	b _0808B612
-	.pool
-_0808B610:
-	movs r0, 0
-_0808B612:
-	pop {r1}
-	bx r1
-	thumb_func_end player_is_anim_in_certain_ranges
-
-	thumb_func_start sub_808B618
-sub_808B618: @ 808B618
-	push {lr}
-	bl player_is_anim_in_certain_ranges
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808B634
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x2]
-	cmp r0, 0x1
-	beq _0808B634
-	movs r0, 0x1
-	b _0808B636
-	.pool
-_0808B634:
-	movs r0, 0
-_0808B636:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808B618
-
-	thumb_func_start PlayerIsAnimActive
-@ bool8 PlayerIsAnimActive()
-PlayerIsAnimActive: @ 808B63C
-	push {lr}
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r0, r1
-	bl EventObjectIsMovementOverridden
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end PlayerIsAnimActive
-
-	thumb_func_start PlayerCheckIfAnimFinishedOrInactive
-@ bool8 PlayerCheckIfAnimFinishedOrInactive()
-PlayerCheckIfAnimFinishedOrInactive: @ 808B660
-	push {lr}
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r0, r1
-	bl EventObjectCheckHeldMovementStatus
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end PlayerCheckIfAnimFinishedOrInactive
-
-	thumb_func_start player_set_x22
-player_set_x22: @ 808B684
-	ldr r3, =gEventObjects
-	ldr r1, =gPlayerAvatar
-	ldrb r2, [r1, 0x5]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r3
-	adds r1, 0x22
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end player_set_x22
-
-	thumb_func_start PlayerGetCopyableMovement
-PlayerGetCopyableMovement: @ 808B6A0
-	ldr r2, =gEventObjects
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x22
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end PlayerGetCopyableMovement
-
-	thumb_func_start sub_808B6BC
-sub_808B6BC: @ 808B6BC
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, =gPlayerAvatar
-	ldrb r2, [r0, 0x5]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	ldr r2, =gEventObjects
-	adds r0, r2
-	bl EventObjectForceSetHeldMovement
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808B6BC
-
-	thumb_func_start PlayerSetAnimId
-@ void PlayerSetAnimId(u8 animState, u8 a2)
-PlayerSetAnimId: @ 808B6E4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r1, 24
-	lsrs r4, r1, 24
-	bl PlayerIsAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808B712
-	adds r0, r4, 0
-	bl player_set_x22
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r0, r1
-	adds r1, r5, 0
-	bl EventObjectSetHeldMovement
-_0808B712:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PlayerSetAnimId
-
-	thumb_func_start PlayerGoSpeed1
-@ void PlayerGoSpeed1(u8 direction)
-PlayerGoSpeed1: @ 808B720
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetWalkNormalMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerGoSpeed1
-
-	thumb_func_start PlayerGoSpeed2
-@ void PlayerGoSpeed2(u8 direction)
-PlayerGoSpeed2: @ 808B738
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetWalkFastMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerGoSpeed2
-
-	thumb_func_start PlayerGoSpeed3
-@ void PlayerGoSpeed3(u8 direction)
-PlayerGoSpeed3: @ 808B750
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetRideWaterCurrentMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerGoSpeed3
-
-	thumb_func_start PlayerGoSpeed4
-@ void PlayerGoSpeed4(u8 direction)
-PlayerGoSpeed4: @ 808B768
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetWalkFastestMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerGoSpeed4
-
-	thumb_func_start PlayerRun
-@ void PlayerRun(u8 direction)
-PlayerRun: @ 808B780
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetPlayerRunMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerRun
-
-	thumb_func_start PlayerOnBikeCollide
-@ void PlayerOnBikeCollide(u8 direction)
-PlayerOnBikeCollide: @ 808B798
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl PlayCollisionSoundIfNotFacingWarp
-	adds r0, r4, 0
-	bl GetWalkInPlaceNormalMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerOnBikeCollide
-
-	thumb_func_start PlayerOnBikeCollideWithFarawayIslandMew
-@ void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction)
-PlayerOnBikeCollideWithFarawayIslandMew: @ 808B7BC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetWalkInPlaceNormalMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerOnBikeCollideWithFarawayIslandMew
-
-	thumb_func_start PlayerNotOnBikeCollide
-@ void PlayerNotOnBikeCollide(u8 direction)
-PlayerNotOnBikeCollide: @ 808B7D4
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl PlayCollisionSoundIfNotFacingWarp
-	adds r0, r4, 0
-	bl GetWalkInPlaceSlowMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerNotOnBikeCollide
-
-	thumb_func_start PlayerNotOnBikeCollideWithFarawayIslandMew
-@ void PlayerNotOnBikeCollideWithFarawayIslandMew(u8 direction)
-PlayerNotOnBikeCollideWithFarawayIslandMew: @ 808B7F8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetWalkInPlaceSlowMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerNotOnBikeCollideWithFarawayIslandMew
-
-	thumb_func_start PlayerFaceDirection
-@ void PlayerFaceDirection(u8 direction)
-PlayerFaceDirection: @ 808B810
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFaceDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerFaceDirection
-
-	thumb_func_start PlayerTurnInPlace
-@ void PlayerTurnInPlace(u8 direction)
-PlayerTurnInPlace: @ 808B828
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetWalkInPlaceFastMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerTurnInPlace
-
-	thumb_func_start PlayerJumpLedge
-@ void PlayerJumpLedge(u8 direction)
-PlayerJumpLedge: @ 808B840
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0xA
-	bl PlaySE
-	adds r0, r4, 0
-	bl GetJump2MovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x8
-	bl PlayerSetAnimId
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerJumpLedge
-
-	thumb_func_start sub_808B864
-sub_808B864: @ 808B864
-	push {r4,lr}
-	ldr r4, =gPlayerAvatar
-	ldrb r0, [r4, 0x3]
-	cmp r0, 0x2
-	beq _0808B872
-	cmp r0, 0
-	bne _0808B89A
-_0808B872:
-	bl player_should_look_direction_be_enforced_upon_movement
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808B89A
-	ldr r2, =gEventObjects
-	ldrb r1, [r4, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetFaceDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_808B6BC
-_0808B89A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808B864
-
-	thumb_func_start PlayerIdleWheelie
-PlayerIdleWheelie: @ 808B8A8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetAcroWheelieFaceDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerIdleWheelie
-
-	thumb_func_start PlayerStartWheelie
-PlayerStartWheelie: @ 808B8C0
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetAcroPopWheelieFaceDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerStartWheelie
-
-	thumb_func_start PlayerEndWheelie
-PlayerEndWheelie: @ 808B8D8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetAcroEndWheelieFaceDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerEndWheelie
-
-	thumb_func_start PlayerStandingHoppingWheelie
-PlayerStandingHoppingWheelie: @ 808B8F0
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x22
-	bl PlaySE
-	adds r0, r4, 0
-	bl GetAcroWheelieHopFaceDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl PlayerSetAnimId
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerStandingHoppingWheelie
-
-	thumb_func_start PlayerMovingHoppingWheelie
-PlayerMovingHoppingWheelie: @ 808B914
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x22
-	bl PlaySE
-	adds r0, r4, 0
-	bl GetAcroWheelieHopDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerMovingHoppingWheelie
-
-	thumb_func_start PlayerLedgeHoppingWheelie
-PlayerLedgeHoppingWheelie: @ 808B938
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x22
-	bl PlaySE
-	adds r0, r4, 0
-	bl GetAcroWheelieJumpDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x8
-	bl PlayerSetAnimId
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerLedgeHoppingWheelie
-
-	thumb_func_start PlayerAcroTurnJump
-PlayerAcroTurnJump: @ 808B95C
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x22
-	bl PlaySE
-	adds r0, r4, 0
-	bl GetJumpInPlaceTurnAroundMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl PlayerSetAnimId
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PlayerAcroTurnJump
-
-	thumb_func_start sub_808B980
-sub_808B980: @ 808B980
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x7
-	bl PlaySE
-	adds r0, r4, 0
-	bl GetAcroWheelieInPlaceDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808B980
-
-	thumb_func_start sub_808B9A4
-sub_808B9A4: @ 808B9A4
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetAcroPopWheelieMoveDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808B9A4
-
-	thumb_func_start sub_808B9BC
-sub_808B9BC: @ 808B9BC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetAcroWheelieMoveDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808B9BC
-
-	thumb_func_start npc_use_some_d2s
-npc_use_some_d2s: @ 808B9D4
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetAcroEndWheelieMoveDirectionMovementAction
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl PlayerSetAnimId
-	pop {r0}
-	bx r0
-	thumb_func_end npc_use_some_d2s
-
-	thumb_func_start PlayCollisionSoundIfNotFacingWarp
-@ void PlayCollisionSoundIfNotFacingWarp(u8 direction)
-PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r2, =gEventObjects
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x1E]
-	ldr r2, =sArrowWarpMetatileBehaviorChecks
-	subs r1, r4, 0x1
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808BA54
-	cmp r4, 0x2
-	bne _0808BA4E
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	movs r0, 0x2
-	mov r1, sp
-	adds r2, r4, 0
-	bl MoveCoords
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsWarpDoor
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808BA54
-_0808BA4E:
-	movs r0, 0x7
-	bl PlaySE
-_0808BA54:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PlayCollisionSoundIfNotFacingWarp
-
-	thumb_func_start GetXYCoordsOneStepInFrontOfPlayer
-GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r3, =gEventObjects
-	ldr r2, =gPlayerAvatar
-	ldrb r1, [r2, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r0, [r0, 0x10]
-	strh r0, [r4]
-	ldrb r1, [r2, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r0, [r0, 0x12]
-	strh r0, [r5]
-	bl GetPlayerFacingDirection
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl MoveCoords
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GetXYCoordsOneStepInFrontOfPlayer
-
-	thumb_func_start PlayerGetDestCoords
-@ void PlayerGetDestCoords(u16 *x, u16 *y)
-PlayerGetDestCoords: @ 808BAAC
-	push {r4,r5,lr}
-	ldr r5, =gEventObjects
-	ldr r4, =gPlayerAvatar
-	ldrb r3, [r4, 0x5]
-	lsls r2, r3, 3
-	adds r2, r3
-	lsls r2, 2
-	adds r2, r5
-	ldrh r2, [r2, 0x10]
-	strh r2, [r0]
-	ldrb r2, [r4, 0x5]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	adds r0, r5
-	ldrh r0, [r0, 0x12]
-	strh r0, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PlayerGetDestCoords
-
-	thumb_func_start plaer_get_pos_including_state_based_drift
-plaer_get_pos_including_state_based_drift: @ 808BADC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r3, r0, r1
-	ldrb r1, [r3]
-	movs r0, 0xC0
-	ands r0, r1
-	cmp r0, 0x40
-	beq _0808BAFC
-	b _0808BC24
-_0808BAFC:
-	ldr r2, =gSprites
-	ldrb r1, [r3, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0x32
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _0808BB12
-	b _0808BC24
-_0808BB12:
-	ldrh r0, [r3, 0x10]
-	strh r0, [r4]
-	ldrh r0, [r3, 0x12]
-	strh r0, [r5]
-	ldrb r0, [r3, 0x1C]
-	subs r0, 0x8
-	cmp r0, 0x30
-	bls _0808BB24
-	b _0808BC24
-_0808BB24:
-	lsls r0, 2
-	ldr r1, =_0808BB40
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0808BB40:
-	.4byte _0808BC04
-	.4byte _0808BC0A
-	.4byte _0808BC14
-	.4byte _0808BC1A
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC24
-	.4byte _0808BC04
-	.4byte _0808BC0A
-	.4byte _0808BC14
-	.4byte _0808BC1A
-_0808BC04:
-	ldrh r0, [r5]
-	adds r0, 0x1
-	b _0808BC0E
-_0808BC0A:
-	ldrh r0, [r5]
-	subs r0, 0x1
-_0808BC0E:
-	strh r0, [r5]
-	movs r0, 0x1
-	b _0808BC30
-_0808BC14:
-	ldrh r0, [r4]
-	subs r0, 0x1
-	b _0808BC1E
-_0808BC1A:
-	ldrh r0, [r4]
-	adds r0, 0x1
-_0808BC1E:
-	strh r0, [r4]
-	movs r0, 0x1
-	b _0808BC30
-_0808BC24:
-	movs r1, 0x1
-	negs r1, r1
-	adds r0, r1, 0
-	strh r0, [r4]
-	strh r0, [r5]
-	movs r0, 0
-_0808BC30:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end plaer_get_pos_including_state_based_drift
-
-	thumb_func_start GetPlayerFacingDirection
-@ u8 GetPlayerFacingDirection()
-GetPlayerFacingDirection: @ 808BC38
-	ldr r2, =gEventObjects
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bx lr
-	.pool
-	thumb_func_end GetPlayerFacingDirection
-
-	thumb_func_start GetPlayerMovementDirection
-@ u8 GetPlayerMovementDirection()
-GetPlayerMovementDirection: @ 808BC58
-	ldr r2, =gEventObjects
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x18]
-	lsrs r0, 4
-	bx lr
-	.pool
-	thumb_func_end GetPlayerMovementDirection
-
-	thumb_func_start PlayerGetZCoord
-@ u8 PlayerGetZCoord()
-PlayerGetZCoord: @ 808BC74
-	ldr r2, =gEventObjects
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	bx lr
-	.pool
-	thumb_func_end PlayerGetZCoord
-
-	thumb_func_start sub_808BC90
-sub_808BC90: @ 808BC90
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r0, r1
-	lsls r3, 16
-	asrs r3, 16
-	lsls r2, 16
-	asrs r2, 16
-	adds r1, r3, 0
-	bl sub_808EB08
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808BC90
-
-	thumb_func_start TestPlayerAvatarFlags
-@ u32 TestPlayerAvatarFlags(u32 mask)
-TestPlayerAvatarFlags: @ 808BCC0
-	ldr r1, =gPlayerAvatar
-	ldrb r1, [r1]
-	ands r1, r0
-	adds r0, r1, 0
-	bx lr
-	.pool
-	thumb_func_end TestPlayerAvatarFlags
-
-	thumb_func_start sub_808BCD0
-sub_808BCD0: @ 808BCD0
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_808BCD0
-
-	thumb_func_start GetPlayerAvatarObjectId
-@ u8 GetPlayerAvatarObjectId()
-GetPlayerAvatarObjectId: @ 808BCDC
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	bx lr
-	.pool
-	thumb_func_end GetPlayerAvatarObjectId
-
-	thumb_func_start sub_808BCE8
-sub_808BCE8: @ 808BCE8
-	push {lr}
-	bl ForcedMovement_None
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808BCE8
-
-	thumb_func_start sub_808BCF4
-sub_808BCF4: @ 808BCF4
-	push {r4,lr}
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	adds r4, r0
-	adds r0, r4, 0
-	bl npc_clear_strange_bits
-	ldrb r1, [r4, 0x18]
-	lsls r1, 28
-	lsrs r1, 28
-	adds r0, r4, 0
-	bl SetEventObjectDirection
-	movs r0, 0x6
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808BD2C
-	bl Bike_HandleBumpySlopeJump
-	movs r0, 0
-	bl Bike_UpdateBikeCounterSpeed
-_0808BD2C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808BCF4
-
-	thumb_func_start GetRivalAvatarGraphicsIdByStateIdAndGender
-GetRivalAvatarGraphicsIdByStateIdAndGender: @ 808BD3C
-	lsls r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, =sRivalAvatarGfxIds
-	lsrs r0, 23
-	adds r1, r0
-	adds r1, r2
-	ldrb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end GetRivalAvatarGraphicsIdByStateIdAndGender
-
-	thumb_func_start GetPlayerAvatarGraphicsIdByStateIdAndGender
-@ u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 stateId, u8 gender)
-GetPlayerAvatarGraphicsIdByStateIdAndGender: @ 808BD54
-	lsls r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, =sPlayerAvatarGfxIds
-	lsrs r0, 23
-	adds r1, r0
-	adds r1, r2
-	ldrb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end GetPlayerAvatarGraphicsIdByStateIdAndGender
-
-	thumb_func_start sub_808BD6C
-sub_808BD6C: @ 808BD6C
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gUnknown_08497508
-	adds r0, r1
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_808BD6C
-
-	thumb_func_start sub_808BD7C
-sub_808BD7C: @ 808BD7C
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gUnknown_0849750A
-	adds r0, r1
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_808BD7C
-
-	thumb_func_start GetPlayerAvatarGraphicsIdByStateId
-@ u8 GetPlayerAvatarGraphicsIdByStateId(u8 stateId)
-GetPlayerAvatarGraphicsIdByStateId: @ 808BD8C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerAvatar
-	ldrb r1, [r1, 0x7]
-	bl GetPlayerAvatarGraphicsIdByStateIdAndGender
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end GetPlayerAvatarGraphicsIdByStateId
-
-	thumb_func_start sub_808BDA8
-sub_808BDA8: @ 808BDA8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	cmp r0, 0x70
-	beq _0808BDCA
-	cmp r0, 0x70
-	bgt _0808BDC2
-	cmp r0, 0x6D
-	bgt _0808BDCE
-	cmp r0, 0x69
-	blt _0808BDCE
-	b _0808BDCA
-_0808BDC2:
-	cmp r1, 0x8A
-	beq _0808BDCA
-	cmp r1, 0xC0
-	bne _0808BDCE
-_0808BDCA:
-	movs r0, 0x1
-	b _0808BDD0
-_0808BDCE:
-	movs r0, 0
-_0808BDD0:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808BDA8
-
-	thumb_func_start GetPlayerAvatarGenderByGraphicsId
-@ u8 GetPlayerAvatarGenderByGraphicsId(u8 graphicsId)
-GetPlayerAvatarGenderByGraphicsId: @ 808BDD4
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	cmp r0, 0x70
-	beq _0808BDF6
-	cmp r0, 0x70
-	bgt _0808BDEE
-	cmp r0, 0x5D
-	bgt _0808BDFA
-	cmp r0, 0x59
-	blt _0808BDFA
-	b _0808BDF6
-_0808BDEE:
-	cmp r1, 0x8A
-	beq _0808BDF6
-	cmp r1, 0xC0
-	bne _0808BDFA
-_0808BDF6:
-	movs r0, 0x1
-	b _0808BDFC
-_0808BDFA:
-	movs r0, 0
-_0808BDFC:
-	pop {r1}
-	bx r1
-	thumb_func_end GetPlayerAvatarGenderByGraphicsId
-
-	thumb_func_start PartyHasMonWithSurf
-@ bool8 PartyHasMonWithSurf()
-PartyHasMonWithSurf: @ 808BE00
-	push {r4,r5,lr}
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808BE44
-	movs r5, 0
-	b _0808BE2A
-_0808BE12:
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl pokemon_has_move
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808BE24
-	movs r0, 0x1
-	b _0808BE46
-_0808BE24:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-_0808BE2A:
-	cmp r5, 0x5
-	bhi _0808BE44
-	movs r0, 0x64
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	cmp r0, 0
-	bne _0808BE12
-_0808BE44:
-	movs r0, 0
-_0808BE46:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end PartyHasMonWithSurf
-
-	thumb_func_start IsPlayerSurfingNorth
-@ bool8 IsPlayerSurfingNorth()
-IsPlayerSurfingNorth: @ 808BE50
-	push {lr}
-	bl GetPlayerMovementDirection
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x2
-	bne _0808BE6E
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808BE6E
-	movs r0, 0x1
-	b _0808BE70
-_0808BE6E:
-	movs r0, 0
-_0808BE70:
-	pop {r1}
-	bx r1
-	thumb_func_end IsPlayerSurfingNorth
-
-	thumb_func_start IsPlayerFacingSurfableFishableWater
-@ bool8 IsPlayerFacingSurfableFishableWater()
-IsPlayerFacingSurfableFishableWater: @ 808BE74
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	adds r4, r0
-	ldrh r1, [r4, 0x10]
-	mov r0, sp
-	strh r1, [r0]
-	ldrh r0, [r4, 0x12]
-	mov r5, sp
-	adds r5, 0x2
-	strh r0, [r5]
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	mov r1, sp
-	adds r2, r5, 0
-	bl MoveCoords
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0
-	ldrsh r2, [r5, r0]
-	ldrb r3, [r4, 0x18]
-	lsls r3, 28
-	lsrs r3, 28
-	adds r0, r4, 0
-	bl GetCollisionAtCoords
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _0808BEF4
-	bl PlayerGetZCoord
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _0808BEF4
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsSurfableFishableWater
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808BEF4
-	movs r0, 0x1
-	b _0808BEF6
-	.pool
-_0808BEF4:
-	movs r0, 0
-_0808BEF6:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end IsPlayerFacingSurfableFishableWater
-
-	thumb_func_start ClearPlayerAvatarInfo
-@ void ClearPlayerAvatarInfo()
-ClearPlayerAvatarInfo: @ 808BF00
-	push {lr}
-	ldr r0, =gPlayerAvatar
-	movs r1, 0
-	movs r2, 0x24
-	bl memset
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearPlayerAvatarInfo
-
-	thumb_func_start SetPlayerAvatarStateMask
-@ void SetPlayerAvatarStateMask(u8 stateMask)
-SetPlayerAvatarStateMask: @ 808BF14
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r3, =gPlayerAvatar
-	ldrb r2, [r3]
-	movs r1, 0xE0
-	ands r1, r2
-	orrs r0, r1
-	strb r0, [r3]
-	bx lr
-	.pool
-	thumb_func_end SetPlayerAvatarStateMask
-
-	thumb_func_start GetPlayerAvatarStateTransitionByGraphicsId
-@ u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
-GetPlayerAvatarStateTransitionByGraphicsId: @ 808BF2C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0
-	ldr r3, =gUnknown_0849750C
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r4, r0, 1
-	adds r6, r3, 0x1
-_0808BF42:
-	lsls r0, r2, 1
-	adds r1, r0, r4
-	adds r0, r1, r3
-	ldrb r0, [r0]
-	cmp r0, r5
-	bne _0808BF58
-	adds r0, r1, r6
-	ldrb r0, [r0]
-	b _0808BF64
-	.pool
-_0808BF58:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x4
-	bls _0808BF42
-	movs r0, 0x1
-_0808BF64:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end GetPlayerAvatarStateTransitionByGraphicsId
-
-	thumb_func_start GetPlayerAvatarGraphicsIdByCurrentState
-@ u8 GetPlayerAvatarGraphicsIdByCurrentState()
-GetPlayerAvatarGraphicsIdByCurrentState: @ 808BF6C
-	push {r4-r6,lr}
-	ldr r0, =gPlayerAvatar
-	ldrb r5, [r0]
-	movs r2, 0
-	ldr r3, =gUnknown_0849750C
-	ldrb r1, [r0, 0x7]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r4, r0, 1
-	adds r6, r3, 0x1
-_0808BF80:
-	lsls r0, r2, 1
-	adds r1, r0, r4
-	adds r0, r1, r6
-	ldrb r0, [r0]
-	ands r0, r5
-	cmp r0, 0
-	beq _0808BF9C
-	adds r0, r1, r3
-	ldrb r0, [r0]
-	b _0808BFA8
-	.pool
-_0808BF9C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x4
-	bls _0808BF80
-	movs r0, 0
-_0808BFA8:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end GetPlayerAvatarGraphicsIdByCurrentState
-
-	thumb_func_start SetPlayerAvatarExtraStateTransition
-@ void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 state)
-SetPlayerAvatarExtraStateTransition: @ 808BFB0
-	push {r4,r5,lr}
-	adds r4, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r5, =gPlayerAvatar
-	ldrb r1, [r5, 0x7]
-	bl GetPlayerAvatarStateTransitionByGraphicsId
-	lsls r0, 24
-	lsrs r0, 24
-	orrs r0, r4
-	ldrb r1, [r5, 0x1]
-	orrs r0, r1
-	strb r0, [r5, 0x1]
-	bl DoPlayerAvatarTransition
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SetPlayerAvatarExtraStateTransition
-
-	thumb_func_start InitPlayerAvatar
-@ void InitPlayerAvatar(u16 x, u16 y, u8 direction, u8 gender)
-InitPlayerAvatar: @ 808BFE0
-	push {r4-r6,lr}
-	mov r6, r9
-	mov r5, r8
-	push {r5,r6}
-	sub sp, 0x18
-	adds r4, r0, 0
-	adds r5, r1, 0
-	mov r9, r2
-	mov r8, r3
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	mov r0, r9
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	mov r1, r8
-	lsls r1, 24
-	lsrs r1, 24
-	mov r8, r1
-	mov r1, sp
-	movs r0, 0xFF
-	strb r0, [r1]
-	movs r0, 0
-	mov r1, r8
-	bl GetPlayerAvatarGraphicsIdByStateIdAndGender
-	mov r1, sp
-	movs r3, 0
-	strb r0, [r1, 0x1]
-	mov r0, sp
-	lsls r4, 16
-	asrs r4, 16
-	subs r4, 0x7
-	movs r6, 0
-	strh r4, [r0, 0x4]
-	lsls r5, 16
-	asrs r5, 16
-	subs r5, 0x7
-	strh r5, [r0, 0x6]
-	strb r6, [r0, 0x8]
-	movs r0, 0xB
-	strb r0, [r1, 0x9]
-	mov r2, sp
-	ldrb r1, [r2, 0xA]
-	subs r0, 0x1B
-	ands r0, r1
-	strb r0, [r2, 0xA]
-	mov r0, sp
-	strb r6, [r0, 0xA]
-	strh r3, [r0, 0xC]
-	strh r3, [r0, 0xE]
-	str r3, [sp, 0x10]
-	strh r3, [r0, 0x14]
-	bl SpawnSpecialEventObject
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r4, r5, 3
-	adds r4, r5
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	adds r4, r0
-	ldrb r0, [r4, 0x2]
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r4, 0x2]
-	bl CreateWarpArrowSprite
-	strb r0, [r4, 0x1B]
-	adds r0, r4, 0
-	mov r1, r9
-	bl EventObjectTurn
-	bl ClearPlayerAvatarInfo
-	ldr r0, =gPlayerAvatar
-	strb r6, [r0, 0x2]
-	strb r6, [r0, 0x3]
-	strb r5, [r0, 0x5]
-	ldrb r1, [r4, 0x4]
-	strb r1, [r0, 0x4]
-	mov r1, r8
-	strb r1, [r0, 0x7]
-	movs r0, 0x21
-	bl SetPlayerAvatarStateMask
-	add sp, 0x18
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end InitPlayerAvatar
-
-	thumb_func_start sub_808C0A8
-sub_808C0A8: @ 808C0A8
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r6, =gEventObjects
-	ldr r5, =gPlayerAvatar
-	ldrb r0, [r5, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	movs r0, 0x1
-	ands r4, r0
-	lsls r3, r4, 5
-	ldrb r2, [r1, 0x1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r3
-	strb r0, [r1, 0x1]
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C100
-	ldr r2, =gSprites
-	ldrb r1, [r5, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	ldrb r0, [r0, 0x1A]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	adds r1, 0x3E
-	lsls r3, r4, 2
-	ldrb r2, [r1]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r3
-	strb r0, [r1]
-_0808C100:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C0A8
-
-	thumb_func_start sub_808C114
-sub_808C114: @ 808C114
-	push {r4,r5,lr}
-	ldr r5, =gPlayerAvatar
-	ldrb r0, [r5, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	adds r4, r0
-	movs r0, 0x5
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	movs r1, 0
-	bl StartSpriteAnim
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C114
-
-	thumb_func_start sub_808C15C
-sub_808C15C: @ 808C15C
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r6, =gPlayerAvatar
-	ldrb r0, [r6, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	adds r4, r0
-	movs r0, 0x6
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r0, [r6, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	adds r0, r5, 0
-	bl GetFishingDirectionAnimNum
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C15C
-
-	thumb_func_start sub_808C1B4
-sub_808C1B4: @ 808C1B4
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r6, =gPlayerAvatar
-	ldrb r0, [r6, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	adds r4, r0
-	movs r0, 0x2
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r0, [r6, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	mov r8, r0
-	add r4, r8
-	adds r0, r5, 0
-	bl GetAcroWheelieDirectionAnimNum
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-	ldrb r1, [r6, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	add r0, r8
-	movs r1, 0x1
-	bl SeekSpriteAnim
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C1B4
-
-	thumb_func_start sub_808C228
-sub_808C228: @ 808C228
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r6, =gPlayerAvatar
-	ldrb r0, [r6, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	adds r4, r0
-	movs r0, 0x7
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r0, [r6, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	adds r0, r5, 0
-	bl GetFaceDirectionAnimNum
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C228
-
-	thumb_func_start sub_808C280
-@ void sub_808C280(struct EventObject *playerEventObj);
-sub_808C280: @ 808C280
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x4
-	adds r5, r0, 0
-	ldrb r0, [r5, 0x1E]
-	mov r8, r0
-	movs r1, 0
-	mov r0, sp
-	strh r1, [r0]
-	movs r6, 0x1
-	ldr r1, =sArrowWarpMetatileBehaviorChecks2
-	mov r9, r1
-	mov r4, sp
-	mov r7, sp
-	adds r7, 0x2
-_0808C2A2:
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	add r0, r9
-	ldr r1, [r0]
-	mov r0, r8
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C2E8
-	ldrb r0, [r5, 0x18]
-	lsrs r0, 4
-	cmp r6, r0
-	bne _0808C2E8
-	ldrh r0, [r5, 0x10]
-	strh r0, [r4]
-	ldrh r0, [r5, 0x12]
-	strh r0, [r7]
-	adds r0, r6, 0
-	mov r1, sp
-	adds r2, r7, 0
-	bl MoveCoords
-	ldrb r0, [r5, 0x1B]
-	movs r1, 0
-	ldrsh r2, [r4, r1]
-	movs r1, 0
-	ldrsh r3, [r7, r1]
-	adds r1, r6, 0
-	bl ShowWarpArrowSprite
-	b _0808C302
-	.pool
-_0808C2E8:
-	ldrh r1, [r4]
-	adds r1, 0x1
-	strh r1, [r4]
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r1, 16
-	asrs r1, 16
-	cmp r1, 0x3
-	ble _0808C2A2
-	ldrb r0, [r5, 0x1B]
-	bl SetSpriteInvisible
-_0808C302:
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808C280
-
-	thumb_func_start task_add_bump_boulder
-task_add_bump_boulder: @ 808C310
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r6, =taskFF_bump_boulder
-	adds r0, r6, 0
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	strh r4, [r1, 0xA]
-	strh r5, [r1, 0xC]
-	bl _call_via_r6
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end task_add_bump_boulder
-
-	thumb_func_start taskFF_bump_boulder
-taskFF_bump_boulder: @ 808C34C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r6, =gUnknown_08497530
-	ldr r2, =gTasks
-	ldr r5, =gEventObjects
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_0808C360:
-	movs r0, 0x8
-	ldrsh r3, [r4, r0]
-	lsls r3, 2
-	adds r3, r6
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	movs r2, 0xA
-	ldrsh r0, [r4, r2]
-	lsls r2, r0, 3
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r5
-	ldr r3, [r3]
-	adds r0, r4, 0
-	bl _call_via_r3
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808C360
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end taskFF_bump_boulder
-
-	thumb_func_start sub_808C3A4
-sub_808C3A4: @ 808C3A4
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptContext2_Enable
-	ldr r1, =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r1, 0x6]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808C3A4
-
-	thumb_func_start do_boulder_dust
-@ int do_boulder_dust(int a1, struct npc_state *a2, struct npc_state *a3)
-do_boulder_dust: @ 808C3C4
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r5, r1, 0
-	adds r4, r2, 0
-	adds r0, r5, 0
-	bl EventObjectIsHeldMovementActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C3DE
-	adds r0, r5, 0
-	bl EventObjectClearHeldMovementIfFinished
-_0808C3DE:
-	adds r0, r4, 0
-	bl EventObjectIsHeldMovementActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C3F0
-	adds r0, r4, 0
-	bl EventObjectClearHeldMovementIfFinished
-_0808C3F0:
-	adds r0, r5, 0
-	bl EventObjectIsMovementOverridden
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808C472
-	adds r0, r4, 0
-	bl EventObjectIsMovementOverridden
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808C472
-	adds r0, r5, 0
-	bl EventObjectClearHeldMovementIfFinished
-	adds r0, r4, 0
-	bl EventObjectClearHeldMovementIfFinished
-	ldrb r0, [r6, 0xC]
-	bl GetWalkInPlaceNormalMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl EventObjectSetHeldMovement
-	ldrb r0, [r6, 0xC]
-	bl GetWalkSlowMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetHeldMovement
-	ldr r2, =gFieldEffectArguments
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	str r0, [r2]
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	str r0, [r2, 0x4]
-	ldrb r0, [r4, 0xB]
-	lsrs r0, 4
-	str r0, [r2, 0x8]
-	ldr r3, =gSprites
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrb r0, [r0, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r2, 0xC]
-	movs r0, 0xA
-	bl FieldEffectStart
-	movs r0, 0xD6
-	bl PlaySE
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-_0808C472:
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end do_boulder_dust
-
-	thumb_func_start sub_808C484
-sub_808C484: @ 808C484
-	push {r4,r5,lr}
-	adds r4, r1, 0
-	adds r5, r2, 0
-	adds r0, r4, 0
-	bl EventObjectCheckHeldMovementStatus
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C4C6
-	adds r0, r5, 0
-	bl EventObjectCheckHeldMovementStatus
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C4C6
-	adds r0, r4, 0
-	bl EventObjectClearHeldMovementIfFinished
-	adds r0, r5, 0
-	bl EventObjectClearHeldMovementIfFinished
-	ldr r1, =gPlayerAvatar
-	movs r0, 0
-	strb r0, [r1, 0x6]
-	bl ScriptContext2_Disable
-	ldr r0, =taskFF_bump_boulder
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_0808C4C6:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808C484
-
-	thumb_func_start sub_808C4D8
-sub_808C4D8: @ 808C4D8
-	push {r4,lr}
-	ldr r4, =sub_808C4F8
-	adds r0, r4, 0
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C4D8
-
-	thumb_func_start sub_808C4F8
-sub_808C4F8: @ 808C4F8
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r5, =gUnknown_0849753C
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_0808C50A:
-	movs r0, 0x8
-	ldrsh r2, [r4, r0]
-	lsls r2, 2
-	adds r2, r5
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, =gEventObjects
-	adds r1, r0
-	ldr r2, [r2]
-	adds r0, r4, 0
-	bl _call_via_r2
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808C50A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C4F8
-
-	thumb_func_start sub_808C544
-sub_808C544: @ 808C544
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	ldr r5, =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r5, 0x6]
-	adds r0, r4, 0
-	bl EventObjectClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C5A0
-	movs r0, 0xA
-	bl PlaySE
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetJumpInPlaceMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetHeldMovement
-	ldrh r0, [r6, 0xA]
-	adds r0, 0x1
-	strh r0, [r6, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _0808C5A0
-	movs r0, 0
-	strb r0, [r5, 0x6]
-	ldrb r0, [r5, 0x1]
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r5, 0x1]
-	ldr r0, =sub_808C4F8
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_0808C5A0:
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808C544
-
-	thumb_func_start sub_808C5B0
-sub_808C5B0: @ 808C5B0
-	push {r4,lr}
-	ldr r4, =sub_808C5D0
-	adds r0, r4, 0
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C5B0
-
-	thumb_func_start sub_808C5D0
-sub_808C5D0: @ 808C5D0
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r5, =gUnknown_08497540
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_0808C5E2:
-	movs r0, 0x8
-	ldrsh r2, [r4, r0]
-	lsls r2, 2
-	adds r2, r5
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, =gEventObjects
-	adds r1, r0
-	ldr r2, [r2]
-	adds r0, r4, 0
-	bl _call_via_r2
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808C5E2
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C5D0
-
-	thumb_func_start sub_808C61C
-sub_808C61C: @ 808C61C
-	push {lr}
-	ldrh r2, [r0, 0x8]
-	adds r2, 0x1
-	strh r2, [r0, 0x8]
-	ldrb r1, [r1, 0x18]
-	lsrs r1, 4
-	strh r1, [r0, 0xA]
-	ldr r1, =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r1, 0x6]
-	bl ScriptContext2_Enable
-	movs r0, 0x2D
-	bl PlaySE
-	movs r0, 0x1
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808C61C
-
-	thumb_func_start sub_808C644
-sub_808C644: @ 808C644
-	push {r4-r6,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r1, =gUnknown_08497550
-	mov r0, sp
-	movs r2, 0x4
-	bl memcpy
-	adds r0, r5, 0
-	bl EventObjectClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C6AC
-	ldrb r0, [r5, 0x18]
-	lsrs r0, 4
-	subs r0, 0x1
-	add r0, sp
-	ldrb r6, [r0]
-	adds r0, r6, 0
-	bl GetFaceDirectionMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl EventObjectSetHeldMovement
-	ldrb r0, [r4, 0xA]
-	cmp r6, r0
-	bne _0808C68A
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-_0808C68A:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r1, 0xC
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x3
-	ble _0808C6AC
-	ldrb r0, [r4, 0xA]
-	bl GetOppositeDirection
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r6, r0
-	bne _0808C6AC
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_0808C6AC:
-	movs r0, 0
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808C644
-
-	thumb_func_start sub_808C6BC
-sub_808C6BC: @ 808C6BC
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldr r1, =gUnknown_08497554
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	adds r0, r4, 0
-	bl EventObjectClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C6EC
-	movs r1, 0xC
-	ldrsh r0, [r5, r1]
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r4, 0
-	bl EventObjectSetHeldMovement
-	movs r0, 0x1
-	strh r0, [r5, 0x8]
-_0808C6EC:
-	movs r0, 0
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808C6BC
-
-	thumb_func_start sub_808C6FC
-sub_808C6FC: @ 808C6FC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r0, r5, 0
-	bl EventObjectClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C740
-	ldrb r0, [r4, 0xA]
-	bl GetOppositeDirection
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetWalkSlowMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl EventObjectSetHeldMovement
-	bl ScriptContext2_Disable
-	ldr r1, =gPlayerAvatar
-	movs r0, 0
-	strb r0, [r1, 0x6]
-	ldr r0, =sub_808C5D0
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_0808C740:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808C6FC
-
-	thumb_func_start sub_808C750
-sub_808C750: @ 808C750
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl ScriptContext2_Enable
-	bl Overworld_ClearSavedMusic
-	bl Overworld_ChangeMusicToDefault
-	ldr r2, =gPlayerAvatar
-	ldrb r1, [r2]
-	movs r0, 0xF7
-	ands r0, r1
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r2]
-	movs r0, 0x1
-	strb r0, [r2, 0x6]
-	ldr r5, =taskFF_0805D1D4
-	adds r0, r5, 0
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	strh r4, [r1, 0x8]
-	bl _call_via_r5
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C750
-
-	thumb_func_start taskFF_0805D1D4
-taskFF_0805D1D4: @ 808C7A8
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r5, r0, r1
-	adds r0, r5, 0
-	bl EventObjectIsMovementOverridden
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C7D4
-	adds r0, r5, 0
-	bl EventObjectClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C7FC
-_0808C7D4:
-	ldrb r0, [r5, 0x1A]
-	movs r1, 0x2
-	bl sub_81555AC
-	ldr r0, =gTasks
-	lsls r4, r6, 2
-	adds r4, r6
-	lsls r4, 3
-	adds r4, r0
-	ldrb r0, [r4, 0x8]
-	bl GetJumpSpecialMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl EventObjectSetHeldMovement
-	ldr r0, =sub_808C814
-	str r0, [r4]
-_0808C7FC:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end taskFF_0805D1D4
-
-	thumb_func_start sub_808C814
-sub_808C814: @ 808C814
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r6, =gPlayerAvatar
-	ldrb r1, [r6, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl EventObjectClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808C87A
-	movs r0, 0
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetFaceDirectionMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetHeldMovement
-	movs r0, 0
-	strb r0, [r6, 0x6]
-	bl ScriptContext2_Disable
-	ldrb r1, [r4, 0x1A]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl DestroySprite
-	adds r0, r5, 0
-	bl DestroyTask
-_0808C87A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808C814
-
-	thumb_func_start StartFishing
-StartFishing: @ 808C88C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r5, =Task_Fish
-	adds r0, r5, 0
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	strh r4, [r1, 0x26]
-	bl _call_via_r5
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end StartFishing
-
-	thumb_func_start Task_Fish
-Task_Fish: @ 808C8C0
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r5, =sFishingStateFuncs
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_0808C8D2:
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808C8D2
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Task_Fish
-
-	thumb_func_start fish0
-fish0: @ 808C8F8
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptContext2_Enable
-	ldr r1, =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r1, 0x6]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fish0
-
-	thumb_func_start fish1
-fish1: @ 808C918
-	push {r4-r6,lr}
-	sub sp, 0x10
-	adds r5, r0, 0
-	ldr r1, =gUnknown_0849759C
-	mov r0, sp
-	movs r2, 0x6
-	bl memcpy
-	add r4, sp, 0x8
-	ldr r1, =gUnknown_084975A2
-	adds r0, r4, 0
-	movs r2, 0x6
-	bl memcpy
-	movs r0, 0
-	strh r0, [r5, 0x20]
-	bl Random
-	movs r2, 0x26
-	ldrsh r1, [r5, r2]
-	lsls r1, 1
-	mov r2, sp
-	adds r6, r2, r1
-	lsls r0, 16
-	lsrs r0, 16
-	adds r4, r1
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl __modsi3
-	ldrh r1, [r6]
-	adds r1, r0
-	strh r1, [r5, 0x22]
-	ldr r3, =gEventObjects
-	ldr r2, =gPlayerAvatar
-	ldrb r1, [r2, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrb r0, [r0, 0x5]
-	strh r0, [r5, 0x24]
-	ldrb r0, [r2, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	adds r4, r3
-	adds r0, r4, 0
-	bl EventObjectClearHeldMovementIfActive
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x8
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl sub_808C15C
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0
-	add sp, 0x10
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fish1
-
-	thumb_func_start fish2
-fish2: @ 808C9B0
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_808CF78
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x3B
-	ble _0808C9CC
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_0808C9CC:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end fish2
-
-	thumb_func_start fish3
-fish3: @ 808C9D4
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_819786C
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r4, 0x8]
-	strh r1, [r4, 0xA]
-	strh r1, [r4, 0xC]
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0xA
-	bl __umodsi3
-	adds r1, r0, 0
-	adds r0, r1, 0x1
-	strh r0, [r4, 0xE]
-	movs r2, 0x20
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	bne _0808CA0C
-	adds r0, r1, 0x4
-	strh r0, [r4, 0xE]
-_0808CA0C:
-	movs r1, 0xE
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x9
-	ble _0808CA18
-	movs r0, 0xA
-	strh r0, [r4, 0xE]
-_0808CA18:
-	movs r0, 0x1
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end fish3
-
-	thumb_func_start fish4
-fish4: @ 808CA20
-	push {r4,r5,lr}
-	sub sp, 0x10
-	adds r4, r0, 0
-	ldr r1, =gText_Dot
-	add r0, sp, 0xC
-	movs r2, 0x2
-	bl memcpy
-	bl sub_808CF78
-	ldrh r0, [r4, 0xA]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0xA]
-	ldr r0, =gMain
-	ldrh r0, [r0, 0x2E]
-	movs r5, 0x1
-	adds r2, r5, 0
-	ands r2, r0
-	cmp r2, 0
-	beq _0808CA64
-	movs r0, 0xB
-	strh r0, [r4, 0x8]
-	movs r1, 0x20
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _0808CA58
-	movs r0, 0xC
-	strh r0, [r4, 0x8]
-_0808CA58:
-	movs r0, 0x1
-	b _0808CAB4
-	.pool
-_0808CA64:
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, 0x13
-	ble _0808CAB2
-	strh r2, [r4, 0xA]
-	movs r3, 0xC
-	ldrsh r1, [r4, r3]
-	movs r3, 0xE
-	ldrsh r0, [r4, r3]
-	cmp r1, r0
-	blt _0808CA94
-	ldrh r0, [r4, 0x8]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x8]
-	ldrh r2, [r4, 0x20]
-	movs r3, 0x20
-	ldrsh r0, [r4, r3]
-	cmp r0, 0
-	beq _0808CA8E
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x8]
-_0808CA8E:
-	adds r0, r2, 0x1
-	strh r0, [r4, 0x20]
-	b _0808CAB2
-_0808CA94:
-	movs r0, 0xC
-	ldrsh r3, [r4, r0]
-	lsls r3, 27
-	lsrs r3, 24
-	str r5, [sp]
-	str r2, [sp, 0x4]
-	str r2, [sp, 0x8]
-	movs r0, 0
-	movs r1, 0x1
-	add r2, sp, 0xC
-	bl AddTextPrinterParameterized
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-_0808CAB2:
-	movs r0, 0
-_0808CAB4:
-	add sp, 0x10
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end fish4
-
-	thumb_func_start fish5
-fish5: @ 808CABC
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	bl sub_808CF78
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r6, 0
-	bl DoesCurrentMapHaveFishingMons
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808CADC
-	movs r0, 0xB
-	strh r0, [r5, 0x8]
-	b _0808CB5C
-_0808CADC:
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	movs r1, 0x6
-	bl GetMonData
-	cmp r0, 0
-	bne _0808CB14
-	adds r0, r4, 0
-	bl GetMonAbility
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x15
-	beq _0808CAFC
-	cmp r0, 0x3C
-	bne _0808CB14
-_0808CAFC:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x64
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xE
-	bls _0808CB14
-	movs r6, 0x1
-_0808CB14:
-	cmp r6, 0
-	bne _0808CB32
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _0808CB30
-	movs r0, 0xB
-	strh r0, [r5, 0x8]
-	b _0808CB32
-	.pool
-_0808CB30:
-	movs r6, 0x1
-_0808CB32:
-	cmp r6, 0x1
-	bne _0808CB5C
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	bl GetPlayerFacingDirection
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFishingBiteDirectionAnimNum
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-_0808CB5C:
-	movs r0, 0x1
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fish5
-
-	thumb_func_start fish6
-fish6: @ 808CB6C
-	push {r4,r5,lr}
-	sub sp, 0xC
-	adds r5, r0, 0
-	bl sub_808CF78
-	ldr r2, =gText_OhABite
-	movs r0, 0x11
-	str r0, [sp]
-	movs r4, 0
-	str r4, [sp, 0x4]
-	str r4, [sp, 0x8]
-	movs r0, 0
-	movs r1, 0x1
-	movs r3, 0
-	bl AddTextPrinterParameterized
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	strh r4, [r5, 0xA]
-	movs r0, 0
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fish6
-
-	thumb_func_start fish7
-fish7: @ 808CBA4
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, =sReelTimeouts
-	mov r0, sp
-	movs r2, 0x6
-	bl memcpy
-	bl sub_808CF78
-	ldrh r1, [r4, 0xA]
-	adds r1, 0x1
-	strh r1, [r4, 0xA]
-	movs r2, 0x26
-	ldrsh r0, [r4, r2]
-	lsls r0, 1
-	add r0, sp
-	lsls r1, 16
-	asrs r1, 16
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	cmp r1, r0
-	blt _0808CBDC
-	movs r0, 0xC
-	b _0808CBEC
-	.pool
-_0808CBDC:
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0808CBEE
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-_0808CBEC:
-	strh r0, [r4, 0x8]
-_0808CBEE:
-	movs r0, 0
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fish7
-
-	thumb_func_start fish8
-fish8: @ 808CBFC
-	push {r4,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	ldr r1, =gUnknown_084975B0
-	mov r0, sp
-	movs r2, 0xC
-	bl memcpy
-	bl sub_808CF78
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x20
-	ldrsh r1, [r4, r0]
-	movs r2, 0x22
-	ldrsh r0, [r4, r2]
-	cmp r1, r0
-	blt _0808CC52
-	cmp r1, 0x1
-	bgt _0808CC56
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x64
-	bl __umodsi3
-	movs r3, 0x20
-	ldrsh r2, [r4, r3]
-	lsls r2, 1
-	movs r3, 0x26
-	ldrsh r1, [r4, r3]
-	lsls r1, 2
-	adds r2, r1
-	mov r3, sp
-	adds r1, r3, r2
-	movs r2, 0
-	ldrsh r1, [r1, r2]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r1, r0
-	ble _0808CC56
-_0808CC52:
-	movs r0, 0x3
-	strh r0, [r4, 0x8]
-_0808CC56:
-	movs r0, 0
-	add sp, 0xC
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fish8
-
-	thumb_func_start fish9
-fish9: @ 808CC64
-	push {r4,r5,lr}
-	sub sp, 0x10
-	adds r4, r0, 0
-	bl sub_808CF78
-	movs r0, 0
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r2, =gText_PokemonOnHook
-	movs r5, 0
-	str r5, [sp]
-	movs r0, 0x2
-	str r0, [sp, 0x4]
-	movs r0, 0x1
-	str r0, [sp, 0x8]
-	movs r0, 0x3
-	str r0, [sp, 0xC]
-	movs r0, 0
-	movs r1, 0x1
-	movs r3, 0x1
-	bl AddTextPrinterParameterized2
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	strh r5, [r4, 0xA]
-	movs r0, 0
-	add sp, 0x10
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fish9
-
-	thumb_func_start fishA_wait_for_a_pressed
-fishA_wait_for_a_pressed: @ 808CCA8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r0, 0
-	movs r1, 0xA
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	bne _0808CCBC
-	bl sub_808CF78
-_0808CCBC:
-	bl RunTextPrinters
-	movs r1, 0xA
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	bne _0808CD58
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	lsrs r6, r0, 16
-	cmp r6, 0
-	bne _0808CD50
-	ldr r7, =gPlayerAvatar
-	ldrb r0, [r7, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	mov r8, r0
-	add r4, r8
-	ldrh r1, [r5, 0x24]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r1, [r4, 0x18]
-	lsrs r1, 4
-	adds r0, r4, 0
-	bl EventObjectTurn
-	ldrb r1, [r7]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _0808CD1A
-	ldrb r0, [r7, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	add r1, r8
-	ldrb r0, [r1, 0x1A]
-	movs r1, 0
-	movs r2, 0
-	bl sub_8155604
-_0808CD1A:
-	ldr r2, =gSprites
-	ldrb r1, [r7, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r6, [r0, 0x24]
-	ldrb r1, [r7, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r6, [r0, 0x26]
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_8197434
-	ldrh r0, [r5, 0xA]
-	adds r0, 0x1
-	strh r0, [r5, 0xA]
-	b _0808CD80
-	.pool
-_0808CD50:
-	movs r1, 0xA
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	beq _0808CD80
-_0808CD58:
-	ldr r1, =gPlayerAvatar
-	movs r0, 0
-	strb r0, [r1, 0x6]
-	bl ScriptContext2_Disable
-	ldrh r0, [r5, 0x26]
-	lsls r0, 24
-	lsrs r0, 24
-	bl FishingWildEncounter
-	movs r0, 0x1
-	bl sub_80ED950
-	ldr r0, =Task_Fish
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_0808CD80:
-	movs r0, 0
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fishA_wait_for_a_pressed
-
-	thumb_func_start fishB
-fishB: @ 808CD94
-	push {r4,r5,lr}
-	sub sp, 0x10
-	adds r5, r0, 0
-	bl sub_808CF78
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	bl GetPlayerFacingDirection
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFishingNoCatchDirectionAnimNum
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-	movs r0, 0
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r2, =gText_NotEvenANibble
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x2
-	str r0, [sp, 0x4]
-	movs r0, 0x1
-	str r0, [sp, 0x8]
-	movs r0, 0x3
-	str r0, [sp, 0xC]
-	movs r0, 0
-	movs r1, 0x1
-	movs r3, 0x1
-	bl AddTextPrinterParameterized2
-	movs r0, 0xD
-	strh r0, [r5, 0x8]
-	movs r0, 0x1
-	add sp, 0x10
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fishB
-
-	thumb_func_start fishC
-fishC: @ 808CE04
-	push {r4,r5,lr}
-	sub sp, 0x10
-	adds r5, r0, 0
-	bl sub_808CF78
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	bl GetPlayerFacingDirection
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFishingNoCatchDirectionAnimNum
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-	movs r0, 0
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r2, =gText_ItGotAway
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x2
-	str r0, [sp, 0x4]
-	movs r0, 0x1
-	str r0, [sp, 0x8]
-	movs r0, 0x3
-	str r0, [sp, 0xC]
-	movs r0, 0
-	movs r1, 0x1
-	movs r3, 0x1
-	bl AddTextPrinterParameterized2
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0x1
-	add sp, 0x10
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fishC
-
-	thumb_func_start fishD
-fishD: @ 808CE74
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_808CF78
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end fishD
-
-	thumb_func_start fishE
-fishE: @ 808CE8C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	bl sub_808CF78
-	ldr r7, =gSprites
-	ldr r5, =gPlayerAvatar
-	ldrb r0, [r5, 0x4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r7
-	adds r1, 0x3F
-	ldrb r0, [r1]
-	lsls r0, 27
-	cmp r0, 0
-	bge _0808CF12
-	ldrb r0, [r5, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gEventObjects
-	mov r8, r0
-	add r4, r8
-	ldrh r1, [r6, 0x24]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectSetGraphicsId
-	ldrb r1, [r4, 0x18]
-	lsrs r1, 4
-	adds r0, r4, 0
-	bl EventObjectTurn
-	ldrb r1, [r5]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _0808CEF2
-	ldrb r0, [r5, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	add r1, r8
-	ldrb r0, [r1, 0x1A]
-	movs r1, 0
-	movs r2, 0
-	bl sub_8155604
-_0808CEF2:
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	movs r2, 0
-	strh r2, [r0, 0x24]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	strh r2, [r0, 0x26]
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-_0808CF12:
-	movs r0, 0
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fishE
-
-	thumb_func_start fishF
-fishF: @ 808CF2C
-	push {lr}
-	bl RunTextPrinters
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0
-	bne _0808CF68
-	ldr r0, =gPlayerAvatar
-	strb r1, [r0, 0x6]
-	bl ScriptContext2_Disable
-	bl UnfreezeEventObjects
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_8197434
-	movs r0, 0
-	bl sub_80ED950
-	ldr r0, =Task_Fish
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_0808CF68:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end fishF
-
-	thumb_func_start sub_808CF78
-sub_808CF78: @ 808CF78
-	push {r4-r7,lr}
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl AnimateSprite
-	movs r0, 0
-	strh r0, [r4, 0x24]
-	strh r0, [r4, 0x26]
-	adds r0, r4, 0
-	adds r0, 0x2B
-	ldrb r5, [r0]
-	movs r0, 0x2A
-	adds r0, r4
-	mov r12, r0
-	ldrb r0, [r0]
-	ldr r1, [r4, 0x8]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	lsls r6, r5, 2
-	adds r0, r6, r0
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r7, 0x1
-	negs r7, r7
-	cmp r0, r7
-	beq _0808CFEA
-	adds r3, r4, 0
-	adds r3, 0x2C
-	ldrb r2, [r3]
-	lsls r1, r2, 26
-	lsrs r1, 26
-	adds r1, 0x1
-	movs r0, 0x3F
-	ands r1, r0
-	movs r0, 0x40
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	mov r1, r12
-	ldrb r0, [r1]
-	ldr r1, [r4, 0x8]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	adds r0, r6, r0
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, r7
-	bne _0808CFF0
-_0808CFEA:
-	subs r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-_0808CFF0:
-	adds r0, r4, 0
-	adds r0, 0x2A
-	ldrb r0, [r0]
-	ldr r1, [r4, 0x8]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, [r0]
-	lsls r0, r5, 2
-	adds r0, r1
-	ldrb r5, [r0]
-	subs r0, r5, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x2
-	bhi _0808D022
-	movs r0, 0x8
-	strh r0, [r4, 0x24]
-	bl GetPlayerFacingDirection
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _0808D022
-	ldr r0, =0x0000fff8
-	strh r0, [r4, 0x24]
-_0808D022:
-	cmp r5, 0x5
-	bne _0808D02A
-	ldr r0, =0x0000fff8
-	strh r0, [r4, 0x26]
-_0808D02A:
-	adds r0, r5, 0
-	subs r0, 0xA
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bhi _0808D03A
-	movs r0, 0x8
-	strh r0, [r4, 0x26]
-_0808D03A:
-	ldr r3, =gPlayerAvatar
-	ldrb r1, [r3]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _0808D05E
-	ldr r2, =gEventObjects
-	ldrb r1, [r3, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x1A]
-	movs r1, 0x26
-	ldrsh r2, [r4, r1]
-	movs r1, 0x1
-	bl sub_8155604
-_0808D05E:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808CF78
-
-	thumb_func_start sub_808D074
-sub_808D074: @ 808D074
-	ldr r1, =gUnknown_0203734C
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_808D074
-
-	thumb_func_start sub_808D080
-sub_808D080: @ 808D080
-	push {lr}
-	ldr r1, =gUnknown_0203734C
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _0808D08C
-	movs r0, 0x1
-_0808D08C:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808D080
-
-	thumb_func_start sub_808D094
-sub_808D094: @ 808D094
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r2, r0, 0
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r4, r0, r1
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r7, r0, r1
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r5, r0, r1
-	movs r0, 0
-	ldrsh r6, [r5, r0]
-	cmp r6, 0x1
-	beq _0808D14A
-	cmp r6, 0x1
-	bgt _0808D0E8
-	cmp r6, 0
-	beq _0808D0EE
-	b _0808D18A
-	.pool
-_0808D0E8:
-	cmp r6, 0x2
-	beq _0808D184
-	b _0808D18A
-_0808D0EE:
-	adds r0, r4, 0
-	bl EventObjectClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808D18A
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl sub_808D074
-	movs r1, 0
-	mov r8, r1
-	strh r6, [r5, 0x2]
-	movs r0, 0x1
-	strh r0, [r5, 0x4]
-	ldrh r0, [r7, 0x26]
-	ldrh r2, [r7, 0x22]
-	adds r0, r2
-	lsls r0, 4
-	strh r0, [r5, 0x6]
-	strh r6, [r7, 0x26]
-	bl CameraObjectReset2
-	ldrb r0, [r4, 0x3]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4, 0x3]
-	ldrb r1, [r7, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r7, 0x5]
-	adds r0, r7, 0
-	adds r0, 0x43
-	mov r1, r8
-	strb r1, [r0]
-	adds r2, r7, 0
-	adds r2, 0x42
-	ldrb r1, [r2]
-	movs r0, 0x3F
-	ands r0, r1
-	strb r0, [r2]
-	ldrh r0, [r5]
-	adds r0, 0x1
-	strh r0, [r5]
-_0808D14A:
-	adds r1, r5, 0x2
-	adds r0, r4, 0
-	bl sub_808D38C
-	ldrh r0, [r5, 0x6]
-	ldrh r1, [r5, 0x4]
-	subs r0, r1
-	strh r0, [r5, 0x6]
-	adds r1, 0x3
-	strh r1, [r5, 0x4]
-	lsls r0, 16
-	asrs r0, 20
-	strh r0, [r7, 0x22]
-	movs r2, 0x22
-	ldrsh r1, [r7, r2]
-	ldr r0, =gTotalCameraPixelOffsetY
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	adds r1, r0
-	movs r0, 0x20
-	negs r0, r0
-	cmp r1, r0
-	bge _0808D18A
-	ldrh r0, [r5]
-	adds r0, 0x1
-	strh r0, [r5]
-	b _0808D18A
-	.pool
-_0808D184:
-	adds r0, r2, 0
-	bl DestroyTask
-_0808D18A:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808D094
-
-	thumb_func_start sub_808D194
-sub_808D194: @ 808D194
-	push {r4,lr}
-	ldr r4, =sub_808D1FC
-	adds r0, r4, 0
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808D194
-
-	thumb_func_start sub_808D1B4
-sub_808D1B4: @ 808D1B4
-	push {lr}
-	ldr r0, =sub_808D1FC
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808D1B4
-
-	thumb_func_start sub_808D1C8
-sub_808D1C8: @ 808D1C8
-	push {r4,lr}
-	ldr r4, =sub_808D094
-	adds r0, r4, 0
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808D1C8
-
-	thumb_func_start sub_808D1E8
-sub_808D1E8: @ 808D1E8
-	push {lr}
-	ldr r0, =sub_808D094
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808D1E8
-
-	thumb_func_start sub_808D1FC
-sub_808D1FC: @ 808D1FC
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r4, r0, r1
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r7, r0, r1
-	mov r1, r8
-	lsls r0, r1, 2
-	add r0, r8
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r5, r0, r1
-	movs r2, 0
-	ldrsh r6, [r5, r2]
-	cmp r6, 0x1
-	beq _0808D2DE
-	cmp r6, 0x1
-	bgt _0808D254
-	cmp r6, 0
-	beq _0808D25E
-	b _0808D37E
-	.pool
-_0808D254:
-	cmp r6, 0x2
-	beq _0808D31C
-	cmp r6, 0x3
-	beq _0808D33A
-	b _0808D37E
-_0808D25E:
-	bl sub_808D080
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0xA]
-	ldr r1, =gUnknown_084975BC
-	movs r3, 0xA
-	ldrsh r0, [r5, r3]
-	adds r0, r1
-	ldrb r0, [r0]
-	bl GetFaceDirectionMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl EventObjectForceSetHeldMovement
-	movs r0, 0
-	mov r9, r0
-	strh r6, [r5, 0x2]
-	movs r0, 0x74
-	strh r0, [r5, 0x4]
-	ldrh r0, [r7, 0x22]
-	strh r0, [r5, 0x8]
-	ldrb r0, [r7, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	strh r0, [r5, 0xC]
-	movs r1, 0x43
-	adds r1, r7
-	mov r8, r1
-	ldrb r0, [r1]
-	strh r0, [r5, 0xE]
-	ldrh r0, [r7, 0x26]
-	adds r0, 0x20
-	negs r0, r0
-	lsls r0, 4
-	strh r0, [r5, 0x6]
-	strh r6, [r7, 0x26]
-	bl CameraObjectReset2
-	ldrb r0, [r4, 0x3]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r4, 0x3]
-	ldrb r1, [r7, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r7, 0x5]
-	mov r3, r9
-	mov r2, r8
-	strb r3, [r2]
-	adds r2, r7, 0
-	adds r2, 0x42
-	ldrb r1, [r2]
-	movs r0, 0x3F
-	ands r0, r1
-	strb r0, [r2]
-	ldrh r0, [r5]
-	adds r0, 0x1
-	strh r0, [r5]
-_0808D2DE:
-	adds r1, r5, 0x2
-	adds r0, r4, 0
-	bl sub_808D38C
-	ldrh r0, [r5, 0x4]
-	ldrh r2, [r5, 0x6]
-	adds r1, r0, r2
-	strh r1, [r5, 0x6]
-	subs r0, 0x3
-	strh r0, [r5, 0x4]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x3
-	bgt _0808D2FE
-	movs r0, 0x4
-	strh r0, [r5, 0x4]
-_0808D2FE:
-	ldrh r0, [r5, 0x6]
-	lsls r0, 16
-	asrs r0, 20
-	strh r0, [r7, 0x22]
-	ldrh r2, [r5, 0x8]
-	movs r3, 0x8
-	ldrsh r1, [r5, r3]
-	cmp r0, r1
-	blt _0808D37E
-	strh r2, [r7, 0x22]
-	movs r0, 0
-	strh r0, [r5, 0x10]
-	b _0808D332
-	.pool
-_0808D31C:
-	adds r1, r5, 0x2
-	adds r0, r4, 0
-	bl sub_808D38C
-	ldrh r0, [r5, 0x10]
-	adds r0, 0x1
-	strh r0, [r5, 0x10]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x8
-	ble _0808D37E
-_0808D332:
-	ldrh r0, [r5]
-	adds r0, 0x1
-	strh r0, [r5]
-	b _0808D37E
-_0808D33A:
-	movs r0, 0xA
-	ldrsh r6, [r5, r0]
-	adds r1, r5, 0x2
-	adds r0, r4, 0
-	bl sub_808D38C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r6, r0
-	bne _0808D37E
-	ldrb r1, [r4, 0x3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x3]
-	movs r0, 0x3
-	ldrb r1, [r5, 0xC]
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r7, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r7, 0x5]
-	ldrh r1, [r5, 0xE]
-	adds r0, r7, 0
-	adds r0, 0x43
-	strb r1, [r0]
-	bl CameraObjectReset1
-	mov r0, r8
-	bl DestroyTask
-_0808D37E:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808D1FC
-
-	thumb_func_start sub_808D38C
-sub_808D38C: @ 808D38C
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r6, r1, 0
-	ldrh r1, [r6]
-	movs r2, 0
-	ldrsh r0, [r6, r2]
-	cmp r0, 0x7
-	bgt _0808D3A8
-	adds r0, r1, 0x1
-	strh r0, [r6]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x7
-	ble _0808D3E4
-_0808D3A8:
-	adds r0, r5, 0
-	bl EventObjectCheckHeldMovementStatus
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808D3E4
-	ldr r4, =gUnknown_084975BC
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	adds r0, r4
-	ldrb r0, [r0]
-	bl GetFaceDirectionMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl EventObjectForceSetHeldMovement
-	movs r0, 0
-	strh r0, [r6]
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	adds r0, r4
-	ldrb r0, [r0]
-	b _0808D3EA
-	.pool
-_0808D3E4:
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-_0808D3EA:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808D38C
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/macros/map.inc b/asm/macros/map.inc
index 23806b4cc..9a028b2e5 100644
--- a/asm/macros/map.inc
+++ b/asm/macros/map.inc
@@ -65,7 +65,7 @@
 	.endm
 
 	.macro bg_hidden_item_event x, y, height, item, flag
-	bg_event \x, \y, \height, 7, \item, \flag, 0
+	bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0
 	.endm
 
 	.macro bg_secret_base_event x, y, height, secret_base_id
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 67fdab266..53a66378c 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -10499,7 +10499,7 @@ sub_81B5958: @ 81B5958
 	thumb_func_start sub_81B5974
 sub_81B5974: @ 81B5974
 	push {lr}
-	bl sub_809D1E8
+	bl TrySetDiveWarp
 	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
diff --git a/asm/pokenav.s b/asm/pokenav.s
index cfad3feda..a8d3c838f 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -30184,7 +30184,7 @@ _081D6670:
 	asrs r0, 1
 	lsls r0, 1
 	subs r4, r0
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	cmp r0, 0
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index 33ace5757..415ebfc0c 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -8335,7 +8335,7 @@ _08019C5A:
 	beq _08019CE6
 	mov r0, sp
 	adds r1, r4, 0
-	bl plaer_get_pos_including_state_based_drift
+	bl player_get_pos_including_state_based_drift
 	mov r0, sp
 	movs r1, 0
 	ldrsh r2, [r0, r1]
@@ -8881,7 +8881,7 @@ sub_801A064: @ 801A064
 	adds r5, 0x6
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl plaer_get_pos_including_state_based_drift
+	bl player_get_pos_including_state_based_drift
 	lsls r0, r7, 2
 	adds r0, r7
 	subs r0, 0x38
diff --git a/asm/script_menu.s b/asm/script_menu.s
index bb145e78d..703c052f3 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -718,7 +718,7 @@ _080E23AC:
 	adds r4, 0x1
 	cmp r4, 0x3
 	bls _080E23AC
-	ldr r6, =0x00000864
+	ldr r6, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	adds r0, r6, 0
 	bl FlagGet
 	lsls r0, 24
diff --git a/asm/shop.s b/asm/shop.s
deleted file mode 100644
index 56658c4ff..000000000
--- a/asm/shop.s
+++ /dev/null
@@ -1,1821 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start BuyMenuDrawMapMetatile
-@ void BuyMenuDrawMapMetatile(u16 x, u16 y, u16 *src, u8 metatileLayerType)
-BuyMenuDrawMapMetatile: @ 80E0670
-	push {r4-r7,lr}
-	adds r7, r2, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r2, r3, 0
-	lsls r0, 17
-	lsrs r5, r0, 16
-	lsls r1, 22
-	lsrs r1, 16
-	cmp r3, 0x1
-	beq _080E06C0
-	cmp r3, 0x1
-	bgt _080E0690
-	cmp r3, 0
-	beq _080E0696
-	b _080E0728
-_080E0690:
-	cmp r2, 0x2
-	beq _080E06F8
-	b _080E0728
-_080E0696:
-	ldr r6, =gShopDataPtr
-	ldr r0, [r6]
-	movs r2, 0xC0
-	lsls r2, 5
-	adds r0, r2
-	lsls r5, 16
-	asrs r5, 16
-	lsls r4, r1, 16
-	asrs r4, 16
-	adds r1, r5, 0
-	adds r2, r4, 0
-	adds r3, r7, 0
-	bl BuyMenuDrawMapMetatileLayer
-	ldr r0, [r6]
-	movs r1, 0x80
-	lsls r1, 4
-	b _080E06E2
-	.pool
-_080E06C0:
-	ldr r6, =gShopDataPtr
-	ldr r0, [r6]
-	movs r2, 0x80
-	lsls r2, 5
-	adds r0, r2
-	lsls r5, 16
-	asrs r5, 16
-	lsls r4, r1, 16
-	asrs r4, 16
-	adds r1, r5, 0
-	adds r2, r4, 0
-	adds r3, r7, 0
-	bl BuyMenuDrawMapMetatileLayer
-	ldr r0, [r6]
-	movs r1, 0xC0
-	lsls r1, 5
-_080E06E2:
-	adds r0, r1
-	adds r3, r7, 0
-	adds r3, 0x8
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl BuyMenuDrawMapMetatileLayer
-	b _080E0728
-	.pool
-_080E06F8:
-	ldr r6, =gShopDataPtr
-	ldr r0, [r6]
-	movs r2, 0x80
-	lsls r2, 5
-	adds r0, r2
-	lsls r5, 16
-	asrs r5, 16
-	lsls r4, r1, 16
-	asrs r4, 16
-	adds r1, r5, 0
-	adds r2, r4, 0
-	adds r3, r7, 0
-	bl BuyMenuDrawMapMetatileLayer
-	ldr r0, [r6]
-	movs r1, 0x80
-	lsls r1, 4
-	adds r0, r1
-	adds r3, r7, 0
-	adds r3, 0x8
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl BuyMenuDrawMapMetatileLayer
-_080E0728:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuDrawMapMetatile
-
-	thumb_func_start BuyMenuDrawMapMetatileLayer
-@ int BuyMenuDrawMapMetatileLayer(void *tilemapBuffer, s16 xOffset, s16 yOffset, u16 *src)
-BuyMenuDrawMapMetatileLayer: @ 80E0734
-	lsls r1, 16
-	asrs r1, 16
-	lsls r2, 16
-	asrs r2, 16
-	adds r1, r2
-	lsls r1, 1
-	adds r1, r0
-	ldrh r0, [r3]
-	strh r0, [r1]
-	ldrh r0, [r3, 0x2]
-	strh r0, [r1, 0x2]
-	adds r2, r1, 0
-	adds r2, 0x40
-	ldrh r0, [r3, 0x4]
-	strh r0, [r2]
-	adds r1, 0x42
-	ldrh r0, [r3, 0x6]
-	strh r0, [r1]
-	bx lr
-	thumb_func_end BuyMenuDrawMapMetatileLayer
-
-	thumb_func_start BuyMenuCollectEventObjectData
-@ void BuyMenuCollectEventObjectData()
-BuyMenuCollectEventObjectData: @ 80E075C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x18
-	movs r0, 0
-	mov r8, r0
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl GetXYCoordsOneStepInFrontOfPlayer
-	movs r7, 0
-	ldr r5, =gShopDataPtr
-	ldr r3, =0x00002010
-	movs r2, 0x10
-_080E0780:
-	ldr r1, [r5]
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 1
-	adds r1, r3
-	adds r1, r0
-	strh r2, [r1]
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0xF
-	bls _080E0780
-	movs r7, 0
-	str r4, [sp, 0x8]
-	ldr r1, =gShopDataPtr
-	mov r9, r1
-	mov r2, sp
-	str r2, [sp, 0x4]
-_080E07A4:
-	movs r3, 0
-	adds r4, r7, 0x1
-	str r4, [sp, 0xC]
-_080E07AA:
-	ldr r1, =0x0000fffc
-	adds r0, r3, r1
-	ldr r2, [sp, 0x4]
-	ldrh r2, [r2]
-	adds r0, r2
-	lsls r0, 16
-	asrs r0, 16
-	ldr r4, =0x0000fffe
-	adds r1, r7, r4
-	ldr r2, [sp, 0x8]
-	ldrh r2, [r2]
-	adds r1, r2
-	lsls r1, 16
-	asrs r1, 16
-	str r3, [sp, 0x10]
-	bl GetEventObjectIdByXY
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r3, [sp, 0x10]
-	cmp r6, 0x10
-	beq _080E08C2
-	mov r4, r9
-	ldr r1, [r4]
-	mov r0, r8
-	lsls r4, r0, 2
-	adds r0, r4, r0
-	lsls r5, r0, 1
-	ldr r2, =0x00002010
-	adds r0, r1, r2
-	adds r0, r5
-	movs r2, 0
-	mov r10, r2
-	strh r6, [r0]
-	ldr r2, =0x00002012
-	adds r0, r1, r2
-	adds r0, r5
-	strh r3, [r0]
-	ldr r0, =0x00002014
-	adds r1, r0
-	adds r1, r5
-	strh r7, [r1]
-	ldr r1, [sp, 0x4]
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	subs r1, r3, 0x4
-	adds r0, r1
-	ldr r1, [sp, 0x8]
-	movs r2, 0
-	ldrsh r1, [r1, r2]
-	mov r12, r1
-	subs r1, r7, 0x2
-	add r1, r12
-	str r3, [sp, 0x10]
-	bl MapGridGetMetatileLayerTypeAt
-	mov r1, r9
-	ldr r2, [r1]
-	ldr r1, =0x00002018
-	adds r1, r2
-	mov r12, r1
-	add r12, r5
-	lsls r0, 24
-	lsrs r0, 24
-	mov r1, r12
-	strh r0, [r1]
-	ldr r1, =gEventObjects
-	lsls r0, r6, 3
-	adds r0, r6
-	lsls r0, 2
-	adds r0, r1
-	ldrb r0, [r0, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	ldr r3, [sp, 0x10]
-	cmp r0, 0x2
-	beq _080E0884
-	cmp r0, 0x2
-	bgt _080E0870
-	cmp r0, 0x1
-	beq _080E0876
-	b _080E08A4
-	.pool
-_080E0870:
-	cmp r0, 0x3
-	beq _080E0894
-	b _080E08A4
-_080E0876:
-	ldr r4, =0x00002016
-	adds r0, r2, r4
-	adds r0, r5
-	mov r1, r10
-	b _080E08B6
-	.pool
-_080E0884:
-	ldr r4, =0x00002016
-	adds r0, r2, r4
-	adds r0, r5
-	movs r1, 0x1
-	b _080E08B6
-	.pool
-_080E0894:
-	ldr r1, =0x00002016
-	adds r0, r2, r1
-	adds r0, r5
-	movs r1, 0x2
-	b _080E08B6
-	.pool
-_080E08A4:
-	mov r2, r9
-	ldr r0, [r2]
-	mov r2, r8
-	adds r1, r4, r2
-	lsls r1, 1
-	ldr r4, =0x00002016
-	adds r0, r4
-	adds r0, r1
-	movs r1, 0x3
-_080E08B6:
-	strh r1, [r0]
-	mov r0, r8
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-_080E08C2:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x6
-	bhi _080E08CE
-	b _080E07AA
-_080E08CE:
-	ldr r1, [sp, 0xC]
-	lsls r0, r1, 24
-	lsrs r7, r0, 24
-	cmp r7, 0x4
-	bhi _080E08DA
-	b _080E07A4
-_080E08DA:
-	add sp, 0x18
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuCollectEventObjectData
-
-	thumb_func_start BuyMenuDrawEventObjects
-@ void BuyMenuDrawEventObjects()
-BuyMenuDrawEventObjects: @ 80E08F0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	movs r7, 0
-	ldr r0, =gShopDataPtr
-	mov r8, r0
-	ldr r1, =gEventObjects
-	mov r10, r1
-	ldr r2, =gSprites
-	mov r9, r2
-_080E090A:
-	mov r3, r8
-	ldr r0, [r3]
-	lsls r1, r7, 2
-	adds r1, r7
-	lsls r5, r1, 1
-	ldr r4, =0x00002010
-	adds r0, r4
-	adds r1, r0, r5
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x10
-	beq _080E09D8
-	adds r1, r0, 0
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	add r0, r10
-	ldrb r0, [r0, 0x5]
-	bl GetEventObjectGraphicsInfo
-	mov r4, r8
-	ldr r3, [r4]
-	ldr r2, =0x00002010
-	adds r1, r3, r2
-	adds r1, r5
-	movs r4, 0
-	ldrsh r2, [r1, r4]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	add r1, r10
-	ldrb r4, [r1, 0x5]
-	ldr r2, =0x00002012
-	adds r1, r3, r2
-	adds r1, r5
-	ldrh r2, [r1]
-	lsls r2, 4
-	adds r2, 0x8
-	lsls r2, 16
-	asrs r2, 16
-	ldr r1, =0x00002014
-	adds r3, r1
-	adds r3, r5
-	ldrh r3, [r3]
-	lsls r3, 4
-	movs r1, 0xA
-	ldrsh r0, [r0, r1]
-	lsrs r1, r0, 31
-	adds r0, r1
-	asrs r0, 1
-	subs r0, 0x30
-	subs r3, r0
-	lsls r3, 16
-	asrs r3, 16
-	movs r0, 0x2
-	str r0, [sp]
-	adds r0, r4, 0
-	ldr r1, =SpriteCallbackDummy
-	bl AddPseudoEventObject
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r6, r4, 0
-	ldr r2, =0x00002010
-	adds r1, r5, r2
-	mov r3, r8
-	ldr r0, [r3]
-	adds r0, r1
-	bl BuyMenuCheckIfEventObjectOverlapsMenuBg
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080E09C0
-	lsls r2, r4, 4
-	adds r2, r4
-	lsls r2, 2
-	add r2, r9
-	adds r2, 0x42
-	ldrb r0, [r2]
-	movs r4, 0x40
-	negs r4, r4
-	adds r1, r4, 0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	movs r1, 0x3F
-	ands r0, r1
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r2]
-_080E09C0:
-	lsls r0, r6, 4
-	adds r0, r6
-	lsls r0, 2
-	add r0, r9
-	mov r2, r8
-	ldr r1, [r2]
-	ldr r3, =0x00002016
-	adds r1, r3
-	adds r1, r5
-	ldrb r1, [r1]
-	bl StartSpriteAnim
-_080E09D8:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0xF
-	bls _080E090A
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuDrawEventObjects
-
-	thumb_func_start BuyMenuCheckIfEventObjectOverlapsMenuBg
-BuyMenuCheckIfEventObjectOverlapsMenuBg: @ 80E0A14
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x2
-	ldrsh r0, [r4, r1]
-	movs r2, 0x4
-	ldrsh r1, [r4, r2]
-	adds r1, 0x2
-	bl BuyMenuCheckForOverlapWithMenuBg
-	lsls r0, 24
-	cmp r0, 0
-	bne _080E0A38
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _080E0A38
-	movs r0, 0x1
-	b _080E0A3A
-_080E0A38:
-	movs r0, 0
-_080E0A3A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end BuyMenuCheckIfEventObjectOverlapsMenuBg
-
-	thumb_func_start BuyMenuCopyMenuBgToBg1TilemapBuffer
-@ void BuyMenuCopyMenuBgToBg1TilemapBuffer()
-BuyMenuCopyMenuBgToBg1TilemapBuffer: @ 80E0A40
-	push {r4-r6,lr}
-	ldr r0, =gShopDataPtr
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 4
-	adds r4, r0, r1
-	adds r3, r0, 0
-	movs r1, 0
-	ldr r0, =0x0000c3e3
-	adds r6, r0, 0
-	ldr r5, =0x000003ff
-_080E0A56:
-	lsls r0, r1, 16
-	asrs r2, r0, 16
-	lsls r1, r2, 1
-	adds r0, r1, r3
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _080E0A6A
-	adds r1, r4
-	adds r0, r6
-	strh r0, [r1]
-_080E0A6A:
-	adds r0, r2, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	asrs r0, 16
-	cmp r0, r5
-	ble _080E0A56
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuCopyMenuBgToBg1TilemapBuffer
-
-	thumb_func_start BuyMenuCheckForOverlapWithMenuBg
-@ bool8 BuyMenuCheckForOverlapWithMenuBg(u16 x, u16 y)
-BuyMenuCheckForOverlapWithMenuBg: @ 80E0A88
-	push {lr}
-	ldr r2, =gShopDataPtr
-	ldr r2, [r2]
-	lsls r0, 1
-	lsls r1, 6
-	adds r1, r0
-	lsls r1, 1
-	adds r1, r2
-	ldrh r0, [r1]
-	cmp r0, 0
-	bne _080E0AC0
-	adds r0, r1, 0
-	adds r0, 0x40
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _080E0AC0
-	ldrh r0, [r1, 0x2]
-	cmp r0, 0
-	bne _080E0AC0
-	adds r0, r1, 0
-	adds r0, 0x42
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _080E0AC0
-	movs r0, 0x1
-	b _080E0AC2
-	.pool
-_080E0AC0:
-	movs r0, 0
-_080E0AC2:
-	pop {r1}
-	bx r1
-	thumb_func_end BuyMenuCheckForOverlapWithMenuBg
-
-	thumb_func_start Task_BuyMenu
-@ void Task_BuyMenu(u8 taskId)
-Task_BuyMenu: @ 80E0AC8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r4, r0, r1
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _080E0AEA
-	b _080E0C8E
-_080E0AEA:
-	ldrb r0, [r4, 0xE]
-	bl ListMenuHandleInputGetItemId
-	adds r5, r0, 0
-	ldrb r0, [r4, 0xE]
-	ldr r7, =gShopDataPtr
-	ldr r2, [r7]
-	ldr r3, =0x00002008
-	adds r1, r2, r3
-	subs r3, 0x2
-	adds r2, r3
-	bl ListMenuGetScrollAndRow
-	movs r0, 0x2
-	negs r0, r0
-	cmp r5, r0
-	beq _080E0B24
-	adds r0, 0x1
-	cmp r5, r0
-	bne _080E0B32
-	b _080E0C8E
-	.pool
-_080E0B24:
-	movs r0, 0x5
-	bl PlaySE
-	adds r0, r6, 0
-	bl ExitBuyMenu
-	b _080E0C8E
-_080E0B32:
-	movs r0, 0x5
-	bl PlaySE
-	strh r5, [r4, 0xA]
-	movs r0, 0x2
-	bl ClearWindowTilemap
-	bl BuyMenuRemoveScrollIndicatorArrows
-	ldrb r0, [r4, 0xE]
-	movs r1, 0x2
-	bl BuyMenuPrintCursor
-	ldr r0, =gMartInfo
-	ldrb r0, [r0, 0xF]
-	cmp r0, 0
-	bne _080E0B80
-	lsls r0, r5, 16
-	lsrs r0, 16
-	bl ItemId_GetPrice
-	adds r4, r0, 0
-	movs r0, 0x1
-	bl GetPriceReduction
-	ldr r1, [r7]
-	movs r2, 0x80
-	lsls r2, 6
-	adds r1, r2
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r0, 24
-	lsrs r0, 24
-	asrs r4, r0
-	str r4, [r1]
-	b _080E0B92
-	.pool
-_080E0B80:
-	ldr r1, [r7]
-	movs r3, 0x80
-	lsls r3, 6
-	adds r1, r3
-	ldr r2, =gDecorations
-	lsls r0, r5, 5
-	adds r0, r2
-	ldrh r0, [r0, 0x14]
-	str r0, [r1]
-_080E0B92:
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x92
-	lsls r1, 3
-	adds r0, r1
-	ldr r2, =gShopDataPtr
-	mov r8, r2
-	ldr r1, [r2]
-	movs r7, 0x80
-	lsls r7, 6
-	adds r1, r7
-	ldr r1, [r1]
-	bl IsEnoughMoney
-	lsls r0, 24
-	cmp r0, 0
-	bne _080E0BD0
-	ldr r1, =gText_YouDontHaveMoney
-	ldr r2, =BuyMenuReturnToItemList
-	b _080E0C28
-	.pool
-_080E0BD0:
-	ldr r4, =gMartInfo
-	ldrb r0, [r4, 0xF]
-	cmp r0, 0
-	bne _080E0C38
-	lsls r0, r5, 16
-	lsrs r5, r0, 16
-	ldr r1, =gStringVar1
-	adds r0, r5, 0
-	bl CopyItemName
-	adds r0, r5, 0
-	bl ItemId_GetPocket
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _080E0C24
-	ldr r4, =gStringVar2
-	adds r0, r5, 0
-	bl ItemIdToBattleMoveId
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0xD
-	muls r1, r0
-	ldr r0, =gMoveNames
-	adds r1, r0
-	adds r0, r4, 0
-	bl StringCopy
-	ldr r1, =gText_Var1CertainlyHowMany2
-	b _080E0C26
-	.pool
-_080E0C24:
-	ldr r1, =gText_Var1CertainlyHowMany
-_080E0C26:
-	ldr r2, =Task_BuyHowManyDialogueInit
-_080E0C28:
-	adds r0, r6, 0
-	bl BuyMenuDisplayMessage
-	b _080E0C8E
-	.pool
-_080E0C38:
-	ldr r0, =gStringVar1
-	lsls r1, r5, 5
-	ldr r2, =gDecorations + 1
-	adds r1, r2
-	bl StringCopy
-	ldr r0, =gStringVar2
-	mov r3, r8
-	ldr r1, [r3]
-	adds r1, r7
-	ldr r1, [r1]
-	movs r2, 0
-	movs r3, 0x6
-	bl ConvertIntToDecimalStringN
-	ldrb r0, [r4, 0xF]
-	cmp r0, 0x1
-	bne _080E0C7C
-	ldr r0, =gStringVar4
-	ldr r1, =gText_Var1IsItThatllBeVar2
-	bl StringExpandPlaceholders
-	b _080E0C84
-	.pool
-_080E0C7C:
-	ldr r0, =gStringVar4
-	ldr r1, =gText_YouWantedVar1ThatllBeVar2
-	bl StringExpandPlaceholders
-_080E0C84:
-	ldr r1, =gStringVar4
-	ldr r2, =BuyMenuConfirmPurchase
-	adds r0, r6, 0
-	bl BuyMenuDisplayMessage
-_080E0C8E:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Task_BuyMenu
-
-	thumb_func_start Task_BuyHowManyDialogueInit
-@ void Task_BuyHowManyDialogueInit(u8 taskId)
-Task_BuyHowManyDialogueInit: @ 80E0CA4
-	push {r4-r6,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r5, r6, 2
-	adds r5, r6
-	lsls r5, 3
-	ldr r0, =gTasks + 0x8
-	adds r5, r0
-	ldrh r0, [r5, 0xA]
-	bl CountTotalItemQuantityInBag
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	movs r0, 0x3
-	movs r1, 0
-	movs r2, 0x1
-	movs r3, 0xD
-	bl SetWindowBorderStyle
-	ldr r0, =gStringVar1
-	adds r1, r4, 0
-	movs r2, 0x1
-	movs r3, 0x4
-	bl ConvertIntToDecimalStringN
-	ldr r4, =gStringVar4
-	ldr r1, =gText_InBagVar1
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	movs r0, 0
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	movs r0, 0x3
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl BuyMenuPrint
-	movs r0, 0x1
-	strh r0, [r5, 0x2]
-	movs r0, 0x4
-	movs r1, 0
-	movs r2, 0x1
-	movs r3, 0xD
-	bl SetWindowBorderStyle
-	adds r0, r6, 0
-	bl BuyMenuPrintItemQuantityAndPrice
-	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x92
-	lsls r1, 3
-	adds r0, r1
-	bl GetMoney
-	ldr r1, =gShopDataPtr
-	ldr r4, [r1]
-	movs r2, 0x80
-	lsls r2, 6
-	adds r1, r4, r2
-	ldr r1, [r1]
-	bl __udivsi3
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0x63
-	bls _080E0D60
-	ldr r0, =0x0000200a
-	adds r1, r4, r0
-	movs r0, 0x63
-	strb r0, [r1]
-	b _080E0D66
-	.pool
-_080E0D60:
-	ldr r2, =0x0000200a
-	adds r0, r4, r2
-	strb r1, [r0]
-_080E0D66:
-	ldr r0, =gTasks
-	lsls r1, r6, 2
-	adds r1, r6
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, =Task_BuyHowManyDialogueHandleInput
-	str r0, [r1]
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Task_BuyHowManyDialogueInit
-
-	thumb_func_start Task_BuyHowManyDialogueHandleInput
-@ void Task_BuyHowManyDialogueHandleInput(u8 taskId)
-Task_BuyHowManyDialogueHandleInput: @ 80E0D88
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	adds r4, r6, 0
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r5, r0, r1
-	adds r0, r5, 0x2
-	ldr r7, =gShopDataPtr
-	ldr r1, [r7]
-	ldr r2, =0x0000200a
-	adds r1, r2
-	ldrb r1, [r1]
-	bl AdjustQuantityAccordingToDPadInput
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080E0DF0
-	ldrh r0, [r5, 0xA]
-	bl ItemId_GetPrice
-	adds r4, r0, 0
-	movs r0, 0x1
-	bl GetPriceReduction
-	ldr r1, [r7]
-	movs r2, 0x80
-	lsls r2, 6
-	adds r1, r2
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r0, 24
-	lsrs r0, 24
-	asrs r4, r0
-	movs r2, 0x2
-	ldrsh r0, [r5, r2]
-	muls r0, r4
-	str r0, [r1]
-	adds r0, r6, 0
-	bl BuyMenuPrintItemQuantityAndPrice
-	b _080E0EA4
-	.pool
-_080E0DF0:
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080E0E74
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x4
-	movs r1, 0
-	bl sub_8198070
-	movs r0, 0x3
-	movs r1, 0
-	bl sub_8198070
-	movs r0, 0x4
-	bl ClearWindowTilemap
-	movs r0, 0x3
-	bl ClearWindowTilemap
-	movs r0, 0x1
-	bl PutWindowTilemap
-	ldrh r0, [r5, 0xA]
-	ldr r1, =gStringVar1
-	bl CopyItemName
-	ldr r0, =gStringVar2
-	movs r2, 0x2
-	ldrsh r1, [r5, r2]
-	movs r2, 0
-	movs r3, 0x2
-	bl ConvertIntToDecimalStringN
-	ldr r0, =gStringVar3
-	ldr r1, [r7]
-	movs r2, 0x80
-	lsls r2, 6
-	adds r1, r2
-	ldr r1, [r1]
-	movs r2, 0
-	movs r3, 0x6
-	bl ConvertIntToDecimalStringN
-	ldr r1, =gText_Var1AndYouWantedVar2
-	ldr r2, =BuyMenuConfirmPurchase
-	adds r0, r6, 0
-	bl BuyMenuDisplayMessage
-	b _080E0EA4
-	.pool
-_080E0E74:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _080E0EA4
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x4
-	movs r1, 0
-	bl sub_8198070
-	movs r0, 0x3
-	movs r1, 0
-	bl sub_8198070
-	movs r0, 0x4
-	bl ClearWindowTilemap
-	movs r0, 0x3
-	bl ClearWindowTilemap
-	adds r0, r4, 0
-	bl BuyMenuReturnToItemList
-_080E0EA4:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end Task_BuyHowManyDialogueHandleInput
-
-	thumb_func_start BuyMenuConfirmPurchase
-@ void BuyMenuConfirmPurchase(u8 taskId)
-BuyMenuConfirmPurchase: @ 80E0EAC
-	push {lr}
-	sub sp, 0x10
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gUnknown_08589AA8
-	movs r2, 0
-	str r2, [sp]
-	movs r2, 0x1
-	str r2, [sp, 0x4]
-	movs r2, 0xD
-	str r2, [sp, 0x8]
-	ldr r2, =gUnknown_08589A08
-	str r2, [sp, 0xC]
-	movs r2, 0x1
-	movs r3, 0
-	bl CreateYesNoMenuWithCallbacks
-	add sp, 0x10
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuConfirmPurchase
-
-	thumb_func_start BuyMenuTryMakePurchase
-@ void BuyMenuTryMakePurchase(u8 taskId)
-BuyMenuTryMakePurchase: @ 80E0EDC
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r7, r5, 0
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r4, r0, r1
-	movs r0, 0x1
-	bl PutWindowTilemap
-	ldr r6, =gMartInfo
-	ldrb r0, [r6, 0xF]
-	cmp r0, 0
-	bne _080E0F40
-	ldrh r0, [r4, 0xA]
-	ldrh r1, [r4, 0x2]
-	bl AddBagItem
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080E0F30
-	ldr r1, =gText_HereYouGoThankYou
-	ldr r2, =BuyMenuSubtractMoney
-	adds r0, r5, 0
-	bl BuyMenuDisplayMessage
-	adds r0, r5, 0
-	bl RecordItemPurchase
-	b _080E0F7A
-	.pool
-_080E0F30:
-	ldr r1, =gText_NoMoreRoomForThis
-	ldr r2, =BuyMenuReturnToItemList
-	b _080E0F60
-	.pool
-_080E0F40:
-	ldrb r0, [r4, 0xA]
-	bl DecorationAdd
-	lsls r0, 24
-	cmp r0, 0
-	beq _080E0F70
-	ldrb r0, [r6, 0xF]
-	cmp r0, 0x1
-	bne _080E0F5C
-	ldr r1, =gText_ThankYouIllSendItHome
-	b _080E0F5E
-	.pool
-_080E0F5C:
-	ldr r1, =gText_ThanksIllSendItHome
-_080E0F5E:
-	ldr r2, =BuyMenuSubtractMoney
-_080E0F60:
-	adds r0, r5, 0
-	bl BuyMenuDisplayMessage
-	b _080E0F7A
-	.pool
-_080E0F70:
-	ldr r1, =gText_SpaceForVar1Full
-	ldr r2, =BuyMenuReturnToItemList
-	adds r0, r7, 0
-	bl BuyMenuDisplayMessage
-_080E0F7A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuTryMakePurchase
-
-	thumb_func_start BuyMenuSubtractMoney
-@ void BuyMenuSubtractMoney(u8 taskId)
-BuyMenuSubtractMoney: @ 80E0F88
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r0, 0x26
-	bl IncrementGameStat
-	ldr r5, =gSaveBlock1Ptr
-	ldr r0, [r5]
-	movs r4, 0x92
-	lsls r4, 3
-	adds r0, r4
-	ldr r1, =gShopDataPtr
-	ldr r1, [r1]
-	movs r2, 0x80
-	lsls r2, 6
-	adds r1, r2
-	ldr r1, [r1]
-	bl RemoveMoney
-	movs r0, 0x5F
-	bl PlaySE
-	ldr r0, [r5]
-	adds r0, r4
-	bl GetMoney
-	adds r1, r0, 0
-	movs r0, 0
-	movs r2, 0
-	bl PrintMoneyAmountInMoneyBox
-	ldr r0, =gMartInfo
-	ldrb r0, [r0, 0xF]
-	cmp r0, 0
-	bne _080E0FF0
-	ldr r0, =gTasks
-	lsls r1, r6, 2
-	adds r1, r6
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, =Task_ReturnToItemListAfterItemPurchase
-	b _080E0FFC
-	.pool
-_080E0FF0:
-	ldr r0, =gTasks
-	lsls r1, r6, 2
-	adds r1, r6
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, =Task_ReturnToItemListAfterDecorationPurchase
-_080E0FFC:
-	str r0, [r1]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuSubtractMoney
-
-	thumb_func_start Task_ReturnToItemListAfterItemPurchase
-@ void Task_ReturnToItemListAfterItemPurchase(u8 taskId)
-Task_ReturnToItemListAfterItemPurchase: @ 80E100C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r5, r0, r1
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	beq _080E1072
-	movs r0, 0x5
-	bl PlaySE
-	movs r1, 0xA
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x4
-	bne _080E106C
-	movs r1, 0x2
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x9
-	ble _080E106C
-	movs r0, 0xC
-	movs r1, 0x1
-	bl AddBagItem
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080E106C
-	ldr r1, =gText_ThrowInPremierBall
-	ldr r2, =BuyMenuReturnToItemList
-	adds r0, r4, 0
-	bl BuyMenuDisplayMessage
-	b _080E1072
-	.pool
-_080E106C:
-	adds r0, r4, 0
-	bl BuyMenuReturnToItemList
-_080E1072:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end Task_ReturnToItemListAfterItemPurchase
-
-	thumb_func_start Task_ReturnToItemListAfterDecorationPurchase
-@ void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId)
-Task_ReturnToItemListAfterDecorationPurchase: @ 80E1078
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	beq _080E1096
-	movs r0, 0x5
-	bl PlaySE
-	adds r0, r4, 0
-	bl BuyMenuReturnToItemList
-_080E1096:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Task_ReturnToItemListAfterDecorationPurchase
-
-	thumb_func_start BuyMenuReturnToItemList
-@ void BuyMenuReturnToItemList(u8 taskId)
-BuyMenuReturnToItemList: @ 80E10A0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r5, =gTasks + 0x8
-	adds r6, r4, r5
-	movs r0, 0x5
-	movs r1, 0
-	bl sub_8197DF8
-	ldrb r0, [r6, 0xE]
-	movs r1, 0x1
-	bl BuyMenuPrintCursor
-	movs r0, 0x1
-	bl PutWindowTilemap
-	movs r0, 0x2
-	bl PutWindowTilemap
-	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
-	bl BuyMenuAddScrollIndicatorArrows
-	subs r5, 0x8
-	adds r4, r5
-	ldr r0, =Task_BuyMenu
-	str r0, [r4]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuReturnToItemList
-
-	thumb_func_start BuyMenuPrintItemQuantityAndPrice
-@ void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
-BuyMenuPrintItemQuantityAndPrice: @ 80E10EC
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r0, =gTasks + 0x8
-	adds r4, r0
-	movs r0, 0x4
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r0, =gShopDataPtr
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 6
-	adds r0, r1
-	ldr r3, [r0]
-	movs r0, 0xFF
-	str r0, [sp]
-	movs r0, 0x4
-	movs r1, 0x26
-	movs r2, 0x1
-	bl PrintMoneyAmount
-	ldr r0, =gStringVar1
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	movs r2, 0x2
-	movs r3, 0x2
-	bl ConvertIntToDecimalStringN
-	ldr r4, =gStringVar4
-	ldr r1, =gText_xVar1
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	movs r0, 0
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	movs r0, 0x4
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl BuyMenuPrint
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuyMenuPrintItemQuantityAndPrice
-
-	thumb_func_start ExitBuyMenu
-@ void ExitBuyMenu(u8 taskId)
-ExitBuyMenu: @ 80E1168
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, =gFieldCallback
-	ldr r0, =MapPostLoadHook_ExitBuyOrSellMenu
-	str r0, [r1]
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, =Task_ExitBuyMenu
-	str r1, [r0]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ExitBuyMenu
-
-	thumb_func_start Task_ExitBuyMenu
-@ void Task_ExitBuyMenu(u8 taskId)
-Task_ExitBuyMenu: @ 80E11B0
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080E11D6
-	bl RemoveMoneyLabelObject
-	bl BuyMenuFreeMemory
-	ldr r0, =CB2_ReturnToField
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_080E11D6:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Task_ExitBuyMenu
-
-	thumb_func_start ClearItemPurchases
-@ void ClearItemPurchases()
-ClearItemPurchases: @ 80E11E4
-	push {lr}
-	ldr r0, =gUnknown_02039F7C
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, =gUnknown_02039F80
-	movs r1, 0
-	movs r2, 0xC
-	bl memset
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearItemPurchases
-
-	thumb_func_start RecordItemPurchase
-@ void RecordItemPurchase(u8 taskId)
-RecordItemPurchase: @ 80E1204
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, =gTasks + 0x8
-	adds r4, r1, r0
-	movs r3, 0
-	ldr r5, =gUnknown_02039F80
-	adds r6, r5, 0
-_080E121A:
-	lsls r0, r3, 2
-	adds r2, r0, r6
-	ldrh r1, [r2]
-	movs r7, 0xA
-	ldrsh r0, [r4, r7]
-	cmp r1, r0
-	bne _080E1250
-	ldrh r0, [r2, 0x2]
-	cmp r0, 0
-	beq _080E1250
-	adds r1, r0, 0
-	movs r3, 0x2
-	ldrsh r0, [r4, r3]
-	adds r0, r1, r0
-	cmp r0, 0xFF
-	ble _080E1248
-	movs r0, 0xFF
-	strh r0, [r2, 0x2]
-	b _080E127A
-	.pool
-_080E1248:
-	ldrh r0, [r4, 0x2]
-	adds r0, r1, r0
-	strh r0, [r2, 0x2]
-	b _080E127A
-_080E1250:
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	cmp r3, 0x2
-	bls _080E121A
-	ldr r2, =gUnknown_02039F7C
-	ldrb r0, [r2]
-	cmp r0, 0x2
-	bhi _080E127A
-	lsls r0, 2
-	adds r0, r5
-	ldrh r1, [r4, 0xA]
-	strh r1, [r0]
-	ldrb r0, [r2]
-	lsls r0, 2
-	adds r0, r5
-	ldrh r1, [r4, 0x2]
-	strh r1, [r0, 0x2]
-	ldrb r0, [r2]
-	adds r0, 0x1
-	strb r0, [r2]
-_080E127A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end RecordItemPurchase
-
-	thumb_func_start CreatePokemartMenu
-@ void CreatePokemartMenu(u16 *itemsForSale)
-CreatePokemartMenu: @ 80E1284
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0
-	bl CreateShopMenu
-	adds r0, r4, 0
-	bl SetShopItemsForSale
-	bl ClearItemPurchases
-	ldr r0, =EnableBothScriptContexts
-	bl SetShopMenuCallback
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end CreatePokemartMenu
-
-	thumb_func_start CreateDecorationShop1Menu
-@ void CreateDecorationShop1Menu(u16 *itemsForSale)
-CreateDecorationShop1Menu: @ 80E12A8
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x1
-	bl CreateShopMenu
-	adds r0, r4, 0
-	bl SetShopItemsForSale
-	ldr r0, =EnableBothScriptContexts
-	bl SetShopMenuCallback
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end CreateDecorationShop1Menu
-
-	thumb_func_start CreateDecorationShop2Menu
-@ void CreateDecorationShop2Menu(u16 *itemsForSale)
-CreateDecorationShop2Menu: @ 80E12C8
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x2
-	bl CreateShopMenu
-	adds r0, r4, 0
-	bl SetShopItemsForSale
-	ldr r0, =EnableBothScriptContexts
-	bl SetShopMenuCallback
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end CreateDecorationShop2Menu
-
-	thumb_func_start sub_80E12E8
-sub_80E12E8: @ 80E12E8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	mov r9, r1
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, 16
-	lsrs r2, 16
-	mov r10, r2
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldrh r0, [r1, 0x10]
-	subs r0, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	ldrh r0, [r1, 0x12]
-	subs r0, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldrh r4, [r1, 0xA]
-	movs r2, 0xC
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bne _080E13AC
-	movs r2, 0
-	lsls r5, 16
-	str r5, [sp, 0xC]
-	lsls r0, r3, 16
-	lsls r1, r4, 16
-	asrs r0, 16
-	str r0, [sp]
-	asrs r1, 16
-	str r1, [sp, 0x4]
-	lsls r0, r1, 1
-	mov r1, r9
-	adds r7, r0, r1
-_080E133C:
-	movs r4, 0
-	lsls r2, 16
-	mov r8, r2
-	asrs r0, r2, 16
-	ldr r2, [sp]
-	adds r6, r2, r0
-_080E1348:
-	ldr r0, [sp, 0xC]
-	asrs r1, r0, 16
-	lsls r4, 16
-	asrs r0, r4, 16
-	adds r5, r1, r0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridGetMetatileIdAt
-	movs r2, 0
-	ldrsh r1, [r7, r2]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r1, r0
-	bne _080E1390
-	ldr r0, [sp, 0x4]
-	cmp r0, 0x2
-	beq _080E1380
-	ldrh r0, [r7, 0x2]
-	mov r2, r10
-	orrs r2, r0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridSetMetatileIdAt
-	b _080E1390
-	.pool
-_080E1380:
-	mov r1, r9
-	ldrh r0, [r1]
-	mov r2, r10
-	orrs r2, r0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridSetMetatileIdAt
-_080E1390:
-	movs r2, 0x80
-	lsls r2, 9
-	adds r0, r4, r2
-	lsrs r4, r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	ble _080E1348
-	adds r0, r2, 0
-	add r0, r8
-	lsrs r2, r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	ble _080E133C
-	b _080E1434
-_080E13AC:
-	movs r2, 0
-	lsls r5, 16
-	str r5, [sp, 0xC]
-	lsls r0, r3, 16
-	lsls r1, r4, 16
-	asrs r0, 16
-	str r0, [sp, 0x8]
-	asrs r7, r1, 16
-_080E13BC:
-	movs r4, 0
-	lsls r2, 16
-	mov r8, r2
-	asrs r0, r2, 16
-	ldr r1, [sp, 0x8]
-	adds r6, r1, r0
-_080E13C8:
-	ldr r2, [sp, 0xC]
-	asrs r1, r2, 16
-	lsls r4, 16
-	asrs r0, r4, 16
-	adds r5, r1, r0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridGetMetatileIdAt
-	movs r1, 0x2
-	subs r1, r7
-	lsls r1, 1
-	add r1, r9
-	movs r2, 0
-	ldrsh r1, [r1, r2]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r1, r0
-	bne _080E141A
-	cmp r7, 0x2
-	beq _080E140A
-	movs r0, 0x1
-	subs r0, r7
-	lsls r0, 1
-	add r0, r9
-	ldrh r0, [r0]
-	mov r2, r10
-	orrs r2, r0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridSetMetatileIdAt
-	b _080E141A
-_080E140A:
-	mov r1, r9
-	ldrh r0, [r1, 0x4]
-	mov r2, r10
-	orrs r2, r0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridSetMetatileIdAt
-_080E141A:
-	movs r2, 0x80
-	lsls r2, 9
-	adds r0, r4, r2
-	lsrs r4, r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	ble _080E13C8
-	adds r0, r2, 0
-	add r0, r8
-	lsrs r2, r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	ble _080E13BC
-_080E1434:
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80E12E8
-
-	thumb_func_start sub_80E1444
-sub_80E1444: @ 80E1444
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r4, r0, r1
-	movs r0, 0x1
-	strh r0, [r4, 0x6]
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x6
-	bhi _080E14DE
-	lsls r0, 2
-	ldr r1, =_080E1474
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080E1474:
-	.4byte _080E1490
-	.4byte _080E1498
-	.4byte _080E14A0
-	.4byte _080E14A8
-	.4byte _080E14B0
-	.4byte _080E14C4
-	.4byte _080E14D4
-_080E1490:
-	ldr r1, =gUnknown_08589ABA
-	b _080E14C6
-	.pool
-_080E1498:
-	ldr r1, =gUnknown_08589AC0
-	b _080E14C6
-	.pool
-_080E14A0:
-	ldr r1, =gUnknown_08589AC6
-	b _080E14B2
-	.pool
-_080E14A8:
-	ldr r1, =gUnknown_08589ACC
-	b _080E14C6
-	.pool
-_080E14B0:
-	ldr r1, =gUnknown_08589AD2
-_080E14B2:
-	movs r2, 0xC0
-	lsls r2, 4
-	adds r0, r3, 0
-	bl sub_80E12E8
-	b _080E14DE
-	.pool
-_080E14C4:
-	ldr r1, =gUnknown_08589AD8
-_080E14C6:
-	adds r0, r3, 0
-	movs r2, 0
-	bl sub_80E12E8
-	b _080E14DE
-	.pool
-_080E14D4:
-	ldr r1, =gUnknown_08589ADE
-	adds r0, r3, 0
-	movs r2, 0
-	bl sub_80E12E8
-_080E14DE:
-	ldrh r0, [r4]
-	adds r0, 0x1
-	movs r1, 0x7
-	ands r0, r1
-	strh r0, [r4]
-	adds r5, r0, 0
-	cmp r5, 0
-	bne _080E1502
-	bl DrawWholeMapView
-	movs r1, 0x2
-	ldrsh r0, [r4, r1]
-	adds r0, 0x1
-	movs r1, 0x3
-	bl __modsi3
-	strh r0, [r4, 0x2]
-	strh r5, [r4, 0x6]
-_080E1502:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E1444
-
-	thumb_func_start sub_80E150C
-sub_80E150C: @ 80E150C
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	ldr r6, =sub_80E1444
-	adds r0, r6, 0
-	movs r1, 0
-	bl CreateTask
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r7, r0, r1
-	adds r0, r7, 0
-	adds r0, 0x8
-	adds r1, r7, 0
-	adds r1, 0xA
-	bl PlayerGetDestCoords
-	movs r0, 0
-	strh r0, [r7]
-	strh r0, [r7, 0x2]
-	strh r5, [r7, 0x4]
-	adds r0, r4, 0
-	bl _call_via_r6
-	adds r0, r4, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80E150C
-
-	thumb_func_start sub_80E1558
-sub_80E1558: @ 80E1558
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80E150C
-	ldr r1, =gUnknown_02039F8C
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E1558
-
-	thumb_func_start sub_80E1570
-sub_80E1570: @ 80E1570
-	push {lr}
-	ldr r0, =gUnknown_02039F8C
-	ldrb r0, [r0]
-	bl DestroyTask
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E1570
-
-	thumb_func_start sub_80E1584
-sub_80E1584: @ 80E1584
-	push {lr}
-	ldr r2, =gTasks
-	ldr r0, =gUnknown_02039F8C
-	ldrb r1, [r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r1, r0, r2
-	movs r2, 0xE
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bne _080E15B0
-	movs r2, 0xA
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x2
-	bne _080E15B0
-	movs r0, 0
-	b _080E15B2
-	.pool
-_080E15B0:
-	movs r0, 0x1
-_080E15B2:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80E1584
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/common_syms/field_control_avatar.txt b/common_syms/field_control_avatar.txt
new file mode 100644
index 000000000..0f336a407
--- /dev/null
+++ b/common_syms/field_control_avatar.txt
@@ -0,0 +1 @@
+gSelectedEventObject
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 9af3ed7a9..1d9ff20ae 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -426,7 +426,7 @@ Move_POUND:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -441,7 +441,7 @@ Move_DOUBLE_SLAP:
 	choosetwoturnanim DoubleSlapLeft, DoubleSlapRight
 DoubleSlapContinue:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -456,7 +456,7 @@ DoubleSlapRight:
 Move_POISON_POWDER:
 	loadspritegfx ANIM_TAG_065
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
-	loopsewithpan SE_W077, +63, 10, 6
+	loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
 	createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
 	createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
 	createsprite gPoisonPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3
@@ -480,7 +480,7 @@ Move_POISON_POWDER:
 
 Move_STUN_SPORE:
 	loadspritegfx ANIM_TAG_068
-	loopsewithpan SE_W077, +63, 10, 6
+	loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
 	createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
 	createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
 	createsprite gStunSporeParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3
@@ -504,7 +504,7 @@ Move_STUN_SPORE:
 
 Move_SLEEP_POWDER:
 	loadspritegfx ANIM_TAG_067
-	loopsewithpan SE_W077, +63, 10, 6
+	loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
 	createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
 	createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
 	createsprite gSleepPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3
@@ -531,21 +531,21 @@ Move_SWIFT:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1
 	delay 5
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1
 	delay 5
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, -10, 22, 15, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1
 	delay 5
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1
 	delay 5
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1
 	delay 5
 	waitforvisualfinish
@@ -557,20 +557,20 @@ Move_STRENGTH:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30
 	waitforvisualfinish
 	delay 10
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4
 	delay 4
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1
 	delay 4
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1
 	delay 4
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -587,7 +587,7 @@ Move_TACKLE:
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -597,14 +597,14 @@ Move_BODY_SLAM:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
 	waitforvisualfinish
 	delay 11
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 26, 0, 0, 5
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0
-	loopsewithpan SE_W025B, +63, 10, 2
+	loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2
 	delay 1
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3
 	waitforvisualfinish
@@ -636,7 +636,7 @@ Move_SUPERSONIC:
 	blendoff
 	end
 Supersonic1:
-	playsewithpan SE_W048, -64
+	playsewithpan SE_W048, SOUND_PAN_ATTACKER
 	createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0
 	delay 2
 	return
@@ -651,7 +651,7 @@ Move_SCREECH:
 	waitforvisualfinish
 	end
 Screech1:
-	playsewithpan SE_W103, -64
+	playsewithpan SE_W103, SOUND_PAN_ATTACKER
 	createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0
 	delay 2
 	return
@@ -661,31 +661,31 @@ Move_FLAME_WHEEL:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
 	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0
-	playsewithpan SE_W172, -64
+	playsewithpan SE_W172, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 4
-	playsewithpan SE_W172, -64
+	playsewithpan SE_W172, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 8
-	playsewithpan SE_W172, -64
+	playsewithpan SE_W172, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 12
-	playsewithpan SE_W172, -64
+	playsewithpan SE_W172, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 16
-	playsewithpan SE_W172, -64
+	playsewithpan SE_W172, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 20
-	playsewithpan SE_W172, -64
+	playsewithpan SE_W172, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 24
-	playsewithpan SE_W172, -64
+	playsewithpan SE_W172, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6
 	delay 4
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1
 	createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1
-	playsewithpan SE_W172B, +63
+	playsewithpan SE_W172B, SOUND_PAN_TARGET
 	call FireMoveEffect
 	delay 7
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9
@@ -704,22 +704,22 @@ Move_PIN_MISSILE:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	createsprite gPinMissileSpriteTemplate, 2, 20, -8, -8, -8, 20, -32
 	delay 15
 	createsprite gPinMissileSpriteTemplate, 2, 20, -8, 8, 8, 20, -40
 	delay 4
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	delay 9
 	createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32
 	delay 4
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	delay 14
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	waitforvisualfinish
@@ -733,22 +733,22 @@ Move_ICICLE_SPEAR:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W196, -64
+	playsewithpan SE_W196, SOUND_PAN_ATTACKER
 	createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, -8, -8, 20, -32
 	delay 15
 	createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 8, 8, 20, -40
 	delay 4
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	delay 9
 	createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32
 	delay 4
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	delay 14
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	waitforvisualfinish
@@ -764,7 +764,7 @@ Move_TAKE_DOWN:
 	delay 35
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0
 	createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	delay 1
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4
 	waitforvisualfinish
@@ -781,19 +781,19 @@ Move_TAKE_DOWN:
 
 Move_DOUBLE_EDGE:
 	loadspritegfx ANIM_TAG_135
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0
 	waitforvisualfinish
 	delay 10
-	playsewithpan SE_W207, -64
-	waitplaysewithpan SE_W207, -64, 8
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 16, 16, RGB_WHITE
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
 	delay 3
 	waitforvisualfinish
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3
 	waitforvisualfinish
@@ -819,12 +819,12 @@ Move_POISON_STING:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	createsprite gLinearStingerSpriteTemplate, 130, 20, 0, -8, 0, 20
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	waitforvisualfinish
 	call PoisonBubblesEffect
 	waitforvisualfinish
@@ -838,13 +838,13 @@ Move_TWINEEDLE:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	loopsewithpan SE_W013B, -64, 6, 2
+	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2
 	createsprite gLinearStingerSpriteTemplate, 130, 10, -4, 0, -4, 20
 	createsprite gLinearStingerSpriteTemplate, 130, 20, 12, 10, 12, 20
 	delay 20
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1
 	createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, -4, 1, 3
-	loopsewithpan SE_W030, +63, 5, 2
+	loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2
 	delay 1
 	createsprite gBattleAnimSpriteTemplate_8597370, 3, 10, 12, 1, 3
 	waitforvisualfinish
@@ -902,29 +902,29 @@ FireBlast2:
 
 Move_LEECH_SEED:
 	loadspritegfx ANIM_TAG_SEED
-	playsewithpan SE_W077, -64
+	playsewithpan SE_W077, SOUND_PAN_ATTACKER
 	createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32
 	delay 8
-	playsewithpan SE_W077, -64
+	playsewithpan SE_W077, SOUND_PAN_ATTACKER
 	createsprite gLeechSeedSpriteTemplate, 130, 15, 0, -16, 24, 35, -40
 	delay 8
-	playsewithpan SE_W077, -64
+	playsewithpan SE_W077, SOUND_PAN_ATTACKER
 	createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 16, 24, 35, -37
 	delay 12
-	loopsewithpan SE_W039, +63, 10, 8
+	loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8
 	waitforvisualfinish
 	end
 
 Move_EMBER:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	loopsewithpan SE_W052, -64, 5, 2
+	loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2
 	createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1
 	delay 4
 	createsprite gEmberSpriteTemplate, 130, 20, 0, 0, 24, 20, 1
 	delay 4
 	createsprite gEmberSpriteTemplate, 130, 20, 0, 16, 24, 20, 1
 	delay 16
-	playsewithpan SE_W172, +63
+	playsewithpan SE_W172, SOUND_PAN_TARGET
 	call Ember1
 	call Ember1
 	call Ember1
@@ -942,7 +942,7 @@ Move_MEGA_PUNCH:
 	delay 2
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK
 	setalpha 12, 8
-	playsewithpan SE_W025, +63
+	playsewithpan SE_W025, SOUND_PAN_TARGET
 	createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 0, 50
 	createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE
 	delay 50
@@ -951,7 +951,7 @@ Move_MEGA_PUNCH:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1
 	createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -985,11 +985,11 @@ Move_MEGA_KICK:
 	delay 2
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK
 	setalpha 12, 8
-	playsewithpan SE_W025, +63
+	playsewithpan SE_W025, SOUND_PAN_TARGET
 	createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 1, 50
 	createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE
 	delay 50
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	call SetImpactBackground
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1
@@ -1011,7 +1011,7 @@ Move_COMET_PUNCH:
 	choosetwoturnanim CometPunchLeft, CometPunchRight
 CometPunchContinue:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -1041,7 +1041,7 @@ Move_SONIC_BOOM:
 	blendoff
 	end
 SonicBoom1:
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	createsprite gSonicBoomSpriteTemplate, 130, 16, 0, 0, 0, 15
 	delay 4
 	return
@@ -1057,7 +1057,7 @@ Move_THUNDER_SHOCK:
 	waitforvisualfinish
 	delay 10
 	createvisualtask sub_810A7DC, 5, 0, -44, 0
-	playsewithpan SE_W085, +63
+	playsewithpan SE_W085, SOUND_PAN_TARGET
 	delay 9
 	createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK
 	waitforvisualfinish
@@ -1079,13 +1079,13 @@ Move_THUNDERBOLT:
 	waitforvisualfinish
 	delay 10
 	createvisualtask sub_810A7DC, 5, 24, -52, 0
-	playsewithpan SE_W085, +63
+	playsewithpan SE_W085, SOUND_PAN_TARGET
 	delay 7
 	createvisualtask sub_810A7DC, 5, -24, -52, 0
-	playsewithpan SE_W085, +63
+	playsewithpan SE_W085, SOUND_PAN_TARGET
 	delay 7
 	createvisualtask sub_810A7DC, 5, 0, -60, 1
-	playsewithpan SE_W085, +63
+	playsewithpan SE_W085, SOUND_PAN_TARGET
 	delay 9
 	createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK
 	waitforvisualfinish
@@ -1101,7 +1101,7 @@ Move_THUNDERBOLT:
 	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 96, 40, 1, -32765
 	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 160, 40, 0, -32765
 	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 224, 40, 2, -32765
-	playsewithpan SE_W063, +63
+	playsewithpan SE_W063, SOUND_PAN_TARGET
 	delay 0
 	createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK
 	delay 6
@@ -1112,7 +1112,7 @@ Move_THUNDERBOLT:
 	createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK
 	waitforvisualfinish
 	delay 20
-	waitplaysewithpan SE_W085B, +63, 19
+	waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19
 	call ElectricityEffect
 	waitforvisualfinish
 	delay 20
@@ -1128,9 +1128,9 @@ Move_THUNDER_WAVE:
 	waitforvisualfinish
 	delay 10
 	createvisualtask sub_810A7DC, 5, 0, -48, 0
-	playsewithpan SE_W086, +63
+	playsewithpan SE_W086, SOUND_PAN_TARGET
 	delay 20
-	loopsewithpan SE_W085B, +63, 10, 4
+	loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4
 	createsprite gUnknown_08595840, 130, -16, -16
 	delay 4
 	createsprite gUnknown_08595840, 130, -16, 0
@@ -1156,23 +1156,23 @@ BeatUpLeft:
 	createsprite gBasicHitSplatSpriteTemplate, 130, -20, -20, 1, 2
 	createsprite gFistFootSpriteTemplate, 131, -20, -12, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2
 	createsprite gFistFootSpriteTemplate, 131, 8, 8, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	goto BeatUpContinue
 BeatUpRight:
 	createsprite gBasicHitSplatSpriteTemplate, 130, 12, -20, 1, 2
 	createsprite gFistFootSpriteTemplate, 131, 12, -12, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 130, -12, 0, 1, 2
 	createsprite gFistFootSpriteTemplate, 131, -12, 8, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	goto BeatUpContinue
 
 Move_STOMP:
@@ -1180,19 +1180,19 @@ Move_STOMP:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W104, +63
+	playsewithpan SE_W104, SOUND_PAN_TARGET
 	createsprite gUnknown_08595F60, 3, 0, -32, 15
 	delay 19
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_TAIL_WHIP:
-	loopsewithpan SE_W039, -64, 24, 3
+	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3
 	waitforvisualfinish
 	end
@@ -1201,7 +1201,7 @@ Move_CUT:
 	loadspritegfx ANIM_TAG_138
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W015, +63
+	playsewithpan SE_W015, SOUND_PAN_TARGET
 	createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0
 	delay 5
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
@@ -1213,14 +1213,14 @@ Move_CUT:
 
 Move_HIDDEN_POWER:
 	loadspritegfx ANIM_TAG_217
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
 	waitforvisualfinish
 	delay 30
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1
 	delay 4
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
-	playsewithpan SE_W179, -64
+	playsewithpan SE_W179, SOUND_PAN_ATTACKER
 	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 0
 	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 42
 	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 84
@@ -1229,7 +1229,7 @@ Move_HIDDEN_POWER:
 	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 210
 	delay 52
 	setarg 7, -1
-	playsewithpan SE_W115, -64
+	playsewithpan SE_W115, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
 	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 0
 	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 32
@@ -1245,13 +1245,13 @@ Move_REVERSAL:
 	loadspritegfx ANIM_TAG_236
 	loadspritegfx ANIM_TAG_143
 	loadspritegfx ANIM_TAG_135
-	playsewithpan SE_W197, -64
+	playsewithpan SE_W197, SOUND_PAN_ATTACKER
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0
 	waitforvisualfinish
 	delay 30
 	createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE
 	delay 10
-	playsewithpan SE_W179, -64
+	playsewithpan SE_W179, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 0
 	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 42
 	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 84
@@ -1262,7 +1262,7 @@ Move_REVERSAL:
 	delay 20
 	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
 	delay 8
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0
 	createsprite gFistFootSpriteTemplate, 132, 0, 0, 10, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
@@ -1286,12 +1286,12 @@ PursuitContinue:
 	waitbgfadein
 	end
 PursuitNormal:
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
 	createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0
 	goto PursuitContinue
 PursuitOnSwitchout:
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
 	createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0
 	goto PursuitContinue
@@ -1304,7 +1304,7 @@ Move_SPIKE_CANNON:
 	setalpha 12, 8
 	createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4
 	waitforvisualfinish
-	loopsewithpan SE_W013B, -64, 5, 3
+	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
 	createsprite gLinearStingerSpriteTemplate, 2, 10, -8, -8, -8, 20
 	createsprite gLinearStingerSpriteTemplate, 2, 18, 0, 0, 0, 20
@@ -1314,7 +1314,7 @@ Move_SPIKE_CANNON:
 	createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, 0, 1, 2
 	createsprite gBattleAnimSpriteTemplate_8597370, 3, 8, 8, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1
-	loopsewithpan SE_W030, +63, 5, 3
+	loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -1324,7 +1324,7 @@ Move_SWORDS_DANCE:
 	loadspritegfx ANIM_TAG_SWORD
 	monbg ANIM_ATTACKER
 	setalpha 12, 8
-	playsewithpan SE_W014, -64
+	playsewithpan SE_W014, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4
 	createsprite gBattleAnimSpriteTemplate_8593380, 2, 0, 0
 	delay 22
@@ -1340,12 +1340,12 @@ Move_PSYCH_UP:
 	monbg ANIM_ATK_PARTNER
 	createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0
 	setalpha 12, 8
-	loopsewithpan SE_W060B, -64, 5, 10
+	loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10
 	createsprite gUnknown_08596548, 2, 0, 0, 0, 0
 	createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER
 	delay 127
 	delay 4
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
 	createvisualtask sub_8116620, 9, 2, 2, 10, 0, RGB_YELLOW
 	delay 30
@@ -1363,7 +1363,7 @@ Move_DIZZY_PUNCH:
 	call DizzyPunch1
 	createsprite gFistFootSpriteTemplate, 133, 16, 8, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gUnknown_08595F78, 131, 16, 8, 160, -32
 	createsprite gUnknown_08595F78, 131, 16, 8, -256, -40
 	createsprite gUnknown_08595F78, 131, 16, 8, 128, -16
@@ -1374,7 +1374,7 @@ Move_DIZZY_PUNCH:
 	call DizzyPunch1
 	createsprite gFistFootSpriteTemplate, 133, -16, -8, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gUnknown_08595F78, 131, -16, -8, 160, -32
 	createsprite gUnknown_08595F78, 131, -16, -8, -256, -40
 	createsprite gUnknown_08595F78, 131, -16, -8, 128, -16
@@ -1393,7 +1393,7 @@ DizzyPunch1:
 
 Move_FIRE_SPIN:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	playsewithpan SE_W221B, +63
+	playsewithpan SE_W221B, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1
 	call FireSpinEffect
 	call FireSpinEffect
@@ -1420,7 +1420,7 @@ Move_FURY_CUTTER:
 	loadspritegfx ANIM_TAG_138
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	createvisualtask AnimTask_IsFuryCutterHitRight, 2
 	jumpretfalse FuryCutterLeft
 	goto FuryCutterRight
@@ -1468,19 +1468,19 @@ Move_SELF_DESTRUCT:
 	createvisualtask sub_8116620, 10, 2, 1, 9, 0, RGB_RED
 	end
 SelfDestruct1:
-	playsewithpan SE_W120, -64
+	playsewithpan SE_W120, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1
 	delay 6
-	playsewithpan SE_W120, -64
+	playsewithpan SE_W120, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1
 	delay 6
-	playsewithpan SE_W120, -64
+	playsewithpan SE_W120, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1
 	delay 6
-	playsewithpan SE_W120, -64
+	playsewithpan SE_W120, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1
 	delay 6
-	playsewithpan SE_W120, -64
+	playsewithpan SE_W120, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1
 	delay 6
 	return
@@ -1490,12 +1490,12 @@ Move_SLAM:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W004, -64
+	playsewithpan SE_W004, SOUND_PAN_ATTACKER
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4
 	delay 1
 	createsprite gUnknown_085928D0, 2, 0, 0
 	delay 3
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
@@ -1511,10 +1511,10 @@ Move_SLAM:
 
 Move_VINE_WHIP:
 	loadspritegfx ANIM_TAG_287
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
 	delay 6
-	playsewithpan SE_W010, +63
+	playsewithpan SE_W010, SOUND_PAN_TARGET
 	createsprite gUnknown_085928E8, 130, 0, 0
 	delay 6
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1
@@ -1524,12 +1524,12 @@ Move_DRILL_PECK:
 	loadspritegfx ANIM_TAG_135
 	loadspritegfx ANIM_TAG_162
 	createsprite gUnknown_08592CD8, 2, 0
-	playsewithpan SE_W029, -64
+	playsewithpan SE_W029, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 2
 	createsprite gUnknown_08592CD8, 2, 1
 	delay 2
-	loopsewithpan SE_W030, +63, 4, 8
+	loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8
 	createvisualtask sub_810EB88, 5
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
 	waitforvisualfinish
@@ -1547,28 +1547,28 @@ Move_WATERFALL:
 	setalpha 12, 8
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1
 	delay 5
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595238, 2, 10, 10, 25, 0
 	delay 4
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595238, 2, -15, 0, 25, 0
 	delay 4
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595238, 2, 20, 10, 25, 0
 	delay 4
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595238, 2, 0, -10, 25, 0
 	delay 4
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595238, 2, -10, 15, 25, 0
 	delay 4
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595238, 2, 25, 20, 25, 0
 	delay 4
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595238, 2, -20, 20, 25, 0
 	delay 4
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595238, 2, 12, 0, 25, 0
 	waitforvisualfinish
 	delay 10
@@ -1581,7 +1581,7 @@ Move_WATERFALL:
 	end
 
 UnderWaterAttack1:
-	playsewithpan SE_W127, +63
+	playsewithpan SE_W127, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1
 	createsprite gUnknown_08597388, 3, 0, 20, 1, 1
 	createsprite gUnknown_08595250, 4, 0, 20
@@ -1636,26 +1636,26 @@ Move_EXPLOSION:
 	createvisualtask sub_8116620, 10, 1, 3, 16, 0, RGB_WHITE
 	end
 Explosion1:
-	playsewithpan SE_W153, -64
+	playsewithpan SE_W153, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1
 	delay 6
-	playsewithpan SE_W153, -64
+	playsewithpan SE_W153, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1
 	delay 6
-	playsewithpan SE_W153, -64
+	playsewithpan SE_W153, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1
 	delay 6
-	playsewithpan SE_W153, -64
+	playsewithpan SE_W153, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1
 	delay 6
-	playsewithpan SE_W153, -64
+	playsewithpan SE_W153, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1
 	delay 6
 	return
 
 Move_DEFENSE_CURL:
 	loadspritegfx ANIM_TAG_234
-	loopsewithpan SE_W161, -64, 18, 3
+	loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
 	createvisualtask sub_811489C, 5, 0, 0
 	createvisualtask sub_815B338, 5
 	waitforvisualfinish
@@ -1669,7 +1669,7 @@ Move_PROTECT:
 	loadspritegfx ANIM_TAG_PROTECT
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
-	waitplaysewithpan SE_W115, -64, 16
+	waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16
 	createsprite gUnknown_08592ADC, 2, 24, 0, 90
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -1681,7 +1681,7 @@ Move_DETECT:
 	waitforvisualfinish
 	createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE
 	delay 18
-	playsewithpan SE_W197, -64
+	playsewithpan SE_W197, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0853EE84, 13, 20, -20
 	waitforvisualfinish
 	delay 10
@@ -1706,15 +1706,15 @@ Frustration_Continue:
 	blendoff
 	end
 Frustration_Strongest:
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1
 	createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31
 	waitforvisualfinish
 	delay 20
-	playsewithpan SE_W207B, -64
+	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	waitforvisualfinish
-	playsewithpan SE_W207B, -64
+	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	waitforvisualfinish
 	delay 10
@@ -1722,65 +1722,65 @@ Frustration_Strongest:
 	delay 5
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31
 	goto Frustration_Continue
 Frustration_Strong:
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1
 	createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31
 	waitforvisualfinish
 	delay 20
-	playsewithpan SE_W207B, -64
+	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	waitforvisualfinish
 	delay 5
 	createvisualtask sub_815C3A8, 5
 	delay 7
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
 	delay 14
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
 	delay 14
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
 	waitforvisualfinish
 	createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31
 	goto Frustration_Continue
 Frustration_Medium:
-	playsewithpan SE_W207B, -64
+	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	waitforvisualfinish
 	delay 5
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
 	delay 6
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
 	delay 6
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	goto Frustration_Continue
@@ -1790,7 +1790,7 @@ Frustration_Weak:
 	delay 10
 	createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2
 	delay 12
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
 	goto Frustration_Continue
@@ -1799,14 +1799,14 @@ Move_SAFEGUARD:
 	loadspritegfx ANIM_TAG_244
 	monbg ANIM_ATK_PARTNER
 	setalpha 8, 8
-	playsewithpan SE_W208, -64
+	playsewithpan SE_W208, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593C64, 2
 	delay 4
 	createsprite gUnknown_08593C64, 2
 	delay 4
 	createsprite gUnknown_08593C64, 2
 	waitforvisualfinish
-	playsewithpan SE_REAPOKE, -64
+	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
 	createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -1842,7 +1842,7 @@ Move_VICE_GRIP:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W011, +63
+	playsewithpan SE_W011, SOUND_PAN_TARGET
 	createsprite gUnknown_08593590, 2, 0
 	createsprite gUnknown_08593590, 2, 1
 	delay 9
@@ -1860,7 +1860,7 @@ Move_GUILLOTINE:
 	setalpha 12, 8
 	fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS
 	waitbgfadein
-	playsewithpan SE_W011, +63
+	playsewithpan SE_W011, SOUND_PAN_TARGET
 	createsprite gUnknown_085935D0, 2, 0
 	createsprite gUnknown_085935D0, 2, 1
 	createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK
@@ -1870,7 +1870,7 @@ Move_GUILLOTINE:
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -1884,10 +1884,10 @@ Move_PAY_DAY:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085934D8, 2, 20, 0, 0, 0, 1152
 	waitforvisualfinish
-	playsewithpan SE_W006, +63
+	playsewithpan SE_W006, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2
 	createsprite gUnknown_085934F0, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
@@ -1898,7 +1898,7 @@ Move_PAY_DAY:
 
 Move_OUTRAGE:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	loopsewithpan SE_W082, -64, 8, 3
+	loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3
 	createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0)
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4
 	delay 0
@@ -1946,7 +1946,7 @@ Move_SPARK:
 	loadspritegfx ANIM_TAG_SPARK_2
 	delay 0
 	createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22)
-	playsewithpan SE_W085B, -64
+	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859574C, 0, 32, 24, 190, 12, 0, 1, 0
 	delay 0
 	createsprite gBattleAnimSpriteTemplate_859574C, 0, 80, 24, 22, 12, 0, 1, 0
@@ -1955,7 +1955,7 @@ Move_SPARK:
 	createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
 	delay 10
 	createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22)
-	playsewithpan SE_W085B, -64
+	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_859574C, 0, 100, 24, 60, 10, 0, 1, 0
 	createsprite gBattleAnimSpriteTemplate_859574C, 0, 170, 24, 42, 11, 0, 1, 1
 	delay 0
@@ -1964,7 +1964,7 @@ Move_SPARK:
 	createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
 	delay 20
 	createvisualtask sub_8115A04, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22)
-	playsewithpan SE_W085B, -64
+	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 0, 20, 0, 0
 	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 64, 20, 1, 0
 	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 128, 20, 0, 0
@@ -1978,7 +1978,7 @@ Move_SPARK:
 	createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
 	delay 4
-	playsewithpan SE_W063, +63
+	playsewithpan SE_W063, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -1989,12 +1989,12 @@ Move_SPARK:
 
 Move_ATTRACT:
 	loadspritegfx ANIM_TAG_216
-	loopsewithpan SE_W204, -64, 12, 3
+	loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3
 	createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER
 	delay 15
 	createsprite gUnknown_085939A0, 131, 20, -8
 	waitforvisualfinish
-	playsewithpan SE_W213, +63
+	playsewithpan SE_W213, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -32
 	createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -40
 	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -16
@@ -2024,7 +2024,7 @@ Move_GROWTH:
 	end
 Growth1:
 	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0
 	return
 
@@ -2037,12 +2037,12 @@ Move_WHIRLWIND:
 	createsprite gUnknown_085963D4, 2, 0, 24, 1, 60, 4
 	createsprite gUnknown_085963D4, 2, 0, 32, 1, 60, 0
 	delay 5
-	loopsewithpan SE_W104, +63, 10, 4
+	loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1
 	delay 0x1D
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5
 	delay 7
-	playsewithpan SE_W081, +63
+	playsewithpan SE_W081, SOUND_PAN_TARGET
 	createvisualtask sub_80D5DB0, 5, 1, 8
 	waitforvisualfinish
 	end
@@ -2052,12 +2052,12 @@ Move_CONFUSE_RAY:
 	monbg ANIM_DEF_PARTNER
 	fadetobg BG_GHOST
 	waitbgfadein
-	createvisualtask sub_8159278, 2, -64, 63, 2, 0
+	createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0
 	createvisualtask sub_8115C80, 2, 10013, 0, 6, 0, 14, 351
 	createsprite gUnknown_08596D14, 130, 28, 0, 288
 	waitforvisualfinish
 	setalpha 8, 8
-	playsewithpan SE_W081B, +63
+	playsewithpan SE_W081B, SOUND_PAN_TARGET
 	createsprite gUnknown_08596D2C, 130, 0, -16
 	waitforvisualfinish
 	delay 0
@@ -2082,10 +2082,10 @@ Move_LOCK_ON:
 Move_MEAN_LOOK:
 	loadspritegfx ANIM_TAG_EYE
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK
-	loopsewithpan SE_W109, +63, 15, 4
-	waitplaysewithpan SE_W043, +63, 0x55
+	loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4
+	waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 0x55
 	createsprite gUnknown_085CE104, 2
 	delay 120
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK
@@ -2098,20 +2098,20 @@ Move_ROCK_THROW:
 	loadspritegfx ANIM_TAG_058
 	createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1
 	createsprite gUnknown_08596B04, 130, 0, 1, 0, 0
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 6
 	createsprite gUnknown_08596B04, 130, 19, 1, 10, 0
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 6
 	createsprite gUnknown_08596B04, 130, -23, 2, -10, 0
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1
 	delay 6
 	createsprite gUnknown_08596B04, 130, -15, 1, -10, 0
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 6
 	createsprite gUnknown_08596B04, 130, 23, 2, 10, 0
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -2120,16 +2120,16 @@ Move_ROCK_SLIDE:
 	monbg ANIM_DEF_PARTNER
 	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1
 	createsprite gUnknown_08596B04, 130, -5, 1, -5, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, 5, 0, 6, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, 19, 1, 10, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, -23, 2, -10, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1
 	delay 2
@@ -2141,28 +2141,28 @@ Move_ROCK_SLIDE:
 
 RockSlide1:
 	createsprite gUnknown_08596B04, 130, -20, 0, -10, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, 28, 1, 10, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, -10, 1, -5, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, 10, 0, 6, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, 24, 1, 10, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, -32, 2, -10, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, -20, 0, -10, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08596B04, 130, 30, 2, 10, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 2
 	return
 
@@ -2175,7 +2175,7 @@ Move_THIEF:
 	setalpha 12, 8
 	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
 	delay 6
-	playsewithpan SE_W233, +63
+	playsewithpan SE_W233, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1
 	waitforvisualfinish
@@ -2205,22 +2205,22 @@ Move_BUBBLE_BEAM:
 	end
 Bulbblebeam1:
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 70, 0, 256, 50
-	playsewithpan SE_W145, -64
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 40, -10, 256, 50
-	playsewithpan SE_W145, -64
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -60, 0, 256, 50
-	playsewithpan SE_W145, -64
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 256, 50
-	playsewithpan SE_W145, -64
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, -10, 256, 50
-	playsewithpan SE_W145, -64
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 256, 50
-	playsewithpan SE_W145, -64
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
 	delay 3
 	return
 
@@ -2234,11 +2234,11 @@ Move_ICY_WIND:
 	playsewithpan SE_W196, 0
 	waitbgfadein
 	waitforvisualfinish
-	panse_1B SE_W016, -64, +63, +2, 0
+	panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call IcyWind1
 	delay 5
 	call IcyWind1
-	playsewithpan SE_W016B, +63
+	playsewithpan SE_W016B, SOUND_PAN_TARGET
 	delay 0x37
 	call IcyWindEffect2
 	waitforvisualfinish
@@ -2263,12 +2263,12 @@ IcyWind1:
 Move_SMOKESCREEN:
 	loadspritegfx ANIM_TAG_BLACK_SMOKE
 	loadspritegfx ANIM_TAG_BLACK_BALL
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085CE050, 130, 20, 0, 0, 0, 35, -25
 	waitforvisualfinish
 	createvisualtask sub_815A160, 2
 	delay 2
-	playsewithpan SE_W028, +63
+	playsewithpan SE_W028, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE038, 132, 0, -12, 104, 0, 75
 	createsprite gUnknown_085CE038, 132, 0, -12, 72, 1, 75
 	createsprite gUnknown_085CE038, 132, 0, -6, 56, 1, 75
@@ -2290,7 +2290,7 @@ Move_CONVERSION:
 	monbgprio_28 ANIM_ATTACKER
 	setalpha 16, 0
 	delay 0
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592E74, 2, -24, -24
 	delay 3
 	createsprite gUnknown_08592E74, 2, -8, -24
@@ -2299,7 +2299,7 @@ Move_CONVERSION:
 	delay 3
 	createsprite gUnknown_08592E74, 2, 24, -24
 	delay 3
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592E74, 2, -24, -8
 	delay 3
 	createsprite gUnknown_08592E74, 2, -8, -8
@@ -2308,7 +2308,7 @@ Move_CONVERSION:
 	delay 3
 	createsprite gUnknown_08592E74, 2, 24, -8
 	delay 3
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592E74, 2, -24, 8
 	delay 3
 	createsprite gUnknown_08592E74, 2, -8, 8
@@ -2317,7 +2317,7 @@ Move_CONVERSION:
 	delay 3
 	createsprite gUnknown_08592E74, 2, 24, 8
 	delay 3
-	playsewithpan SE_W129, -64
+	playsewithpan SE_W129, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592E74, 2, -24, 24
 	delay 3
 	createsprite gUnknown_08592E74, 2, -8, 24
@@ -2326,7 +2326,7 @@ Move_CONVERSION:
 	delay 3
 	createsprite gUnknown_08592E74, 2, 24, 24
 	delay 20
-	playsewithpan SE_W112, -64
+	playsewithpan SE_W112, SOUND_PAN_ATTACKER
 	createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0
 	delay 6
 	createvisualtask sub_81022D4, 5
@@ -2342,7 +2342,7 @@ Move_CONVERSION_2:
 	monbgprio_2A ANIM_TARGET
 	setalpha 0, 16
 	delay 0
-	playsewithpan SE_W112, +63
+	playsewithpan SE_W112, SOUND_PAN_TARGET
 	createsprite gUnknown_08592EA4, 2, -24, -24, 60
 	createsprite gUnknown_08592EA4, 2, -8, -24, 65
 	createsprite gUnknown_08592EA4, 2, 8, -24, 70
@@ -2361,21 +2361,21 @@ Move_CONVERSION_2:
 	createsprite gUnknown_08592EA4, 2, 24, 24, 135
 	createvisualtask sub_81023E0, 5
 	delay 60
-	playsewithpan SE_W129, +63
+	playsewithpan SE_W129, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, +63
+	playsewithpan SE_W129, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, +63
+	playsewithpan SE_W129, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, +63
+	playsewithpan SE_W129, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, +63
+	playsewithpan SE_W129, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, +63
+	playsewithpan SE_W129, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, +63
+	playsewithpan SE_W129, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, +63
+	playsewithpan SE_W129, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -2387,14 +2387,14 @@ Move_ROLLING_KICK:
 	monbg ANIM_TARGET
 	setalpha 12, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 6
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
 	createsprite gUnknown_08595EE0, 2, -24, 0, 48, 10, 160, 0
 	delay 5
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	waitforvisualfinish
@@ -2406,7 +2406,7 @@ Move_ROLLING_KICK:
 Move_HEADBUTT:
 	loadspritegfx ANIM_TAG_135
 	createsprite gUnknown_08592CD8, 2, 0
-	playsewithpan SE_W029, -64
+	playsewithpan SE_W029, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 2
 	createsprite gUnknown_08592CD8, 2, 1
@@ -2415,7 +2415,7 @@ Move_HEADBUTT:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gUnknown_08592CD8, 2, 2
 	createsprite gUnknown_085973E8, 131, 0, 0, 1, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -2423,7 +2423,7 @@ Move_HORN_ATTACK:
 	loadspritegfx ANIM_TAG_135
 	loadspritegfx ANIM_TAG_HORN_HIT
 	createsprite gUnknown_08592CD8, 2, 0
-	playsewithpan SE_W029, -64
+	playsewithpan SE_W029, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 2
 	createsprite gUnknown_08592CD8, 2, 1
@@ -2433,7 +2433,7 @@ Move_HORN_ATTACK:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gUnknown_08592CD8, 2, 2
 	createsprite gUnknown_085973E8, 131, 0, 0, 1, 1
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -2451,14 +2451,14 @@ FuryAttackRight:
 	createsprite gUnknown_08592F44, 132, 8, 8, 10
 	waitforvisualfinish
 	createsprite gUnknown_085973E8, 131, 0, 0, 1, 1
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	goto FuryAttackContinue
 
 FuryAttackLeft:
 	createsprite gUnknown_08592F44, 132, -8, -8, 10
 	waitforvisualfinish
 	createsprite gUnknown_085973E8, 131, 0, 0, 1, 1
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	goto FuryAttackContinue
 
 Move_HORN_DRILL:
@@ -2472,7 +2472,7 @@ HornDrillContinue:
 	waitbgfadein
 	setalpha 12, 8
 	createsprite gUnknown_08592CD8, 2, 0
-	playsewithpan SE_W029, -64
+	playsewithpan SE_W029, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 2
 	createsprite gUnknown_08592CD8, 2, 1
@@ -2482,37 +2482,37 @@ HornDrillContinue:
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1
 	createsprite gUnknown_085973E8, 131, 0, 0, 1, 3
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, 0, 2, 1, 3
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, -4, 3, 1, 3
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, -8, -5, 1, 3
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, 4, -12, 1, 3
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, 16, 0, 1, 3
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, 5, 18, 1, 3
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, -17, 12, 1, 2
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, -21, -15, 1, 2
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, 8, -27, 1, 2
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973E8, 131, 32, 0, 1, 2
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08592CD8, 2, 2
 	waitforvisualfinish
@@ -2535,15 +2535,15 @@ Move_THRASH:
 	createvisualtask sub_8104CA4, 2
 	createsprite gUnknown_08595EB0, 131, 1, 10, 0
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 28
 	createsprite gUnknown_08595EB0, 131, 1, 10, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 28
 	createsprite gUnknown_08595EB0, 131, 1, 10, 3
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	end
 
 Move_SING:
@@ -2551,7 +2551,7 @@ Move_SING:
 	monbg ANIM_DEF_PARTNER
 	createvisualtask sub_8102BE8, 2
 	waitforvisualfinish
-	panse_1B SE_W047, -64, +63, +2, 0
+	panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createsprite gUnknown_08593008, 130, 7, 0, 12
 	delay 5
 	createsprite gUnknown_08593008, 130, 6, 1, 12
@@ -2590,7 +2590,7 @@ Move_LOW_KICK:
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2
 	createvisualtask sub_80D6134, 2, 6, 384, 1, 2
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4
 	end
@@ -2609,7 +2609,7 @@ Move_FISSURE:
 	loadspritegfx ANIM_TAG_074
 	createvisualtask sub_81152DC, 3, 5, 10, 50
 	createvisualtask sub_81152DC, 3, 1, 10, 50
-	playsewithpan SE_W089, +63
+	playsewithpan SE_W089, SOUND_PAN_TARGET
 	delay 8
 	call Fissure1
 	delay 15
@@ -2637,7 +2637,7 @@ Fissure1:
 	createsprite gUnknown_085971FC, 130, 1, 0, 16, -16, -10, 24
 	createsprite gUnknown_085971FC, 130, 1, 1, 14, -52, -18, 24
 	createsprite gUnknown_085971FC, 130, 1, 1, 12, -32, -16, 24
-	playsewithpan SE_W091, +63
+	playsewithpan SE_W091, SOUND_PAN_TARGET
 	return
 
 Fissure2:
@@ -2645,7 +2645,7 @@ Fissure2:
 	createsprite gUnknown_085971FC, 130, 1, 0, 16, -38, -10, 24
 	createsprite gUnknown_085971FC, 130, 1, 1, 14, -20, -18, 24
 	createsprite gUnknown_085971FC, 130, 1, 1, 12, -36, -16, 24
-	playsewithpan SE_W091, +63
+	playsewithpan SE_W091, SOUND_PAN_TARGET
 	return
 
 Move_DIG:
@@ -2684,7 +2684,7 @@ DigUnleash:
 	delay 16
 	createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
-	playsewithpan SE_W025B, -64
+	playsewithpan SE_W025B, SOUND_PAN_ATTACKER
 	clearmonbg ANIM_ATTACKER
 	goto DigEnd
 DigSetUp1:
@@ -2692,16 +2692,16 @@ DigSetUp1:
 	createsprite gUnknown_085971FC, 2, 0, 0, 16, 4, -10, 18
 	createsprite gUnknown_085971FC, 2, 0, 1, 14, 4, -18, 18
 	createsprite gUnknown_085971FC, 2, 0, 1, 12, 4, -16, 18
-	playsewithpan SE_W091, -64
+	playsewithpan SE_W091, SOUND_PAN_ATTACKER
 	delay 32
 	return
 
 Move_MEDITATE:
 	call SetPsychicBackground
 	createvisualtask sub_810F7D4, 2
-	playsewithpan SE_W029, -64
+	playsewithpan SE_W029, SOUND_PAN_ATTACKER
 	delay 16
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	call UnsetPsychicBackground
 	end
@@ -2711,15 +2711,15 @@ Move_AGILITY:
 	setalpha 12, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4
 	createvisualtask sub_81169C0, 2, 0, 4, 7, 10
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 12
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -2733,11 +2733,11 @@ Move_QUICK_ATTACK:
 	setalpha 12, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
 	createvisualtask sub_81169C0, 2, 0, 4, 7, 3
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	delay 4
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -2751,16 +2751,16 @@ Move_RAGE:
 	setalpha 12, 8
 	createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2
 	createsprite gUnknown_0859368C, 2, 0, -20, -28
-	playsewithpan SE_W207B, -64
+	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
 	delay 20
 	createsprite gUnknown_0859368C, 2, 0, 20, -28
-	playsewithpan SE_W207B, -64
+	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	createvisualtask sub_80D6388, 2, 1, 1, 10, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	end
@@ -2768,7 +2768,7 @@ Move_RAGE:
 Move_TELEPORT:
 	call SetPsychicBackground
 	createvisualtask sub_810F83C, 2
-	playsewithpan SE_W100, -64
+	playsewithpan SE_W100, SOUND_PAN_ATTACKER
 	delay 15
 	call UnsetPsychicBackground
 	waitforvisualfinish
@@ -2778,23 +2778,23 @@ Move_DOUBLE_TEAM:
 	createvisualtask sub_81029B4, 2
 	setalpha 12, 8
 	monbg ANIM_ATK_PARTNER
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 32
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 24
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 16
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -2804,7 +2804,7 @@ Move_DOUBLE_TEAM:
 Move_MINIMIZE:
 	setalpha 10, 8
 	createvisualtask sub_8104674, 2
-	loopsewithpan SE_W107, -64, 34, 3
+	loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3
 	waitforvisualfinish
 	blendoff
 	end
@@ -2813,11 +2813,11 @@ Move_METRONOME:
 	loadspritegfx ANIM_TAG_064
 	loadspritegfx ANIM_TAG_209
 	createsprite gUnknown_08593114, 11, 0, 100
-	playsewithpan SE_W118, -64
+	playsewithpan SE_W118, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gUnknown_085931BC, 12, 0
 	delay 24
-	loopsewithpan SE_W039, -64, 22, 3
+	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3
 	waitforvisualfinish
 	end
 
@@ -2832,7 +2832,7 @@ SkullBashSetUp:
 	goto SkullBashEnd
 SkullBashSetUp1:
 	createsprite gUnknown_0857FE88, 2, 0, -24, 0, 0, 10, 0
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask sub_80D6134, 2, 16, 96, 0, 2
 	waitforvisualfinish
@@ -2842,14 +2842,14 @@ SkullBashSetUp1:
 SkullBashAttack:
 	loadspritegfx ANIM_TAG_135
 	createvisualtask sub_8101C94, 2, 0
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	playse SE_BAN
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1
 	createsprite gUnknown_085973E8, 132, 0, 0, 1, 0
-	loopsewithpan SE_W025B, +63, 8, 3
+	loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3
 	waitforvisualfinish
 	createvisualtask sub_8101C94, 2, 1
 	goto SkullBashEnd
@@ -2859,9 +2859,9 @@ Move_AMNESIA:
 	call SetPsychicBackground
 	delay 8
 	createsprite gUnknown_08596744, 20
-	playsewithpan SE_W118, -64
+	playsewithpan SE_W118, SOUND_PAN_ATTACKER
 	delay 54
-	loopsewithpan SE_W118, -64, 16, 3
+	loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3
 	waitforvisualfinish
 	call UnsetPsychicBackground
 	end
@@ -2869,18 +2869,18 @@ Move_AMNESIA:
 Move_KINESIS:
 	loadspritegfx ANIM_TAG_075
 	loadspritegfx ANIM_TAG_BENT_SPOON
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	createsprite gUnknown_085966DC, 20
 	createsprite gUnknown_08593344, 19, 32, -8, 0
 	createsprite gUnknown_08593344, 19, 32, 16, 1
-	loopsewithpan SE_W109, -64, 21, 2
+	loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2
 	delay 60
-	playsewithpan SE_W146, -64
+	playsewithpan SE_W146, SOUND_PAN_ATTACKER
 	delay 30
-	loopsewithpan SE_W146, -64, 20, 2
+	loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2
 	delay 70
-	playsewithpan SE_W207B, -64
+	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	call UnsetPsychicBackground
 	end
@@ -2889,14 +2889,14 @@ Move_GLARE:
 	loadspritegfx ANIM_TAG_248
 	loadspritegfx ANIM_TAG_218
 	createvisualtask sub_815E114, 5, 0
-	playsewithpan SE_W060B, -64
+	playsewithpan SE_W060B, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK
 	waitforvisualfinish
 	createsprite gUnknown_08593A84, 0, -16, -8
 	createsprite gUnknown_08593A84, 0, 16, -8
 	createvisualtask sub_81064F8, 5
-	playsewithpan SE_W043, -64
+	playsewithpan SE_W043, SOUND_PAN_ATTACKER
 	delay 2
 	createvisualtask sub_810A094, 3, 20, 1, 0
 	waitforvisualfinish
@@ -2906,12 +2906,12 @@ Move_GLARE:
 Move_BARRAGE:
 	loadspritegfx ANIM_TAG_254
 	createvisualtask sub_815E47C, 3
-	playsewithpan SE_W207, -64
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 8, 1, 40, 1
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1
-	loopsewithpan SE_W070, +63, 8, 2
+	loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2
 	end
 
 Move_SKY_ATTACK:
@@ -2930,7 +2930,7 @@ SkyAttackSetUpAgainstOpponent:
 	delay 12
 	createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK
 	createvisualtask sub_81152DC, 5, 0, 2, 16
-	loopsewithpan SE_W287, -64, 4, 8
+	loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8
 	createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE
 	delay 20
 	createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE
@@ -2946,7 +2946,7 @@ SkyAttackSetUpAgainstPartner:
 	delay 12
 	createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK
 	createvisualtask sub_81152DC, 5, 0, 2, 16
-	playsewithpan SE_W287, -64
+	playsewithpan SE_W287, SOUND_PAN_ATTACKER
 	delay 8
 	createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE
 	delay 20
@@ -2966,11 +2966,11 @@ SkyAttackUnleash:
 	delay 4
 	createvisualtask sub_81136E8, 5, 0
 	waitforvisualfinish
-	createvisualtask sub_8159244, 5, 238, -64
+	createvisualtask sub_8159244, 5, 238, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596514, 130
 	delay 14
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
-	createvisualtask sub_8159210, 5, 141, 63
+	createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET
 	delay 20
 	createvisualtask sub_81137E4, 5, 1
 	delay 2
@@ -2981,7 +2981,7 @@ SkyAttackUnleash:
 	goto SkyAttackEnd
 
 Move_FLASH:
-	playsewithpan SE_W043, -64
+	playsewithpan SE_W043, SOUND_PAN_ATTACKER
 	createvisualtask sub_8117494, 2
 	waitforvisualfinish
 	end
@@ -2989,7 +2989,7 @@ Move_FLASH:
 Move_SPLASH:
 	createvisualtask sub_8104938, 2, 0, 3
 	delay 8
-	loopsewithpan SE_W039, -64, 38, 3
+	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3
 	waitforvisualfinish
 	end
 
@@ -2997,7 +2997,7 @@ Move_ACID_ARMOR:
 	monbg ANIM_ATTACKER
 	setalpha 15, 0
 	createvisualtask sub_815D240, 2, 0
-	playsewithpan SE_W151, -64
+	playsewithpan SE_W151, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_ATTACKER
@@ -3013,7 +3013,7 @@ Move_SHARPEN:
 Move_SUPER_FANG:
 	loadspritegfx ANIM_TAG_192
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1
 	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1
@@ -3022,7 +3022,7 @@ Move_SUPER_FANG:
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
 	delay 4
 	createsprite gUnknown_08592F74, 130
-	playsewithpan SE_W044, +63
+	playsewithpan SE_W044, SOUND_PAN_TARGET
 	delay 8
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1
@@ -3033,11 +3033,11 @@ Move_SUPER_FANG:
 Move_SLASH:
 	loadspritegfx ANIM_TAG_183
 	createsprite gUnknown_08592D2C, 130, 1, -8, 0
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08592D2C, 130, 1, 8, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -3049,11 +3049,11 @@ Move_STRUGGLE:
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
 	createsprite gUnknown_08593B80, 2, 0, 0, 2
 	createsprite gUnknown_08593B80, 2, 0, 1, 2
-	loopsewithpan SE_W029, -64, 12, 4
+	loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -3067,7 +3067,7 @@ Move_SKETCH:
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	createvisualtask sub_8104938, 2, 0, 2
-	loopsewithpan SE_W039, -64, 38, 2
+	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2
 	end
 
 Move_NIGHTMARE:
@@ -3077,7 +3077,7 @@ Move_NIGHTMARE:
 	monbg ANIM_DEF_PARTNER
 	createvisualtask sub_8111C50, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1
-	playsewithpan SE_W171, +63
+	playsewithpan SE_W171, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	restorebg
@@ -3086,7 +3086,7 @@ Move_NIGHTMARE:
 NightmareInContest:
 	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1
-	playsewithpan SE_W171, +63
+	playsewithpan SE_W171, SOUND_PAN_TARGET
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3097,11 +3097,11 @@ Move_FLAIL:
 	monbg ANIM_TARGET
 	setalpha 12, 8
 	createvisualtask sub_815C770, 2, 0
-	loopsewithpan SE_W029, -64, 8, 2
+	loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2
 	waitforvisualfinish
 	createsprite gUnknown_085973A0, 131, 1, 3
 	createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -3109,12 +3109,12 @@ Move_FLAIL:
 
 Move_SPITE:
 	fadetobg BG_GHOST
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	waitbgfadein
 	monbg ANIM_DEF_PARTNER
 	createvisualtask sub_8115A04, 2, 2, 2, 6, 0, 8, RGB_WHITE
 	createvisualtask sub_8111E50, 2
-	loopsewithpan SE_W060, +63, 20, 3
+	loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3135,11 +3135,11 @@ MachPunchContinue:
 	delay 0
 	setalpha 9, 8
 	createvisualtask sub_80A8BC4, 2, 28968, 10
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
 	createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -3160,13 +3160,13 @@ Move_FORESIGHT:
 	setalpha 16, 0
 	createsprite gUnknown_085CE8C4, 130, 1
 	delay 17
-	loopsewithpan SE_W166, +63, 16, 4
+	loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4
 	delay 48
 	delay 24
-	playsewithpan SE_W166, +63
+	playsewithpan SE_W166, SOUND_PAN_TARGET
 	delay 10
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1
-	playsewithpan SE_W197, +63
+	playsewithpan SE_W197, SOUND_PAN_TARGET
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER
@@ -3175,16 +3175,16 @@ Move_FORESIGHT:
 Move_DESTINY_BOND:
 	loadspritegfx ANIM_TAG_188
 	fadetobg BG_GHOST
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	waitbgfadein
 	createvisualtask sub_81123C4, 5, 0, 48
-	playsewithpan SE_W109, -64
+	playsewithpan SE_W109, SOUND_PAN_ATTACKER
 	delay 48
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1
 	createvisualtask sub_8116664, 2, 6, 1, 0, 12, RGB(29, 29, 29)
 	delay 24
 	createvisualtask sub_8116664, 2, 6, 1, 12, 0, RGB(29, 29, 29)
-	playsewithpan SE_W171, +63
+	playsewithpan SE_W171, SOUND_PAN_TARGET
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3194,7 +3194,7 @@ Move_DESTINY_BOND:
 
 Move_ENDURE:
 	loadspritegfx ANIM_TAG_184
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	call EndureEffect
 	delay 8
 	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED
@@ -3221,13 +3221,13 @@ Move_CHARM:
 	loadspritegfx ANIM_TAG_PURPLE_HEART
 	createvisualtask sub_815C478, 5, 0, 2, 0
 	createsprite gUnknown_08593970, 3, 0, 20
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	delay 15
 	createsprite gUnknown_08593970, 3, -20, 20
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	delay 15
 	createsprite gUnknown_08593970, 3, 20, 20
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	end
 
@@ -3242,7 +3242,7 @@ Move_ROLLOUT:
 	waitforvisualfinish
 	createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -3252,44 +3252,44 @@ Move_FALSE_SWIPE:
 	loadspritegfx ANIM_TAG_286
 	loadspritegfx ANIM_TAG_135
 	createsprite gUnknown_08592D44, 130
-	playsewithpan SE_W233, +63
+	playsewithpan SE_W233, SOUND_PAN_TARGET
 	delay 16
 	createsprite gUnknown_08592D5C, 130, 0
-	playsewithpan SE_W104, +63
+	playsewithpan SE_W104, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08592D5C, 130, 16
 	delay 2
 	createsprite gUnknown_08592D5C, 130, 32
-	playsewithpan SE_W104, +63
+	playsewithpan SE_W104, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08592D5C, 130, 48
 	delay 2
 	createsprite gUnknown_08592D5C, 130, 64
-	playsewithpan SE_W104, +63
+	playsewithpan SE_W104, SOUND_PAN_TARGET
 	delay 2
 	createsprite gUnknown_08592D5C, 130, 80
 	delay 2
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	end
 
 Move_SWAGGER:
 	loadspritegfx ANIM_TAG_086
 	loadspritegfx ANIM_TAG_ANGER
 	createvisualtask sub_8104AB4, 2
-	playsewithpan SE_W207, -64
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gUnknown_08593658, 2
-	loopsewithpan SE_W207, -64, 4, 2
+	loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2
 	waitforvisualfinish
 	delay 24
 	createsprite gUnknown_0859368C, 130, 1, -20, -28
-	playsewithpan SE_W207B, +63
+	playsewithpan SE_W207B, SOUND_PAN_TARGET
 	delay 12
 	createsprite gUnknown_0859368C, 130, 1, 20, -28
-	playsewithpan SE_W207B, +63
+	playsewithpan SE_W207B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -3300,14 +3300,14 @@ Move_MILK_DRINK:
 	monbg ANIM_TARGET
 	createsprite gUnknown_08592B3C, 2
 	delay 40
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	delay 20
-	playsewithpan SE_W152, -64
+	playsewithpan SE_W152, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gUnknown_0859381C, 3, 0, 0, 1, 0
-	playsewithpan SE_W208, -64
+	playsewithpan SE_W208, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	call HealingEffect2
@@ -3324,12 +3324,12 @@ MagnitudeEnd:
 MagnitudeRegular:
 	createvisualtask sub_81152DC, 5, 5, 0, 50
 	createvisualtask sub_81152DC, 5, 4, 0, 50
-	loopsewithpan SE_W070, +63, 8, 10
+	loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10
 	goto MagnitudeEnd
 MagnitudeIntense:
 	createvisualtask sub_81152DC, 5, 5, 0, 50
 	createvisualtask sub_81152DC, 5, 4, 0, 50
-	loopsewithpan SE_W070, +63, 8, 10
+	loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10
 	delay 10
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
 	delay 16
@@ -3342,15 +3342,15 @@ Move_RAPID_SPIN:
 	monbg ANIM_ATTACKER
 	createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2
 	createvisualtask sub_815ADB0, 2, 0, 2, 0
-	loopsewithpan SE_W013B, -64, 8, 4
+	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
 	createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	waitforvisualfinish
 	delay 8
 	createvisualtask sub_815ADB0, 2, 0, 2, 1
-	loopsewithpan SE_W013B, -64, 8, 4
+	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	end
@@ -3393,7 +3393,7 @@ ExtremeSpeedContinue:
 	createvisualtask sub_8117660, 5, -2304, 0, 1, -1
 	waitbgfadein
 	createvisualtask sub_810577C, 2
-	loopsewithpan SE_W013B, -64, 8, 3
+	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3
 	waitforvisualfinish
 	delay 1
 	createvisualtask sub_8117F60, 2
@@ -3402,19 +3402,19 @@ ExtremeSpeedContinue:
 	delay 18
 	createvisualtask sub_8105810, 2
 	delay 2
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, -12, 3
 	delay 10
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 12, 3
 	delay 10
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 0, 3
 	waitforvisualfinish
 	createvisualtask sub_8105AAC, 2
 	delay 10
 	createvisualtask sub_810599C, 2
-	loopsewithpan SE_W104, -64, 8, 4
+	loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4
 	waitforvisualfinish
 	restorebg
 	waitbgfadeout
@@ -3436,19 +3436,19 @@ Move_UPROAR:
 	monbg ANIM_DEF_PARTNER
 	createvisualtask sub_8106D90, 2, 0
 	createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8
-	playsewithpan SE_W253, -64
+	playsewithpan SE_W253, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 29, -12, 0
 	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -12, -29, 1
 	delay 16
 	createvisualtask sub_8106D90, 2, 0
 	createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8
-	playsewithpan SE_W253, -64
+	playsewithpan SE_W253, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 12, -29, 1
 	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -29, -12, 0
 	delay 16
 	createvisualtask sub_8106D90, 2, 0
 	createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8
-	playsewithpan SE_W253, -64
+	playsewithpan SE_W253, SOUND_PAN_ATTACKER
 	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 24, -24, 1
 	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -24, -24, 0
 	waitforvisualfinish
@@ -3460,7 +3460,7 @@ Move_HEAT_WAVE:
 	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_261, 0, 6, 6, RGB_RED
 	createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE
 	createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED
-	panse_1B SE_W257, -64, +63, +2, 0
+	panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	delay 4
 	createvisualtask sub_8109DBC, 5
 	delay 12
@@ -3497,10 +3497,10 @@ Move_TORMENT:
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1
 	createsprite gUnknown_0859368C, 130, 1, -20, -28
-	playsewithpan SE_W207B, +63
+	playsewithpan SE_W207B, SOUND_PAN_TARGET
 	delay 20
 	createsprite gUnknown_0859368C, 130, 1, 20, -28
-	playsewithpan SE_W207B, +63
+	playsewithpan SE_W207B, SOUND_PAN_TARGET
 	end
 
 Move_MEMENTO:
@@ -3509,9 +3509,9 @@ Move_MEMENTO:
 	createvisualtask sub_81143C0, 2
 	delay 1
 	createvisualtask sub_8113BAC, 5
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	delay 48
-	playsewithpan SE_W060B, -64
+	playsewithpan SE_W060B, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask sub_8114470, 2
 	delay 12
@@ -3519,7 +3519,7 @@ Move_MEMENTO:
 	delay 1
 	monbg_22 ANIM_TARGET
 	createvisualtask sub_8113E78, 5
-	playsewithpan SE_W060, +63
+	playsewithpan SE_W060, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg_23 ANIM_TARGET
 	delay 1
@@ -3531,7 +3531,7 @@ Move_FACADE:
 	loadspritegfx ANIM_TAG_243
 	createvisualtask sub_815DCA4, 2, 0, 3
 	createvisualtask sub_815DF0C, 2, 0, 72
-	loopsewithpan SE_W207, -64, 24, 3
+	loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3
 	end
 
 Move_SMELLING_SALT:
@@ -3541,22 +3541,22 @@ Move_SMELLING_SALT:
 	createsprite gUnknown_085CE864, 130, 1, 1, 2
 	delay 32
 	createvisualtask sub_815E840, 3, 1, 2
-	loopsewithpan SE_W003, +63, 12, 2
+	loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2
 	waitforvisualfinish
 	delay 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2
 	createsprite gUnknown_085CE894, 130, 1, 8, 3
-	loopsewithpan SE_W207B, +63, 16, 3
+	loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3
 	end
 
 Move_FOLLOW_ME:
 	loadspritegfx ANIM_TAG_064
 	createsprite gUnknown_085931D4, 2, 0
-	playsewithpan SE_W039, -64
+	playsewithpan SE_W039, SOUND_PAN_ATTACKER
 	delay 18
-	playsewithpan SE_W213, -64
+	playsewithpan SE_W213, SOUND_PAN_ATTACKER
 	delay 71
-	loopsewithpan SE_W039, -64, 22, 3
+	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3
 	end
 
 Move_CHARGE:
@@ -3568,26 +3568,26 @@ Move_CHARGE:
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask sub_810AAFC, 2, 0, 60, 2, 12
-	playsewithpan SE_W268, -64
+	playsewithpan SE_W268, SOUND_PAN_ATTACKER
 	delay 30
-	playsewithpan SE_W268, -64
+	playsewithpan SE_W268, SOUND_PAN_ATTACKER
 	delay 30
-	playsewithpan SE_W268, -64
+	playsewithpan SE_W268, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0859595C, 2, 0
 	delay 25
-	playsewithpan SE_W268, -64
+	playsewithpan SE_W268, SOUND_PAN_ATTACKER
 	delay 20
-	playsewithpan SE_W268, -64
+	playsewithpan SE_W268, SOUND_PAN_ATTACKER
 	delay 15
-	playsewithpan SE_W268, -64
+	playsewithpan SE_W268, SOUND_PAN_ATTACKER
 	delay 10
 	delay 6
-	loopsewithpan SE_W268, -64, 6, 5
+	loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5
 	waitforvisualfinish
 	createsprite gUnknown_0859598C, 2, 0, 16, 16
 	delay 2
 	createsprite gUnknown_0859598C, 2, 0, -16, -16
-	playsewithpan SE_W085B, -64
+	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK
 	clearmonbg ANIM_ATTACKER
@@ -3599,19 +3599,19 @@ Move_TAUNT:
 	loadspritegfx ANIM_TAG_209
 	loadspritegfx ANIM_TAG_ANGER
 	createsprite gUnknown_08593114, 11, 0, 45
-	playsewithpan SE_W118, -64
+	playsewithpan SE_W118, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gUnknown_0859324C, 12, 0
 	delay 4
-	loopsewithpan SE_W039, -64, 16, 2
+	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2
 	waitforvisualfinish
 	delay 8
 	createsprite gUnknown_0859368C, 130, 1, -20, -28
-	playsewithpan SE_W207B, +63
+	playsewithpan SE_W207B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	delay 12
 	createsprite gUnknown_0859368C, 130, 1, 20, -28
-	playsewithpan SE_W207B, +63
+	playsewithpan SE_W207B, SOUND_PAN_TARGET
 	end
 
 Move_HELPING_HAND:
@@ -3656,7 +3656,7 @@ Move_SUPERPOWER:
 	monbgprio_28 ANIM_ATTACKER
 	setalpha 12, 8
 	createsprite gUnknown_08595FEC, 130, 0
-	playsewithpan SE_W025, -64
+	playsewithpan SE_W025, SOUND_PAN_ATTACKER
 	delay 20
 	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1
 	createvisualtask sub_8159244, 5, 234, 0
@@ -3672,10 +3672,10 @@ Move_SUPERPOWER:
 	createsprite gUnknown_08596004, 41, 60, 288, 3, 88
 	delay 74
 	createsprite gUnknown_0859601C, 131, 0
-	playsewithpan SE_W207, -64
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
 	delay 16
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -3688,10 +3688,10 @@ Move_RECYCLE:
 	setalpha 0, 16
 	delay 1
 	createsprite gUnknown_085CE9B0, 2
-	loopsewithpan SE_W036, -64, 24, 3
+	loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_ATTACKER
@@ -3711,19 +3711,19 @@ BrickBreakNormal:
 	delay 4
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1
-	playsewithpan SE_W233, +63
+	playsewithpan SE_W233, SOUND_PAN_TARGET
 	delay 20
 	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1
-	playsewithpan SE_W233, +63
+	playsewithpan SE_W233, SOUND_PAN_TARGET
 	delay 20
 	createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK
 	delay 37
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
 	createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK
 	waitforvisualfinish
@@ -3737,25 +3737,25 @@ BrickBreakShatteredWall:
 	createsprite gUnknown_08595F90, 3, 1, 0, 0, 90, 10
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1
-	playsewithpan SE_W233, +63
+	playsewithpan SE_W233, SOUND_PAN_TARGET
 	delay 20
 	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1
-	playsewithpan SE_W233, +63
+	playsewithpan SE_W233, SOUND_PAN_TARGET
 	delay 20
 	createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK
 	delay 37
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
 	createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gUnknown_08595FA8, 2, 1, 0, -8, -12
 	createsprite gUnknown_08595FA8, 2, 1, 1, 8, -12
 	createsprite gUnknown_08595FA8, 2, 1, 2, -8, 12
 	createsprite gUnknown_08595FA8, 2, 1, 3, 8, 12
-	playsewithpan SE_W280, +63
+	playsewithpan SE_W280, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK
 	waitforvisualfinish
@@ -3765,33 +3765,33 @@ BrickBreakShatteredWall:
 Move_YAWN:
 	loadspritegfx ANIM_TAG_242
 	createvisualtask sub_815D64C, 2, 0
-	playsewithpan SE_W281, -64
+	playsewithpan SE_W281, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gUnknown_085CE68C, 133, 2
-	playsewithpan SE_W255, -64
+	playsewithpan SE_W255, SOUND_PAN_ATTACKER
 	delay 4
 	createsprite gUnknown_085CE68C, 133, 1
 	delay 4
 	createsprite gUnknown_085CE68C, 133, 0
 	waitforvisualfinish
 	createvisualtask sub_815D64C, 2, 1
-	playsewithpan SE_W281, +63
+	playsewithpan SE_W281, SOUND_PAN_TARGET
 	end
 
 Move_ENDEAVOR:
 	loadspritegfx ANIM_TAG_243
 	loadspritegfx ANIM_TAG_135
 	createvisualtask sub_815DCA4, 2, 0, 2
-	loopsewithpan SE_W039, -64, 24, 2
+	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2
 	delay 6
 	createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	delay 24
 	createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	end
 
 Move_ERUPTION:
@@ -3799,10 +3799,10 @@ Move_ERUPTION:
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED
 	waitforvisualfinish
 	createvisualtask sub_8109460, 2
-	waitplaysewithpan SE_W153, -64, 60
+	waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60
 	waitforvisualfinish
 	createvisualtask sub_8109460, 2
-	waitplaysewithpan SE_W153, -64, 60
+	waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60
 	waitforvisualfinish
 	delay 30
 	createsprite gUnknown_085955E8, 40, 200, -32, 0, 100, 0
@@ -3814,7 +3814,7 @@ Move_ERUPTION:
 	delay 22
 	createvisualtask sub_81152DC, 5, 5, 8, 60
 	createvisualtask sub_81152DC, 5, 4, 8, 60
-	loopsewithpan SE_W088, +63, 16, 12
+	loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12
 	delay 80
 	createsprite gSimplePaletteBlendSpriteTemplate, 40, 31, 4, 4, 0, RGB_RED
 	end
@@ -3824,7 +3824,7 @@ Move_SKILL_SWAP:
 	call SetPsychicBackground
 	createvisualtask sub_810FBF0, 3, 1
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1
-	loopsewithpan SE_W179, -64, 24, 3
+	loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3
 	delay 16
 	createvisualtask sub_810FBF0, 3, 0
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1
@@ -3839,12 +3839,12 @@ Move_IMPRISON:
 	monbg ANIM_DEF_PARTNER
 	createvisualtask sub_810F940, 5
 	delay 8
-	loopsewithpan SE_W030, -64, 8, 5
+	loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5
 	waitforvisualfinish
 	delay 4
 	createsprite gUnknown_085967AC, 5, 0, 40
 	createvisualtask sub_81152DC, 5, 4, 1, 10
-	playsewithpan SE_W063, -64
+	playsewithpan SE_W063, SOUND_PAN_ATTACKER
 	clearmonbg ANIM_DEF_PARTNER
 	call UnsetPsychicBackground
 	end
@@ -3854,13 +3854,13 @@ Move_GRUDGE:
 	monbg ANIM_ATTACKER
 	monbgprio_29
 	fadetobg BG_GHOST
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	waitbgfadein
 	createvisualtask sub_8112C6C, 3
-	loopsewithpan SE_W052, -64, 16, 4
+	loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4
 	delay 10
 	delay 80
-	playsewithpan SE_W171, +63
+	playsewithpan SE_W171, SOUND_PAN_TARGET
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3874,7 +3874,7 @@ Move_CAMOUFLAGE:
 	createvisualtask sub_811675C, 5, 2, 3, 0, 14
 	delay 16
 	createvisualtask sub_81136E8, 2, 4
-	playsewithpan SE_W185, -64
+	playsewithpan SE_W185, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 8
 	createvisualtask sub_811675C, 5, 2, 0, 0, 0
@@ -3893,7 +3893,7 @@ Move_TAIL_GLOW:
 	waitforvisualfinish
 	createsprite gUnknown_08596AC8, 66, 0
 	delay 18
-	loopsewithpan SE_W234, -64, 16, 6
+	loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK
 	clearmonbg ANIM_ATTACKER
@@ -3910,7 +3910,7 @@ Move_LUSTER_PURGE:
 	waitbgfadein
 	monbg ANIM_ATTACKER
 	setalpha 12, 8
-	playsewithpan SE_W076, -64
+	playsewithpan SE_W076, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596898, 41, 0, 0, 0, 0
 	delay 20
 	createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA
@@ -3919,22 +3919,22 @@ Move_LUSTER_PURGE:
 	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_135, 0, 12, 12, RGB(0, 0, 23)
 	waitforvisualfinish
 	createsprite gUnknown_085973A0, 131, 1, 2
-	createvisualtask sub_8159210, 5, 215, 63
+	createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET
 	delay 3
 	createsprite gUnknown_085973A0, 131, 1, 2
-	createvisualtask sub_8159210, 5, 215, 63
+	createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET
 	delay 3
 	createsprite gUnknown_085973A0, 131, 1, 2
-	createvisualtask sub_8159210, 5, 215, 63
+	createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET
 	delay 3
 	createsprite gUnknown_085973A0, 131, 1, 2
-	createvisualtask sub_8159210, 5, 215, 63
+	createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET
 	delay 3
 	createsprite gUnknown_085973A0, 131, 1, 2
-	createvisualtask sub_8159210, 5, 215, 63
+	createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET
 	delay 3
 	createsprite gUnknown_085973A0, 131, 1, 2
-	createvisualtask sub_8159210, 5, 215, 63
+	createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_8116664, 5, 5, 2, 16, 0, RGB_WHITEALPHA
 	createvisualtask sub_81152DC, 5, 1, 5, 14
@@ -3948,10 +3948,10 @@ Move_MIST_BALL:
 	loadspritegfx ANIM_TAG_155
 	loadspritegfx ANIM_TAG_270
 	delay 0
-	playsewithpan SE_W081, -64
+	playsewithpan SE_W081, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0
 	waitforvisualfinish
-	playsewithpan SE_W028, +63
+	playsewithpan SE_W028, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0
 	createsprite gComplexPaletteBlendSpriteTemplate, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16
 	delay 0
@@ -3968,7 +3968,7 @@ Move_FEATHER_DANCE:
 	loadspritegfx ANIM_TAG_270
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
-	playsewithpan SE_W080, +63
+	playsewithpan SE_W080, SOUND_PAN_TARGET
 	delay 0
 	createsprite gUnknown_08596388, 128, 0, -16, 64, 2, 104, 11304, 32, 1
 	delay 6
@@ -3991,19 +3991,19 @@ Move_TEETER_DANCE:
 	loadspritegfx ANIM_TAG_DUCK
 	createvisualtask sub_8160164, 5
 	createsprite gUnknown_08593050, 2, 0, 16, -2
-	playsewithpan SE_W298, -64
+	playsewithpan SE_W298, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gUnknown_08593050, 2, 0, 0, -2
-	playsewithpan SE_W298, -64
+	playsewithpan SE_W298, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gUnknown_08593050, 2, 0, -16, -2
-	playsewithpan SE_W298, -64
+	playsewithpan SE_W298, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gUnknown_08593050, 2, 1, -8, -2
-	playsewithpan SE_W298, -64
+	playsewithpan SE_W298, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gUnknown_08593050, 2, 2, 8, -2
-	playsewithpan SE_W298, -64
+	playsewithpan SE_W298, SOUND_PAN_ATTACKER
 	end
 
 Move_MUD_SPORT:
@@ -4012,15 +4012,15 @@ Move_MUD_SPORT:
 	delay 24
 	createsprite gUnknown_085971E4, 130, 0, -4, -16
 	createsprite gUnknown_085971E4, 130, 0, 4, -12
-	playsewithpan SE_W091, -64
+	playsewithpan SE_W091, SOUND_PAN_ATTACKER
 	delay 32
 	createsprite gUnknown_085971E4, 130, 0, -3, -12
 	createsprite gUnknown_085971E4, 130, 0, 5, -14
-	playsewithpan SE_W091, -64
+	playsewithpan SE_W091, SOUND_PAN_ATTACKER
 	delay 32
 	createsprite gUnknown_085971E4, 130, 0, -5, -18
 	createsprite gUnknown_085971E4, 130, 0, 3, -14
-	playsewithpan SE_W091, -64
+	playsewithpan SE_W091, SOUND_PAN_ATTACKER
 	delay 16
 	createsprite gUnknown_085971E4, 130, 1, 220, 60
 	waitplaysewithpan SE_W145B, 0, 15
@@ -4057,7 +4057,7 @@ Move_NEEDLE_ARM:
 	loadspritegfx ANIM_TAG_266
 	loadspritegfx ANIM_TAG_135
 	loadspritegfx ANIM_TAG_143
-	loopsewithpan SE_W030, +63, 2, 16
+	loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16
 	createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16
 	delay 2
 	createsprite gUnknown_08592888, 130, 1, 0, 22, -22, 16
@@ -4085,7 +4085,7 @@ Move_NEEDLE_ARM:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
 	createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gUnknown_08592888, 130, 1, 1, 0, -24, 10
 	createsprite gUnknown_08592888, 130, 1, 1, 17, -17, 10
 	createsprite gUnknown_08592888, 130, 1, 1, 24, 0, 10
@@ -4099,7 +4099,7 @@ Move_NEEDLE_ARM:
 Move_SLACK_OFF:
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	createvisualtask sub_8160544, 2, 0
-	playsewithpan SE_W281, -64
+	playsewithpan SE_W281, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	call HealingEffect
 	waitforvisualfinish
@@ -4116,11 +4116,11 @@ Move_CRUSH_CLAW:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	delay 12
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_TARGET
@@ -4151,15 +4151,15 @@ Move_AROMATHERAPY:
 	delay 1
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 7, 0, RGB(13, 31, 12)
 	delay 1
-	playsewithpan SE_W287, -64
+	playsewithpan SE_W287, SOUND_PAN_ATTACKER
 	createvisualtask sub_815DFCC, 2, 1
 	waitforvisualfinish
-	playsewithpan SE_W234, -64
+	playsewithpan SE_W234, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1
 	delay 8
 	createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1
 	waitforvisualfinish
-	playsewithpan SE_REAPOKE, -64
+	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 43, 3, 10, 0, RGB(13, 31, 12)
 	createsprite gUnknown_08593868, 16, 0, 0, 0, 1
 	waitforvisualfinish
@@ -4172,7 +4172,7 @@ Move_FAKE_TEARS:
 	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31)
 	waitforvisualfinish
 	createvisualtask sub_815C478, 5, 0, 2, 1
-	loopsewithpan SE_W039, -64, 12, 4
+	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4
 	delay 8
 	createsprite gUnknown_085970E8, 2, 0, 0
 	createsprite gUnknown_085970E8, 2, 0, 1
@@ -4198,7 +4198,7 @@ Move_AIR_CUTTER:
 	delay 0
 	createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128
 	waitforvisualfinish
-	playsewithpan SE_W015, +63
+	playsewithpan SE_W015, SOUND_PAN_TARGET
 	createsprite gUnknown_08592A34, 2, 40, -32, 0, 2
 	delay 5
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -4214,15 +4214,15 @@ Move_ODOR_SLEUTH:
 	createvisualtask sub_815F620, 5
 	delay 24
 	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4
-	playsewithpan SE_W207, -64
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4
-	playsewithpan SE_W207, -64
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	delay 1
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0
-	playsewithpan SE_W043, -64
+	playsewithpan SE_W043, SOUND_PAN_ATTACKER
 	end
 
 Move_GRASS_WHISTLE:
@@ -4231,7 +4231,7 @@ Move_GRASS_WHISTLE:
 	waitforvisualfinish
 	createvisualtask sub_8102BE8, 2
 	waitforvisualfinish
-	panse_1B SE_W320, -64, +63, +2, 0
+	panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createsprite gUnknown_08593008, 130, 7, 1, 0
 	delay 5
 	createsprite gUnknown_08593008, 130, 6, 1, 0
@@ -4268,7 +4268,7 @@ Move_TICKLE:
 	waitforvisualfinish
 	createsprite gUnknown_08593A84, 0, -16, -8
 	createsprite gUnknown_08593A84, 0, 16, -8
-	playsewithpan SE_W197, -64
+	playsewithpan SE_W197, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 16, 0, RGB_BLACK
 	waitforvisualfinish
@@ -4276,7 +4276,7 @@ Move_TICKLE:
 	createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER
 	delay 12
 	createvisualtask sub_815C478, 3, 1, 6, 2
-	loopsewithpan SE_W039, +63, 8, 8
+	loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8
 	waitforvisualfinish
 	end
 
@@ -4286,13 +4286,13 @@ Move_WATER_SPOUT:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	createvisualtask sub_81080E4, 5
-	playsewithpan SE_W029, -64
+	playsewithpan SE_W029, SOUND_PAN_ATTACKER
 	delay 44
-	playsewithpan SE_W291, -64
+	playsewithpan SE_W291, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 16
 	createvisualtask sub_81085C8, 5
-	playsewithpan SE_W057, +63
+	playsewithpan SE_W057, SOUND_PAN_TARGET
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
@@ -4305,11 +4305,11 @@ Move_SHADOW_PUNCH:
 	monbg ANIM_ATK_PARTNER
 	setalpha 9, 8
 	createvisualtask sub_80A8BC4, 2, 0, 13
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
 	createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -4324,15 +4324,15 @@ Move_EXTRASENSORY:
 	setalpha 12, 8
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
 	createvisualtask sub_810FE14, 5, 0
-	playsewithpan SE_W020, +63
+	playsewithpan SE_W020, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
 	createvisualtask sub_810FE14, 5, 1
-	playsewithpan SE_W020, +63
+	playsewithpan SE_W020, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_8110034, 5, 0
 	createvisualtask sub_810FE14, 5, 2
-	playsewithpan SE_W043, -64
+	playsewithpan SE_W043, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER
@@ -4346,18 +4346,18 @@ Move_AERIAL_ACE:
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
 	createvisualtask sub_81169C0, 2, 0, 4, 7, 3
 	createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	delay 5
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_IRON_DEFENSE:
-	loopsewithpan SE_REAPOKE, -64, 28, 2
+	loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask sub_81144F8, 5, 0, 0, 0
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0
 	waitforvisualfinish
@@ -4366,7 +4366,7 @@ Move_IRON_DEFENSE:
 Move_BLOCK:
 	loadspritegfx ANIM_TAG_X_SIGN
 	createsprite gUnknown_085CE90C, 194
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	end
 
 Move_HOWL:
@@ -4382,10 +4382,10 @@ Move_HOWL:
 Move_BULK_UP:
 	loadspritegfx ANIM_TAG_086
 	createvisualtask sub_8104AB4, 2
-	playsewithpan SE_W207, -64
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gUnknown_08593658, 2
-	loopsewithpan SE_W207, -64, 4, 2
+	loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2
 	waitforvisualfinish
 	end
 
@@ -4394,16 +4394,16 @@ Move_COVET:
 	loadspritegfx ANIM_TAG_ITEM_BAG
 	createvisualtask sub_815C478, 5, 0, 2, 0
 	createsprite gUnknown_08593970, 3, 0, 20
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	delay 15
 	createsprite gUnknown_08593970, 3, -20, 20
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	delay 15
 	createsprite gUnknown_08593970, 3, 20, 20
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	loopsewithpan SE_W146, +63, 4, 3
+	loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3
 	end
 
 Move_VOLT_TACKLE:
@@ -4415,28 +4415,28 @@ Move_VOLT_TACKLE:
 	createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK
 	waitforvisualfinish
 	createsprite gUnknown_085959A4, 1
-	playsewithpan SE_W268, -64
+	playsewithpan SE_W268, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	blendoff
 	delay 8
 	createvisualtask sub_810AFCC, 5, 0
-	playsewithpan SE_W085, -64
+	playsewithpan SE_W085, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask sub_810AFCC, 5, 1
-	playsewithpan SE_W085, +63
+	playsewithpan SE_W085, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_810AFCC, 5, 2
-	playsewithpan SE_W085, -64
+	playsewithpan SE_W085, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask sub_810AFCC, 5, 3
-	playsewithpan SE_W085, +63
+	playsewithpan SE_W085, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_810AFCC, 5, 4
-	playsewithpan SE_W085, -64
+	playsewithpan SE_W085, SOUND_PAN_ATTACKER
 	delay 8
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gUnknown_0859598C, 2, 1, 16, 16
 	delay 2
 	createsprite gUnknown_0859598C, 2, 1, -16, -16
@@ -4444,7 +4444,7 @@ Move_VOLT_TACKLE:
 	createvisualtask sub_810AE5C, 5
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1
-	playsewithpan SE_W085B, -64
+	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0859598C, 2, 0, 16, 16
 	delay 2
 	createsprite gUnknown_0859598C, 2, 0, -16, -16
@@ -4457,13 +4457,13 @@ Move_WATER_SPORT:
 	loadspritegfx ANIM_TAG_268
 	createvisualtask sub_81088E4, 5
 	delay 8
-	playsewithpan SE_W057, -64
+	playsewithpan SE_W057, SOUND_PAN_ATTACKER
 	delay 44
-	playsewithpan SE_W057, -64
+	playsewithpan SE_W057, SOUND_PAN_ATTACKER
 	delay 44
-	playsewithpan SE_W057, -64
+	playsewithpan SE_W057, SOUND_PAN_ATTACKER
 	delay 44
-	panse_1B SE_W057, -64, +63, +2, 0
+	panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	end
 
 Move_CALM_MIND:
@@ -4474,13 +4474,13 @@ Move_CALM_MIND:
 	createvisualtask sub_81177E4, 5, 1
 	waitforvisualfinish
 	createsprite gUnknown_08593850, 40, 0, 0, 0, 0
-	playsewithpan SE_W048, -64
+	playsewithpan SE_W048, SOUND_PAN_ATTACKER
 	delay 14
 	createsprite gUnknown_08593850, 40, 0, 0, 0, 0
-	playsewithpan SE_W048, -64
+	playsewithpan SE_W048, SOUND_PAN_ATTACKER
 	delay 14
 	createsprite gUnknown_08593850, 40, 0, 0, 0, 0
-	playsewithpan SE_W048, -64
+	playsewithpan SE_W048, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask sub_81177E4, 5, 0
 	waitforvisualfinish
@@ -4495,20 +4495,20 @@ Move_LEAF_BLADE:
 	createvisualtask sub_80FFFC0, 5
 	delay 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	playsewithpan SE_W015, +63
+	playsewithpan SE_W015, SOUND_PAN_TARGET
 	delay 50
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	playsewithpan SE_W015, +63
+	playsewithpan SE_W015, SOUND_PAN_TARGET
 	delay 50
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	playsewithpan SE_W015, +63
+	playsewithpan SE_W015, SOUND_PAN_TARGET
 	waitforvisualfinish
 	monbg ANIM_TARGET
 	setalpha 12, 8
 	delay 12
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1
 	createsprite gUnknown_085973D0, 130, 0, 0, 1, 36
-	playsewithpan SE_W043, +63
+	playsewithpan SE_W043, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -4520,7 +4520,7 @@ Move_DRAGON_DANCE:
 	monbgprio_28 ANIM_ATTACKER
 	delay 1
 	createvisualtask sub_81133E8, 5
-	playsewithpan SE_W100, -64
+	playsewithpan SE_W100, SOUND_PAN_ATTACKER
 	delay 8
 	createvisualtask sub_80A7CB4, 5, 10249, 19456, 14, 0, 3
 	createsprite gUnknown_08596F98, 2, 0
@@ -4530,9 +4530,9 @@ Move_DRAGON_DANCE:
 	createsprite gUnknown_08596F98, 2, 170
 	createsprite gUnknown_08596F98, 2, 213
 	delay 30
-	playsewithpan SE_W100, -64
+	playsewithpan SE_W100, SOUND_PAN_ATTACKER
 	delay 30
-	playsewithpan SE_W100, -64
+	playsewithpan SE_W100, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	delay 1
@@ -4548,7 +4548,7 @@ Move_SHOCK_WAVE:
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask sub_810AAFC, 2, 0, 20, 0, 2
-	playsewithpan SE_W268, -64
+	playsewithpan SE_W268, SOUND_PAN_ATTACKER
 	delay 12
 	createsprite gUnknown_08595A18, 2
 	delay 30
@@ -4556,7 +4556,7 @@ Move_SHOCK_WAVE:
 	delay 12
 	waitforvisualfinish
 	createvisualtask sub_810B55C, 5
-	playsewithpan SE_W161B, +63
+	playsewithpan SE_W161B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1
 	createvisualtask sub_8116620, 5, 1, 3, 16, 0, RGB_WHITE
@@ -4569,7 +4569,7 @@ Move_SHOCK_WAVE:
 	end
 
 Move_HARDEN:
-	loopsewithpan SE_W231, -64, 28, 2
+	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask sub_81144F8, 5, 0, 0, 0
 	waitforvisualfinish
 	end
@@ -4581,27 +4581,27 @@ Move_BELLY_DRUM:
 	waitforvisualfinish
 	call BellyDrum1
 	createsprite gUnknown_0859309C, 2, 0, 0, 0, 0
-	playsewithpan SE_W187, -64
+	playsewithpan SE_W187, SOUND_PAN_ATTACKER
 	delay 15
 	call BellyDrum2
 	createsprite gUnknown_0859309C, 2, 1, 1, 1, 0
-	playsewithpan SE_W187, -64
+	playsewithpan SE_W187, SOUND_PAN_ATTACKER
 	delay 15
 	call BellyDrum1
 	createsprite gUnknown_0859309C, 2, 0, 3, 3, 128
-	playsewithpan SE_W187, -64
+	playsewithpan SE_W187, SOUND_PAN_ATTACKER
 	delay 7
 	call BellyDrum2
 	createsprite gUnknown_0859309C, 2, 1, 2, 0, 128
-	playsewithpan SE_W187, -64
+	playsewithpan SE_W187, SOUND_PAN_ATTACKER
 	delay 7
 	call BellyDrum1
 	createsprite gUnknown_0859309C, 2, 0, 1, 1, 0
-	playsewithpan SE_W187, -64
+	playsewithpan SE_W187, SOUND_PAN_ATTACKER
 	delay 7
 	call BellyDrum2
 	createsprite gUnknown_0859309C, 2, 1, 0, 3, 0
-	playsewithpan SE_W187, -64
+	playsewithpan SE_W187, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask sub_8102CA0, 2
 	waitforvisualfinish
@@ -4622,11 +4622,11 @@ Move_MIND_READER:
 	loadspritegfx ANIM_TAG_OPENING_EYE
 	loadspritegfx ANIM_TAG_191
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W109, +63
+	playsewithpan SE_W109, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0
 	createsprite gUnknown_085CE094, 5
 	delay 40
-	playsewithpan SE_W043, +63
+	playsewithpan SE_W043, SOUND_PAN_TARGET
 	createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK
 	call MindReaderEffect
 	waitforvisualfinish
@@ -4666,7 +4666,7 @@ Move_ICE_PUNCH:
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK
 	createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31)
 	delay 20
-	playsewithpan SE_W081, +63
+	playsewithpan SE_W081, SOUND_PAN_TARGET
 	createsprite gUnknown_08595AE8, 2, 0
 	createsprite gUnknown_08595AE8, 2, 64
 	createsprite gUnknown_08595AE8, 2, 128
@@ -4679,7 +4679,7 @@ Move_ICE_PUNCH:
 	delay 17
 	createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1
 	waitforvisualfinish
@@ -4695,7 +4695,7 @@ Move_ICE_PUNCH:
 	end
 
 Move_REST:
-	playsewithpan SE_W173, -64
+	playsewithpan SE_W173, SOUND_PAN_ATTACKER
 	loadspritegfx ANIM_TAG_LETTER_Z
 	createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0
 	delay 20
@@ -4712,7 +4712,7 @@ Move_CONFUSION:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
 	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE
 	waitforvisualfinish
-	playsewithpan SE_W048, +63
+	playsewithpan SE_W048, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1
 	waitforvisualfinish
@@ -4729,7 +4729,7 @@ Move_PSYCHIC:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
 	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0)
 	waitforvisualfinish
-	loopsewithpan SE_W048, +63, 10, 3
+	loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
 	waitforvisualfinish
@@ -4748,10 +4748,10 @@ FutureSightContinue:
 	end
 FutureSight:
 	monbg ANIM_ATK_PARTNER
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	setalpha 8, 8
-	playsewithpan SE_W048, -64
+	playsewithpan SE_W048, SOUND_PAN_ATTACKER
 	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
 	waitforvisualfinish
@@ -4768,7 +4768,7 @@ Move_THUNDER:
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK
 	delay 16
 	createvisualtask sub_8115F10, 2, 257, 257, 257
-	playsewithpan SE_W086, +63
+	playsewithpan SE_W086, SOUND_PAN_TARGET
 	delay 1
 	createsprite gUnknown_085956C0, 130, 16, -36
 	delay 1
@@ -4777,12 +4777,12 @@ Move_THUNDER:
 	createsprite gUnknown_085956C0, 130, 16, 12
 	delay 20
 	createsprite gUnknown_085956C0, 0x86, -16, -32
-	playsewithpan SE_W086, +63
+	playsewithpan SE_W086, SOUND_PAN_TARGET
 	delay 1
 	createsprite gUnknown_085956C0, 0x86, -16, -16
 	delay 1
 	createsprite gUnknown_085956C0, 0x86, -16, 16
-	playsewithpan SE_W086, +63
+	playsewithpan SE_W086, SOUND_PAN_TARGET
 	delay 5
 	createvisualtask sub_8115F10, 2, 257, 257, 257
 	delay 1
@@ -4797,7 +4797,7 @@ Move_THUNDER:
 	createvisualtask sub_8115F10, 2, 257, 257, 257
 	delay 1
 	createsprite gUnknown_085956C0, 130, 0, -32
-	playsewithpan SE_W161B, +63
+	playsewithpan SE_W161B, SOUND_PAN_TARGET
 	delay 1
 	createsprite gUnknown_085956C0, 130, 0, -16
 	delay 1
@@ -4825,7 +4825,7 @@ Move_THUNDER_PUNCH:
 	setalpha 12, 8
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK
 	waitforvisualfinish
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
 	delay 1
@@ -4837,7 +4837,7 @@ Move_THUNDER_PUNCH:
 	delay 1
 	createsprite gUnknown_085956C0, 2, 0, 16
 	delay 1
-	playsewithpan SE_W161B, +63
+	playsewithpan SE_W161B, SOUND_PAN_TARGET
 	createvisualtask sub_8115F10, 2, 257, 257, 257
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
@@ -4853,7 +4853,7 @@ Move_THUNDER_PUNCH:
 Move_SACRED_FIRE:
 	loadspritegfx ANIM_TAG_FIRE
 	loadspritegfx ANIM_TAG_035
-	loopsewithpan SE_W221, -64, 7, 5
+	loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5
 	createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0
 	delay 1
 	createsprite gUnknown_08595428, 66, -20, -10, 50, 5, -1, -1
@@ -4874,13 +4874,13 @@ Move_SACRED_FIRE:
 	createvisualtask sub_8115F10, 2, 257, 257, 257
 	delay 1
 	waitforvisualfinish
-	playsewithpan SE_W221B, +63
+	playsewithpan SE_W221B, SOUND_PAN_TARGET
 	createsprite gUnknown_085953F8, 130, -16, 0, 70, 16, 0, 1
 	delay 10
-	playsewithpan SE_W221B, +63
+	playsewithpan SE_W221B, SOUND_PAN_TARGET
 	createsprite gUnknown_085953F8, 130, 0, 0, 70, 16, 0, 1
 	delay 10
-	playsewithpan SE_W221B, +63
+	playsewithpan SE_W221B, SOUND_PAN_TARGET
 	createsprite gUnknown_085953F8, 130, 16, 0, 80, 16, 0, 1
 	delay 1
 	createvisualtask sub_8115F10, 2, 257, 257, 257
@@ -4888,7 +4888,7 @@ Move_SACRED_FIRE:
 	waitforvisualfinish
 	createvisualtask sub_8115F10, 2, 257, 257, 257
 	delay 1
-	playsewithpan SE_W172B, +63
+	playsewithpan SE_W172B, SOUND_PAN_TARGET
 	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0
 	delay 1
 	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1
@@ -4911,7 +4911,7 @@ Move_SCRATCH:
 	loadspritegfx ANIM_TAG_137
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W010, +63
+	playsewithpan SE_W010, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE020, 2, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -4924,7 +4924,7 @@ Move_DRAGON_BREATH:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W172, -64, 7, 7
+	loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7
 	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
 	delay 2
 	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
@@ -5006,7 +5006,7 @@ Move_SNORE:
 	blendoff
 	end
 Snore1:
-	playsewithpan SE_W173, -64
+	playsewithpan SE_W173, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
 	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 6, 1, 14, 0, 0
@@ -5019,7 +5019,7 @@ Move_LIGHT_SCREEN:
 	loadspritegfx ANIM_TAG_070
 	loadspritegfx ANIM_TAG_166
 	setalpha 0, 16
-	waitplaysewithpan SE_W115, -64, 15
+	waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15
 	createsprite gUnknown_08596560, 1, 40, 0, 10166
 	delay 10
 	call SpecialScreenEffect
@@ -5048,7 +5048,7 @@ Move_MIRROR_COAT:
 	setalpha 0, 16
 	createsprite gUnknown_08596590, 1, 40, 0, 10168
 	delay 10
-	playsewithpan SE_W115, -64
+	playsewithpan SE_W115, SOUND_PAN_ATTACKER
 	call SpecialScreenEffect
 	waitforvisualfinish
 	delay 1
@@ -5059,7 +5059,7 @@ Move_REFLECT:
 	loadspritegfx ANIM_TAG_071
 	loadspritegfx ANIM_TAG_167
 	setalpha 0, 16
-	waitplaysewithpan SE_W115, -64, 15
+	waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15
 	createsprite gUnknown_08596578, 1, 40, 0, 10167
 	delay 20
 	createsprite gUnknown_085965F4, 2, 30, 0, 0, 1
@@ -5075,7 +5075,7 @@ Move_REFLECT:
 Move_BARRIER:
 	loadspritegfx ANIM_TAG_169
 	setalpha 0, 16
-	waitplaysewithpan SE_W112, -64, 15
+	waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15
 	createsprite gUnknown_085965A8, 3, 40, 0, 10169
 	waitforvisualfinish
 	delay 1
@@ -5089,28 +5089,28 @@ Move_BUBBLE:
 	setalpha 12, 8
 	delay 1
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 128, 100
-	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 100
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 37, 40, 128, 100
-	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 100
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -37, 30, 128, 100
-	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 100
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, 15, 128, 100
-	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 100
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 33, 20, 128, 100
-	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 100
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 128, 100
-	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 100
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
 	waitforvisualfinish
 	call WaterBubbleEffect2
 	waitforvisualfinish
@@ -5123,7 +5123,7 @@ Move_SMOG:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
 	setalpha 12, 8
-	loopsewithpan SE_W054, +63, 17, 10
+	loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10
 	call Smog1
 	call Smog1
 	call Smog1
@@ -5132,7 +5132,7 @@ Move_SMOG:
 	call Smog1
 	call Smog1
 	delay 120
-	loopsewithpan SE_W092, +63, 18, 2
+	loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2
 	createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26)
 	delay 10
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1
@@ -5151,7 +5151,7 @@ Move_FAINT_ATTACK:
 	fadetobg BG_DARK
 	waitbgfadein
 	delay 0
-	playsewithpan SE_W185, -64
+	playsewithpan SE_W185, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3
 	createvisualtask sub_81136E8, 2, 1
 	waitforvisualfinish
@@ -5162,7 +5162,7 @@ Move_FAINT_ATTACK:
 	setalpha 12, 8
 	monbg ANIM_TARGET
 	delay 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1
 	waitforvisualfinish
@@ -5186,7 +5186,7 @@ Move_SAND_ATTACK:
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
 	setalpha 12, 8
-	playsewithpan SE_W028, -64
+	playsewithpan SE_W028, SOUND_PAN_ATTACKER
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2
@@ -5211,7 +5211,7 @@ SandAttack1:
 
 Move_MUD_SLAP:
 	loadspritegfx ANIM_TAG_074
-	playsewithpan SE_W028, -64
+	playsewithpan SE_W028, SOUND_PAN_ATTACKER
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2
@@ -5235,14 +5235,14 @@ MudSlap1:
 Move_DRAGON_RAGE:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	loadspritegfx ANIM_TAG_035
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4
 	waitforvisualfinish
 	createsprite gUnknown_08596F80, 130, 30, 15, 0, 10, 10
 	waitforvisualfinish
-	loopsewithpan SE_W172B, +63, 11, 3
+	loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1
 	createsprite gUnknown_08596F28, 194, 1, 5, 0
 	delay 1
@@ -5266,7 +5266,7 @@ Move_DRAGON_RAGE:
 
 Move_RAIN_DANCE:
 	loadspritegfx ANIM_TAG_115
-	playsewithpan SE_W240, -64
+	playsewithpan SE_W240, SOUND_PAN_ATTACKER
 	createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120
@@ -5283,7 +5283,7 @@ Move_BITE:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W044, +63
+	playsewithpan SE_W044, SOUND_PAN_TARGET
 	createsprite gUnknown_08597080, 2, 0, -32, 0, 0, 819, 10
 	createsprite gUnknown_08597080, 2, 0, 32, 4, 0, -819, 10
 	delay 10
@@ -5302,14 +5302,14 @@ Move_CRUNCH:
 	fadetobg BG_DARK
 	waitbgfadein
 	setalpha 12, 8
-	playsewithpan SE_W044, +63
+	playsewithpan SE_W044, SOUND_PAN_TARGET
 	createsprite gUnknown_08597080, 2, -32, -32, 1, 819, 819, 10
 	createsprite gUnknown_08597080, 2, 32, 32, 5, -819, -819, 10
 	delay 10
 	createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2
 	waitforvisualfinish
-	playsewithpan SE_W044, +63
+	playsewithpan SE_W044, SOUND_PAN_TARGET
 	createsprite gUnknown_08597080, 2, 32, -32, 7, -819, 819, 10
 	createsprite gUnknown_08597080, 2, -32, 32, 3, 819, -819, 10
 	delay 10
@@ -5328,7 +5328,7 @@ Move_CLAMP:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W011, +63
+	playsewithpan SE_W011, SOUND_PAN_TARGET
 	createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10
 	createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10
 	delay 10
@@ -5347,7 +5347,7 @@ Move_ICE_BEAM:
 	loadspritegfx ANIM_TAG_141
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK
 	waitforvisualfinish
-	createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10
+	createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
 	createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20
 	createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20
 	delay 1
@@ -5385,7 +5385,7 @@ IceBeam1:
 	return
 
 Move_WITHDRAW:
-	playsewithpan SE_W029, -64
+	playsewithpan SE_W029, SOUND_PAN_ATTACKER
 	createvisualtask sub_81036A0, 5
 	waitforvisualfinish
 	end
@@ -5394,7 +5394,7 @@ Move_AURORA_BEAM:
 	loadspritegfx ANIM_TAG_140
 	fadetobg BG_AURORABEAM
 	waitbgfadein
-	playsewithpan SE_W062, -64
+	playsewithpan SE_W062, SOUND_PAN_ATTACKER
 	setarg 7, 0
 	createvisualtask sub_8107528, 10, 130
 	call AuroraBeam1
@@ -5403,7 +5403,7 @@ Move_AURORA_BEAM:
 	call AuroraBeam1
 	call AuroraBeam1
 	setarg 7, -1
-	createsoundtask sub_8158C58, 183, -64, 63, 3, 6, 0, 10
+	createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1
 	call AuroraBeam1
 	call AuroraBeam1
@@ -5436,7 +5436,7 @@ SolarBeamSetUp:
 	monbg ANIM_ATK_PARTNER
 	setalpha 12, 8
 	createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11)
-	playsewithpan SE_W025, -64
+	playsewithpan SE_W025, SOUND_PAN_ATTACKER
 	call SolarBeamSetUp1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -5474,7 +5474,7 @@ SolarBeamSetUp1:
 	return
 SolarBeamUnleash:
 	call SetSolarbeamBg
-	panse_1B SE_W076, -64, +63, +2, 0
+	panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createvisualtask sub_80FEA58, 5
 	createsprite gUnknown_085921F8, 131, 15, 0, 20, 0
 	delay 4
@@ -5526,10 +5526,10 @@ BlizzardContinue:
 	createvisualtask sub_8117660, 5, -2304, 0, 1, -1
 	waitbgfadein
 	waitforvisualfinish
-	panse_1B SE_W059, -64, +63, +2, 0
+	panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call Blizzard1
 	call Blizzard1
-	playsewithpan SE_W059B, +63
+	playsewithpan SE_W059B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	call FreezeEffect2
 	waitforvisualfinish
@@ -5572,10 +5572,10 @@ Move_POWDER_SNOW:
 	monbg ANIM_DEF_PARTNER
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK
 	waitforvisualfinish
-	panse_1B SE_W016, -64, +63, +2, 0
+	panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call PowderSnow1
 	call PowderSnow1
-	playsewithpan SE_W016B, +63
+	playsewithpan SE_W016B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	waitsound
 	call FreezeEffect2
@@ -5609,7 +5609,7 @@ Move_HYDRO_PUMP:
 	setalpha 12, 8
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1
 	delay 6
-	panse_1B SE_W056, -64, +63, +2, 0
+	panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createvisualtask sub_81076C8, 5, 100
 	call HydroPump1
 	call HydroPump1
@@ -5654,7 +5654,7 @@ Move_SIGNAL_BEAM:
 	loadspritegfx ANIM_TAG_DUCK
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1
 	delay 6
-	panse_1B SE_W062, -64, +63, +1, 0
+	panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
 	createvisualtask sub_81076C8, 5, 100
 	call SignalBeam1
 	call SignalBeam1
@@ -5698,7 +5698,7 @@ Move_ABSORB:
 	setalpha 12, 8
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12)
 	waitforvisualfinish
-	playsewithpan SE_W071, +63
+	playsewithpan SE_W071, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
@@ -5716,28 +5716,28 @@ Move_ABSORB:
 	end
 
 AbsorbEffect:
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	delay 4
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
 	delay 4
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
 	delay 4
 	return
@@ -5751,7 +5751,7 @@ Move_MEGA_DRAIN:
 	setalpha 12, 8
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 8, RGB(13, 31, 12)
 	waitforvisualfinish
-	playsewithpan SE_W071, +63
+	playsewithpan SE_W071, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
@@ -5769,35 +5769,35 @@ Move_MEGA_DRAIN:
 	end
 
 MegaDrainEffect:
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
 	delay 4
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
 	delay 4
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	delay 4
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
 	delay 4
@@ -5812,7 +5812,7 @@ Move_GIGA_DRAIN:
 	setalpha 12, 8
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 12, RGB(13, 31, 12)
 	waitforvisualfinish
-	playsewithpan SE_W071, +63
+	playsewithpan SE_W071, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
@@ -5830,42 +5830,42 @@ Move_GIGA_DRAIN:
 	end
 
 GigaDrainEffect:
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 5, -18, -40, 35
 	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 28, 26
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	createsprite gUnknown_08592270, 3, -10, 20, 40, 39
 	delay 4
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	createsprite gUnknown_08592270, 3, 10, -5, -32, 26
 	delay 4
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	createsprite gUnknown_08592270, 3, 10, -5, -40, 26
 	delay 4
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, -5, 15, 36, 33
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
@@ -5885,7 +5885,7 @@ Move_LEECH_LIFE:
 	createsprite gUnknown_085969C8, 2, -20, 15, 12
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
-	playsewithpan SE_W071, +63
+	playsewithpan SE_W071, SOUND_PAN_TARGET
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
 	waitforvisualfinish
@@ -5905,7 +5905,7 @@ Move_LEECH_LIFE:
 Move_SYNTHESIS:
 	loadspritegfx ANIM_TAG_SPARKLE
 	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18)
-	playsewithpan SE_W025, -64
+	playsewithpan SE_W025, SOUND_PAN_ATTACKER
 	call GrantingStarsEffect
 	waitforvisualfinish
 	unloadspritegfx ANIM_TAG_SPARKLE
@@ -5927,22 +5927,22 @@ Move_TOXIC:
 	end
 Toxic1:
 	createsprite gUnknown_08596134, 130, -24, 16, 1, 1
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 15
 	createsprite gUnknown_08596134, 130, 8, 16, 1, 1
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 15
 	createsprite gUnknown_08596134, 130, -8, 16, 1, 1
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 15
 	createsprite gUnknown_08596134, 130, 24, 16, 1, 1
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 15
 	return
 
 Move_SLUDGE:
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085961A8, 130, 20, 0, 40, 0
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1
@@ -5969,19 +5969,19 @@ Move_SLUDGE_BOMB:
 	createsprite gUnknown_085961D8, 130, -27, 44, 20
 	createsprite gUnknown_085961D8, 130, 39, -28, 20
 	createsprite gUnknown_085961D8, 130, -42, -42, 20
-	playsewithpan SE_W091, +63
+	playsewithpan SE_W091, SOUND_PAN_TARGET
 	delay 5
 	createsprite gUnknown_085961D8, 130, 0, 40, 20
 	createsprite gUnknown_085961D8, 130, -8, -44, 20
 	createsprite gUnknown_085961D8, 130, -46, -28, 20
 	createsprite gUnknown_085961D8, 130, 46, 9, 20
-	playsewithpan SE_W091, +63
+	playsewithpan SE_W091, SOUND_PAN_TARGET
 	delay 5
 	createsprite gUnknown_085961D8, 130, 42, 0, 20
 	createsprite gUnknown_085961D8, 130, -43, -12, 20
 	createsprite gUnknown_085961D8, 130, 16, -46, 20
 	createsprite gUnknown_085961D8, 130, -16, 44, 20
-	playsewithpan SE_W091, +63
+	playsewithpan SE_W091, SOUND_PAN_TARGET
 	delay 0
 	waitsound
 	waitforvisualfinish
@@ -5989,7 +5989,7 @@ Move_SLUDGE_BOMB:
 	waitforvisualfinish
 	end
 SludgeBomb1:
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085961A8, 130, 20, 0, 40, 0
 	delay 3
 	return
@@ -5998,31 +5998,31 @@ Move_ACID:
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
 	monbg ANIM_DEF_PARTNER
 	createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 24, 0
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, -24, 0
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	delay 15
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1
 	createvisualtask sub_8115A04, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31)
 	createsprite gUnknown_0859620C, 130, 0, -22, 0, 15, 55
-	playsewithpan SE_W145, +63
+	playsewithpan SE_W145, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_0859620C, 130, -26, -24, 0, 15, 55
-	playsewithpan SE_W145, +63
+	playsewithpan SE_W145, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_0859620C, 130, 15, -27, 0, 15, 50
-	playsewithpan SE_W145, +63
+	playsewithpan SE_W145, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_0859620C, 130, -15, -17, 0, 10, 45
-	playsewithpan SE_W145, +63
+	playsewithpan SE_W145, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_0859620C, 130, 27, -22, 0, 15, 50
-	playsewithpan SE_W145, +63
+	playsewithpan SE_W145, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
@@ -6033,14 +6033,14 @@ Move_BONEMERANG:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W155, -64
+	playsewithpan SE_W155, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08597178, 2
 	delay 20
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1
 	delay 17
-	playsewithpan SE_W233, -64
+	playsewithpan SE_W233, SOUND_PAN_ATTACKER
 	createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6053,13 +6053,13 @@ Move_BONE_CLUB:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W155, +63
+	playsewithpan SE_W155, SOUND_PAN_TARGET
 	createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15
 	delay 12
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6070,12 +6070,12 @@ Move_BONE_RUSH:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W155, +63
+	playsewithpan SE_W155, SOUND_PAN_TARGET
 	createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15
 	delay 12
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6084,15 +6084,15 @@ Move_BONE_RUSH:
 Move_SPIKES:
 	loadspritegfx ANIM_TAG_152
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W026, -64
-	waitplaysewithpan SE_W030, +63, 28
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
 	createsprite gUnknown_085CE11C, 130, 20, 0, 0, 24, 30
 	delay 10
-	playsewithpan SE_W026, -64
-	waitplaysewithpan SE_W030, +63, 28
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
 	createsprite gUnknown_085CE11C, 130, 20, 0, -24, 24, 30
 	delay 10
-	waitplaysewithpan SE_W030, +63, 28
+	waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
 	createsprite gUnknown_085CE11C, 130, 20, 0, 24, 24, 30
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6102,7 +6102,7 @@ Move_MEGAHORN:
 	loadspritegfx ANIM_TAG_153
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	jumpifcontest MegahornInContest
 	fadetobg BG_DRILL
 	waitbgfadeout
@@ -6117,7 +6117,7 @@ MegahornContinue:
 	delay 3
 	createsprite gUnknown_08596974, 3, -42, 25, 0, 0, 6
 	delay 4
-	playsewithpan SE_W011, +63
+	playsewithpan SE_W011, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4
 	waitforvisualfinish
@@ -6147,13 +6147,13 @@ Move_GUST:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W016, +63
+	playsewithpan SE_W016, SOUND_PAN_TARGET
 	createsprite gUnknown_08596270, 2, 0, -16
 	createvisualtask sub_810DED8, 5, 1, 70
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
-	playsewithpan SE_W016B, +63
+	playsewithpan SE_W016B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6165,7 +6165,7 @@ Move_WING_ATTACK:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	loopsewithpan SE_W017, -64, 20, 2
+	loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2
 	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4
 	createvisualtask sub_810DED8, 5, 1, 70
 	createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20
@@ -6175,7 +6175,7 @@ Move_WING_ATTACK:
 	delay 17
 	createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1
 	createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1
-	loopsewithpan SE_W003, +63, 5, 2
+	loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11
 	waitforvisualfinish
@@ -6185,7 +6185,7 @@ Move_WING_ATTACK:
 
 Move_PECK:
 	loadspritegfx ANIM_TAG_135
-	playsewithpan SE_W030, +63
+	playsewithpan SE_W030, SOUND_PAN_TARGET
 	createvisualtask sub_80D622C, 2, 3, -768, 1, 2
 	createsprite gUnknown_085973E8, 131, -12, 0, 1, 3
 	waitforvisualfinish
@@ -6206,7 +6206,7 @@ Move_AEROBLAST:
 	call Aeroblast1
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6214,19 +6214,19 @@ Move_AEROBLAST:
 	call UnsetFlyingBg
 	end
 Aeroblast1:
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 0, 0
 	createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 0, 0
 	delay 3
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 1, 0
 	createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 1, 0
 	delay 3
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 2, 0
 	createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 2, 0
 	delay 3
-	playsewithpan SE_W026, -64
+	playsewithpan SE_W026, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 3, 0
 	createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 3, 0
 	delay 3
@@ -6239,18 +6239,18 @@ Move_WATER_GUN:
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
 	createsprite gUnknown_08595208, 2, 20, 0, 0, 0, 40, -25
-	playsewithpan SE_W145, -64
+	playsewithpan SE_W145, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1
 	createsprite gUnknown_08597388, 4, 0, 0, 1, 2
 	createsprite gUnknown_08595220, 2, 0, -15, 0, 15, 55
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_08595220, 2, 15, -20, 0, 15, 50
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_08595220, 2, -15, -10, 0, 10, 45
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6262,7 +6262,7 @@ Move_CRABHAMMER:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	createsprite gUnknown_08597388, 4, 0, 0, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 1
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4
@@ -6271,7 +6271,7 @@ Move_CRABHAMMER:
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 4
 	waitforvisualfinish
-	loopsewithpan SE_W152, +63, 20, 3
+	loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1
 	createsprite gUnknown_08595238, 2, 10, 10, 20, 1
 	delay 4
@@ -6296,7 +6296,7 @@ Move_CRABHAMMER:
 Move_SURF:
 	createvisualtask AnimTask_CreateSurfWave, 2, FALSE
 	delay 24
-	panse_1B SE_W057, -64, +63, +2, 0
+	panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	waitforvisualfinish
 	end
 
@@ -6308,7 +6308,7 @@ Move_FLAMETHROWER:
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
 	delay 6
 	createvisualtask sub_81076C8, 5, 100
-	panse_1B SE_W053, -64, +63, +2, 0
+	panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call Flamethrower1
 	call Flamethrower1
 	call Flamethrower1
@@ -6360,7 +6360,7 @@ Move_WHIRLPOOL:
 	setalpha 12, 8
 	delay 0
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23)
-	playsewithpan SE_W250, +63
+	playsewithpan SE_W250, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1
 	call WhirlpoolEffect
 	call WhirlpoolEffect
@@ -6395,19 +6395,19 @@ FlyEnd:
 	end
 
 FlySetUp:
-	playsewithpan SE_W019, -64
+	playsewithpan SE_W019, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596340, 2, 0, 0, 13, 336
 	goto FlyEnd
 
 FlyUnleash:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596358, 2, 20
 	delay 20
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6421,17 +6421,17 @@ BounceEnd:
 	end
 
 BounceSetUp:
-	playsewithpan SE_W100, -64
+	playsewithpan SE_W100, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596420, 2, 0, 0
 	goto BounceEnd
 
 BounceUnleash:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_0859644C, 131
 	delay 7
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1
 	waitforvisualfinish
@@ -6445,10 +6445,10 @@ Move_KARATE_CHOP:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W104, +63
+	playsewithpan SE_W104, SOUND_PAN_TARGET
 	createsprite gUnknown_08595E68, 2, -16, 0, 0, 0, 10, 1, 3, 0
 	waitforvisualfinish
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
 	waitforvisualfinish
@@ -6461,11 +6461,11 @@ Move_CROSS_CHOP:
 	loadspritegfx ANIM_TAG_285
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W025, +63
+	playsewithpan SE_W025, SOUND_PAN_TARGET
 	createsprite gUnknown_08595EC8, 2, 0, 0, 0
 	createsprite gUnknown_08595EC8, 2, 0, 0, 1
 	delay 40
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10
 	createsprite gUnknown_085973D0, 3, 0, 0, 1, 20
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1
@@ -6482,11 +6482,11 @@ Move_JUMP_KICK:
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
 	delay 3
 	createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1
-	playsewithpan SE_W026, +63
+	playsewithpan SE_W026, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6503,10 +6503,10 @@ Move_HI_JUMP_KICK:
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3
 	delay 2
 	createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1
-	playsewithpan SE_W026, +63
+	playsewithpan SE_W026, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3
 	delay 3
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1
@@ -6525,7 +6525,7 @@ Move_DOUBLE_KICK:
 	setalpha 12, 8
 	createsprite gUnknown_08595EB0, 3, 1, 20, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6536,7 +6536,7 @@ Move_TRIPLE_KICK:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	jumpifmoveturn 0, TripleKickLeft
 	jumpifmoveturn 1, TripleKickRight
 	goto TripleKickCenter
@@ -6572,26 +6572,26 @@ Move_DYNAMIC_PUNCH:
 	delay 1
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gFistFootSpriteTemplate, 131, 0, 0, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1
 	delay 1
 	waitsound
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6604,23 +6604,23 @@ Move_COUNTER:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4
-	playsewithpan SE_W233, -64
+	playsewithpan SE_W233, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1
 	createsprite gFistFootSpriteTemplate, 3, -15, 18, 8, 1, 0
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, -4, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 1
 	createsprite gFistFootSpriteTemplate, 3, 0, -4, 8, 1, 0
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 1
 	createsprite gFistFootSpriteTemplate, 3, 15, 9, 8, 1, 0
 	delay 5
@@ -6634,13 +6634,13 @@ Move_VITAL_THROW:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W233, -64
+	playsewithpan SE_W233, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
 	delay 2
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 1
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4
 	waitforvisualfinish
@@ -6662,10 +6662,10 @@ Move_ROCK_SMASH:
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
 	createsprite gFistFootSpriteTemplate, 2, 0, 0, 8, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
 	waitforvisualfinish
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	createsprite gUnknown_08596B1C, 2, 0, 0, 20, 24, 14, 2
 	createsprite gUnknown_08596B1C, 2, 5, 0, -20, 24, 14, 1
 	createsprite gUnknown_08596B1C, 2, 0, 5, 20, -24, 14, 2
@@ -6684,16 +6684,16 @@ Move_SUBMISSION:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W104, -64
-	waitplaysewithpan SE_W004, +63, 10
-	waitplaysewithpan SE_W104, -64, 20
-	waitplaysewithpan SE_W004, +63, 30
-	waitplaysewithpan SE_W104, -64, 40
-	waitplaysewithpan SE_W004, +63, 50
-	waitplaysewithpan SE_W104, -64, 60
-	waitplaysewithpan SE_W004, +63, 70
-	waitplaysewithpan SE_W104, -64, 80
-	waitplaysewithpan SE_W004, +63, 0x5A
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10
+	waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20
+	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30
+	waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40
+	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50
+	waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60
+	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70
+	waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80
+	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x5A
 	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4
 	createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4
 	call Submission1
@@ -6719,7 +6719,7 @@ Move_SUNNY_DAY:
 	setalpha 13, 3
 	createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE
 	waitforvisualfinish
-	panse_26 SE_W080, -64, +63, +1, 0
+	panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
 	call SunnyDay1
 	call SunnyDay1
 	call SunnyDay1
@@ -6740,7 +6740,7 @@ Move_COTTON_SPORE:
 	loadspritegfx ANIM_TAG_158
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W077, +63, 18, 10
+	loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10
 	call CottonSpore1
 	call CottonSpore1
 	call CottonSpore1
@@ -6762,7 +6762,7 @@ Move_SPORE:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	createvisualtask sub_80FEE1C, 2
-	loopsewithpan SE_W077, +63, 16, 11
+	loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11
 	call Spore1
 	call Spore1
 	call Spore1
@@ -6786,7 +6786,7 @@ Move_PETAL_DANCE:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W080, -64
+	playsewithpan SE_W080, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3
 	createsprite gUnknown_0859231C, 2, 0, -24, 8, 140
 	createsprite gUnknown_08592334, 2, 16, -24, 8, 100
@@ -6808,7 +6808,7 @@ Move_PETAL_DANCE:
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5
 	delay 3
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1
 	waitforvisualfinish
@@ -6826,7 +6826,7 @@ Move_RAZOR_LEAF:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	delay 1
-	loopsewithpan SE_W077, -64, 10, 5
+	loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5
 	createsprite gUnknown_08592390, 2, -3, -2, 10
 	delay 2
 	createsprite gUnknown_08592390, 2, -1, -1, 15
@@ -6847,11 +6847,11 @@ Move_RAZOR_LEAF:
 	delay 2
 	createsprite gUnknown_08592390, 2, -3, -5, 8
 	delay 60
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, 20, 1
 	createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, -20, 1
 	delay 20
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1
 	waitforvisualfinish
@@ -6873,7 +6873,7 @@ Move_ANCIENT_POWER:
 	createsprite gUnknown_08596C10, 2, 20, 32, -28, 60, 1
 	createsprite gUnknown_08596C10, 2, 0, 32, -28, 30, 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	delay 10
 	createsprite gUnknown_08596C10, 2, 15, 32, -48, 25, 5
 	createsprite gUnknown_08596C10, 2, -10, 32, -42, 30, 4
@@ -6883,7 +6883,7 @@ Move_ANCIENT_POWER:
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4
 	delay 3
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -6896,10 +6896,10 @@ Move_ANCIENT_POWER:
 Move_OCTAZOOKA:
 	loadspritegfx ANIM_TAG_GRAY_SMOKE
 	loadspritegfx ANIM_TAG_BLACK_BALL
-	playsewithpan SE_W025B, -64
+	playsewithpan SE_W025B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592DFC, 130, 20, 0, 0, 0, 20, 0
 	waitforvisualfinish
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gUnknown_08592E30, 130, 8, 8, 1, 0
 	delay 2
 	createsprite gUnknown_08592E30, 130, -8, -8, 1, 0
@@ -6914,7 +6914,7 @@ Move_MIST:
 	loadspritegfx ANIM_TAG_144
 	monbg ANIM_ATK_PARTNER
 	setalpha 12, 8
-	loopsewithpan SE_W054, -64, 20, 15
+	loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15
 	call Mist1
 	call Mist1
 	call Mist1
@@ -6955,14 +6955,14 @@ Move_FIRE_PUNCH:
 	createsprite gUnknown_08595368, 0x81, 64
 	createsprite gUnknown_08595368, 0x81, 128
 	createsprite gUnknown_08595368, 0x81, 196
-	playsewithpan SE_W172, +63
+	playsewithpan SE_W172, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gFistFootSpriteTemplate, 131, 0, 0, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
 	call FireMoveEffect
 	delay 4
-	playsewithpan SE_W007, +63
+	playsewithpan SE_W007, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_8116620, 10, 4, 0, 9, 0, RGB_RED
 	waitforvisualfinish
@@ -6985,7 +6985,7 @@ Move_LEER:
 	monbg ANIM_ATTACKER
 	monbgprio_28 ANIM_ATTACKER
 	setalpha 8, 8
-	playsewithpan SE_W043, -64
+	playsewithpan SE_W043, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085CE150, 2, 24, -12
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
 	waitforvisualfinish
@@ -7004,10 +7004,10 @@ Move_DREAM_EATER:
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	setalpha 8, 8
-	playsewithpan SE_W107, +63
+	playsewithpan SE_W107, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
 	waitforvisualfinish
@@ -7024,42 +7024,42 @@ Move_DREAM_EATER:
 	call UnsetPsychicBackground
 	end
 DreamEaterEffect:
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 5, -18, -40, 35
 	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 28, 26
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	createsprite gUnknown_08592270, 3, -10, 20, 40, 39
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	createsprite gUnknown_08592270, 3, 10, -5, -32, 26
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
 	createsprite gUnknown_08592270, 3, 10, -5, -40, 26
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, -5, 15, 36, 33
 	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
 	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
 	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
@@ -7074,25 +7074,25 @@ Move_POISON_GAS:
 	monbgprio_29
 	setalpha 12, 8
 	delay 0
-	playsewithpan SE_W054, -64
+	playsewithpan SE_W054, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, -64
+	playsewithpan SE_W054, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, -64
+	playsewithpan SE_W054, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, -64
+	playsewithpan SE_W054, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, -64
+	playsewithpan SE_W054, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, -64
+	playsewithpan SE_W054, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 40
-	loopsewithpan SE_W054, +63, 28, 6
+	loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6
 	createvisualtask sub_8115A04, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26)
 	waitforvisualfinish
 	blendoff
@@ -7105,7 +7105,7 @@ Move_BIND:
 	goto BindWrap
 
 BindWrap:
-	playsewithpan SE_W020, +63
+	playsewithpan SE_W020, SOUND_PAN_TARGET
 	call BindWrap1
 	call BindWrap1
 	waitforvisualfinish
@@ -7121,9 +7121,9 @@ Move_WRAP:
 
 Move_PSYBEAM:
 	loadspritegfx ANIM_TAG_163
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
-	createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15
+	createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
 	call Psybeam1
 	call Psybeam1
 	createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
@@ -7158,7 +7158,7 @@ Move_HYPNOSIS:
 	call UnsetPsychicBackground
 	end
 Hypnosis1:
-	playsewithpan SE_W048, -64
+	playsewithpan SE_W048, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0859663C, 130, 0, 8, 0, 8, 27, 0
 	createsprite gUnknown_0859663C, 130, 16, -8, 0, -8, 27, 0
 	delay 6
@@ -7166,10 +7166,10 @@ Hypnosis1:
 
 Move_PSYWAVE:
 	loadspritegfx ANIM_TAG_165
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	createvisualtask sub_81076C8, 5, 100
-	createsoundtask sub_8158C58, 203, -64, 63, 2, 9, 0, 10
+	createsoundtask sub_8158C58, 203, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
 	call Psywave1
 	call Psywave1
 	createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31)
@@ -7191,7 +7191,7 @@ Psywave1:
 Move_ZAP_CANNON:
 	loadspritegfx ANIM_TAG_171
 	loadspritegfx ANIM_TAG_SPARK_2
-	playsewithpan SE_W086, -64
+	playsewithpan SE_W086, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0
 	createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 0, 40, 0
 	createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 64, 40, 1
@@ -7204,7 +7204,7 @@ Move_ZAP_CANNON:
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
 	delay 15
-	waitplaysewithpan SE_W085B, +63, 19
+	waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19
 	call ElectricityEffect
 	waitforvisualfinish
 	end
@@ -7212,13 +7212,13 @@ Move_ZAP_CANNON:
 Move_STEEL_WING:
 	loadspritegfx ANIM_TAG_GUST
 	loadspritegfx ANIM_TAG_135
-	loopsewithpan SE_W231, -64, 28, 2
+	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask sub_81144F8, 5, 0, 0, 0
 	waitforvisualfinish
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	loopsewithpan SE_W017, -64, 20, 2
+	loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2
 	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4
 	createvisualtask sub_810DED8, 5, 1, 70
 	createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20
@@ -7228,7 +7228,7 @@ Move_STEEL_WING:
 	delay 17
 	createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1
 	createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11
 	waitforvisualfinish
@@ -7238,7 +7238,7 @@ Move_STEEL_WING:
 
 Move_IRON_TAIL:
 	loadspritegfx ANIM_TAG_135
-	loopsewithpan SE_W231, -64, 28, 2
+	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask sub_81144F8, 5, 1, 0, 0
 	waitforvisualfinish
 	monbg ANIM_TARGET
@@ -7247,7 +7247,7 @@ Move_IRON_TAIL:
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_811489C, 5, 0, 1
 	clearmonbg ANIM_TARGET
@@ -7258,7 +7258,7 @@ Move_IRON_TAIL:
 Move_POISON_TAIL:
 	loadspritegfx ANIM_TAG_135
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
-	loopsewithpan SE_W231, -64, 28, 2
+	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23)
 	waitforvisualfinish
 	monbg ANIM_TARGET
@@ -7267,7 +7267,7 @@ Move_POISON_TAIL:
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_811489C, 5, 0, 1
 	clearmonbg ANIM_TARGET
@@ -7278,19 +7278,19 @@ Move_POISON_TAIL:
 
 Move_METAL_CLAW:
 	loadspritegfx ANIM_TAG_CLAW_SLASH
-	loopsewithpan SE_W231, -64, 28, 2
+	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask sub_81144F8, 5, 0, 0, 0
 	waitforvisualfinish
 	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
 	delay 2
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0
 	createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1
 	delay 8
 	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
 	delay 2
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1
 	createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1
@@ -7300,11 +7300,11 @@ Move_METAL_CLAW:
 Move_NIGHT_SHADE:
 	monbg ANIM_ATTACKER
 	monbgprio_28 ANIM_ATTACKER
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	fadetobg BG_GHOST
 	waitbgfadein
 	delay 10
-	playsewithpan SE_W043, -64
+	playsewithpan SE_W043, SOUND_PAN_ATTACKER
 	createvisualtask sub_811188C, 5, 85
 	delay 70
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1
@@ -7319,24 +7319,24 @@ Move_NIGHT_SHADE:
 Move_EGG_BOMB:
 	loadspritegfx ANIM_TAG_EXPLOSION
 	loadspritegfx ANIM_TAG_175
-	playsewithpan SE_W039, -64
+	playsewithpan SE_W039, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1
 	createsprite gBattleAnimSpriteTemplate_859371C, 132, 6, 5, 1, 0
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_859371C, 132, -16, -15, 1, 0
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_859371C, 132, 16, -5, 1, 0
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_859371C, 132, -12, 18, 1, 0
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	delay 3
 	createsprite gBattleAnimSpriteTemplate_859371C, 132, 0, 5, 1, 0
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	delay 3
 	waitforvisualfinish
 	end
@@ -7346,10 +7346,10 @@ Move_SHADOW_BALL:
 	fadetobg BG_GHOST
 	waitbgfadein
 	delay 15
-	createsoundtask sub_8158C58, 168, -64, 63, 5, 5, 0, 5
+	createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
 	createsprite gUnknown_08596D58, 130, 16, 16, 8
 	waitforvisualfinish
-	playsewithpan SE_W028, +63
+	playsewithpan SE_W028, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
 	waitforvisualfinish
 	restorebg
@@ -7359,7 +7359,7 @@ Move_SHADOW_BALL:
 Move_LICK:
 	loadspritegfx ANIM_TAG_177
 	delay 15
-	playsewithpan SE_W122, +63
+	playsewithpan SE_W122, SOUND_PAN_TARGET
 	createsprite gUnknown_08596D8C, 130, 0, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1
 	waitforvisualfinish
@@ -7367,7 +7367,7 @@ Move_LICK:
 
 Move_FOCUS_ENERGY:
 	loadspritegfx ANIM_TAG_184
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	call EndureEffect
 	delay 8
 	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_WHITE
@@ -7382,7 +7382,7 @@ Move_BIDE:
 	choosetwoturnanim BideSetUp, BideUnleash
 	end
 BideSetUp:
-	loopsewithpan SE_W036, -64, 9, 2
+	loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2
 	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
 	waitforvisualfinish
@@ -7392,7 +7392,7 @@ BideUnleash:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	loopsewithpan SE_W036, -64, 9, 2
+	loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2
 	createvisualtask sub_8116620, 10, 2, 2, 0, 11, RGB_RED
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
 	waitforvisualfinish
@@ -7400,13 +7400,13 @@ BideUnleash:
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1
 	delay 5
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1
 	delay 5
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1
 	waitforvisualfinish
 	delay 5
@@ -7425,7 +7425,7 @@ Move_STRING_SHOT:
 	delay 0
 	createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK
 	waitforvisualfinish
-	loopsewithpan SE_W081, -64, 9, 6
+	loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6
 	call StringShot1
 	call StringShot1
 	call StringShot1
@@ -7445,7 +7445,7 @@ Move_STRING_SHOT:
 	call StringShot1
 	call StringShot1
 	waitforvisualfinish
-	playsewithpan SE_W081B, +63
+	playsewithpan SE_W081B, SOUND_PAN_TARGET
 	createsprite gUnknown_085969F8, 130, 0, 10
 	delay 4
 	createsprite gUnknown_085969F8, 130, 0, -2
@@ -7471,7 +7471,7 @@ Move_SPIDER_WEB:
 	createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK
 	waitforvisualfinish
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W081, -64, 9, 6
+	loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6
 	call SpiderWeb1
 	call SpiderWeb1
 	call SpiderWeb1
@@ -7487,7 +7487,7 @@ Move_SPIDER_WEB:
 	call SpiderWeb1
 	call SpiderWeb1
 	waitforvisualfinish
-	playsewithpan SE_W081B, +63
+	playsewithpan SE_W081B, SOUND_PAN_TARGET
 	createsprite gUnknown_08596A2C, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -7508,12 +7508,12 @@ RazorWindContinue:
 
 RazorWindSetUp:
 	loadspritegfx ANIM_TAG_GUST
-	playsewithpan SE_W016, -64
+	playsewithpan SE_W016, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 0, 7, 40
 	createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 85, 7, 40
 	createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 170, 7, 40
 	waitforvisualfinish
-	playsewithpan SE_W016B, -64
+	playsewithpan SE_W016B, SOUND_PAN_ATTACKER
 	goto RazorWindContinue
 
 RazorWindUnleash:
@@ -7521,16 +7521,16 @@ RazorWindUnleash:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085962D4, 2, 14, 8, 0, 0, 22, 2, 1
 	delay 2
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085962D4, 2, 14, -8, 16, 14, 22, 1, 1
 	delay 2
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085962D4, 2, 14, 12, -16, -14, 22, 0, 1
 	delay 17
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1
 	waitforvisualfinish
@@ -7543,11 +7543,11 @@ Move_DISABLE:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 8, 8
-	playsewithpan SE_W197, -64
+	playsewithpan SE_W197, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0853EE84, 13, 24, -16
 	waitforvisualfinish
 	createvisualtask sub_81045B0, 5
-	loopsewithpan SE_W020, +63, 15, 4
+	loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4
 	waitforvisualfinish
 	delay 1
 	clearmonbg ANIM_TARGET
@@ -7559,7 +7559,7 @@ Move_RECOVER:
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_ATK_PARTNER
 	setalpha 12, 8
-	loopsewithpan SE_W025, -64, 13, 3
+	loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3
 	createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11)
 	call Recover1
 	call Recover1
@@ -7594,14 +7594,14 @@ Move_MIMIC:
 	setalpha 11, 5
 	monbg_22 ANIM_DEF_PARTNER
 	monbgprio_29
-	panse_1B SE_W107, +63, -64, -3, 0
+	panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
 	createvisualtask sub_80FF458, 5, 128, 24
 	delay 15
 	createsprite gUnknown_085924DC, 130, -12, 24
 	delay 10
 	setarg 7, -1
 	waitforvisualfinish
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg_23 ANIM_DEF_PARTNER
@@ -7610,7 +7610,7 @@ Move_MIMIC:
 
 Move_CONSTRICT:
 	loadspritegfx ANIM_TAG_186
-	loopsewithpan SE_W010, +63, 6, 4
+	loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4
 	createsprite gUnknown_08592494, 132, 0, 16, 0, 2
 	delay 7
 	createsprite gUnknown_08592494, 131, 0, 0, 0, 2
@@ -7620,7 +7620,7 @@ Move_CONSTRICT:
 	delay 8
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	delay 20
-	playsewithpan SE_W020, +63
+	playsewithpan SE_W020, SOUND_PAN_TARGET
 	setarg 7, -1
 	waitforvisualfinish
 	end
@@ -7645,7 +7645,7 @@ CurseGhost:
 	clearmonbg ANIM_ATK_PARTNER
 	delay 1
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W171, +63
+	playsewithpan SE_W171, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_8596DE8, 130
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
@@ -7655,7 +7655,7 @@ CurseGhost:
 	end
 CurseGhost1:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0
-	playsewithpan SE_W020, -64
+	playsewithpan SE_W020, SOUND_PAN_ATTACKER
 	return
 CurseStats:
 	createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER
@@ -7665,7 +7665,7 @@ CurseStats:
 	waitforvisualfinish
 	end
 CurseStats1:
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	createvisualtask sub_8116B14, 5
 	createvisualtask sub_8115A04, 5, 2, 4, 2, 0, 10, RGB_RED
 	return
@@ -7675,13 +7675,13 @@ Move_SOFT_BOILED:
 	loadspritegfx ANIM_TAG_203
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_ATK_PARTNER
-	playsewithpan SE_W039, -64
+	playsewithpan SE_W039, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1
 	createsprite gUnknown_085937B0, 4, 0, 16, 0
 	createsprite gUnknown_085937B0, 4, 0, 16, 1
 	delay 120
 	delay 7
-	playsewithpan SE_W030, -64
+	playsewithpan SE_W030, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30)
 	createsprite gUnknown_0859381C, 3, 31, 16, 0, 1
 	delay 8
@@ -7726,14 +7726,14 @@ Move_HEAL_BELL:
 	unloadspritegfx ANIM_TAG_MUSIC_NOTES
 	unloadspritegfx ANIM_TAG_203
 	loadspritegfx ANIM_TAG_SPARKLE
-	playsewithpan SE_W234, -64
+	playsewithpan SE_W234, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1
 	delay 8
 	createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1
 	waitforvisualfinish
 	unloadspritegfx ANIM_TAG_SPARKLE
 	loadspritegfx ANIM_TAG_203
-	playsewithpan SE_REAPOKE, -64
+	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
 	createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30)
 	createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE
 	createsprite gUnknown_08593868, 16, 0, 0, 0, 1
@@ -7742,14 +7742,14 @@ HealBell1:
 	createvisualtask sub_8116664, 10, 4, 3, 8, 0, RGB(12, 24, 30)
 	createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE
 	createsprite gUnknown_0859381C, 40, 0, -24, 0, 1
-	playsewithpan SE_W215, -64
+	playsewithpan SE_W215, SOUND_PAN_ATTACKER
 	return
 
 Move_FAKE_OUT:
 	playsewithpan SE_W260, 0
 	createvisualtask sub_8105EB0, 5
 	waitforvisualfinish
-	playsewithpan SE_W166, +63
+	playsewithpan SE_W166, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
 	createvisualtask sub_8106020, 3
 	waitforvisualfinish
@@ -7759,17 +7759,17 @@ Move_FAKE_OUT:
 Move_SCARY_FACE:
 	loadspritegfx ANIM_TAG_218
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 10
-	playsewithpan SE_W043, -64
+	playsewithpan SE_W043, SOUND_PAN_ATTACKER
 	createvisualtask sub_81064F8, 5
 	delay 13
 	createsprite gUnknown_08593A84, 0, -16, -8
 	createsprite gUnknown_08593A84, 0, 16, -8
 	waitforvisualfinish
 	createvisualtask sub_810A094, 3, 20, 1, 0
-	playsewithpan SE_W081B, +63
+	playsewithpan SE_W081B, SOUND_PAN_TARGET
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 16, 0, RGB_BLACK
 	waitforvisualfinish
 	end
@@ -7778,14 +7778,14 @@ Move_SWEET_KISS:
 	loadspritegfx ANIM_TAG_216
 	loadspritegfx ANIM_TAG_ANGEL
 	createsprite gUnknown_08593AA8, 130, 16, -48
-	playsewithpan SE_W215, +63
+	playsewithpan SE_W215, SOUND_PAN_TARGET
 	delay 23
-	playsewithpan SE_W215, +63
+	playsewithpan SE_W215, SOUND_PAN_TARGET
 	delay 23
-	playsewithpan SE_W215, +63
+	playsewithpan SE_W215, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -30
-	playsewithpan SE_W213, +63
+	playsewithpan SE_W213, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -42
 	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -14
 	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38
@@ -7797,9 +7797,9 @@ Move_LOVELY_KISS:
 	loadspritegfx ANIM_TAG_219
 	loadspritegfx ANIM_TAG_EVIL_ANGEL
 	createsprite gUnknown_08593AF0, 130, 0, -24
-	playsewithpan SE_W060B, +63
+	playsewithpan SE_W060B, SOUND_PAN_TARGET
 	waitforvisualfinish
-	playsewithpan SE_W213, +63
+	playsewithpan SE_W213, SOUND_PAN_TARGET
 	createsprite gUnknown_08593AC0, 131, -256, -42
 	createsprite gUnknown_08593AC0, 131, 128, -14
 	createsprite gUnknown_08593AC0, 131, 416, -38
@@ -7810,13 +7810,13 @@ Move_FURY_SWIPES:
 	loadspritegfx ANIM_TAG_222
 	createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5
 	delay 4
-	playsewithpan SE_W010, +63
+	playsewithpan SE_W010, SOUND_PAN_TARGET
 	createsprite gUnknown_08593B38, 130, 16, 0, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1
 	delay 10
 	createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5
 	delay 4
-	playsewithpan SE_W010, +63
+	playsewithpan SE_W010, SOUND_PAN_TARGET
 	createsprite gUnknown_08593B38, 130, -16, 0, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
 	end
@@ -7825,28 +7825,28 @@ Move_INGRAIN:
 	loadspritegfx ANIM_TAG_223
 	loadspritegfx ANIM_TAG_147
 	createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150
-	playsewithpan SE_W010, -64
+	playsewithpan SE_W010, SOUND_PAN_ATTACKER
 	delay 10
 	createsprite gUnknown_0859254C, 2, -32, 20, 1, 1, 140
-	playsewithpan SE_W010, -64
+	playsewithpan SE_W010, SOUND_PAN_ATTACKER
 	delay 10
 	createsprite gUnknown_0859254C, 2, 32, 22, 1, 0, 130
-	playsewithpan SE_W010, -64
+	playsewithpan SE_W010, SOUND_PAN_ATTACKER
 	delay 10
 	createsprite gUnknown_0859254C, 2, -16, 25, -1, 3, 120
-	playsewithpan SE_W010, -64
+	playsewithpan SE_W010, SOUND_PAN_ATTACKER
 	delay 40
 	createsprite gUnknown_0859258C, 3, 32, 26, -1, 3, 30
 	delay 5
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gUnknown_0859258C, 3, -48, 20, 1, 2, 30
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	delay 5
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gUnknown_0859258C, 3, 48, 26, -2, 3, 18
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	delay 10
 	waitforvisualfinish
 	end
@@ -7855,13 +7855,13 @@ Move_PRESENT:
 	loadspritegfx ANIM_TAG_ITEM_BAG
 	createvisualtask AnimTask_IsHealingMove, 2
 	createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1
-	playsewithpan SE_W039, -64
+	playsewithpan SE_W039, SOUND_PAN_ATTACKER
 	delay 14
-	playsewithpan SE_W145B, -64
+	playsewithpan SE_W145B, SOUND_PAN_ATTACKER
 	delay 14
 	playsewithpan SE_W145B, 0
 	delay 20
-	playsewithpan SE_W145B, +63
+	playsewithpan SE_W145B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	jumpretfalse PresentDamage
 	jumprettrue PresentHeal
@@ -7869,26 +7869,26 @@ Move_PRESENT:
 
 PresentDamage:
 	loadspritegfx ANIM_TAG_EXPLOSION
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 131, 24, -24, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 131, -16, 16, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 131, -24, -12, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 131, 16, 16, 1, 1
 	end
 
 PresentHeal:
 	loadspritegfx ANIM_TAG_GREEN_SPARKLE
 	loadspritegfx ANIM_TAG_BLUE_STAR
-	playsewithpan SE_W234, +63
+	playsewithpan SE_W234, SOUND_PAN_TARGET
 	createsprite gUnknown_08592658, 132, -16, 32, -3, 1
 	delay 3
 	createsprite gUnknown_08592658, 132, 16, 32, -3, -1
@@ -7913,7 +7913,7 @@ PresentHeal:
 
 Move_BATON_PASS:
 	loadspritegfx ANIM_TAG_226
-	playsewithpan SE_W226, -64
+	playsewithpan SE_W226, SOUND_PAN_ATTACKER
 	createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30)
 	createsprite gUnknown_085CE370, 2
 	end
@@ -7938,7 +7938,7 @@ Move_PERISH_SONG:
 	createsprite gUnknown_08593C0C, 4, 15, 0, 240
 	createsprite gUnknown_08593C24, 4, 15, 0, 0
 	delay 20
-	panse_1B SE_W195, -64, +63, +2, 0
+	panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	delay 80
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_BLACK
 	createvisualtask sub_811489C, 5, 4, 0
@@ -7959,21 +7959,21 @@ Move_SLEEP_TALK:
 	createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER
 	delay 20
 	createsprite gUnknown_085CE190, 130, 0, 20, 5, -1
-	playsewithpan SE_W173, -64
+	playsewithpan SE_W173, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gUnknown_085CE190, 130, 0, 20, 5, -1
 	delay 6
 	createsprite gUnknown_085CE190, 130, 0, 20, 5, -1
 	delay 20
 	createsprite gUnknown_085CE190, 130, 0, 20, 5, -5
-	playsewithpan SE_W173, -64
+	playsewithpan SE_W173, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gUnknown_085CE190, 130, 0, 20, 5, -5
 	delay 6
 	createsprite gUnknown_085CE190, 130, 0, 20, 5, -5
 	delay 20
 	createsprite gUnknown_085CE190, 130, 0, 20, 5, -3
-	playsewithpan SE_W173, -64
+	playsewithpan SE_W173, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gUnknown_085CE190, 130, 0, 20, 5, -3
 	delay 6
@@ -7983,7 +7983,7 @@ Move_SLEEP_TALK:
 
 Move_HYPER_FANG:
 	loadspritegfx ANIM_TAG_192
-	playsewithpan SE_W044, +63
+	playsewithpan SE_W044, SOUND_PAN_TARGET
 	delay 1
 	delay 2
 	createvisualtask AnimTask_IsContest, 2
@@ -7996,7 +7996,7 @@ HyperFangContinue:
 	createsprite gUnknown_085CE1DC, 130
 	waitbgfadein
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1
-	playsewithpan SE_W043, +63
+	playsewithpan SE_W043, SOUND_PAN_TARGET
 	delay 20
 	restorebg
 	waitbgfadein
@@ -8015,17 +8015,17 @@ HyperFangInContest:
 Move_TRI_ATTACK:
 	loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE
 	createsprite gUnknown_085CE2F8, 130, 16, 0
-	playsewithpan SE_W161, -64
+	playsewithpan SE_W161, SOUND_PAN_ATTACKER
 	delay 20
-	playsewithpan SE_W161, -64
+	playsewithpan SE_W161, SOUND_PAN_ATTACKER
 	delay 20
-	createsoundtask sub_8158C58, 220, -64, 63, 5, 6, 0, 7
+	createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK
 	delay 16
 	loadspritegfx ANIM_TAG_FIRE
 	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0
-	playsewithpan SE_W172B, +63
+	playsewithpan SE_W172B, SOUND_PAN_TARGET
 	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1
 	delay 1
 	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1
@@ -8044,7 +8044,7 @@ Move_TRI_ATTACK:
 	waitforvisualfinish
 	loadspritegfx ANIM_TAG_LIGHTNING
 	createvisualtask sub_8115F10, 2, 257, 257, 257
-	playsewithpan SE_W161B, +63
+	playsewithpan SE_W161B, SOUND_PAN_TARGET
 	createsprite gUnknown_085956C0, 130, 0, -48
 	delay 1
 	createsprite gUnknown_085956C0, 130, 0, -16
@@ -8066,9 +8066,9 @@ Move_WILL_O_WISP:
 	loadspritegfx ANIM_TAG_231
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	playsewithpan SE_W052, -64
-	waitplaysewithpan SE_W052, -64, 10
-	createvisualtask sub_8159278, 2, -64, -64, 1, 0
+	playsewithpan SE_W052, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10
+	createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_ATTACKER, 1, 0
 	createsprite gUnknown_0859563C, 2, 0, 0, 0
 	delay 3
 	createsprite gUnknown_0859563C, 3, 0, 0, 1
@@ -8077,10 +8077,10 @@ Move_WILL_O_WISP:
 	delay 3
 	createsprite gUnknown_0859563C, 4, 0, 0, 3
 	delay 40
-	createvisualtask sub_8159278, 2, -64, 63, 2, 0
+	createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0
 	waitforvisualfinish
 	monbgprio_29
-	playsewithpan SE_W172B, +63
+	playsewithpan SE_W172B, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1
 	createsprite gUnknown_0859566C, 2, 0
 	createsprite gUnknown_0859566C, 2, 42
@@ -8104,7 +8104,7 @@ Move_ENCORE:
 	createsprite gUnknown_085CE25C, 3, -2, 0, 0, 0, 9
 	createsprite gUnknown_085CE25C, 3, 2, 0, 1, 0, 9
 	delay 16
-	createvisualtask sub_8159244, 5, 223, 63
+	createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET
 	createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET
 	waitforvisualfinish
 	createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1
@@ -8145,11 +8145,11 @@ Move_WISH:
 	loadspritegfx ANIM_TAG_SPARKLE
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK
 	waitforvisualfinish
-	panse_27 SE_W115, +63, -64, -3, 0
+	panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
 	createsprite gUnknown_085CE388, 40
 	waitforvisualfinish
 	delay 60
-	loopsewithpan SE_W215, -64, 16, 3
+	loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3
 	call GrantingStarsEffect
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK
@@ -8158,7 +8158,7 @@ Move_WISH:
 
 Move_STOCKPILE:
 	loadspritegfx ANIM_TAG_235
-	playsewithpan SE_W025, -64
+	playsewithpan SE_W025, SOUND_PAN_ATTACKER
 	createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE
 	createvisualtask sub_815B65C, 5
 	call Stockpile1
@@ -8188,11 +8188,11 @@ Stockpile1:
 Move_SPIT_UP:
 	loadspritegfx ANIM_TAG_237
 	loadspritegfx ANIM_TAG_135
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask sub_815B6B4, 5
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
 	delay 45
-	playsewithpan SE_W255, -64
+	playsewithpan SE_W255, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gUnknown_08593A50, 2, 0, 12
 	createsprite gUnknown_08593A50, 2, 32, 12
@@ -8208,10 +8208,10 @@ Move_SPIT_UP:
 SpitUpContinue:
 	delay 5
 	createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	createsprite gUnknown_085973E8, 131, -12, 10, 1, 1
 	delay 5
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	createsprite gUnknown_085973E8, 131, 12, -10, 1, 1
 	waitforvisualfinish
 	end
@@ -8235,11 +8235,11 @@ SpitUpStrongest:
 Move_SWALLOW:
 	loadspritegfx ANIM_TAG_236
 	loadspritegfx ANIM_TAG_BLUE_STAR
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask sub_815B778, 5
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
 	delay 38
-	playsewithpan SE_W255, -64
+	playsewithpan SE_W255, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1
 	call SwallowEffect
 	jumpifmoveturn 2, SwallowGood
@@ -8270,8 +8270,8 @@ SwallowBest:
 
 Move_TRANSFORM:
 	monbg ANIM_ATTACKER
-	playsewithpan SE_W100, -64
-	waitplaysewithpan SE_W107, -64, 48
+	playsewithpan SE_W100, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48
 	createvisualtask sub_815B7D0, 2, 0
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
@@ -8311,13 +8311,13 @@ MorningSun1:
 
 Move_SWEET_SCENT:
 	loadspritegfx ANIM_TAG_238
-	playsewithpan SE_W230, -64
+	playsewithpan SE_W230, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085CE544, 2, 100, 0, 100
 	delay 25
 	setpan 0
 	call SweetScentEffect
 	createsprite gUnknown_085CE544, 2, 55, 0
-	setpan +63
+	setpan SOUND_PAN_TARGET
 	createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21)
 	call SweetScentEffect
 	waitforvisualfinish
@@ -8352,11 +8352,11 @@ Move_HYPER_BEAM:
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK
 	waitforvisualfinish
 	delay 10
-	playsewithpan SE_W063, -64
+	playsewithpan SE_W063, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1
 	waitforvisualfinish
 	delay 30
-	createsoundtask sub_8158C58, 247, -64, 63, 1, 15, 0, 5
+	createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
 	createvisualtask sub_8115D94, 2, ANIM_TAG_147, 1, 12, 31, 16, 0, 0
 	call HyperBeam1
@@ -8400,7 +8400,7 @@ HyperBeam1:
 Move_FLATTER:
 	loadspritegfx ANIM_TAG_227
 	loadspritegfx ANIM_TAG_240
-	createvisualtask sub_8159244, 5, 223, 63
+	createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET
 	createvisualtask sub_815ABEC, 2
 	createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
 	waitforvisualfinish
@@ -8410,7 +8410,7 @@ Move_FLATTER:
 	delay 10
 	createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET
 	delay 0
-	createvisualtask sub_8159210, 5, 229, -64
+	createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER
 	call Flatter1
 	call Flatter1
 	call Flatter1
@@ -8431,7 +8431,7 @@ Move_FLATTER:
 	call Flatter1
 	call Flatter1
 	delay 5
-	createvisualtask sub_8159210, 5, 229, 63
+	createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1
 	waitforvisualfinish
@@ -8447,8 +8447,8 @@ Move_ROLE_PLAY:
 	createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_WHITE
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 10, RGB_BLACK
 	waitforvisualfinish
-	playsewithpan SE_W161, -64
-	waitplaysewithpan SE_W197, -64, 30
+	playsewithpan SE_W161, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30
 	createvisualtask sub_815CED8, 2
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -8460,13 +8460,13 @@ Move_ROLE_PLAY:
 Move_REFRESH:
 	loadspritegfx ANIM_TAG_203
 	loadspritegfx ANIM_TAG_SPARKLE
-	playsewithpan SE_W287, -64
+	playsewithpan SE_W287, SOUND_PAN_ATTACKER
 	createvisualtask sub_815DFCC, 2, 0
 	waitforvisualfinish
-	playsewithpan SE_W234, -64
+	playsewithpan SE_W234, SOUND_PAN_ATTACKER
 	call GrantingStarsEffect
 	waitforvisualfinish
-	playsewithpan SE_REAPOKE, -64
+	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30)
 	createsprite gUnknown_0859381C, 3, 0, 0, 0, 0
 	end
@@ -8477,11 +8477,11 @@ Move_BLAZE_KICK:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W172, +63
+	playsewithpan SE_W172, SOUND_PAN_TARGET
 	createsprite gUnknown_08595F14, 131, 0, 0, 1, 30
 	createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE
 	delay 30
-	playsewithpan SE_W007, +63
+	playsewithpan SE_W007, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1
 	createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE
@@ -8516,7 +8516,7 @@ Move_SAND_TOMB:
 	loadspritegfx ANIM_TAG_074
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0)
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1
-	playsewithpan SE_W328, +63
+	playsewithpan SE_W328, SOUND_PAN_TARGET
 	call SandTombEffect
 	call SandTombEffect
 	call SandTombEffect
@@ -8550,7 +8550,7 @@ Move_SHEER_COLD:
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
 	createvisualtask sub_80A9EF4, 2
-	waitplaysewithpan SE_W258, +63, 17
+	waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -8567,11 +8567,11 @@ Move_ARM_THRUST:
 	delay 6
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08596034, 130, 10, -8, 14, 3
 	waitforvisualfinish
 	createvisualtask sub_80D6134, 5, 8, 5, 0, 1
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	choosetwoturnanim ArmThrustRight, ArmThrustLeft
 ArmThrustContinue:
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
@@ -8586,7 +8586,7 @@ ArmThrustLeft:
 	goto ArmThrustContinue
 
 Move_MUDDY_WATER:
-	panse_1B SE_W250, -64, +63, +2, 0
+	panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createvisualtask AnimTask_CreateSurfWave, 2, TRUE
 	waitforvisualfinish
 	end
@@ -8619,7 +8619,7 @@ Move_BULLET_SEED:
 Move_DRAGON_CLAW:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	loadspritegfx ANIM_TAG_CLAW_SLASH
-	playsewithpan SE_W221B, -64
+	playsewithpan SE_W221B, SOUND_PAN_ATTACKER
 	createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0)
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1
 	call DragonClawEffect
@@ -8627,7 +8627,7 @@ Move_DRAGON_CLAW:
 	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
 	createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0
 	delay 2
-	createvisualtask sub_8159210, 5, 136, 63
+	createvisualtask sub_8159210, 5, 136, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0
 	createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1
@@ -8640,7 +8640,7 @@ Move_DRAGON_CLAW:
 	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
 	createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0
 	delay 2
-	createvisualtask sub_8159210, 5, 136, 63
+	createvisualtask sub_8159210, 5, 136, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1
 	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1
 	createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1
@@ -8686,7 +8686,7 @@ Move_MUD_SHOT:
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
 	delay 6
 	createvisualtask sub_81076C8, 5, 100
-	panse_1B SE_W250, -64, +63, +1, 0
+	panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
 	call MudShot1
 	call MudShot1
 	call MudShot1
@@ -8714,18 +8714,18 @@ Move_METEOR_MASH:
 	loadspritegfx ANIM_TAG_233
 	loadspritegfx ANIM_TAG_135
 	loadspritegfx ANIM_TAG_143
-	panse_1B SE_W112, -64, +63, +3, 0
+	panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0
 	fadetobg BG_COSMIC
 	waitbgfadein
 	waitforvisualfinish
-	createsprite gUnknown_085CE8DC, 131, -48, -64, 72, 32, 30
+	createsprite gUnknown_085CE8DC, 131, -48, SOUND_PAN_ATTACKER, 72, 32, 30
 	delay 10
-	createsprite gUnknown_085CE8DC, 131, -112, -64, 8, 32, 30
+	createsprite gUnknown_085CE8DC, 131, -112, SOUND_PAN_ATTACKER, 8, 32, 30
 	delay 40
 	createsprite gUnknown_08595F14, 131, 0, 0, 0, 30
-	createsprite gUnknown_085CE8DC, 131, -80, -64, 40, 32, 30
+	createsprite gUnknown_085CE8DC, 131, -80, SOUND_PAN_ATTACKER, 40, 32, 30
 	delay 20
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1
 	waitforvisualfinish
@@ -8739,7 +8739,7 @@ Move_REVENGE:
 	loadspritegfx ANIM_TAG_245
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596088, 2, 10, -10
 	waitforvisualfinish
 	createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED
@@ -8748,17 +8748,17 @@ Move_REVENGE:
 	loadspritegfx ANIM_TAG_246
 	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
 	delay 4
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_085960D0, 130, 10, -10
 	waitforvisualfinish
 	unloadspritegfx ANIM_TAG_246
 	loadspritegfx ANIM_TAG_135
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1
 	createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 8
 	createsprite gUnknown_08597400, 131, 10, 8, 1, 1, 8
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -8767,7 +8767,7 @@ Move_REVENGE:
 Move_POISON_FANG:
 	loadspritegfx ANIM_TAG_192
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
-	playsewithpan SE_W044, +63
+	playsewithpan SE_W044, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE1DC, 130
 	delay 10
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1
@@ -8778,7 +8778,7 @@ Move_POISON_FANG:
 	end
 
 Move_SUBSTITUTE:
-	playsewithpan SE_W213, -64
+	playsewithpan SE_W213, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_MonToSubstitute, 2
 	end
 
@@ -8791,7 +8791,7 @@ Move_FRENZY_PLANT:
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 0, 5, RGB_BLACK
 	waitforvisualfinish
 	createsprite gUnknown_08592564, 2, 10, 8, 2, 0, 0, 100
-	playsewithpan SE_W010, -64
+	playsewithpan SE_W010, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gUnknown_08592564, 2, 20, -8, -2, 0, 1, 95
 	playsewithpan SE_W010, -43
@@ -8809,32 +8809,32 @@ Move_FRENZY_PLANT:
 	playsewithpan SE_W010, +42
 	delay 5
 	createsprite gUnknown_08592564, 2, 75, 8, 0, 0, 0, 85
-	playsewithpan SE_W010, +63
+	playsewithpan SE_W010, SOUND_PAN_TARGET
 	delay 5
 	createsprite gUnknown_08592564, 2, 85, 16, 6, 0, 3, 80
-	playsewithpan SE_W010, +63
+	playsewithpan SE_W010, SOUND_PAN_TARGET
 	delay 5
 	createsprite gUnknown_08592564, 2, 85, -16, -6, 0, 2, 75
-	playsewithpan SE_W010, +63
+	playsewithpan SE_W010, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	delay 2
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	delay 2
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 5, 0, RGB_BLACK
 	waitforvisualfinish
@@ -8857,7 +8857,7 @@ Move_METAL_SOUND:
 	waitforvisualfinish
 	end
 MetalSound1:
-	panse_1B SE_W103, -64, +63, +2, 0
+	panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createsprite gUnknown_08593458, 130, 16, 0, 0, 0, 30, 0
 	delay 2
 	return
@@ -8880,20 +8880,20 @@ FocusPunchContinue:
 	waitbgfadein
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W207, +63
+	playsewithpan SE_W207, SOUND_PAN_TARGET
 	createsprite gUnknown_08596104, 130
 	delay 10
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -8927,94 +8927,94 @@ ReturnContinue:
 	end
 ReturnWeak:
 	createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 5, 139, 63
+	createvisualtask sub_8159210, 5, 139, SOUND_PAN_TARGET
 	goto ReturnContinue
 ReturnMedium:
 	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 11
 	createsprite gHorizontalLungeSpriteTemplate, 2, 5, 4
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
-	createvisualtask sub_8159210, 5, 141, 63
+	createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET
 	goto ReturnContinue
 ReturnStrong:
 	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	goto ReturnContinue
 ReturnStrongest:
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 6, RGB_BLACK
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, 2, 12, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	waitforvisualfinish
 	delay 4
 	createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	waitforvisualfinish
 	delay 2
 	createvisualtask sub_81169C0, 2, 0, 4, 5, 1
 	createsprite gVerticalDipSpriteTemplate, 2, 4, 1, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	createvisualtask sub_81169C0, 2, 0, 4, 5, 1
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, 2, 4, 2, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	createvisualtask sub_81169C0, 2, 0, 4, 5, 1
 	waitforvisualfinish
@@ -9023,25 +9023,25 @@ ReturnStrongest:
 	call ReturnStrongest1
 	call ReturnStrongest1
 	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0
-	createvisualtask sub_8159210, 5, 141, 63
+	createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 0
-	createvisualtask sub_8159210, 5, 141, 63
+	createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 0
-	createvisualtask sub_8159210, 5, 141, 63
+	createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 0
-	createvisualtask sub_8159210, 5, 141, 63
+	createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 6, 0, RGB_BLACK
 	goto ReturnContinue
 ReturnStrongest1:
 	createsprite gVerticalDipSpriteTemplate, 2, 4, 3, ANIM_ATTACKER
-	createvisualtask sub_8159244, 5, 167, -64
+	createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
-	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	createvisualtask sub_81169C0, 2, 0, 4, 5, 1
 	waitforvisualfinish
@@ -9058,7 +9058,7 @@ Move_COSMIC_POWER:
 	createvisualtask sub_8117660, 2, 0, 128, 0, -1
 	waitbgfadein
 	delay 70
-	createvisualtask sub_8159210, 5, 228, -64
+	createvisualtask sub_8159210, 5, 228, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60
 	delay 8
 	createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60
@@ -9077,7 +9077,7 @@ Move_BLAST_BURN:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W221, -64
+	playsewithpan SE_W221, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595428, 2, -32, 0, 24, 0, 0, 0
 	createsprite gUnknown_08595428, 2, -20, -10, 24, 0, 0, 0
 	createsprite gUnknown_08595428, 66, 0, -16, 24, 0, 0, 0
@@ -9087,7 +9087,7 @@ Move_BLAST_BURN:
 	createsprite gUnknown_08595428, 2, 0, 16, 24, 0, 0, 0
 	createsprite gUnknown_08595428, 2, -20, 10, 24, 0, 0, 0
 	delay 25
-	playsewithpan SE_W172B, -64
+	playsewithpan SE_W172B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595428, 2, -64, 0, 24, 0, 0, 0
 	createsprite gUnknown_08595428, 6, -40, -20, 24, 0, 0, 0
 	createsprite gUnknown_08595428, 70, 0, -32, 24, 0, 0, 0
@@ -9099,7 +9099,7 @@ Move_BLAST_BURN:
 	createsprite gUnknown_08595428, 2, -40, 20, 24, 0, 0, 0
 	createvisualtask sub_8115F10, 2, 257, 257, 257
 	delay 25
-	playsewithpan SE_W172B, -64
+	playsewithpan SE_W172B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595428, 2, -96, 0, 24, 0, 0, 0
 	createsprite gUnknown_08595428, 6, -60, -30, 24, 0, 0, 0
 	createsprite gUnknown_08595428, 70, 0, -48, 24, 0, 0, 0
@@ -9125,24 +9125,24 @@ Move_ROCK_TOMB:
 	createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0
 	delay 8
 	createvisualtask sub_81162A4, 2, 0, 2, 3, 1
-	playsewithpan SE_W070, +63
+	playsewithpan SE_W070, SOUND_PAN_TARGET
 	delay 8
 	createsprite gUnknown_08596C58, 130, -20, 12, 64, 98, 0
 	delay 8
 	createvisualtask sub_81162A4, 2, 0, 2, 3, 1
-	playsewithpan SE_W070, +63
+	playsewithpan SE_W070, SOUND_PAN_TARGET
 	delay 8
 	createsprite gUnknown_08596C58, 194, 3, 6, 64, 82, 0
 	delay 8
 	createvisualtask sub_81162A4, 2, 0, 2, 3, 1
-	playsewithpan SE_W070, +63
+	playsewithpan SE_W070, SOUND_PAN_TARGET
 	delay 8
 	createsprite gUnknown_08596C58, 130, -3, 13, 64, 66, 0
 	delay 8
 	createvisualtask sub_81162A4, 2, 0, 2, 3, 1
-	playsewithpan SE_W070, +63
+	playsewithpan SE_W070, SOUND_PAN_TARGET
 	delay 24
-	playsewithpan SE_W063, +63
+	playsewithpan SE_W063, SOUND_PAN_TARGET
 	createsprite gUnknown_085967AC, 133, 1, 50
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1
 	createvisualtask sub_81162A4, 2, 2, 0, 10, 1
@@ -9151,7 +9151,7 @@ Move_ROCK_TOMB:
 
 Move_SILVER_WIND:
 	loadspritegfx ANIM_TAG_271
-	panse_1B SE_W016, -64, +63, +2, 0
+	panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	playsewithpan SE_W234, 0
 	delay 0
 	monbg ANIM_DEF_PARTNER
@@ -9191,7 +9191,7 @@ SilverWindContinue:
 	createsprite gUnknown_08592860, -62, -4, 16, 0, 6, 1, 2, 1
 	createsprite gUnknown_08592860, -62, -16, 12, 192, 5, 2, 3, 1
 	waitforvisualfinish
-	playsewithpan SE_W016B, +63
+	playsewithpan SE_W016B, SOUND_PAN_TARGET
 	clearmonbg ANIM_DEF_PARTNER
 	delay 0
 	restorebg
@@ -9207,7 +9207,7 @@ SilverWindOnPlayer:
 	goto SilverWindContinue
 
 Move_SNATCH:
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6
 	end
 
@@ -9217,10 +9217,10 @@ Move_DIVE:
 	choosetwoturnanim DiveSetUp, DiveAttack
 DiveSetUp:
 	loadspritegfx ANIM_TAG_156
-	playsewithpan SE_W029, -64
+	playsewithpan SE_W029, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596490, 2, 0, 0, 13, 336
 	waitforvisualfinish
-	playsewithpan SE_W291, -64
+	playsewithpan SE_W291, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085964CC, 3, 0
 	call DiveSetUp1
 	call DiveSetUp1
@@ -9237,7 +9237,7 @@ DiveAttack:
 	loadspritegfx ANIM_TAG_155
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W153, +63
+	playsewithpan SE_W153, SOUND_PAN_TARGET
 	createsprite gUnknown_085964CC, 131, 1
 	call DiveAttack1
 	call DiveAttack1
@@ -9261,11 +9261,11 @@ Move_ROCK_BLAST:
 	loadspritegfx ANIM_TAG_135
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
 	delay 3
-	playsewithpan SE_W207, -64
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596C98, 130, 16, 0, 0, 0, 25, 257
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	createsprite gUnknown_08596B1C, 130, 0, 0, 20, 24, 14, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
 	createsprite gUnknown_08596B1C, 130, 5, 0, -20, 24, 14, 1
@@ -9287,13 +9287,13 @@ Move_OVERHEAT:
 	delay 1
 	createvisualtask sub_8117DD8, 5, 0
 	delay 1
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	createvisualtask sub_8117CA0, 5, 1, 0
 	delay 1
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 1, 0, 13, RGB(28, 0, 0)
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1
 	waitforvisualfinish
-	playsewithpan SE_W172B, -64
+	playsewithpan SE_W172B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, -20
 	createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, -20
 	createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, -20
@@ -9323,17 +9323,17 @@ Move_OVERHEAT:
 	delay 5
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0
-	playsewithpan SE_W007, +63
+	playsewithpan SE_W007, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0
-	playsewithpan SE_W007, +63
+	playsewithpan SE_W007, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0
-	playsewithpan SE_W007, +63
+	playsewithpan SE_W007, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0
-	playsewithpan SE_W007, +63
+	playsewithpan SE_W007, SOUND_PAN_TARGET
 	createvisualtask sub_8117DD8, 5, 1
 	delay 1
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, -1, 0, 13, RGB(18, 18, 18)
@@ -9360,12 +9360,12 @@ Move_HYDRO_CANNON:
 	loadspritegfx ANIM_TAG_148
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W057, -64
+	playsewithpan SE_W057, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085951C0, 130
 	delay 10
 	createvisualtask sub_8115F10, 2, 257, 257, 257
 	delay 30
-	panse_1B SE_W056, -64, +63, +2, 0
+	panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call HydroCannon1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1
 	createsprite gUnknown_08597388, 130, 0, 0, 1, 0
@@ -9399,11 +9399,11 @@ HydroCannon1:
 
 Move_ASTONISH:
 	loadspritegfx ANIM_TAG_273
-	playsewithpan SE_W227, -64
+	playsewithpan SE_W227, SOUND_PAN_ATTACKER
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
 	delay 25
 	createsprite gUnknown_085964E4, -123, 0, 1
-	playsewithpan SE_W166, +63
+	playsewithpan SE_W166, SOUND_PAN_TARGET
 	createsprite gUnknown_085964E4, -123, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
 	createvisualtask sub_8106020, 3
@@ -9460,7 +9460,7 @@ SeismicTossStrong:
 	goto SeismicTossContinue
 SeismicToss1:
 	createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1
-	playsewithpan SE_W070, +63
+	playsewithpan SE_W070, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1
 	createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3
 	createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4
@@ -9469,7 +9469,7 @@ SeismicToss1:
 	return
 SeismicToss2:
 	createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1
 	createsprite gUnknown_08596CB0, 130, -12, 32, 3, 4
 	createsprite gUnknown_08596CB0, 130, 8, 31, 2, 2
@@ -9480,7 +9480,7 @@ SeismicToss2:
 Move_MAGIC_COAT:
 	loadspritegfx ANIM_TAG_170
 	setalpha 0, 16
-	waitplaysewithpan SE_W112, -64, 15
+	waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15
 	createsprite gUnknown_085965C0, 3, 40, 0, 10170
 	waitforvisualfinish
 	delay 1
@@ -9492,7 +9492,7 @@ Move_WATER_PULSE:
 	loadspritegfx ANIM_TAG_288
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	playsewithpan SE_W145C, -64
+	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 7, RGB(0, 25, 28)
 	delay 10
 	createsprite gUnknown_085952F8, 66, 100, 100, 8, 1, 20, 40, 0
@@ -9500,15 +9500,15 @@ Move_WATER_PULSE:
 	createsprite gUnknown_085952F8, 66, 200, 80, 8, 1, 40, 20, 0
 	createsprite gUnknown_085952F8, 66, 80, 60, 10, 3, 20, 50, 0
 	createsprite gUnknown_085952F8, 66, 140, 100, 16, 1, 20, 30, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	waitforvisualfinish
-	playsewithpan SE_W202, -64
+	playsewithpan SE_W202, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593470, 130, 0, 0, 40, 15
 	delay 5
-	playsewithpan SE_W202, -64
+	playsewithpan SE_W202, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593470, 130, 0, 0, 40, 15
 	delay 5
-	playsewithpan SE_W202, -64
+	playsewithpan SE_W202, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593470, 130, 0, 0, 40, 15
 	delay 13
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1
@@ -9532,13 +9532,13 @@ Move_PSYCHO_BOOST:
 	setalpha 8, 8
 	delay 10
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0
-	loopsewithpan SE_W060B, -64, 14, 10
+	loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10
 	createsprite gUnknown_08596920, 2
 	delay 110
-	loopsewithpan SE_W060B, -64, 7, 10
+	loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1
-	playsewithpan SE_W043, +63
+	playsewithpan SE_W043, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -9550,12 +9550,12 @@ Move_KNOCK_OFF:
 	loadspritegfx ANIM_TAG_135
 	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
 	delay 4
-	playsewithpan SE_W233, +63
+	playsewithpan SE_W233, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE984, 130, -16, -16
 	delay 8
 	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
 	delay 3
@@ -9574,7 +9574,7 @@ Move_DOOM_DESIRE:
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	setalpha 8, 8
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
 	waitforvisualfinish
 	delay 20
@@ -9591,7 +9591,7 @@ Move_SKY_UPPERCUT:
 	monbgprio_28 ANIM_TARGET
 	fadetobg BG_SEISMICTOSS_SKUUPPERCUT
 	waitbgfadeout
-	playsewithpan SE_W327, -64
+	playsewithpan SE_W327, SOUND_PAN_ATTACKER
 	createvisualtask sub_810DABC, 5, 55
 	waitbgfadein
 	setalpha 12, 8
@@ -9599,20 +9599,20 @@ Move_SKY_UPPERCUT:
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5
 	delay 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1
 	delay 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	delay 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1
 	delay 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1
 	delay 1
-	playsewithpan SE_W233B, +63
+	playsewithpan SE_W233B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4
 	delay 4
@@ -9648,7 +9648,7 @@ Move_TWISTER:
 	loadspritegfx ANIM_TAG_058
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	playsewithpan SE_W239, +63
+	playsewithpan SE_W239, SOUND_PAN_TARGET
 	createsprite gUnknown_085923A8, 130, 120, 70, 5, 70, 30
 	delay 1
 	createsprite gUnknown_085923A8, 130, 115, 55, 6, 60, 25
@@ -9671,18 +9671,18 @@ Move_TWISTER:
 	createsprite gUnknown_085923A8, 130, 110, 10, 8, 32, 20
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
 	delay 4
 	createsprite gUnknown_085973A0, 131, 1, 3
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_085973A0, 131, 1, 3
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3
-	playsewithpan SE_W004, +63
+	playsewithpan SE_W004, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -9695,7 +9695,7 @@ Move_MAGICAL_LEAF:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	delay 1
-	loopsewithpan SE_W077, -64, 10, 5
+	loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5
 	createvisualtask sub_81007C4, 5
 	createsprite gUnknown_08592390, 2, -3, -2, 10
 	delay 2
@@ -9717,11 +9717,11 @@ Move_MAGICAL_LEAF:
 	delay 2
 	createsprite gUnknown_08592390, 2, -3, -5, 8
 	delay 60
-	playsewithpan SE_W013B, -64
+	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, 20, 0
 	createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, -20, 0
 	delay 30
-	playsewithpan SE_W013, +63
+	playsewithpan SE_W013, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2
 	createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -9738,10 +9738,10 @@ Move_ICE_BALL:
 	createvisualtask AnimTask_GetRolloutCounter, 5, 0
 	jumpargeq 0, 4, IceBallSetIceBg
 IceBallContinue:
-	playsewithpan SE_W196, -64
+	playsewithpan SE_W196, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08595DE4, 130, 15, 0, -12, -16, 30, -40
 	delay 28
-	playsewithpan SE_W280, +63
+	playsewithpan SE_W280, SOUND_PAN_TARGET
 	createvisualtask AnimTask_GetRolloutCounter, 5, 0
 	jumpargeq 0, 0, IceBallWeakest
 	jumpargeq 0, 1, IceBallWeak
@@ -9826,7 +9826,7 @@ Move_WEATHER_BALL:
 	loadspritegfx ANIM_TAG_283
 	createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER
 	delay 8
-	playsewithpan SE_W207, -64
+	playsewithpan SE_W207, SOUND_PAN_ATTACKER
 	createsprite gUnknown_0853EE38, 2
 	waitforvisualfinish
 	delay 15
@@ -9844,7 +9844,7 @@ WeatherBallNormal:
 	loadspritegfx ANIM_TAG_135
 	createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0
 	waitforvisualfinish
-	playsewithpan SE_W025B, +63
+	playsewithpan SE_W025B, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
 	waitforvisualfinish
@@ -9852,45 +9852,45 @@ WeatherBallNormal:
 WeatherBallFire:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10
-	playsewithpan SE_W172, +63
+	playsewithpan SE_W172, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, -40, 20
-	playsewithpan SE_W172, +63
+	playsewithpan SE_W172, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 0, 0
-	playsewithpan SE_W172, +63
+	playsewithpan SE_W172, SOUND_PAN_TARGET
 	waitforvisualfinish
-	playsewithpan SE_W172B, +63
+	playsewithpan SE_W172B, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
 	waitforvisualfinish
 	end
 WeatherBallWater:
 	loadspritegfx ANIM_TAG_155
 	createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	delay 8
 	createsprite gUnknown_08595328, 130, -30, -100, 25, 1, -20, 20
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	delay 13
 	createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 0, 0
-	playsewithpan SE_W152, +63
+	playsewithpan SE_W152, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
-	playsewithpan SE_W202, +63
+	playsewithpan SE_W202, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 WeatherBallSandstorm:
 	loadspritegfx ANIM_TAG_058
 	createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 5
 	createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, -40, 20
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	delay 14
 	createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 0, 0
-	playsewithpan SE_W088, +63
+	playsewithpan SE_W088, SOUND_PAN_TARGET
 	waitforvisualfinish
-	playsewithpan SE_W070, +63
+	playsewithpan SE_W070, SOUND_PAN_TARGET
 	createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3
 	createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4
 	createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3
@@ -9902,16 +9902,16 @@ WeatherBallIce:
 	loadspritegfx ANIM_TAG_263
 	loadspritegfx ANIM_TAG_141
 	createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20
-	playsewithpan SE_W258, +63
+	playsewithpan SE_W258, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 40, 0
-	playsewithpan SE_W258, +63
+	playsewithpan SE_W258, SOUND_PAN_TARGET
 	delay 10
 	createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 0, 0
-	playsewithpan SE_W258, +63
+	playsewithpan SE_W258, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	call FreezeEffect1
 	waitforvisualfinish
 	end
@@ -9920,7 +9920,7 @@ Move_COUNT:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -9930,64 +9930,64 @@ Move_COUNT:
 
 FreezeEffect1:
 	createsprite gUnknown_08595B68, 130, -10, -10, 0
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, 10, 20, 0
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B68, 130, -5, 10, 0
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, 17, -12, 0
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, -15, 15, 0
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, 0, 0, 0
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B68, 130, 20, 2, 0
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	return
 
 FreezeEffect2:
 	createsprite gUnknown_08595B68, 130, -10, -10, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, 10, 20, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B68, 130, -29, 0, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, 29, -20, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B68, 130, -5, 10, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, 17, -12, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B68, 130, -20, 0, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, -15, 15, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, 26, -5, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B80, 130, 0, 0, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	delay 4
 	createsprite gUnknown_08595B68, 130, 20, 2, 1
-	playsewithpan SE_W196, +63
+	playsewithpan SE_W196, SOUND_PAN_TARGET
 	return
 
 IcyWindEffect1: @ Unused
-	loopsewithpan SE_W196, +63, 6, 4
+	loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4
 	createsprite gUnknown_08595C04, 130, 0, 24, 0
 	delay 4
 	createsprite gUnknown_08595C04, 130, 8, 24, 0
@@ -10004,7 +10004,7 @@ IcyWindEffect1: @ Unused
 	return
 
 IcyWindEffect2:
-	loopsewithpan SE_W196, +63, 6, 4
+	loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4
 	createsprite gUnknown_08595C04, 130, 0, 24, 1
 	delay 4
 	createsprite gUnknown_08595C04, 130, 8, 24, 1
@@ -10034,7 +10034,7 @@ GrantingStarsEffect:
 	return
 
 HealingEffect:
-	playsewithpan SE_W071B, -64
+	playsewithpan SE_W071B, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592F2C, 2, 0, -5, 0, 0
 	delay 7
 	createsprite gUnknown_08592F2C, 2, -15, 10, 0, 0
@@ -10046,7 +10046,7 @@ HealingEffect:
 	return
 
 HealingEffect2:
-	playsewithpan SE_W071B, +63
+	playsewithpan SE_W071B, SOUND_PAN_TARGET
 	createsprite gUnknown_08592F2C, 130, 0, -5, 1, 0
 	delay 7
 	createsprite gUnknown_08592F2C, 130, -15, 10, 1, 0
@@ -10059,72 +10059,72 @@ HealingEffect2:
 
 PoisonBubblesEffect:
 	createsprite gPoisonBubbleSpriteTemplate, 130, 10, 10, 0
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, 130, 20, -20, 0
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, 130, -20, 15, 0
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, 130, 0, 0, 0
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, 130, -20, -20, 0
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, 130, 16, -8, 0
-	playsewithpan SE_W092, +63
+	playsewithpan SE_W092, SOUND_PAN_TARGET
 	return
 
 WaterBubbleEffect:
 	createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 0
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 0
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 0
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 0
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 0
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 0
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	return
 
 WaterBubbleEffect2:
 	createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, -28, -10, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, 27, 8, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 1
-	playsewithpan SE_W145C, +63
+	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	return
 
 ElectricityEffect:
-	playsewithpan SE_W085B, +63
+	playsewithpan SE_W085B, SOUND_PAN_TARGET
 	createsprite gElectricitySpriteTemplate, 130, 5, 0, 5, 0
 	delay 2
 	createsprite gElectricitySpriteTemplate, 130, -5, 10, 5, 1
@@ -10143,7 +10143,7 @@ ElectricityEffect:
 	return
 
 ConfusionEffect:
-	loopsewithpan SE_W146, +63, 13, 6
+	loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6
 	createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 0, 3, 90
 	createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 51, 3, 90
 	createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 102, 3, 90
@@ -10211,7 +10211,7 @@ UnsetSolarbeamBg:
 	return
 
 Status_Poison:
-	loopsewithpan SE_W092, +63, 13, 6
+	loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2
 	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31)
 	end
@@ -10223,7 +10223,7 @@ Status_Confusion:
 
 Status_Burn:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	playsewithpan SE_W172, +63
+	playsewithpan SE_W172, SOUND_PAN_TARGET
 	call Burn1
 	call Burn1
 	call Burn1
@@ -10236,19 +10236,19 @@ Burn1:
 
 Status_Infatuation:
 	loadspritegfx ANIM_TAG_PURPLE_HEART
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593970, 3, 0, 20
 	delay 15
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593970, 3, -20, 20
 	delay 15
-	playsewithpan SE_W204, -64
+	playsewithpan SE_W204, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08593970, 3, 20, 20
 	end
 
 Status_Sleep:
 	loadspritegfx ANIM_TAG_LETTER_Z
-	playsewithpan SE_W173, -64
+	playsewithpan SE_W173, SOUND_PAN_ATTACKER
 	createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0
 	delay 30
 	createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0
@@ -10265,7 +10265,7 @@ Status_Freeze:
 	loadspritegfx ANIM_TAG_ICE_CUBE
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	waitplaysewithpan SE_W258, +63, 17
+	waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17
 	createvisualtask sub_80A9EF4, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -10274,7 +10274,7 @@ Status_Freeze:
 Status_Curse:
 	loadspritegfx ANIM_TAG_200
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W171, +63
+	playsewithpan SE_W171, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_8596DE8, 130
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
@@ -10284,7 +10284,7 @@ Status_Curse:
 Status_Nightmare:
 	loadspritegfx ANIM_TAG_EVIL_ANGEL
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W171, +63
+	playsewithpan SE_W171, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_8596E00, 130
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
@@ -10297,8 +10297,8 @@ General_CastformChange:
 	goto AnimScript_82D7EB2
 AnimScript_82D7EB2:
 	monbg ANIM_ATTACKER
-	playsewithpan SE_W100, -64
-	waitplaysewithpan SE_W107, -64, 48
+	playsewithpan SE_W100, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48
 	createvisualtask sub_815B7D0, 2, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
@@ -10333,10 +10333,10 @@ General_PokeblockThrow:
 	createvisualtask sub_817345C, 2, 0
 	createvisualtask sub_81732B0, 2
 	delay 0
-	waitplaysewithpan SE_W026, -64, 22
+	waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22
 	createsprite gBattleAnimSpriteTemplate_85E5338, 131, -18, 12, 0, 32
 	delay 50
-	loopsewithpan SE_W039, +63, 19, 2
+	loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2
 	createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET
 	waitforvisualfinish
 	createvisualtask sub_81732E4, 2
@@ -10356,7 +10356,7 @@ General_TurnTrap:
 	goto Status_BindWrap
 Status_BindWrap:
 	loadspritegfx ANIM_TAG_186
-	loopsewithpan SE_W010, +63, 6, 2
+	loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2
 	createsprite gUnknown_08592494, 132, 0, 16, 0, 1
 	delay 7
 	createsprite gUnknown_08592494, 130, 0, 8, 1, 1
@@ -10364,12 +10364,12 @@ Status_BindWrap:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	delay 20
 	setarg 7, -1
-	playsewithpan SE_W020, +63
+	playsewithpan SE_W020, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 Status_FireSpin:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	playsewithpan SE_W221B, +63
+	playsewithpan SE_W221B, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
 	call FireSpinEffect
 	call FireSpinEffect
@@ -10383,7 +10383,7 @@ Status_Whrilpool:
 	setalpha 12, 8
 	delay 0
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23)
-	playsewithpan SE_W250, +63
+	playsewithpan SE_W250, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
 	call WhirlpoolEffect
 	call WhirlpoolEffect
@@ -10398,7 +10398,7 @@ Status_Clamp:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W011, +63
+	playsewithpan SE_W011, SOUND_PAN_TARGET
 	createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10
 	createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10
 	delay 10
@@ -10413,7 +10413,7 @@ Status_SandTomb:
 	loadspritegfx ANIM_TAG_074
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0)
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
-	playsewithpan SE_W328, +63
+	playsewithpan SE_W328, SOUND_PAN_TARGET
 	call SandTombEffect
 	call SandTombEffect
 	delay 22
@@ -10426,19 +10426,19 @@ General_ItemEffect:
 	loadspritegfx ANIM_TAG_203
 	loadspritegfx ANIM_TAG_SPARKLE
 	delay 0
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask sub_80D622C, 2, 16, 128, 0, 2
 	waitforvisualfinish
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask sub_80D622C, 2, 16, 128, 0, 2
 	waitforvisualfinish
-	playsewithpan SE_W036, -64
+	playsewithpan SE_W036, SOUND_PAN_ATTACKER
 	createvisualtask sub_80D622C, 2, 16, 128, 0, 2
 	waitforvisualfinish
-	playsewithpan SE_W234, -64
+	playsewithpan SE_W234, SOUND_PAN_ATTACKER
 	call GrantingStarsEffect
 	waitforvisualfinish
-	playsewithpan SE_REAPOKE, -64
+	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 3, 7, 0, RGB(17, 31, 25)
 	createsprite gUnknown_0859381C, 3, 0, 0, 0, 0
 	waitforvisualfinish
@@ -10449,23 +10449,23 @@ General_SmokeballEscape:
 	monbg ANIM_ATTACKER
 	setalpha 12, 4
 	delay 0
-	playsewithpan SE_BOWA2, +63
+	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE734, 128, 0, 32, 28, 30
 	delay 4
-	playsewithpan SE_BOWA2, +63
+	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE734, 127, 2, 12, 20, 30
 	delay 12
-	playsewithpan SE_BOWA2, +63
+	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE734, 0x7E, 2, -28, 4, 30
 	delay 12
-	playsewithpan SE_BOWA2, +63
+	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE734, 0x7C, 2, 14, -20, 30
 	delay 4
-	playsewithpan SE_BOWA2, +63
+	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
 	createvisualtask sub_81136E8, 2, 2
 	createsprite gUnknown_085CE734, 0x7B, 3, 4, 4, 30
 	delay 14
-	playsewithpan SE_BOWA2, +63
+	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
 	createsprite gUnknown_085CE734, 0x7A, 3, -14, 18, 46
 	delay 0
 	createsprite gUnknown_085CE734, 0x79, 3, 14, -14, 46
@@ -10484,7 +10484,7 @@ General_SmokeballEscape:
 
 General_HangedOn:
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 7, 0, 9, RGB_RED
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 4, 9, 0, RGB_RED
@@ -10495,7 +10495,7 @@ General_HangedOn:
 
 General_Rain:
 	loadspritegfx ANIM_TAG_115
-	playsewithpan SE_W240, -64
+	playsewithpan SE_W240, SOUND_PAN_ATTACKER
 	createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
@@ -10524,7 +10524,7 @@ General_MonHit:
 	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -10555,22 +10555,22 @@ SnatchMoveContinue:
 	call AnimScript_82D85C3
 	end
 SnatchOpposingMonMove:
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	createvisualtask sub_815F8F4, 2
 	goto SnatchMoveContinue
 SnatchPartnerMonMove:
-	playsewithpan SE_W104, -64
+	playsewithpan SE_W104, SOUND_PAN_ATTACKER
 	createvisualtask sub_815FFC4, 2
 	goto SnatchMoveContinue
 
 General_FutureSightHit:
 	createvisualtask sub_8117F10, 2
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W060, -64
+	playsewithpan SE_W060, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	setalpha 8, 8
-	playsewithpan SE_W048, +63
-	waitplaysewithpan SE_W048, +63, 8
+	playsewithpan SE_W048, SOUND_PAN_TARGET
+	waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1
 	waitforvisualfinish
@@ -10591,26 +10591,26 @@ General_DoomDesireHit:
 	delay 10
 	createvisualtask sub_815C0A4, 5
 	delay 9
-	playsewithpan SE_W109, -64
+	playsewithpan SE_W109, SOUND_PAN_ATTACKER
 	delay 9
 	playsewithpan SE_W109, 0
 	delay 9
-	playsewithpan SE_W109, +63
+	playsewithpan SE_W109, SOUND_PAN_TARGET
 	delay 25
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1
 	delay 6
-	playsewithpan SE_W120, +63
+	playsewithpan SE_W120, SOUND_PAN_TARGET
 	createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE
@@ -10619,7 +10619,7 @@ General_DoomDesireHit:
 
 General_FocusPunchSetUp:
 	loadspritegfx ANIM_TAG_184
-	playsewithpan SE_W082, -64
+	playsewithpan SE_W082, SOUND_PAN_ATTACKER
 	call EndureEffect
 	delay 8
 	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED
@@ -10653,7 +10653,7 @@ General_WishHeal:
 	loadspritegfx ANIM_TAG_SPARKLE
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK
 	waitforvisualfinish
-	playsewithpan SE_W025, -64
+	playsewithpan SE_W025, SOUND_PAN_ATTACKER
 	call GrantingStarsEffect
 	waitforvisualfinish
 	unloadspritegfx ANIM_TAG_SPARKLE
@@ -10723,7 +10723,7 @@ BallThrowTrainerBlock:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	delay 0
-	playsewithpan SE_W003, +63
+	playsewithpan SE_W003, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 30adafd35..81ad1f268 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -431,7 +431,7 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/SecretBase_YellowCave3/scripts.inc"
 	.include "data/maps/SecretBase_YellowCave4/scripts.inc"
 
-gUnknown_0823B4BB:: @ 823B4BB
+EventScript_SecretBasePC:: @ 823B4BB
 	lockall
 	playse 2
 	message Text_276805
@@ -492,7 +492,7 @@ EventScript_23B585:: @ 823B585
 	special sub_80E9C88
 	end
 
-gUnknown_0823B589:: @ 823B589
+EventScript_RecordMixingSecretBasePC:: @ 823B589
 	lockall
 	message Text_276805
 	playse 2
@@ -581,13 +581,13 @@ EventScript_23B680:: @ 823B680
 	special sub_80EBB28
 	end
 
-gUnknown_0823B684:: @ 823B684
+EventScript_SecretBaseSandOrnament:: @ 823B684
 	special sub_80EBE7C
 	dofieldeffect 52
 	waitstate
 	end
 
-gUnknown_0823B68C:: @ 823B68C
+EventScript_SecretBaseShieldOrToyTV:: @ 823B68C
 	special sub_80FAC78
 	compare VAR_RESULT, 0
 	goto_eq EventScript_23B6BC
@@ -1070,165 +1070,165 @@ EventScript_27149D:: @ 827149D
 	return
 
 EventScript_2715DE:: @ 82715DE
-	setflag FLAG_0x056
-	setflag FLAG_0x301
-	setflag FLAG_0x302
-	setflag FLAG_0x303
-	setflag FLAG_0x2D1
-	setflag FLAG_0x379
-	setflag FLAG_0x32B
-	setflag FLAG_0x32C
-	setflag FLAG_0x346
-	setflag FLAG_0x2D6
-	setflag FLAG_0x363
-	setflag FLAG_0x2DB
-	setflag FLAG_0x2DC
-	setflag FLAG_0x32E
-	setflag FLAG_0x34C
-	setflag FLAG_0x364
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
-	setflag FLAG_0x2E2
-	setflag FLAG_0x2E4
-	setflag FLAG_0x2E5
-	setflag FLAG_0x2E7
-	setflag FLAG_0x2E8
-	setflag FLAG_0x38A
-	setflag FLAG_0x345
-	setflag FLAG_0x306
-	setflag FLAG_0x37F
-	setflag FLAG_0x308
-	setflag FLAG_0x309
-	setflag FLAG_0x30A
-	setflag FLAG_0x30B
-	setflag FLAG_0x30C
-	setflag FLAG_0x30D
-	setflag FLAG_0x338
-	setflag FLAG_0x2E9
-	setflag FLAG_0x2EA
-	setflag FLAG_0x2F8
-	setflag FLAG_0x2D2
-	setflag FLAG_0x2DE
-	setflag FLAG_0x351
-	setflag FLAG_0x32F
+	setflag FLAG_LINK_CONTEST_POKE_BALL
+	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
+	setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA
+	setflag FLAG_HIDE_PETALBURG_CITY_WALLY
+	setflag FLAG_UNKNOWN_0x363
+	setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT
+	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
+	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
+	setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
+	setflag FLAG_HIDE_ROUTE_110_BIRCH
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
+	setflag FLAG_HIDE_PETALBURG_GYM_GREETER
+	setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
+	setflag FLAG_HIDE_PLAYERS_HOUSE_DAD
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_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_0x2DA
-	setflag FLAG_0x31D
-	setflag FLAG_0x31E
-	setflag FLAG_0x31F
-	setflag FLAG_0x385
-	setflag FLAG_0x386
-	setflag FLAG_0x387
-	setflag FLAG_0x388
-	setflag FLAG_0x323
-	setflag FLAG_0x322
-	setflag FLAG_0x326
-	setflag FLAG_0x328
-	setflag FLAG_0x329
-	setflag FLAG_0x3D8
-	setflag FLAG_0x2FE
-	setflag FLAG_0x33E
-	setflag FLAG_0x362
-	setflag FLAG_0x365
-	setflag FLAG_0x33C
-	setflag FLAG_0x33D
-	setflag FLAG_0x33F
-	setflag FLAG_0x35B
-	setflag FLAG_0x355
-	setflag FLAG_0x349
-	setflag FLAG_0x34D
-	setflag FLAG_0x34E
-	setflag FLAG_0x35C
-	setflag FLAG_0x35D
-	setflag FLAG_0x343
-	setflag FLAG_0x348
-	setflag FLAG_0x350
-	setflag FLAG_0x353
-	setflag FLAG_0x312
-	setflag FLAG_0x3CD
-	setflag FLAG_0x330
-	setflag FLAG_0x366
-	setflag FLAG_0x368
-	setflag FLAG_0x36D
-	setflag FLAG_0x3E2
-	setflag FLAG_0x36F
-	setflag FLAG_0x37B
-	setflag FLAG_0x370
-	setflag FLAG_0x36E
-	setflag FLAG_0x327
-	setflag FLAG_0x3D7
-	setflag FLAG_0x376
-	setflag FLAG_0x374
-	setflag FLAG_0x375
-	setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
-	setflag FLAG_0x378
-	setflag FLAG_0x2F0
-	setflag FLAG_0x2F5
-	setflag FLAG_0x31A
-	setflag FLAG_0x31B
-	setflag FLAG_0x37C
-	setflag FLAG_0x380
-	setflag FLAG_0x381
-	setflag FLAG_0x382
-	setflag FLAG_0x38D
-	setflag FLAG_0x2EC
-	setflag FLAG_0x38E
-	setflag FLAG_0x38F
+	setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
+	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
+	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
+	setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
+	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
+	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
+	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
+	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
+	setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
+	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
+	setflag FLAG_HIDE_PETALBURG_GYM_WALLY
+	setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
+	setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
+	setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
+	setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
+	setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
+	setflag FLAG_HIDE_ROUTE_119_RIVAL
+	setflag FLAG_HIDE_ROUTE_119_SCOTT
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
+	setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
+	setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
+	setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
+	setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
+	setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
+	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE
+	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1
+	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2
+	setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
+	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
+	setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
+	setflag FLAG_HIDE_ROUTE_101_BIRCH
+	setflag FLAG_HIDE_ROUTE_103_BIRCH
+	setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR
+	setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER
+	setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
+	setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
 	setflag FLAG_0x393
-	setflag FLAG_0x358
-	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
-	setflag FLAG_0x2FD
-	setflag FLAG_0x398
-	setflag FLAG_0x399
-	setflag FLAG_0x39A
-	setflag FLAG_0x39B
-	setflag FLAG_0x2CF
-	setflag FLAG_0x39D
-	setflag FLAG_0x3A1
-	setflag FLAG_0x3A2
-	setflag FLAG_0x3A6
-	setflag FLAG_0x3AA
-	setflag FLAG_0x3AC
-	setflag FLAG_0x3A0
-	setflag FLAG_0x3E0
-	setflag FLAG_0x342
-	setflag FLAG_0x3B0
-	setflag FLAG_0x3B1
-	setflag FLAG_0x3B3
-	setflag FLAG_0x3B4
-	setflag FLAG_0x2ED
-	setflag FLAG_0x35A
-	setflag FLAG_0x2EF
-	setflag FLAG_0x3B6
-	setflag FLAG_0x3C7
-	setflag FLAG_0x3C8
-	setflag FLAG_0x2D7
-	setflag FLAG_0x3D3
-	setflag FLAG_0x3DF
-	setflag FLAG_0x3E3
-	setflag FLAG_0x3E4
-	setflag FLAG_0x3E5
-	setflag FLAG_0x3E6
-	setflag FLAG_0x356
-	setflag FLAG_0x33A
-	setflag FLAG_0x33B
-	setflag FLAG_0x36C
-	setflag FLAG_0x36B
-	setflag FLAG_0x36A
-	setflag FLAG_0x337
-	setflag FLAG_0x2F4
-	setflag FLAG_0x35E
-	setflag FLAG_0x35F
-	setflag FLAG_0x340
-	setflag FLAG_0x2FB
-	setflag FLAG_0x2EB
-	setflag FLAG_0x2FF
-	setflag FLAG_0x319
-	setflag FLAG_0x357
-	setflag FLAG_0x050
+	setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
+	setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
+	setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT
+	setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
+	setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH
+	setflag FLAG_HIDE_ROUTE_110_RIVAL_2
+	setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
+	setflag FLAG_HIDE_ROUTE_104_RIVAL
+	setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
+	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
+	setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
+	setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
+	setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
+	setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
+	setflag FLAG_HIDE_ROUTE_128_STEVEN
+	setflag FLAG_HIDE_ROUTE_128_ARCHIE
+	setflag FLAG_HIDE_ROUTE_128_MAXIE
+	setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
+	setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
+	setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT
+	setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
+	setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
+	setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
+	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
+	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
+	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
+	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
+	setflag FLAG_HIDE_ROUTE_101_BOY
+	setflag FLAG_HIDE_PETALBURG_CITY_SCOTT
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
+	setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
+	setflag FLAG_HIDE_ROUTE_111_DESERT_RIVAL
+	setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
+	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	setflag FLAG_HIDE_DEOXYS
+	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
+	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
+	setflag FLAG_HIDE_SKY_PILLAR_WALLACE
+	setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
 	call EventScript_27149D
 	end
 
@@ -1238,26 +1238,26 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
 	call EverGrandeCity_HallOfFame_EventScript_271829
 	compare VAR_0x40CC, 0
 	call_if 1, EverGrandeCity_HallOfFame_EventScript_271839
-	clearflag FLAG_0x39D
+	clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
 	call EverGrandeCity_HallOfFame_EventScript_2718CC
-	setflag FLAG_0x365
-	clearflag FLAG_0x3B6
-	clearflag FLAG_0x2D7
+	setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
+	clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
 	setvar VAR_0x40C6, 2
-	setflag FLAG_0x35A
-	clearflag FLAG_0x2EF
-	clearflag FLAG_0x35C
-	clearflag FLAG_0x35D
-	setflag FLAG_0x2CD
-	clearflag FLAG_0x2EB
-	setflag FLAG_0x3CB
+	setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
+	clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
+	clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
+	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
+	clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
+	setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL
 	special sub_813BA60
 	checkflag FLAG_0x123
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_271843
 	checkflag FLAG_0x12A
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F
-	setflag FLAG_0x2F8
-	setflag FLAG_0x2D2
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	compare VAR_0x40D3, 0
 	call_if 1, EverGrandeCity_HallOfFame_EventScript_271851
 	return
@@ -1275,13 +1275,13 @@ EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839
 	return
 
 EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
-	clearflag FLAG_0x3C8
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
 	return
 
 EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
 	setvar VAR_0x4082, 3
 	setvar VAR_0x408C, 3
-	clearflag FLAG_0x2DE
+	clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
 	return
 
 EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
@@ -1303,35 +1303,35 @@ EventScript_271862:: @ 8271862
 	end
 
 EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
-	setflag FLAG_0x2E4
-	setflag FLAG_0x2E7
-	setflag FLAG_0x2E5
-	setflag FLAG_0x2E8
-	clearflag FLAG_0x2E6
-	clearflag FLAG_0x2E3
-	clearflag FLAG_0x371
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
+	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	end
 
 EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
-	setflag FLAG_0x2E5
-	setflag FLAG_0x2E8
-	setflag FLAG_0x2E2
-	setflag FLAG_0x2E6
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
-	clearflag FLAG_0x2E4
-	clearflag FLAG_0x2E7
+	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	end
 
 EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3
-	setflag FLAG_0x2E2
-	setflag FLAG_0x2E6
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
-	setflag FLAG_0x2E4
-	setflag FLAG_0x2E7
-	clearflag FLAG_0x2E5
-	clearflag FLAG_0x2E8
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
+	clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	end
 
 EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC
@@ -1355,11 +1355,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27374E
 	checkflag FLAG_0x4F4
 	goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E
-	checkflag FLAG_0x2E6
+	checkflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C
-	checkflag FLAG_0x2E4
+	checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912
-	checkflag FLAG_0x2E5
+	checkflag FLAG_HIDE_ROUTE_108_MR_BRINEY
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918
 	return
 
@@ -1685,7 +1685,7 @@ EventScript_271CA1:: @ 8271CA1
 	setvar VAR_RESULT, 0
 	return
 
-EventScript_271CB7:: @ 8271CB7
+EventScript_HiddenItemScript:: @ 8271CB7
 	lockall
 	waitse
 	giveitem VAR_0x8005, 1
@@ -1761,7 +1761,7 @@ EventScript_271D89:: @ 8271D89
 	release
 	end
 
-EventScript_271D92:: @ 8271D92
+EventScript_PC:: @ 8271D92
 	lockall
 	setvar VAR_0x8004, 0
 	special DoPCTurnOnEffect
@@ -1884,7 +1884,7 @@ DewfordTown_Gym_EventScript_271E84:: @ 8271E84
 LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84
 MauvilleCity_Gym_EventScript_271E84:: @ 8271E84
 RustboroCity_Gym_EventScript_271E84:: @ 8271E84
-	clearflag FLAG_0x30D
+	clearflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	setflag FLAG_0x128
 	return
 
@@ -1902,7 +1902,7 @@ Route109_EventScript_271E95:: @ 8271E95
 	setvar VAR_0x4096, 0
 	return
 
-EventScript_271EA0:: @ 8271EA0
+EventScript_UseSurf:: @ 8271EA0
 	checkpartymove MOVE_SURF
 	compare VAR_RESULT, 6
 	goto_eq EventScript_271ED6
@@ -2201,7 +2201,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083
 	fadescreen 0
 	return
 
-EventScript_27208F:: @ 827208F
+EventScript_RegionMap:: @ 827208F
 	lockall
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4
 	fadescreen 1
@@ -2250,24 +2250,24 @@ Route103_EventScript_2720AD:: @ 82720AD
 	return
 
 Route101_EventScript_27211A:: @ 827211A
-	clearflag FLAG_0x2D1
-	clearflag FLAG_0x380
-	setflag FLAG_0x381
-	setflag FLAG_0x382
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
+	setflag FLAG_HIDE_ROUTE_101_BIRCH
+	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
 Route101_EventScript_272127:: @ 8272127
-	clearflag FLAG_0x381
-	setflag FLAG_0x2D1
-	setflag FLAG_0x380
-	setflag FLAG_0x382
+	clearflag FLAG_HIDE_ROUTE_101_BIRCH
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
+	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
 Route101_EventScript_272134:: @ 8272134
-	clearflag FLAG_0x382
-	setflag FLAG_0x381
-	setflag FLAG_0x2D1
-	setflag FLAG_0x380
+	clearflag FLAG_HIDE_ROUTE_103_BIRCH
+	setflag FLAG_HIDE_ROUTE_101_BIRCH
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141
@@ -2341,22 +2341,22 @@ SlateportCity_Harbor_Movement_2721F0: @ 82721F0
 	step_end
 
 PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
-	setflag FLAG_0x2E4
-	setflag FLAG_0x2E7
-	setflag FLAG_0x2E5
-	setflag FLAG_0x2E8
-	setflag FLAG_0x2E2
-	setflag FLAG_0x2E6
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
+	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setvar VAR_0x4096, 0
 	return
 
 RusturfTunnel_EventScript_272216:: @ 8272216
 	removeobject 1
 	removeobject 10
-	clearflag FLAG_0x328
-	clearflag FLAG_0x3D8
+	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
+	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
 	setvar VAR_RUSTURF_TUNNEL_STATE, 6
 	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
@@ -3074,31 +3074,31 @@ Movement_2725CB:: @ 82725CB
 	walk_up
 	step_end
 
-EventScript_2725CE:: @ 82725CE
+EventScript_PictureBookShelf:: @ 82725CE
 	msgbox Text_2A81E5, 3
 	end
 
-EventScript_2725D7:: @ 82725D7
+EventScript_BookShelf:: @ 82725D7
 	msgbox Text_2A820D, 3
 	end
 
-EventScript_2725E0:: @ 82725E0
+EventScript_PokemonCenterBookshelf:: @ 82725E0
 	msgbox Text_2A8232, 3
 	end
 
-EventScript_2725E9:: @ 82725E9
+EventScript_Vase:: @ 82725E9
 	msgbox Text_2A8276, 3
 	end
 
-EventScript_2725F2:: @ 82725F2
+EventScript_TrashCan:: @ 82725F2
 	msgbox Text_2A82B3, 3
 	end
 
-EventScript_2725FB:: @ 82725FB
+EventScript_ShopShelf:: @ 82725FB
 	msgbox Text_2A82BF, 3
 	end
 
-EventScript_272604:: @ 8272604
+EventScript_Blueprint:: @ 8272604
 	msgbox Text_2A82F7, 3
 	end
 
@@ -3322,7 +3322,7 @@ EventScript_2736B3:: @ 82736B3
 	msgbox gUnknown_08272C98, 3
 	end
 
-EventScript_2736BC:: @ 82736BC
+EventScript_Poison:: @ 82736BC
 	lockall
 	special ExecuteWhiteOut
 	waitstate
@@ -3565,7 +3565,7 @@ RustboroCity_DevonCorp_2F_EventScript_273811:: @ 8273811
 	release
 	end
 
-EventScript_27381B:: @ 827381B
+EventScript_Questionnaire:: @ 827381B
 	lockall
 	msgbox gUnknown_0827339F, 5
 	compare VAR_RESULT, 0
@@ -4536,7 +4536,7 @@ EventScript_275B5B:: @ 8275B5B
 	closemessage
 	playse SE_KAIDAN
 	setvar VAR_0x4097, 0
-	setflag FLAG_0x0AD
+	setflag FLAG_DECORATION_0
 	special sub_80E8E18
 	special sub_80E9068
 	setvar VAR_0x8004, 0
@@ -4577,14 +4577,14 @@ EventScript_275BB7:: @ 8275BB7
 	special sub_80E9744
 	compare VAR_RESULT, 0
 	goto_eq EventScript_275BDB
-	clearflag FLAG_0x0AD
+	clearflag FLAG_DECORATION_0
 	special sub_80E9068
 	setvar VAR_0x4089, 0
 	waitstate
 	end
 
 EventScript_275BDB:: @ 8275BDB
-	setflag FLAG_0x0AD
+	setflag FLAG_DECORATION_0
 	special sub_80E9068
 	setvar VAR_0x4089, 0
 	waitstate
@@ -4655,20 +4655,20 @@ EventScript_275CDE:: @ 8275CDE
 LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1
 LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1
 SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1
-	setflag FLAG_0x0AE
-	setflag FLAG_0x0AF
-	setflag FLAG_0x0B0
-	setflag FLAG_0x0B1
-	setflag FLAG_0x0B2
-	setflag FLAG_0x0B3
-	setflag FLAG_0x0B4
-	setflag FLAG_0x0B5
-	setflag FLAG_0x0B6
-	setflag FLAG_0x0B7
-	setflag FLAG_0x0B8
-	setflag FLAG_0x0B9
-	setflag FLAG_0x0BA
-	setflag FLAG_0x0BB
+	setflag FLAG_DECORATION_1
+	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
 	return
 
 EventScript_275D0C:: @ 8275D0C
@@ -5680,7 +5680,7 @@ SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F
 LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59
 	lock
 	faceplayer
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	goto_eq LilycoveCity_ContestLobby_EventScript_28CB21
 	setvar VAR_0x8005, 6
 	special InterviewBefore
@@ -5726,7 +5726,7 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
 	compare VAR_RESULT, 0
 	goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0
 	msgbox LilycoveCity_ContestLobby_Text_27F0EC, 4
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	setvar VAR_0x8005, 6
 	goto LilycoveCity_ContestLobby_EventScript_28C7E9
 	end
@@ -5753,7 +5753,7 @@ LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B
 	end
 
 LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91
-	clearflag FLAG_0x322
+	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	return
 
 LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95
@@ -5762,7 +5762,7 @@ LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95
 BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
 	lock
 	faceplayer
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A
 	setvar VAR_0x8005, 7
 	special InterviewBefore
@@ -5814,7 +5814,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70
 	msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, 4
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	copyvar VAR_0x8004, VAR_0x8008
 	setvar VAR_0x8005, 7
 	goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9
@@ -5837,11 +5837,11 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84
 	special InterviewBefore
 	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
-	clearflag FLAG_0x396
+	clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6
-	setflag FLAG_0x396
+	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	return
 
 	.include "data/scripts/gabby_and_ty.inc"
@@ -5859,7 +5859,7 @@ EventScript_2926F8:: @ 82926F8
 
 	.include "data/scripts/players_house.inc"
 
-EventScript_292DE5:: @ 8292DE5
+EventScript_RunningShoesManual:: @ 8292DE5
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, 3
 	end
 
@@ -6010,7 +6010,7 @@ MirageTower_3F_MapScript2_2A8327: @ 82A8327
 MtPyre_2F_MapScript2_2A8327: @ 82A8327
 SkyPillar_2F_MapScript2_2A8327: @ 82A8327
 SkyPillar_4F_MapScript2_2A8327: @ 82A8327
-	map_script_2 VAR_ICE_STEP_COUNT, 0, gUnknown_082A8337
+	map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
 	.2byte 0
 
 GraniteCave_B1F_MapScript1_2A8331: @ 82A8331
@@ -6020,7 +6020,7 @@ MtPyre_2F_MapScript1_2A8331: @ 82A8331
 	copyvar VAR_ICE_STEP_COUNT, 0x1
 	end
 
-gUnknown_082A8337:: @ 82A8337
+EventScript_FallDownHole:: @ 82A8337
 	lockall
 	delay 20
 	applymovement 255, GraniteCave_B1F_Movement_2A8369
@@ -11691,7 +11691,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
 	map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF
 	.2byte 0
 
-TrainerHill_1F_EventScript_2C8393:: @ 82C8393
+EventScript_TrainerHillTimer:: @ 82C8393
 	lockall
 	setvar VAR_0x8004, 7
 	special sp194_trainer_tower
diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc
index dfe6d84e0..b59eb456a 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/events.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc
@@ -1,6 +1,6 @@
 AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY
 
 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
 	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
index 5b3941dd2..ee4b69f24 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
@@ -4,12 +4,12 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2
 	lock
 	faceplayer
-	checkflag FLAG_0x126
+	checkflag FLAG_TRADED_SCANNER_TO_STERN
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
 	checkitem ITEM_SCANNER, 1
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_238810
-	checkflag FLAG_0x436
+	checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
 	msgbox AbandonedShip_CaptainsOffice_Text_238824, 4
 	release
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
index 07dd3558b..b2cf9b11b 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
@@ -1,8 +1,8 @@
 AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE
 
 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
 	warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -16,10 +16,10 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
 	warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
 
 AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
-	bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31
-	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32
-	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33
-	bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34
+	bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY
+	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY
+	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY
+	bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY
 	bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
 	bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
 	bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc
index f3a1d3327..bd882d6d8 100644
--- a/data/maps/AbandonedShip_Room_B1F/events.inc
+++ b/data/maps/AbandonedShip_Room_B1F/events.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Room_B1F_EventObjects: @ 853697C
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13
 
 AbandonedShip_Room_B1F_MapWarps: @ 8536994
 	warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc
index 34fdb9fd7..6e4b9b280 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc
@@ -1,7 +1,7 @@
 AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
 	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
 	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE
 	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
 	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
 
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
index 05d48a618..3bb29619a 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
 	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL
 
 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
 	warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc
index 3b6fc136e..f0322558b 100644
--- a/data/maps/AbandonedShip_Rooms_1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/events.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Rooms_1F_EventObjects: @ 8536764
 	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL
 	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
 
diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc
index 97a8aa246..4af246e5c 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
 	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE
 
 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
 	warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc
index 207744c30..3e784dea2 100644
--- a/data/maps/AncientTomb/events.inc
+++ b/data/maps/AncientTomb/events.inc
@@ -1,5 +1,5 @@
 AncientTomb_EventObjects: @ 8536CDC
-	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937
+	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL
 
 AncientTomb_MapWarps: @ 8536CF4
 	warp_def 8, 29, 3, 0, MAP_ROUTE120
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 9dbacfe8e..18361bca5 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -23,7 +23,7 @@ AncientTomb_MapScript1_238FE1: @ 8238FE1
 	end
 
 AncientTomb_EventScript_238FEE:: @ 8238FEE
-	clearflag FLAG_0x3A9
+	clearflag FLAG_HIDE_REGISTEEL
 	return
 
 AncientTomb_MapScript1_238FF2: @ 8238FF2
diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc
index ab7c49b30..6a4f0972f 100644
--- a/data/maps/AquaHideout_1F/events.inc
+++ b/data/maps/AquaHideout_1F/events.inc
@@ -1,7 +1,7 @@
 AquaHideout_1F_EventObjects: @ 8535304
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 
 AquaHideout_1F_MapWarps: @ 853534C
 	warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc
index bbada49f8..6dd83aebf 100644
--- a/data/maps/AquaHideout_B1F/events.inc
+++ b/data/maps/AquaHideout_B1F/events.inc
@@ -1,13 +1,13 @@
 AquaHideout_B1F_EventObjects: @ 8535378
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 
 AquaHideout_B1F_MapWarps: @ 8535450
 	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc
index 12c25faac..22c3406c5 100644
--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -23,11 +23,11 @@ AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
 	end
 
 AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
-	clearflag FLAG_0x3D1
+	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
 	return
 
 AquaHideout_B1F_EventScript_2339E7:: @ 82339E7
-	clearflag FLAG_0x3D2
+	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
 	return
 
 AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc
index 09846d401..552a95ad4 100644
--- a/data/maps/AquaHideout_B2F/events.inc
+++ b/data/maps/AquaHideout_B2F/events.inc
@@ -1,10 +1,10 @@
 AquaHideout_B2F_EventObjects: @ 853552C
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072
-	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL
+	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 
 AquaHideout_B2F_MapWarps: @ 85355BC
 	warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc
index fd3868512..7fbf55b51 100644
--- a/data/maps/AquaHideout_B2F/scripts.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -48,7 +48,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_233FF2, 4
 	setflag FLAG_0x070
-	setflag FLAG_0x354
+	setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
 	release
 	end
 
diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc
index 7f7405a55..30f920220 100644
--- a/data/maps/ArtisanCave_1F/events.inc
+++ b/data/maps/ArtisanCave_1F/events.inc
@@ -1,5 +1,5 @@
 ArtisanCave_1F_EventObjects: @ 8537774
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS
 
 ArtisanCave_1F_MapWarps: @ 853778C
 	warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc
index 5b47d72a5..9df844aa3 100644
--- a/data/maps/ArtisanCave_B1F/events.inc
+++ b/data/maps/ArtisanCave_B1F/events.inc
@@ -1,15 +1,15 @@
 ArtisanCave_B1F_EventObjects: @ 8537708
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP
 
 ArtisanCave_B1F_MapWarps: @ 8537720
 	warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F
 
 ArtisanCave_B1F_MapBGEvents: @ 8537730
-	bg_hidden_item_event 32, 29, 0, ITEM_ZINC, 102
-	bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101
-	bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103
-	bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104
+	bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC
+	bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM
+	bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN
+	bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON
 
 ArtisanCave_B1F_MapEvents:: @ 8537760
 	map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index e004eafac..203de2813 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -219,17 +219,17 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
 	return
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	return
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	return
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
index 55aed13a4..0fd75debb 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
 
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
index 505a903da..90232cf5b 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888
+	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
 	object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
 	object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
 
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
index 556d4499a..2db7e5cdf 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -220,7 +220,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
 	closemessage
-	clearflag FLAG_0x002
+	clearflag FLAG_TEMP_2
 	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
 	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
 	waitmovement 0
@@ -349,7 +349,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
 	return
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
 	multichoice 19, 6, 105, 1
 	switch VAR_RESULT
@@ -387,7 +387,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	end
 
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
index 0961aa403..d100dec0b 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
@@ -3,8 +3,8 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
 	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0
 	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
-	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918
-	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, 701
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER
+	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
 	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
 	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
 	object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 73c56351f..b70bb8049 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -19,7 +19,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
 	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1
 
 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
-	clearflag FLAG_0x2BD
+	clearflag FLAG_HIDE_APPRENTICE
 	setvar VAR_0x8004, 23
 	special CallApprenticeFunction
 
@@ -27,7 +27,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1
-	setflag FLAG_0x2BD
+	setflag FLAG_HIDE_APPRENTICE
 	goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0
 
 BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
index 533e6af8b..9212f2fd2 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
@@ -1,13 +1,13 @@
 BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716
-	object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864
-	object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
+	object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
+	object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
 	map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index a2f003b85..10cf3194d 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -13,14 +13,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
 	checkflag FLAG_0x152
 	goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
-	clearflag FLAG_0x2C7
-	clearflag FLAG_0x2C8
-	clearflag FLAG_0x2C9
-	clearflag FLAG_0x2CA
-	clearflag FLAG_0x2CB
-	clearflag FLAG_0x2CC
-	setflag FLAG_0x360
-	setflag FLAG_0x361
+	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
+	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
+	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
+	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
+	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
+	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
+	setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
+	setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
 	setvar VAR_0x8004, 10
 	special sub_8161F74
 	end
diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc
index dab98712a..a16bca779 100644
--- a/data/maps/BattleFrontier_OutsideEast/events.inc
+++ b/data/maps/BattleFrontier_OutsideEast/events.inc
@@ -12,7 +12,7 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10
 	object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0
 	object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0
 	object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0
-	object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842
+	object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
 	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0
 	object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0
 	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index 0a3723acc..6ed4d94d6 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -17,13 +17,13 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
 
 BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
 	setvar VAR_0x40BC, 0
-	setflag FLAG_0x396
+	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	checkflag FLAG_0x1C6
 	call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F
 	end
 
 BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
-	clearflag FLAG_0x34A
+	clearflag FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
 	return
 
 BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43
diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc
index bd9d508dd..ad58cb70f 100644
--- a/data/maps/BattleFrontier_OutsideWest/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc
@@ -4,7 +4,7 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
 
 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
 	setvar VAR_0x40BC, 0
-	setflag FLAG_0x396
+	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
index 4d0b88090..75bd2ebbb 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
 	warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F
diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc
index c29718501..551cb802f 100644
--- a/data/maps/BattleFrontier_ReceptionGate/events.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/events.inc
@@ -2,7 +2,7 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0
-	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 836
+	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT
 	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0
 
 BattleFrontier_ReceptionGate_MapWarps: @ 853D498
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index da73da354..cf7f6a55e 100644
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -4,11 +4,11 @@ BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7
 BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8
 	lock
 	faceplayer
-	checkflag FLAG_0x004
+	checkflag FLAG_TEMP_4
 	goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA
-	checkflag FLAG_0x003
+	checkflag FLAG_TEMP_3
 	goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	goto_eq BattleFrontier_ScottsHouse_EventScript_263939
 	goto BattleFrontier_ScottsHouse_EventScript_2636CB
 	end
@@ -51,7 +51,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0
 	setflag FLAG_0x05C
-	setflag FLAG_0x004
+	setflag FLAG_TEMP_4
 	release
 	end
 
@@ -75,7 +75,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0
 	setflag FLAG_0x1D2
-	setflag FLAG_0x004
+	setflag FLAG_TEMP_4
 	release
 	end
 
@@ -138,7 +138,7 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0
 	setflag FLAG_0x0ED
-	setflag FLAG_0x003
+	setflag FLAG_TEMP_3
 	goto BattleFrontier_ScottsHouse_EventScript_2638AA
 	end
 
@@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0
 	setflag FLAG_0x0EE
-	setflag FLAG_0x003
+	setflag FLAG_TEMP_3
 	goto BattleFrontier_ScottsHouse_EventScript_2638AA
 	end
 
@@ -244,7 +244,7 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
 	msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
 	msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4
 	setflag FLAG_0x1D1
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	release
 	end
 
diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc
index 4093e4086..c5a485f9a 100644
--- a/data/maps/BirthIsland_Exterior/events.inc
+++ b/data/maps/BirthIsland_Exterior/events.inc
@@ -1,6 +1,6 @@
 BirthIsland_Exterior_EventObjects: @ 853D7DC
-	object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764
-	object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 763
+	object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
+	object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS
 
 BirthIsland_Exterior_MapWarps: @ 853D80C
 	warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 787230c60..7bd9c1e60 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -20,14 +20,14 @@ BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
 	end
 
 BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
-	setflag FLAG_0x2FB
-	setflag FLAG_0x2FC
+	setflag FLAG_HIDE_DEOXYS
+	setflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	return
 
 BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
 	checkflag FLAG_0x1AC
 	goto_eq BirthIsland_Exterior_EventScript_27374E
-	clearflag FLAG_0x2FC
+	clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	clearflag FLAG_0x8D4
 	return
 
diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc
index bd1b79bc0..94f30d262 100644
--- a/data/maps/CaveOfOrigin_B1F/events.inc
+++ b/data/maps/CaveOfOrigin_B1F/events.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_B1F_EventObjects: @ 8535DD0
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE
 
 CaveOfOrigin_B1F_MapWarps: @ 8535DE8
 	warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F
diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index 5ac3ec64a..198fffa2b 100644
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -54,7 +54,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D
 	setflag FLAG_0x137
 	setvar VAR_0x405E, 3
 	removeobject 1
-	clearflag FLAG_0x357
+	clearflag FLAG_HIDE_SKY_PILLAR_WALLACE
 	fadescreen 0
 	release
 	end
diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc
index 036127ca8..e7a815ce0 100644
--- a/data/maps/DesertRuins/events.inc
+++ b/data/maps/DesertRuins/events.inc
@@ -1,5 +1,5 @@
 DesertRuins_EventObjects: @ 8534354
-	object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935
+	object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK
 
 DesertRuins_MapWarps: @ 853436C
 	warp_def 8, 29, 3, 1, MAP_ROUTE111
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index 45d192c80..9d085e45a 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -37,7 +37,7 @@ DesertRuins_MapScript1_22D9CA: @ 822D9CA
 	end
 
 DesertRuins_EventScript_22D9D7:: @ 822D9D7
-	clearflag FLAG_0x3A7
+	clearflag FLAG_HIDE_REGIROCK
 	return
 
 DesertRuins_EventScript_22D9DB:: @ 822D9DB
diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc
index 76215c65a..aec461c34 100644
--- a/data/maps/DesertUnderpass/events.inc
+++ b/data/maps/DesertUnderpass/events.inc
@@ -1,5 +1,5 @@
 DesertUnderpass_EventObjects: @ 85376D4
-	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874
+	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
 
 DesertUnderpass_MapWarps: @ 85376EC
 	warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc
index aa637587c..3d2d0af4a 100644
--- a/data/maps/DewfordTown/events.inc
+++ b/data/maps/DewfordTown/events.inc
@@ -1,8 +1,8 @@
 DewfordTown_EventObjects: @ 8527964
 	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0
-	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 743
+	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0
 
 DewfordTown_MapWarps: @ 85279DC
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index 157c1f4d5..f14dbbfe8 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -135,10 +135,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
 	applymovement 255, DewfordTown_Movement_1E9914
 	waitmovement 0
 	showobjectat 255, MAP_ROUTE104
-	clearflag FLAG_0x2E3
-	clearflag FLAG_0x371
-	clearflag FLAG_0x2E6
-	setflag FLAG_0x2E7
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
+	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	hideobjectat 4, MAP_DEWFORD_TOWN
 	setvar VAR_0x408E, 2
 	resetobjectpriority 255, MAP_DEWFORD_TOWN
@@ -171,10 +171,10 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
 	setobjectpriority 2, MAP_ROUTE109, 0
 	applymovement 2, DewfordTown_Movement_1E991F
 	waitmovement 0
-	clearflag FLAG_0x2E5
+	clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
 	addobject 1
-	clearflag FLAG_0x2E8
-	setflag FLAG_0x2E7
+	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	hideobjectat 4, MAP_DEWFORD_TOWN
 	checkflag FLAG_0x095
 	call_if 0, DewfordTown_EventScript_1E9790
diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc
index 3f150c6f6..4f1881f92 100644
--- a/data/maps/DewfordTown_Hall/events.inc
+++ b/data/maps/DewfordTown_Hall/events.inc
@@ -7,7 +7,7 @@ DewfordTown_Hall_EventObjects: @ 852DC48
 	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0
 	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0
 	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0
-	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
 
 DewfordTown_Hall_MapWarps: @ 852DD20
 	warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN
diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc
index 37122a640..d8c19f1fe 100644
--- a/data/maps/DewfordTown_Hall/scripts.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
@@ -252,13 +252,13 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
 	lock
 	faceplayer
 	call DewfordTown_Hall_EventScript_271E8B
-	checkflag FLAG_0x0E6
+	checkflag FLAG_RECEIVED_TM_36
 	goto_eq DewfordTown_Hall_EventScript_1FD80E
 	msgbox DewfordTown_Hall_Text_1FE142, 4
 	giveitem_std ITEM_TM36
 	compare VAR_RESULT, 0
 	goto_eq DewfordTown_Hall_EventScript_272054
-	setflag FLAG_0x0E6
+	setflag FLAG_RECEIVED_TM_36
 	release
 	end
 
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
index f9d67ecbf..4f37111a5 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08
 	warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
index b09221dca..bd4cc71e3 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
 	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 920
-	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 921
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
+	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH
 
 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748
 	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 3e68f4fed..71a72b83c 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -136,7 +136,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
 	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20
 	waitmovement 0
-	setflag FLAG_0x30D
+	setflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
 	waitstate
 	releaseall
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
index f6fa3987f..23e555622 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
@@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0
 	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0
 	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0
-	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793
+	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 
 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
 	warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 16b82a592..aaec19840 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -12,7 +12,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
 EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
 	checkflag FLAG_BADGE06_GET
 	goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E
-	clearflag FLAG_0x319
+	clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	return
 
 EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
index 08dbeb5c6..855336146 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C
 	warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
index 18d45eef9..b6497d824 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
@@ -2,7 +2,7 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8
 	warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index b2db55e36..5513d3c24 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
 
 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
 	setflag FLAG_0x1CF
-	setflag FLAG_0x319
+	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	end
 
 EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc
index b2246ad5a..9b2f0a2de 100644
--- a/data/maps/FallarborTown/events.inc
+++ b/data/maps/FallarborTown/events.inc
@@ -2,7 +2,7 @@ FallarborTown_EventObjects: @ 8527BE0
 	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0
 	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
 	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0
-	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907
+	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL
 
 FallarborTown_MapWarps: @ 8527C40
 	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
@@ -19,7 +19,7 @@ FallarborTown_MapBGEvents: @ 8527C68
 	bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259
 	bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
 	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262
-	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, 28
+	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET
 
 FallarborTown_MapEvents:: @ 8527CC8
 	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc
index 937a15f27..6a9741c50 100644
--- a/data/maps/FallarborTown_BattleTentLobby/events.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/events.inc
@@ -3,7 +3,7 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370
 	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0
 	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0
 	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
 
 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8
 	warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN
diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc
index 972ba61b6..da261afb4 100644
--- a/data/maps/FallarborTown_House1/events.inc
+++ b/data/maps/FallarborTown_House1/events.inc
@@ -1,5 +1,5 @@
 FallarborTown_House1_EventObjects: @ 852E5B8
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
 	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0
 
 FallarborTown_House1_MapWarps: @ 852E5E8
diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc
index 47459f8d5..4c02160f7 100644
--- a/data/maps/FallarborTown_House1/scripts.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
@@ -14,9 +14,9 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13
 	end
 
 FallarborTown_House1_EventScript_200F38:: @ 8200F38
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	call_if 0, FallarborTown_House1_EventScript_200F8B
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	call_if 1, FallarborTown_House1_EventScript_200F9C
 	compare VAR_RESULT, 0
 	goto_eq FallarborTown_House1_EventScript_200FA5
@@ -41,7 +41,7 @@ FallarborTown_House1_EventScript_200F9C:: @ 8200F9C
 	return
 
 FallarborTown_House1_EventScript_200FA5:: @ 8200FA5
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	msgbox FallarborTown_House1_Text_201212, 4
 	release
 	end
diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc
index 7ab0666e8..c24c7b1f6 100644
--- a/data/maps/FallarborTown_House2/scripts.inc
+++ b/data/maps/FallarborTown_House2/scripts.inc
@@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_201383:: @ 8201383
 	lockall
 	applymovement 1, FallarborTown_House2_Movement_27259E
 	waitmovement 0
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq FallarborTown_House2_EventScript_2013A8
 	msgbox FallarborTown_House2_Text_20145C, 4
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	goto FallarborTown_House2_EventScript_2013A8
 	end
 
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
index 12b7f850e..cb6243c6f 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
@@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0
 	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE
 
 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
 	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index d11caa86f..e408f04d9 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -49,7 +49,7 @@ FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38
 FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48
 	playse SE_JIDO_DOA
 	removeobject 4
-	clearflag FLAG_0x366
+	clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
 	release
 	end
 
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
index 563b6bc50..233eab8d9 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C
 	warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc
index b9242b5be..fc8d99166 100644
--- a/data/maps/FarawayIsland_Interior/events.inc
+++ b/data/maps/FarawayIsland_Interior/events.inc
@@ -1,5 +1,5 @@
 FarawayIsland_Interior_EventObjects: @ 853D7A0
-	object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718
+	object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW
 
 FarawayIsland_Interior_MapWarps: @ 853D7B8
 	warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index 70e41b42d..a2892988a 100644
--- a/data/maps/FarawayIsland_Interior/scripts.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -49,7 +49,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
 FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
 	checkflag FLAG_0x1C7
 	goto_eq FarawayIsland_Interior_EventScript_27374E
-	clearflag FLAG_0x2CE
+	clearflag FLAG_HIDE_MEW
 	setvar VAR_TEMP_1, 0
 	return
 
@@ -195,7 +195,7 @@ FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0
 FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB
 	lockall
 	fadescreenswapbuffers 1
-	setflag FLAG_0x2CE
+	setflag FLAG_HIDE_MEW
 	removeobject 1
 	fadescreenswapbuffers 0
 	msgbox FarawayIsland_Interior_Text_267EF1, 4
diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc
index 3b3985325..0ea132989 100644
--- a/data/maps/FieryPath/events.inc
+++ b/data/maps/FieryPath/events.inc
@@ -1,12 +1,12 @@
 FieryPath_EventObjects: @ 8534C80
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_13
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_14
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_15
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE
 
 FieryPath_MapWarps: @ 8534D40
 	warp_def 26, 36, 3, 4, MAP_ROUTE112
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
index a040a5327..f0a28345c 100644
--- a/data/maps/FieryPath/scripts.inc
+++ b/data/maps/FieryPath/scripts.inc
@@ -9,7 +9,7 @@ FieryPath_MapScript1_230F2A: @ 8230F2A
 	end
 
 FieryPath_EventScript_230F37:: @ 8230F37
-	setflag FLAG_0x2FE
-	clearflag FLAG_0x2FF
+	setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
+	clearflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
 	return
 
diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc
index d0cede5fc..4dc9f3e83 100644
--- a/data/maps/FortreeCity/events.inc
+++ b/data/maps/FortreeCity/events.inc
@@ -5,7 +5,7 @@ FortreeCity_EventObjects: @ 8526B9C
 	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0
 	object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0
 	object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0
-	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969
+	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON
 
 FortreeCity_MapWarps: @ 8526C44
 	warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc
index 2a7842d5e..8c7e03f76 100644
--- a/data/maps/FortreeCity_House4/events.inc
+++ b/data/maps/FortreeCity_House4/events.inc
@@ -1,7 +1,7 @@
 FortreeCity_House4_EventObjects: @ 8530FD8
 	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0
 	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0
-	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
 
 FortreeCity_House4_MapWarps: @ 8531020
 	warp_def 3, 5, 0, 6, MAP_FORTREE_CITY
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
index 27ead9ec2..bf71282bf 100644
--- a/data/maps/FortreeCity_House4/scripts.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -16,7 +16,7 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
 	msgbox FortreeCity_House4_Text_217DB9, 4
 	closemessage
 	setflag FLAG_0x0DE
-	clearflag FLAG_0x3A6
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
 	applymovement 3, FortreeCity_House4_Movement_217D1A
 	waitmovement 0
 	removeobject 3
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
index 43e74e0d7..028b5cada 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80
 	warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc
index bba8bbe40..8228e1678 100644
--- a/data/maps/GraniteCave_1F/events.inc
+++ b/data/maps/GraniteCave_1F/events.inc
@@ -1,6 +1,6 @@
 GraniteCave_1F_EventObjects: @ 85343BC
 	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE
 
 GraniteCave_1F_MapWarps: @ 85343EC
 	warp_def 37, 12, 3, 0, MAP_ROUTE106
diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc
index 4b4a08870..b27a68f17 100644
--- a/data/maps/GraniteCave_B1F/events.inc
+++ b/data/maps/GraniteCave_B1F/events.inc
@@ -1,5 +1,5 @@
 GraniteCave_B1F_EventObjects: @ 8534420
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL
 
 GraniteCave_B1F_MapWarps: @ 8534438
 	warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F
diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc
index e128b40b2..08ac73a5a 100644
--- a/data/maps/GraniteCave_B2F/events.inc
+++ b/data/maps/GraniteCave_B2F/events.inc
@@ -1,13 +1,13 @@
 GraniteCave_B2F_EventObjects: @ 8534484
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22
-	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_12
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_13
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_14
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_15
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17
 
 GraniteCave_B2F_MapWarps: @ 853455C
 	warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F
@@ -17,8 +17,8 @@ GraniteCave_B2F_MapWarps: @ 853455C
 	warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F
 
 GraniteCave_B2F_MapBGEvents: @ 8534584
-	bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, 48
-	bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, 49
+	bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1
+	bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2
 
 GraniteCave_B2F_MapEvents:: @ 853459C
 	map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc
index 43cc6e444..387770626 100644
--- a/data/maps/GraniteCave_StevensRoom/events.inc
+++ b/data/maps/GraniteCave_StevensRoom/events.inc
@@ -1,5 +1,5 @@
 GraniteCave_StevensRoom_EventObjects: @ 85345B0
-	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN
 
 GraniteCave_StevensRoom_MapWarps: @ 85345C8
 	warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 24fe954a8..f4d9fe0b2 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -26,11 +26,11 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04
 InsideOfTruck_EventScript_23BF20:: @ 823BF20
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	setvar VAR_0x4092, 1
-	setflag FLAG_0x2F7
-	setflag FLAG_0x2FA
-	setflag FLAG_0x310
-	setflag FLAG_0x2DF
-	setflag FLAG_0x331
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
 	setvar VAR_0x408C, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
 	releaseall
@@ -39,11 +39,11 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20
 InsideOfTruck_EventScript_23BF46:: @ 823BF46
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	setvar VAR_0x4092, 2
-	setflag FLAG_0x2F6
-	setflag FLAG_0x2F9
-	setflag FLAG_0x311
-	setflag FLAG_0x2E0
-	setflag FLAG_0x332
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
 	setvar VAR_0x4082, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
 	releaseall
diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc
index 01283e146..f6abd57a7 100644
--- a/data/maps/IslandCave/events.inc
+++ b/data/maps/IslandCave/events.inc
@@ -1,5 +1,5 @@
 IslandCave_EventObjects: @ 8536C74
-	object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936
+	object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE
 
 IslandCave_MapWarps: @ 8536C8C
 	warp_def 8, 29, 3, 0, MAP_ROUTE105
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index b00b41d40..647077080 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -38,7 +38,7 @@ IslandCave_MapScript1_238E99: @ 8238E99
 	end
 
 IslandCave_EventScript_238EAB:: @ 8238EAB
-	clearflag FLAG_0x3A8
+	clearflag FLAG_HIDE_REGICE
 	return
 
 IslandCave_EventScript_238EAF:: @ 8238EAF
@@ -55,12 +55,12 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
 
 IslandCave_EventScript_238EEF:: @ 8238EEF
 	lockall
-	checkflag FLAG_0x003
+	checkflag FLAG_TEMP_3
 	call_if 1, IslandCave_EventScript_238F45
 	checkflag FLAG_SYS_BRAILLE_WAIT
 	goto_eq IslandCave_EventScript_238F13
 	braillemessage IslandCave_Braille_2A6CD4
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	special ShouldDoBrailleRegicePuzzle
 	goto IslandCave_EventScript_238F41
 	end
@@ -72,12 +72,12 @@ IslandCave_EventScript_238F13:: @ 8238F13
 
 IslandCave_EventScript_238F1D:: @ 8238F1D
 	lockall
-	checkflag FLAG_0x003
+	checkflag FLAG_TEMP_3
 	call_if 1, IslandCave_EventScript_238F45
 	braillemessage IslandCave_Braille_2A6CD4
 	checkflag FLAG_SYS_BRAILLE_WAIT
 	goto_eq IslandCave_EventScript_238F41
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	special ShouldDoBrailleRegicePuzzle
 	goto IslandCave_EventScript_238F41
 	end
@@ -92,7 +92,7 @@ IslandCave_EventScript_238F45:: @ 8238F45
 	setvar VAR_0x403B, 0
 	setvar VAR_0x403C, 0
 	setvar VAR_0x403D, 0
-	clearflag FLAG_0x003
+	clearflag FLAG_TEMP_3
 	return
 
 IslandCave_EventScript_238F58:: @ 8238F58
diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc
index b1028c978..f9a82c89b 100644
--- a/data/maps/JaggedPass/events.inc
+++ b/data/maps/JaggedPass/events.inc
@@ -1,9 +1,9 @@
 JaggedPass_EventObjects: @ 8534AE4
 	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0
 	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL
 	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
 	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0
 	object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0
 
@@ -27,8 +27,8 @@ JaggedPass_MapCoordEvents: @ 8534BB4
 	coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
 
 JaggedPass_MapBGEvents: @ 8534C54
-	bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, 77
-	bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, 76
+	bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL
+	bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL
 
 JaggedPass_MapEvents:: @ 8534C6C
 	map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc
index 1d4b1239a..4822762ea 100644
--- a/data/maps/LavaridgeTown/events.inc
+++ b/data/maps/LavaridgeTown/events.inc
@@ -5,8 +5,8 @@ LavaridgeTown_EventObjects: @ 8527A54
 	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0
 	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0
 	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0
-	object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 930
-	object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 929
+	object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
+	object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
 	object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0
 
 LavaridgeTown_MapWarps: @ 8527B2C
@@ -28,7 +28,7 @@ LavaridgeTown_MapBGEvents: @ 8527B6C
 	bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73
 	bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A
 	bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73
-	bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, 0
+	bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL
 
 LavaridgeTown_MapEvents:: @ 8527BCC
 	map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index 5670d9b6e..efc5a2b89 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -31,11 +31,11 @@ LavaridgeTown_EventScript_1EA529:: @ 81EA529
 	setobjectxyperm 8, 11, 9
 	setobjectxyperm 7, 9, 8
 	setobjectmovementtype 7, 7
-	clearflag FLAG_0x3A1
+	clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
 	return
 
 LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
-	clearflag FLAG_0x36D
+	clearflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
 	return
 
 LavaridgeTown_EventScript_1EA543:: @ 81EA543
diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index 1d317d43b..a0c2e1514 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 	call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84
 	setvar VAR_0x8008, 4
 	call LavaridgeTown_Gym_1F_EventScript_271F43
-	setflag FLAG_0x326
+	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
 	setvar VAR_0x4053, 1
 	call LavaridgeTown_Gym_1F_EventScript_1FE841
 	closemessage
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
index e55b08e7b..6e1011dd8 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8
 	warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc
index 427f49201..2c7f71d5c 100644
--- a/data/maps/LilycoveCity/events.inc
+++ b/data/maps/LilycoveCity/events.inc
@@ -8,14 +8,14 @@ LilycoveCity_EventObjects: @ 8526CE8
 	object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0
 	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0
 	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0
-	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042
-	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852
-	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852
-	object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852
+	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
+	object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
 	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0
-	object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971
+	object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL
 	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0
 	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
 	object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0
@@ -49,9 +49,9 @@ LilycoveCity_MapBGEvents: @ 8526F68
 	bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44
 	bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62
 	bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74
-	bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, 27
-	bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, 43
-	bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, 75
+	bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE
+	bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP
+	bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL
 
 LilycoveCity_MapEvents:: @ 8527004
 	map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 70018b229..54fead4ef 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -6,7 +6,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C
 LilycoveCity_MapScript1_1E2B47: @ 81E2B47
 	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar VAR_0x4086, 0
-	setflag FLAG_0x322
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, LilycoveCity_EventScript_27207A
 	call LilycoveCity_EventScript_271ED7
@@ -347,8 +347,8 @@ LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E
 	call_if 1, LilycoveCity_EventScript_1E2F86
 	compare VAR_RESULT, 1
 	call_if 1, LilycoveCity_EventScript_1E2F8F
-	clearflag FLAG_0x2D2
-	clearflag FLAG_0x351
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
 	goto LilycoveCity_EventScript_1E3006
 	end
 
@@ -384,8 +384,8 @@ LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA
 	call_if 1, LilycoveCity_EventScript_1E2FE2
 	compare VAR_RESULT, 1
 	call_if 1, LilycoveCity_EventScript_1E2FEB
-	clearflag FLAG_0x2F8
-	clearflag FLAG_0x32F
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
 	goto LilycoveCity_EventScript_1E3006
 	end
 
diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc
index 636e0db5a..fa04b72e7 100644
--- a/data/maps/LilycoveCity_ContestLobby/events.inc
+++ b/data/maps/LilycoveCity_ContestLobby/events.inc
@@ -2,27 +2,27 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0
-	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 774
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1
 	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0
 	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0
 	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0
-	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802
+	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0
 	object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0
-	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 895
+	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2
 	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0
 	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0
 	object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0
 	object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0
-	object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873
+	object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
 	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832
-	object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832
-	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832
-	object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832
-	object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832
-	object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832
-	object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832
+	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
 	object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0
 
 LilycoveCity_ContestLobby_MapWarps: @ 853178C
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 956766395..66775d417 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -12,13 +12,13 @@ LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
 	getpricereduction 4
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_ContestLobby_EventScript_21A23C
-	clearflag FLAG_0x369
-	setflag FLAG_0x340
+	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
-	setflag FLAG_0x369
-	clearflag FLAG_0x340
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
+	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
 	return
 
 LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
@@ -27,7 +27,7 @@ LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
 	.2byte 0
 
 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255
-	checkflag FLAG_0x307
+	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	goto_eq LilycoveCity_ContestLobby_EventScript_21A264
 	setvar VAR_0x4099, 0
 	end
@@ -111,23 +111,23 @@ LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2
-	clearflag FLAG_0x308
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6
-	clearflag FLAG_0x309
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA
-	clearflag FLAG_0x30A
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE
-	clearflag FLAG_0x30B
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2
-	clearflag FLAG_0x30C
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6
@@ -202,7 +202,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
-	checkflag FLAG_0x307
+	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	goto_eq LilycoveCity_ContestLobby_EventScript_21A436
 	setvar VAR_0x4099, 0
 	end
@@ -356,7 +356,7 @@ LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
-	setflag FLAG_0x307
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	copyvar VAR_0x4094, 0x1
 	giveitem ITEM_CONTEST_PASS, 1
 	setvar VAR_0x800B, 8
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
index 810fe5af9..d7e508ec6 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
@@ -1,11 +1,11 @@
 LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925
-	object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925
-	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925
-	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT
 
 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230
 	warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index 90769b550..d77627bc3 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2
 LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3
 	lock
 	faceplayer
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
 	specialvar VAR_RESULT, sub_80C08E4
 	compare VAR_RESULT, 1
@@ -19,7 +19,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9
 	return
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	playfanfare MUS_FANFA4
 	waitfanfare
 	goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index 372d16dae..bcc3649e2 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
 	lock
 	faceplayer
 	setvar VAR_0x8004, 0
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
 	copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
 	special sub_8139B60
@@ -120,7 +120,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
 	waitse
 	special ShakeScreenInElevator
 	waitstate
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	return
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
index 5d0b88445..594a439ce 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
@@ -1,7 +1,7 @@
 LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C
 	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0
-	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962
+	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0
 
 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index da97bbf81..9a4a5aead 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -11,11 +11,11 @@ LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227
-	clearflag FLAG_0x3C2
+	clearflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B
-	setflag FLAG_0x3C2
+	setflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F
diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc
index 7828d58a4..4f69e4fc6 100644
--- a/data/maps/LilycoveCity_Harbor/events.inc
+++ b/data/maps/LilycoveCity_Harbor/events.inc
@@ -1,9 +1,9 @@
 LilycoveCity_Harbor_EventObjects: @ 8531E1C
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 861
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
 	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0
-	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 909
-	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 748
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR
+	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER
 
 LilycoveCity_Harbor_MapWarps: @ 8531E94
 	warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
index ea9606936..52f7a2f9e 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
@@ -1,14 +1,14 @@
 LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C
 	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0
 	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0
 	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0
 	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776
-	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779
-	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780
-	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778
+	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
+	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
+	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
+	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
 
 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C
 	warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
index ce4a6e169..ecae340c0 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
@@ -1,8 +1,8 @@
 LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428
 	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780
-	object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
+	object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
 
 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488
 	warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
index 42b4949a2..3ab130771 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
@@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC
 	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0
 	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0
 	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0
-	object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993
+	object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
 
 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44
 	warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index 934f666ad..f4a21637b 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
@@ -17,11 +17,11 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6
 	end
 
 LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0
-	setflag FLAG_0x3E1
+	setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
 	end
 
 LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4
-	clearflag FLAG_0x3E1
+	clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
 	end
 
 LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
index 910dd36ab..1a7e9a6a2 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0
 	warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
index 7ba16fbb9..3d08ce647 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
@@ -3,11 +3,11 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20
 	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0
 	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0
 	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0
-	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791
-	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790
-	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792
-	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789
-	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730
+	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, FLAG_HIDE_FANCLUB_LITTLE_BOY
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, FLAG_HIDE_FANCLUB_BOY
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, FLAG_HIDE_FANCLUB_LADY
+	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
 
 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8
 	warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 9587bcae3..8735811bf 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -109,12 +109,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA
 	specialvar VAR_RESULT, sub_80EE7C0
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1
-	clearflag FLAG_0x2DA
+	clearflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
 	clearflag FLAG_0x0D2
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
-	setflag FLAG_0x2DA
+	setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc
index 72fe038ff..99eeef56f 100644
--- a/data/maps/LinkContestRoom1/events.inc
+++ b/data/maps/LinkContestRoom1/events.inc
@@ -11,7 +11,7 @@ LinkContestRoom1_EventObjects: @ 8539EFC
 	object_event 10, 249, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
 	object_event 11, 250, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
 	object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 86
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_POKE_BALL
 	object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
 	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
 
diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc
index 89057d387..71bf9a643 100644
--- a/data/maps/LittlerootTown/events.inc
+++ b/data/maps/LittlerootTown/events.inc
@@ -1,12 +1,12 @@
 LittlerootTown_EventObjects: @ 85276A8
 	object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
 	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0
-	object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752
-	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 761
-	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 762
-	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 794
-	object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 795
+	object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
+	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
+	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
+	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
+	object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 
 LittlerootTown_MapWarps: @ 8527768
 	warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index eb78368af..03100ee66 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -41,7 +41,7 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
 
 LittlerootTown_EventScript_1E7E53:: @ 81E7E53
 	setvar VAR_0x40C7, 2
-	setflag FLAG_0x3D3
+	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	return
 
 LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C
@@ -66,7 +66,7 @@ LittlerootTown_EventScript_1E7E86:: @ 81E7E86
 	return
 
 LittlerootTown_EventScript_1E7E92:: @ 81E7E92
-	clearflag FLAG_0x2F0
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
 	setobjectmovementtype 4, 8
 	checkplayergender
 	compare VAR_RESULT, 0
@@ -94,7 +94,7 @@ LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 8
 	call LittlerootTown_EventScript_1E7F17
-	setflag FLAG_0x2F9
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
 	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
 	waitstate
 	releaseall
@@ -105,7 +105,7 @@ LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9
 	setvar VAR_0x8004, 14
 	setvar VAR_0x8005, 8
 	call LittlerootTown_EventScript_1E7F17
-	setflag FLAG_0x2FA
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
 	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
 	waitstate
 	releaseall
@@ -136,12 +136,12 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
 	applymovement 4, LittlerootTown_Movement_1E7FA1
 	applymovement 255, LittlerootTown_Movement_1E7FA9
 	waitmovement 0
-	setflag FLAG_0x2F0
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
 	setvar VAR_0x4092, 3
 	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
-	clearflag FLAG_0x364
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
 	clearflag FLAG_SPECIAL_FLAG_0x4000
 	return
 
@@ -192,8 +192,8 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
 	delay 80
 	msgbox LittlerootTown_Text_1E8DA2, 4
 	closemessage
-	clearflag FLAG_0x31A
-	clearflag FLAG_0x31B
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	delay 20
 	clearflag FLAG_SPECIAL_FLAG_0x4000
 	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
index d5289690c..6f327d330 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
@@ -1,11 +1,11 @@
 LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C
-	object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758
-	object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755
-	object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784
-	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 734
-	object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735
-	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 745
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
+	object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
+	object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD
+	object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
+	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
 
 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134
 	warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 4c904b001..04cc1ad38 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -170,9 +170,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5
 	playse SE_KAIDAN
 	removeobject 7
-	setflag FLAG_0x2E9
-	setflag FLAG_0x331
-	clearflag FLAG_0x2F8
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	delay 30
 	setvar VAR_0x408D, 3
 	setvar VAR_0x4050, 1
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
index 815acaa82..07ce48998 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
@@ -1,26 +1,26 @@
 LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0
-	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185
-	object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757
-	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817
-	object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 815
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
+	object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
 
 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320
 	warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
 
 LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328
-	bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, gUnknown_081F860D
+	bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale
 	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656
 	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781
 	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index 429c933fc..54d386e26 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -83,8 +83,8 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 	compare VAR_FACING, 4
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594
 	setvar VAR_0x408D, 3
-	setflag FLAG_0x331
-	clearflag FLAG_0x2F8
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	setvar VAR_0x4050, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
@@ -245,7 +245,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609
 	walk_in_place_fastest_left
 	step_end
 
-gUnknown_081F860D:: @ 81F860D
+EventScript_PlayerPCMale:: @ 81F860D
 	lockall
 	checkplayergender
 	compare VAR_RESULT, 0
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
index a2970c073..3075945f1 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
@@ -1,11 +1,11 @@
 LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C
-	object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759
-	object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754
-	object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785
-	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 734
-	object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736
-	object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 746
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
+	object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
+	object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD
+	object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
+	object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
 
 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414
 	warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 99d47f938..d5348ef8a 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -209,9 +209,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E
 	playse SE_KAIDAN
 	removeobject 7
-	setflag FLAG_0x2EA
-	setflag FLAG_0x332
-	clearflag FLAG_0x2D2
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	delay 30
 	setvar VAR_0x408D, 3
 	setvar VAR_0x4050, 1
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
index 6d541e1e3..8c93a570a 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
@@ -1,20 +1,20 @@
 LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480
-	object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185
-	object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757
-	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 849
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818
+	object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
+	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
 
 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600
 	warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
@@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608
 	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F
 	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656
 	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D
-	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, gUnknown_081F9553
+	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale
 
 LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638
 	map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 5501f5ad5..70e1c59d4 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -84,8 +84,8 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 	compare VAR_FACING, 4
 	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440
 	setvar VAR_0x408D, 3
-	setflag FLAG_0x332
-	clearflag FLAG_0x2D2
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	setvar VAR_0x4050, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
@@ -301,7 +301,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4
 	return
 
-gUnknown_081F9553:: @ 81F9553
+EventScript_PlayerPCFemale:: @ 81F9553
 	lockall
 	checkplayergender
 	compare VAR_RESULT, 0
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
index df992a2e3..4eb310f74 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
@@ -1,10 +1,10 @@
 LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0
-	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721
-	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA
 
 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC
 	warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 75b83b6a1..ae01e4632 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -121,7 +121,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, 4
-	clearflag FLAG_0x3DF
+	clearflag FLAG_HIDE_ROUTE_101_BOY
 	setvar VAR_0x4084, 3
 	releaseall
 	end
@@ -192,8 +192,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	special EnableNationalPokedex
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4
 	closemessage
-	setflag FLAG_0x31B
-	setflag FLAG_0x31A
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	setvar VAR_0x40D3, 2
 	setvar VAR_0x40F5, 0
 	setflag FLAG_0x072
@@ -500,7 +500,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
-	checkflag FLAG_0x380
+	checkflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141
 	compare VAR_0x40D3, 3
 	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc
index 2fa18eade..fd82f78e0 100644
--- a/data/maps/MagmaHideout_1F/events.inc
+++ b/data/maps/MagmaHideout_1F/events.inc
@@ -1,10 +1,10 @@
 MagmaHideout_1F_EventObjects: @ 85371CC
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_11
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13
 
 MagmaHideout_1F_MapWarps: @ 853725C
 	warp_def 10, 34, 3, 4, MAP_JAGGED_PASS
diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc
index 723c9e914..d80849231 100644
--- a/data/maps/MagmaHideout_2F_1R/events.inc
+++ b/data/maps/MagmaHideout_2F_1R/events.inc
@@ -1,8 +1,8 @@
 MagmaHideout_2F_1R_EventObjects: @ 8537290
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
 
 MagmaHideout_2F_1R_MapWarps: @ 85372F0
 	warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R
diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc
index 277dcf530..8bc61def7 100644
--- a/data/maps/MagmaHideout_2F_2R/events.inc
+++ b/data/maps/MagmaHideout_2F_2R/events.inc
@@ -1,10 +1,10 @@
 MagmaHideout_2F_2R_EventObjects: @ 853731C
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE
 
 MagmaHideout_2F_2R_MapWarps: @ 85373AC
 	warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R
diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc
index 0f3ff3529..1fbad5042 100644
--- a/data/maps/MagmaHideout_3F_1R/events.inc
+++ b/data/maps/MagmaHideout_3F_1R/events.inc
@@ -1,7 +1,7 @@
 MagmaHideout_3F_1R_EventObjects: @ 85373D0
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET
 
 MagmaHideout_3F_1R_MapWarps: @ 8537418
 	warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F
diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc
index d2bd79078..d00cbf423 100644
--- a/data/maps/MagmaHideout_3F_2R/events.inc
+++ b/data/maps/MagmaHideout_3F_2R/events.inc
@@ -1,6 +1,6 @@
 MagmaHideout_3F_2R_EventObjects: @ 8537444
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX
 
 MagmaHideout_3F_2R_MapWarps: @ 8537474
 	warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R
diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc
index 2ced1f4fd..26ffa3dff 100644
--- a/data/maps/MagmaHideout_3F_3R/events.inc
+++ b/data/maps/MagmaHideout_3F_3R/events.inc
@@ -1,5 +1,5 @@
 MagmaHideout_3F_3R_EventObjects: @ 8537574
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE
 
 MagmaHideout_3F_3R_MapWarps: @ 853758C
 	warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R
diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc
index 435099c47..09e054109 100644
--- a/data/maps/MagmaHideout_4F/events.inc
+++ b/data/maps/MagmaHideout_4F/events.inc
@@ -1,12 +1,12 @@
 MagmaHideout_4F_EventObjects: @ 8537490
-	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 853
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857
-	object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857
-	object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 850
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168
+	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
+	object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE
 
 MagmaHideout_4F_MapWarps: @ 8537550
 	warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 0cc0fea56..b2a28639f 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -60,8 +60,8 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5
 	msgbox MagmaHideout_4F_Text_23ABE2, 4
 	closemessage
-	clearflag FLAG_0x348
-	clearflag FLAG_0x343
+	clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
+	clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
 	setvar VAR_0x4058, 1
 	setflag FLAG_0x06F
 	setvar VAR_0x40A0, 1
@@ -71,7 +71,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	removeobject 3
 	removeobject 4
 	removeobject 5
-	setflag FLAG_0x359
+	setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
 	fadescreen 0
 	releaseall
 	end
diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc
index 8569e33ec..62d1cd37e 100644
--- a/data/maps/MarineCave_End/events.inc
+++ b/data/maps/MarineCave_End/events.inc
@@ -1,5 +1,5 @@
 MarineCave_End_EventObjects: @ 85377E8
-	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 782
+	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE
 
 MarineCave_End_MapWarps: @ 8537800
 	warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc
index d6b4bbd8d..f61620c29 100644
--- a/data/maps/MarineCave_End/scripts.inc
+++ b/data/maps/MarineCave_End/scripts.inc
@@ -21,7 +21,7 @@ MarineCave_End_MapScript1_23B008: @ 823B008
 	end
 
 MarineCave_End_EventScript_23B012:: @ 823B012
-	clearflag FLAG_0x30E
+	clearflag FLAG_HIDE_MARINE_CAVE_KYOGRE
 	setvar VAR_TEMP_1, 1
 	return
 
diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc
index 17ae4a327..ebdc866f5 100644
--- a/data/maps/MauvilleCity/events.inc
+++ b/data/maps/MauvilleCity/events.inc
@@ -4,12 +4,12 @@ MauvilleCity_EventObjects: @ 852662C
 	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0
 	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0
 	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0
-	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804
-	object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805
-	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116
+	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, FLAG_HIDE_MAUVILLE_CITY_WALLY
+	object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE
+	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, FLAG_HIDE_MAUVILLE_CITY_WATTSON
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, FLAG_ITEM_MAUVILLE_CITY_X_SPEED
 	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0
-	object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 765
+	object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT
 
 MauvilleCity_MapWarps: @ 8526734
 	warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index abb527d7f..ed5163cf1 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -5,7 +5,7 @@ MauvilleCity_MapScripts:: @ 81DF385
 MauvilleCity_MapScript1_1DF38B: @ 81DF38B
 	setflag FLAG_VISITED_MAUVILLE_CITY
 	clearflag FLAG_0x09D
-	clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
+	clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_SYS_TV_START
 	clearflag FLAG_0x063
 	setvar VAR_0x4093, 0
@@ -14,8 +14,8 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B
 	end
 
 MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
-	clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
-	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
+	clearflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
+	setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
 	setflag FLAG_WATTSON_REMATCH_AVAILABLE
 	return
 
@@ -159,8 +159,8 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D
 MauvilleCity_EventScript_1DF593:: @ 81DF593
 	removeobject 6
 	removeobject 7
-	clearflag FLAG_0x326
-	clearflag FLAG_0x329
+	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
+	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
 	setflag FLAG_0x0BE
 	setvar VAR_0x40F2, 0
 	setflag FLAG_0x088
diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc
index 84e6f7eff..4a05acafb 100644
--- a/data/maps/MauvilleCity_Gym/events.inc
+++ b/data/maps/MauvilleCity_Gym/events.inc
@@ -1,5 +1,5 @@
 MauvilleCity_Gym_EventObjects: @ 852FD5C
-	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913
+	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON
 	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0
 	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index 049833db0..a284d1dd7 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -94,7 +94,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
 	call MauvilleCity_Gym_EventScript_27207E
 	msgbox MauvilleCity_Gym_Text_20E7AA, 4
 	setvar VAR_0x40D2, 3
-	clearflag FLAG_0x2FE
+	clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
 	setflag FLAG_0x4F2
 	setflag FLAG_BADGE03_GET
 	addvar VAR_0x4085, 1
diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc
index b36e116db..dd3e1665f 100644
--- a/data/maps/MauvilleCity_House1/scripts.inc
+++ b/data/maps/MauvilleCity_House1/scripts.inc
@@ -9,7 +9,7 @@ MauvilleCity_House1_EventScript_20F976:: @ 820F976
 	msgbox MauvilleCity_House1_Text_20F9AF, 4
 	giveitem_std ITEM_HM06
 	setflag FLAG_0x06B
-	setflag FLAG_0x34B
+	setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY
 	msgbox MauvilleCity_House1_Text_20FAA9, 4
 	release
 	end
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
index d445b3cca..031dac213 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0
 
 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4
diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc
index 068f9a356..8f84327d2 100644
--- a/data/maps/MeteorFalls_1F_1R/events.inc
+++ b/data/maps/MeteorFalls_1F_1R/events.inc
@@ -1,14 +1,14 @@
 MeteorFalls_1F_1R_EventObjects: @ 8533F74
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 939
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 939
-	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 938
-	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA
+	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
+	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO
 
 MeteorFalls_1F_1R_MapWarps: @ 8534064
 	warp_def 27, 18, 4, 0, MAP_ROUTE114
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index b786dc961..e8b81164f 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -84,9 +84,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	removeobject 7
 	removeobject 8
 	removeobject 9
-	setflag FLAG_0x333
+	setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA
 	setflag FLAG_0x0CF
-	setflag FLAG_0x2FF
+	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
 	setvar VAR_0x40BF, 1
 	releaseall
 	end
diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc
index 85dafb869..44b283d1e 100644
--- a/data/maps/MeteorFalls_B1F_2R/events.inc
+++ b/data/maps/MeteorFalls_B1F_2R/events.inc
@@ -1,5 +1,5 @@
 MeteorFalls_B1F_2R_EventObjects: @ 8534190
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02
 
 MeteorFalls_B1F_2R_MapWarps: @ 85341A8
 	warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R
diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc
index d62e54f92..4f55d7485 100644
--- a/data/maps/MirageTower_3F/events.inc
+++ b/data/maps/MirageTower_3F/events.inc
@@ -1,6 +1,6 @@
 MirageTower_3F_EventObjects: @ 853761C
-	object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17
-	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 18
+	object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12
 
 MirageTower_3F_MapWarps: @ 853764C
 	warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F
diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc
index b9574637a..61c536c61 100644
--- a/data/maps/MirageTower_4F/events.inc
+++ b/data/maps/MirageTower_4F/events.inc
@@ -1,7 +1,7 @@
 MirageTower_4F_EventObjects: @ 8537670
-	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963
-	object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, 17
+	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
+	object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11
 
 MirageTower_4F_MapWarps: @ 85376B8
 	warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F
diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc
index 1e079c5d7..6406edd9b 100644
--- a/data/maps/MirageTower_4F/scripts.inc
+++ b/data/maps/MirageTower_4F/scripts.inc
@@ -9,8 +9,8 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48
 	goto_eq MirageTower_4F_EventScript_23AD7F
 	giveitem_std ITEM_ROOT_FOSSIL
 	closemessage
-	setflag FLAG_0x3C3
-	setflag FLAG_0x3C4
+	setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
+	setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
 	removeobject 1
 	delay 30
 	setflag FLAG_0x14F
@@ -30,8 +30,8 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89
 	goto_eq MirageTower_4F_EventScript_23ADC0
 	giveitem_std ITEM_CLAW_FOSSIL
 	closemessage
-	setflag FLAG_0x3C4
-	setflag FLAG_0x3C3
+	setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
+	setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
 	removeobject 2
 	delay 30
 	setflag FLAG_0x150
diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc
index fead88f9b..5a653bc22 100644
--- a/data/maps/MossdeepCity/events.inc
+++ b/data/maps/MossdeepCity/events.inc
@@ -4,17 +4,17 @@ MossdeepCity_EventObjects: @ 8527018
 	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0
 	object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0
 	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, FLAG_ITEM_MOSSDEEP_CITY_NET_BALL
 	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0
 	object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0
 	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0
-	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823
-	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823
-	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823
-	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823
-	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 823
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
+	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
+	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
+	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
 	object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0
-	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788
+	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0
 
 MossdeepCity_MapWarps: @ 85271B0
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index 8cce8efeb..710770472 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -98,7 +98,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41
 	removeobject 13
 	delay 30
 	setvar VAR_0x405D, 2
-	setflag FLAG_0x337
+	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
 	releaseall
 	end
 
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index f38fd606d..17cf90993 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -66,18 +66,18 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
 	msgbox MossdeepCity_Gym_Text_221999, 4
 	setflag FLAG_0x4F6
 	setflag FLAG_BADGE07_GET
-	setflag FLAG_0x39C
-	clearflag FLAG_0x365
+	setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
+	clearflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
 	clearflag FLAG_0x393
 	setvar VAR_0x8008, 7
 	call MossdeepCity_Gym_EventScript_271F43
-	clearflag FLAG_0x389
-	clearflag FLAG_0x337
-	clearflag FLAG_0x2F4
-	clearflag FLAG_0x35E
-	clearflag FLAG_0x35F
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
 	setvar VAR_0x405D, 1
-	setflag FLAG_0x2F1
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
 	setvar VAR_0x409F, 1
 	call MossdeepCity_Gym_EventScript_22095B
 	closemessage
diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc
index 001039dfc..8e169c3b0 100644
--- a/data/maps/MossdeepCity_House2/events.inc
+++ b/data/maps/MossdeepCity_House2/events.inc
@@ -1,7 +1,7 @@
 MossdeepCity_House2_EventObjects: @ 85329CC
 	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0
 	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0
-	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
 
 MossdeepCity_House2_MapWarps: @ 8532A14
 	warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY
diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc
index c61f74d99..410fa1df7 100644
--- a/data/maps/MossdeepCity_House2/scripts.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
@@ -18,7 +18,7 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
 	waitmoncry
 	closemessage
 	setflag FLAG_0x0E0
-	clearflag FLAG_0x3A5
+	clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
 	compare VAR_FACING, 2
 	call_if 1, MossdeepCity_House2_EventScript_222124
 	compare VAR_FACING, 3
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
index 1641be959..c2158f4f4 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0
 
 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
index c45f433f2..dbb5a47eb 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
@@ -4,12 +4,12 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18
 	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0
 	object_event 4, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0
 	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756
-	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756
-	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756
-	object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756
-	object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737
-	object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
+	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
+	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
+	object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
+	object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY
+	object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
 
 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20
 	warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
index 02b771bf6..6c271b5de 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
@@ -2,12 +2,12 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C
 	object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0
 	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0
-	object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862
-	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862
-	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862
-	object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862
+	object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
+	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
+	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
+	object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
 
 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24
 	warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 36bfc422a..b09babbdd 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -295,9 +295,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	fadedefaultbgm
 	fadescreen 1
 	setvar VAR_0x409F, 3
-	setflag FLAG_0x2F4
-	setflag FLAG_0x35E
-	setflag FLAG_0x337
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
 	removeobject 5
 	removeobject 7
 	removeobject 6
@@ -315,12 +315,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	closemessage
 	fadescreen 1
 	setflag FLAG_0x075
-	setflag FLAG_0x3C7
+	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
 	removeobject 4
-	setflag FLAG_0x2E1
-	clearflag FLAG_0x3C7
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
 	setvar VAR_0x40C6, 1
-	setflag FLAG_0x314
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	removeobject 3
 	setobjectxyperm 3, 5, 6
 	setobjectmovementtype 3, 2
diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc
index 208ec7db0..dd8b3d1b4 100644
--- a/data/maps/MossdeepCity_StevensHouse/events.inc
+++ b/data/maps/MossdeepCity_StevensHouse/events.inc
@@ -1,7 +1,7 @@
 MossdeepCity_StevensHouse_EventObjects: @ 8532C10
-	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968
-	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
+	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
 
 MossdeepCity_StevensHouse_MapWarps: @ 8532C58
 	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 14d0cd5c7..ca24cebb7 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -47,8 +47,8 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	delay 20
 	applymovement 1, MossdeepCity_StevensHouse_Movement_22283B
 	waitmovement 0
-	setflag FLAG_0x314
-	setflag FLAG_0x3AD
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT
 	setvar VAR_0x40C6, 2
 	releaseall
 	end
@@ -129,7 +129,7 @@ MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB
 	return
 
 MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901
-	setflag FLAG_0x3C8
+	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
 	setflag FLAG_0x12A
 	releaseall
 	end
diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc
index 343f6a203..d11ba584e 100644
--- a/data/maps/MtChimney/events.inc
+++ b/data/maps/MtChimney/events.inc
@@ -1,34 +1,34 @@
 MtChimney_EventObjects: @ 85347C8
-	object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926
-	object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926
-	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994
-	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927
-	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
-	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
-	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927
-	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
-	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
-	object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927
-	object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927
-	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
-	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
-	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
-	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
-	object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927
-	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
-	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
-	object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877
-	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877
-	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877
-	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877
-	object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927
-	object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, 877
+	object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
+	object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
+	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
+	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
+	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
+	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, FLAG_HIDE_MT_CHIMNEY_TRAINERS
+	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, FLAG_HIDE_MT_CHIMNEY_TRAINERS
+	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, FLAG_HIDE_MT_CHIMNEY_TRAINERS
+	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, FLAG_HIDE_MT_CHIMNEY_TRAINERS
+	object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
+	object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS
 
 MtChimney_MapWarps: @ 8534A98
 	warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 5abd7c176..c727c735b 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -54,7 +54,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	removeobject 29
 	removeobject 3
 	removeobject 22
-	setflag FLAG_0x39F
+	setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
 	fadescreen 0
 	setobjectxyperm 1, 10, 12
 	addobject 1
@@ -71,11 +71,11 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	compare VAR_FACING, 2
 	call_if 1, MtChimney_EventScript_22EEE8
 	removeobject 1
-	setflag FLAG_0x39E
+	setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
 	setflag FLAG_0x08B
-	clearflag FLAG_0x3A0
-	setflag FLAG_0x3AE
-	clearflag FLAG_0x3E2
+	clearflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
+	setflag FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO
+	clearflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
 	releaseall
 	end
 
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc
index c025089e3..f9fad9f46 100644
--- a/data/maps/MtPyre_2F/events.inc
+++ b/data/maps/MtPyre_2F/events.inc
@@ -1,6 +1,6 @@
 MtPyre_2F_EventObjects: @ 8534DF0
 	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL
 	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0
 	object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0
 	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc
index 8d841d828..f78373aca 100644
--- a/data/maps/MtPyre_3F/events.inc
+++ b/data/maps/MtPyre_3F/events.inc
@@ -1,7 +1,7 @@
 MtPyre_3F_EventObjects: @ 8534EEC
 	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0
 	object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL
 	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0
 
 MtPyre_3F_MapWarps: @ 8534F4C
diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc
index 73c0a59cf..ffe568880 100644
--- a/data/maps/MtPyre_4F/events.inc
+++ b/data/maps/MtPyre_4F/events.inc
@@ -1,6 +1,6 @@
 MtPyre_4F_EventObjects: @ 8534F90
 	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, 1130
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE
 
 MtPyre_4F_MapWarps: @ 8534FC0
 	warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F
diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc
index e1fffe025..afd3801e3 100644
--- a/data/maps/MtPyre_5F/events.inc
+++ b/data/maps/MtPyre_5F/events.inc
@@ -1,6 +1,6 @@
 MtPyre_5F_EventObjects: @ 8535004
 	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, 1052
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE
 
 MtPyre_5F_MapWarps: @ 8535034
 	warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc
index 607c0902a..3ab5dcf70 100644
--- a/data/maps/MtPyre_6F/events.inc
+++ b/data/maps/MtPyre_6F/events.inc
@@ -1,6 +1,6 @@
 MtPyre_6F_EventObjects: @ 8535070
 	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30
 	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0
 
 MtPyre_6F_MapWarps: @ 85350B8
diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc
index 16fd3530f..75c9489e4 100644
--- a/data/maps/MtPyre_Exterior/events.inc
+++ b/data/maps/MtPyre_Exterior/events.inc
@@ -1,6 +1,6 @@
 MtPyre_Exterior_EventObjects: @ 85350DC
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48
 
 MtPyre_Exterior_MapWarps: @ 853510C
 	warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F
@@ -15,8 +15,8 @@ MtPyre_Exterior_MapCoordEvents: @ 8535124
 	coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED
 
 MtPyre_Exterior_MapBGEvents: @ 8535174
-	bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, 29
-	bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, 78
+	bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL
+	bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER
 
 MtPyre_Exterior_MapEvents:: @ 853518C
 	map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc
index 554eaa75e..b112fbcfe 100644
--- a/data/maps/MtPyre_Summit/events.inc
+++ b/data/maps/MtPyre_Summit/events.inc
@@ -1,12 +1,12 @@
 MtPyre_Summit_EventObjects: @ 85351A0
 	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 916
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
 	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917
-	object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 856
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
+	object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
 
 MtPyre_Summit_MapWarps: @ 8535260
 	warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
@@ -22,8 +22,8 @@ MtPyre_Summit_MapCoordEvents: @ 8535278
 	coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204
 
 MtPyre_Summit_MapBGEvents: @ 85352D8
-	bg_hidden_item_event 9, 25, 0, ITEM_ZINC, 79
-	bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, 80
+	bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC
+	bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY
 
 MtPyre_Summit_MapEvents:: @ 85352F0
 	map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index fe39e9d48..352d92d83 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -51,8 +51,8 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	removeobject 5
 	removeobject 6
 	removeobject 7
-	setflag FLAG_0x394
-	setflag FLAG_0x395
+	setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
+	setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
 	fadedefaultbgm
 	fadescreen 0
 	delay 20
@@ -66,7 +66,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	msgbox MtPyre_Summit_Text_23290E, 4
 	giveitem_std ITEM_MAGMA_EMBLEM
 	setflag FLAG_0x0D4
-	setflag FLAG_0x34F
+	setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
 	releaseall
 	end
 
diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc
index 49a39c162..d18565161 100644
--- a/data/maps/NavelRock_Bottom/events.inc
+++ b/data/maps/NavelRock_Bottom/events.inc
@@ -1,5 +1,5 @@
 NavelRock_Bottom_EventObjects: @ 853DD50
-	object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800
+	object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA
 
 NavelRock_Bottom_MapWarps: @ 853DD68
 	warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11
diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc
index febe106bf..3abd0c84a 100644
--- a/data/maps/NavelRock_Bottom/scripts.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
@@ -11,13 +11,13 @@ NavelRock_Bottom_MapScript1_269260: @ 8269260
 	end
 
 NavelRock_Bottom_EventScript_269273:: @ 8269273
-	setflag FLAG_0x320
+	setflag FLAG_HIDE_LUGIA
 	return
 
 NavelRock_Bottom_EventScript_269277:: @ 8269277
 	checkflag FLAG_0x1DD
 	goto_eq NavelRock_Bottom_EventScript_27374E
-	clearflag FLAG_0x320
+	clearflag FLAG_HIDE_LUGIA
 	return
 
 NavelRock_Bottom_MapScript1_269284: @ 8269284
diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc
index ef781a838..abd337cb2 100644
--- a/data/maps/NavelRock_Top/events.inc
+++ b/data/maps/NavelRock_Top/events.inc
@@ -1,5 +1,5 @@
 NavelRock_Top_EventObjects: @ 853DB74
-	object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 801
+	object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HOOH
 
 NavelRock_Top_MapWarps: @ 853DB8C
 	warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4
@@ -8,7 +8,7 @@ NavelRock_Top_MapCoordEvents: @ 853DB94
 	coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F
 
 NavelRock_Top_MapBGEvents: @ 853DBA4
-	bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, 109
+	bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH
 
 NavelRock_Top_MapEvents:: @ 853DBB0
 	map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc
index 4310529dd..8ae17cb37 100644
--- a/data/maps/NavelRock_Top/scripts.inc
+++ b/data/maps/NavelRock_Top/scripts.inc
@@ -12,7 +12,7 @@ NavelRock_Top_MapScript1_26911E: @ 826911E
 
 NavelRock_Top_EventScript_269131:: @ 8269131
 	setvar VAR_TEMP_1, 1
-	setflag FLAG_0x321
+	setflag FLAG_HIDE_HOOH
 	return
 
 NavelRock_Top_EventScript_26913A:: @ 826913A
@@ -20,7 +20,7 @@ NavelRock_Top_EventScript_26913A:: @ 826913A
 	checkflag FLAG_0x1DC
 	goto_eq NavelRock_Top_EventScript_27374E
 	setvar VAR_TEMP_1, 0
-	clearflag FLAG_0x321
+	clearflag FLAG_HIDE_HOOH
 	return
 
 NavelRock_Top_MapScript1_269151: @ 8269151
diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc
index af8f10f99..568f4b22e 100644
--- a/data/maps/NewMauville_Inside/events.inc
+++ b/data/maps/NewMauville_Inside/events.inc
@@ -1,12 +1,12 @@
 NewMauville_Inside_EventObjects: @ 85364A8
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, 976
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3
 
 NewMauville_Inside_MapWarps: @ 8536568
 	warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE
diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc
index e6d80c33d..1ced90ca9 100644
--- a/data/maps/NewMauville_Inside/scripts.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
@@ -32,15 +32,15 @@ NewMauville_Inside_MapScript1_23741B: @ 823741B
 	end
 
 NewMauville_Inside_EventScript_237441:: @ 8237441
-	clearflag FLAG_0x3CE
+	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1
 	return
 
 NewMauville_Inside_EventScript_237445:: @ 8237445
-	clearflag FLAG_0x3CF
+	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2
 	return
 
 NewMauville_Inside_EventScript_237449:: @ 8237449
-	clearflag FLAG_0x3D0
+	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3
 	return
 
 NewMauville_Inside_MapScript1_23744D: @ 823744D
diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc
index 8c637b2bf..bbf84390c 100644
--- a/data/maps/OldaleTown/events.inc
+++ b/data/maps/OldaleTown/events.inc
@@ -2,7 +2,7 @@ OldaleTown_EventObjects: @ 8527854
 	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0
 	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0
 	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0
-	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, 979
+	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL
 
 OldaleTown_MapWarps: @ 85278B4
 	warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index 32bca3703..174d108eb 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -40,9 +40,9 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC
 	faceplayer
 	checkflag FLAG_0x084
 	goto_eq OldaleTown_EventScript_1E8FB9
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq OldaleTown_EventScript_1E8FB9
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	playbgm MUS_TSURETEK, 0
 	msgbox OldaleTown_Text_1E91C0, 4
 	closemessage
@@ -287,7 +287,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
 	waitmovement 0
 	removeobject 4
 	setvar VAR_0x40C7, 2
-	setflag FLAG_0x3D3
+	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	releaseall
 	end
 
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
index fe8490c9c..34f343eb4 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930
 	warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
index 1b961ee74..d41f1fa71 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74
 	warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc
index 3e85ad434..10d85c939 100644
--- a/data/maps/PetalburgCity/events.inc
+++ b/data/maps/PetalburgCity/events.inc
@@ -1,13 +1,13 @@
 PetalburgCity_EventObjects: @ 8525FD0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728
-	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 726
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
+	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY
 	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0
 	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0
-	object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 830
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040
+	object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, FLAG_ITEM_PETALBURG_CITY_ETHER
 	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0
-	object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 995
+	object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT
 
 PetalburgCity_MapWarps: @ 85260A8
 	warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1
@@ -35,7 +35,7 @@ PetalburgCity_MapBGEvents: @ 8526158
 	bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73
 	bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A
 	bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491
-	bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, 95
+	bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY
 
 PetalburgCity_MapEvents:: @ 85261B8
 	map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index 67a9f83f3..5eda45fb8 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -67,7 +67,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
 	applymovement 5, PetalburgCity_Movement_1DC42D
 	applymovement 255, PetalburgCity_Movement_1DC418
 	waitmovement 0
-	setflag FLAG_0x33E
+	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
 	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc
index 42a0a8fc7..4c75dc7f6 100644
--- a/data/maps/PetalburgCity_Gym/events.inc
+++ b/data/maps/PetalburgCity_Gym/events.inc
@@ -1,5 +1,5 @@
 PetalburgCity_Gym_EventObjects: @ 852EDC8
-	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772
+	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN
 	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0
 	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0
@@ -7,9 +7,9 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8
 	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0
 	object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0
 	object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781
-	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 866
-	object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 824
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, FLAG_HIDE_PETALBURG_GYM_GREETER
+	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY
+	object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
 
 PetalburgCity_Gym_MapWarps: @ 852EED0
 	warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index e95e434b5..9347397ff 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -96,7 +96,7 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
 	waitmovement 0
 	playse SE_KAIDAN
 	removeobject 10
-	setflag FLAG_0x2D6
+	setflag FLAG_HIDE_PETALBURG_CITY_WALLY
 	delay 30
 	applymovement 255, PetalburgCity_Gym_Movement_2725A6
 	waitmovement 0
@@ -216,12 +216,12 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
 	compare VAR_0x8008, 3
 	call_if 1, PetalburgCity_Gym_EventScript_204CB5
 	removeobject 10
-	setflag FLAG_0x2D8
+	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
 	setvar VAR_0x4085, 1
 	setvar VAR_0x4057, 2
-	clearflag FLAG_0x2D6
-	clearflag FLAG_0x362
-	setflag FLAG_0x379
+	clearflag FLAG_HIDE_PETALBURG_CITY_WALLY
+	clearflag FLAG_HIDE_PETALBURG_GYM_WALLY
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
 	special InitBirchState
 	warp MAP_PETALBURG_CITY, 255, 15, 8
 	waitstate
@@ -423,11 +423,11 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
 	setflag FLAG_BADGE05_GET
 	special sub_813B9A0
 	call PetalburgCity_Gym_EventScript_2721F8
-	setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
-	clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
+	setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
+	clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
 	setvar VAR_0x8008, 5
 	call PetalburgCity_Gym_EventScript_271F43
-	clearflag FLAG_0x3AC
+	clearflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
 	call PetalburgCity_Gym_EventScript_2048FF
 	special DrawWholeMapView
 	call PetalburgCity_Gym_EventScript_204ED2
@@ -500,7 +500,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
 	call_if 1, PetalburgCity_Gym_EventScript_20506C
 	removeobject 11
 	setvar VAR_0x4057, 4
-	clearflag FLAG_0x33E
+	clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
 	warp MAP_PETALBURG_CITY, 255, 15, 8
 	waitstate
 	release
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
index d83875c10..08bd8f524 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268
 	warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc
index e0bfbc630..b64e38885 100644
--- a/data/maps/PetalburgWoods/events.inc
+++ b/data/maps/PetalburgWoods/events.inc
@@ -1,16 +1,16 @@
 PetalburgWoods_EventObjects: @ 85345E4
-	object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17
-	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 725
-	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 724
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058
+	object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, FLAG_ITEM_PETALBURG_WOODS_X_ATTACK
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, FLAG_ITEM_PETALBURG_WOODS_ETHER
 	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0
 	object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0
 	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0
 	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, 1117
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL
 	object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0
 
 PetalburgWoods_MapWarps: @ 853471C
@@ -27,10 +27,10 @@ PetalburgWoods_MapCoordEvents: @ 853474C
 
 PetalburgWoods_MapBGEvents: @ 853476C
 	bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B
-	bg_hidden_item_event 39, 35, 3, ITEM_POTION, 58
-	bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, 59
-	bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, 60
-	bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, 61
+	bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION
+	bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1
+	bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2
+	bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL
 	bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264
 
 PetalburgWoods_MapEvents:: @ 85347B4
diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc
index d43253baa..77ee2848f 100644
--- a/data/maps/Route101/events.inc
+++ b/data/maps/Route101/events.inc
@@ -1,10 +1,10 @@
 Route101_EventObjects: @ 8527E98
 	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0
-	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, 720
-	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700
-	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, 750
-	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, 897
-	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
+	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_ZIGZAGOON
+	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY
 
 Route101_MapCoordEvents: @ 8527F28
 	coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 97e832761..7cc7d522f 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -231,9 +231,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	waitmovement 0
 	msgbox Route101_Text_1EBF12, 4
 	special HealPlayerParty
-	setflag FLAG_0x2D0
-	clearflag FLAG_0x2D1
-	setflag FLAG_0x2BC
+	setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
+	setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
 	setvar VAR_0x4084, 2
 	setvar VAR_0x4060, 3
 	clearflag FLAG_SPECIAL_FLAG_0x4000
@@ -248,11 +248,11 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	end
 
 Route101_EventScript_1EBE85:: @ 81EBE85
-	setflag FLAG_0x2D2
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	return
 
 Route101_EventScript_1EBE89:: @ 81EBE89
-	setflag FLAG_0x2F8
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	return
 
 Route101_Movement_1EBE8D: @ 81EBE8D
diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc
index 1c660cda4..b2299feea 100644
--- a/data/maps/Route102/events.inc
+++ b/data/maps/Route102/events.inc
@@ -4,7 +4,7 @@ Route102_EventObjects: @ 8527FD8
 	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0
 	object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0
 	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_ITEM_ROUTE_102_POTION
 	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0
 	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0
 	object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0
diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
index f11191970..30a7292a0 100644
--- a/data/maps/Route103/events.inc
+++ b/data/maps/Route103/events.inc
@@ -1,6 +1,6 @@
 Route103_EventObjects: @ 85280DC
 	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL
 	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
 	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
 	object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
@@ -9,16 +9,16 @@ Route103_EventObjects: @ 85280DC
 	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0
 	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0
 	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
-	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, 898
+	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, FLAG_HIDE_ROUTE_103_BIRCH
 	object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 18
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 19
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, FLAG_ITEM_ROUTE_103_GUARD_SPEC
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_12
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_13
 	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
 	object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
 	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
 	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP
 
 Route103_MapWarps: @ 85282BC
 	warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 6674662f7..57cde74e6 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -142,10 +142,10 @@ Route103_EventScript_1EC585:: @ 81EC585
 Route103_EventScript_1EC5A2:: @ 81EC5A2
 	removeobject 2
 	setvar VAR_0x4084, 4
-	clearflag FLAG_0x379
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
 	setflag FLAG_0x082
 	setvar VAR_0x40C7, 1
-	clearflag FLAG_0x3D3
+	clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc
index 94642fbba..889ef3595 100644
--- a/data/maps/Route104/events.inc
+++ b/data/maps/Route104/events.inc
@@ -5,8 +5,8 @@ Route104_EventObjects: @ 85282E4
 	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0
 	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0
 	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0
-	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 742
-	object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 738
+	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY
 	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0
 	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0
 	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0
@@ -19,20 +19,20 @@ Route104_EventObjects: @ 85282E4
 	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0
 	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0
 	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002
-	object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, FLAG_ITEM_ROUTE_104_PP_UP
+	object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	object_event 23, EVENT_OBJ_GFX_TWIN, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0
 	object_event 24, EVENT_OBJ_GFX_TWIN, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0
 	object_event 25, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0
 	object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0
-	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057
+	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, FLAG_ITEM_ROUTE_104_POKE_BALL
 	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, 1115
-	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, 17
-	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, 1135
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, FLAG_ITEM_ROUTE_104_X_ACCURACY
+	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, FLAG_TEMP_11
+	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, FLAG_ITEM_ROUTE_104_POTION
 	object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0
 	object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0
-	object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, 719
+	object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL
 
 Route104_MapWarps: @ 8528614
 	warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE
@@ -53,11 +53,11 @@ Route104_MapBGEvents: @ 8528664
 	bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A
 	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033
 	bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C
-	bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, 44
-	bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, 62
-	bg_hidden_item_event 14, 55, 3, ITEM_POTION, 37
-	bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, 85
-	bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, 88
+	bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION
+	bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL
+	bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION
+	bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE
+	bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE
 
 Route104_MapEvents:: @ 85286DC
 	map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index 9b45844f0..a37c89469 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -23,11 +23,11 @@ Route104_EventScript_1ECC5E:: @ 81ECC5E
 	goto_if 0, Route104_EventScript_1ECC74
 	checkflag FLAG_BADGE03_GET
 	goto_if 0, Route104_EventScript_1ECC74
-	clearflag FLAG_0x38A
+	clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	return
 
 Route104_EventScript_1ECC74:: @ 81ECC74
-	setflag FLAG_0x38A
+	setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	return
 
 Route104_EventScript_1ECC78:: @ 81ECC78
@@ -52,14 +52,14 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E
 
 Route104_EventScript_1ECCB3:: @ 81ECCB3
 	lockall
-	setflag FLAG_0x32E
+	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
 	setvar VAR_0x405A, 8
 	setvar VAR_0x4063, 2
 	applymovement 255, Route104_Movement_2725A6
 	waitmovement 0
 	delay 10
 	addobject 34
-	clearflag FLAG_0x2CF
+	clearflag FLAG_HIDE_ROUTE_104_RIVAL
 	applymovement 255, Route104_Movement_1ECF86
 	waitmovement 0
 	applymovement 34, Route104_Movement_1ECF8A
@@ -418,13 +418,13 @@ Route104_EventScript_1ED139:: @ 81ED139
 	setobjectxyperm 2, 12, 8
 	addobject 2
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
-	clearflag FLAG_0x2E4
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	applymovement 2, Route104_Movement_1ED35C
 	waitmovement 0
 	addobject 4
-	clearflag FLAG_0x2E7
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	call Route104_EventScript_2720A8
-	setflag FLAG_0x2E6
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	hideobjectat 7, MAP_ROUTE104
 	copyvar VAR_0x4096, VAR_0x8008
 	resetobjectpriority 255, MAP_ROUTE104
diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc
index d6422508c..daee7759a 100644
--- a/data/maps/Route104_MrBrineysHouse/events.inc
+++ b/data/maps/Route104_MrBrineysHouse/events.inc
@@ -1,6 +1,6 @@
 Route104_MrBrineysHouse_EventObjects: @ 8533AD4
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739
-	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 
 Route104_MrBrineysHouse_MapWarps: @ 8533B04
 	warp_def 5, 8, 0, 0, MAP_ROUTE104
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 1721fa4a0..aa40c8cb4 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -11,7 +11,7 @@ Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
 	end
 
 Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C
-	setflag FLAG_0x32E
+	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
 	return
 
 Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50
@@ -80,13 +80,13 @@ Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
 	msgbox Route104_MrBrineysHouse_Text_229FE9, 4
 	call Route104_MrBrineysHouse_EventScript_271E95
 	setvar VAR_0x408E, 1
-	clearflag FLAG_0x2E2
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
+	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setvar VAR_0x405A, 8
 	setvar VAR_0x4063, 2
-	setflag FLAG_0x32E
-	setflag FLAG_0x2CF
+	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
+	setflag FLAG_HIDE_ROUTE_104_RIVAL
 	warp MAP_ROUTE104, 255, 13, 51
 	waitstate
 	releaseall
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index 5142a1282..eefc723b6 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
@@ -8,7 +8,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B
 	checkflag FLAG_BADGE03_GET
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B
@@ -18,7 +18,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B
 Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373
 	lock
 	faceplayer
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3E4
 	msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, 4
 	checkflag FLAG_0x07F
diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc
index d11bb8cab..e22aa668c 100644
--- a/data/maps/Route105/events.inc
+++ b/data/maps/Route105/events.inc
@@ -3,7 +3,7 @@ Route105_EventObjects: @ 85286F0
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, 1003
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, FLAG_ITEM_ROUTE_105_IRON
 	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0
 	object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
 	object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0
@@ -12,8 +12,8 @@ Route105_MapWarps: @ 85287B0
 	warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
 
 Route105_MapBGEvents: @ 85287B8
-	bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, 89
-	bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, 111
+	bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE
+	bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL
 
 Route105_MapEvents:: @ 85287D0
 	map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc
index 11541f2bf..9ff0f41dd 100644
--- a/data/maps/Route106/events.inc
+++ b/data/maps/Route106/events.inc
@@ -3,15 +3,15 @@ Route106_EventObjects: @ 85287E4
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0
 	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0
 	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, 1004
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN
 
 Route106_MapWarps: @ 852885C
 	warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
 
 Route106_MapBGEvents: @ 8528864
-	bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, 63
-	bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, 46
-	bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, 47
+	bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL
+	bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST
+	bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE
 	bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A
 
 Route106_MapEvents:: @ 8528894
diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc
index a92fe680d..094eb0bc7 100644
--- a/data/maps/Route108/events.inc
+++ b/data/maps/Route108/events.inc
@@ -5,13 +5,13 @@ Route108_EventObjects: @ 8528964
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0
 	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0
 	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE
 
 Route108_MapWarps: @ 8528A0C
 	warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK
 
 Route108_MapBGEvents: @ 8528A14
-	bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, 86
+	bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY
 
 Route108_MapEvents:: @ 8528A20
 	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc
index e74aa5dfa..322055874 100644
--- a/data/maps/Route109/events.inc
+++ b/data/maps/Route109/events.inc
@@ -1,6 +1,6 @@
 Route109_EventObjects: @ 8528A34
-	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 744
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, 741
+	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0
 	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0
@@ -8,7 +8,7 @@ Route109_EventObjects: @ 8528A34
 	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0
 	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0
 	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, FLAG_ITEM_ROUTE_109_PP_UP
 	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0
 	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0
 	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0
@@ -21,7 +21,7 @@ Route109_EventObjects: @ 8528A34
 	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0
 	object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0
 	object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0
-	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, 1140
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_0x474
 	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0
 
 Route109_MapWarps: @ 8528C74
@@ -30,12 +30,12 @@ Route109_MapWarps: @ 8528C74
 Route109_MapBGEvents: @ 8528C7C
 	bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B
 	bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34
-	bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, 50
-	bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, 52
-	bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, 51
-	bg_hidden_item_event 28, 20, 3, ITEM_ETHER, 64
-	bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, 90
-	bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, 91
+	bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE
+	bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1
+	bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL
+	bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER
+	bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2
+	bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3
 
 Route109_MapEvents:: @ 8528CDC
 	map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index 84f7b7c34..f87572891 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -44,14 +44,14 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
 	applymovement 255, Route109_Movement_1EE900
 	waitmovement 0
 	addobject 4
-	clearflag FLAG_0x2E7
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setobjectxyperm 2, 12, 8
 	addobject 2
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
 	applymovement 2, Route109_Movement_1EE90D
 	waitmovement 0
-	clearflag FLAG_0x2E4
-	setflag FLAG_0x2E8
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	hideobjectat 1, MAP_ROUTE109
 	msgbox Route109_Text_1E9C1D, 4
 	closemessage
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index e70f91ca8..cb617e2f9 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -13,10 +13,10 @@ Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE
 	goto_eq Route109_SeashoreHouse_EventScript_269460
 	checkflag FLAG_0x08D
 	goto_eq Route109_SeashoreHouse_EventScript_269432
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	goto_eq Route109_SeashoreHouse_EventScript_269428
 	msgbox Route109_SeashoreHouse_Text_269555, 4
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	release
 	end
 
diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc
index c767f91d3..221dd6f6c 100644
--- a/data/maps/Route110/events.inc
+++ b/data/maps/Route110/events.inc
@@ -17,24 +17,24 @@ Route110_EventObjects: @ 8528CF0
 	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, BerryTreeScript, 0
 	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, BerryTreeScript, 0
 	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, BerryTreeScript, 0
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, 1007
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, 1006
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, FLAG_ITEM_ROUTE_110_DIRE_HIT
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, FLAG_ITEM_ROUTE_109_RARE_CANDY
 	object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0
-	object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900
-	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900
-	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900
-	object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900
-	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 900
+	object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, FLAG_HIDE_ROUTE_110_TEAM_AQUA
+	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, FLAG_HIDE_ROUTE_110_TEAM_AQUA
+	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, FLAG_HIDE_ROUTE_110_TEAM_AQUA
+	object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, FLAG_HIDE_ROUTE_110_TEAM_AQUA
+	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_TEAM_AQUA
 	object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_1EF499, 0
-	object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, 919
-	object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 922
+	object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_1
+	object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_2
 	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0
 	object_event 31, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0
 	object_event 32, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0
 	object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0
 	object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0
-	object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141
-	object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 837
+	object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR
+	object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH
 
 Route110_MapWarps: @ 8529050
 	warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE
@@ -68,10 +68,10 @@ Route110_MapBGEvents: @ 8529110
 	bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380
 	bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389
 	bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392
-	bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, 54
-	bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, 53
-	bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, 65
-	bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, 55
+	bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE
+	bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL
+	bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL
+	bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL
 	bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A
 
 Route110_MapEvents:: @ 85291DC
diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc
index 44539d4cc..1e371bbbe 100644
--- a/data/maps/Route110_TrickHouseEnd/events.inc
+++ b/data/maps/Route110_TrickHouseEnd/events.inc
@@ -1,5 +1,5 @@
 Route110_TrickHouseEnd_EventObjects: @ 853DEFC
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN
 
 Route110_TrickHouseEnd_MapWarps: @ 853DF14
 	warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
@@ -9,7 +9,7 @@ Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24
 	coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041
 
 Route110_TrickHouseEnd_MapBGEvents: @ 853DF34
-	bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, 1
+	bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET
 
 Route110_TrickHouseEnd_MapEvents:: @ 853DF40
 	map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc
index 5255e5acf..ff83f0bdb 100644
--- a/data/maps/Route110_TrickHouseEntrance/events.inc
+++ b/data/maps/Route110_TrickHouseEntrance/events.inc
@@ -1,5 +1,5 @@
 Route110_TrickHouseEntrance_EventObjects: @ 853DE6C
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
 
 Route110_TrickHouseEntrance_MapWarps: @ 853DE84
 	warp_def 5, 7, 3, 1, MAP_ROUTE110
diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc
index ae6de093d..02dfa58bc 100644
--- a/data/maps/Route110_TrickHousePuzzle1/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/events.inc
@@ -2,18 +2,18 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88
 	object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0
 	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0
 	object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0
-	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19
-	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18
-	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20
-	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23
-	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22
-	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21
-	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25
-	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_13
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_12
+	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_14
+	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_17
+	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_16
+	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_15
+	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_19
+	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_18
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1B
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E
 
 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc
index 0e8d3607b..e49d391e6 100644
--- a/data/maps/Route110_TrickHousePuzzle2/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/events.inc
@@ -2,8 +2,8 @@ Route110_TrickHousePuzzle2_EventObjects: @ 853E128
 	object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0
 	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0
 	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL
 
 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc
index 38063f98d..118667076 100644
--- a/data/maps/Route110_TrickHousePuzzle3/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/events.inc
@@ -2,10 +2,10 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218
 	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0
 	object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0
 	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16
 
 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc
index f5406539f..4bad58814 100644
--- a/data/maps/Route110_TrickHousePuzzle4/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/events.inc
@@ -2,17 +2,17 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338
 	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0
 	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20
-	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21
-	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22
-	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23
-	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24
-	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25
-	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_11
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_12
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_13
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_14
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_15
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_16
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_17
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_18
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19
+	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A
 
 Route110_TrickHousePuzzle4_MapWarps: @ 853E488
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc
index 72fc4fbc6..f172622ea 100644
--- a/data/maps/Route110_TrickHousePuzzle6/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/events.inc
@@ -2,7 +2,7 @@ Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0
 	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0
 	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL
 
 Route110_TrickHousePuzzle6_MapWarps: @ 853E730
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc
index 62a52420b..d29c76263 100644
--- a/data/maps/Route110_TrickHousePuzzle7/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/events.inc
@@ -2,7 +2,7 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768
 	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0
 	object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0
 	object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL
 	object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0
 	object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0
 	object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0
diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc
index 8dff961ac..909c8cbfd 100644
--- a/data/maps/Route110_TrickHousePuzzle8/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/events.inc
@@ -2,7 +2,7 @@ Route110_TrickHousePuzzle8_EventObjects: @ 853E908
 	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0
 	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL
 
 Route110_TrickHousePuzzle8_MapWarps: @ 853E968
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc
index 93767ff41..46e3b067b 100644
--- a/data/maps/Route111/events.inc
+++ b/data/maps/Route111/events.inc
@@ -1,8 +1,8 @@
 Route111_EventObjects: @ 85291F0
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 769
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 770
-	object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 771
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
+	object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
 	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0
 	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0
 	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0
@@ -11,27 +11,27 @@ Route111_EventObjects: @ 85291F0
 	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0
 	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0
 	object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1F1249, 0
-	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796
-	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796
-	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 17
-	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 18
+	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
+	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_12
 	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, FLAG_ITEM_ROUTE_111_TM_37
 	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, BerryTreeScript, 0
 	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, BerryTreeScript, 0
-	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, 799
-	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799
-	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, 903
-	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, 903
-	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009
-	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010
-	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, 19
+	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
+	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
+	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
+	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, FLAG_ITEM_ROUTE_111_STARDUST
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, FLAG_ITEM_ROUTE_111_HP_UP
+	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, FLAG_TEMP_13
 	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0
 	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0
 	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0
 	object_event 31, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0
 	object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0
-	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, 960
+	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN
 	object_event 34, EVENT_OBJ_GFX_MAN_4, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0
 	object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0
 	object_event 36, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0
@@ -40,11 +40,11 @@ Route111_EventObjects: @ 85291F0
 	object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0
 	object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0
 	object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0
-	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, 1142
+	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR
 	object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0
-	object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 876
-	object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 875
-	object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, 843
+	object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
+	object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_RIVAL
+	object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY
 
 Route111_MapWarps: @ 8529640
 	warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE
@@ -100,13 +100,13 @@ Route111_MapBGEvents: @ 8529888
 	bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177
 	bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3
 	bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3
-	bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, 2
+	bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST
 	bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3
 	bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180
 	bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4
 	bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1
-	bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, 56
-	bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, 57
+	bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN
+	bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY
 	bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C
 
 Route111_MapEvents:: @ 8529960
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 6be0eba1d..b339ee5de 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -89,10 +89,10 @@ Route111_EventScript_1F0E25:: @ 81F0E25
 	return
 
 Route111_EventScript_1F0E26:: @ 81F0E26
-	clearflag FLAG_0x300
-	setflag FLAG_0x301
-	setflag FLAG_0x302
-	setflag FLAG_0x303
+	clearflag FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE
+	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
+	setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
 	cleartrainerflag TRAINER_VICTOR
 	cleartrainerflag TRAINER_VICTORIA
 	cleartrainerflag TRAINER_VIVI
@@ -137,7 +137,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60
 	special sub_81BEB7C
 	waitstate
 	setvar VAR_0x40CB, 2
-	clearflag FLAG_0x36A
+	clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
 	checkflag FLAG_0x150
 	goto_eq Route111_EventScript_1F0EA7
 	msgbox Route111_Text_1F1C74, 4
diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index 847119d2e..13a897692 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
@@ -40,10 +40,10 @@ Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD
 	lock
 	faceplayer
 	setvar VAR_0x8008, 4
-	checkflag FLAG_0x004
+	checkflag FLAG_TEMP_4
 	goto_eq Route111_WinstrateFamilysHouse_EventScript_22A51E
 	msgbox Route111_WinstrateFamilysHouse_Text_22A780, 4
-	setflag FLAG_0x004
+	setflag FLAG_TEMP_4
 	goto Route111_WinstrateFamilysHouse_EventScript_22A52C
 	end
 
diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc
index 123385208..cfa145e97 100644
--- a/data/maps/Route112/events.inc
+++ b/data/maps/Route112/events.inc
@@ -1,16 +1,16 @@
 Route112_EventObjects: @ 8529974
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA
 	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0
 	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0
 	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0
 	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA
 	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0
 	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0
 	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0
 	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0
 	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_ITEM_ROUTE_112_NUGGET
 	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0
 	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0
 
diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc
index 21bae5dc6..b2481d6ed 100644
--- a/data/maps/Route113/events.inc
+++ b/data/maps/Route113/events.inc
@@ -4,13 +4,13 @@ Route113_EventObjects: @ 8529B2C
 	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0
 	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_ITEM_ROUTE_113_MAX_ETHER
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_ITEM_ROUTE_113_SUPER_REPEL
 	object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0
 	object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0
 	object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0
 	object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_ITEM_ROUTE_113_HYPER_POTION
 	object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0
 	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0
 	object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0
@@ -48,9 +48,9 @@ Route113_MapBGEvents: @ 8529DF4
 	bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7
 	bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE
 	bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3
-	bg_hidden_item_event 66, 3, 3, ITEM_ETHER, 3
-	bg_hidden_item_event 22, 5, 3, ITEM_TM32, 30
-	bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, 98
+	bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER
+	bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32
+	bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET
 
 Route113_MapEvents:: @ 8529E54
 	map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc
index 910d5e004..55ea12195 100644
--- a/data/maps/Route114/events.inc
+++ b/data/maps/Route114/events.inc
@@ -7,24 +7,24 @@ Route114_EventObjects: @ 8529E68
 	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0
 	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0
 	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, 1014
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, 1015
-	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, 17
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, FLAG_ITEM_ROUTE_114_RARE_CANDY
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, FLAG_ITEM_ROUTE_114_PROTEIN
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_11
 	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0
 	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0
 	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0
 	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0
 	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0
 	object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0
-	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 18
-	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 19
-	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 20
-	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 21
+	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_12
+	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_13
+	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_14
+	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_15
 	object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0
 	object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0
 	object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0
 	object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0
-	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, 1160
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER
 	object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0
 
 Route114_MapWarps: @ 852A0F0
@@ -44,9 +44,9 @@ Route114_MapBGEvents: @ 852A118
 	bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2
 	bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2
 	bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637
-	bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, 4
+	bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS
 	bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3
-	bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, 42
+	bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE
 
 Route114_MapEvents:: @ 852A1A8
 	map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc
index 15b016bba..17030ddc1 100644
--- a/data/maps/Route114_LanettesHouse/events.inc
+++ b/data/maps/Route114_LanettesHouse/events.inc
@@ -1,5 +1,5 @@
 Route114_LanettesHouse_EventObjects: @ 8533DD4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE
 
 Route114_LanettesHouse_MapWarps: @ 8533DEC
 	warp_def 5, 7, 0, 2, MAP_ROUTE114
diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc
index c79c836ea..18179deb1 100644
--- a/data/maps/Route115/events.inc
+++ b/data/maps/Route115/events.inc
@@ -8,20 +8,20 @@ Route115_EventObjects: @ 852A1BC
 	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0
 	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0
 	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, 1017
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, 1018
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, FLAG_ITEM_ROUTE_115_SUPER_POTION
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, FLAG_ITEM_ROUTE_115_TM_01
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, FLAG_ITEM_ROUTE_115_IRON
 	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0
 	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0
-	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, 17
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, 1118
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, FLAG_ITEM_ROUTE_115_GREAT_BALL
 	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0
 	object_event 18, EVENT_OBJ_GFX_NINJA_BOY, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0
 	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0
 	object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0
 	object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161
-	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER
 
 Route115_MapWarps: @ 852A3E4
 	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
@@ -42,7 +42,7 @@ Route115_MapBGEvents: @ 852A3FC
 	bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3
 	bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3
 	bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1
-	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, 97
+	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE
 
 Route115_MapEvents:: @ 852A4A4
 	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc
index f967ebbba..37c54eb7e 100644
--- a/data/maps/Route116/events.inc
+++ b/data/maps/Route116/events.inc
@@ -2,29 +2,29 @@ Route116_EventObjects: @ 852A4B8
 	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0
 	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0
 	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0
-	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 17
-	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 18
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_11
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_12
 	object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, 1019
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, 1020
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, FLAG_ITEM_ROUTE_116_ETHER
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, FLAG_ITEM_ROUTE_116_REPEL
 	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0
 	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 19
+	object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, FLAG_HIDE_ROUTE_116_MR_BRINEY
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_13
 	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 20
-	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_14
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, FLAG_ITEM_ROUTE_116_HP_UP
 	object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0
 	object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0
 	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0
-	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, 1001
-	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894
-	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813
+	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, FLAG_ITEM_ROUTE_116_X_SPECIAL
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, FLAG_HIDE_ROUTE_116_TUNNELER
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN
 	object_event 23, EVENT_OBJ_GFX_WOMAN_2, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0
 	object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0
-	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146
-	object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, 21
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, FLAG_ITEM_ROUTE_116_POTION
+	object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_15
 	object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0
 	object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0
 
@@ -48,8 +48,8 @@ Route116_MapBGEvents: @ 852A790
 	bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B
 	bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2
 	bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2
-	bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, 45
-	bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, 96
+	bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION
+	bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES
 
 Route116_MapEvents:: @ 852A814
 	map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index 769d254a5..a2bf4d9e0 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -76,7 +76,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB
 	compare VAR_FACING, 4
 	call_if 1, Route116_EventScript_1F2D20
 	removeobject VAR_LAST_TALKED
-	clearflag FLAG_0x3B5
+	clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
 	setflag FLAG_0x100
 	release
 	end
diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc
index 0a1e6bead..4cede4040 100644
--- a/data/maps/Route117/events.inc
+++ b/data/maps/Route117/events.inc
@@ -12,9 +12,9 @@ Route117_EventObjects: @ 852A828
 	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0
 	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0
 	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0
-	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, 17
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023
+	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, FLAG_ITEM_ROUTE_117_GREAT_BALL
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, FLAG_ITEM_ROUTE_117_REVIVE
 	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0
 	object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0
 	object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0
@@ -31,7 +31,7 @@ Route117_MapBGEvents: @ 852AA70
 	bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5
 	bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE
 	bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7
-	bg_hidden_item_event 3, 18, 3, ITEM_REPEL, 72
+	bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL
 
 Route117_MapEvents:: @ 852AAA0
 	map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc
index 19d36d602..fe131549f 100644
--- a/data/maps/Route118/events.inc
+++ b/data/maps/Route118/events.inc
@@ -3,22 +3,22 @@ Route118_EventObjects: @ 852AAB4
 	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0
 	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0
 	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0
-	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, 797
-	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, 797
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
+	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0
-	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, 901
-	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901
-	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, 904
-	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, 904
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, 17
+	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
+	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11
 	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0
 	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0
 	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0
 	object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0
 	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0
 	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0
-	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 966
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121
+	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_118_STEVEN
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION
 	object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0
 
 Route118_MapWarps: @ 852ACAC
@@ -38,8 +38,8 @@ Route118_MapBGEvents: @ 852ACEC
 	bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2
 	bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3
 	bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1
-	bg_hidden_item_event 31, 13, 3, ITEM_IRON, 67
-	bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, 66
+	bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON
+	bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE
 
 Route118_MapEvents:: @ 852AD58
 	map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc
index 1abed81eb..3a7d1422b 100644
--- a/data/maps/Route119/events.inc
+++ b/data/maps/Route119/events.inc
@@ -14,34 +14,34 @@ Route119_EventObjects: @ 852AD6C
 	object_event 13, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0
 	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0
 	object_event 15, EVENT_OBJ_GFX_MAN_5, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0
-	object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 851
-	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, 1025
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, 1027
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, 1028
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, 1029
-	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890
-	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890
-	object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 923
+	object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL
+	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, FLAG_ITEM_ROUTE_119_SUPER_REPEL
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, FLAG_ITEM_ROUTE_119_ZINC
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, FLAG_ITEM_ROUTE_119_ELIXIR_1
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, FLAG_ITEM_ROUTE_119_LEAF_STONE
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, FLAG_ITEM_ROUTE_119_RARE_CANDY
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, FLAG_ITEM_ROUTE_119_HYPER_POTION_1
+	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+	object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
 	object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0
 	object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0
 	object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0
 	object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0
 	object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0
 	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0
-	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, FLAG_ITEM_ROUTE_119_HYPER_POTION_2
 	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0
 	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0
-	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, 989
-	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, 990
+	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, FLAG_HIDE_ROUTE_119_KECLEON_1
+	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, FLAG_HIDE_ROUTE_119_KECLEON_2
 	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0
 	object_event 38, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0
 	object_event 39, EVENT_OBJ_GFX_MAN_5, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0
 	object_event 40, EVENT_OBJ_GFX_MAN_5, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0
-	object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, 1134
-	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147
-	object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 786
+	object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, FLAG_ITEM_ROUTE_119_NUGGET
+	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2
+	object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT
 
 Route119_MapWarps: @ 852B174
 	warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F
@@ -83,15 +83,15 @@ Route119_MapBGEvents: @ 852B2F4
 	bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1
 	bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3
 	bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3
-	bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, 5
-	bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, 6
+	bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM
+	bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL
 	bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3
 	bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3
 	bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3
 	bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3
 	bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3
-	bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, 68
-	bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, 87
+	bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL
+	bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER
 	bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3
 
 Route119_MapEvents:: @ 852B3E4
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index f2e52d50c..bf3abf9f8 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -24,8 +24,8 @@ Route119_MapScript1_1F444D: @ 81F444D
 	end
 
 Route119_EventScript_1F4466:: @ 81F4466
-	setflag FLAG_0x37D
-	clearflag FLAG_0x37C
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
 	setvar VAR_WEATHER_INSTITUTE_STATE, 2
 	return
 
diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc
index a46081332..6d72fea9c 100644
--- a/data/maps/Route119_WeatherInstitute_1F/events.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/events.inc
@@ -1,8 +1,8 @@
 Route119_WeatherInstitute_1F_EventObjects: @ 853EB20
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
 	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0
 
 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98
diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
index ae7f8b9fc..d2cc64d40 100644
--- a/data/maps/Route119_WeatherInstitute_2F/events.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
@@ -1,12 +1,12 @@
 Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
 	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 992
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA
 
 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4
 	warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index b2341bf3d..fb0c4ca54 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -63,11 +63,11 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
 	msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4
 	closemessage
 	setvar VAR_WEATHER_INSTITUTE_STATE, 1
-	clearflag FLAG_0x37D
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
 	fadedefaultbgm
 	fadescreen 1
-	setflag FLAG_0x37A
-	setflag FLAG_0x3E0
+	setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
 	removeobject 1
 	removeobject 2
 	removeobject 3
@@ -146,7 +146,7 @@ Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A
 	call_if 1, Route119_WeatherInstitute_2F_EventScript_270160
 	compare VAR_0x8004, 2
 	goto_eq Route119_WeatherInstitute_2F_EventScript_270166
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	call_if 0, Route119_WeatherInstitute_2F_EventScript_270159
 	specialvar VAR_RESULT, sub_813B374
 	compare VAR_RESULT, 1
@@ -162,7 +162,7 @@ Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F
 
 Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159
 	special sub_813B2E4
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	return
 
 Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160
diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc
index 717e75055..4400081f7 100644
--- a/data/maps/Route120/events.inc
+++ b/data/maps/Route120/events.inc
@@ -14,35 +14,35 @@ Route120_EventObjects: @ 852B3F8
 	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0
 	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0
 	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, 1030
-	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, 798
-	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, 798
-	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, 902
-	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, 902
-	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, 17
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, 1031
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, FLAG_ITEM_ROUTE_120_NUGGET
+	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
+	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
+	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
+	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
+	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_11
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, FLAG_ITEM_ROUTE_120_FULL_HEAL
 	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0
 	object_event 24, EVENT_OBJ_GFX_WOMAN_5, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
 	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0
 	object_event 26, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
 	object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, 1107
-	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970
-	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, 972
-	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 20
-	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 18
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, FLAG_ITEM_ROUTE_120_NEST_BALL
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, FLAG_ITEM_ROUTE_120_HYPER_POTION
+	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, FLAG_HIDE_ROUTE_120_KECLEON_1
+	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_0x3CC
+	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_14
+	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_12
 	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
 	object_event 35, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
-	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 981
-	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, 982
-	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, 985
-	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, 986
-	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, 988
-	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, 987
+	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE
+	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, FLAG_HIDE_ROUTE_120_KECLEON_2
+	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, FLAG_HIDE_ROUTE_120_KECLEON_3
+	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, FLAG_HIDE_ROUTE_120_KECLEON_4
+	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, FLAG_HIDE_ROUTE_120_KECLEON_6
+	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, FLAG_HIDE_ROUTE_120_KECLEON_5
 	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0
 	object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
-	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148
+	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE
 
 Route120_MapWarps: @ 852B818
 	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
@@ -79,10 +79,10 @@ Route120_MapBGEvents: @ 852B958
 	bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3
 	bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3
 	bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3
-	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, 71
-	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, 84
-	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, 69
-	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, 70
+	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1
+	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE
+	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2
+	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC
 	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
 
 Route120_MapEvents:: @ 852BA00
diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc
index b252be7a0..4f27079a6 100644
--- a/data/maps/Route121/events.inc
+++ b/data/maps/Route121/events.inc
@@ -10,24 +10,24 @@ Route121_EventObjects: @ 852BA14
 	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0
 	object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0
 	object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0
-	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 914
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 914
-	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 914
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 17
-	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 18
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_0x392
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_0x392
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_0x392
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_12
 	object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0
 	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0
 	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0
 	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, 1103
-	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, 19
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_ITEM_ROUTE_121_CARBOS
+	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_13
 	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0
 	object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0
 	object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0
 	object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0
 	object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, 1149
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC
 
 Route121_MapWarps: @ 852BCCC
 	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
@@ -45,10 +45,10 @@ Route121_MapBGEvents: @ 852BD14
 	bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2
 	bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2
 	bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F
-	bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, 39
-	bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, 40
-	bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, 73
-	bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, 100
+	bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP
+	bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET
+	bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL
+	bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE
 
 Route121_MapEvents:: @ 852BD8C
 	map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc
index c1a7e57f8..d45ac0222 100644
--- a/data/maps/Route123/events.inc
+++ b/data/maps/Route123/events.inc
@@ -16,10 +16,10 @@ Route123_EventObjects: @ 852BDBC
 	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0
 	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0
 	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0
-	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 17
-	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 18
-	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 19
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032
+	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_11
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_12
+	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_13
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, FLAG_ITEM_ROUTE_123_CALCIUM
 	object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0
 	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0
 	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0
@@ -30,18 +30,18 @@ Route123_EventObjects: @ 852BDBC
 	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0
 	object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0
 	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0
-	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104
-	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, FLAG_ITEM_ROUTE_123_ULTRA_BALL
+	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, FLAG_ITEM_ROUTE_123_ELIXIR
 	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0
 	object_event 35, EVENT_OBJ_GFX_WOMAN_2, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0
 	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0
 	object_event 37, EVENT_OBJ_GFX_MAN_5, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0
 	object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0
 	object_event 39, EVENT_OBJ_GFX_EXPERT_M, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0
-	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152
+	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, FLAG_ITEM_ROUTE_123_PP_UP
 	object_event 41, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0
 	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0
-	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153
+	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB
 
 Route123_MapWarps: @ 852C1C4
 	warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE
@@ -75,13 +75,13 @@ Route123_MapBGEvents: @ 852C32C
 	bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2
 	bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2
 	bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA
-	bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, 7
+	bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL
 	bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC
 	bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3
-	bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, 41
-	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, 74
-	bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, 99
-	bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, 110
+	bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE
+	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION
+	bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP
+	bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY
 
 Route123_MapEvents:: @ 852C3B0
 	map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc
index 30ff07ee9..4b52615fc 100644
--- a/data/maps/Route124/events.inc
+++ b/data/maps/Route124/events.inc
@@ -4,9 +4,9 @@ Route124_EventObjects: @ 852C3C4
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0
 	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, 1066
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD
 	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0
 	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0
 	object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0
diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc
index 2a408aec6..256802406 100644
--- a/data/maps/Route125/events.inc
+++ b/data/maps/Route125/events.inc
@@ -8,7 +8,7 @@ Route125_EventObjects: @ 852C50C
 	object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0
 	object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0
 	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, 1154
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL
 
 Route125_MapWarps: @ 852C5FC
 	warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc
index 0c3180a79..8754a0006 100644
--- a/data/maps/Route126/events.inc
+++ b/data/maps/Route126/events.inc
@@ -3,7 +3,7 @@ Route126_EventObjects: @ 852C648
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, 1105
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, FLAG_ITEM_ROUTE_126_GREEN_SHARD
 	object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0
 	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0
 	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0
diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc
index bb434202b..78dc26899 100644
--- a/data/maps/Route127/events.inc
+++ b/data/maps/Route127/events.inc
@@ -1,15 +1,15 @@
 Route127_EventObjects: @ 852C734
 	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, 1034
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, 1035
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, FLAG_ITEM_ROUTE_127_CARBOS
 	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0
 	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0
 	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0
 	object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
 	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0
 	object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY
 
 Route127_MapBGEvents: @ 852C83C
 	bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1
diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc
index 5c0b82cee..792ff5ca3 100644
--- a/data/maps/Route128/events.inc
+++ b/data/maps/Route128/events.inc
@@ -1,9 +1,9 @@
 Route128_EventObjects: @ 852C88C
 	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0
-	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 834
-	object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 944
-	object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 945
+	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN
+	object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_ARCHIE
+	object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_MAXIE
 	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0
 	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0
 	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0
@@ -11,9 +11,9 @@ Route128_EventObjects: @ 852C88C
 	object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0
 
 Route128_MapBGEvents: @ 852C97C
-	bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, 92
-	bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, 93
-	bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, 94
+	bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1
+	bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2
+	bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3
 
 Route128_MapEvents:: @ 852C9A0
 	map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents
diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc
index 227e359b6..97532e576 100644
--- a/data/maps/Route130/events.inc
+++ b/data/maps/Route130/events.inc
@@ -1,7 +1,7 @@
 Route130_EventObjects: @ 852CA40
 	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, 17
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0
 
 Route130_MapEvents:: @ 852CAA0
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 26278cf50..2d860050b 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -8,21 +8,21 @@ Route130_MapScript1_1F7365: @ 81F7365
 	specialvar VAR_RESULT, IsMirageIslandPresent
 	compare VAR_RESULT, 1
 	goto_eq Route130_EventScript_1F73B1
-	setflag FLAG_0x011
-	setflag FLAG_0x012
-	setflag FLAG_0x013
-	setflag FLAG_0x014
-	setflag FLAG_0x015
-	setflag FLAG_0x016
-	setflag FLAG_0x017
-	setflag FLAG_0x018
-	setflag FLAG_0x019
-	setflag FLAG_0x01A
-	setflag FLAG_0x01B
-	setflag FLAG_0x01C
-	setflag FLAG_0x01D
-	setflag FLAG_0x01E
-	setflag FLAG_0x01F
+	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
 	setmaplayoutindex 263
 	end
 
diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc
index 817d7b038..da648b925 100644
--- a/data/maps/Route132/events.inc
+++ b/data/maps/Route132/events.inc
@@ -1,14 +1,14 @@
 Route132_EventObjects: @ 852CB90
 	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, 1036
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY
 	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0
 	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0
 	object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0
 	object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0
 	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0
 	object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, 1156
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN
 
 Route132_MapEvents:: @ 852CC80
 	map_events Route132_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc
index b1cbb4bb1..36f8b747d 100644
--- a/data/maps/Route133/events.inc
+++ b/data/maps/Route133/events.inc
@@ -2,13 +2,13 @@ Route133_EventObjects: @ 852CC94
 	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, 1037
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, 1038
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_ITEM_ROUTE_133_BIG_PEARL
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_ITEM_ROUTE_133_STAR_PIECE
 	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0
 	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0
 	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0
 	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, 1157
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE
 
 Route133_MapEvents:: @ 852CD84
 	map_events Route133_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc
index 4201b8068..8caf4da1e 100644
--- a/data/maps/Route134/events.inc
+++ b/data/maps/Route134/events.inc
@@ -8,8 +8,8 @@ Route134_EventObjects: @ 852CD98
 	object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0
 	object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0
 	object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE
 
 Route134_MapEvents:: @ 852CEA0
 	map_events Route134_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc
index 2f14304ba..48d125d0f 100644
--- a/data/maps/RustboroCity/events.inc
+++ b/data/maps/RustboroCity/events.inc
@@ -7,13 +7,13 @@ RustboroCity_EventObjects: @ 85267E0
 	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0
 	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0
 	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732
-	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 731
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
+	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT
 	object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND
 	object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0
-	object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814
-	object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 844
+	object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL
+	object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
 	object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0
 
 RustboroCity_MapWarps: @ 8526960
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index f4c8d5434..e79c8ef45 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -98,7 +98,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
 	waitmovement 0
 	playse SE_KAIDAN
 	removeobject 15
-	setflag FLAG_0x34C
+	setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
 	setvar VAR_0x405A, 7
 	clearflag FLAG_SPECIAL_FLAG_0x4000
 	releaseall
@@ -303,16 +303,16 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
 	fadedefaultbgm
 	removeobject 9
 	setobjectxyperm 9, 30, 10
-	clearflag FLAG_0x2DC
+	clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
 	setflag FLAG_0x08E
 	setvar VAR_0x405A, 2
 	setvar VAR_RUSTURF_TUNNEL_STATE, 2
 	setvar VAR_0x406F, 1
-	clearflag FLAG_0x37B
-	clearflag FLAG_0x370
-	clearflag FLAG_0x36E
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
+	clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY
+	clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
+	clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	releaseall
 	end
 
@@ -599,7 +599,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
 	msgbox RustboroCity_Text_1E1A21, 4
 	closemessage
 	setflag FLAG_0x090
-	setflag FLAG_0x2DC
+	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
 	setvar VAR_0x405A, 5
 	delay 30
 	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc
index 164391cf6..df8ba0293 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/events.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc
@@ -1,6 +1,6 @@
 RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC
 	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
 	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0
 
 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index ffc2614cb..e3ecb3db0 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -55,18 +55,18 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
 	waitfanfare
 	setflag FLAG_SYS_POKENAV_GET
 	setflag FLAG_0x0BC
-	setflag FLAG_0x3E7
+	setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT
 	msgbox RustboroCity_DevonCorp_3F_Text_212837, 4
 	closemessage
 	call RustboroCity_DevonCorp_3F_EventScript_272083
 	msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4
-	setflag FLAG_0x37E
-	clearflag FLAG_0x327
-	clearflag FLAG_0x3D7
-	clearflag FLAG_0x2E3
-	clearflag FLAG_0x371
+	setflag FLAG_HIDE_ROUTE_116_TUNNELER
+	clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
+	clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setvar VAR_0x4096, 1
-	clearflag FLAG_0x32E
+	clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL
 	setvar VAR_0x408F, 1
 	setvar VAR_0x405A, 6
 	releaseall
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
index f1f9fe356..346a4de16 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0
 	warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc
index d32f8ad46..0c6ca19dc 100644
--- a/data/maps/RustboroCity_PokemonSchool/events.inc
+++ b/data/maps/RustboroCity_PokemonSchool/events.inc
@@ -5,7 +5,7 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC
 	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0
 	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0
 	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0
-	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999
+	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT
 
 RustboroCity_PokemonSchool_MapWarps: @ 8530694
 	warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY
diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc
index 5d3f3c8be..292bda57d 100644
--- a/data/maps/RusturfTunnel/events.inc
+++ b/data/maps/RusturfTunnel/events.inc
@@ -1,14 +1,14 @@
 RusturfTunnel_EventObjects: @ 85341C4
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807
-	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049
-	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 879
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878
-	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER
+	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2
 	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983
+	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
 
 RusturfTunnel_MapWarps: @ 85342B4
 	warp_def 4, 10, 3, 0, MAP_ROUTE116
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 33e87bda5..86f9c3b2f 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -31,9 +31,9 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
 RusturfTunnel_EventScript_22CE76:: @ 822CE76
 	lock
 	faceplayer
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq RusturfTunnel_EventScript_22CE99
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	msgbox RusturfTunnel_Text_22D510, 4
 	closemessage
 	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
@@ -348,7 +348,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
 	setflag FLAG_0x08F
 	setvar VAR_0x405A, 4
 	setvar VAR_0x4090, 1
-	setflag FLAG_0x37B
+	setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
 	release
 	end
 
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc
index 6ed455cad..c36e38fda 100644
--- a/data/maps/SSTidalCorridor/events.inc
+++ b/data/maps/SSTidalCorridor/events.inc
@@ -1,9 +1,9 @@
 SSTidalCorridor_EventObjects: @ 853A158
 	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0
 	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950
-	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 810
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT
 
 SSTidalCorridor_MapWarps: @ 853A1D0
 	warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index 8fcd6e59b..d53973e87 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -143,7 +143,7 @@ SSTidalCorridor_EventScript_23C15A:: @ 823C15A
 	end
 
 SSTidalCorridor_EventScript_23C179:: @ 823C179
-	setflag FLAG_0x3B7
+	setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
 	return
 
 SSTidalCorridor_EventScript_23C17D:: @ 823C17D
diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc
index be32d9ad4..65ced7c13 100644
--- a/data/maps/SSTidalLowerDeck/events.inc
+++ b/data/maps/SSTidalLowerDeck/events.inc
@@ -6,7 +6,7 @@ SSTidalLowerDeck_MapWarps: @ 853A2EC
 	warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
 
 SSTidalLowerDeck_MapBGEvents: @ 853A2F4
-	bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, 35
+	bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS
 
 SSTidalLowerDeck_MapEvents:: @ 853A300
 	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc
index cca2bc821..99937ef75 100644
--- a/data/maps/SSTidalRooms/events.inc
+++ b/data/maps/SSTidalRooms/events.inc
@@ -6,7 +6,7 @@ SSTidalRooms_EventObjects: @ 853A314
 	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0
 	object_event 6, EVENT_OBJ_GFX_RICH_BOY, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0
 	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0
-	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, 951
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
 
 SSTidalRooms_MapWarps: @ 853A3D4
 	warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc
index 11e4b2e28..152fa54c5 100644
--- a/data/maps/SafariZone_North/events.inc
+++ b/data/maps/SafariZone_North/events.inc
@@ -1,13 +1,13 @@
 SafariZone_North_EventObjects: @ 853B160
 	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, 1119
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_12
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_13
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_14
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_15
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM
 
 SafariZone_North_MapEvents:: @ 853B238
 	map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc
index a3d1ad0a3..dc0393b4d 100644
--- a/data/maps/SafariZone_Northeast/events.inc
+++ b/data/maps/SafariZone_Northeast/events.inc
@@ -1,17 +1,17 @@
 SafariZone_Northeast_EventObjects: @ 853B968
 	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15
 	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_13
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_11
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_14
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET
 
 SafariZone_Northeast_MapBGEvents: @ 853BA40
-	bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, 106
-	bg_hidden_item_event 21, 5, 3, ITEM_ZINC, 107
+	bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY
+	bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC
 
 SafariZone_Northeast_MapEvents:: @ 853BA58
 	map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents
diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc
index c43db4125..95b6623ac 100644
--- a/data/maps/SafariZone_Northwest/events.inc
+++ b/data/maps/SafariZone_Northwest/events.inc
@@ -1,6 +1,6 @@
 SafariZone_Northwest_EventObjects: @ 853B11C
 	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22
 
 SafariZone_Northwest_MapEvents:: @ 853B14C
 	map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc
index 21626d410..6d8d84877 100644
--- a/data/maps/SafariZone_South/events.inc
+++ b/data/maps/SafariZone_South/events.inc
@@ -3,8 +3,8 @@ SafariZone_South_EventObjects: @ 853B2A4
 	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0
-	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717
-	object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
+	object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
 
 SafariZone_South_MapWarps: @ 853B334
 	warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc
index d1be808cc..badaaefd4 100644
--- a/data/maps/SafariZone_Southeast/events.inc
+++ b/data/maps/SafariZone_Southeast/events.inc
@@ -2,12 +2,12 @@ SafariZone_Southeast_EventObjects: @ 853BA6C
 	object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0
 	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0
 	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170
-	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
 
 SafariZone_Southeast_MapBGEvents: @ 853BAE4
-	bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, 108
-	bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, 105
+	bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP
+	bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE
 
 SafariZone_Southeast_MapEvents:: @ 853BAFC
 	map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents
diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc
index f4750621d..930d3c8ed 100644
--- a/data/maps/SafariZone_Southwest/events.inc
+++ b/data/maps/SafariZone_Southwest/events.inc
@@ -1,6 +1,6 @@
 SafariZone_Southwest_EventObjects: @ 853B24C
 	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE
 
 SafariZone_Southwest_MapWarps: @ 853B27C
 	warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE
diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc
index 5bbe88c20..20a5fc145 100644
--- a/data/maps/ScorchedSlab/events.inc
+++ b/data/maps/ScorchedSlab/events.inc
@@ -1,5 +1,5 @@
 ScorchedSlab_EventObjects: @ 8536F88
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11
 
 ScorchedSlab_MapWarps: @ 8536FA0
 	warp_def 7, 16, 1, 1, MAP_ROUTE120
diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc
index 11a8211de..b0574d14e 100644
--- a/data/maps/SeafloorCavern_Entrance/events.inc
+++ b/data/maps/SeafloorCavern_Entrance/events.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Entrance_EventObjects: @ 85356BC
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT
 
 SeafloorCavern_Entrance_MapWarps: @ 85356D4
 	warp_def 10, 18, 3, 0, MAP_UNDERWATER4
diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc
index 2c8e51e30..2c507151b 100644
--- a/data/maps/SeafloorCavern_Room1/events.inc
+++ b/data/maps/SeafloorCavern_Room1/events.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room1_EventObjects: @ 85356F8
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
 
 SeafloorCavern_Room1_MapWarps: @ 8535770
 	warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc
index 82f924121..1cc30957a 100644
--- a/data/maps/SeafloorCavern_Room2/events.inc
+++ b/data/maps/SeafloorCavern_Room2/events.inc
@@ -1,12 +1,12 @@
 SeafloorCavern_Room2_EventObjects: @ 853579C
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_15
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_16
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_18
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17
 
 SeafloorCavern_Room2_MapWarps: @ 853585C
 	warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1
diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc
index 9a1399705..e48782693 100644
--- a/data/maps/SeafloorCavern_Room3/events.inc
+++ b/data/maps/SeafloorCavern_Room3/events.inc
@@ -1,13 +1,13 @@
 SeafloorCavern_Room3_EventObjects: @ 8535890
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_16
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_17
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_18
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_19
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
 
 SeafloorCavern_Room3_MapWarps: @ 8535968
 	warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8
diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc
index e67cb0d5b..c4e96aee0 100644
--- a/data/maps/SeafloorCavern_Room4/events.inc
+++ b/data/maps/SeafloorCavern_Room4/events.inc
@@ -1,6 +1,6 @@
 SeafloorCavern_Room4_EventObjects: @ 8535994
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
 
 SeafloorCavern_Room4_MapWarps: @ 85359C4
 	warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2
diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc
index f0c69175b..e4780db22 100644
--- a/data/maps/SeafloorCavern_Room5/events.inc
+++ b/data/maps/SeafloorCavern_Room5/events.inc
@@ -1,10 +1,10 @@
 SeafloorCavern_Room5_EventObjects: @ 85359F8
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_15
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14
 
 SeafloorCavern_Room5_MapWarps: @ 8535A88
 	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1
diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc
index d69b12f7e..c34ec76d3 100644
--- a/data/maps/SeafloorCavern_Room8/events.inc
+++ b/data/maps/SeafloorCavern_Room8/events.inc
@@ -1,16 +1,16 @@
 SeafloorCavern_Room8_EventObjects: @ 8535B04
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24
-	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25
-	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26
-	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27
-	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_14
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_15
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_16
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_17
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_18
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_19
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1A
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C
 
 SeafloorCavern_Room8_MapWarps: @ 8535C24
 	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9
diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc
index 2fb2d069b..6ca415e12 100644
--- a/data/maps/SeafloorCavern_Room9/events.inc
+++ b/data/maps/SeafloorCavern_Room9/events.inc
@@ -1,11 +1,11 @@
 SeafloorCavern_Room9_EventObjects: @ 8535C48
-	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 859
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 828
-	object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 829
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090
-	object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 733
+	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
+	object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26
+	object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2
 
 SeafloorCavern_Room9_MapWarps: @ 8535CF0
 	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index cbfbccfe4..8761e4bfe 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -120,26 +120,26 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	msgbox SeafloorCavern_Room9_Text_235723, 4
 	setvar VAR_0x407B, 1
 	setvar VAR_0x405E, 1
-	clearflag FLAG_0x3CD
-	clearflag FLAG_0x33A
-	clearflag FLAG_0x33B
-	clearflag FLAG_0x356
-	clearflag FLAG_0x3E6
-	clearflag FLAG_0x3E5
-	setflag FLAG_0x347
+	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
+	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
+	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
+	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
+	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON
+	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1
 	setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
-	clearflag FLAG_0x3B0
-	clearflag FLAG_0x3B1
+	clearflag FLAG_HIDE_ROUTE_128_ARCHIE
+	clearflag FLAG_HIDE_ROUTE_128_MAXIE
 	setflag FLAG_SYS_WEATHER_CTRL
 	setflag FLAG_0x081
-	setflag FLAG_0x3C7
+	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
 	setvar VAR_0x40C6, 2
 	setvar VAR_0x40A2, 1
-	setflag FLAG_0x33C
-	setflag FLAG_0x33D
-	setflag FLAG_0x33F
-	setflag FLAG_0x35B
-	setflag FLAG_0x3B2
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
 	setflag FLAG_SPECIAL_FLAG_0x4000
 	warp MAP_ROUTE128, 255, 38, 22
 	waitstate
diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc
index 606999612..87361e082 100644
--- a/data/maps/SecretBase_BlueCave1/events.inc
+++ b/data/maps/SecretBase_BlueCave1/events.inc
@@ -1,19 +1,19 @@
 SecretBase_BlueCave1_EventObjects: @ 8537BEC
-	object_event 1, 255, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_BlueCave1_MapWarps: @ 8537D54
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc
index 0991d03e2..ad584e2bb 100644
--- a/data/maps/SecretBase_BlueCave2/events.inc
+++ b/data/maps/SecretBase_BlueCave2/events.inc
@@ -1,19 +1,19 @@
 SecretBase_BlueCave2_EventObjects: @ 8538504
-	object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_BlueCave2_MapWarps: @ 853866C
 	warp_def 7, 5, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc
index e0bd13a3b..af85949d3 100644
--- a/data/maps/SecretBase_BlueCave3/events.inc
+++ b/data/maps/SecretBase_BlueCave3/events.inc
@@ -1,19 +1,19 @@
 SecretBase_BlueCave3_EventObjects: @ 8538E1C
-	object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_BlueCave3_MapWarps: @ 8538F84
 	warp_def 4, 15, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc
index 15266e18b..6ff0d4e67 100644
--- a/data/maps/SecretBase_BlueCave4/events.inc
+++ b/data/maps/SecretBase_BlueCave4/events.inc
@@ -1,19 +1,19 @@
 SecretBase_BlueCave4_EventObjects: @ 8539734
-	object_event 1, 255, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_BlueCave4_MapWarps: @ 853989C
 	warp_def 4, 15, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc
index 8c2771f4e..5a49bb704 100644
--- a/data/maps/SecretBase_BrownCave1/events.inc
+++ b/data/maps/SecretBase_BrownCave1/events.inc
@@ -1,19 +1,19 @@
 SecretBase_BrownCave1_EventObjects: @ 8537A68
-	object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_BrownCave1_MapWarps: @ 8537BD0
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc
index f5e168e36..569b808bd 100644
--- a/data/maps/SecretBase_BrownCave2/events.inc
+++ b/data/maps/SecretBase_BrownCave2/events.inc
@@ -1,19 +1,19 @@
 SecretBase_BrownCave2_EventObjects: @ 8538380
-	object_event 1, 255, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_BrownCave2_MapWarps: @ 85384E8
 	warp_def 1, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc
index c41147bc6..4dd9655b8 100644
--- a/data/maps/SecretBase_BrownCave3/events.inc
+++ b/data/maps/SecretBase_BrownCave3/events.inc
@@ -1,19 +1,19 @@
 SecretBase_BrownCave3_EventObjects: @ 8538C98
-	object_event 1, 255, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_BrownCave3_MapWarps: @ 8538E00
 	warp_def 11, 9, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc
index 40d00597e..506c3cafc 100644
--- a/data/maps/SecretBase_BrownCave4/events.inc
+++ b/data/maps/SecretBase_BrownCave4/events.inc
@@ -1,19 +1,19 @@
 SecretBase_BrownCave4_EventObjects: @ 85395B0
-	object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_BrownCave4_MapWarps: @ 8539718
 	warp_def 2, 8, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc
index 1b5f202cf..edc9b8e78 100644
--- a/data/maps/SecretBase_RedCave1/events.inc
+++ b/data/maps/SecretBase_RedCave1/events.inc
@@ -1,19 +1,19 @@
 SecretBase_RedCave1_EventObjects: @ 85378E4
-	object_event 1, 255, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_RedCave1_MapWarps: @ 8537A4C
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc
index d84f297a2..c5817721e 100644
--- a/data/maps/SecretBase_RedCave2/events.inc
+++ b/data/maps/SecretBase_RedCave2/events.inc
@@ -1,19 +1,19 @@
 SecretBase_RedCave2_EventObjects: @ 85381FC
-	object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_RedCave2_MapWarps: @ 8538364
 	warp_def 3, 14, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc
index f288371e8..af7854d9e 100644
--- a/data/maps/SecretBase_RedCave3/events.inc
+++ b/data/maps/SecretBase_RedCave3/events.inc
@@ -1,19 +1,19 @@
 SecretBase_RedCave3_EventObjects: @ 8538B14
-	object_event 1, 255, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_RedCave3_MapWarps: @ 8538C7C
 	warp_def 3, 6, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc
index 9090f940e..181e8d7c6 100644
--- a/data/maps/SecretBase_RedCave4/events.inc
+++ b/data/maps/SecretBase_RedCave4/events.inc
@@ -1,19 +1,19 @@
 SecretBase_RedCave4_EventObjects: @ 853942C
-	object_event 1, 255, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_RedCave4_MapWarps: @ 8539594
 	warp_def 2, 12, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc
index aa886a0aa..aa8054a80 100644
--- a/data/maps/SecretBase_Shrub1/events.inc
+++ b/data/maps/SecretBase_Shrub1/events.inc
@@ -1,19 +1,19 @@
 SecretBase_Shrub1_EventObjects: @ 8538078
-	object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_Shrub1_MapWarps: @ 85381E0
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc
index 1acb5d0a1..ecbbdfcb4 100644
--- a/data/maps/SecretBase_Shrub2/events.inc
+++ b/data/maps/SecretBase_Shrub2/events.inc
@@ -1,19 +1,19 @@
 SecretBase_Shrub2_EventObjects: @ 8538990
-	object_event 1, 255, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_Shrub2_MapWarps: @ 8538AF8
 	warp_def 7, 5, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc
index 7902f3fc7..2a280d6c5 100644
--- a/data/maps/SecretBase_Shrub3/events.inc
+++ b/data/maps/SecretBase_Shrub3/events.inc
@@ -1,19 +1,19 @@
 SecretBase_Shrub3_EventObjects: @ 85392A8
-	object_event 1, 255, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_Shrub3_MapWarps: @ 8539410
 	warp_def 6, 9, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc
index c6d5f32f5..bef5f0ca2 100644
--- a/data/maps/SecretBase_Shrub4/events.inc
+++ b/data/maps/SecretBase_Shrub4/events.inc
@@ -1,19 +1,19 @@
 SecretBase_Shrub4_EventObjects: @ 8539BC0
-	object_event 1, 255, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_Shrub4_MapWarps: @ 8539D28
 	warp_def 11, 8, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc
index 593fb5dbb..a2863ced7 100644
--- a/data/maps/SecretBase_Tree1/events.inc
+++ b/data/maps/SecretBase_Tree1/events.inc
@@ -1,19 +1,19 @@
 SecretBase_Tree1_EventObjects: @ 8537EF4
-	object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_Tree1_MapWarps: @ 853805C
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc
index 189911755..d930de64f 100644
--- a/data/maps/SecretBase_Tree2/events.inc
+++ b/data/maps/SecretBase_Tree2/events.inc
@@ -1,19 +1,19 @@
 SecretBase_Tree2_EventObjects: @ 853880C
-	object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_Tree2_MapWarps: @ 8538974
 	warp_def 3, 14, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc
index b2d950a40..6dda3e303 100644
--- a/data/maps/SecretBase_Tree3/events.inc
+++ b/data/maps/SecretBase_Tree3/events.inc
@@ -1,19 +1,19 @@
 SecretBase_Tree3_EventObjects: @ 8539124
-	object_event 1, 255, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_Tree3_MapWarps: @ 853928C
 	warp_def 8, 6, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc
index a1d7f7b50..493bc93db 100644
--- a/data/maps/SecretBase_Tree4/events.inc
+++ b/data/maps/SecretBase_Tree4/events.inc
@@ -1,19 +1,19 @@
 SecretBase_Tree4_EventObjects: @ 8539A3C
-	object_event 1, 255, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_Tree4_MapWarps: @ 8539BA4
 	warp_def 7, 12, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc
index 9b394350c..04045999a 100644
--- a/data/maps/SecretBase_YellowCave1/events.inc
+++ b/data/maps/SecretBase_YellowCave1/events.inc
@@ -1,19 +1,19 @@
 SecretBase_YellowCave1_EventObjects: @ 8537D70
-	object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_YellowCave1_MapWarps: @ 8537ED8
 	warp_def 5, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc
index a958fcb53..d26d337ae 100644
--- a/data/maps/SecretBase_YellowCave2/events.inc
+++ b/data/maps/SecretBase_YellowCave2/events.inc
@@ -1,19 +1,19 @@
 SecretBase_YellowCave2_EventObjects: @ 8538688
-	object_event 1, 255, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_YellowCave2_MapWarps: @ 85387F0
 	warp_def 12, 7, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc
index 2decabcee..e888677b4 100644
--- a/data/maps/SecretBase_YellowCave3/events.inc
+++ b/data/maps/SecretBase_YellowCave3/events.inc
@@ -1,19 +1,19 @@
 SecretBase_YellowCave3_EventObjects: @ 8538FA0
-	object_event 1, 255, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_YellowCave3_MapWarps: @ 8539108
 	warp_def 5, 9, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc
index 535ca8e4c..577693af9 100644
--- a/data/maps/SecretBase_YellowCave4/events.inc
+++ b/data/maps/SecretBase_YellowCave4/events.inc
@@ -1,19 +1,19 @@
 SecretBase_YellowCave4_EventObjects: @ 85398B8
-	object_event 1, 255, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
-	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
-	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
-	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
-	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
-	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
-	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
-	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
-	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+	object_event 1, 255, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
 
 SecretBase_YellowCave4_MapWarps: @ 8539A20
 	warp_def 6, 12, 0, 126, MAP_NONE
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
index 875bed2fb..899ad3eb8 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL
 	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0
 
 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index f57a27c1d..14d5ba0fa 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
@@ -43,7 +43,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9
 	compare VAR_RESULT, 0
 	goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054
 	msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, 4
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	release
 	end
 
diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc
index 5f4fe1dac..99ab13475 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/events.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc
@@ -1,6 +1,6 @@
 ShoalCave_LowTideIceRoom_EventObjects: @ 8537100
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE
 
 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130
 	warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
index 543a7d02b..4f446148e 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY
 
 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8
 	warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
index dabb85971..b487edcd7 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11
 	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0
 
 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
index b6af468c5..6dbf50eb5 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL
 
 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC
 	warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc
index 386ea0b35..9519d1248 100644
--- a/data/maps/SkyPillar_Outside/events.inc
+++ b/data/maps/SkyPillar_Outside/events.inc
@@ -1,5 +1,5 @@
 SkyPillar_Outside_EventObjects: @ 853701C
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE
 
 SkyPillar_Outside_MapWarps: @ 8537034
 	warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index e9fbf4ad6..c852e3484 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -86,7 +86,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	clearflag FLAG_SPECIAL_FLAG_0x4000
 	setvar VAR_0x405E, 4
 	removeobject 1
-	clearflag FLAG_0x330
+	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
 	fadescreenswapbuffers 0
 	releaseall
 	end
diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc
index 9271dd4d3..a47e5e77f 100644
--- a/data/maps/SkyPillar_Top/events.inc
+++ b/data/maps/SkyPillar_Top/events.inc
@@ -1,6 +1,6 @@
 SkyPillar_Top_EventObjects: @ 8537170
-	object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 773
-	object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, 80
+	object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2
+	object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
 
 SkyPillar_Top_MapWarps: @ 85371A0
 	warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index 690464698..a0ae3eb24 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -34,7 +34,7 @@ SkyPillar_Top_EventScript_239705:: @ 8239705
 	return
 
 SkyPillar_Top_EventScript_23970F:: @ 823970F
-	clearflag FLAG_0x050
+	clearflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
 	return
 
 SkyPillar_Top_MapScript2_239713: @ 8239713
diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc
index 841de657e..2987c2020 100644
--- a/data/maps/SlateportCity/events.inc
+++ b/data/maps/SlateportCity/events.inc
@@ -3,37 +3,37 @@ SlateportCity_EventObjects: @ 85261CC
 	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0
 	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0
 	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
 	object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0
 	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0
 	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0
-	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835
-	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835
-	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
+	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
 	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0
 	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0
 	object_event 14, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0
 	object_event 15, EVENT_OBJ_GFX_MAN_3, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0
 	object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0
 	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0
-	object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882
-	object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882
+	object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
+	object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
 	object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0
 	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0
 	object_event 22, EVENT_OBJ_GFX_MAN_5, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0
 	object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0
-	object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948
+	object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
 	object_event 25, EVENT_OBJ_GFX_POKEFAN_M, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0
-	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882
-	object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882
-	object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882
-	object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882
-	object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882
-	object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882
-	object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882
-	object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882
+	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
+	object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
+	object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
+	object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
+	object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
+	object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
+	object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
+	object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
 	object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0
-	object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, 749
+	object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT
 
 SlateportCity_MapWarps: @ 8526514
 	warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 9a5e41b15..588a37636 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -15,7 +15,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C
 SlateportCity_EventScript_1DCC8D:: @ 81DCC8D
 	setflag FLAG_VISITED_SLATEPORT_CITY
 	setvar VAR_0x4086, 0
-	setflag FLAG_0x323
+	setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
 	return
 
 SlateportCity_EventScript_1DCC99:: @ 81DCC99
@@ -611,10 +611,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	applymovement 255, SlateportCity_Movement_1DD344
 	waitmovement 0
 	removeobject 11
-	clearflag FLAG_0x349
-	clearflag FLAG_0x350
-	clearflag FLAG_0x34D
-	clearflag FLAG_0x34E
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
 	setvar VAR_0x4058, 2
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
 	waitstate
diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc
index ba5f25d98..e0781c2cb 100644
--- a/data/maps/SlateportCity_Harbor/events.inc
+++ b/data/maps/SlateportCity_Harbor/events.inc
@@ -1,12 +1,12 @@
 SlateportCity_Harbor_EventObjects: @ 852FA68
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905
-	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841
-	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 860
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 845
-	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 846
-	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 848
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
+	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
+	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
+	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
 
 SlateportCity_Harbor_MapWarps: @ 852FB28
 	warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index 58c318d37..20e6b78ed 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -12,14 +12,14 @@ SlateportCity_Harbor_MapScript1_20C983: @ 820C983
 	end
 
 SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5
-	clearflag FLAG_0x35C
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
 	return
 
 SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9
 	savebgm MUS_AQA_0
 	setobjectxyperm 4, 12, 13
 	setobjectmovementtype 4, 9
-	setflag FLAG_0x389
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
 	return
 
 SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB
@@ -65,7 +65,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	removeobject 8
 	setvar VAR_0x40A0, 2
 	setflag FLAG_0x061
-	setflag FLAG_0x313
+	setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT
 	compare VAR_0x8008, 0
 	call_if 1, SlateportCity_Harbor_EventScript_20CA89
 	compare VAR_0x8008, 1
@@ -76,8 +76,8 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	call_if 1, SlateportCity_Harbor_EventScript_20CAB3
 	msgbox SlateportCity_Harbor_Text_20D35A, 4
 	closemessage
-	setflag FLAG_0x335
-	setflag FLAG_0x336
+	setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
+	setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
 	moveobjectoffscreen 4
 	setobjectmovementtype 4, 10
 	releaseall
@@ -371,7 +371,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B
 	goto_eq SlateportCity_Harbor_EventScript_272054
 	takeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_20D94A, 4
-	setflag FLAG_0x126
+	setflag FLAG_TRADED_SCANNER_TO_STERN
 	goto SlateportCity_Harbor_EventScript_20CE11
 	end
 
@@ -384,7 +384,7 @@ SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB
 	goto_eq SlateportCity_Harbor_EventScript_272054
 	takeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_20D94A, 4
-	setflag FLAG_0x126
+	setflag FLAG_TRADED_SCANNER_TO_STERN
 	goto SlateportCity_Harbor_EventScript_20CE11
 	end
 
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
index 8e3a7879f..8d727f483 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
@@ -1,18 +1,18 @@
 SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670
 	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
 	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883
-	object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961
-	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961
-	object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961
-	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965
-	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
+	object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
+	object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
+	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT
+	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
 
 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0
 	warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index 4464ee582..0ed39c118 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -198,7 +198,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA
-	setflag FLAG_0x3C5
+	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT
 	playse SE_KAIDAN
 	removeobject 13
 	release
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
index 3ca657bb6..14499f35b 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
@@ -1,11 +1,11 @@
 SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 886
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 884
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 885
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961
-	object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961
-	object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
+	object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
+	object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
 
 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950
 	warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 4172c47ef..f31a0d386 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -67,7 +67,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	removeobject 4
 	fadescreen 0
 	delay 30
-	setflag FLAG_0x373
+	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
 	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, 4
@@ -80,12 +80,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	waitfanfare
 	special HealPlayerParty
 	removeobject 1
-	setflag FLAG_0x384
+	setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA
 	compare VAR_0x40DA, 0
 	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C
 	setflag FLAG_0x095
-	clearflag FLAG_0x3B3
-	setflag FLAG_0x3B5
+	clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
+	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
 	setvar VAR_0x40D2, 1
 	fadescreen 0
 	release
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
index e20e593cb..c28c3111a 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4
 	warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
index 107a00ee0..5bad8c5e2 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
@@ -2,7 +2,7 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318
 	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0
 	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0
 	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0
-	object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869
+	object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
 
 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378
 	warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index 8197eb873..20bbc6fc4 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
@@ -19,7 +19,7 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2
 	waitmovement 0
 	setflag FLAG_0x094
-	setflag FLAG_0x372
+	setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
 	releaseall
 	end
 
diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc
index 52dcb8f53..9ca0bb20d 100644
--- a/data/maps/SootopolisCity/events.inc
+++ b/data/maps/SootopolisCity/events.inc
@@ -1,22 +1,22 @@
 SootopolisCity_EventObjects: @ 8527314
 	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854
+	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
 	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0
 	object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0
 	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839
-	object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1
+	object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
 	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0
-	object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, 998
-	object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, 997
-	object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 996
-	object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854
-	object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854
-	object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854
-	object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854
-	object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827
-	object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826
-	object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, 816
+	object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON
+	object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE
+	object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA
+	object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
+	object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
+	object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
+	object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
+	object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
+	object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
+	object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
 
 SootopolisCity_MapWarps: @ 85274C4
 	warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 5de8c7d12..f5dcdab74 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -927,7 +927,7 @@ SootopolisCity_EventScript_1E6154:: @ 81E6154
 	msgbox SootopolisCity_Text_1E65C8, 3
 	end
 
-SootopolisCity_EventScript_1E615D:: @ 81E615D
+EventScript_ClosedSootopolisDoor:: @ 81E615D
 	msgbox SootopolisCity_Text_1E6604, 3
 	end
 
@@ -1442,11 +1442,11 @@ SootopolisCity_EventScript_1E6536:: @ 81E6536
 	end
 
 SootopolisCity_EventScript_1E654C:: @ 81E654C
-	setflag FLAG_0x33B
-	setflag FLAG_0x33A
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
 	setflag FLAG_0x09E
-	clearflag FLAG_0x358
-	clearflag FLAG_0x394
+	clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
+	clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
 	setvar VAR_0x40B9, 2
 	warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34
 	waitstate
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index af661890f..e95a57769 100644
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -105,11 +105,11 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
 	msgbox SootopolisCity_Gym_1F_Text_2255BE, 4
 	setflag FLAG_0x4F7
 	setflag FLAG_BADGE08_GET
-	setflag FLAG_0x356
-	setflag FLAG_0x3CD
-	setflag FLAG_0x330
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
+	setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
 	setvar VAR_0x405E, 6
-	clearflag FLAG_0x347
+	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1
 	setvar VAR_0x8008, 8
 	call SootopolisCity_Gym_1F_EventScript_271F43
 	call SootopolisCity_Gym_1F_EventScript_224FD4
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
index f9e4626ea..0062c87e1 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260
 	warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc
index b65134679..cc8256e8c 100644
--- a/data/maps/SouthernIsland_Interior/events.inc
+++ b/data/maps/SouthernIsland_Interior/events.inc
@@ -1,6 +1,6 @@
 SouthernIsland_Interior_EventObjects: @ 853B89C
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 910
-	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 911
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
+	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
 
 SouthernIsland_Interior_MapWarps: @ 853B8CC
 	warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 3005e32d7..26bf9d9f9 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -56,7 +56,7 @@ SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4
 	end
 
 SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	goto_eq SouthernIsland_Interior_EventScript_242B9A
 	checkflag FLAG_0x1C8
 	goto_eq SouthernIsland_Interior_EventScript_242B9A
@@ -65,7 +65,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
 	checkflag FLAG_SYS_HAS_EON_TICKET
 	goto_if 0, SouthernIsland_Interior_EventScript_242B9A
 	setflag FLAG_0x0CE
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	special SpawnScriptEventObject
 	applymovement 127, SouthernIsland_Interior_Movement_242BCA
 	waitmovement 0
diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc
index aa23659eb..553b4151a 100644
--- a/data/maps/TerraCave_End/events.inc
+++ b/data/maps/TerraCave_End/events.inc
@@ -1,5 +1,5 @@
 TerraCave_End_EventObjects: @ 8537850
-	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 783
+	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON
 
 TerraCave_End_MapWarps: @ 8537868
 	warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc
index d603f2274..b23cc23f1 100644
--- a/data/maps/TerraCave_End/scripts.inc
+++ b/data/maps/TerraCave_End/scripts.inc
@@ -21,7 +21,7 @@ TerraCave_End_MapScript1_23B0D9: @ 823B0D9
 	end
 
 TerraCave_End_EventScript_23B0E3:: @ 823B0E3
-	clearflag FLAG_0x30F
+	clearflag FLAG_HIDE_TERRA_CAVE_GROUDON
 	setvar VAR_TEMP_1, 1
 	return
 
diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc
index 102a5f6e7..7d3866eb0 100644
--- a/data/maps/Underwater1/events.inc
+++ b/data/maps/Underwater1/events.inc
@@ -1,11 +1,11 @@
 Underwater1_MapBGEvents: @ 852CEB4
-	bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, 8
-	bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, 9
-	bg_hidden_item_event 66, 34, 3, ITEM_PEARL, 10
-	bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, 11
-	bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, 13
-	bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, 36
-	bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, 38
+	bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS
+	bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD
+	bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL
+	bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL
+	bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1
+	bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM
+	bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2
 
 Underwater1_MapEvents:: @ 852CF08
 	map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents
diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc
index ca98f25ac..dd2421506 100644
--- a/data/maps/Underwater2/events.inc
+++ b/data/maps/Underwater2/events.inc
@@ -2,14 +2,14 @@ Underwater2_MapWarps: @ 852CF1C
 	warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY
 
 Underwater2_MapBGEvents: @ 852CF24
-	bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, 14
-	bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, 15
-	bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, 16
-	bg_hidden_item_event 10, 36, 3, ITEM_PEARL, 17
-	bg_hidden_item_event 11, 39, 3, ITEM_IRON, 19
-	bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, 18
-	bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, 20
-	bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, 12
+	bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE
+	bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL
+	bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST
+	bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL
+	bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON
+	bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD
+	bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL
+	bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD
 
 Underwater2_MapEvents:: @ 852CF84
 	map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents
diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc
index 0a5dc773d..02ac86aa1 100644
--- a/data/maps/Underwater3/events.inc
+++ b/data/maps/Underwater3/events.inc
@@ -3,10 +3,10 @@ Underwater3_MapWarps: @ 852CF98
 	warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE
 
 Underwater3_MapBGEvents: @ 852CFA8
-	bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, 21
-	bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, 22
-	bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, 23
-	bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, 24
+	bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE
+	bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP
+	bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE
+	bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD
 
 Underwater3_MapEvents:: @ 852CFD8
 	map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents
diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc
index 7799e0ad6..5a08e82f9 100644
--- a/data/maps/Underwater4/events.inc
+++ b/data/maps/Underwater4/events.inc
@@ -2,8 +2,8 @@ Underwater4_MapWarps: @ 852CFEC
 	warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN
 
 Underwater4_MapBGEvents: @ 852CFF4
-	bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, 25
-	bg_hidden_item_event 69, 18, 3, ITEM_PEARL, 26
+	bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN
+	bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL
 
 Underwater4_MapEvents:: @ 852D00C
 	map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents
diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc
index fbad57bc8..468dedcd6 100644
--- a/data/maps/Underwater_SeafloorCavern/events.inc
+++ b/data/maps/Underwater_SeafloorCavern/events.inc
@@ -1,8 +1,8 @@
 Underwater_SeafloorCavern_EventObjects: @ 8535640
-	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
-	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
-	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
-	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
 
 Underwater_SeafloorCavern_MapWarps: @ 85356A0
 	warp_def 6, 7, 0, 0, MAP_UNDERWATER4
diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index 128cb31c0..ae1d161e0 100644
--- a/data/maps/Underwater_SeafloorCavern/scripts.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
@@ -11,7 +11,7 @@ Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B
 	end
 
 Underwater_SeafloorCavern_EventScript_234358:: @ 8234358
-	setflag FLAG_0x3D4
+	setflag FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
 	end
 
 Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C
diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc
index 3396b5b8b..0cebf1502 100644
--- a/data/maps/UnionRoom/events.inc
+++ b/data/maps/UnionRoom/events.inc
@@ -1,13 +1,13 @@
 UnionRoom_EventObjects: @ 853B020
 	object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0
-	object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706
-	object_event 3, 247, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710
-	object_event 4, 246, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709
-	object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707
-	object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705
-	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704
-	object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703
+	object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4
+	object_event 3, 247, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8
+	object_event 4, 246, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, FLAG_HIDE_UNION_ROOM_PLAYER_7
+	object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, FLAG_HIDE_UNION_ROOM_PLAYER_6
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, FLAG_HIDE_UNION_ROOM_PLAYER_5
+	object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, FLAG_HIDE_UNION_ROOM_PLAYER_3
+	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2
+	object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1
 
 UnionRoom_MapWarps: @ 853B0F8
 	warp_def 7, 11, 3, 127, MAP_NONE
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index 250b4b402..f71c40e3d 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -4,14 +4,14 @@ UnionRoom_MapScripts:: @ 823D1A6
 	.byte 0
 
 UnionRoom_MapScript1_23D1B1: @ 823D1B1
-	setflag FLAG_0x2BF
-	setflag FLAG_0x2C0
-	setflag FLAG_0x2C1
-	setflag FLAG_0x2C2
-	setflag FLAG_0x2C3
-	setflag FLAG_0x2C4
-	setflag FLAG_0x2C5
-	setflag FLAG_0x2C6
+	setflag FLAG_HIDE_UNION_ROOM_PLAYER_1
+	setflag FLAG_HIDE_UNION_ROOM_PLAYER_2
+	setflag FLAG_HIDE_UNION_ROOM_PLAYER_3
+	setflag FLAG_HIDE_UNION_ROOM_PLAYER_4
+	setflag FLAG_HIDE_UNION_ROOM_PLAYER_5
+	setflag FLAG_HIDE_UNION_ROOM_PLAYER_6
+	setflag FLAG_HIDE_UNION_ROOM_PLAYER_7
+	setflag FLAG_HIDE_UNION_ROOM_PLAYER_8
 	removeobject 9
 	removeobject 8
 	removeobject 7
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
index 1da591d59..1dfb49dd9 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
@@ -3,7 +3,7 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648
 	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT
 	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0
 
 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
index 6aa0d681a..e3e959838 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
@@ -2,7 +2,7 @@ VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 
 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900
 	warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc
index 5f0fd0b3c..f8d6f4db5 100644
--- a/data/maps/VerdanturfTown_WandasHouse/events.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/events.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_WandasHouse_EventObjects: @ 852E92C
-	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809
+	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
 	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984
+	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
 
 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4
 	warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc
index f162a9d80..05cafcc48 100644
--- a/data/maps/VictoryRoad_1F/events.inc
+++ b/data/maps/VictoryRoad_1F/events.inc
@@ -2,10 +2,10 @@ VictoryRoad_1F_EventObjects: @ 8535E04
 	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0
 	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0
-	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085
-	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751
+	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, FLAG_ITEM_VICTORY_ROAD_1F_PP_UP
+	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
 	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0
 	object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0
 
@@ -21,7 +21,7 @@ VictoryRoad_1F_MapCoordEvents: @ 8535F04
 	coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8
 
 VictoryRoad_1F_MapBGEvents: @ 8535F24
-	bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, 81
+	bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL
 
 VictoryRoad_1F_MapEvents:: @ 8535F30
 	map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 2ed1c6baf..e32c07684 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -43,7 +43,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
 	msgbox VictoryRoad_1F_Text_235EE6, 4
 	trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC
 	msgbox VictoryRoad_1F_Text_236020, 4
-	clearflag FLAG_0x35A
+	clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	moveobjectoffscreen 4
 	setflag FLAG_0x07E
 	copyvar VAR_0x40C3, VAR_0x8008
diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc
index 14d400fec..814d8a73d 100644
--- a/data/maps/VictoryRoad_B1F/events.inc
+++ b/data/maps/VictoryRoad_B1F/events.inc
@@ -1,23 +1,23 @@
 VictoryRoad_B1F_EventObjects: @ 8535F44
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25
-	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26
-	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27
-	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28
-	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29
-	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_12
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_17
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_16
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1E
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_19
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1A
+	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1B
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1C
+	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1D
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1F
 	object_event 14, EVENT_OBJ_GFX_MAN_3, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0
 	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0
 	object_event 16, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0
-	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087
+	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_15
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, FLAG_ITEM_VICTORY_ROAD_B1F_TM_29
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE
 	object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0
 	object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0
 
diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc
index 17d878215..1ad4f3e50 100644
--- a/data/maps/VictoryRoad_B2F/events.inc
+++ b/data/maps/VictoryRoad_B2F/events.inc
@@ -3,7 +3,7 @@ VictoryRoad_B2F_EventObjects: @ 8536188
 	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0
 	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0
 	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL
 	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0
 	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0
 
@@ -14,8 +14,8 @@ VictoryRoad_B2F_MapWarps: @ 8536230
 	warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F
 
 VictoryRoad_B2F_MapBGEvents: @ 8536250
-	bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, 82
-	bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, 83
+	bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR
+	bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL
 
 VictoryRoad_B2F_MapEvents:: @ 8536268
 	map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index a644008d0..bbb7662ba 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
 	end
 
 Script_Apprentice_SetLeavingFlags:
-	setflag FLAG_0x2BD
+	setflag FLAG_HIDE_APPRENTICE
 	setflag FLAG_0x934
 	return
 
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 08f5accca..3408eb2a8 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -29,11 +29,11 @@ OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276AFB:: @ 8276AFB
-	clearflag FLAG_0x2BE
+	clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_276AFF:: @ 8276AFF
-	setflag FLAG_0x2BE
+	setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 	return
 
 BattleFrontier_PokemonCenter_2F_EventScript_276B03:: @ 8276B03
@@ -474,7 +474,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
 	release
 	compare VAR_0x8004, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036
-	special sub_809D2BC
+	special SetCableClubWarp
 	warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
 	special sub_80AF948
 	waitstate
@@ -486,7 +486,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036
-	special sub_809D2BC
+	special SetCableClubWarp
 	warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
 	special sub_80AF948
 	waitstate
@@ -576,7 +576,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
 	closedoor 9, 1
 	waitdooranim
 	release
-	special sub_809D2BC
+	special SetCableClubWarp
 	setwarp MAP_TRADE_CENTER, 255, 5, 8
 	special sub_80AF948
 	waitstate
@@ -651,7 +651,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
 	closedoor 9, 1
 	waitdooranim
 	release
-	special sub_809D2BC
+	special SetCableClubWarp
 	setwarp MAP_RECORD_CORNER, 255, 8, 9
 	special sub_80AF948
 	waitstate
@@ -702,7 +702,7 @@ MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306
-	special sub_809D2BC
+	special SetCableClubWarp
 	special sub_80AF948
 	waitstate
 	end
@@ -784,7 +784,7 @@ MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360
 	walk_up
 	step_end
 
-gUnknown_08277365:: @ 8277365
+EventScript_CableBoxResults:: @ 8277365
 	lockall
 	setvar VAR_0x8004, 0
 	special ShowLinkBattleRecords
@@ -1050,7 +1050,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
 	closedoor 5, 1
 	waitdooranim
 	special sub_8018090
-	special sub_809D2BC
+	special SetCableClubWarp
 	warpteleport2 MAP_UNION_ROOM, 255, 7, 11
 	waitstate
 	special UnionRoomSpecial
@@ -1392,7 +1392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A
 	waitstate
 	end
 
-OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A
+EventScript_WirelessBoxResults:: @ 8277B8A
 	lockall
 	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index d89c78f18..afd2ca851 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1086,7 +1086,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36
 	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27ABD8
 	call LinkContestRoom1_EventScript_27AB9E
-	checkflag FLAG_0x002
+	checkflag FLAG_TEMP_2
 	goto_eq LinkContestRoom1_EventScript_27AB82
 	lockall
 	msgbox LinkContestRoom1_Text_27BBA8, 4
@@ -1127,7 +1127,7 @@ LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF
 LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE
 	compare VAR_CONTEST_RANK, 3
 	goto_eq LinkContestRoom1_EventScript_27ABCD
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	return
 
 LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index d9b8a89ac..7b306a261 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -289,7 +289,7 @@ Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_291FC0:: @ 8291FC0
+EventScript_EggHatch:: @ 8291FC0
 	lockall
 	msgbox Text_292668, 4
 	special EggHatch
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index d0936b9c1..aba6bec97 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -223,7 +223,7 @@ FieryPath_Text_290A16: @ 8290A16
 	.string "STRENGTH made it possible to move\n"
 	.string "boulders around.$"
 
-EventScript_290A49:: @ 8290A49
+EventScript_UseWaterfall:: @ 8290A49
 	lockall
 	checkpartymove MOVE_WATERFALL
 	compare VAR_RESULT, 6
@@ -237,7 +237,7 @@ EventScript_290A49:: @ 8290A49
 	dofieldeffect 43
 	goto EventScript_290A8C
 
-EventScript_290A83:: @ 8290A83
+EventScript_CannotUseWaterfall:: @ 8290A83
 	lockall
 
 EventScript_290A84:: @ 8290A84
@@ -258,7 +258,7 @@ Text_290AC3: @ 8290AC3
 Text_290AFC: @ 8290AFC
 	.string "{STR_VAR_1} used WATERFALL.$"
 
-EventScript_290B0F:: @ 8290B0F
+EventScript_UseDive:: @ 8290B0F
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, 6
@@ -283,7 +283,7 @@ EventScript_290B58:: @ 8290B58
 	releaseall
 	end
 
-EventScript_290B5A:: @ 8290B5A
+EventScript_UseDiveUnderwater:: @ 8290B5A
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, 6
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 5a03a0e98..0ca624572 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -72,67 +72,67 @@ Route111_EventScript_28CD8B:: @ 828CD8B
 	return
 
 Route111_EventScript_28CD96:: @ 828CD96
-	setflag FLAG_0x31C
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CD9A:: @ 828CD9A
-	clearflag FLAG_0x31C
+	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CD9E:: @ 828CD9E
-	setflag FLAG_0x31D
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CDA2:: @ 828CDA2
-	clearflag FLAG_0x31D
+	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CDA6:: @ 828CDA6
-	setflag FLAG_0x31E
+	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CDAA:: @ 828CDAA
-	clearflag FLAG_0x31E
+	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
 Route111_EventScript_28CDAE:: @ 828CDAE
-	setflag FLAG_0x31F
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
 Route111_EventScript_28CDB2:: @ 828CDB2
-	clearflag FLAG_0x31F
+	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
 Route111_EventScript_28CDB6:: @ 828CDB6
-	setflag FLAG_0x385
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDBA:: @ 828CDBA
-	clearflag FLAG_0x385
+	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDBE:: @ 828CDBE
-	setflag FLAG_0x386
+	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDC2:: @ 828CDC2
-	clearflag FLAG_0x386
+	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDC6:: @ 828CDC6
-	setflag FLAG_0x387
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDCA:: @ 828CDCA
-	clearflag FLAG_0x387
+	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
 Route111_EventScript_28CDCE:: @ 828CDCE
-	setflag FLAG_0x388
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
 Route111_EventScript_28CDD2:: @ 828CDD2
-	clearflag FLAG_0x388
+	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
 Route111_EventScript_28CDD6:: @ 828CDD6
@@ -220,7 +220,7 @@ Route111_EventScript_28CF56:: @ 828CF56
 	call_if 1, Route111_EventScript_28CF9F
 	compare VAR_FACING, 4
 	call_if 1, Route111_EventScript_28CFB1
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq Route111_EventScript_28D0EE
 	msgbox Route111_Text_28B042, 5
 	goto Route111_EventScript_28D0A7
@@ -254,7 +254,7 @@ Route120_EventScript_28CFC3:: @ 828CFC3
 	call_if 1, Route111_EventScript_28CF9F
 	compare VAR_FACING, 4
 	call_if 1, Route111_EventScript_28CFB1
-	checkflag FLAG_0x001
+	checkflag FLAG_TEMP_1
 	goto_eq Route111_EventScript_28D0EE
 	specialvar VAR_RESULT, GabbyAndTyGetLastQuote
 	compare VAR_RESULT, 0
@@ -323,13 +323,13 @@ Route111_EventScript_28D0A7:: @ 828D0A7
 	goto_eq Route111_EventScript_28D0E1
 	msgbox Route111_Text_28B4AB, 4
 	special GabbyAndTyAfterInterview
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	release
 	end
 
 Route111_EventScript_28D0E1:: @ 828D0E1
 	msgbox Route111_Text_28B577, 4
-	setflag FLAG_0x001
+	setflag FLAG_TEMP_1
 	release
 	end
 
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 734831f7f..9ae77ccf8 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -66,8 +66,8 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
 	delay 30
 	setvar VAR_0x4092, 6
 	setflag FLAG_0x051
-	setflag FLAG_0x2F2
-	setflag FLAG_0x2F3
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
 	checkplayergender
 	compare VAR_RESULT, 0
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 3187c95f4..e77db6b00 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4
 
 EventScript_Pblock1_Ask:: @ 8293C3E
 	lockall
-	checkflag FLAG_0x340
+	checkflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
 	goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB
 	setvar VAR_0x8009, 1
 	applymovement 16, LilycoveCity_ContestLobby_Movement_294053
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 76a4ee8f1..27fe53a4c 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -50,7 +50,7 @@ Route111_EventScript_27661E:: @ 827661E
 	msgbox Route111_Text_27636E, 4
 	closemessage
 	setflag FLAG_0x060
-	clearflag FLAG_0x3B4
+	clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
 	compare VAR_FACING, 3
 	call_if 1, Route111_EventScript_27666A
 	compare VAR_FACING, 4
@@ -104,10 +104,10 @@ Route111_Movement_276696: @ 8276696
 	walk_down
 	step_end
 
-EventScript_2766A2:: @ 82766A2
+EventScript_SecretPower1:: @ 82766A2
 	special sub_80EB290
 	end
 
-EventScript_2766A6:: @ 82766A6
+EventScript_SecretPower2:: @ 82766A6
 	special sub_80EB2C8
 	end
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 8d1ac83eb..2292e9984 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -1,4 +1,4 @@
-EventScript_27EE0B:: @ 827EE0B
+EventScript_TV:: @ 827EE0B
 	lockall
 	incrementgamestat 44
 	special ResetTVShowState
diff --git a/data/shop.s b/data/shop.s
deleted file mode 100644
index 45ecbb585..000000000
--- a/data/shop.s
+++ /dev/null
@@ -1,80 +0,0 @@
-@ the third big chunk of data
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_08589A08:: @ 8589A08
-	.4byte BuyMenuTryMakePurchase
-	.4byte BuyMenuReturnToItemList
-
-gUnknown_08589A10:: @ 8589A10
-	.4byte gUnknown_085E93C7
-	.4byte HandleShopMenuBuy
-	.4byte gUnknown_085E93CB
-	.4byte HandleShopMenuSell
-	.4byte gUnknown_085E93D0
-	.4byte HandleShopMenuQuit
-
-gUnknown_08589A28:: @ 8589A28
-	.4byte gUnknown_085E93C7
-	.4byte HandleShopMenuBuy
-	.4byte gUnknown_085E93D0
-	.4byte HandleShopMenuQuit
-
-gUnknown_08589A38:: @ 8589A38
-	window_template 0, 2, 1, 9, 6, 15, 8
-	window_template 0, 2, 1, 9, 4, 15, 8
-
-gUnknown_08589A48:: @ 8589A48
-	.byte 0, 0, 0, 0
-	.4byte BuyMenuPrintItemDescriptionAndShowItemIcon
-	.4byte BuyMenuPrintPriceInList 
-	.byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7
-
-gUnknown_08589A60:: @ 8589A60
-	.4byte 0x1F8
-	.4byte 0x11E1
-	.4byte 0x21D2
-	.4byte 0x31C3
-
-gUnknown_08589A70:: @ 8589A70
-	window_template 0, 1, 1, 10, 2, 15, 30
-	window_template 0, 14, 2, 15, 16, 15, 50
-	window_template 0, 0, 13, 14, 6, 15, 0x122
-	window_template 0, 1, 11, 12, 2, 15, 0x176
-	window_template 0, 18, 11, 10, 2, 15, 0x18E
-	window_template 0, 2, 15, 27, 4, 15, 0x1A2
-	null_window_template
-
-gUnknown_08589AA8:: @ 8589AA8
-	window_template 0, 21, 9, 5, 4, 15, 0x20E
-
-gUnknown_08589AB0:: @ 8589AB0
-	.byte 1, 2, 3
-	.byte 0, 2, 3
-	.byte 0, 3, 2
-
-	.align 1
-
-gUnknown_08589ABA:: @ 8589ABA
-	.2byte 0x284, 0x282, 0x280
-
-gUnknown_08589AC0:: @ 8589AC0
-	.2byte 0x285, 0x283, 0x281
-
-gUnknown_08589AC6:: @ 8589AC6
-	.2byte 0x28C, 0x28A, 0x288
-
-gUnknown_08589ACC:: @ 8589ACC
-	.2byte 0x28D, 0x28B, 0x289
-
-gUnknown_08589AD2:: @ 8589AD2
-	.2byte 0x2A0, 0x2A2, 0x2A4
-
-gUnknown_08589AD8:: @ 8589AD8
-	.2byte 0x2A1, 0x2A3, 0x2A5
-
-gUnknown_08589ADE:: @ 8589ADE
-	.2byte 0x2A8, 0x2AA, 0x2AC
diff --git a/data/specials.inc b/data/specials.inc
index ec378ae19..fb654af21 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -9,7 +9,7 @@
 		.align 2
 gSpecials:: @ 81DBA64
 	def_special HealPlayerParty
-	def_special sub_809D2BC
+	def_special SetCableClubWarp
 	def_special sub_80AF948
 	def_special sub_80AF9F8
 	def_special sub_80B36EC
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 200b9fdb1..3483f6836 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -31,9 +31,6 @@ struct BattleAnimBackground
 
 #define ANIM_ARGS_COUNT 8
 
-#define PAN_SIDE_PLAYER     -64
-#define PAN_SIDE_OPPONENT   63
-
 extern void (*gAnimScriptCallback)(void);
 extern bool8 gAnimScriptActive;
 extern u8 gAnimVisualTaskCount;
diff --git a/include/battle_frontier_1.h b/include/battle_frontier_1.h
new file mode 100644
index 000000000..bc777914a
--- /dev/null
+++ b/include/battle_frontier_1.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BATTLE_FRONTIER_1_H
+#define GUARD_BATTLE_FRONTIER_1_H
+
+bool32 sub_8196034(void);
+
+#endif // GUARD_BATTLE_FRONTIER_1_H
diff --git a/include/blit.h b/include/blit.h
index e7f384cc8..2fe99d7bd 100644
--- a/include/blit.h
+++ b/include/blit.h
@@ -1,6 +1,13 @@
 #ifndef GUARD_BLIT_H
 #define GUARD_BLIT_H
 
+struct Bitmap
+{
+    u8* pixels;
+    u32 width:16;
+    u32 height:16;
+};
+
 void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height);
 void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey);
 void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
index 2b21aad9e..ea3087c18 100644
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -313,6 +313,20 @@
 #define ANIM_ATK_PARTNER 2
 #define ANIM_DEF_PARTNER 3
 
+// stereo panning constants [0-255]
+//
+//          0
+//         .  .
+//      .        .
+// 192 .          . 63
+//     .          .
+//      .        .
+//         .  .
+//          127
+//  
+#define SOUND_PAN_ATTACKER -64
+#define SOUND_PAN_TARGET    63
+
 // move background ids
 #define BG_DARK_ 0 // the same as BG_DARK but is unused
 #define BG_DARK 1
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 80e4213fd..4967c814d 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -96,8 +96,8 @@
 #define EVENT_OBJ_GFX_MAY_SURFING                 92
 #define EVENT_OBJ_GFX_MAY_FIELD_MOVE              93
 #define EVENT_OBJ_GFX_TRUCK                       94
-#define EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX       95
-#define EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY        96
+#define EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX       95
+#define EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY        96
 #define EVENT_OBJ_GFX_BIRCHS_BAG                  97
 #define EVENT_OBJ_GFX_ZIGZAGOON_1                 98
 #define EVENT_OBJ_GFX_ARTIST                      99
diff --git a/include/constants/flags.h b/include/constants/flags.h
index a74dffccf..c21affd61 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1,38 +1,43 @@
 #ifndef GUARD_CONSTANTS_FLAGS_H
 #define GUARD_CONSTANTS_FLAGS_H
 
-#define FLAG_0x001               0x1
-#define FLAG_0x002               0x2
-#define FLAG_0x003               0x3
-#define FLAG_0x004               0x4
-#define FLAG_0x005               0x5
-#define FLAG_0x006               0x6
-#define FLAG_0x007               0x7
-#define FLAG_0x008               0x8
-#define FLAG_0x009               0x9
-#define FLAG_0x00A               0xA
-#define FLAG_0x00B               0xB
-#define FLAG_0x00C               0xC
-#define FLAG_0x00D               0xD
-#define FLAG_0x00E               0xE
-#define FLAG_0x00F               0xF
-#define FLAG_0x010               0x10
-#define FLAG_0x011               0x11
-#define FLAG_0x012               0x12
-#define FLAG_0x013               0x13
-#define FLAG_0x014               0x14
-#define FLAG_0x015               0x15
-#define FLAG_0x016               0x16
-#define FLAG_0x017               0x17
-#define FLAG_0x018               0x18
-#define FLAG_0x019               0x19
-#define FLAG_0x01A               0x1A
-#define FLAG_0x01B               0x1B
-#define FLAG_0x01C               0x1C
-#define FLAG_0x01D               0x1D
-#define FLAG_0x01E               0x1E
-#define FLAG_0x01F               0x1F
-#define FLAG_0x020               0x20
+// temporary flags
+// These temporary flags 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
+#define FLAG_TEMP_20  0x20
+
 #define FLAG_0x021               0x21
 #define FLAG_0x022               0x22
 #define FLAG_0x023               0x23
@@ -80,13 +85,13 @@
 #define FLAG_0x04D               0x4D
 #define FLAG_0x04E               0x4E
 #define FLAG_0x04F               0x4F
-#define FLAG_0x050               0x50
+#define FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT               0x50
 #define FLAG_0x051               0x51
 #define FLAG_0x052               0x52
 #define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53
 #define FLAG_0x054               0x54
 #define FLAG_0x055               0x55
-#define FLAG_0x056               0x56
+#define FLAG_LINK_CONTEST_POKE_BALL               0x56
 #define FLAG_0x057               0x57
 #define FLAG_0x058               0x58
 #define FLAG_0x059               0x59
@@ -173,21 +178,24 @@
 #define FLAG_0x0AA               0xAA
 #define FLAG_0x0AB               0xAB
 #define FLAG_0x0AC               0xAC
-#define FLAG_0x0AD               0xAD
-#define FLAG_0x0AE               0xAE
-#define FLAG_0x0AF               0xAF
-#define FLAG_0x0B0               0xB0
-#define FLAG_0x0B1               0xB1
-#define FLAG_0x0B2               0xB2
-#define FLAG_0x0B3               0xB3
-#define FLAG_0x0B4               0xB4
-#define FLAG_0x0B5               0xB5
-#define FLAG_0x0B6               0xB6
-#define FLAG_0x0B7               0xB7
-#define FLAG_0x0B8               0xB8
-#define FLAG_0x0B9               0xB9
-#define FLAG_0x0BA               0xBA
-#define FLAG_0x0BB               0xBB
+
+#define FLAG_DECORATION_0               0xAD
+#define FLAG_DECORATION_1               0xAE
+#define FLAG_DECORATION_2               0xAF
+#define FLAG_DECORATION_3               0xB0
+#define FLAG_DECORATION_4               0xB1
+#define FLAG_DECORATION_5               0xB2
+#define FLAG_DECORATION_6               0xB3
+#define FLAG_DECORATION_7               0xB4
+#define FLAG_DECORATION_8               0xB5
+#define FLAG_DECORATION_9               0xB6
+#define FLAG_DECORATION_10               0xB7
+#define FLAG_DECORATION_11               0xB8
+#define FLAG_DECORATION_12               0xB9
+#define FLAG_DECORATION_13               0xBA
+#define FLAG_DECORATION_14               0xBB
+
+// scripts
 #define FLAG_0x0BC               0xBC
 #define FLAG_0x0BD               0xBD
 #define FLAG_0x0BE               0xBE
@@ -230,7 +238,7 @@
 #define FLAG_0x0E3               0xE3
 #define FLAG_0x0E4               0xE4
 #define FLAG_0x0E5               0xE5
-#define FLAG_0x0E6               0xE6
+#define FLAG_RECEIVED_TM_36               0xE6
 #define FLAG_0x0E7               0xE7
 #define FLAG_0x0E8               0xE8
 #define FLAG_0x0E9               0xE9
@@ -292,9 +300,11 @@
 #define FLAG_0x121               0x121
 #define FLAG_0x122               0x122
 #define FLAG_0x123               0x123
+
+// upper flags?
 #define FLAG_0x124               0x124
 #define FLAG_0x125               0x125
-#define FLAG_0x126               0x126
+#define FLAG_TRADED_SCANNER_TO_STERN               0x126
 #define FLAG_0x127               0x127
 #define FLAG_0x128               0x128
 #define FLAG_0x129               0x129
@@ -335,8 +345,8 @@
 #define FLAG_0x14C               0x14C
 #define FLAG_0x14D               0x14D
 #define FLAG_0x14E               0x14E
-#define FLAG_0x14F               0x14F
-#define FLAG_0x150               0x150
+#define FLAG_0x14F               0x14F// PLAYER CHOSE CLAW FOSSIL
+#define FLAG_0x150               0x150// PLAYER CHOSE ROOT FOSSIL
 #define FLAG_0x151               0x151
 #define FLAG_0x152               0x152
 #define FLAG_0x153               0x153
@@ -501,677 +511,599 @@
 #define FLAG_0x1F1               0x1F1
 #define FLAG_0x1F2               0x1F2
 #define FLAG_0x1F3               0x1F3
-#define FLAG_0x1F4               0x1F4
-#define FLAG_0x1F5               0x1F5
-#define FLAG_0x1F6               0x1F6
-#define FLAG_0x1F7               0x1F7
-#define FLAG_0x1F8               0x1F8
-#define FLAG_0x1F9               0x1F9
-#define FLAG_0x1FA               0x1FA
-#define FLAG_0x1FB               0x1FB
-#define FLAG_0x1FC               0x1FC
-#define FLAG_0x1FD               0x1FD
-#define FLAG_0x1FE               0x1FE
-#define FLAG_0x1FF               0x1FF
-#define FLAG_0x200               0x200
-#define FLAG_0x201               0x201
-#define FLAG_0x202               0x202
-#define FLAG_0x203               0x203
-#define FLAG_0x204               0x204
-#define FLAG_0x205               0x205
-#define FLAG_0x206               0x206
-#define FLAG_0x207               0x207
-#define FLAG_0x208               0x208
-#define FLAG_0x209               0x209
-#define FLAG_0x20A               0x20A
-#define FLAG_0x20B               0x20B
-#define FLAG_0x20C               0x20C
-#define FLAG_0x20D               0x20D
-#define FLAG_0x20E               0x20E
-#define FLAG_0x20F               0x20F
-#define FLAG_0x210               0x210
-#define FLAG_0x211               0x211
-#define FLAG_0x212               0x212
-#define FLAG_HIDDEN_ITEM_1F               0x213
-#define FLAG_HIDDEN_ITEM_20               0x214
-#define FLAG_HIDDEN_ITEM_21               0x215
-#define FLAG_HIDDEN_ITEM_22               0x216
-#define FLAG_0x217               0x217
-#define FLAG_0x218               0x218
-#define FLAG_0x219               0x219
-#define FLAG_0x21A               0x21A
-#define FLAG_0x21B               0x21B
-#define FLAG_0x21C               0x21C
-#define FLAG_0x21D               0x21D
-#define FLAG_0x21E               0x21E
-#define FLAG_0x21F               0x21F
-#define FLAG_0x220               0x220
-#define FLAG_0x221               0x221
-#define FLAG_0x222               0x222
-#define FLAG_0x223               0x223
-#define FLAG_0x224               0x224
-#define FLAG_0x225               0x225
-#define FLAG_0x226               0x226
-#define FLAG_0x227               0x227
-#define FLAG_0x228               0x228
-#define FLAG_0x229               0x229
-#define FLAG_0x22A               0x22A
-#define FLAG_0x22B               0x22B
-#define FLAG_0x22C               0x22C
-#define FLAG_0x22D               0x22D
-#define FLAG_0x22E               0x22E
-#define FLAG_0x22F               0x22F
-#define FLAG_0x230               0x230
-#define FLAG_0x231               0x231
-#define FLAG_0x232               0x232
-#define FLAG_0x233               0x233
-#define FLAG_0x234               0x234
-#define FLAG_0x235               0x235
-#define FLAG_0x236               0x236
-#define FLAG_0x237               0x237
-#define FLAG_0x238               0x238
-#define FLAG_0x239               0x239
-#define FLAG_0x23A               0x23A
-#define FLAG_0x23B               0x23B
-#define FLAG_0x23C               0x23C
-#define FLAG_0x23D               0x23D
-#define FLAG_0x23E               0x23E
-#define FLAG_0x23F               0x23F
-#define FLAG_0x240               0x240
-#define FLAG_0x241               0x241
-#define FLAG_0x242               0x242
-#define FLAG_0x243               0x243
-#define FLAG_0x244               0x244
-#define FLAG_0x245               0x245
-#define FLAG_0x246               0x246
-#define FLAG_0x247               0x247
-#define FLAG_0x248               0x248
-#define FLAG_0x249               0x249
-#define FLAG_0x24A               0x24A
-#define FLAG_0x24B               0x24B
-#define FLAG_0x24C               0x24C
-#define FLAG_0x24D               0x24D
-#define FLAG_0x24E               0x24E
-#define FLAG_0x24F               0x24F
-#define FLAG_0x250               0x250
-#define FLAG_0x251               0x251
-#define FLAG_0x252               0x252
-#define FLAG_0x253               0x253
-#define FLAG_HIDDEN_ITEM_BLACK_GLASSES               0x254
-#define FLAG_0x255               0x255
-#define FLAG_0x256               0x256
-#define FLAG_0x257               0x257
-#define FLAG_0x258               0x258
-#define FLAG_0x259               0x259
-#define FLAG_0x25A               0x25A
-#define FLAG_0x25B               0x25B
-#define FLAG_0x25C               0x25C
-#define FLAG_0x25D               0x25D
-#define FLAG_0x25E               0x25E
-#define FLAG_0x25F               0x25F
-#define FLAG_0x260               0x260
-#define FLAG_0x261               0x261
-#define FLAG_0x262               0x262
-#define FLAG_0x263               0x263
-#define FLAG_0x264               0x264
-#define FLAG_0x265               0x265
-#define FLAG_0x266               0x266
-#define FLAG_0x267               0x267
-#define FLAG_0x268               0x268
-#define FLAG_0x269               0x269
-#define FLAG_0x26A               0x26A
-#define FLAG_0x26B               0x26B
-#define FLAG_0x26C               0x26C
-#define FLAG_0x26D               0x26D
-#define FLAG_0x26E               0x26E
-#define FLAG_0x26F               0x26F
-#define FLAG_0x270               0x270
-#define FLAG_0x271               0x271
-#define FLAG_0x272               0x272
-#define FLAG_0x273               0x273
-#define FLAG_0x274               0x274
-#define FLAG_0x275               0x275
-#define FLAG_0x276               0x276
-#define FLAG_0x277               0x277
-#define FLAG_0x278               0x278
-#define FLAG_0x279               0x279
-#define FLAG_0x27A               0x27A
-#define FLAG_0x27B               0x27B
-#define FLAG_0x27C               0x27C
-#define FLAG_0x27D               0x27D
-#define FLAG_0x27E               0x27E
-#define FLAG_0x27F               0x27F
-#define FLAG_0x280               0x280
-#define FLAG_0x281               0x281
-#define FLAG_0x282               0x282
-#define FLAG_0x283               0x283
-#define FLAG_0x284               0x284
-#define FLAG_0x285               0x285
-#define FLAG_0x286               0x286
-#define FLAG_0x287               0x287
-#define FLAG_0x288               0x288
-#define FLAG_0x289               0x289
-#define FLAG_0x28A               0x28A
-#define FLAG_0x28B               0x28B
-#define FLAG_0x28C               0x28C
-#define FLAG_0x28D               0x28D
-#define FLAG_0x28E               0x28E
-#define FLAG_0x28F               0x28F
-#define FLAG_0x290               0x290
-#define FLAG_0x291               0x291
-#define FLAG_0x292               0x292
-#define FLAG_0x293               0x293
-#define FLAG_0x294               0x294
-#define FLAG_0x295               0x295
-#define FLAG_0x296               0x296
-#define FLAG_0x297               0x297
-#define FLAG_0x298               0x298
-#define FLAG_0x299               0x299
-#define FLAG_0x29A               0x29A
-#define FLAG_0x29B               0x29B
-#define FLAG_0x29C               0x29C
-#define FLAG_0x29D               0x29D
-#define FLAG_0x29E               0x29E
-#define FLAG_0x29F               0x29F
-#define FLAG_0x2A0               0x2A0
-#define FLAG_0x2A1               0x2A1
-#define FLAG_0x2A2               0x2A2
-#define FLAG_0x2A3               0x2A3
-#define FLAG_0x2A4               0x2A4
-#define FLAG_0x2A5               0x2A5
-#define FLAG_0x2A6               0x2A6
-#define FLAG_0x2A7               0x2A7
-#define FLAG_0x2A8               0x2A8
-#define FLAG_0x2A9               0x2A9
-#define FLAG_0x2AA               0x2AA
-#define FLAG_0x2AB               0x2AB
-#define FLAG_0x2AC               0x2AC
-#define FLAG_0x2AD               0x2AD
-#define FLAG_0x2AE               0x2AE
-#define FLAG_0x2AF               0x2AF
-#define FLAG_0x2B0               0x2B0
-#define FLAG_0x2B1               0x2B1
-#define FLAG_0x2B2               0x2B2
-#define FLAG_0x2B3               0x2B3
-#define FLAG_0x2B4               0x2B4
-#define FLAG_0x2B5               0x2B5
-#define FLAG_0x2B6               0x2B6
-#define FLAG_0x2B7               0x2B7
-#define FLAG_0x2B8               0x2B8
-#define FLAG_0x2B9               0x2B9
-#define FLAG_0x2BA               0x2BA
-#define FLAG_0x2BB               0x2BB
-#define FLAG_0x2BC               0x2BC
-#define FLAG_0x2BD               0x2BD
-#define FLAG_0x2BE               0x2BE
-#define FLAG_0x2BF               0x2BF
-#define FLAG_0x2C0               0x2C0
-#define FLAG_0x2C1               0x2C1
-#define FLAG_0x2C2               0x2C2
-#define FLAG_0x2C3               0x2C3
-#define FLAG_0x2C4               0x2C4
-#define FLAG_0x2C5               0x2C5
-#define FLAG_0x2C6               0x2C6
-#define FLAG_0x2C7               0x2C7
-#define FLAG_0x2C8               0x2C8
-#define FLAG_0x2C9               0x2C9
-#define FLAG_0x2CA               0x2CA
-#define FLAG_0x2CB               0x2CB
-#define FLAG_0x2CC               0x2CC
-#define FLAG_0x2CD               0x2CD
-#define FLAG_0x2CE               0x2CE
-#define FLAG_0x2CF               0x2CF
-#define FLAG_0x2D0               0x2D0
-#define FLAG_0x2D1               0x2D1
-#define FLAG_0x2D2               0x2D2
-#define FLAG_0x2D3               0x2D3
-#define FLAG_0x2D4               0x2D4
-#define FLAG_0x2D5               0x2D5
-#define FLAG_0x2D6               0x2D6
-#define FLAG_0x2D7               0x2D7
-#define FLAG_0x2D8               0x2D8
-#define FLAG_0x2D9               0x2D9
-#define FLAG_0x2DA               0x2DA
-#define FLAG_0x2DB               0x2DB
-#define FLAG_0x2DC               0x2DC
-#define FLAG_0x2DD               0x2DD
-#define FLAG_0x2DE               0x2DE
-#define FLAG_0x2DF               0x2DF
-#define FLAG_0x2E0               0x2E0
-#define FLAG_0x2E1               0x2E1
-#define FLAG_0x2E2               0x2E2
-#define FLAG_0x2E3               0x2E3
-#define FLAG_0x2E4               0x2E4
-#define FLAG_0x2E5               0x2E5
-#define FLAG_0x2E6               0x2E6
-#define FLAG_0x2E7               0x2E7
-#define FLAG_0x2E8               0x2E8
-#define FLAG_0x2E9               0x2E9
-#define FLAG_0x2EA               0x2EA
-#define FLAG_0x2EB               0x2EB
-#define FLAG_0x2EC               0x2EC
-#define FLAG_0x2ED               0x2ED
-#define FLAG_0x2EE               0x2EE
-#define FLAG_0x2EF               0x2EF
-#define FLAG_0x2F0               0x2F0
-#define FLAG_0x2F1               0x2F1
-#define FLAG_0x2F2               0x2F2
-#define FLAG_0x2F3               0x2F3
-#define FLAG_0x2F4               0x2F4
-#define FLAG_0x2F5               0x2F5
-#define FLAG_0x2F6               0x2F6
-#define FLAG_0x2F7               0x2F7
-#define FLAG_0x2F8               0x2F8
-#define FLAG_0x2F9               0x2F9
-#define FLAG_0x2FA               0x2FA
-#define FLAG_0x2FB               0x2FB
-#define FLAG_0x2FC               0x2FC
-#define FLAG_0x2FD               0x2FD
-#define FLAG_0x2FE               0x2FE
-#define FLAG_0x2FF               0x2FF
-#define FLAG_0x300               0x300
-#define FLAG_0x301               0x301
-#define FLAG_0x302               0x302
-#define FLAG_0x303               0x303
-#define FLAG_0x304               0x304
-#define FLAG_0x305               0x305
-#define FLAG_0x306               0x306
-#define FLAG_0x307               0x307
-#define FLAG_0x308               0x308
-#define FLAG_0x309               0x309
-#define FLAG_0x30A               0x30A
-#define FLAG_0x30B               0x30B
-#define FLAG_0x30C               0x30C
-#define FLAG_0x30D               0x30D
-#define FLAG_0x30E               0x30E
-#define FLAG_0x30F               0x30F
-#define FLAG_0x310               0x310
-#define FLAG_0x311               0x311
-#define FLAG_0x312               0x312
-#define FLAG_0x313               0x313
-#define FLAG_0x314               0x314
-#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_0x319               0x319
-#define FLAG_0x31A               0x31A
-#define FLAG_0x31B               0x31B
-#define FLAG_0x31C               0x31C
-#define FLAG_0x31D               0x31D
-#define FLAG_0x31E               0x31E
-#define FLAG_0x31F               0x31F
-#define FLAG_0x320               0x320
-#define FLAG_0x321               0x321
-#define FLAG_0x322               0x322
-#define FLAG_0x323               0x323
-#define FLAG_0x324               0x324
-#define FLAG_0x325               0x325
-#define FLAG_0x326               0x326
-#define FLAG_0x327               0x327
-#define FLAG_0x328               0x328
-#define FLAG_0x329               0x329
-#define FLAG_0x32A               0x32A
-#define FLAG_0x32B               0x32B
-#define FLAG_0x32C               0x32C
-#define FLAG_0x32D               0x32D
-#define FLAG_0x32E               0x32E
-#define FLAG_0x32F               0x32F
-#define FLAG_0x330               0x330
-#define FLAG_0x331               0x331
-#define FLAG_0x332               0x332
-#define FLAG_0x333               0x333
-#define FLAG_0x334               0x334
-#define FLAG_0x335               0x335
-#define FLAG_0x336               0x336
-#define FLAG_0x337               0x337
-#define FLAG_0x338               0x338
-#define FLAG_0x339               0x339
-#define FLAG_0x33A               0x33A
-#define FLAG_0x33B               0x33B
-#define FLAG_0x33C               0x33C
-#define FLAG_0x33D               0x33D
-#define FLAG_0x33E               0x33E
-#define FLAG_0x33F               0x33F
-#define FLAG_0x340               0x340
-#define FLAG_0x341               0x341
-#define FLAG_0x342               0x342
-#define FLAG_0x343               0x343
-#define FLAG_0x344               0x344
-#define FLAG_0x345               0x345
-#define FLAG_0x346               0x346
-#define FLAG_0x347               0x347
-#define FLAG_0x348               0x348
-#define FLAG_0x349               0x349
-#define FLAG_0x34A               0x34A
-#define FLAG_0x34B               0x34B
-#define FLAG_0x34C               0x34C
-#define FLAG_0x34D               0x34D
-#define FLAG_0x34E               0x34E
-#define FLAG_0x34F               0x34F
-#define FLAG_0x350               0x350
-#define FLAG_0x351               0x351
-#define FLAG_0x352               0x352
-#define FLAG_0x353               0x353
-#define FLAG_0x354               0x354
-#define FLAG_0x355               0x355
-#define FLAG_0x356               0x356
-#define FLAG_0x357               0x357
-#define FLAG_0x358               0x358
-#define FLAG_0x359               0x359
-#define FLAG_0x35A               0x35A
-#define FLAG_0x35B               0x35B
-#define FLAG_0x35C               0x35C
-#define FLAG_0x35D               0x35D
-#define FLAG_0x35E               0x35E
-#define FLAG_0x35F               0x35F
-#define FLAG_0x360               0x360
-#define FLAG_0x361               0x361
-#define FLAG_0x362               0x362
-#define FLAG_0x363               0x363
-#define FLAG_0x364               0x364
-#define FLAG_0x365               0x365
-#define FLAG_0x366               0x366
-#define FLAG_0x367               0x367
-#define FLAG_0x368               0x368
-#define FLAG_0x369               0x369
-#define FLAG_0x36A               0x36A
-#define FLAG_0x36B               0x36B
-#define FLAG_0x36C               0x36C
-#define FLAG_0x36D               0x36D
-#define FLAG_0x36E               0x36E
-#define FLAG_0x36F               0x36F
-#define FLAG_0x370               0x370
-#define FLAG_0x371               0x371
-#define FLAG_0x372               0x372
-#define FLAG_0x373               0x373
-#define FLAG_0x374               0x374
-#define FLAG_0x375               0x375
-#define FLAG_0x376               0x376
-#define FLAG_0x377               0x377
-#define FLAG_0x378               0x378
-#define FLAG_0x379               0x379
-#define FLAG_0x37A               0x37A
-#define FLAG_0x37B               0x37B
-#define FLAG_0x37C               0x37C
-#define FLAG_0x37D               0x37D
-#define FLAG_0x37E               0x37E
-#define FLAG_0x37F               0x37F
-#define FLAG_0x380               0x380
-#define FLAG_0x381               0x381
-#define FLAG_0x382               0x382
-#define FLAG_0x383               0x383
-#define FLAG_0x384               0x384
-#define FLAG_0x385               0x385
-#define FLAG_0x386               0x386
-#define FLAG_0x387               0x387
-#define FLAG_0x388               0x388
-#define FLAG_0x389               0x389
-#define FLAG_0x38A               0x38A
-#define FLAG_0x38B               0x38B
-#define FLAG_0x38C               0x38C
-#define FLAG_0x38D               0x38D
-#define FLAG_0x38E               0x38E
-#define FLAG_0x38F               0x38F
-#define FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON               0x390
-#define FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON               0x391
-#define FLAG_0x392               0x392
-#define FLAG_0x393               0x393
-#define FLAG_0x394               0x394
-#define FLAG_0x395               0x395
-#define FLAG_0x396               0x396
-#define FLAG_0x397               0x397
-#define FLAG_0x398               0x398
-#define FLAG_0x399               0x399
-#define FLAG_0x39A               0x39A
-#define FLAG_0x39B               0x39B
-#define FLAG_0x39C               0x39C
-#define FLAG_0x39D               0x39D
-#define FLAG_0x39E               0x39E
-#define FLAG_0x39F               0x39F
-#define FLAG_0x3A0               0x3A0
-#define FLAG_0x3A1               0x3A1
-#define FLAG_0x3A2               0x3A2
-#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1               0x3A3
-#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2               0x3A4
-#define FLAG_0x3A5               0x3A5
-#define FLAG_0x3A6               0x3A6
-#define FLAG_0x3A7               0x3A7
-#define FLAG_0x3A8               0x3A8
-#define FLAG_0x3A9               0x3A9
-#define FLAG_0x3AA               0x3AA
-#define FLAG_0x3AB               0x3AB
-#define FLAG_0x3AC               0x3AC
-#define FLAG_0x3AD               0x3AD
-#define FLAG_0x3AE               0x3AE
-#define FLAG_0x3AF               0x3AF
-#define FLAG_0x3B0               0x3B0
-#define FLAG_0x3B1               0x3B1
-#define FLAG_0x3B2               0x3B2
-#define FLAG_0x3B3               0x3B3
-#define FLAG_0x3B4               0x3B4
-#define FLAG_0x3B5               0x3B5
-#define FLAG_0x3B6               0x3B6
-#define FLAG_0x3B7               0x3B7
-#define FLAG_0x3B8               0x3B8
-#define FLAG_0x3B9               0x3B9
-#define FLAG_0x3BA               0x3BA
-#define FLAG_0x3BB               0x3BB
-#define FLAG_0x3BC               0x3BC
-#define FLAG_0x3BD               0x3BD
-#define FLAG_0x3BE               0x3BE
-#define FLAG_0x3BF               0x3BF
-#define FLAG_0x3C0               0x3C0
-#define FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION               0x3C1
-#define FLAG_0x3C2               0x3C2
-#define FLAG_0x3C3               0x3C3
-#define FLAG_0x3C4               0x3C4
-#define FLAG_0x3C5               0x3C5
-#define FLAG_0x3C6               0x3C6
-#define FLAG_0x3C7               0x3C7
-#define FLAG_0x3C8               0x3C8
-#define FLAG_0x3C9               0x3C9
-#define FLAG_0x3CA               0x3CA
-#define FLAG_0x3CB               0x3CB
-#define FLAG_0x3CC               0x3CC
-#define FLAG_0x3CD               0x3CD
-#define FLAG_0x3CE               0x3CE
-#define FLAG_0x3CF               0x3CF
-#define FLAG_0x3D0               0x3D0
-#define FLAG_0x3D1               0x3D1
-#define FLAG_0x3D2               0x3D2
-#define FLAG_0x3D3               0x3D3
-#define FLAG_0x3D4               0x3D4
-#define FLAG_0x3D5               0x3D5
-#define FLAG_0x3D6               0x3D6
-#define FLAG_0x3D7               0x3D7
-#define FLAG_0x3D8               0x3D8
-#define FLAG_0x3D9               0x3D9
-#define FLAG_0x3DA               0x3DA
-#define FLAG_0x3DB               0x3DB
-#define FLAG_0x3DC               0x3DC
-#define FLAG_0x3DD               0x3DD
-#define FLAG_0x3DE               0x3DE
-#define FLAG_0x3DF               0x3DF
-#define FLAG_0x3E0               0x3E0
-#define FLAG_0x3E1               0x3E1
-#define FLAG_0x3E2               0x3E2
-#define FLAG_0x3E3               0x3E3
-#define FLAG_0x3E4               0x3E4
-#define FLAG_0x3E5               0x3E5
-#define FLAG_0x3E6               0x3E6
-#define FLAG_0x3E7               0x3E7
-#define FLAG_0x3E8               0x3E8
-#define FLAG_0x3E9               0x3E9
-#define FLAG_0x3EA               0x3EA
-#define FLAG_0x3EB               0x3EB
-#define FLAG_0x3EC               0x3EC
-#define FLAG_0x3ED               0x3ED
-#define FLAG_0x3EE               0x3EE
-#define FLAG_0x3EF               0x3EF
-#define FLAG_0x3F0               0x3F0
-#define FLAG_0x3F1               0x3F1
-#define FLAG_0x3F2               0x3F2
-#define FLAG_0x3F3               0x3F3
-#define FLAG_0x3F4               0x3F4
-#define FLAG_0x3F5               0x3F5
-#define FLAG_0x3F6               0x3F6
-#define FLAG_0x3F7               0x3F7
-#define FLAG_0x3F8               0x3F8
-#define FLAG_0x3F9               0x3F9
-#define FLAG_0x3FA               0x3FA
-#define FLAG_0x3FB               0x3FB
-#define FLAG_0x3FC               0x3FC
-#define FLAG_0x3FD               0x3FD
-#define FLAG_0x3FE               0x3FE
-#define FLAG_0x3FF               0x3FF
-#define FLAG_0x400               0x400
-#define FLAG_0x401               0x401
-#define FLAG_0x402               0x402
-#define FLAG_0x403               0x403
-#define FLAG_0x404               0x404
-#define FLAG_0x405               0x405
-#define FLAG_0x406               0x406
-#define FLAG_0x407               0x407
-#define FLAG_0x408               0x408
-#define FLAG_0x409               0x409
-#define FLAG_0x40A               0x40A
-#define FLAG_0x40B               0x40B
-#define FLAG_0x40C               0x40C
-#define FLAG_0x40D               0x40D
-#define FLAG_0x40E               0x40E
-#define FLAG_0x40F               0x40F
-#define FLAG_0x410               0x410
-#define FLAG_0x411               0x411
-#define FLAG_0x412               0x412
-#define FLAG_0x413               0x413
-#define FLAG_0x414               0x414
-#define FLAG_0x415               0x415
-#define FLAG_0x416               0x416
-#define FLAG_0x417               0x417
-#define FLAG_0x418               0x418
-#define FLAG_0x419               0x419
-#define FLAG_0x41A               0x41A
-#define FLAG_0x41B               0x41B
-#define FLAG_0x41C               0x41C
-#define FLAG_0x41D               0x41D
-#define FLAG_0x41E               0x41E
-#define FLAG_0x41F               0x41F
-#define FLAG_0x420               0x420
-#define FLAG_0x421               0x421
-#define FLAG_0x422               0x422
-#define FLAG_0x423               0x423
-#define FLAG_0x424               0x424
-#define FLAG_0x425               0x425
-#define FLAG_0x426               0x426
-#define FLAG_0x427               0x427
-#define FLAG_0x428               0x428
-#define FLAG_0x429               0x429
-#define FLAG_0x42A               0x42A
-#define FLAG_0x42B               0x42B
-#define FLAG_0x42C               0x42C
-#define FLAG_0x42D               0x42D
-#define FLAG_0x42E               0x42E
-#define FLAG_0x42F               0x42F
-#define FLAG_0x430               0x430
-#define FLAG_0x431               0x431
-#define FLAG_0x432               0x432
-#define FLAG_0x433               0x433
-#define FLAG_0x434               0x434
-#define FLAG_0x435               0x435
-#define FLAG_0x436               0x436
-#define FLAG_0x437               0x437
-#define FLAG_0x438               0x438
-#define FLAG_0x439               0x439
-#define FLAG_0x43A               0x43A
-#define FLAG_0x43B               0x43B
-#define FLAG_0x43C               0x43C
-#define FLAG_0x43D               0x43D
-#define FLAG_0x43E               0x43E
-#define FLAG_0x43F               0x43F
-#define FLAG_0x440               0x440
-#define FLAG_0x441               0x441
-#define FLAG_0x442               0x442
-#define FLAG_0x443               0x443
-#define FLAG_0x444               0x444
-#define FLAG_0x445               0x445
-#define FLAG_0x446               0x446
-#define FLAG_0x447               0x447
-#define FLAG_0x448               0x448
-#define FLAG_0x449               0x449
-#define FLAG_0x44A               0x44A
-#define FLAG_0x44B               0x44B
-#define FLAG_0x44C               0x44C
-#define FLAG_0x44D               0x44D
-#define FLAG_0x44E               0x44E
-#define FLAG_0x44F               0x44F
-#define FLAG_0x450               0x450
-#define FLAG_0x451               0x451
-#define FLAG_0x452               0x452
-#define FLAG_0x453               0x453
-#define FLAG_0x454               0x454
-#define FLAG_0x455               0x455
-#define FLAG_0x456               0x456
-#define FLAG_0x457               0x457
-#define FLAG_0x458               0x458
-#define FLAG_0x459               0x459
-#define FLAG_0x45A               0x45A
-#define FLAG_0x45B               0x45B
-#define FLAG_0x45C               0x45C
-#define FLAG_0x45D               0x45D
-#define FLAG_0x45E               0x45E
-#define FLAG_0x45F               0x45F
-#define FLAG_0x460               0x460
-#define FLAG_0x461               0x461
-#define FLAG_0x462               0x462
-#define FLAG_0x463               0x463
-#define FLAG_0x464               0x464
-#define FLAG_0x465               0x465
-#define FLAG_0x466               0x466
-#define FLAG_0x467               0x467
-#define FLAG_0x468               0x468
-#define FLAG_0x469               0x469
-#define FLAG_0x46A               0x46A
-#define FLAG_0x46B               0x46B
-#define FLAG_0x46C               0x46C
-#define FLAG_0x46D               0x46D
-#define FLAG_0x46E               0x46E
-#define FLAG_0x46F               0x46F
-#define FLAG_0x470               0x470
-#define FLAG_0x471               0x471
-#define FLAG_0x472               0x472
-#define FLAG_0x473               0x473
-#define FLAG_0x474               0x474
-#define FLAG_0x475               0x475
-#define FLAG_0x476               0x476
-#define FLAG_0x477               0x477
-#define FLAG_0x478               0x478
-#define FLAG_0x479               0x479
-#define FLAG_0x47A               0x47A
-#define FLAG_0x47B               0x47B
-#define FLAG_0x47C               0x47C
-#define FLAG_0x47D               0x47D
-#define FLAG_0x47E               0x47E
-#define FLAG_0x47F               0x47F
-#define FLAG_0x480               0x480
-#define FLAG_0x481               0x481
-#define FLAG_0x482               0x482
-#define FLAG_0x483               0x483
-#define FLAG_0x484               0x484
-#define FLAG_0x485               0x485
-#define FLAG_0x486               0x486
-#define FLAG_0x487               0x487
-#define FLAG_0x488               0x488
-#define FLAG_0x489               0x489
-#define FLAG_0x48A               0x48A
-#define FLAG_0x48B               0x48B
-#define FLAG_0x48C               0x48C
-#define FLAG_0x48D               0x48D
-#define FLAG_0x48E               0x48E
-#define FLAG_0x48F               0x48F
-#define FLAG_0x490               0x490
-#define FLAG_0x491               0x491
-#define FLAG_0x492               0x492
+#define FLAG_0x1F5               0x1F5 // trick house end room?
+
+// Hidden Items -- sorted by location
+#define FLAG_HIDDEN_ITEMS_START               0x1F4
+#define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS        (FLAG_HIDDEN_ITEMS_START + 0x08)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD   (FLAG_HIDDEN_ITEMS_START + 0x09)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL         (FLAG_HIDDEN_ITEMS_START + 0x0A)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL     (FLAG_HIDDEN_ITEMS_START + 0x0B)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x0D)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM       (FLAG_HIDDEN_ITEMS_START + 0x24)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x26)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE  (FLAG_HIDDEN_ITEMS_START + 0x0E)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL   (FLAG_HIDDEN_ITEMS_START + 0x0F)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST     (FLAG_HIDDEN_ITEMS_START + 0x10)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL        (FLAG_HIDDEN_ITEMS_START + 0x11)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON         (FLAG_HIDDEN_ITEMS_START + 0x13)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD (FLAG_HIDDEN_ITEMS_START + 0x12)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL    (FLAG_HIDDEN_ITEMS_START + 0x14)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD   (FLAG_HIDDEN_ITEMS_START + 0x0C)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE  (FLAG_HIDDEN_ITEMS_START + 0x15)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP       (FLAG_HIDDEN_ITEMS_START + 0x16)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x17)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD   (FLAG_HIDDEN_ITEMS_START + 0x18)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL   (FLAG_HIDDEN_ITEMS_START + 0x1A)
+#define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x1C)
+#define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 0x00)
+#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY (FLAG_HIDDEN_ITEMS_START + 0x1F)
+#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY (FLAG_HIDDEN_ITEMS_START + 0x20)
+#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY (FLAG_HIDDEN_ITEMS_START + 0x21)
+#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY (FLAG_HIDDEN_ITEMS_START + 0x22)
+#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x65)
+#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC    (FLAG_HIDDEN_ITEMS_START + 0x66)
+#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x67)
+#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON    (FLAG_HIDDEN_ITEMS_START + 0x68)
+#define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 (FLAG_HIDDEN_ITEMS_START + 0x30)
+#define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 (FLAG_HIDDEN_ITEMS_START + 0x31)
+#define FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x4C)
+#define FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL  (FLAG_HIDDEN_ITEMS_START + 0x4D)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x1B)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP       (FLAG_HIDDEN_ITEMS_START + 0x2B)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL   (FLAG_HIDDEN_ITEMS_START + 0x4B)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x1D)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER  (FLAG_HIDDEN_ITEMS_START + 0x4E)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC       (FLAG_HIDDEN_ITEMS_START + 0x4F)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x50)
+#define FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH (FLAG_HIDDEN_ITEMS_START + 0x6D)
+#define FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x5F)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION          (FLAG_HIDDEN_ITEMS_START + 0x3A)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 (FLAG_HIDDEN_ITEMS_START + 0x3B)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 (FLAG_HIDDEN_ITEMS_START + 0x3C)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL       (FLAG_HIDDEN_ITEMS_START + 0x3D)
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR    (FLAG_HIDDEN_ITEMS_START + 0x52)
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL (FLAG_HIDDEN_ITEMS_START + 0x53)
+#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6A)
+#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC       (FLAG_HIDDEN_ITEMS_START + 0x6B)
+#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP        (FLAG_HIDDEN_ITEMS_START + 0x6C)
+#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 0x69)
+#define FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS (FLAG_HIDDEN_ITEMS_START + 0x23)
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x51)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2C)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL    (FLAG_HIDDEN_ITEMS_START + 0x3E)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_POTION       (FLAG_HIDDEN_ITEMS_START + 0x25)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE     (FLAG_HIDDEN_ITEMS_START + 0x55)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE  (FLAG_HIDDEN_ITEMS_START + 0x58)
+#define FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x59)
+#define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL   (FLAG_HIDDEN_ITEMS_START + 0x6F)
+#define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL   (FLAG_HIDDEN_ITEMS_START + 0x3F)
+#define FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST    (FLAG_HIDDEN_ITEMS_START + 0x2E)
+#define FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x2F)
+#define FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x56)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE        (FLAG_HIDDEN_ITEMS_START + 0x32)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x34)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL    (FLAG_HIDDEN_ITEMS_START + 0x33)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER         (FLAG_HIDDEN_ITEMS_START + 0x40)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5A)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5B)
+#define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE     (FLAG_HIDDEN_ITEMS_START + 0x36)
+#define FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x35)
+#define FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL  (FLAG_HIDDEN_ITEMS_START + 0x41)
+#define FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL  (FLAG_HIDDEN_ITEMS_START + 0x37)
+#define FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST   (FLAG_HIDDEN_ITEMS_START + 0x02)
+#define FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN    (FLAG_HIDDEN_ITEMS_START + 0x38)
+#define FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x39)
+#define FLAG_HIDDEN_ITEM_ROUTE_113_ETHER  (FLAG_HIDDEN_ITEMS_START + 0x03)
+#define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32  (FLAG_HIDDEN_ITEMS_START + 0x1E)
+#define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x62)
+#define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x04)
+#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x2A)
+#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x61)
+#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION  (FLAG_HIDDEN_ITEMS_START + 0x2D)
+#define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES (FLAG_HIDDEN_ITEMS_START + 0x60)
+#define FLAG_HIDDEN_ITEM_ROUTE_117_REPEL (FLAG_HIDDEN_ITEMS_START + 0x48)
+#define FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x42)
+#define FLAG_HIDDEN_ITEM_ROUTE_118_IRON        (FLAG_HIDDEN_ITEMS_START + 0x43)
+#define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM    (FLAG_HIDDEN_ITEMS_START + 0x05)
+#define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x06)
+#define FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL  (FLAG_HIDDEN_ITEMS_START + 0x44)
+#define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER  (FLAG_HIDDEN_ITEMS_START + 0x57)
+#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 (FLAG_HIDDEN_ITEMS_START + 0x47)
+#define FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE       (FLAG_HIDDEN_ITEMS_START + 0x54)
+#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 (FLAG_HIDDEN_ITEMS_START + 0x45)
+#define FLAG_HIDDEN_ITEM_ROUTE_120_ZINC         (FLAG_HIDDEN_ITEMS_START + 0x46)
+#define FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP      (FLAG_HIDDEN_ITEMS_START + 0x27)
+#define FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET     (FLAG_HIDDEN_ITEMS_START + 0x28)
+#define FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL  (FLAG_HIDDEN_ITEMS_START + 0x49)
+#define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x64)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL  (FLAG_HIDDEN_ITEMS_START + 0x07)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE       (FLAG_HIDDEN_ITEMS_START + 0x29)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x4A)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP        (FLAG_HIDDEN_ITEMS_START + 0x63)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY   (FLAG_HIDDEN_ITEMS_START + 0x6E)
+#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x5C)
+#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5D)
+#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5E)
+
+// Event Flags
+#define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG                      0x2BC 
+#define FLAG_HIDE_APPRENTICE                                        0x2BD 
+#define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN                0x2BE 
+#define FLAG_HIDE_UNION_ROOM_PLAYER_1                               0x2BF 
+#define FLAG_HIDE_UNION_ROOM_PLAYER_2                               0x2C0 
+#define FLAG_HIDE_UNION_ROOM_PLAYER_3                               0x2C1 
+#define FLAG_HIDE_UNION_ROOM_PLAYER_4                               0x2C2 
+#define FLAG_HIDE_UNION_ROOM_PLAYER_5                               0x2C3 
+#define FLAG_HIDE_UNION_ROOM_PLAYER_6                               0x2C4 
+#define FLAG_HIDE_UNION_ROOM_PLAYER_7                               0x2C5 
+#define FLAG_HIDE_UNION_ROOM_PLAYER_8                               0x2C6 
+#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1               0x2C7 
+#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2               0x2C8 
+#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3               0x2C9 
+#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4               0x2CA 
+#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5               0x2CB 
+#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6               0x2CC 
+#define FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS            0x2CD 
+#define FLAG_HIDE_MEW                                               0x2CE 
+#define FLAG_HIDE_ROUTE_104_RIVAL                                   0x2CF 
+#define FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE                  0x2D0 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH                  0x2D1 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM          0x2D2 
+#define FLAG_HIDE_ROUTE_103_RIVAL                                   0x2D3 
+#define FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE                    0x2D4 
+#define FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT                        0x2D5 
+#define FLAG_HIDE_PETALBURG_CITY_WALLY                              0x2D6 
+#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY   0x2D7 
+#define FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT                        0x2D8 
+#define FLAG_UNUSED_0x2D9                                           0x2D9 
+#define FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER                     0x2DA 
+#define FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT                          0x2DB 
+#define FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1                    0x2DC 
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2                   0x2DD 
+#define FLAG_HIDE_PLAYERS_HOUSE_DAD                                 0x2DE 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING      0x2DF 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING          0x2E0 
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY    0x2E1 
+#define FLAG_HIDE_ROUTE_104_MR_BRINEY                               0x2E2 
+#define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY                           0x2E3 
+#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN                            0x2E4 
+#define FLAG_HIDE_ROUTE_108_MR_BRINEY                               0x2E5 
+#define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT                          0x2E6 
+#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN                       0x2E7 
+#define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT                          0x2E8 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN            0x2E9 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN                0x2EA 
+#define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION                  0x2EB 
+#define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER                  0x2EC 
+#define FLAG_HIDE_SLATEPORT_CITY_SCOTT                              0x2ED 
+#define FLAG_HIDE_ROUTE_101_ZIGZAGOON                               0x2EE 
+#define FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY                           0x2EF 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE                       0x2F0 
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN              0x2F1 
+#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1          0x2F2 
+#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2          0x2F3 
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA          0x2F4 
+#define FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM              0x2F5 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM                0x2F6 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM                    0x2F7 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM      0x2F8 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK              0x2F9 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK                  0x2FA 
+#define FLAG_HIDE_DEOXYS                                            0x2FB 
+#define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE                      0x2FC 
+#define FLAG_HIDE_MAUVILLE_CITY_SCOTT                               0x2FD 
+#define FLAG_HIDE_VERDANTURF_TOWN_SCOTT                             0x2FE 
+#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT                  0x2FF 
+#define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE                        0x300 
+#define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE                      0x301 
+#define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE                          0x302 
+#define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE                         0x303 
+#define FLAG_HIDE_PETALYBURG_GYM_NORMAN                             0x304 
+#define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2                         0x305 
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1         0x306 
+#define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR                           0x307 
+#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1                          0x308 
+#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2                          0x309 
+#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3                          0x30A 
+#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4                          0x30B 
+#define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS                          0x30C 
+#define FLAG_HIDE_PETALBURG_GYM_GREETER                             0x30D 
+#define FLAG_HIDE_MARINE_CAVE_KYOGRE                                0x30E 
+#define FLAG_HIDE_TERRA_CAVE_GROUDON                                0x30F 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM          0x310 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM              0x311 
+#define FLAG_HIDE_ROUTE_119_SCOTT                                   0x312 
+#define FLAG_HIDE_LILCOVE_MOTEL_SCOTT                               0x313 
+#define FLAG_HIDE_MOSSDEEP_CITY_SCOTT                               0x314 
+#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_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT               0x319 
+#define FLAG_HIDE_LITTLEROOT_TOWN_RIVAL                             0x31A 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCH                             0x31B 
+#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1                          0x31C 
+#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1                          0x31D 
+#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1                          0x31E 
+#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3                          0x31F 
+#define FLAG_HIDE_LUGIA                                             0x320 
+#define FLAG_HIDE_HOOH                                              0x321 
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER                    0x322 
+#define FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER                   0x323 
+#define FLAG_HIDE_MAUVILLE_CITY_WALLY                               0x324 
+#define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE                        0x325 
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY                0x326 
+#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN                          0x327 
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN            0x328 
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE         0x329 
+#define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT                           0x32A 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL     0x32B 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE      0x32C 
+#define FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN                     0x32D 
+#define FLAG_HIDE_RUSBORO_CITY_RIVAL                                0x32E 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL     0x32F 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE                           0x330 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL       0x331 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL           0x332 
+#define FLAG_HIDE_ROUTE_112_TEAM_MAGMA                              0x333 
+#define FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE                        0x334 
+#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE         0x335 
+#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE         0x336 
+#define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA                          0x337 
+#define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE                        0x338 
+#define FLAG_UNUSED_0x339                                           0x339 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE                            0x33A 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE                             0x33B 
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE                     0x33C 
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE                      0x33D 
+#define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE                       0x33E 
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS               0x33F 
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS      0x340 
+#define FLAG_HIDE_GRANITE_CAVE_STEVEN                               0x341 
+#define FLAG_HIDE_ROUTE_128_STEVEN                                  0x342 
+#define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY                       0x343 
+#define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT              0x344 
+#define FLAG_HIDE_ROUTE_110_BIRCH                                   0x345 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA     0x346 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1                             0x347 
+#define FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN                      0x348 
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN               0x349 
+#define FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO                         0x34A 
+#define FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY                      0x34B 
+#define FLAG_HIDE_RUSTBORO_CITY_SCIENTIST                           0x34C 
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT                  0x34D 
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE                      0x34E 
+#define FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD                           0x34F 
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW            0x350 
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL          0x351 
+#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2                        0x352 
+#define FLAG_HIDE_ROUTE_119_RIVAL                                   0x353 
+#define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS                         0x354 
+#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1                        0x355 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS                         0x356 
+#define FLAG_HIDE_SKY_PILLAR_WALLACE                                0x357 
+#define FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE                              0x358 
+#define FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS                              0x359 
+#define FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY                       0x35A 
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1                   0x35B 
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL                    0x35C 
+#define FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL                           0x35D 
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA          0x35E 
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN              0x35F 
+#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1           0x360 
+#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2           0x361 
+#define FLAG_HIDE_PETALBURG_GYM_WALLY                               0x362 
+#define FLAG_UNKNOWN_0x363                                          0x363 
+#define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN                           0x364 
+#define FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY          0x365 
+#define FLAG_HIDE_LANETTES_HOUSE_LANETTE                            0x366 
+#define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE                  0x367 
+#define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN                          0x368 
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT            0x369 
+#define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL                           0x36A 
+#define FLAG_HIDE_ROUTE_111_DESERT_RIVAL                            0x36B 
+#define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL                           0x36C 
+#define FLAG_HIDE_MT_CHIMNEY_TRAINERS                               0x36D 
+#define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT                         0x36E 
+#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN                            0x36F 
+#define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO                              0x370 
+#define FLAG_HIDE_BRINEYS_HOUSE_PEEKO                               0x371 
+#define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA                          0x372 
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS         0x373 
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1     0x374 
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2     0x375 
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE           0x376 
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN    0x377 
+#define FLAG_HIDE_BATTLE_TOWER_OPPONENT                             0x378 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL                  0x379 
+#define FLAG_HIDE_ROUTE_119_TEAM_AQUA                               0x37A 
+#define FLAG_HIDE_ROUTE_116_MR_BRINEY                               0x37B 
+#define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS                      0x37C 
+#define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS                      0x37D 
+#define FLAG_HIDE_ROUTE_116_TUNNELER                                0x37E 
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2         0x37F 
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380          0x380 
+#define FLAG_HIDE_ROUTE_101_BIRCH                                   0x381 
+#define FLAG_HIDE_ROUTE_103_BIRCH                                   0x382 
+#define FLAG_HIDE_TRICK_HOUSE_END_MAN                               0x383 
+#define FLAG_HIDE_ROUTE_110_TEAM_AQUA                               0x384 
+#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2                          0x385 
+#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2                          0x386 
+#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2                          0x387 
+#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3                          0x388 
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS                     0x389 
+#define FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST                      0x38A 
+#define FLAG_HIDE_FALLARBOR_AZURILL                                 0x38B 
+#define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT                   0x38C 
+#define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR                      0x38D 
+#define FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE                         0x38E 
+#define FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON              0x38F 
+#define FLAG_HIDE_MAUVILLE_CITY_WATTSON                             0x390 
+#define FLAG_HIDE_MAUVILLE_GYM_WATTSON                              0x391 
+#define FLAG_0x392                                                  0x392 
+#define FLAG_0x393                                                  0x393 
+#define FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE                             0x394 
+#define FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA                          0x395 
+#define FLAG_HIDE_BATTLE_TOWER_REPORTER                             0x396 
+#define FLAG_HIDE_ROUTE_110_RIVAL_1                                 0x397 
+#define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL                              0x398 
+#define FLAG_HIDE_CHAMPIONS_ROOM_BIRCH                              0x399 
+#define FLAG_HIDE_ROUTE_110_RIVAL_2                                 0x39A 
+#define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE                           0x39B 
+#define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS                               0x39C 
+#define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS                      0x39D 
+#define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA                              0x39E 
+#define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA                             0x39F 
+#define FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO                      0x3A0 
+#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1                            0x3A1 
+#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2                            0x3A2 
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1                             0x3A3 
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2                             0x3A4 
+#define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL                      0x3A5 
+#define FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL                     0x3A6 
+#define FLAG_HIDE_REGIROCK                                          0x3A7 
+#define FLAG_HIDE_REGICE                                            0x3A8 
+#define FLAG_HIDE_REGISTEEL                                         0x3A9 
+#define FLAG_HIDE_METEOR_FALLS_TEAM_AQUA                            0x3AA 
+#define FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA                           0x3AB 
+#define FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN                      0x3AC 
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT               0x3AD 
+#define FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO                          0x3AE 
+#define FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW                 0x3AF 
+#define FLAG_HIDE_ROUTE_128_ARCHIE                                  0x3B0 
+#define FLAG_HIDE_ROUTE_128_MAXIE                                   0x3B1 
+#define FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS                       0x3B2 
+#define FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE                          0x3B3 
+#define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN                        0x3B4 
+#define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE              0x3B5 
+#define FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY                       0x3B6 
+#define FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER                       0x3B7 
+#define FLAG_0x3B8                                                  0x3B8 
+#define FLAG_0x3B9                                                  0x3B9 
+#define FLAG_0x3BA                                                  0x3BA 
+#define FLAG_0x3BB                                                  0x3BB 
+#define FLAG_0x3BC                                                  0x3BC 
+#define FLAG_0x3BD                                                  0x3BD 
+#define FLAG_0x3BE                                                  0x3BE 
+#define FLAG_0x3BF                                                  0x3BF 
+#define FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN                        0x3C0 
+#define FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION                       0x3C1 
+#define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN      0x3C2 
+#define FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL                          0x3C3 
+#define FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL                          0x3C4 
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT 0x3C5 
+#define FLAG_HIDE_ROUTE_118_STEVEN                                  0x3C6 
+#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN                0x3C7 
+#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL       0x3C8 
+#define FLAG_HIDE_FORTREE_CITY_KECLEON                              0x3C9 
+#define FLAG_HIDE_ROUTE_120_KECLEON_1                               0x3CA 
+#define FLAG_HIDE_LILYCOVE_CITY_RIVAL                               0x3CB 
+#define FLAG_0x3CC                                                  0x3CC 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN                            0x3CD 
+#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1                            0x3CE 
+#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2                            0x3CF 
+#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3                            0x3D0 
+#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1                      0x3D1 
+#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2                      0x3D2 
+#define FLAG_HIDE_OLDALE_TOWN_RIVAL                                 0x3D3 
+#define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE      0x3D4 
+#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE                          0x3D5 
+#define FLAG_HIDE_ROUTE_120_KECLEON_2                               0x3D6 
+#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN                        0x3D7 
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN          0x3D8 
+#define FLAG_HIDE_ROUTE_120_KECLEON_3                               0x3D9 
+#define FLAG_HIDE_ROUTE_120_KECLEON_4                               0x3DA 
+#define FLAG_HIDE_ROUTE_120_KECLEON_5                               0x3DB 
+#define FLAG_HIDE_ROUTE_120_KECLEON_6                               0x3DC 
+#define FLAG_HIDE_ROUTE_119_KECLEON_1                               0x3DD 
+#define FLAG_HIDE_ROUTE_119_KECLEON_2                               0x3DE 
+#define FLAG_HIDE_ROUTE_101_BOY                                     0x3DF 
+#define FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M                 0x3E0 
+#define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY                      0x3E1 
+#define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY                       0x3E2 
+#define FLAG_HIDE_PETALBURG_CITY_SCOTT                              0x3E3 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA                          0x3E4 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE                            0x3E5 
+#define FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON                           0x3E6 
+#define FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT                0x3E7 
+
+// Item Ball Flags
+#define FLAG_ITEM_ROUTE_102_POTION                               0x3E8 
+#define FLAG_ITEM_ROUTE_116_X_SPECIAL                            0x3E9 
+#define FLAG_ITEM_ROUTE_104_PP_UP                                0x3EA 
+#define FLAG_ITEM_ROUTE_105_IRON                                 0x3EB 
+#define FLAG_ITEM_ROUTE_106_PROTEIN                              0x3EC 
+#define FLAG_ITEM_ROUTE_109_PP_UP                                0x3ED 
+#define FLAG_ITEM_ROUTE_109_RARE_CANDY                           0x3EE 
+#define FLAG_ITEM_ROUTE_110_DIRE_HIT                             0x3EF 
+#define FLAG_ITEM_ROUTE_111_TM_37                                0x3F0 
+#define FLAG_ITEM_ROUTE_111_STARDUST                             0x3F1 
+#define FLAG_ITEM_ROUTE_111_HP_UP                                0x3F2 
+#define FLAG_ITEM_ROUTE_112_NUGGET                               0x3F3 
+#define FLAG_ITEM_ROUTE_113_MAX_ETHER                            0x3F4 
+#define FLAG_ITEM_ROUTE_113_SUPER_REPEL                          0x3F5 
+#define FLAG_ITEM_ROUTE_114_RARE_CANDY                           0x3F6 
+#define FLAG_ITEM_ROUTE_114_PROTEIN                              0x3F7 
+#define FLAG_ITEM_ROUTE_115_SUPER_POTION                         0x3F8 
+#define FLAG_ITEM_ROUTE_115_TM_01                                0x3F9 
+#define FLAG_ITEM_ROUTE_115_IRON                                 0x3FA 
+#define FLAG_ITEM_ROUTE_116_ETHER                                0x3FB 
+#define FLAG_ITEM_ROUTE_116_REPEL                                0x3FC 
+#define FLAG_ITEM_ROUTE_116_HP_UP                                0x3FD 
+#define FLAG_ITEM_ROUTE_117_GREAT_BALL                           0x3FE 
+#define FLAG_ITEM_ROUTE_117_REVIVE                               0x3FF 
+#define FLAG_ITEM_ROUTE_119_SUPER_REPEL                          0x400 
+#define FLAG_ITEM_ROUTE_119_ZINC                                 0x401 
+#define FLAG_ITEM_ROUTE_119_ELIXIR_1                             0x402 
+#define FLAG_ITEM_ROUTE_119_LEAF_STONE                           0x403 
+#define FLAG_ITEM_ROUTE_119_RARE_CANDY                           0x404 
+#define FLAG_ITEM_ROUTE_119_HYPER_POTION_1                       0x405 
+#define FLAG_ITEM_ROUTE_120_NUGGET                               0x406 
+#define FLAG_ITEM_ROUTE_120_FULL_HEAL                            0x407 
+#define FLAG_ITEM_ROUTE_123_CALCIUM                              0x408 
+#define FLAG_UNUSED_0x409                                        0x409 
+#define FLAG_ITEM_ROUTE_127_ZINC                                 0x40A 
+#define FLAG_ITEM_ROUTE_127_CARBOS                               0x40B 
+#define FLAG_ITEM_ROUTE_132_RARE_CANDY                           0x40C 
+#define FLAG_ITEM_ROUTE_133_BIG_PEARL                            0x40D 
+#define FLAG_ITEM_ROUTE_133_STAR_PIECE                           0x40E 
+#define FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE                      0x40F 
+#define FLAG_ITEM_PETALBURG_CITY_ETHER                           0x410 
+#define FLAG_ITEM_RUSTBORO_CITY_X_DEFEND                         0x411 
+#define FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL                        0x412 
+#define FLAG_ITEM_MOSSDEEP_CITY_NET_BALL                         0x413 
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23                       0x414 
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL                   0x415 
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE                  0x416 
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP                       0x417 
+#define FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL                       0x418 
+#define FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER                       0x419 
+#define FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE                    0x41A 
+#define FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL                     0x41B 
+#define FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE                         0x41C 
+#define FLAG_ITEM_GRANITE_CAVE_B2F_REPEL                         0x41D 
+#define FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY                    0x41E 
+#define FLAG_ITEM_PETALBURG_WOODS_X_ATTACK                       0x41F 
+#define FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL                     0x420 
+#define FLAG_ITEM_ROUTE_104_POKE_BALL                            0x421 
+#define FLAG_ITEM_PETALBURG_WOODS_ETHER                          0x422 
+#define FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE                 0x423 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL               0x424 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL               0x425 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL                 0x426 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL               0x427 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL                 0x428 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL                 0x429 
+#define FLAG_ITEM_ROUTE_124_YELLOW_SHARD                         0x42A 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL              0x42B 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL               0x42C 
+#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL                 0x42D 
+#define FLAG_ITEM_JAGGED_PASS_BURN_HEAL                          0x42E 
+#define FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR                    0x42F 
+#define FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL                     0x430 
+#define FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION                    0x431 
+#define FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48                         0x432 
+#define FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL                        0x433 
+#define FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE                       0x434 
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL 0x435 
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER     0x436 
+#define FLAG_ITEM_SCORCHED_SLAB_TM_11                            0x437 
+#define FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02                      0x438 
+#define FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL                  0x439 
+#define FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY               0x43A 
+#define FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL                0x43B 
+#define FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR                     0x43C 
+#define FLAG_ITEM_VICTORY_ROAD_1F_PP_UP                          0x43D 
+#define FLAG_ITEM_VICTORY_ROAD_B1F_TM_29                         0x43E 
+#define FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE                  0x43F 
+#define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL                     0x440 
+#define FLAG_ITEM_MT_PYRE_6F_TM_30                               0x441 
+#define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26                   0x442 
+#define FLAG_ITEM_FIERY_PATH_TM06                                0x443 
+#define FLAG_ITEM_ROUTE_124_RED_SHARD                            0x444 
+#define FLAG_ITEM_ROUTE_124_BLUE_SHARD                           0x445 
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22                   0x446 
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL            0x447 
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE           0x448 
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL           0x449 
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13                 0x44A 
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE               0x44B 
+#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY     0x44C 
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D 
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18       0x44E 
+#define FLAG_ITEM_ROUTE_121_CARBOS                               0x44F 
+#define FLAG_ITEM_ROUTE_123_ULTRA_BALL                           0x450 
+#define FLAG_ITEM_ROUTE_126_GREEN_SHARD                          0x451 
+#define FLAG_ITEM_ROUTE_119_HYPER_POTION_2                       0x452 
+#define FLAG_ITEM_ROUTE_120_HYPER_POTION                         0x453 
+#define FLAG_ITEM_ROUTE_120_NEST_BALL                            0x454 
+#define FLAG_ITEM_ROUTE_123_ELIXIR                               0x455 
+#define FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE                     0x456 
+#define FLAG_ITEM_FIERY_PATH_FIRE_STONE                          0x457 
+#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07                      0x458 
+#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE             0x459 
+#define FLAG_ITEM_ROUTE_103_GUARD_SPEC                           0x45A 
+#define FLAG_ITEM_ROUTE_104_X_ACCURACY                           0x45B 
+#define FLAG_ITEM_MAUVILLE_CITY_X_SPEED                          0x45C 
+#define FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL                  0x45D 
+#define FLAG_ITEM_ROUTE_115_GREAT_BALL                           0x45E 
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM                      0x45F 
+#define FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL                         0x460 
+#define FLAG_ITEM_ROUTE_118_HYPER_POTION                         0x461 
+#define FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL                         0x462 
+#define FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL                     0x463 
+#define FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL                   0x464 
+#define FLAG_UNUSED_0x465                                        0x465 
+#define FLAG_UNUSED_0x466                                        0x466 
+#define FLAG_UNUSED_0x467                                        0x467 
+#define FLAG_UNUSED_0x468                                        0x468 
+#define FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL                          0x469 
+#define FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE                         0x46A 
+#define FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE              0x46B 
+#define FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET                        0x46C 
+#define FLAG_UNUSED_0x46D                                        0x46D 
+#define FLAG_ITEM_ROUTE_119_NUGGET                               0x46E 
+#define FLAG_ITEM_ROUTE_104_POTION                               0x46F 
+#define FLAG_UNUSED_0x470                                        0x470 
+#define FLAG_ITEM_ROUTE_103_PP_UP                                0x471 
+#define FLAG_UNUSED_0x472                                        0x472 
+#define FLAG_ITEM_ROUTE_108_STAR_PIECE                           0x473 
+#define FLAG_0x474                                               0x474 
+#define FLAG_ITEM_ROUTE_110_ELIXIR                               0x475 
+#define FLAG_ITEM_ROUTE_111_ELIXIR                               0x476 
+#define FLAG_ITEM_ROUTE_113_HYPER_POTION                         0x477 
+#define FLAG_ITEM_ROUTE_115_HEAL_POWDER                          0x478 
+#define FLAG_UNUSED_0x479                                        0x479 
+#define FLAG_ITEM_ROUTE_116_POTION                               0x47A 
+#define FLAG_ITEM_ROUTE_119_ELIXIR_2                             0x47B 
+#define FLAG_ITEM_ROUTE_120_REVIVE                               0x47C 
+#define FLAG_ITEM_ROUTE_121_REVIVE                               0x47D 
+#define FLAG_ITEM_ROUTE_121_ZINC                                 0x47E 
+#define FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY                    0x47F 
+#define FLAG_ITEM_ROUTE_123_PP_UP                                0x480 
+#define FLAG_ITEM_ROUTE_123_REVIVAL_HERB                         0x481 
+#define FLAG_ITEM_ROUTE_125_BIG_PEARL                            0x482 
+#define FLAG_ITEM_ROUTE_127_RARE_CANDY                           0x483 
+#define FLAG_ITEM_ROUTE_132_PROTEIN                              0x484 
+#define FLAG_ITEM_ROUTE_133_MAX_REVIVE                           0x485 
+#define FLAG_ITEM_ROUTE_134_CARBOS                               0x486 
+#define FLAG_ITEM_ROUTE_134_STAR_PIECE                           0x487 
+#define FLAG_ITEM_ROUTE_114_ENERGY_POWDER                        0x488 
+#define FLAG_ITEM_ROUTE_115_PP_UP                                0x489 
+#define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP                         0x48A 
+#define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS                         0x48B 
+#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR                 0x48C 
+#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE               0x48D 
+#define FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET                     0x48E 
+#define FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX                     0x48F 
+#define FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE                    0x490 
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET                  0x491 
+#define FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL               0x492 
+
+
 #define FLAG_0x493               0x493
 #define FLAG_0x494               0x494
 #define FLAG_0x495               0x495
diff --git a/include/daycare.h b/include/daycare.h
index 7db44e024..ecd875865 100644
--- a/include/daycare.h
+++ b/include/daycare.h
@@ -15,7 +15,7 @@ void TriggerPendingDaycareEgg(void);
 void RejectEggFromDayCare(void);
 void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation);
 void GiveEggFromDaycare(void);
-bool8 DoEggActions_CheckHatch(void);
+bool8 ShouldEggHatch(void);
 u16 GetSelectedMonNickAndSpecies(void);
 void GetDaycareMonNicknames(void);
 u8 GetDaycareState(void);
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 0fabcf95a..6515791c3 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -143,9 +143,27 @@ u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 d
 u8 GetFaceDirectionMovementAction(u32);
 u8 GetWalkNormalMovementAction(u32);
 u8 GetWalkFastMovementAction(u32);
+u8 GetRideWaterCurrentMovementAction(u32);
 u8 GetWalkFastestMovementAction(u32);
+u8 GetPlayerRunMovementAction(u32);
 u8 GetJumpInPlaceMovementAction(u32);
+u8 GetAcroWheelieFaceDirectionMovementAction(u32);
+u8 GetAcroPopWheelieFaceDirectionMovementAction(u32);
+u8 GetAcroEndWheelieFaceDirectionMovementAction(u32);
+u8 GetAcroWheelieHopFaceDirectionMovementAction(u32);
+u8 GetAcroWheelieHopDirectionMovementAction(u32);
+u8 GetAcroWheelieJumpDirectionMovementAction(u32);
+u8 GetJumpInPlaceTurnAroundMovementAction(u32);
+u8 GetAcroWheelieInPlaceDirectionMovementAction(u32);
+u8 GetAcroPopWheelieMoveDirectionMovementAction(u32);
+u8 GetAcroWheelieMoveDirectionMovementAction(u32);
+u8 GetAcroEndWheelieMoveDirectionMovementAction(u32);
+u8 GetFishingDirectionAnimNum(u8 direction);
+u8 GetAcroWheelieDirectionAnimNum(u8 direction);
+u8 GetFishingBiteDirectionAnimNum(u8 direction);
+u8 GetFishingNoCatchDirectionAnimNum(u8 direction);
 bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId);
+void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId);
 bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject);
 u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject);
 u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject);
@@ -192,6 +210,7 @@ u16 GetObjectPaletteTag(u8 palSlot);
 void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
 s16 sub_809773C(s16 a1);
 s16 sub_8097728(s16 a1);
+void CameraObjectReset2(void);
 
 void MovementType_None(struct Sprite *);
 void MovementType_LookAround(struct Sprite *);
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 4f85156aa..5b8b74d8b 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -19,8 +19,8 @@ extern const u8 EventScript_TryDoDoubleTrainerBattle[];
 extern const u8 EventScript_271362[];
 extern const u8 EventScript_TryDoDoubleRematchBattle[];
 extern const u8 EventScript_2713D1[];
-extern const u8 EventScript_2766A2[];
-extern const u8 EventScript_2766A6[];
+extern const u8 EventScript_SecretPower1[];
+extern const u8 EventScript_SecretPower2[];
 
 
 extern const u8 gTVBravoTrainerText00[];
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 14245a8a2..24adbe4b3 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -3,22 +3,22 @@
 
 struct FieldInput
 {
-    u8 pressedAButton:1;
-    u8 input_field_0_1:1;
-    u8 pressedStartButton:1;
-    u8 pressedSelectButton:1;
-    u8 input_field_0_4:1;
-    u8 input_field_0_5:1;
-    u8 input_field_0_6:1;
-    u8 pressedBButton:1;
-    u8 input_field_1_0:1;
-    u8 input_field_1_1:1;
-    u8 input_field_1_2:1;
-    u8 input_field_1_3:1;
-    u8 input_field_1_4:1;
-    u8 input_field_1_5:1;
-    u8 input_field_1_6:1;
-    u8 input_field_1_7:1;
+    bool8 pressedAButton:1;
+    bool8 checkStandardWildEncounter:1;
+    bool8 pressedStartButton:1;
+    bool8 pressedSelectButton:1;
+    bool8 input_field_0_4:1;
+    bool8 input_field_0_5:1;
+    bool8 tookStep:1;
+    bool8 pressedBButton:1;
+    bool8 input_field_1_0:1;
+    bool8 input_field_1_1:1;
+    bool8 input_field_1_2:1;
+    bool8 input_field_1_3:1;
+    bool8 input_field_1_4:1;
+    bool8 input_field_1_5:1;
+    bool8 input_field_1_6:1;
+    bool8 input_field_1_7:1;
     u8 dpadDirection;
     u8 input_field_3;
 };
@@ -28,15 +28,15 @@ void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys);
 int ProcessPlayerFieldInput(struct FieldInput *pStruct);
 u8 *sub_80682A8(struct MapPosition *, u8, u8);
 void overworld_poison_timer_set(void);
-void prev_quest_postbuffer_cursor_backup_reset(void);
+void RestartWildEncounterImmunitySteps(void);
 u8 *sub_8068E24(struct MapPosition *);
-u8 *GetEventObjectScriptPointerPlayerFacing(void);
-bool8 mapheader_trigger_activate_at__run_now(struct MapPosition *);
+const u8 *GetEventObjectScriptPointerPlayerFacing(void);
 bool8 sub_8068870(u16 a);
 bool8 sub_8068894(void);
 bool8 sub_8068A64(struct MapPosition *, u16);
 u8 sub_8068F18(void);
 bool8 dive_warp(struct MapPosition *position, u16 b);
-void sub_809D2BC(void);
+int SetCableClubWarp(void);
+u8 TrySetDiveWarp(void);
 
 #endif // GUARD_FIELDCONTROLAVATAR_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 105dcd610..6022467e4 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -7,9 +7,10 @@
 
 // Exported ROM declarations
 u8 CreateWarpArrowSprite(void);
+u8 sub_8155800(u8 oldSpriteId);
+void sub_81555AC(u8, u8);
 bool8 sub_8155DA0(struct EventObject *);
 void sub_8155D78(struct EventObject *);
-void sub_81555AC(u8, u8);
 void StartAshFieldEffect(s16, s16, u16, s16);
 void SetUpReflection(struct EventObject*, struct Sprite*, u8);
 u32 StartFieldEffectForEventObject(u8, struct EventObject*);
@@ -30,5 +31,8 @@ void UpdateShortGrassFieldEffect(struct Sprite*);
 void UpdateHotSpringsWaterFieldEffect(struct Sprite*);
 void UpdateBubblesFieldEffect(struct Sprite*);
 void UpdateSparkleFieldEffect(struct Sprite*);
+void SetSpriteInvisible(u8 spriteId);
+void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
+void sub_8155604(u8 spriteId, u8 value, s16 data1);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index b11b5e21a..adb51f889 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -1,6 +1,17 @@
 #ifndef GUARD_FIELD_PLAYER_AVATAR_H
 #define GUARD_FIELD_PLAYER_AVATAR_H
 
+enum {
+    PLAYER_AVATAR_STATE_NORMAL,
+    PLAYER_AVATAR_STATE_MACH_BIKE,
+    PLAYER_AVATAR_STATE_ACRO_BIKE,
+    PLAYER_AVATAR_STATE_SURFING,
+    PLAYER_AVATAR_STATE_UNDERWATER,
+    PLAYER_AVATAR_STATE_FIELD_MOVE,
+    PLAYER_AVATAR_STATE_FISHING,
+    PLAYER_AVATAR_STATE_WATERING,
+};
+
 void player_step(u8 a, u16 b, u16 c);
 void ClearPlayerAvatarInfo(void);
 void SetPlayerAvatarExtraStateTransition(u8, u8);
@@ -13,7 +24,7 @@ u8 GetPlayerMovementDirection(void);
 u8 PlayerGetCopyableMovement(void);
 void PlayerGoSpeed1(u8);
 void PlayerGoSpeed2(u8);
-void PlayerGoSpeed3(u8);
+void PlayerRideWaterCurrent(u8);
 void PlayerGoSpeed4(u8);
 void PlayerOnBikeCollide(u8);
 void PlayerFaceDirection(u8 a);
@@ -44,23 +55,8 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
 void SetPlayerAvatarStateMask(u8 a);
 u8 GetPlayerAvatarGraphicsIdByStateId(u8 a);
 u8 GetJumpSpecialMovementAction(u32);
-
-bool8 ForcedMovement_None(void);
-bool8 ForcedMovement_Slip(void);
-bool8 ForcedMovement_WalkSouth(void);
-bool8 ForcedMovement_WalkNorth(void);
-bool8 ForcedMovement_WalkWest(void);
-bool8 ForcedMovement_WalkEast(void);
-bool8 ForcedMovement_PushedSouthByCurrent(void);
-bool8 ForcedMovement_PushedNorthByCurrent(void);
-bool8 ForcedMovement_PushedWestByCurrent(void);
-bool8 ForcedMovement_PushedEastByCurrent(void);
-bool8 ForcedMovement_SlideSouth(void);
-bool8 ForcedMovement_SlideNorth(void);
-bool8 ForcedMovement_SlideWest(void);
-bool8 ForcedMovement_SlideEast(void);
-bool8 ForcedMovement_0xBB(void);
-bool8 ForcedMovement_0xBC(void);
-bool8 ForcedMovement_MuddySlope(void);
+bool8 PartyHasMonWithSurf(void);
+bool8 IsPlayerFacingSurfableFishableWater(void);
+bool8 IsPlayerSurfingNorth(void);
 
 #endif // GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_poison.h b/include/field_poison.h
index 90d017ac7..a23a93ca5 100644
--- a/include/field_poison.h
+++ b/include/field_poison.h
@@ -14,6 +14,6 @@ enum {
 };
 
 void ExecuteWhiteOut(void);
-u32 DoPoisonFieldEffect(void);
+s32 DoPoisonFieldEffect(void);
 
 #endif //GUARD_FIELD_POISON_H
diff --git a/include/field_screen.h b/include/field_screen.h
index bf1502405..021d2b9e9 100644
--- a/include/field_screen.h
+++ b/include/field_screen.h
@@ -16,5 +16,9 @@ void sub_80AC3E4(void);
 void PreservePaletteInWeather(u8);
 void sub_80AF128(void);
 void sub_80AB104(u8);
+void sub_80AF80C(u8);
+void sub_80AF828(void);
+void sub_80AF838(void);
+void sub_80B0268(void);
 
 #endif //GUARD_FIELD_SCREEN_H
diff --git a/include/field_specials.h b/include/field_specials.h
index 4709f9551..0e2daf9c3 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -6,5 +6,14 @@ u8 sub_813B260(void);
 u16 get_unknown_box_id(void);
 bool8 InMultiBattleRoom(void);
 void sub_813BF10(void);
+void increment_var_x4026_on_birth_island_modulo_100(void);
+bool8 sub_813B3B0(void);
+bool8 ShouldDoBrailleRegicePuzzle(void);
+bool32 is_tile_that_overrides_player_control(void);
+bool32 sub_8138120(void);
+bool32 sub_8138168(void);
+bool32 sub_81381B0(void);
+bool32 sub_81381F8(void);
+bool32 CountSSTidalStep(u16 delta);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h
index 67e0de85f..027bb4273 100644
--- a/include/fldeff_80F9BCC.h
+++ b/include/fldeff_80F9BCC.h
@@ -12,6 +12,8 @@ void sub_80FA794(s16 x, s16 y);
 void CreateRecordMixingSprite(void);
 void DestroyRecordMixingSprite(void);
 void FldeffPoison_Start(void);
+void sub_80FA970(s16);
+void sub_80FA9D0(void);
 bool8 sub_80FADE4(u16, u8);
 
 #endif //GUARD_FLDEFF_80F9BCC_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 055f29f40..f6273e80d 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -61,17 +61,16 @@ struct EventObjectTemplate
 struct WarpEvent
 {
     s16 x, y;
-    s8 warpId;
-    u8 mapGroup;
+    u8 elevation;
+    u8 warpId;
     u8 mapNum;
-    u8 unk7;
+    u8 mapGroup;
 };
 
 struct CoordEvent
 {
     s16 x, y;
-    u8 unk4;
-    u8 filler_5;
+    u8 elevation;
     u16 trigger;
     u16 index;
     u8 filler_A[0x2];
@@ -81,16 +80,15 @@ struct CoordEvent
 struct BgEvent
 {
     u16 x, y;
-    u8 unk4;
+    u8 elevation;
     u8 kind;
-    // 0x2 padding for the union beginning.
     union { // carried over from diego's FR/LG work, seems to be the same struct
         // in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union.
         u8 *script;
 
-        // hidden item type probably
+        // hidden item type
         struct {
-            u8 filler6[0x2];
+            u16 item;
             u16 hiddenItemId; // flag offset to determine flag lookup
         } hiddenItem;
 
diff --git a/include/global.h b/include/global.h
index f77b3159e..7de5b24fd 100644
--- a/include/global.h
+++ b/include/global.h
@@ -976,13 +976,4 @@ struct UnkStruct_8054FF8
     u16 field_C;
 };
 
-struct Bitmap           // TODO: Find a better spot for this
-{
-    u8* pixels;
-    u32 width:16;
-    u32 height:16;
-};
-
-extern u8 gReservedSpritePaletteCount;
-
 #endif // GUARD_GLOBAL_H
diff --git a/include/graphics.h b/include/graphics.h
index 4cbee1c34..07900977d 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4029,4 +4029,8 @@ extern const u8 gUnknown_08D97CF4[];
 extern const u8 gStatusGfx_Icons[];
 extern const u8 gStatusPal_Icons[];
 
+extern const u8 gBuyMenuFrame_Gfx[];
+extern const u16 gBuyMenuFrame_Tilemap[];
+extern const u16 gMenuMoneyPal[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/item_menu.h b/include/item_menu.h
index 59316e948..649eb934c 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -58,5 +58,7 @@ void sub_81AAC28(void);
 void bag_menu_mail_related(void);
 void CB2_BagMenuFromStartMenu(void);
 u8 sub_81ABB2C(u8 pocketId);
+bool8 UseRegisteredKeyItemOnField(void);
+void CB2_GoToSellMenu(void);
 
 #endif //GUARD_item_menu_H
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 82617268a..e18639faf 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -50,7 +50,7 @@ bool8 MetatileBehavior_IsSecretBaseCave(u8);
 bool8 MetatileBehavior_IsSecretBaseTree(u8);
 bool8 MetatileBehavior_IsSecretBaseShrub(u8);
 bool8 MetatileBehavior_IsSecretBasePC(u8);
-bool8 MetatileBehavior_IsSecretBaseRegisterPC(u8);
+bool8 MetatileBehavior_IsRecordMixingSecretBasePC(u8);
 bool8 MetatileBehavior_IsMB_B2(u8);
 bool8 MetatileBehavior_IsBlockDecoration(u8);
 bool8 MetatileBehavior_IsSecretBaseImpassable(u8);
@@ -67,7 +67,7 @@ bool8 MetatileBehavior_IsSecretBaseBreakableDoor(u8);
 bool8 MetatileBehavior_IsSecretBaseSoundMat(u8);
 bool8 MetatileBehavior_IsSecretBaseGlitterMat(u8);
 bool8 MetatileBehavior_IsSecretBaseSandOrnament(u8);
-bool8 MetatileBehavior_IsSecretBaseTvOrShield(u8);
+bool8 MetatileBehavior_IsSecretBaseShieldOrToyTV(u8);
 bool8 MetatileBehavior_IsPlayerRoomPCOn(u8);
 bool8 MetatileBehavior_HasRipples(u8);
 bool8 MetatileBehavior_IsPuddle(u8);
@@ -106,14 +106,14 @@ bool8 MetatileBehavior_IsPacifilogHorizontalLog2(u8);
 bool8 MetatileBehavior_IsPacifidlogLog(u8);
 bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8);
 bool8 MetatileBehavior_IsRegionMap(u8);
-bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8);
+bool8 MetatileBehavior_IsClosedSootopolisDoor(u8);
 bool8 MetatileBehavior_IsUnknownClosedDoor(u8);
 bool8 MetatileBehavior_IsRoulette(u8);
 bool8 MetatileBehavior_IsPokeblockFeeder(u8);
 bool8 MetatileBehavior_IsSecretBaseJumpMat(u8);
 bool8 MetatileBehavior_IsSecretBaseSpinMat(u8);
 bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8);
-bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8);
+bool8 MetatileBehavior_IsLavaridge1FWarp(u8);
 bool8 MetatileBehavior_IsAquaHideoutWarp(u8);
 bool8 MetatileBehavior_IsWarpOrBridge(u8);
 bool8 MetatileBehavior_IsMossdeepGymWarp(u8);
@@ -130,7 +130,7 @@ bool8 MetatileBehavior_IsHorizontalRail(u8);
 bool8 MetatileBehavior_IsSeaweed(u8);
 bool8 MetatileBehavior_IsRunningDisallowed(u8);
 bool8 MetatileBehavior_IsCuttableGrass(u8);
-bool8 MetatileBehavior_IsRunningShoesInstruction(u8);
+bool8 MetatileBehavior_IsRunningShoesManual(u8);
 bool8 MetatileBehavior_IsPictureBookShelf(u8);
 bool8 MetatileBehavior_IsBookShelf(u8);
 bool8 MetatileBehavior_IsPokeCenterBookShelf(u8);
diff --git a/include/party_menu.h b/include/party_menu.h
index 170fcafc1..cb82eb82c 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -70,6 +70,5 @@ extern void sub_81B67C8(u8, u16, TaskFunc);
 extern void sub_81B79E8(u8, u16, TaskFunc);
 extern void sub_81B6DC4(u8, u16, TaskFunc);
 extern void sub_81B7C74(u8, u16, TaskFunc);
-extern u16 ItemIdToBattleMoveId(u16);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon.h b/include/pokemon.h
index d261fba85..8259e7d34 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -94,6 +94,8 @@
 #define MON_DATA_SPATK2            87
 #define MON_DATA_SPDEF2            88
 
+#define MAX_LEVEL 100
+
 #define OT_ID_RANDOM_NO_SHINY 2
 #define OT_ID_PRESET 1
 #define OT_ID_PLAYER_ID 0
@@ -110,10 +112,47 @@
 #define MON_FEMALE     0xFE
 #define MON_GENDERLESS 0xFF
 
+#define TYPE_NORMAL   0x00
+#define TYPE_FIGHTING 0x01
+#define TYPE_FLYING   0x02
+#define TYPE_POISON   0x03
+#define TYPE_GROUND   0x04
+#define TYPE_ROCK     0x05
+#define TYPE_BUG      0x06
+#define TYPE_GHOST    0x07
+#define TYPE_STEEL    0x08
+#define TYPE_MYSTERY  0x09
+#define TYPE_FIRE     0x0a
+#define TYPE_WATER    0x0b
+#define TYPE_GRASS    0x0c
+#define TYPE_ELECTRIC 0x0d
+#define TYPE_PSYCHIC  0x0e
+#define TYPE_ICE      0x0f
+#define TYPE_DRAGON   0x10
+#define TYPE_DARK     0x11
+
+#define FRIENDSHIP_EVENT_GROW_LEVEL           0x0
+#define FRIENDSHIP_EVENT_VITAMIN              0x1 // unused
+#define FRIENDSHIP_EVENT_BATTLE_ITEM          0x2 // unused
+#define FRIENDSHIP_EVENT_LEAGUE_BATTLE        0x3
+#define FRIENDSHIP_EVENT_LEARN_TMHM           0x4
+#define FRIENDSHIP_EVENT_WALKING              0x5
+#define FRIENDSHIP_EVENT_FAINT_SMALL          0x6
+#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7
+#define FRIENDSHIP_EVENT_FAINT_LARGE          0x8
+
+#define STATUS_PRIMARY_NONE      0x0
+#define STATUS_PRIMARY_POISON    0x1
+#define STATUS_PRIMARY_PARALYSIS 0x2
+#define STATUS_PRIMARY_SLEEP     0x3
+#define STATUS_PRIMARY_FREEZE    0x4
+#define STATUS_PRIMARY_BURN      0x5
+#define STATUS_PRIMARY_POKERUS   0x6
+#define STATUS_PRIMARY_FAINTED   0x7
+
 #define MAX_TOTAL_EVS 510
 #define NUM_STATS 6
 #define UNOWN_FORM_COUNT 28
-#define MAX_MON_LEVEL 100
 
 struct PokemonSubstruct0
 {
@@ -421,7 +460,7 @@ extern const u8 gFacilityClassToTrainerClass[];
 extern const struct BaseStats gBaseStats[];
 extern const u8 *const gItemEffectTable[];
 extern const struct Evolution gEvolutionTable[][EVOS_PER_MON];
-extern const u32 gExperienceTables[][MAX_MON_LEVEL + 1];
+extern const u32 gExperienceTables[][MAX_LEVEL + 1];
 extern const u16 *const gLevelUpLearnsets[];
 extern const u8 gUnknown_08329D22[];
 extern const u8 gUnknown_08329D26[];
diff --git a/include/pokenav.h b/include/pokenav.h
index b595e2be9..1fde8aa44 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -28,5 +28,13 @@ u16 sub_81D2C3C(void);
 void sub_81D2C50(void);
 u8 sub_81D28C8(const struct ListMenuItem *items, u16 numChoices);
 void sub_81D2824(u16);
+bool32 InTrainerHill(void);
+bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
+u32 sub_81D427C(void);
+void sub_81D4998(void);
+u8 GetCurrentTrainerHillMapId(void);
+u8 sub_81D6490(void);
+const struct WarpEvent *sub_81D6120(void);
+const struct WarpEvent *sub_81D6134(u8);
 
 #endif //GUARD_POKENAV_H
diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h
deleted file mode 100644
index 900daf4e7..000000000
--- a/include/rom_81BE66C.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// Created by Scott Norton on 9/6/17.
-//
-
-#ifndef GUARD_ROM_81BE66C_H
-#define GUARD_ROM_81BE66C_H
-
-bool32 InTrainerHill(void);
-bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
-u32 sub_81D427C(void);
-
-#endif //GUARD_ROM_81BE66C_H
diff --git a/include/script.h b/include/script.h
index 2b5f8c2ce..755ff19a3 100644
--- a/include/script.h
+++ b/include/script.h
@@ -55,8 +55,8 @@ bool8 mapheader_run_first_tag2_script_list_match(void);
 void mapheader_run_first_tag4_script_list_match(void);
 u32 CalculateRamScriptChecksum(void);
 void ClearRamScript(void);
-bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
-u8 *GetRamScript(u8 objectId, u8 *script);
+bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
+const u8 *GetRamScript(u8 objectId, const u8 *script);
 bool32 sub_80991F8(void);
 u8 *sub_8099244(void);
 void sub_80992A0(u8 *script, u16 scriptSize);
diff --git a/include/secret_base.h b/include/secret_base.h
index c20533698..4fa0d0c4a 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -16,5 +16,11 @@ void sub_80E8EE0(struct MapEvents const *events);
 void sub_80E9238(u8 flagIn);
 bool8 CurrentMapIsSecretBase(void);
 void sub_80EA3E4(u8 taskId);
+bool8 sub_80E9680(void);
+void sub_80EB498(void);
+void sub_80EB56C(void);
+void sub_80EB9E0(void);
+void sub_80EBB28(void);
+void sub_80E9668(const struct MapPosition *position, const struct MapEvents *events);
 
 #endif //GUARD_SECRET_BASE_H
diff --git a/include/shop.h b/include/shop.h
index 067b8fee4..7f2d877dc 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_SHOP_H
 #define GUARD_SHOP_H
 
-extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
+extern EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3];
 
 enum
 {
@@ -10,9 +10,19 @@ enum
     MART_TYPE_2,
 };
 
+// shop view window NPC info enum
+enum
+{
+    EVENT_OBJ_ID,
+    X_COORD,
+    Y_COORD,
+    ANIM_NUM,
+	LAYER_TYPE
+};
+
 struct MartInfo
 {
-    /*0x0*/ void (* callback) (void);
+    /*0x0*/ void (*callback)(void);
     /*0x4*/ const struct MenuAction *menuActions;
     /*0x8*/ const u16 *itemList;
     /*0xC*/ u16 itemCount;
@@ -20,23 +30,18 @@ struct MartInfo
     /*0xF*/ u8 martType;
 };
 
-struct BuyMenuLabel
-{
-	u8 label[16];
-};
-
 struct ShopData
 {
-	/*0x0000*/ u8 tilemapBuffers[4][0x800];
-	/*0x2000*/ u8 filler2000[0x4];
-	/*0x2004*/ u16 unk2004;
-	/*0x2006*/ u8 filler2006[0x2];
-	/*0x2008*/ u16 unk2008;
-	/*0x200A*/ u8 filler200A;
+	/*0x0000*/ u16 tilemapBuffers[4][0x400];
+	/*0x2000*/ u32 totalCost;
+	/*0x2004*/ u16 itemsShowed;
+	/*0x2006*/ u16 selectedRow;
+	/*0x2008*/ u16 scrollOffset;
+	/*0x200A*/ u8 maxQuantity;
 	/*0x200B*/ u8 scrollIndicatorsTaskId;
-	/*0x200C*/ u8 unk200C;
-	/*0x200D*/ u8 unk200D[2];
-	/*0x200F*/ u8 filler200F[0xA1];
+	/*0x200C*/ u8 iconSlot;
+	/*0x200D*/ u8 itemSpriteIds[2];
+	/*0x2010*/ s16 viewportObjects[16][5];
 };
 
 void CreatePokemartMenu(const u16 *);
diff --git a/include/sprite.h b/include/sprite.h
index 8fc45d501..4ffcd2884 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -235,11 +235,15 @@ extern const struct OamData gDummyOamData;
 extern const union AnimCmd *const gDummySpriteAnimTable[];
 extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
 extern const struct SpriteTemplate gDummySpriteTemplate;
-extern s16 gSpriteCoordOffsetX;
-extern s16 gSpriteCoordOffsetY;
 
+extern u8 gReservedSpritePaletteCount;
 extern struct Sprite gSprites[];
+extern u8 gOamLimit;
+extern u16 gReservedSpriteTileCount;
+extern s16 gSpriteCoordOffsetX;
+extern s16 gSpriteCoordOffsetY;
 extern struct OamMatrix gOamMatrices[];
+extern bool8 gAffineAnimsDisabled;
 
 void ResetSpriteData(void);
 void AnimateSprites(void);
diff --git a/include/strings.h b/include/strings.h
index 4ea33635b..c563353ec 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -855,5 +855,26 @@ extern const u8 gText_CanIHelpWithAnythingElse[];
 extern const u8 gText_AnythingElseICanHelp[];
 extern const u8 gText_QuitShopping[];
 extern const u8 gText_PokedollarVar1[];
+extern const u8 gText_YouDontHaveMoney[];
+extern const u8 gText_Var1CertainlyHowMany2[];
+extern const u8 gText_Var1CertainlyHowMany[];
+extern const u8 gText_Var1IsItThatllBeVar2[];
+extern const u8 gText_YouWantedVar1ThatllBeVar2[];
+extern const u8 gText_InBagVar1[];
+extern const u8 gText_Var1AndYouWantedVar2[];
+extern const u8 gText_HereYouGoThankYou[];
+extern const u8 gText_NoMoreRoomForThis[];
+extern const u8 gText_ThankYouIllSendItHome[];
+extern const u8 gText_ThanksIllSendItHome[];
+extern const u8 gText_SpaceForVar1Full[];
+extern const u8 gText_ThrowInPremierBall[];
+extern const u8 gText_ShopBuy[];
+extern const u8 gText_ShopSell[];
+extern const u8 gText_ShopQuit[];
+
+extern const u8 gText_OhABite[];
+extern const u8 gText_PokemonOnHook[];
+extern const u8 gText_NotEvenANibble[];
+extern const u8 gText_ItGotAway[];
 
 #endif //GUARD_STRINGS_H
diff --git a/ld_script.txt b/ld_script.txt
index 50ce3bb6d..77f95e96f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -92,14 +92,13 @@ SECTIONS {
         src/field_camera.o(.text);
         src/field_door.o(.text);
         src/field_player_avatar.o(.text);
-        asm/field_player_avatar.o(.text);
         src/event_object_movement.o(.text);
         src/field_message_box.o(.text);
         src/event_obj_lock.o(.text);
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
-        asm/field_control_avatar.o(.text);
+        src/field_control_avatar.o(.text);
         src/event_data.o(.text);
         src/coord_event_weather.o(.text);
         src/field_tasks.o(.text);
@@ -138,7 +137,7 @@ SECTIONS {
         src/contest.o(.text);
         asm/contest.o(.text);
         src/shop.o(.text);
-        asm/shop.o(.text);
+        src/fldeff_escalator.o(.text);
         src/berry.o(.text);
         asm/script_menu.o(.text);
         src/naming_screen.o(.text);
@@ -443,7 +442,8 @@ SECTIONS {
         src/map_name_popup.o(.rodata);
         src/item_menu_icons.o(.rodata);
         data/contest.o(.rodata);
-        data/shop.o(.rodata);
+        src/shop.o(.rodata);
+        src/fldeff_escalator.o(.rodata);
         src/berry.o(.rodata);
         data/script_menu.o(.rodata);
         src/naming_screen.o(.rodata);
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 0a5395b02..590e34cb6 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1262,39 +1262,39 @@ s8 BattleAnimAdjustPanning(s8 pan)
     if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
     {
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-            pan = PAN_SIDE_OPPONENT;
+            pan = SOUND_PAN_TARGET;
         else
-            pan = PAN_SIDE_PLAYER;
+            pan = SOUND_PAN_ATTACKER;
     }
     else if (IsContest())
     {
-        if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != PAN_SIDE_OPPONENT)
+        if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != SOUND_PAN_TARGET)
             pan *= -1;
     }
     else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
         if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
         {
-            if (pan == PAN_SIDE_OPPONENT)
-                pan = PAN_SIDE_PLAYER;
-            else if (pan != PAN_SIDE_PLAYER)
+            if (pan == SOUND_PAN_TARGET)
+                pan = SOUND_PAN_ATTACKER;
+            else if (pan != SOUND_PAN_ATTACKER)
                 pan *= -1;
         }
     }
     else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
     {
-        if (pan == PAN_SIDE_PLAYER)
-            pan = PAN_SIDE_OPPONENT;
+        if (pan == SOUND_PAN_ATTACKER)
+            pan = SOUND_PAN_TARGET;
     }
     else
     {
         pan *= -1;
     }
 
-    if (pan > PAN_SIDE_OPPONENT)
-        pan = PAN_SIDE_OPPONENT;
-    else if (pan < PAN_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+    if (pan > SOUND_PAN_TARGET)
+        pan = SOUND_PAN_TARGET;
+    else if (pan < SOUND_PAN_ATTACKER)
+        pan = SOUND_PAN_ATTACKER;
 
     return pan;
 }
@@ -1304,9 +1304,9 @@ s8 BattleAnimAdjustPanning2(s8 pan)
     if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
     {
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-            pan = PAN_SIDE_OPPONENT;
+            pan = SOUND_PAN_TARGET;
         else
-            pan = PAN_SIDE_PLAYER;
+            pan = SOUND_PAN_ATTACKER;
     }
     else
     {
@@ -1320,10 +1320,10 @@ s16 KeepPanInRange(s16 panArg)
 {
     s16 pan = panArg;
 
-    if (pan > PAN_SIDE_OPPONENT)
-        pan = PAN_SIDE_OPPONENT;
-    else if (pan < PAN_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+    if (pan > SOUND_PAN_TARGET)
+        pan = SOUND_PAN_TARGET;
+    else if (pan < SOUND_PAN_ATTACKER)
+        pan = SOUND_PAN_ATTACKER;
 
     return pan;
 }
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c
index 6993bd2ee..7b8eb4ed7 100644
--- a/src/battle_anim_sound_tasks.c
+++ b/src/battle_anim_sound_tasks.c
@@ -23,8 +23,8 @@ void sub_8158B30(u8 taskId)
     gTasks[taskId].data[0] = gBattleAnimArgs[0];
     gTasks[taskId].data[1] = gBattleAnimArgs[1];
 
-    pan1 = BattleAnimAdjustPanning(PAN_SIDE_PLAYER);
-    pan2 = BattleAnimAdjustPanning(PAN_SIDE_OPPONENT);
+    pan1 = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
+    pan2 = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
     panIncrement = CalculatePanIncrement(pan1, pan2, 2);
 
     gTasks[taskId].data[2] = pan1;
@@ -64,7 +64,7 @@ static void sub_8158C04(u8 taskId)
         s8 pan;
 
         gTasks[taskId].data[10] = 0;
-        pan = BattleAnimAdjustPanning(PAN_SIDE_OPPONENT);
+        pan = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
         PlaySE12WithPanning(gTasks[taskId].data[1], pan);
         if (++gTasks[taskId].data[11] == 2)
             DestroyAnimSoundTask(taskId);
@@ -127,7 +127,7 @@ static void sub_8158D08(u8 taskId)
 void sub_8158D8C(u8 taskId)
 {
     u16 species = 0;
-    s8 pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER);
+    s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
     if (IsContest())
     {
         if (gBattleAnimArgs[0] == ANIM_ATTACKER)
@@ -173,7 +173,7 @@ void sub_8158D8C(u8 taskId)
 void sub_8158E9C(u8 taskId)
 {
     u16 species = 0;
-    s8 pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER);
+    s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
     if (IsContest())
     {
         if (gBattleAnimArgs[0] == ANIM_ATTACKER)
@@ -278,7 +278,7 @@ void sub_81590B8(u8 taskId)
     s8 pan;
 
     gTasks[taskId].data[10] = gBattleAnimArgs[0];
-    pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER);
+    pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
 
     if (IsContest())
         species = gContestResources->field_18->unk0;
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 637b8c702..4fea3aca8 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1364,7 +1364,7 @@ static void LinkOpponentHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
+            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
             gBattlerControllerFuncs[gActiveBattler] = sub_8064C14;
         }
@@ -1660,9 +1660,9 @@ static void LinkOpponentHandlePlaySE(void)
     s8 pan;
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+        pan = SOUND_PAN_ATTACKER;
     else
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
 
     PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     LinkOpponentBufferExecCompleted();
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index bfaaf9e82..51e26b620 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -1187,7 +1187,7 @@ static void LinkPartnerHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-            PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
+            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
@@ -1485,9 +1485,9 @@ static void LinkPartnerHandlePlaySE(void)
     s8 pan;
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+        pan = SOUND_PAN_ATTACKER;
     else
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
 
     PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     LinkPartnerBufferExecCompleted();
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index c490ad314..b8b5bd3b8 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1402,7 +1402,7 @@ static void OpponentHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
+            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
             gBattlerControllerFuncs[gActiveBattler] = sub_805FAC4;
         }
@@ -1810,9 +1810,9 @@ static void OpponentHandlePlaySE(void)
     s8 pan;
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+        pan = SOUND_PAN_ATTACKER;
     else
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
 
     PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     OpponentBufferExecCompleted();
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 57a4efa9f..6bc6c6f49 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2407,7 +2407,7 @@ static void PlayerHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-            PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
+            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
@@ -2710,7 +2710,7 @@ static void PlayerHandleExpUpdate(void)
 {
     u8 monId = gBattleBufferA[gActiveBattler][1];
 
-    if (GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL) >= MAX_MON_LEVEL)
+    if (GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL) >= MAX_LEVEL)
     {
         PlayerBufferExecCompleted();
     }
@@ -2882,9 +2882,9 @@ static void PlayerHandlePlaySE(void)
     s8 pan;
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+        pan = SOUND_PAN_ATTACKER;
     else
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
 
     PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     PlayerBufferExecCompleted();
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 7795c5656..e893d2f3d 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -1382,7 +1382,7 @@ static void PlayerPartnerHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-            PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
+            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
@@ -1597,7 +1597,7 @@ static void PlayerPartnerHandleExpUpdate(void)
 {
     u8 monId = gBattleBufferA[gActiveBattler][1];
 
-    if (GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL) >= MAX_MON_LEVEL)
+    if (GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL) >= MAX_LEVEL)
     {
         PlayerPartnerBufferExecCompleted();
     }
@@ -1739,9 +1739,9 @@ static void PlayerPartnerHandlePlaySE(void)
     s8 pan;
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+        pan = SOUND_PAN_ATTACKER;
     else
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
 
     PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     PlayerPartnerBufferExecCompleted();
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 963c535db..57eb6842e 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -1295,7 +1295,7 @@ static void RecordedOpponentHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
+            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
             gBattlerControllerFuncs[gActiveBattler] = sub_8186D58;
         }
@@ -1603,9 +1603,9 @@ static void RecordedOpponentHandlePlaySE(void)
     s8 pan;
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+        pan = SOUND_PAN_ATTACKER;
     else
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
 
     PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     RecordedOpponentBufferExecCompleted();
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 1a043573f..f6c19121d 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -1624,9 +1624,9 @@ static void RecordedPlayerHandlePlaySE(void)
     s8 pan;
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+        pan = SOUND_PAN_ATTACKER;
     else
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
 
     PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     RecordedPlayerBufferExecCompleted();
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 898e18294..148f13865 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -594,9 +594,9 @@ static void SafariHandlePlaySE(void)
     s8 pan;
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
-        pan = PAN_SIDE_PLAYER;
+        pan = SOUND_PAN_ATTACKER;
     else
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
 
     PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     SafariBufferExecCompleted();
diff --git a/src/battle_interface.c b/src/battle_interface.c
index d2750bf9d..ad9737668 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -20,6 +20,7 @@
 #include "international_string_util.h"
 #include "safari_zone.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "constants/rgb.h"
 #include "data2.h"
 
@@ -1889,9 +1890,9 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
 
     if (sprite->pos2.x == 0)
     {
-        pan = PAN_SIDE_OPPONENT;
+        pan = SOUND_PAN_TARGET;
         if (var1 != 0)
-            pan = PAN_SIDE_PLAYER;
+            pan = SOUND_PAN_ATTACKER;
 
         if (sprite->data[7] != 0)
             PlaySE2WithPanning(SE_TB_KARA, pan);
@@ -2341,7 +2342,7 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar)
                     &gBattleSpritesDataPtr->battleBars[battlerId].currValue,
                     array, B_EXPBAR_PIXELS / 8);
         level = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_LEVEL);
-        if (level == MAX_MON_LEVEL)
+        if (level == MAX_LEVEL)
         {
             for (i = 0; i < 8; i++)
                 array[i] = 0;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 685f0db7a..33d86924f 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -3347,7 +3347,7 @@ static void atk23_getexp(void)
                 gBattleScripting.atk23_state = 5;
                 gBattleMoveDamage = 0; // used for exp
             }
-            else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_MON_LEVEL)
+            else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_LEVEL)
             {
                 *(&gBattleStruct->sentInPokes) >>= 1;
                 gBattleScripting.atk23_state = 5;
@@ -3382,17 +3382,17 @@ static void atk23_getexp(void)
                         // check if the pokemon doesn't belong to the player
                         if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gBattleStruct->expGetterMonId >= 3)
                         {
-                            i = 0x149;
+                            i = STRINGID_EMPTYSTRING4;
                         }
                         else
                         {
                             gBattleMoveDamage = (gBattleMoveDamage * 150) / 100;
-                            i = 0x14A;
+                            i = STRINGID_ABOOSTED;
                         }
                     }
                     else
                     {
-                        i = 0x149;
+                        i = STRINGID_EMPTYSTRING4;
                     }
 
                     // get exp getter battlerId
@@ -3430,7 +3430,7 @@ static void atk23_getexp(void)
         if (gBattleControllerExecFlags == 0)
         {
             gBattleBufferB[gBattleStruct->expGetterBattlerId][0] = 0;
-            if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != MAX_MON_LEVEL)
+            if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != MAX_LEVEL)
             {
                 gBattleResources->statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP);
                 gBattleResources->statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 5cb60ebca..d74fef9cc 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -56,8 +56,8 @@ extern bool8 InBattlePyramid(void);
 extern bool8 InBattlePike(void);
 extern bool32 InTrainerHill(void);
 extern bool32 FieldPoisonEffectIsRunning(void);
-extern void prev_quest_postbuffer_cursor_backup_reset(void);
-extern void ResetPoisonStepCounter(void);
+extern void RestartWildEncounterImmunitySteps(void);
+extern void ClearPoisonStepCounter(void);
 extern void sub_81BE72C(void);
 extern void sub_808BCF4(void);
 extern void sub_80EECC8(void);
@@ -354,8 +354,8 @@ static void Task_BattleStart(u8 taskId)
         {
             overworld_free_bg_tilemaps();
             SetMainCallback2(CB2_InitBattle);
-            prev_quest_postbuffer_cursor_backup_reset();
-            ResetPoisonStepCounter();
+            RestartWildEncounterImmunitySteps();
+            ClearPoisonStepCounter();
             DestroyTask(taskId);
         }
         break;
@@ -921,8 +921,8 @@ static void CB2_StartFirstBattle(void)
         gMain.savedCallback = CB2_EndFirstBattle;
         FreeAllWindowBuffers();
         SetMainCallback2(CB2_InitBattle);
-        prev_quest_postbuffer_cursor_backup_reset();
-        ResetPoisonStepCounter();
+        RestartWildEncounterImmunitySteps();
+        ClearPoisonStepCounter();
         IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
         IncrementGameStat(GAME_STAT_WILD_BATTLES);
         sub_80EECC8();
diff --git a/src/berry.c b/src/berry.c
index ce2a29901..7b0b2cdb0 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -12,7 +12,7 @@
 extern u8 EventObjectGetBerryTreeId(u8 eventObjectId);
 extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
 extern void CB2_ChooseBerry(void);
-extern const u8* GetEventObjectScriptPointerForComparison(void);
+extern const u8* GetEventObjectScriptPointerPlayerFacing(void);
 extern bool8 IsBerryTreeSparkling(u8, u8, u8);
 
 extern u16 gSpecialVar_ItemId;
@@ -943,7 +943,7 @@ bool32 EventObjectInteractionWaterBerryTree(void)
 
 bool8 IsPlayerFacingPlantedBerryTree(void)
 {
-    if (GetEventObjectScriptPointerForComparison() == BerryTreeScript
+    if (GetEventObjectScriptPointerPlayerFacing() == BerryTreeScript
      && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == 0)
         return TRUE;
     else
@@ -952,7 +952,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void)
 
 bool8 TryToWaterBerryTree(void)
 {
-    if (GetEventObjectScriptPointerForComparison() != BerryTreeScript)
+    if (GetEventObjectScriptPointerPlayerFacing() != BerryTreeScript)
         return FALSE;
     else
         return EventObjectInteractionWaterBerryTree();
diff --git a/src/berry_blender.c b/src/berry_blender.c
index a5b940189..8e0bc8043 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1124,7 +1124,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum)
         sBerryBlenderData->playersNo = 2;
         StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
 
-        if (!FlagGet(FLAG_0x340))
+        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS))
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]);
         else
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]);
@@ -1647,7 +1647,7 @@ static void sub_80808D4(void)
 
         if (gSpecialVar_0x8004 == 1)
         {
-            if (!FlagGet(FLAG_0x340))
+            if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS))
                 sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
             else
                 sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10);
diff --git a/src/bike.c b/src/bike.c
index 742b2a6bb..b9d247c5d 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -18,7 +18,7 @@ extern u8 sub_808B980(u8 direction);
 extern u8 sub_808B9BC(u8 direction);
 extern u8 sub_808B9A4(u8 direction);
 extern u8 sub_808C1B4(u8 direction);
-extern u8 npc_use_some_d2s(u8 direction);
+extern u8 sub_808B9D4(u8 direction);
 extern void Overworld_ClearSavedMusic(void);
 extern void Overworld_PlaySpecialMapMusic(void);
 
@@ -575,7 +575,7 @@ static void AcroBikeTransition_Moving(u8 direction)
     }
     else
     {
-        PlayerGoSpeed3(direction);
+        PlayerRideWaterCurrent(direction);
     }
 }
 
@@ -768,7 +768,7 @@ static void AcroBikeTransition_WheelieLoweringMoving(u8 direction)
             PlayerEndWheelie(direction);
         return;
     }
-    npc_use_some_d2s(direction);
+    sub_808B9D4(direction);
 }
 
 void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys)
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 4765141de..76394e937 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -431,9 +431,9 @@ bool8 ShouldDoBrailleRegicePuzzle(void)
     {
         if (FlagGet(FLAG_SYS_BRAILLE_WAIT) != FALSE)
             return FALSE;
-        if (FlagGet(FLAG_0x002) == FALSE)
+        if (FlagGet(FLAG_TEMP_2) == FALSE)
             return FALSE;
-        if (FlagGet(FLAG_0x003) == TRUE)
+        if (FlagGet(FLAG_TEMP_3) == TRUE)
             return FALSE;
 
         for (i = 0; i < 36; i++)
@@ -474,8 +474,8 @@ bool8 ShouldDoBrailleRegicePuzzle(void)
             }
         }
 
-        FlagSet(FLAG_0x003);
-        FlagClear(FLAG_0x002);
+        FlagSet(FLAG_TEMP_3);
+        FlagClear(FLAG_TEMP_2);
     }
 
     return FALSE;
diff --git a/src/data/pokemon/experience_tables.h b/src/data/pokemon/experience_tables.h
index 58474b6f1..9fd5a2fae 100644
--- a/src/data/pokemon/experience_tables.h
+++ b/src/data/pokemon/experience_tables.h
@@ -18,7 +18,7 @@
     :(n <= 36) ? ((n + 14)           * CUBE(n) / 50)        \
     :            (((n / 2) + 32)     * CUBE(n) / 50)
 
-const u32 gExperienceTables[][MAX_MON_LEVEL + 1] =
+const u32 gExperienceTables[][MAX_LEVEL + 1] =
 {
     { // Medium Fast
         0, // 0
diff --git a/src/daycare.c b/src/daycare.c
index 934cdea43..c80a8b743 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -241,7 +241,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon)
     bool8 firstMove;
     u16 learnedMove;
 
-    for (i = 0; i < MAX_MON_LEVEL; i++)
+    for (i = 0; i < MAX_LEVEL; i++)
     {
         // Add the mon's gained daycare experience level by level until it can't level up anymore.
         if (TryIncrementMonLevel(mon))
@@ -278,7 +278,7 @@ static u16 TakeSelectedPokemonFromDaycare(struct DaycareMon *daycareMon)
     species = GetBoxMonData(&daycareMon->mon, MON_DATA_SPECIES);
     BoxMonToMon(&daycareMon->mon, &pokemon);
 
-    if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_MON_LEVEL)
+    if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL)
     {
         experience = GetMonData(&pokemon, MON_DATA_EXP) + daycareMon->steps;
         SetMonData(&pokemon, MON_DATA_EXP, &experience);
@@ -949,7 +949,7 @@ static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare)
     return FALSE; // no hatching
 }
 
-bool8 DoEggActions_CheckHatch(void)
+bool8 ShouldEggHatch(void)
 {
     return _DoEggActions_CheckHatch(&gSaveBlock1Ptr->daycare);
 }
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index d3c8da3b5..078cc0fae 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -17,7 +17,6 @@
 #include "pokenav.h"
 #include "random.h"
 #include "rom_818CFC8.h"
-#include "rom_81BE66C.h"
 #include "sprite.h"
 #include "trainer_see.h"
 #include "util.h"
@@ -2621,10 +2620,10 @@ void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat)
         switch (decorCat)
         {
             case DECORCAT_DOLL:
-                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_2766A2);
+                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_SecretPower1);
                 break;
             case DECORCAT_CUSHION:
-                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_2766A6);
+                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_SecretPower2);
                 break;
         }
     }
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index c00aaeb15..067e103c2 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -27,6 +27,7 @@
 #include "link.h"
 #include "util.h"
 #include "trig.h"
+#include "data2.h"
 
 struct EvoInfo
 {
@@ -48,8 +49,6 @@ extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
-extern bool8 gAffineAnimsDisabled;
-extern const u8 gSpeciesNames[][11];
 
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
 #define sEvoGraphicsTaskID      gBattleCommunication[2]
@@ -60,12 +59,9 @@ extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 // strings
 extern const u8 gText_CommunicationStandby5[];
 
-extern void sub_80356D0(void);
 extern void sub_807B154(void);
 extern void sub_807F19C(void);
 extern void sub_807B140(void);
-extern void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
-extern void Overworld_PlaySpecialMapMusic(void);
 extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move);
 extern u8 sub_81C1B94(void);
 extern void sub_807F1A8(u8 arg0, const u8 *arg1, u8 arg2);
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
new file mode 100644
index 000000000..7fd07af5c
--- /dev/null
+++ b/src/field_control_avatar.c
@@ -0,0 +1,1058 @@
+#include "global.h"
+#include "battle_setup.h"
+#include "battle_frontier_1.h"
+#include "bike.h"
+#include "coord_event_weather.h"
+#include "daycare.h"
+#include "event_data.h"
+#include "event_object_movement.h"
+#include "fieldmap.h"
+#include "field_control_avatar.h"
+#include "field_fadetransition.h"
+#include "field_player_avatar.h"
+#include "field_poison.h"
+#include "field_screen.h"
+#include "field_specials.h"
+#include "fldeff_80F9BCC.h"
+#include "item_menu.h"
+#include "link.h"
+#include "metatile_behavior.h"
+#include "overworld.h"
+#include "pokemon.h"
+#include "pokenav.h"
+#include "safari_zone.h"
+#include "script.h"
+#include "secret_base.h"
+#include "sound.h"
+#include "start_menu.h"
+#include "trainer_see.h"
+#include "wild_encounter.h"
+#include "constants/bg_event_constants.h"
+#include "constants/map_types.h"
+#include "constants/songs.h"
+
+static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
+static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
+
+u8 gSelectedEventObject;
+
+//scripts
+extern const u8 EventScript_PlayerPCMale[];
+extern const u8 EventScript_PlayerPCFemale[];
+extern const u8 EventScript_SecretBasePC[];
+extern const u8 EventScript_RecordMixingSecretBasePC[];
+extern const u8 EventScript_SecretPower1[];
+extern const u8 EventScript_SecretPower2[];
+extern const u8 EventScript_PC[];
+extern const u8 EventScript_TestSignpostMsg[];
+extern const u8 EventScript_HiddenItemScript[];
+extern const u8 EventScript_2759F1[];
+extern const u8 EventScript_TV[];
+extern const u8 EventScript_ClosedSootopolisDoor[];
+extern const u8 SkyPillar_Outside_EventScript_2393F9[];
+extern const u8 EventScript_CableBoxResults[];
+extern const u8 EventScript_2A4BAC[];
+extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[];
+extern const u8 EventScript_RegionMap[];
+extern const u8 EventScript_RunningShoesManual[];
+extern const u8 EventScript_PictureBookShelf[];
+extern const u8 EventScript_BookShelf[];
+extern const u8 EventScript_PokemonCenterBookshelf[];
+extern const u8 EventScript_Vase[];
+extern const u8 EventScript_TrashCan[];
+extern const u8 EventScript_ShopShelf[];
+extern const u8 EventScript_Blueprint[];
+extern const u8 EventScript_WirelessBoxResults[];
+extern const u8 EventScript_CableBoxResults[];
+extern const u8 EventScript_Questionnaire[];
+extern const u8 EventScript_TrainerHillTimer[];
+extern const u8 EventScript_SecretBaseSandOrnament[];
+extern const u8 EventScript_SecretBaseShieldOrToyTV[];
+extern const u8 EventScript_UseSurf[];
+extern const u8 EventScript_UseWaterfall[];
+extern const u8 EventScript_CannotUseWaterfall[];
+extern const u8 EventScript_UseDive[];
+extern const u8 EventScript_UseDiveUnderwater[];
+extern const u8 EventScript_FallDownHole[];
+extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[];
+extern const u8 EventScript_Poison[];
+extern const u8 EventScript_EggHatch[];
+extern const u8 gUnknown_08273D1F[];
+extern const u8 IslandCave_EventScript_238EAF[];
+extern const u8 MauvilleCity_EventScript_1DF7BA[];
+extern const u8 Route119_EventScript_1F49EC[];
+extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[];
+extern const u8 RustboroCity_Gym_EventScript_21307B[];
+extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[];
+extern const u8 SSTidalCorridor_EventScript_23C050[];
+extern const u8 gUnknown_082A8350[];
+
+static void GetPlayerPosition(struct MapPosition *);
+static void GetInFrontOfPlayerPosition(struct MapPosition *);
+static u16 GetPlayerCurMetatileBehavior(int);
+static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8);
+static const u8 *GetInteractionScript(struct MapPosition*, u8, u8);
+static const u8 *GetInteractedEventObjectScript(struct MapPosition *, u8, u8);
+static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8);
+static const u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8);
+static const u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8);
+static bool32 TrySetupDiveDownScript(void);
+static bool32 TrySetupDiveEmergeScript(void);
+static bool8 TryStartStepBasedScript(struct MapPosition *, u16, u16);
+static bool8 CheckStandardWildEncounter(u16);
+static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *, u16, u8);
+static bool8 IsWarpMetatileBehavior(u16);
+static bool8 IsArrowWarpMetatileBehavior(u16, u8);
+static s8 GetWarpEventAtMapPosition(struct MapHeader *, struct MapPosition *);
+static void sub_809CEB0(struct MapHeader *, s8, struct MapPosition *);
+static bool8 map_warp_consider_2_to_inside(struct MapPosition *, u16, u8);
+static s8 GetWarpEventAtPosition(struct MapHeader *, u16, u16, u8);
+static u8 *GetCoordEventScriptAtPosition(struct MapHeader *, u16, u16, u8);
+static struct BgEvent *GetBackgroundEventAtPosition(struct MapHeader *, u16, u16, u8);
+static bool8 TryStartCoordEventScript(struct MapPosition *);
+static bool8 TryStartWarpEventScript(struct MapPosition *, u16);
+static bool8 TryStartMiscWalkingScripts(u16);
+static bool8 TryStartStepCountScript(u16);
+static void UpdateHappinessStepCounter(void);
+static bool8 UpdatePoisonStepCounter(void);
+
+void FieldClearPlayerInput(struct FieldInput *input)
+{
+    input->pressedAButton = FALSE;
+    input->checkStandardWildEncounter = FALSE;
+    input->pressedStartButton = FALSE;
+    input->pressedSelectButton = FALSE;
+    input->input_field_0_4 = FALSE;
+    input->input_field_0_5 = FALSE;
+    input->tookStep = FALSE;
+    input->pressedBButton = FALSE;
+    input->input_field_1_0 = FALSE;
+    input->input_field_1_1 = FALSE;
+    input->input_field_1_2 = FALSE;
+    input->input_field_1_3 = FALSE;
+    input->dpadDirection = 0;
+}
+
+void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
+{
+    u8 tileTransitionState = gPlayerAvatar.tileTransitionState;
+    u8 runningState = gPlayerAvatar.runningState;
+    bool8 forcedMove = MetatileBehavior_IsForcedMovementTile(GetPlayerCurMetatileBehavior(runningState));
+
+    if ((tileTransitionState == T_TILE_CENTER && forcedMove == FALSE) || tileTransitionState == T_NOT_MOVING)
+    {
+        if (GetPlayerSpeed() != 4)
+        {
+            if (newKeys & START_BUTTON)
+                input->pressedStartButton = TRUE;
+            if (newKeys & SELECT_BUTTON)
+                input->pressedSelectButton = TRUE;
+            if (newKeys & A_BUTTON)
+                input->pressedAButton = TRUE;
+            if (newKeys & B_BUTTON)
+                input->pressedBButton = TRUE;
+        }
+
+        if (heldKeys & (DPAD_UP | DPAD_DOWN | DPAD_LEFT | DPAD_RIGHT))
+        {
+            input->input_field_0_4 = TRUE;
+            input->input_field_0_5 = TRUE;
+        }
+    }
+
+    if (forcedMove == FALSE)
+    {
+        if (tileTransitionState == T_TILE_CENTER && runningState == MOVING)
+            input->tookStep = TRUE;
+        if (forcedMove == FALSE && tileTransitionState == T_TILE_CENTER)
+            input->checkStandardWildEncounter = TRUE;
+    }
+
+    if (heldKeys & DPAD_UP)
+        input->dpadDirection = DIR_NORTH;
+    else if (heldKeys & DPAD_DOWN)
+        input->dpadDirection = DIR_SOUTH;
+    else if (heldKeys & DPAD_LEFT)
+        input->dpadDirection = DIR_WEST;
+    else if (heldKeys & DPAD_RIGHT)
+        input->dpadDirection = DIR_EAST;
+}
+
+int ProcessPlayerFieldInput(struct FieldInput *input)
+{
+    struct MapPosition position;
+    u8 playerDirection;
+    u16 metatileBehavior;
+
+    gSpecialVar_LastTalked = 0;
+    gSelectedEventObject = 0;
+
+    playerDirection = GetPlayerFacingDirection();
+    GetPlayerPosition(&position);
+    metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
+
+    if (CheckForTrainersWantingBattle() == TRUE)
+        return TRUE;
+
+    if (mapheader_run_first_tag2_script_list_match() == 1)
+        return TRUE;
+
+    if (input->pressedBButton && TrySetupDiveEmergeScript() == TRUE)
+        return TRUE;
+    if (input->tookStep)
+    {
+        IncrementGameStat(GAME_STAT_STEPS);
+        increment_var_x4026_on_birth_island_modulo_100();
+        if (TryStartStepBasedScript(&position, metatileBehavior, playerDirection) == TRUE)
+            return TRUE;
+    }
+    if (input->checkStandardWildEncounter && CheckStandardWildEncounter(metatileBehavior) == TRUE)
+        return TRUE;
+    if (input->input_field_0_4 && input->dpadDirection == playerDirection)
+    {
+        if (mapheader_run_first_tag2_script_list_match_conditionally(&position, metatileBehavior, playerDirection) == TRUE)
+            return TRUE;
+    }
+
+    GetInFrontOfPlayerPosition(&position);
+    metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
+    if (input->pressedAButton && TryStartInteractionScript(&position, metatileBehavior, playerDirection) == TRUE)
+        return TRUE;
+
+    if (input->input_field_0_5 && input->dpadDirection == playerDirection)
+    {
+        if (map_warp_consider_2_to_inside(&position, metatileBehavior, playerDirection) == TRUE)
+            return TRUE;
+    }
+    if (input->pressedAButton && TrySetupDiveDownScript() == TRUE)
+        return TRUE;
+    if (input->pressedStartButton)
+    {
+        PlaySE(SE_WIN_OPEN);
+        ShowStartMenu();
+        return TRUE;
+    }
+    if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
+        return TRUE;
+
+    return FALSE;
+}
+
+static void GetPlayerPosition(struct MapPosition *position)
+{
+    PlayerGetDestCoords(&position->x, &position->y);
+    position->height = PlayerGetZCoord();
+}
+
+static void GetInFrontOfPlayerPosition(struct MapPosition *position)
+{
+    s16 x, y;
+
+    GetXYCoordsOneStepInFrontOfPlayer(&position->x, &position->y);
+    PlayerGetDestCoords(&x, &y);
+    if (MapGridGetZCoordAt(x, y) != 0)
+        position->height = PlayerGetZCoord();
+    else
+        position->height = 0;
+}
+
+static u16 GetPlayerCurMetatileBehavior(int runningState)
+{
+    s16 x, y;
+
+    PlayerGetDestCoords(&x, &y);
+    return MapGridGetMetatileBehaviorAt(x, y);
+}
+
+static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatileBehavior, u8 direction)
+{
+    const u8 *script = GetInteractionScript(position, metatileBehavior, direction);
+    if (script == NULL)
+        return FALSE;
+
+    // Don't play interaction sound for certain scripts.
+    if (script != EventScript_PlayerPCMale
+     && script != EventScript_PlayerPCFemale
+     && script != EventScript_SecretBasePC
+     && script != EventScript_RecordMixingSecretBasePC
+     && script != EventScript_SecretPower1
+     && script != EventScript_SecretPower2
+     && script != EventScript_PC)
+        PlaySE(SE_SELECT);
+
+    ScriptContext1_SetupScript(script);
+    return TRUE;
+}
+
+static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavior, u8 direction)
+{
+    const u8 *script = GetInteractedEventObjectScript(position, metatileBehavior, direction);
+    if (script != NULL)
+        return script;
+
+    script = GetInteractedBackgroundEventScript(position, metatileBehavior, direction);
+    if (script != NULL)
+        return script;
+
+    script = GetInteractedMetatileScript(position, metatileBehavior, direction);
+    if (script != NULL)
+        return script;
+
+    script = GetInteractedWaterScript(position, metatileBehavior, direction);
+    if (script != NULL)
+        return script;
+
+    return NULL;
+}
+
+const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction)
+{
+    u8 eventObjectId;
+    s32 i;
+
+    if (!MetatileBehavior_IsCounter(MapGridGetMetatileBehaviorAt(position->x, position->y)))
+        eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height);
+    else
+        eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height);
+
+    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
+        return NULL;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (gLinkPlayerEventObjects[i].active == TRUE && gLinkPlayerEventObjects[i].eventObjId == eventObjectId)
+            return NULL;
+    }
+
+    gSelectedEventObject = eventObjectId;
+    gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId;
+    gSpecialVar_Facing = direction;
+    return GetEventObjectScriptPointerByEventObjectId(eventObjectId);
+}
+
+static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metatileBehavior, u8 direction)
+{
+    u8 eventObjectId;
+    const u8 *script;
+
+    eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height);
+    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
+    {
+        if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE)
+            return NULL;
+
+        // Look for an event object on the other side of the counter.
+        eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height);
+        if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
+            return NULL;
+    }
+
+    gSelectedEventObject = eventObjectId;
+    gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId;
+    gSpecialVar_Facing = direction;
+
+    if (InTrainerHill() == TRUE)
+    {
+        script = sub_81D62AC();
+    }
+    else
+    {
+        script = GetEventObjectScriptPointerByEventObjectId(eventObjectId);
+    }
+    script = GetRamScript(gSpecialVar_LastTalked, script);
+    return script;
+}
+
+static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *position, u8 metatileBehavior, u8 direction)
+{
+    struct BgEvent *bgEvent = GetBackgroundEventAtPosition(&gMapHeader, position->x - 7, position->y - 7, position->height);
+
+    if (bgEvent == NULL)
+        return NULL;
+    if (bgEvent->bgUnion.script == NULL)
+        return EventScript_TestSignpostMsg;
+
+    switch (bgEvent->kind)
+    {
+    case BG_EVENT_PLAYER_FACING_ANY:
+    default:
+        return bgEvent->bgUnion.script;
+    case BG_EVENT_PLAYER_FACING_NORTH:
+        if (direction != DIR_NORTH)
+            return NULL;
+        break;
+    case BG_EVENT_PLAYER_FACING_SOUTH:
+        if (direction != DIR_SOUTH)
+            return NULL;
+        break;
+    case BG_EVENT_PLAYER_FACING_EAST:
+        if (direction != DIR_EAST)
+            return NULL;
+        break;
+    case BG_EVENT_PLAYER_FACING_WEST:
+        if (direction != DIR_WEST)
+            return NULL;
+        break;
+    case 5:
+    case 6:
+    case BG_EVENT_HIDDEN_ITEM:
+        gSpecialVar_0x8004 = ((u32)bgEvent->bgUnion.script >> 16) + FLAG_HIDDEN_ITEMS_START;
+        gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script;
+        if (FlagGet(gSpecialVar_0x8004) == TRUE)
+            return NULL;
+        return EventScript_HiddenItemScript;
+    case BG_EVENT_SECRET_BASE:
+        if (direction == DIR_NORTH)
+        {
+            gSpecialVar_0x8004 = bgEvent->bgUnion.secretBaseId;
+            if (sub_80E9680())
+                return EventScript_2759F1;
+        }
+        return NULL;
+    }
+
+    return bgEvent->bgUnion.script;
+}
+
+static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatileBehavior, u8 direction)
+{
+    s8 height;
+
+    if (MetatileBehavior_IsPlayerFacingTVScreen(metatileBehavior, direction) == TRUE)
+        return EventScript_TV;
+    if (MetatileBehavior_IsPC(metatileBehavior) == TRUE)
+        return EventScript_PC;
+    if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE)
+        return EventScript_ClosedSootopolisDoor;
+    if (MetatileBehavior_IsUnknownClosedDoor(metatileBehavior) == TRUE)
+        return SkyPillar_Outside_EventScript_2393F9;
+    if (MetatileBehavior_IsCableBoxResults1(metatileBehavior) == TRUE)
+        return EventScript_CableBoxResults;
+    if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE)
+        return EventScript_2A4BAC;
+    if (MetatileBehavior_IsTrickHousePuzzleDoor(metatileBehavior) == TRUE)
+        return Route110_TrickHouseEntrance_EventScript_26A22A;
+    if (MetatileBehavior_IsRegionMap(metatileBehavior) == TRUE)
+        return EventScript_RegionMap;
+    if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE)
+        return EventScript_RunningShoesManual;
+    if (MetatileBehavior_IsPictureBookShelf(metatileBehavior) == TRUE)
+        return EventScript_PictureBookShelf;
+    if (MetatileBehavior_IsBookShelf(metatileBehavior) == TRUE)
+        return EventScript_BookShelf;
+    if (MetatileBehavior_IsPokeCenterBookShelf(metatileBehavior) == TRUE)
+        return EventScript_PokemonCenterBookshelf;
+    if (MetatileBehavior_IsVase(metatileBehavior) == TRUE)
+        return EventScript_Vase;
+    if (MetatileBehavior_IsTrashCan(metatileBehavior) == TRUE)
+        return EventScript_TrashCan;
+    if (MetatileBehavior_IsShopShelf(metatileBehavior) == TRUE)
+        return EventScript_ShopShelf;
+    if (MetatileBehavior_IsBlueprint(metatileBehavior) == TRUE)
+        return EventScript_Blueprint;
+    if (MetatileBehavior_IsPlayerFacingWirelessBoxResults(metatileBehavior, direction) == TRUE)
+        return EventScript_WirelessBoxResults;
+    if (MetatileBehavior_IsCableBoxResults2(metatileBehavior, direction) == TRUE)
+        return EventScript_CableBoxResults;
+    if (MetatileBehavior_IsQuestionnaire(metatileBehavior) == TRUE)
+        return EventScript_Questionnaire;
+    if (MetatileBehavior_IsTrainerHillTimer(metatileBehavior) == TRUE)
+        return EventScript_TrainerHillTimer;
+
+    height = position->height;
+    if (height == MapGridGetZCoordAt(position->x, position->y))
+    {
+        if (MetatileBehavior_IsSecretBasePC(metatileBehavior) == TRUE)
+            return EventScript_SecretBasePC;
+        if (MetatileBehavior_IsRecordMixingSecretBasePC(metatileBehavior) == TRUE)
+            return EventScript_RecordMixingSecretBasePC;
+        if (MetatileBehavior_IsSecretBaseSandOrnament(metatileBehavior) == TRUE)
+            return EventScript_SecretBaseSandOrnament;
+        if (MetatileBehavior_IsSecretBaseShieldOrToyTV(metatileBehavior) == TRUE)
+            return EventScript_SecretBaseShieldOrToyTV;
+        if (MetatileBehavior_IsMB_C6(metatileBehavior) == TRUE)
+        {
+            sub_80EB56C();
+            return NULL;
+        }
+        if (MetatileBehavior_IsLargeMatCenter(metatileBehavior) == TRUE)
+        {
+            sub_80EB9E0();
+            return NULL;
+        }
+        if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatileBehavior) == TRUE)
+        {
+            sub_80EBB28();
+            return NULL;
+        }
+    }
+    else if (MetatileBehavior_IsSecretBasePoster(metatileBehavior) == TRUE)
+    {
+        sub_80EB498();
+        return NULL;
+    }
+
+    return NULL;
+}
+
+static const u8 *GetInteractedWaterScript(struct MapPosition *unused1, u8 metatileBehavior, u8 direction)
+{
+    if (FlagGet(FLAG_BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
+        return EventScript_UseSurf;
+
+    if (MetatileBehavior_IsWaterfall(metatileBehavior) == TRUE)
+    {
+        if (FlagGet(FLAG_BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE)
+            return EventScript_UseWaterfall;
+        else
+            return EventScript_CannotUseWaterfall;
+    }
+    return NULL;
+}
+
+static bool32 TrySetupDiveDownScript(void)
+{
+    if (FlagGet(FLAG_BADGE07_GET) && TrySetDiveWarp() == 2)
+    {
+        ScriptContext1_SetupScript(EventScript_UseDive);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool32 TrySetupDiveEmergeScript(void)
+{
+    if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && TrySetDiveWarp() == 1)
+    {
+        ScriptContext1_SetupScript(EventScript_UseDiveUnderwater);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool8 TryStartStepBasedScript(struct MapPosition *position, u16 metatileBehavior, u16 direction)
+{
+    if (TryStartCoordEventScript(position) == TRUE)
+        return TRUE;
+    if (TryStartWarpEventScript(position, metatileBehavior) == TRUE)
+        return TRUE;
+    if (TryStartMiscWalkingScripts(metatileBehavior) == TRUE)
+        return TRUE;
+    if (TryStartStepCountScript(metatileBehavior) == TRUE)
+        return TRUE;
+    if (UpdateRepelCounter() == TRUE)
+        return TRUE;
+    return FALSE;
+}
+
+static bool8 TryStartCoordEventScript(struct MapPosition *position)
+{
+    u8 *script = GetCoordEventScriptAtPosition(&gMapHeader, position->x - 7, position->y - 7, position->height);
+
+    if (script == NULL)
+        return FALSE;
+    ScriptContext1_SetupScript(script);
+    return TRUE;
+}
+
+static bool8 TryStartMiscWalkingScripts(u16 metatileBehavior)
+{
+    s16 x;
+    s16 y;
+
+    if (MetatileBehavior_IsCrackedFloorHole(metatileBehavior))
+    {
+        ScriptContext1_SetupScript(EventScript_FallDownHole);
+        return TRUE;
+    }
+    else if (MetatileBehavior_IsBattlePyramidWarp(metatileBehavior))
+    {
+        ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8);
+        return TRUE;
+    }
+    else if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE)
+    {
+        sub_80FA9D0();
+        return FALSE;
+    }
+    else if (MetatileBehavior_IsSecretBaseSoundMat(metatileBehavior) == TRUE)
+    {
+        PlayerGetDestCoords(&x, &y);
+        sub_80FA970(MapGridGetMetatileIdAt(x, y));
+        return FALSE;
+    }
+    return FALSE;
+}
+
+static bool8 TryStartStepCountScript(u16 metatileBehavior)
+{
+    if (InUnionRoom() == TRUE)
+    {
+        return FALSE;
+    }
+
+    IncrementRematchStepCounter();
+    UpdateHappinessStepCounter();
+    sub_81D4998();
+
+    if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior))
+    {
+        if (UpdatePoisonStepCounter() == TRUE)
+        {
+            ScriptContext1_SetupScript(EventScript_Poison);
+            return TRUE;
+        }
+        if (ShouldEggHatch())
+        {
+            IncrementGameStat(GAME_STAT_HATCHED_EGGS);
+            ScriptContext1_SetupScript(EventScript_EggHatch);
+            return TRUE;
+        }
+        if (sub_813B3B0() == TRUE)
+        {
+            ScriptContext1_SetupScript(gUnknown_08273D1F);
+            return TRUE;
+        }
+        if (ShouldDoBrailleRegicePuzzle() == TRUE)
+        {
+            ScriptContext1_SetupScript(IslandCave_EventScript_238EAF);
+            return TRUE;
+        }
+        if (is_tile_that_overrides_player_control() == TRUE)
+        {
+            ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA);
+            return TRUE;
+        }
+        if (sub_8138120() == TRUE)
+        {
+            ScriptContext1_SetupScript(Route119_EventScript_1F49EC);
+            return TRUE;
+        }
+        if (sub_8138168() == TRUE)
+        {
+            ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6);
+            return TRUE;
+        }
+        if (sub_81381B0() == TRUE)
+        {
+            ScriptContext1_SetupScript(RustboroCity_Gym_EventScript_21307B);
+            return TRUE;
+        }
+        if (sub_81381F8() == TRUE)
+        {
+            ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_224175);
+            return TRUE;
+        }
+    }
+
+    if (SafariZoneTakeStep() == TRUE)
+        return TRUE;
+    if (CountSSTidalStep(1) == TRUE)
+    {
+        ScriptContext1_SetupScript(SSTidalCorridor_EventScript_23C050);
+        return TRUE;
+    }
+    if (sub_8196034())
+        return TRUE;
+    return FALSE;
+}
+
+void Unref_ClearHappinessStepCounter(void)
+{
+    VarSet(VAR_HAPPINESS_STEP_COUNTER, 0);
+}
+
+static void UpdateHappinessStepCounter(void)
+{
+    u16 *ptr = GetVarPointer(VAR_HAPPINESS_STEP_COUNTER);
+    int i;
+
+    (*ptr)++;
+    (*ptr) %= 128;
+    if (*ptr == 0)
+    {
+        struct Pokemon *mon = gPlayerParty;
+        for (i = 0; i < PARTY_SIZE; i++)
+        {
+            AdjustFriendship(mon, FRIENDSHIP_EVENT_WALKING);
+            mon++;
+        }
+    }
+}
+
+void ClearPoisonStepCounter(void)
+{
+    VarSet(VAR_POISON_STEP_COUNTER, 0);
+}
+
+static bool8 UpdatePoisonStepCounter(void)
+{
+    u16 *ptr;
+
+    if (gMapHeader.mapType != MAP_TYPE_SECRET_BASE)
+    {
+        ptr = GetVarPointer(VAR_POISON_STEP_COUNTER);
+        (*ptr)++;
+        (*ptr) %= 4;
+        if (*ptr == 0)
+        {
+            switch (DoPoisonFieldEffect())
+            {
+            case 0:
+                return FALSE;
+            case 1:
+                return FALSE;
+            case 2:
+                return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+void RestartWildEncounterImmunitySteps(void)
+{
+    // Starts at 0 and counts up to 4 steps.
+    sWildEncounterImmunitySteps = 0;
+}
+
+static bool8 CheckStandardWildEncounter(u16 metatileBehavior)
+{
+    if (sWildEncounterImmunitySteps < 4)
+    {
+        sWildEncounterImmunitySteps++;
+        sPreviousPlayerMetatileBehavior = metatileBehavior;
+        return FALSE;
+    }
+
+    if (StandardWildEncounter(metatileBehavior, sPreviousPlayerMetatileBehavior) == TRUE)
+    {
+        sWildEncounterImmunitySteps = 0;
+        sPreviousPlayerMetatileBehavior = metatileBehavior;
+        return TRUE;
+    }
+
+    sPreviousPlayerMetatileBehavior = metatileBehavior;
+    return FALSE;
+}
+
+static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *position, u16 metatileBehavior, u8 direction)
+{
+    s8 warpEventId = GetWarpEventAtMapPosition(&gMapHeader, position);
+
+    if (IsArrowWarpMetatileBehavior(metatileBehavior, direction) == TRUE && warpEventId != -1)
+    {
+        StoreInitialPlayerAvatarState();
+        sub_809CEB0(&gMapHeader, warpEventId, position);
+        sub_80AF734();
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileBehavior)
+{
+    s8 warpEventId = GetWarpEventAtMapPosition(&gMapHeader, position);
+
+    if (warpEventId != -1 && IsWarpMetatileBehavior(metatileBehavior) == TRUE)
+    {
+        StoreInitialPlayerAvatarState();
+        sub_809CEB0(&gMapHeader, warpEventId, position);
+        if (MetatileBehavior_IsEscalator(metatileBehavior) == TRUE)
+        {
+            sub_80AF80C(metatileBehavior);
+            return TRUE;
+        }
+        if (MetatileBehavior_IsLavaridgeB1FWarp(metatileBehavior) == TRUE)
+        {
+            sub_80AF828();
+            return TRUE;
+        }
+        if (MetatileBehavior_IsLavaridge1FWarp(metatileBehavior) == TRUE)
+        {
+            sub_80AF838();
+            return TRUE;
+        }
+        if (MetatileBehavior_IsAquaHideoutWarp(metatileBehavior) == TRUE)
+        {
+            sub_80AF848();
+            return TRUE;
+        }
+        if (MetatileBehavior_IsWarpOrBridge(metatileBehavior) == TRUE)
+        {
+            sub_80B0268();
+            return TRUE;
+        }
+        if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE)
+        {
+            ScriptContext1_SetupScript(gUnknown_082A8350);
+            return TRUE;
+        }
+        if (MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) == TRUE)
+        {
+            sub_80AF87C();
+            return TRUE;
+        }
+        sub_80AF734();
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool8 IsWarpMetatileBehavior(u16 metatileBehavior)
+{
+    if (MetatileBehavior_IsWarpDoor(metatileBehavior) != TRUE
+     && MetatileBehavior_IsLadder(metatileBehavior) != TRUE
+     && MetatileBehavior_IsEscalator(metatileBehavior) != TRUE
+     && MetatileBehavior_IsNonAnimDoor(metatileBehavior) != TRUE
+     && MetatileBehavior_IsLavaridgeB1FWarp(metatileBehavior) != TRUE
+     && MetatileBehavior_IsLavaridge1FWarp(metatileBehavior) != TRUE
+     && MetatileBehavior_IsAquaHideoutWarp(metatileBehavior) != TRUE
+     && MetatileBehavior_IsMtPyreHole(metatileBehavior) != TRUE
+     && MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) != TRUE
+     && MetatileBehavior_IsWarpOrBridge(metatileBehavior) != TRUE)
+        return FALSE;
+    return TRUE;
+}
+
+static bool8 IsArrowWarpMetatileBehavior(u16 metatileBehavior, u8 direction)
+{
+    switch (direction)
+    {
+    case DIR_NORTH:
+        return MetatileBehavior_IsNorthArrowWarp(metatileBehavior);
+    case DIR_SOUTH:
+        return MetatileBehavior_IsSouthArrowWarp(metatileBehavior);
+    case DIR_WEST:
+        return MetatileBehavior_IsWestArrowWarp(metatileBehavior);
+    case DIR_EAST:
+        return MetatileBehavior_IsEastArrowWarp(metatileBehavior);
+    }
+    return FALSE;
+}
+
+static s8 GetWarpEventAtMapPosition(struct MapHeader *mapHeader, struct MapPosition *position)
+{
+    return GetWarpEventAtPosition(mapHeader, position->x - 7, position->y - 7, position->height);
+}
+
+static void sub_809CEB0(struct MapHeader *unused, s8 warpEventId, struct MapPosition *position)
+{
+    const struct WarpEvent *warpEvent;
+
+    u8 trainerHillMapId = GetCurrentTrainerHillMapId();
+
+    if (trainerHillMapId)
+    {
+        if (trainerHillMapId == sub_81D6490())
+        {
+            if (warpEventId == 0)
+            {
+                warpEvent = &gMapHeader.events->warps[0];
+            }
+            else
+            {
+                warpEvent = sub_81D6120();
+            }
+        }
+        else if (trainerHillMapId == 5)
+        {
+            warpEvent = sub_81D6134(warpEventId);
+        }
+        else
+        {
+            warpEvent = &gMapHeader.events->warps[warpEventId];
+        }
+    }
+    else
+    {
+        warpEvent = &gMapHeader.events->warps[warpEventId];
+    }
+
+    if (warpEvent->mapNum == 0x7F)
+    {
+        copy_saved_warp2_bank_and_enter_x_to_warp1(warpEvent->warpId);
+    }
+    else
+    {
+        const struct MapHeader *mapHeader;
+
+        warp1_set_2(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId);
+        sub_8084D5C(position->x, position->y);
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum);
+        if (mapHeader->events->warps[warpEvent->warpId].mapNum == 0x7F)
+            saved_warp2_set(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId);
+    }
+}
+
+static bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 metatileBehavior, u8 direction)
+{
+    s8 warpEventId;
+
+    if (direction == DIR_NORTH)
+    {
+        if (MetatileBehavior_IsOpenSecretBaseDoor(metatileBehavior) == TRUE)
+        {
+            sub_80E9668(position, gMapHeader.events);
+            return TRUE;
+        }
+        if (MetatileBehavior_IsWarpDoor(metatileBehavior) == TRUE)
+        {
+            warpEventId = GetWarpEventAtMapPosition(&gMapHeader, position);
+            if (warpEventId != -1 && IsWarpMetatileBehavior(metatileBehavior) == TRUE)
+            {
+                StoreInitialPlayerAvatarState();
+                sub_809CEB0(&gMapHeader, warpEventId, position);
+                sub_80AF7D0();
+                return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+static s8 GetWarpEventAtPosition(struct MapHeader *mapHeader, u16 x, u16 y, u8 elevation)
+{
+    s32 i;
+    struct WarpEvent *warpEvent = mapHeader->events->warps;
+    u8 warpCount = mapHeader->events->warpCount;
+
+    for (i = 0; i < warpCount; i++, warpEvent++)
+    {
+        if ((u16)warpEvent->x == x && (u16)warpEvent->y == y)
+        {
+            if (warpEvent->elevation == elevation || warpEvent->elevation == 0)
+                return i;
+        }
+    }
+    return -1;
+}
+
+static u8 *TryRunCoordEventScript(struct CoordEvent *coordEvent)
+{
+    if (coordEvent != NULL)
+    {
+        if (coordEvent->script == NULL)
+        {
+            DoCoordEventWeather(coordEvent->trigger);
+            return NULL;
+        }
+        if (coordEvent->trigger == 0)
+        {
+            ScriptContext2_RunNewScript(coordEvent->script);
+            return NULL;
+        }
+        if (VarGet(coordEvent->trigger) == (u8)coordEvent->index)
+            return coordEvent->script;
+    }
+    return NULL;
+}
+
+static u8 *GetCoordEventScriptAtPosition(struct MapHeader *mapHeader, u16 x, u16 y, u8 elevation)
+{
+    s32 i;
+    struct CoordEvent *coordEvents = mapHeader->events->coordEvents;
+    u8 coordEventCount = mapHeader->events->coordEventCount;
+
+    for (i = 0; i < coordEventCount; i++)
+    {
+        if ((u16)coordEvents[i].x == x && (u16)coordEvents[i].y == y)
+        {
+            if (coordEvents[i].elevation == elevation || coordEvents[i].elevation == 0)
+            {
+                u8 *script = TryRunCoordEventScript(&coordEvents[i]);
+                if (script != NULL)
+                    return script;
+            }
+        }
+    }
+    return NULL;
+}
+
+u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position)
+{
+    return GetCoordEventScriptAtPosition(&gMapHeader, position->x - 7, position->y - 7, position->height);
+}
+
+static struct BgEvent *GetBackgroundEventAtPosition(struct MapHeader *mapHeader, u16 x, u16 y, u8 elevation)
+{
+    u8 i;
+    struct BgEvent *bgEvents = mapHeader->events->bgEvents;
+    u8 bgEventCount = mapHeader->events->bgEventCount;
+
+    for (i = 0; i < bgEventCount; i++)
+    {
+        if ((u16)bgEvents[i].x == x && (u16)bgEvents[i].y == y)
+        {
+            if (bgEvents[i].elevation == elevation || bgEvents[i].elevation == 0)
+                return &bgEvents[i];
+        }
+    }
+    return NULL;
+}
+
+bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior)
+{
+    if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && !MetatileBehavior_IsUnableToEmerge(metatileBehavior))
+    {
+        if (SetDiveWarpEmerge(position->x - 7, position->y - 7))
+        {
+            StoreInitialPlayerAvatarState();
+            sp13E_warp_to_last_warp();
+            PlaySE(SE_W291);
+            return TRUE;
+        }
+    }
+    else if (MetatileBehavior_IsDiveable(metatileBehavior) == TRUE)
+    {
+        if (SetDiveWarpDive(position->x - 7, position->y - 7))
+        {
+            StoreInitialPlayerAvatarState();
+            sp13E_warp_to_last_warp();
+            PlaySE(SE_W291);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+u8 TrySetDiveWarp(void)
+{
+    s16 x, y;
+    u8 metatileBehavior;
+
+    PlayerGetDestCoords(&x, &y);
+    metatileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+    if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && !MetatileBehavior_IsUnableToEmerge(metatileBehavior))
+    {
+        if (SetDiveWarpEmerge(x - 7, y - 7) == TRUE)
+            return 1;
+    }
+    else if (MetatileBehavior_IsDiveable(metatileBehavior) == TRUE)
+    {
+        if (SetDiveWarpDive(x - 7, y - 7) == TRUE)
+            return 2;
+    }
+    return 0;
+}
+
+const u8 *GetEventObjectScriptPointerPlayerFacing(void)
+{
+    u8 direction;
+    struct MapPosition position;
+
+    direction = GetPlayerMovementDirection();
+    GetInFrontOfPlayerPosition(&position);
+    return GetInteractedEventObjectScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction);
+}
+
+int SetCableClubWarp(void)
+{
+    struct MapPosition position;
+
+    GetPlayerMovementDirection();  //unnecessary
+    GetPlayerPosition(&position);
+    MapGridGetMetatileBehaviorAt(position.x, position.y);  //unnecessary
+    sub_809CEB0(&gMapHeader, GetWarpEventAtMapPosition(&gMapHeader, &position), &position);
+    return 0;
+}
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index f5ddbcca4..6b8548f1a 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1,38 +1,64 @@
 #include "global.h"
+#include "main.h"
 #include "bike.h"
 #include "event_data.h"
 #include "event_object_movement.h"
+#include "field_camera.h"
 #include "field_player_avatar.h"
+#include "field_effect.h"
+#include "field_effect_helpers.h"
 #include "fieldmap.h"
 #include "global.fieldmap.h"
+#include "menu.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
+#include "party_menu.h"
+#include "random.h"
 #include "rotating_gate.h"
+#include "script.h"
+#include "sound.h"
 #include "sprite.h"
+#include "strings.h"
 #include "task.h"
+#include "tv.h"
+#include "wild_encounter.h"
+#include "constants/abilities.h"
 #include "constants/event_objects.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/flags.h"
+#include "constants/maps.h"
+#include "constants/moves.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 
-extern void task_add_bump_boulder(u8, u8);
+static EWRAM_DATA u8 gUnknown_0203734C = 0;
+EWRAM_DATA struct EventObject gEventObjects[EVENT_OBJECTS_COUNT] = {};
+EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {};
+
+static void StartStrengthAnim(u8, u8);
 static bool8 ShouldJumpLedge(s16, s16, u8);
 static bool8 sub_808B1BC(s16, s16, u8);
 static u8 sub_808B164(struct EventObject *, s16, s16, u8, u8);
 static u8 sub_808B238(s16, s16, u8);
 static void check_acro_bike_metatile(s16, s16, u8, u8 *);
-extern void PlayerNotOnBikeCollide(u8);
-extern void PlayerNotOnBikeCollideWithFarawayIslandMew(u8);
-extern void PlayerRun(u8); 
+static void PlayerNotOnBikeCollide(u8);
+static void PlayCollisionSoundIfNotFacingWarp(u8 a);
+static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8);
+static void PlayerRun(u8); 
 static void MovePlayerNotOnBike(u8, u16);
 static u8 CheckMovementInputNotOnBike(u8);
-extern void sub_808C5B0(void);
-extern void sub_808C4D8(void);
+static void DoPlayerMatSpin(void);
+static void DoPlayerMatJump(void);
 static u8 CheckForPlayerAvatarCollision(u8);
 static u8 EventObjectCB2_NoMovement2();
-extern void sub_808C280(struct EventObject *); 
+static void sub_808C280(struct EventObject *); 
 static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *, u8);
-void npc_clear_strange_bits(struct EventObject *);
-extern void DoPlayerAvatarTransition(void); 
+static void npc_clear_strange_bits(struct EventObject *);
+static void DoPlayerAvatarTransition(void); 
+static bool8 player_is_anim_in_certain_ranges(void);
+static bool8 sub_808B618(void);
+static bool8 PlayerIsAnimActive(void);
+static bool8 PlayerCheckIfAnimFinishedOrInactive(void);
 static bool8 TryDoMetatileBehaviorForcedMovement();
 static void MovePlayerAvatarUsingKeypadInput(u8, u16, u16);
 static void PlayerAllowForcedMovementIfMovingSameDirection();
@@ -41,43 +67,61 @@ static u8 GetForcedMovementByMetatileBehavior();
 static void PlayerNotOnBikeNotMoving(u8, u16);
 static void PlayerNotOnBikeTurningInPlace(u8, u16);
 static void PlayerNotOnBikeMoving(u8, u16);
-extern void sub_808C750(u8);
-
-extern void PlayerAvatarTransition_Normal(struct EventObject *a);
-extern void PlayerAvatarTransition_MachBike(struct EventObject *a);
-extern void PlayerAvatarTransition_AcroBike(struct EventObject *a);
-extern void PlayerAvatarTransition_Surfing(struct EventObject *a);
-extern void PlayerAvatarTransition_Underwater(struct EventObject *a);
-extern void PlayerAvatarTransition_ReturnToField(struct EventObject *a);
-extern void PlayerAvatarTransition_Dummy(struct EventObject *a);
-
-extern u8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject);
-extern u8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject);
-extern u8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject);
-
-extern u8 sub_808C544(struct Task *task, struct EventObject *eventObject);
-
-extern u8 sub_808C61C(struct Task *task, struct EventObject *eventObject);
-extern u8 sub_808C644(struct Task *task, struct EventObject *eventObject);
-extern u8 sub_808C6BC(struct Task *task, struct EventObject *eventObject);
-extern u8 sub_808C6FC(struct Task *task, struct EventObject *eventObject);
-
-extern u8 fish0(struct Task *task);
-extern u8 fish1(struct Task *task);
-extern u8 fish2(struct Task *task);
-extern u8 fish3(struct Task *task);
-extern u8 fish4(struct Task *task);
-extern u8 fish5(struct Task *task);
-extern u8 fish6(struct Task *task);
-extern u8 fish7(struct Task *task);
-extern u8 fish8(struct Task *task);
-extern u8 fish9(struct Task *task);
-extern u8 fishA_wait_for_a_pressed(struct Task *task);
-extern u8 fishB(struct Task *task);
-extern u8 fishC(struct Task *task);
-extern u8 fishD(struct Task *task);
-extern u8 fishE(struct Task *task);
-extern u8 fishF(struct Task *task);
+static void sub_808C750(u8);
+
+static bool8 ForcedMovement_None(void);
+static bool8 ForcedMovement_Slip(void);
+static bool8 ForcedMovement_WalkSouth(void);
+static bool8 ForcedMovement_WalkNorth(void);
+static bool8 ForcedMovement_WalkWest(void);
+static bool8 ForcedMovement_WalkEast(void);
+static bool8 ForcedMovement_PushedSouthByCurrent(void);
+static bool8 ForcedMovement_PushedNorthByCurrent(void);
+static bool8 ForcedMovement_PushedWestByCurrent(void);
+static bool8 ForcedMovement_PushedEastByCurrent(void);
+static bool8 ForcedMovement_SlideSouth(void);
+static bool8 ForcedMovement_SlideNorth(void);
+static bool8 ForcedMovement_SlideWest(void);
+static bool8 ForcedMovement_SlideEast(void);
+static bool8 ForcedMovement_0xBB(void);
+static bool8 ForcedMovement_0xBC(void);
+static bool8 ForcedMovement_MuddySlope(void);
+
+static void PlayerAvatarTransition_Normal(struct EventObject *a);
+static void PlayerAvatarTransition_MachBike(struct EventObject *a);
+static void PlayerAvatarTransition_AcroBike(struct EventObject *a);
+static void PlayerAvatarTransition_Surfing(struct EventObject *a);
+static void PlayerAvatarTransition_Underwater(struct EventObject *a);
+static void PlayerAvatarTransition_ReturnToField(struct EventObject *a);
+static void PlayerAvatarTransition_Dummy(struct EventObject *a);
+
+static u8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject);
+static u8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject);
+static u8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject);
+
+static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject);
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject);
+static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject);
+static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject);
+static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject);
+
+static u8 Fishing1(struct Task *task);
+static u8 Fishing2(struct Task *task);
+static u8 Fishing3(struct Task *task);
+static u8 Fishing4(struct Task *task);
+static u8 Fishing5(struct Task *task);
+static u8 Fishing6(struct Task *task);
+static u8 Fishing7(struct Task *task);
+static u8 Fishing8(struct Task *task);
+static u8 Fishing9(struct Task *task);
+static u8 Fishing10(struct Task *task);
+static u8 Fishing11(struct Task *task);
+static u8 Fishing12(struct Task *task);
+static u8 Fishing13(struct Task *task);
+static u8 Fishing14(struct Task *task);
+static u8 Fishing15(struct Task *task);
+static u8 Fishing16(struct Task *task);
 
 static bool8 (*const sForcedMovementTestFuncs[])(u8) =
 {
@@ -142,7 +186,7 @@ static bool8 (*const gUnknown_0849749C[])(u8) =
 
 static const u8 gUnknown_084974B0[] = {9, 10, 11, 12, 13, 0, 0, 0};
 
-void (*const gUnknown_084974B8[])(struct EventObject *) =
+static void (*const gUnknown_084974B8[])(struct EventObject *) =
 {
     PlayerAvatarTransition_Normal,
     PlayerAvatarTransition_MachBike,
@@ -154,7 +198,7 @@ void (*const gUnknown_084974B8[])(struct EventObject *) =
     PlayerAvatarTransition_Dummy,
 };
 
-bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) =
+static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) =
 {
     MetatileBehavior_IsSouthArrowWarp,
     MetatileBehavior_IsNorthArrowWarp,
@@ -162,7 +206,7 @@ bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) =
     MetatileBehavior_IsEastArrowWarp,
 };
 
-const u8 sRivalAvatarGfxIds[][2] =
+static const u8 sRivalAvatarGfxIds[][2] =
 {
     {EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL,     EVENT_OBJ_GFX_RIVAL_MAY_NORMAL},
     {EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE,  EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE},
@@ -174,7 +218,7 @@ const u8 sRivalAvatarGfxIds[][2] =
     {EVENT_OBJ_GFX_BRENDAN_WATERING,         EVENT_OBJ_GFX_MAY_WATERING}
 };
 
-const u8 sPlayerAvatarGfxIds[][2] =
+static const u8 sPlayerAvatarGfxIds[][2] =
 {
     {EVENT_OBJ_GFX_BRENDAN_NORMAL,     EVENT_OBJ_GFX_MAY_NORMAL},
     {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE,  EVENT_OBJ_GFX_MAY_MACH_BIKE},
@@ -186,11 +230,11 @@ const u8 sPlayerAvatarGfxIds[][2] =
     {EVENT_OBJ_GFX_BRENDAN_WATERING,   EVENT_OBJ_GFX_MAY_WATERING},
 };
 
-const u8 gUnknown_08497508[] = {EVENT_OBJ_GFX_RED, EVENT_OBJ_GFX_LEAF};
+static const u8 sFRLGAvatarGfxIds[] = {EVENT_OBJ_GFX_RED, EVENT_OBJ_GFX_LEAF};
 
-const u8 gUnknown_0849750A[] = {EVENT_OBJ_GFX_LINK_RS_BRENDAN, EVENT_OBJ_GFX_LINK_RS_MAY};
+static const u8 sRSAvatarGfxIds[] = {EVENT_OBJ_GFX_LINK_RS_BRENDAN, EVENT_OBJ_GFX_LINK_RS_MAY};
 
-const u8 gUnknown_0849750C[2][5][2] =
+static const u8 gUnknown_0849750C[2][5][2] =
 {
     //male
     {
@@ -210,7 +254,7 @@ const u8 gUnknown_0849750C[2][5][2] =
     }
 };
 
-bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) =  //Duplicate of sArrowWarpMetatileBehaviorChecks
+static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) =  //Duplicate of sArrowWarpMetatileBehaviorChecks
 {
     MetatileBehavior_IsSouthArrowWarp,
     MetatileBehavior_IsNorthArrowWarp,
@@ -218,76 +262,35 @@ bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) =  //Duplicate of sArrowW
     MetatileBehavior_IsEastArrowWarp,
 };
 
-u8 (*const gUnknown_08497530[])(struct Task *, struct EventObject *, struct EventObject *) =
+static bool8 (*const gUnknown_08497530[])(struct Task *, struct EventObject *, struct EventObject *) =
 {
     sub_808C3A4,
     do_boulder_dust,
     sub_808C484,
 };
 
-u8 (*const gUnknown_0849753C[])(struct Task *, struct EventObject *) =
+static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventObject *) =
 {
-    sub_808C544,
+    PlayerAvatar_DoSecretBaseMatJump,
 };
 
-u8 (*const gUnknown_08497540[])(struct Task *, struct EventObject *) =
+static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct EventObject *) =
 {
-    sub_808C61C,
-    sub_808C644,
-    sub_808C6BC,
-    sub_808C6FC,
-};
-
-const u8 gUnknown_08497550[] = {3, 4, 2, 1};
-
-const u8 gUnknown_08497554[] = {16, 16, 17, 18, 19};
-
-u8 (*const sFishingStateFuncs[])(struct Task *) =
-{
-    fish0,
-    fish1,
-    fish2,
-    fish3,
-    fish4,
-    fish5,
-    fish6,
-    fish7,
-    fish8,
-    fish9,
-    fishA_wait_for_a_pressed,
-    fishB,
-    fishC,
-    fishD,
-    fishE,
-    fishF,
+    PlayerAvatar_SecretBaseMatSpinStep0,
+    PlayerAvatar_SecretBaseMatSpinStep1,
+    PlayerAvatar_SecretBaseMatSpinStep2,
+    PlayerAvatar_SecretBaseMatSpinStep3,
 };
 
-const u16 gUnknown_0849759C[] = {1, 1, 1};
-
-const u16 gUnknown_084975A2[] = {1, 3, 6};
-
-const u8 gText_Dot[] = _("·");
-
-const u16 sReelTimeouts[] = {36, 33, 30};
-
-const u16 gUnknown_084975B0[] =
-{
-    0, 0,
-    0x28, 10,
-    0x46, 30,
-};
-
-const u8 gUnknown_084975BC[] = {0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00};
-
 // .text
 void MovementType_Player(struct Sprite *sprite)
 {
-	UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2);
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2);
 }
 
 static u8 EventObjectCB2_NoMovement2(void)
 {
-	return 0;
+    return 0;
 }
 
 void player_step(u8 direction, u16 newKeys, u16 heldKeys)
@@ -352,7 +355,7 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO
     return FALSE;
 }
 
-void npc_clear_strange_bits(struct EventObject *eventObj)
+static void npc_clear_strange_bits(struct EventObject *eventObj)
 {
     eventObj->inanimate = 0;
     eventObj->disableAnim = 0;
@@ -377,7 +380,7 @@ static void PlayerAllowForcedMovementIfMovingSameDirection(void)
 
 static bool8 TryDoMetatileBehaviorForcedMovement(void)
 {
-	return sForcedMovementFuncs[GetForcedMovementByMetatileBehavior()]();
+    return sForcedMovementFuncs[GetForcedMovementByMetatileBehavior()]();
 }
 
 static u8 GetForcedMovementByMetatileBehavior(void)
@@ -397,7 +400,7 @@ static u8 GetForcedMovementByMetatileBehavior(void)
     return 0;
 }
 
-bool8 ForcedMovement_None(void)
+static bool8 ForcedMovement_None(void)
 {
     if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6)
     {
@@ -441,7 +444,7 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8))
     }
 }
 
-u8 DoForcedMovementInCurrentDirection(void (*a)(u8))
+static u8 DoForcedMovementInCurrentDirection(void (*a)(u8))
 {
     struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
@@ -449,49 +452,49 @@ u8 DoForcedMovementInCurrentDirection(void (*a)(u8))
     return DoForcedMovement(playerEventObj->movementDirection, a);
 }
 
-bool8 ForcedMovement_Slip(void)
+static bool8 ForcedMovement_Slip(void)
 {
     return DoForcedMovementInCurrentDirection(PlayerGoSpeed2);
 }
 
-bool8 ForcedMovement_WalkSouth(void)
+static bool8 ForcedMovement_WalkSouth(void)
 {
     return DoForcedMovement(DIR_SOUTH, PlayerGoSpeed1);
 }
 
-bool8 ForcedMovement_WalkNorth(void)
+static bool8 ForcedMovement_WalkNorth(void)
 {
     return DoForcedMovement(DIR_NORTH, PlayerGoSpeed1);
 }
 
-bool8 ForcedMovement_WalkWest(void)
+static bool8 ForcedMovement_WalkWest(void)
 {
     return DoForcedMovement(DIR_WEST, PlayerGoSpeed1);
 }
 
-bool8 ForcedMovement_WalkEast(void)
+static bool8 ForcedMovement_WalkEast(void)
 {
     return DoForcedMovement(DIR_EAST, PlayerGoSpeed1);
 }
 
-bool8 ForcedMovement_PushedSouthByCurrent(void)
+static bool8 ForcedMovement_PushedSouthByCurrent(void)
 {
-    return DoForcedMovement(DIR_SOUTH, PlayerGoSpeed3);
+    return DoForcedMovement(DIR_SOUTH, PlayerRideWaterCurrent);
 }
 
-bool8 ForcedMovement_PushedNorthByCurrent(void)
+static bool8 ForcedMovement_PushedNorthByCurrent(void)
 {
-    return DoForcedMovement(DIR_NORTH, PlayerGoSpeed3);
+    return DoForcedMovement(DIR_NORTH, PlayerRideWaterCurrent);
 }
 
-bool8 ForcedMovement_PushedWestByCurrent(void)
+static bool8 ForcedMovement_PushedWestByCurrent(void)
 {
-    return DoForcedMovement(DIR_WEST, PlayerGoSpeed3);
+    return DoForcedMovement(DIR_WEST, PlayerRideWaterCurrent);
 }
 
-bool8 ForcedMovement_PushedEastByCurrent(void)
+static bool8 ForcedMovement_PushedEastByCurrent(void)
 {
-    return DoForcedMovement(DIR_EAST, PlayerGoSpeed3);
+    return DoForcedMovement(DIR_EAST, PlayerRideWaterCurrent);
 }
 
 u8 ForcedMovement_Slide(u8 direction, void (*b)(u8))
@@ -503,39 +506,39 @@ u8 ForcedMovement_Slide(u8 direction, void (*b)(u8))
     return DoForcedMovement(direction, b);
 }
 
-bool8 ForcedMovement_SlideSouth(void)
+static bool8 ForcedMovement_SlideSouth(void)
 {
     return ForcedMovement_Slide(DIR_SOUTH, PlayerGoSpeed2);
 }
 
-bool8 ForcedMovement_SlideNorth(void)
+static bool8 ForcedMovement_SlideNorth(void)
 {
     return ForcedMovement_Slide(DIR_NORTH, PlayerGoSpeed2);
 }
 
-bool8 ForcedMovement_SlideWest(void)
+static bool8 ForcedMovement_SlideWest(void)
 {
     return ForcedMovement_Slide(DIR_WEST, PlayerGoSpeed2);
 }
 
-bool8 ForcedMovement_SlideEast(void)
+static bool8 ForcedMovement_SlideEast(void)
 {
     return ForcedMovement_Slide(DIR_EAST, PlayerGoSpeed2);
 }
 
-bool8 ForcedMovement_0xBB(void)
+static bool8 ForcedMovement_0xBB(void)
 {
-    sub_808C4D8();
+    DoPlayerMatJump();
     return TRUE;
 }
 
-bool8 ForcedMovement_0xBC(void)
+static bool8 ForcedMovement_0xBC(void)
 {
-    sub_808C5B0();
+    DoPlayerMatSpin();
     return TRUE;
 }
 
-bool8 ForcedMovement_MuddySlope(void)
+static bool8 ForcedMovement_MuddySlope(void)
 {
     struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
@@ -619,7 +622,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
 
     if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
     {
-	// speed 2 is fast, same speed as running
+    // speed 2 is fast, same speed as running
         PlayerGoSpeed2(direction);
         return;
     }
@@ -733,7 +736,7 @@ static u8 sub_808B238(s16 x, s16 y, u8 direction)
                 if (GetCollisionAtCoords(&gEventObjects[eventObjectId], x, y, direction) == 0
                  && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0)
                 {
-                    task_add_bump_boulder(eventObjectId, direction);
+                    StartStrengthAnim(eventObjectId, direction);
                     return 1;
                 }
             }
@@ -754,3 +757,1472 @@ static void check_acro_bike_metatile(s16 unused1, s16 unused2, u8 c, u8 *d)
         }
     }
 }
+
+bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
+{
+    u8 mewObjectId;
+    struct EventObject *object;
+    s16 playerX;
+    s16 playerY;
+    s16 mewPrevX;
+
+    object = &gEventObjects[gPlayerAvatar.eventObjectId];
+    playerX = object->currentCoords.x;
+    playerY = object->currentCoords.y;
+
+    MoveCoords(direction, &playerX, &playerY);
+    mewObjectId = GetEventObjectIdByLocalIdAndMap(1, 0x39, 0x1A);
+
+    if (mewObjectId == 16)
+    {
+        return FALSE;
+    }
+
+    object = &gEventObjects[mewObjectId];
+    mewPrevX = object->previousCoords.x;
+
+    if (mewPrevX == playerX)
+    {
+        if (object->previousCoords.y != playerY
+            || object->currentCoords.x != mewPrevX
+            || object->currentCoords.y != object->previousCoords.y)
+        {
+            if (object->previousCoords.x == playerX &&
+                object->previousCoords.y == playerY)
+                return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
+{
+    gPlayerAvatar.unk1 |= transitionFlags;
+    DoPlayerAvatarTransition();
+}
+
+static void DoPlayerAvatarTransition(void)
+{
+    u8 i;
+    u32 flags = gPlayerAvatar.unk1;
+
+    if (flags != 0)
+    {
+        for (i = 0; i < 8; i++, flags >>= 1)
+        {
+#ifdef NONMATCHING
+            if (flags & 1)
+            {
+                gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
+            }
+#else
+            if (flags & 1)
+            {
+                register void (*const *funcs)(struct EventObject *) asm("r0") = gUnknown_084974B8;
+                funcs[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
+            }
+#endif
+        }
+        gPlayerAvatar.unk1 = 0;
+    }
+}
+
+static void PlayerAvatarTransition_Dummy(struct EventObject *eventObj)
+{
+
+}
+
+static void PlayerAvatarTransition_Normal(struct EventObject *eventObj)
+{
+    EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
+    SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
+}
+
+static void PlayerAvatarTransition_MachBike(struct EventObject *eventObj)
+{
+    EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
+    SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE);
+    BikeClearState(0, 0);
+}
+
+static void PlayerAvatarTransition_AcroBike(struct EventObject *eventObj)
+{
+    EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
+    SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE);
+    BikeClearState(0, 0);
+    Bike_HandleBumpySlopeJump();
+}
+
+static void PlayerAvatarTransition_Surfing(struct EventObject *eventObj)
+{
+    u8 spriteId;
+
+    EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
+    SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId;
+    spriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
+    eventObj->fieldEffectSpriteId = spriteId;
+    sub_81555AC(spriteId, 1);
+}
+
+static void PlayerAvatarTransition_Underwater(struct EventObject *eventObj)
+{
+    EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
+    SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER);
+    eventObj->fieldEffectSpriteId = sub_8155800(eventObj->spriteId);
+}
+
+static void PlayerAvatarTransition_ReturnToField(struct EventObject *eventObj)
+{
+    gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5;
+}
+
+void sub_808B578(void)
+{
+    gPlayerAvatar.tileTransitionState = T_NOT_MOVING;
+    if (PlayerIsAnimActive())
+    {
+        if (!PlayerCheckIfAnimFinishedOrInactive())
+        {
+            if (!player_is_anim_in_certain_ranges())
+                gPlayerAvatar.tileTransitionState = T_TILE_TRANSITION;
+        }
+        else
+        {
+            if (!sub_808B618())
+                gPlayerAvatar.tileTransitionState = T_TILE_CENTER;
+        }
+    }
+}
+
+static bool8 player_is_anim_in_certain_ranges(void)
+{
+    u8 movementActionId = gEventObjects[gPlayerAvatar.eventObjectId].movementActionId;
+
+    if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT
+     || (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16)
+     || (movementActionId >= MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN && movementActionId <= MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT)
+     || (movementActionId >= MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN && movementActionId <= MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT)
+     || (movementActionId >= MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN && movementActionId <= MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT))
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static bool8 sub_808B618(void)
+{
+    if (player_is_anim_in_certain_ranges() && gPlayerAvatar.runningState != TURN_DIRECTION)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static bool8 PlayerIsAnimActive(void)
+{
+    return EventObjectIsMovementOverridden(&gEventObjects[gPlayerAvatar.eventObjectId]);
+}
+
+static bool8 PlayerCheckIfAnimFinishedOrInactive(void)
+{
+    return EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]);
+}
+
+static void PlayerSetCopyableMovement(u8 a)
+{
+    gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement = a;
+}
+
+u8 PlayerGetCopyableMovement(void)
+{
+    return gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement;
+}
+
+static void sub_808B6BC(u8 a)
+{
+    EventObjectForceSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], a);
+}
+
+void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
+{
+    if (!PlayerIsAnimActive())
+    {
+        PlayerSetCopyableMovement(copyableMovement);
+        EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], movementActionId);
+    }
+}
+
+// normal speed (1 speed)
+void PlayerGoSpeed1(u8 a)
+{
+    PlayerSetAnimId(GetWalkNormalMovementAction(a), 2);
+}
+
+// fast speed (2 speed)
+void PlayerGoSpeed2(u8 a)
+{
+    PlayerSetAnimId(GetWalkFastMovementAction(a), 2);
+}
+
+void PlayerRideWaterCurrent(u8 a)
+{
+    PlayerSetAnimId(GetRideWaterCurrentMovementAction(a), 2);
+}
+
+// fastest speed (4 speed)
+void PlayerGoSpeed4(u8 a)
+{
+    PlayerSetAnimId(GetWalkFastestMovementAction(a), 2);
+}
+
+void PlayerRun(u8 a)
+{
+    PlayerSetAnimId(GetPlayerRunMovementAction(a), 2);
+}
+
+void PlayerOnBikeCollide(u8 a)
+{
+    PlayCollisionSoundIfNotFacingWarp(a);
+    PlayerSetAnimId(GetWalkInPlaceNormalMovementAction(a), 2);
+}
+
+void PlayerOnBikeCollideWithFarawayIslandMew(u8 a)
+{
+    PlayerSetAnimId(GetWalkInPlaceNormalMovementAction(a), 2);
+}
+
+void PlayerNotOnBikeCollide(u8 a)
+{
+    PlayCollisionSoundIfNotFacingWarp(a);
+    PlayerSetAnimId(GetWalkInPlaceSlowMovementAction(a), 2);
+}
+
+void PlayerNotOnBikeCollideWithFarawayIslandMew(u8 a)
+{
+    PlayerSetAnimId(GetWalkInPlaceSlowMovementAction(a), 2);
+}
+
+void PlayerFaceDirection(u8 direction)
+{
+    PlayerSetAnimId(GetFaceDirectionMovementAction(direction), 1);
+}
+
+void PlayerTurnInPlace(u8 direction)
+{
+    PlayerSetAnimId(GetWalkInPlaceFastMovementAction(direction), 1);
+}
+
+void PlayerJumpLedge(u8 direction)
+{
+    PlaySE(SE_DANSA);
+    PlayerSetAnimId(GetJump2MovementAction(direction), 8);
+}
+
+void sub_808B864(void)
+{
+    if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING)
+    {
+        if (player_should_look_direction_be_enforced_upon_movement())
+            sub_808B6BC(GetFaceDirectionMovementAction(gEventObjects[gPlayerAvatar.eventObjectId].facingDirection));
+    }
+}
+
+// wheelie idle
+void PlayerIdleWheelie(u8 direction)
+{
+    PlayerSetAnimId(GetAcroWheelieFaceDirectionMovementAction(direction), 1);
+}
+
+// normal to wheelie
+void PlayerStartWheelie(u8 direction)
+{
+    PlayerSetAnimId(GetAcroPopWheelieFaceDirectionMovementAction(direction), 1);
+}
+
+// wheelie to normal
+void PlayerEndWheelie(u8 direction)
+{
+    PlayerSetAnimId(GetAcroEndWheelieFaceDirectionMovementAction(direction), 1);
+}
+
+// wheelie hopping standing
+void PlayerStandingHoppingWheelie(u8 a)
+{
+    PlaySE(SE_JITE_PYOKO);
+    PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(a), 1);
+}
+
+// wheelie hopping moving
+void PlayerMovingHoppingWheelie(u8 a)
+{
+    PlaySE(SE_JITE_PYOKO);
+    PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(a), 2);
+}
+
+// wheelie hopping ledge
+void PlayerLedgeHoppingWheelie(u8 a)
+{
+    PlaySE(SE_JITE_PYOKO);
+    PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(a), 8);
+}
+
+// acro turn jump
+void PlayerAcroTurnJump(u8 direction)
+{
+    PlaySE(SE_JITE_PYOKO);
+    PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1);
+}
+
+void sub_808B980(u8 direction)
+{
+    PlaySE(SE_WALL_HIT);
+    PlayerSetAnimId(GetAcroWheelieInPlaceDirectionMovementAction(direction), 2);
+}
+
+void sub_808B9A4(u8 direction)
+{
+    PlayerSetAnimId(GetAcroPopWheelieMoveDirectionMovementAction(direction), 2);
+}
+
+void sub_808B9BC(u8 direction)
+{
+    PlayerSetAnimId(GetAcroWheelieMoveDirectionMovementAction(direction), 2);
+}
+
+void sub_808B9D4(u8 direction)
+{
+    PlayerSetAnimId(GetAcroEndWheelieMoveDirectionMovementAction(direction), 2);
+}
+
+static void PlayCollisionSoundIfNotFacingWarp(u8 a)
+{
+    s16 x, y;
+    u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior;
+
+    if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior))
+    {
+        if (a == 2)
+        {
+            PlayerGetDestCoords(&x, &y);
+            MoveCoords(2, &x, &y);
+            if (MetatileBehavior_IsWarpDoor(MapGridGetMetatileBehaviorAt(x, y)))
+                return;
+        }
+        PlaySE(SE_WALL_HIT);
+    }
+}
+
+void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y)
+{
+    *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x;
+    *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y;
+    MoveCoords(GetPlayerFacingDirection(), x, y);
+}
+
+void PlayerGetDestCoords(s16 *x, s16 *y)
+{
+    *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x;
+    *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y;
+}
+
+u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y)
+{
+    struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId];
+    
+    if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2])
+    {
+        *x = object->currentCoords.x;
+        *y = object->currentCoords.y;
+
+        switch (object->movementActionId)
+        {
+            case MOVEMENT_ACTION_WALK_NORMAL_DOWN:
+            case MOVEMENT_ACTION_PLAYER_RUN_DOWN:
+                (*y)++;
+                return TRUE;
+            case MOVEMENT_ACTION_WALK_NORMAL_UP:
+            case MOVEMENT_ACTION_PLAYER_RUN_UP:
+                (*y)--;
+                return TRUE;
+            case MOVEMENT_ACTION_WALK_NORMAL_LEFT:
+            case MOVEMENT_ACTION_PLAYER_RUN_LEFT:
+                (*x)--;
+                return TRUE;
+            case MOVEMENT_ACTION_WALK_NORMAL_RIGHT:
+            case MOVEMENT_ACTION_PLAYER_RUN_RIGHT:
+                (*x)++;
+                return TRUE;
+        }
+    }
+
+    *x = -1;
+    *y = -1;
+    return FALSE;
+}
+
+u8 GetPlayerFacingDirection(void)
+{
+    return gEventObjects[gPlayerAvatar.eventObjectId].facingDirection;
+}
+
+u8 GetPlayerMovementDirection(void)
+{
+    return gEventObjects[gPlayerAvatar.eventObjectId].movementDirection;
+}
+
+u8 PlayerGetZCoord(void)
+{
+    return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation;
+}
+
+void sub_808BC90(s16 a, s16 b)
+{
+    sub_808EB08(&gEventObjects[gPlayerAvatar.eventObjectId], a, b);
+}
+
+u8 TestPlayerAvatarFlags(u8 a)
+{
+    return gPlayerAvatar.flags & a;
+}
+
+u8 sub_808BCD0(void)
+{
+    return gPlayerAvatar.flags;
+}
+
+u8 GetPlayerAvatarObjectId(void)
+{
+    return gPlayerAvatar.spriteId;
+}
+
+void sub_808BCE8(void)
+{
+    ForcedMovement_None();
+}
+
+void sub_808BCF4(void)
+{
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+
+    npc_clear_strange_bits(playerEventObj);
+    SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection);
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
+    {
+        Bike_HandleBumpySlopeJump();
+        Bike_UpdateBikeCounterSpeed(0);
+    }
+}
+
+u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender)
+{
+    return sRivalAvatarGfxIds[state][gender];
+}
+
+u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender)
+{
+    return sPlayerAvatarGfxIds[state][gender];
+}
+
+u8 GetFRLGAvatarGraphicsIdByGender(u8 gender)
+{
+    return sFRLGAvatarGfxIds[gender];
+}
+
+u8 GetRSAvatarGraphicsIdByGender(u8 gender)
+{
+    return sRSAvatarGfxIds[gender];
+}
+
+u8 GetPlayerAvatarGraphicsIdByStateId(u8 state)
+{
+    return GetPlayerAvatarGraphicsIdByStateIdAndGender(state, gPlayerAvatar.gender);
+}
+
+u8 unref_GetRivalAvatarGenderByGraphicsId(u8 gfxId)
+{
+    switch (gfxId)
+    {
+    case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL:
+    case EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE:
+    case EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE:
+    case EVENT_OBJ_GFX_RIVAL_MAY_SURFING:
+    case EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE:
+    case EVENT_OBJ_GFX_MAY_UNDERWATER:
+    case EVENT_OBJ_GFX_MAY_FISHING:
+    case EVENT_OBJ_GFX_MAY_WATERING:
+        return FEMALE;
+    default:
+        return MALE;
+    }
+}
+
+u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId)
+{
+    switch (gfxId)
+    {
+    case EVENT_OBJ_GFX_MAY_NORMAL:
+    case EVENT_OBJ_GFX_MAY_MACH_BIKE:
+    case EVENT_OBJ_GFX_MAY_ACRO_BIKE:
+    case EVENT_OBJ_GFX_MAY_SURFING:
+    case EVENT_OBJ_GFX_MAY_FIELD_MOVE:
+    case EVENT_OBJ_GFX_MAY_UNDERWATER:
+    case EVENT_OBJ_GFX_MAY_FISHING:
+    case EVENT_OBJ_GFX_MAY_WATERING:
+        return FEMALE;
+    default:
+        return MALE;
+    }
+}
+
+bool8 PartyHasMonWithSurf(void)
+{
+    u8 i;
+
+    if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+    {
+        for (i = 0; i < 6; i++)
+        {
+            if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) == SPECIES_NONE)
+                break;
+            if (pokemon_has_move(&gPlayerParty[i], MOVE_SURF))
+                return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+bool8 IsPlayerSurfingNorth(void)
+{
+    if (GetPlayerMovementDirection() == DIR_NORTH && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+        return TRUE;
+    else
+        return FALSE;
+}
+
+bool8 IsPlayerFacingSurfableFishableWater(void)
+{
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    s16 x = playerEventObj->currentCoords.x;
+    s16 y = playerEventObj->currentCoords.y;
+
+    MoveCoords(playerEventObj->facingDirection, &x, &y);
+    if (GetCollisionAtCoords(playerEventObj, x, y, playerEventObj->facingDirection) == 3 && PlayerGetZCoord() == 3
+     && MetatileBehavior_IsSurfableFishableWater(MapGridGetMetatileBehaviorAt(x, y)))
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void ClearPlayerAvatarInfo(void)
+{
+    memset(&gPlayerAvatar, 0, sizeof(struct PlayerAvatar));
+}
+
+void SetPlayerAvatarStateMask(u8 flags)
+{
+    gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_DASH | PLAYER_AVATAR_FLAG_6 | PLAYER_AVATAR_FLAG_5);
+    gPlayerAvatar.flags |= flags;
+}
+
+static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 a, u8 gender)
+{
+    u8 i;
+
+    for (i = 0; i < 5; i++)
+    {
+        if (gUnknown_0849750C[gender][i][0] == a)
+            return gUnknown_0849750C[gender][i][1];
+    }
+    return 1;
+}
+
+u8 GetPlayerAvatarGraphicsIdByCurrentState(void)
+{
+    u8 i;
+    u8 r5 = gPlayerAvatar.flags;
+
+    for (i = 0; i < 5; i++)
+    {
+        if (gUnknown_0849750C[gPlayerAvatar.gender][i][1] & r5)
+            return gUnknown_0849750C[gPlayerAvatar.gender][i][0];
+    }
+    return 0;
+}
+
+void SetPlayerAvatarExtraStateTransition(u8 a, u8 b)
+{
+    u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(a, gPlayerAvatar.gender);
+
+    gPlayerAvatar.unk1 |= unk | b;
+    DoPlayerAvatarTransition();
+}
+
+void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
+{
+    struct EventObjectTemplate playerEventObjTemplate;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
+
+    playerEventObjTemplate.localId = 0xFF;
+    playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender);
+    playerEventObjTemplate.x = x - 7;
+    playerEventObjTemplate.y = y - 7;
+    playerEventObjTemplate.elevation = 0;
+    playerEventObjTemplate.movementType = MOVEMENT_TYPE_PLAYER;
+    playerEventObjTemplate.movementRangeX = 0;
+    playerEventObjTemplate.movementRangeY = 0;
+    playerEventObjTemplate.trainerType = 0;
+    playerEventObjTemplate.trainerRange_berryTreeId = 0;
+    playerEventObjTemplate.script = NULL;
+    playerEventObjTemplate.flagId = 0;
+    eventObjectId = SpawnSpecialEventObject(&playerEventObjTemplate);
+    eventObject = &gEventObjects[eventObjectId];
+    eventObject->isPlayer = 1;
+    eventObject->warpArrowSpriteId = CreateWarpArrowSprite();
+    EventObjectTurn(eventObject, direction);
+    ClearPlayerAvatarInfo();
+    gPlayerAvatar.runningState = NOT_MOVING;
+    gPlayerAvatar.tileTransitionState = T_NOT_MOVING;
+    gPlayerAvatar.eventObjectId = eventObjectId;
+    gPlayerAvatar.spriteId = eventObject->spriteId;
+    gPlayerAvatar.gender = gender;
+    SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT);
+}
+
+void sub_808C0A8(u8 a)
+{
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = a;
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+        gSprites[gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId].invisible = a;
+}
+
+void sub_808C114(void)
+{
+    EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0);
+}
+
+void sub_808C15C(u8 direction)
+{
+    EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction));
+}
+
+void sub_808C1B4(u8 direction)
+{
+    EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction));
+    SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1);
+}
+
+void sub_808C228(u8 direction)
+{
+    EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction));
+}
+
+static void sub_808C280(struct EventObject *eventObject)
+{
+    s16 x;
+    s16 y;
+    u8 direction;
+    u8 metatileBehavior = eventObject->currentMetatileBehavior;
+
+    for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++)
+    {
+        if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == eventObject->movementDirection)
+        {
+            x = eventObject->currentCoords.x;
+            y = eventObject->currentCoords.y;
+            MoveCoords(direction, &x, &y);
+            ShowWarpArrowSprite(eventObject->warpArrowSpriteId, direction, x, y);
+            return;
+        }
+    }
+    SetSpriteInvisible(eventObject->warpArrowSpriteId);
+}
+
+/* Strength */
+
+static void Task_BumpBoulder(u8 taskId);
+
+static void StartStrengthAnim(u8 a, u8 b)
+{
+    u8 taskId = CreateTask(Task_BumpBoulder, 0xFF);
+
+    gTasks[taskId].data[1] = a;
+    gTasks[taskId].data[2] = b;
+    Task_BumpBoulder(taskId);
+}
+
+static void Task_BumpBoulder(u8 taskId)
+{
+    while (gUnknown_08497530[gTasks[taskId].data[0]](&gTasks[taskId],
+                                                     &gEventObjects[gPlayerAvatar.eventObjectId],
+                                                     &gEventObjects[gTasks[taskId].data[1]]))
+        ;
+}
+
+static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject)
+{
+    ScriptContext2_Enable();
+    gPlayerAvatar.preventStep = TRUE;
+    task->data[0]++;
+    return FALSE;
+}
+
+static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject)
+{
+    if (EventObjectIsHeldMovementActive(playerObject))
+    {
+        EventObjectClearHeldMovementIfFinished(playerObject);
+    }
+
+    if (EventObjectIsHeldMovementActive(strengthObject))
+    {
+        EventObjectClearHeldMovementIfFinished(strengthObject);
+    }
+
+    if (!EventObjectIsMovementOverridden(playerObject)
+     && !EventObjectIsMovementOverridden(strengthObject))
+    {
+        EventObjectClearHeldMovementIfFinished(playerObject);
+        EventObjectClearHeldMovementIfFinished(strengthObject);
+        EventObjectSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2]));
+        EventObjectSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2]));
+        gFieldEffectArguments[0] = strengthObject->currentCoords.x;
+        gFieldEffectArguments[1] = strengthObject->currentCoords.y;
+        gFieldEffectArguments[2] = strengthObject->previousElevation;
+        gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority;
+        FieldEffectStart(FLDEFF_DUST);
+        PlaySE(SE_W070);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+static bool8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject)
+{
+    if (EventObjectCheckHeldMovementStatus(playerObject)
+     && EventObjectCheckHeldMovementStatus(strengthObject))
+    {
+        EventObjectClearHeldMovementIfFinished(playerObject);
+        EventObjectClearHeldMovementIfFinished(strengthObject);
+        gPlayerAvatar.preventStep = FALSE;
+        ScriptContext2_Disable();
+        DestroyTask(FindTaskIdByFunc(Task_BumpBoulder));
+    }
+    return FALSE;
+}
+
+/* Some field effect */
+
+static void DoPlayerAvatarSecretBaseMatJump(u8 taskId);
+
+static void DoPlayerMatJump(void)
+{
+    DoPlayerAvatarSecretBaseMatJump(CreateTask(DoPlayerAvatarSecretBaseMatJump, 0xFF));
+}
+
+static void DoPlayerAvatarSecretBaseMatJump(u8 taskId)
+{
+    while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]))
+        ;
+}
+
+// because data[0] is used to call this, it can be inferred that there may have been multiple mat jump functions at one point, so the name for these groups of functions is appropriate in assuming the sole use of mat jump.
+static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject)
+{
+    gPlayerAvatar.preventStep = TRUE;
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
+    {
+        PlaySE(SE_DANSA);
+        EventObjectSetHeldMovement(eventObject, GetJumpInPlaceMovementAction(eventObject->facingDirection));
+        task->data[1]++;
+        if (task->data[1] > 1)
+        {
+            gPlayerAvatar.preventStep = FALSE;
+            gPlayerAvatar.unk1 |= 0x20;
+            DestroyTask(FindTaskIdByFunc(DoPlayerAvatarSecretBaseMatJump));
+        }
+    }
+    return FALSE;
+}
+
+/* Some field effect */
+
+static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId);
+
+static void DoPlayerMatSpin(void)
+{
+    u8 taskId = CreateTask(PlayerAvatar_DoSecretBaseMatSpin, 0xFF);
+
+    PlayerAvatar_DoSecretBaseMatSpin(taskId);
+}
+
+static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId)
+{
+    while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]))
+        ;
+}
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject)
+{
+    task->data[0]++;
+    task->data[1] = eventObject->movementDirection;
+    gPlayerAvatar.preventStep = TRUE;
+    ScriptContext2_Enable();
+    PlaySE(SE_TK_WARPIN);
+    return TRUE;
+}
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject)
+{
+    u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
+
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
+    {
+        u8 direction;
+
+        EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(direction = directions[eventObject->movementDirection - 1]));
+        if (direction == (u8)task->data[1])
+            task->data[2]++;
+        task->data[0]++;
+        if (task->data[2] > 3 && direction == GetOppositeDirection(task->data[1]))
+            task->data[0]++;
+    }
+    return FALSE;
+}
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject)
+{
+    const u8 actions[] = {
+        MOVEMENT_ACTION_DELAY_1,
+        MOVEMENT_ACTION_DELAY_1,
+        MOVEMENT_ACTION_DELAY_2,
+        MOVEMENT_ACTION_DELAY_4,
+        MOVEMENT_ACTION_DELAY_8,
+    };
+
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
+    {
+        EventObjectSetHeldMovement(eventObject, actions[task->data[2]]);
+        task->data[0] = 1;
+    }
+    return FALSE;
+}
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject)
+{
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
+    {
+        EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1])));
+        ScriptContext2_Disable();
+        gPlayerAvatar.preventStep = FALSE;
+        DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin));
+    }
+    return FALSE;
+}
+
+/* Some Field effect */
+
+static void taskFF_0805D1D4(u8 taskId);
+static void sub_808C814(u8 taskId);
+
+static void sub_808C750(u8 a)
+{
+    u8 taskId;
+
+    ScriptContext2_Enable();
+    Overworld_ClearSavedMusic();
+    Overworld_ChangeMusicToDefault();
+    gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_SURFING;
+    gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_ON_FOOT;
+    gPlayerAvatar.preventStep = TRUE;
+    taskId = CreateTask(taskFF_0805D1D4, 0xFF);
+    gTasks[taskId].data[0] = a;
+    taskFF_0805D1D4(taskId);
+}
+
+static void taskFF_0805D1D4(u8 taskId)
+{
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+
+    if (EventObjectIsMovementOverridden(playerEventObj))
+    {
+        if (!EventObjectClearHeldMovementIfFinished(playerEventObj))
+            return;
+    }
+    sub_81555AC(playerEventObj->fieldEffectSpriteId, 2);
+    EventObjectSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0]));
+    gTasks[taskId].func = sub_808C814;
+}
+
+static void sub_808C814(u8 taskId)
+{
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+
+    if (EventObjectClearHeldMovementIfFinished(playerEventObj))
+    {
+        EventObjectSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
+        EventObjectSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection));
+        gPlayerAvatar.preventStep = FALSE;
+        ScriptContext2_Disable();
+        DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]);
+        DestroyTask(taskId);
+    }
+}
+
+static bool8 (*const sFishingStateFuncs[])(struct Task *) =
+{
+    Fishing1,
+    Fishing2,
+    Fishing3,
+    Fishing4,
+    Fishing5,
+    Fishing6,
+    Fishing7,
+    Fishing8,
+    Fishing9,
+    Fishing10,
+    Fishing11,
+    Fishing12,
+    Fishing13,
+    Fishing14,
+    Fishing15,
+    Fishing16,
+};
+
+static void Task_Fishing(u8 taskId);
+static void sub_808CF78(void);
+
+#define tStep              data[0]
+#define tFrameCounter      data[1]
+#define tNumDots           data[2]
+#define tDotsRequired      data[3]
+#define tRoundsPlayed      data[12]
+#define tMinRoundsRequired data[13]
+#define tPlayerGfxId       data[14]
+#define tFishingRod        data[15]
+
+#define FISHING_START_ROUND 3
+#define FISHING_GOT_BITE 6
+#define FISHING_ON_HOOK 9
+#define FISHING_NO_BITE 11
+#define FISHING_GOT_AWAY 12
+#define FISHING_SHOW_RESULT 13
+
+void StartFishing(u8 rod)
+{
+    u8 taskId = CreateTask(Task_Fishing, 0xFF);
+
+    gTasks[taskId].tFishingRod = rod;
+    Task_Fishing(taskId);
+}
+
+static void Task_Fishing(u8 taskId)
+{
+    while (sFishingStateFuncs[gTasks[taskId].tStep](&gTasks[taskId]))
+        ;
+}
+
+static bool8 Fishing1(struct Task *task)
+{
+    ScriptContext2_Enable();
+    gPlayerAvatar.preventStep = TRUE;
+    task->tStep++;
+    return FALSE;
+}
+
+static bool8 Fishing2(struct Task *task)
+{
+    struct EventObject *playerEventObj;
+    const s16 arr1[] = {1, 1, 1};
+    const s16 arr2[] = {1, 3, 6};
+
+    task->tRoundsPlayed = 0;
+    task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]);
+    task->tPlayerGfxId = gEventObjects[gPlayerAvatar.eventObjectId].graphicsId;
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    EventObjectClearHeldMovementIfActive(playerEventObj);
+    playerEventObj->enableAnim = 1;
+    sub_808C15C(playerEventObj->facingDirection);
+    task->tStep++;
+    return FALSE;
+}
+
+static bool8 Fishing3(struct Task *task)
+{
+    sub_808CF78();
+    
+    // Wait one second
+    task->tFrameCounter++;
+    if (task->tFrameCounter >= 60)
+        task->tStep++;
+    return FALSE;
+}
+
+static bool8 Fishing4(struct Task *task)
+{
+    u32 randVal;
+
+    sub_819786C(0, TRUE);
+    task->tStep++;
+    task->tFrameCounter = 0;
+    task->tNumDots = 0;
+    randVal = Random();
+    randVal %= 10;
+    task->tDotsRequired = randVal + 1;
+    if (task->tRoundsPlayed == 0)
+        task->tDotsRequired = randVal + 4;
+    if (task->tDotsRequired >= 10)
+        task->tDotsRequired = 10;
+    return TRUE;
+}
+
+// Play a round of the dot game
+static bool8 Fishing5(struct Task *task)
+{
+    const u8 dot[] = _("·");
+
+    sub_808CF78();
+    task->tFrameCounter++;
+    if (gMain.newKeys & A_BUTTON)
+    {
+        task->tStep = FISHING_NO_BITE;
+        if (task->tRoundsPlayed != 0)
+            task->tStep = FISHING_GOT_AWAY;
+        return TRUE;
+    }
+    else
+    {
+        if (task->tFrameCounter >= 20)
+        {
+            task->tFrameCounter = 0;
+            if (task->tNumDots >= task->tDotsRequired)
+            {
+                task->tStep++;
+                if (task->tRoundsPlayed != 0)
+                    task->tStep++;
+                task->tRoundsPlayed++;
+            }
+            else
+            {
+                AddTextPrinterParameterized(0, 1, dot, task->tNumDots * 8, 1, 0, NULL);
+                task->tNumDots++;
+            }
+        }
+        return FALSE;
+    }
+}
+
+// Determine if fish bites
+static bool8 Fishing6(struct Task *task)
+{
+    bool8 bite;
+
+    sub_808CF78();
+    task->tStep++;
+    bite = FALSE;
+
+    if (!DoesCurrentMapHaveFishingMons())
+    {
+        task->tStep = FISHING_NO_BITE;
+    }
+    else
+    {
+        if (!GetMonData(&gPlayerParty[0], MON_DATA_SANITY_BIT3))
+        {
+            u8 ability = GetMonAbility(&gPlayerParty[0]);
+            if (ability == ABILITY_SUCTION_CUPS || ability  == ABILITY_STICKY_HOLD)
+            {
+                if (Random() % 100 > 14)
+                {
+                    bite = TRUE;
+                }
+            }
+        }
+
+        if (!bite)
+        {
+            if (Random() & 1)
+            {
+                task->tStep = FISHING_NO_BITE;
+            }
+            else
+            {
+                bite = TRUE;
+            }
+        }
+
+        if (bite == TRUE)
+        {
+            StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection()));
+        }
+    }
+    return TRUE;
+}
+
+// Oh! A Bite!
+static bool8 Fishing7(struct Task *task)
+{
+    sub_808CF78();
+    AddTextPrinterParameterized(0, 1, gText_OhABite, 0, 17, 0, NULL);
+    task->tStep++;
+    task->tFrameCounter = 0;
+    return FALSE;
+}
+
+// We have a bite. Now, wait for the player to press A, or the timer to expire.
+static bool8 Fishing8(struct Task *task)
+{
+    const s16 reelTimeouts[3] = {36, 33, 30};
+
+    sub_808CF78();
+    task->tFrameCounter++;
+    if (task->tFrameCounter >= reelTimeouts[task->tFishingRod])
+        task->tStep = FISHING_GOT_AWAY;
+    else if (gMain.newKeys & A_BUTTON)
+        task->tStep++;
+    return FALSE;
+}
+
+// Determine if we're going to play the dot game again
+static bool8 Fishing9(struct Task *task)
+{
+    const s16 arr[][2] =
+    {
+        {0, 0},
+        {40, 10},
+        {70, 30}
+    };
+
+    sub_808CF78();
+    task->tStep++;
+    if (task->tRoundsPlayed < task->tMinRoundsRequired)
+    {
+        task->tStep = FISHING_START_ROUND;
+    }
+    else if (task->tRoundsPlayed < 2)
+    {
+        // probability of having to play another round
+        s16 probability = Random() % 100;
+
+        if (arr[task->tFishingRod][task->tRoundsPlayed] > probability)
+            task->tStep = FISHING_START_ROUND;
+    }
+    return FALSE;
+}
+
+static bool8 Fishing10(struct Task *task)
+{
+    sub_808CF78();
+    FillWindowPixelBuffer(0, 0x11);
+    AddTextPrinterParameterized2(0, 1, gText_PokemonOnHook, 1, 0, 2, 1, 3);
+    task->tStep++;
+    task->tFrameCounter = 0;
+    return FALSE;
+}
+
+static bool8 Fishing11(struct Task *task)
+{
+    if (task->tFrameCounter == 0)
+        sub_808CF78();
+
+    RunTextPrinters();
+
+    if (task->tFrameCounter == 0)
+    {
+        if (!IsTextPrinterActive(0))
+        {
+            struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+
+            EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId);
+            EventObjectTurn(playerEventObj, playerEventObj->movementDirection);
+            if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+                sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0);
+            gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
+            gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+            sub_8197434(0, TRUE);
+            task->tFrameCounter++;
+            return FALSE;
+        }
+    }
+
+    if (task->tFrameCounter != 0)
+    {
+        gPlayerAvatar.preventStep = FALSE;
+        ScriptContext2_Disable();
+        FishingWildEncounter(task->tFishingRod);
+        sub_80ED950(1);
+        DestroyTask(FindTaskIdByFunc(Task_Fishing));
+    }
+    return FALSE;
+}
+
+// Not even a nibble
+static bool8 Fishing12(struct Task *task)
+{
+    sub_808CF78();
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
+    FillWindowPixelBuffer(0, 0x11);
+    AddTextPrinterParameterized2(0, 1, gText_NotEvenANibble, 1, 0, 2, 1, 3);
+    task->tStep = FISHING_SHOW_RESULT;
+    return TRUE;
+}
+
+// It got away
+static bool8 Fishing13(struct Task *task)
+{
+    sub_808CF78();
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
+    FillWindowPixelBuffer(0, 0x11);
+    AddTextPrinterParameterized2(0, 1, gText_ItGotAway, 1, 0, 2, 1, 3);
+    task->tStep++;
+    return TRUE;
+}
+
+// Wait one second
+static bool8 Fishing14(struct Task *task)
+{
+    sub_808CF78();
+    task->tStep++;
+    return FALSE;
+}
+
+static bool8 Fishing15(struct Task *task)
+{
+    sub_808CF78();
+    if (gSprites[gPlayerAvatar.spriteId].animEnded)
+    {
+        struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+
+        EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId);
+        EventObjectTurn(playerEventObj, playerEventObj->movementDirection);
+        if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+            sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0);
+        gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
+        gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+        task->tStep++;
+    }
+    return FALSE;
+}
+
+static bool8 Fishing16(struct Task *task)
+{
+    RunTextPrinters();
+    if (!IsTextPrinterActive(0))
+    {
+        gPlayerAvatar.preventStep = FALSE;
+        ScriptContext2_Disable();
+        UnfreezeEventObjects();
+        sub_8197434(0, TRUE);
+        sub_80ED950(0);
+        DestroyTask(FindTaskIdByFunc(Task_Fishing));
+    }
+    return FALSE;
+}
+
+#undef tStep
+#undef tFrameCounter
+#undef tFishingRod
+
+static void sub_808CF78(void)
+{
+    struct Sprite *playerSprite = &gSprites[gPlayerAvatar.spriteId];
+    u8 animCmdIndex;
+    u8 animType;
+
+    AnimateSprite(playerSprite);
+    playerSprite->pos2.x = 0;
+    playerSprite->pos2.y = 0;
+    animCmdIndex = playerSprite->animCmdIndex;
+    if (playerSprite->anims[playerSprite->animNum][animCmdIndex].type == -1)
+    {
+        animCmdIndex--;
+    }
+    else
+    {
+        playerSprite->animDelayCounter++;
+        if (playerSprite->anims[playerSprite->animNum][animCmdIndex].type == -1)
+            animCmdIndex--;
+    }
+    animType = playerSprite->anims[playerSprite->animNum][animCmdIndex].type;
+    if (animType == 1 || animType == 2 || animType == 3)
+    {
+        playerSprite->pos2.x = 8;
+        if (GetPlayerFacingDirection() == 3)
+            playerSprite->pos2.x = -8;
+    }
+    if (animType == 5)
+        playerSprite->pos2.y = -8;
+    if (animType == 10 || animType == 11)
+        playerSprite->pos2.y = 8;
+    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+        sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y);
+}
+
+void sub_808D074(u8 a0)
+{
+    gUnknown_0203734C = a0;
+}
+
+static u8 sub_808D080(void)
+{
+    if (gUnknown_0203734C == 0)
+    {
+        return 1;
+    }
+    return gUnknown_0203734C;
+}
+
+static u8 sub_808D38C(struct EventObject *object, s16 *a1);
+
+static void sub_808D094(u8 taskId)
+{
+    struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId];
+    struct Sprite *sprite = &gSprites[object->spriteId];
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+        case 0:
+            if (!EventObjectClearHeldMovementIfFinished(object))
+            {
+                return;
+            }
+
+            sub_808D074(object->facingDirection);
+            data[1] = 0;
+            data[2] = 1;
+            data[3] = (u16)(sprite->pos1.y + sprite->pos2.y) * 16;
+            sprite->pos2.y = 0;
+            CameraObjectReset2();
+            object->fixedPriority = TRUE;
+            sprite->oam.priority = 0;
+            sprite->subpriority = 0;
+            sprite->subspriteMode = 0;
+            data[0]++;
+        case 1:
+            sub_808D38C(object, &data[1]);
+            data[3] -= data[2];
+            data[2] += 3;
+            sprite->pos1.y = data[3] >> 4;
+            if (sprite->pos1.y + (s16)gTotalCameraPixelOffsetY < -32)
+            {
+                data[0]++;
+            }
+            break;
+        case 2:
+            DestroyTask(taskId);
+            break;
+    }
+}
+
+static void sub_808D1FC(u8 taskId);
+
+void sub_808D194(void)
+{
+    sub_808D1FC(CreateTask(sub_808D1FC, 0));
+}
+
+bool8 sub_808D1B4(void)
+{
+    return FuncIsActiveTask(sub_808D1FC);
+}
+
+void sub_808D1C8(void)
+{
+    sub_808D094(CreateTask(sub_808D094, 0));
+}
+
+bool8 sub_808D1E8(void)
+{
+    return FuncIsActiveTask(sub_808D094);
+}
+
+static const u8 gUnknown_084975BC[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
+
+static void sub_808D1FC(u8 taskId)
+{
+    struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId];
+    struct Sprite *sprite = &gSprites[object->spriteId];
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+        case 0:
+            data[5] = sub_808D080();
+            EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]]));
+            data[1] = 0;
+            data[2] = 116;
+            data[4] = sprite->pos1.y;
+            data[6] = sprite->oam.priority;
+            data[7] = sprite->subpriority;
+            data[3] = -((u16)sprite->pos2.y + 32) * 16;
+            sprite->pos2.y = 0;
+            CameraObjectReset2();
+            object->fixedPriority = TRUE;
+            sprite->oam.priority = 1;
+            sprite->subpriority = 0;
+            sprite->subspriteMode = 0;
+            data[0]++;
+        case 1:
+            sub_808D38C(object, &data[1]);
+            data[3] += data[2];
+            data[2] -= 3;
+            if (data[2] < 4)
+            {
+                data[2] = 4;
+            }
+            sprite->pos1.y = data[3] >> 4;
+            if (sprite->pos1.y >= data[4])
+            {
+                sprite->pos1.y = data[4];
+                data[8] = 0;
+                data[0]++;
+            }
+            break;
+        case 2:
+            sub_808D38C(object, &data[1]);
+            data[8]++;
+            if (data[8] > 8)
+            {
+                data[0]++;
+            }
+            break;
+        case 3:
+            if (data[5] == sub_808D38C(object, &data[1]))
+            {
+                object->fixedPriority = 0;
+                sprite->oam.priority = data[6];
+                sprite->subpriority = data[7];
+                CameraObjectReset1();
+                DestroyTask(taskId);
+            }
+            break;
+    }
+}
+
+static u8 sub_808D38C(struct EventObject *object, s16 *a1)
+{
+    if (*a1 < 8 && ++(*a1) < 8)
+    {
+        return object->facingDirection;
+    }
+
+    if (!EventObjectCheckHeldMovementStatus(object))
+    {
+        return object->facingDirection;
+    }
+
+    EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection]));
+    *a1 = 0;
+    return gUnknown_084975BC[object->facingDirection];
+}
diff --git a/src/field_poison.c b/src/field_poison.c
index a3b70323e..a5a76e00a 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -112,7 +112,7 @@ void ExecuteWhiteOut(void)
     ScriptContext1_Stop();
 }
 
-u32 DoPoisonFieldEffect(void)
+s32 DoPoisonFieldEffect(void)
 {
     int i;
     u32 hp;
diff --git a/src/field_specials.c b/src/field_specials.c
index c9feeabda..beaa11e99 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1328,7 +1328,7 @@ u16 GetSlotMachineId(void)
 bool8 FoundAbandonedShipRoom1Key(void)
 {
     u16 *specVar = &gSpecialVar_0x8004;
-    u16 flag = FLAG_HIDDEN_ITEM_1F;
+    u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY;
     *specVar = flag;
     if (!FlagGet(flag))
     {
@@ -1340,7 +1340,7 @@ bool8 FoundAbandonedShipRoom1Key(void)
 bool8 FoundAbandonedShipRoom2Key(void)
 {
     u16 *specVar = &gSpecialVar_0x8004;
-    u16 flag = FLAG_HIDDEN_ITEM_20;
+    u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY;
     *specVar = flag;
     if (!FlagGet(flag))
     {
@@ -1352,7 +1352,7 @@ bool8 FoundAbandonedShipRoom2Key(void)
 bool8 FoundAbandonedShipRoom4Key(void)
 {
     u16 *specVar = &gSpecialVar_0x8004;
-    u16 flag = FLAG_HIDDEN_ITEM_21;
+    u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY;
     *specVar = flag;
     if (!FlagGet(flag))
     {
@@ -1364,7 +1364,7 @@ bool8 FoundAbandonedShipRoom4Key(void)
 bool8 FoundAbandonedShipRoom6Key(void)
 {
     u16 *specVar = &gSpecialVar_0x8004;
-    u16 flag = FLAG_HIDDEN_ITEM_22;
+    u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY;
     *specVar = flag;
     if (!FlagGet(flag))
     {
@@ -1508,7 +1508,7 @@ static void sub_8139620(u8 taskId)
 
 bool8 FoundBlackGlasses(void)
 {
-    return FlagGet(FLAG_HIDDEN_ITEM_BLACK_GLASSES);
+    return FlagGet(FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES);
 }
 
 void SetRoute119Weather(void)
@@ -3668,7 +3668,7 @@ bool32 sub_813B374(void)
     }
 }
 
-bool32 sub_813B3B0(void)
+bool8 sub_813B3B0(void)
 {
     static const u8 gUnknown_085B3410[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
 
@@ -4081,7 +4081,7 @@ void sub_813BA60(void)
         FlagClear(FLAG_HIDE_FANCLUB_BOY);
         FlagClear(FLAG_HIDE_FANCLUB_LITTLE_BOY);
         FlagClear(FLAG_HIDE_FANCLUB_LADY);
-        FlagClear(FLAG_0x2DA);
+        FlagClear(FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER);
         VarSet(VAR_LILYCOVE_FAN_CLUB_STATE, 1);
     }
 }
diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c
new file mode 100644
index 000000000..b906225da
--- /dev/null
+++ b/src/fldeff_escalator.c
@@ -0,0 +1,132 @@
+#include "global.h"
+#include "task.h"
+#include "fieldmap.h"
+#include "field_camera.h"
+#include "field_player_avatar.h"
+
+static EWRAM_DATA u8 sEscalatorAnim_TaskId = 0;
+
+void sub_80E12E8(u8 taskId, const s16 *list, u16 c)
+{
+    s16 r5 = gTasks[taskId].data[4] - 1;
+    s16 r3 = gTasks[taskId].data[5] - 1;
+    s16 r4 = gTasks[taskId].data[1];
+    s16 y;
+    s16 x;
+    
+    if (gTasks[taskId].data[2] == 0)
+    {
+        for (y = 0; y < 3; y++)
+        {
+            for (x = 0; x < 3; x++)
+            {
+                s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y);
+                
+                if (list[r4] == metatileId)
+                {
+                    if (r4 != 2)
+                        MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[r4 + 1]);
+                    else
+                        MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[0]);
+                }
+            }
+        }
+    }
+    else
+    {
+        for (y = 0; y < 3; y++)
+        {
+            for (x = 0; x < 3; x++)
+            {
+                s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y);
+                
+                if (list[2 - r4] == metatileId)
+                {
+                    if (r4 != 2)
+                        MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[1 - r4]);
+                    else
+                        MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[2]);
+                }
+            }
+        }
+    }
+}
+
+static const u16 gUnknown_08589ABA[] = {0x284, 0x282, 0x280};
+static const u16 gUnknown_08589AC0[] = {0x285, 0x283, 0x281};
+static const u16 gUnknown_08589AC6[] = {0x28C, 0x28A, 0x288};
+static const u16 gUnknown_08589ACC[] = {0x28D, 0x28B, 0x289};
+static const u16 gUnknown_08589AD2[] = {0x2A0, 0x2A2, 0x2A4};
+static const u16 gUnknown_08589AD8[] = {0x2A1, 0x2A3, 0x2A5};
+static const u16 gUnknown_08589ADE[] = {0x2A8, 0x2AA, 0x2AC};
+
+void sub_80E1444(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    data[3] = 1;
+
+    switch (data[0])
+    {
+        case 0:
+            sub_80E12E8(taskId, gUnknown_08589ABA, 0);
+            break;
+        case 1:
+            sub_80E12E8(taskId, gUnknown_08589AC0, 0);
+            break;
+        case 2:
+            sub_80E12E8(taskId, gUnknown_08589AC6, 0xC00);
+            break;
+        case 3:
+            sub_80E12E8(taskId, gUnknown_08589ACC, 0);
+            break;
+        case 4:
+            sub_80E12E8(taskId, gUnknown_08589AD2, 0xC00);
+            break;
+        case 5:
+            sub_80E12E8(taskId, gUnknown_08589AD8, 0);
+            break;
+        case 6:
+            sub_80E12E8(taskId, gUnknown_08589ADE, 0);
+            break;
+    }
+
+    data[0] = (data[0] + 1) & 7;
+    if (!data[0])
+    {
+        DrawWholeMapView();
+        data[1] = (data[1] + 1) % 3;
+        data[3] = 0;
+    }
+}
+
+u8 sub_80E150C(u16 var)
+{
+    u8 taskId = CreateTask(sub_80E1444, 0);
+    s16 *data = gTasks[taskId].data;
+
+    PlayerGetDestCoords(&data[4], &data[5]);
+    data[0] = 0;
+    data[1] = 0;
+    data[2] = var;
+    sub_80E1444(taskId);
+    return taskId;
+}
+
+void sub_80E1558(u8 var)
+{
+    sEscalatorAnim_TaskId = sub_80E150C(var);
+}
+
+void sub_80E1570(void)
+{
+    DestroyTask(sEscalatorAnim_TaskId);
+}
+
+bool8 sub_80E1584(void)
+{
+    if (gTasks[sEscalatorAnim_TaskId].data[3] == 0 && gTasks[sEscalatorAnim_TaskId].data[1] == 2)
+        return FALSE;
+    else
+        return TRUE;
+}
diff --git a/src/match_call.c b/src/match_call.c
index 2879881bf..a15700070 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -375,7 +375,7 @@ static const match_call_text_data_t sMayTextScripts[] = {
     { gText_May_Pokenav_2B3AB3, 0xFFFF,              0xFFFF },
     { gText_May_Pokenav_2B3B3F, FLAG_0x4F1,          0xFFFF },
     { gText_May_Pokenav_2B3C13, FLAG_0x095,          0xFFFF },
-    { gText_May_Pokenav_2B3CF3, FLAG_0x324,          0xFFFF },
+    { gText_May_Pokenav_2B3CF3, FLAG_HIDE_MAUVILLE_CITY_WALLY,          0xFFFF },
     { gText_May_Pokenav_2B3D4B, FLAG_0x06A,          0xFFFF },
     { gText_May_Pokenav_2B3DD1, FLAG_0x4F3,          0xFFFF },
     { gText_May_Pokenav_2B3E69, FLAG_0x4F4,          0xFFFF },
@@ -396,7 +396,7 @@ static const match_call_text_data_t sBrendanTextScripts[] = {
     { gText_Brendan_Pokenav_2B43EF, 0xFFFF,              0xFFFF },
     { gText_Brendan_Pokenav_2B4486, FLAG_0x4F1,          0xFFFF },
     { gText_Brendan_Pokenav_2B4560, FLAG_0x095,          0xFFFF },
-    { gText_Brendan_Pokenav_2B463F, FLAG_0x324,          0xFFFF },
+    { gText_Brendan_Pokenav_2B463F, FLAG_HIDE_MAUVILLE_CITY_WALLY,          0xFFFF },
     { gText_Brendan_Pokenav_2B46B7, FLAG_0x06A,          0xFFFF },
     { gText_Brendan_Pokenav_2B4761, FLAG_0x4F3,          0xFFFF },
     { gText_Brendan_Pokenav_2B47F4, FLAG_0x4F4,          0xFFFF },
@@ -425,9 +425,9 @@ static const match_call_text_data_t sWallyTextScripts[] = {
 };
 
 const struct MatchCallSubstruct2 sWallyAdditionalData[] = {
-    { FLAG_0x324, 0x05 },
+    { FLAG_HIDE_MAUVILLE_CITY_WALLY, 0x05 },
     { FLAG_0x06F, 0xD5 },
-    { FLAG_0x35A, 0x46 },
+    { FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY, 0x46 },
     { 0xFFFF,     0xD5 }
 };
 
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index af6a0115d..2bae89ecf 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -679,7 +679,7 @@ bool8 MetatileBehavior_IsSecretBasePC(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSecretBaseRegisterPC(u8 metatileBehavior)
+bool8 MetatileBehavior_IsRecordMixingSecretBasePC(u8 metatileBehavior)
 {
     if (metatileBehavior == MB_SECRET_BASE_REGISTER_PC)
         return TRUE;
@@ -815,7 +815,7 @@ bool8 MetatileBehavior_IsSecretBaseSandOrnament(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSecretBaseTvOrShield(u8 metatileBehavior)
+bool8 MetatileBehavior_IsSecretBaseShieldOrToyTV(u8 metatileBehavior)
 {
     if (metatileBehavior == MB_SECRET_BASE_TV_SHIELD)
         return TRUE;
@@ -1164,7 +1164,7 @@ bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8 metatileBehavior)
+bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior)
 {
     if (metatileBehavior == MB_CLOSED_SOOTOPOLIS_DOOR)
         return TRUE;
@@ -1365,7 +1365,7 @@ bool8 MetatileBehavior_IsCuttableGrass(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsRunningShoesInstruction(u8 metatileBehavior)
+bool8 MetatileBehavior_IsRunningShoesManual(u8 metatileBehavior)
 {
     if (metatileBehavior == MB_RUNNING_SHOES_INSTRUCTION)
         return TRUE;
diff --git a/src/overworld.c b/src/overworld.c
index ef0220867..00a3a020f 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -107,7 +107,7 @@ extern void sub_80A0A2C(void);
 extern void not_trainer_hill_battle_pyramid(void);
 extern void apply_map_tileset2_palette(const struct MapLayout *);
 extern void copy_map_tileset2_to_vram_2(const struct MapLayout *);
-extern void prev_quest_postbuffer_cursor_backup_reset(void);
+extern void RestartWildEncounterImmunitySteps(void);
 extern void ShowMapNamePopup(void);
 extern bool32 InTrainerHill(void);
 extern bool32 sub_808651C(void);
@@ -164,10 +164,10 @@ extern bool32 sub_8009F3C(void);
 extern void sub_8010198(void);
 extern u32 sub_800B4DC(void);
 extern bool32 sub_80B39D4(u8);
-extern const u8* sub_809C2C8(struct MapPosition *a1, u8, u8);
-extern u8 *sub_809D0F4(void*);
-extern u8 sub_808BD6C(u8);
-extern u8 sub_808BD7C(u8);
+extern const u8* GetInteractedLinkPlayerScript(struct MapPosition *a1, u8, u8);
+extern u8 *GetCoordEventScriptAtMapPosition(void*);
+extern u8 GetFRLGAvatarGraphicsIdByGender(u8);
+extern u8 GetRSAvatarGraphicsIdByGender(u8);
 extern void UpdateEventObjectSpriteVisibility(struct Sprite*, u8);
 
 // this file's functions
@@ -827,7 +827,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum)
     TrySetMapSaveWarpStatus();
     ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
-    prev_quest_postbuffer_cursor_backup_reset();
+    RestartWildEncounterImmunitySteps();
     TryUpdateRandomTrainerRematches(mapGroup, mapNum);
     DoTimeBasedEvents();
     SetSav1WeatherFromCurrMapHeader();
@@ -876,7 +876,7 @@ static void mli0_load_map(u32 a1)
     TrySetMapSaveWarpStatus();
     ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
-    prev_quest_postbuffer_cursor_backup_reset();
+    RestartWildEncounterImmunitySteps();
     TryUpdateRandomTrainerRematches(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
     if (a1 != 1)
         DoTimeBasedEvents();
@@ -2706,7 +2706,7 @@ static u8 *sub_8087370(struct UnkStruct_8054FF8 *a1)
 {
     if (a1->c != 2)
         return 0;
-    return sub_809D0F4(&a1->sub);
+    return GetCoordEventScriptAtMapPosition(&a1->sub);
 }
 
 static bool32 sub_8087388(struct UnkStruct_8054FF8 *a1)
@@ -2747,7 +2747,7 @@ static const u8 *sub_80873B4(struct UnkStruct_8054FF8 *a1)
             return EventScript_TradeRoom_ReadTrainerCard2;
     }
 
-    return sub_809C2C8(&unkStruct, a1->field_C, a1->d);
+    return GetInteractedLinkPlayerScript(&unkStruct, a1->field_C, a1->d);
 }
 
 static u16 sub_8087480(const u8 *script)
@@ -3137,11 +3137,11 @@ static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion)
         {
         case VERSION_FIRE_RED:
         case VERSION_LEAF_GREEN:
-            eventObj->spriteId = AddPseudoEventObject(sub_808BD6C(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
+            eventObj->spriteId = AddPseudoEventObject(GetFRLGAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
             break;
         case VERSION_RUBY:
         case VERSION_SAPPHIRE:
-            eventObj->spriteId = AddPseudoEventObject(sub_808BD7C(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
+            eventObj->spriteId = AddPseudoEventObject(GetRSAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
             break;
         case VERSION_EMERALD:
             eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
diff --git a/src/pokemon.c b/src/pokemon.c
index 40f7e94b2..7227d28cb 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -3251,7 +3251,7 @@ u8 GetLevelFromMonExp(struct Pokemon *mon)
     u32 exp = GetMonData(mon, MON_DATA_EXP, NULL);
     s32 level = 1;
 
-    while (level <= MAX_MON_LEVEL && gExperienceTables[gBaseStats[species].growthRate][level] <= exp)
+    while (level <= MAX_LEVEL && gExperienceTables[gBaseStats[species].growthRate][level] <= exp)
         level++;
 
     return level - 1;
@@ -3263,7 +3263,7 @@ u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon)
     u32 exp = GetBoxMonData(boxMon, MON_DATA_EXP, NULL);
     s32 level = 1;
 
-    while (level <= MAX_MON_LEVEL && gExperienceTables[gBaseStats[species].growthRate][level] <= exp)
+    while (level <= MAX_LEVEL && gExperienceTables[gBaseStats[species].growthRate][level] <= exp)
         level++;
 
     return level - 1;
@@ -5145,7 +5145,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & 0x40)  // raise level
-             && GetMonData(mon, MON_DATA_LEVEL, NULL) != MAX_MON_LEVEL)
+             && GetMonData(mon, MON_DATA_LEVEL, NULL) != MAX_LEVEL)
             {
                 dataUnsigned = gExperienceTables[gBaseStats[GetMonData(mon, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(mon, MON_DATA_LEVEL, NULL) + 1];
                 SetMonData(mon, MON_DATA_EXP, &dataUnsigned);
@@ -6430,12 +6430,12 @@ bool8 TryIncrementMonLevel(struct Pokemon *mon)
     u16 species = GetMonData(mon, MON_DATA_SPECIES, 0);
     u8 nextLevel = GetMonData(mon, MON_DATA_LEVEL, 0) + 1;
     u32 expPoints = GetMonData(mon, MON_DATA_EXP, 0);
-    if (expPoints > gExperienceTables[gBaseStats[species].growthRate][MAX_MON_LEVEL])
+    if (expPoints > gExperienceTables[gBaseStats[species].growthRate][MAX_LEVEL])
     {
-        expPoints = gExperienceTables[gBaseStats[species].growthRate][MAX_MON_LEVEL];
+        expPoints = gExperienceTables[gBaseStats[species].growthRate][MAX_LEVEL];
         SetMonData(mon, MON_DATA_EXP, &expPoints);
     }
-    if (nextLevel > MAX_MON_LEVEL || expPoints < gExperienceTables[gBaseStats[species].growthRate][nextLevel])
+    if (nextLevel > MAX_LEVEL || expPoints < gExperienceTables[gBaseStats[species].growthRate][nextLevel])
     {
         return FALSE;
     }
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index df596749e..db2a07909 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -2533,7 +2533,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused)
     u16 *r9;
     u8 i;
 
-    if (summary->level < MAX_MON_LEVEL)
+    if (summary->level < MAX_LEVEL)
     {
         u32 expBetweenLevels = gExperienceTables[gBaseStats[summary->species].growthRate][summary->level + 1] - gExperienceTables[gBaseStats[summary->species].growthRate][summary->level];
         u32 expSinceLastLevel = summary->exp - gExperienceTables[gBaseStats[summary->species].growthRate][summary->level];
@@ -3349,7 +3349,7 @@ static void PrintExpPointsNextLevel(void)
     offset = GetStringRightAlignXOffset(1, gStringVar1, 42) + 2;
     SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 1, 0, 0);
 
-    if (sum->level < MAX_MON_LEVEL)
+    if (sum->level < MAX_LEVEL)
         expToNextLevel = gExperienceTables[gBaseStats[sum->species].growthRate][sum->level + 1] - sum->exp;
     else
         expToNextLevel = 0;
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c
index dc94cb9d5..bf16a20fc 100644
--- a/src/rom_8011DC0.c
+++ b/src/rom_8011DC0.c
@@ -1646,7 +1646,7 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4)
     VarSet(VAR_0x4087, arg4);
     gFieldLinkPlayerCount = GetLinkPlayerCount();
     gUnknown_03005DB4 = GetMultiplayerId();
-    sub_809D2BC();
+    SetCableClubWarp();
     Overworld_SetWarpDestination(mapGroup, mapNum, -1, x, y);
     WarpIntoMap();
 }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index acaf78576..fa3e21996 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -52,7 +52,7 @@
 typedef u16 (*SpecialFunc)(void);
 typedef void (*NativeFunc)(void);
 
-extern u32 gUnknown_020375C0;
+extern const u8 *gUnknown_020375C0;
 
 static EWRAM_DATA u32 gUnknown_020375C4 = 0;
 static EWRAM_DATA u16 sPauseCounter = 0;
@@ -284,7 +284,7 @@ bool8 ScrCmd_callstd_if(struct ScriptContext *ctx)
 
 bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
 {
-    ScriptJump(ctx, (const u8 *)gUnknown_020375C0);
+    ScriptJump(ctx, gUnknown_020375C0);
     return FALSE;
 }
 
@@ -2223,7 +2223,7 @@ bool8 ScrCmd_cmdCF(struct ScriptContext *ctx)
 
     if (v1)
     {
-        ((u8*)gUnknown_020375C0) = ctx->scriptPtr;
+        gUnknown_020375C0 = ctx->scriptPtr;
         ScriptJump(ctx, v1);
     }
     return FALSE;
diff --git a/src/script.c b/src/script.c
index 8c868128b..c61ae7183 100644
--- a/src/script.c
+++ b/src/script.c
@@ -5,7 +5,7 @@
 
 #define RAM_SCRIPT_MAGIC 51
 
-extern u8* gUnknown_020375C0;
+extern const u8* gUnknown_020375C0;
 
 extern bool32 sub_801B27C(void);
 
@@ -344,7 +344,7 @@ void ClearRamScript(void)
     CpuFill32(0, &gSaveBlock1Ptr->ramScript, sizeof(struct RamScript));
 }
 
-bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId)
+bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId)
 {
     struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
 
@@ -362,7 +362,7 @@ bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objec
     return TRUE;
 }
 
-u8 *GetRamScript(u8 objectId, u8 *script)
+const u8 *GetRamScript(u8 objectId, const u8 *script)
 {
     struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
     gUnknown_020375C0 = NULL;
diff --git a/src/secret_base.c b/src/secret_base.c
index 441bdef04..a684f3982 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -596,13 +596,13 @@ void sub_80E95D4(void)
     VarSet(VAR_OBJ_GFX_ID_F, gUnknown_0858D060[sub_80EA20C(VarGet(VAR_0x4054))]);
 }
 
-void sub_80E9608(struct Coords16 *coords, struct MapEvents *events)
+void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events)
 {
     s16 bgEventIdx;
 
     for (bgEventIdx = 0; bgEventIdx < events->bgEventCount; bgEventIdx ++)
     {
-        if (events->bgEvents[bgEventIdx].kind == BG_EVENT_SECRET_BASE && coords->x == events->bgEvents[bgEventIdx].x + 7 && coords->y == events->bgEvents[bgEventIdx].y + 7)
+        if (events->bgEvents[bgEventIdx].kind == BG_EVENT_SECRET_BASE && position->x == events->bgEvents[bgEventIdx].x + 7 && position->y == events->bgEvents[bgEventIdx].y + 7)
         {
             sCurSecretBaseId = events->bgEvents[bgEventIdx].bgUnion.secretBaseId;
             break;
@@ -610,9 +610,9 @@ void sub_80E9608(struct Coords16 *coords, struct MapEvents *events)
     }
 }
 
-void sub_80E9668(struct Coords16 *coords, struct MapEvents *events)
+void sub_80E9668(const struct MapPosition *position, const struct MapEvents *events)
 {
-    sub_80E9608(coords, events);
+    sub_80E9608(position, events);
     sub_80E8B6C();
     ScriptContext1_SetupScript(EventScript_275BB7);
 }
diff --git a/src/shop.c b/src/shop.c
index 26151171a..510c9f4f7 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -1,15 +1,20 @@
 #include "global.h"
 #include "bg.h"
+#include "data2.h"
 #include "decompress.h"
 #include "decoration.h"
+#include "decoration_inventory.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "field_screen.h"
 #include "field_weather.h"
 #include "fieldmap.h"
 #include "gpu_regs.h"
+#include "graphics.h"
 #include "international_string_util.h"
 #include "item.h"
 #include "item_icon.h"
+#include "item_menu.h"
 #include "list_menu.h"
 #include "main.h"
 #include "malloc.h"
@@ -18,6 +23,7 @@
 #include "money.h"
 #include "overworld.h"
 #include "palette.h"
+#include "party_menu.h"
 #include "scanline_effect.h"
 #include "script.h"
 #include "shop.h"
@@ -27,54 +33,243 @@
 #include "strings.h"
 #include "text_window.h"
 #include "tv.h"
+#include "constants/items.h"
+#include "constants/metatile_behaviors.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
 
-extern struct ShopData *gShopDataPtr;
-extern struct ListMenuItem *gUnknown_02039F74;
-extern u8 (*gUnknown_02039F78)[16];
-extern struct MartInfo gMartInfo;
-
-extern const struct WindowTemplate gUnknown_08589A38[2];
-extern const struct MenuAction gUnknown_08589A10[3];
-extern const struct MenuAction gUnknown_08589A28[2];
-extern const struct ListMenuTemplate gUnknown_08589A48;
-extern const struct BgTemplate gUnknown_08589A60[4];
-extern const u8 gBuyMenuFrame_Gfx[];
-extern const u8 gBuyMenuFrame_Tilemap[];
-extern const u16 gMenuMoneyPal[];
-extern const struct WindowTemplate gUnknown_08589A70[];
-extern u8 gUnknown_08589AB0[][3];
+EWRAM_DATA struct MartInfo gMartInfo = {0};
+EWRAM_DATA struct ShopData *gShopDataPtr = NULL;
+EWRAM_DATA struct ListMenuItem *gUnknown_02039F74 = NULL;
+EWRAM_DATA u8 (*gUnknown_02039F78)[16] = {0};
+EWRAM_DATA u8 gMartPurchaseHistoryId = 0;
+EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3] = {0};
 
 static void Task_ShopMenu(u8 taskId);
-void HandleShopMenuQuit(u8 taskId);
-void CB2_InitBuyMenu(void);
+static void Task_HandleShopMenuQuit(u8 taskId);
+static void CB2_InitBuyMenu(void);
 static void Task_GoToBuyOrSellMenu(u8 taskId);
-void CB2_GoToSellMenu(void);
-void MapPostLoadHook_ExitBuyOrSellMenu(void);
-void Task_ExitSellMenu(u8 taskId);
-void ReturnToShopMenuAfterExitingSellMenu(u8 taskId);
-void BuyMenuDrawGraphics(void);
-void BuyMenuAddScrollIndicatorArrows(void);
-void Task_BuyMenu(u8 taskId);
-void BuyMenuBuildListMenuTemplate(void);
-void BuyMenuInitBgs(void);
-void BuyMenuInitWindows(void);
-void BuyMenuDecompressBgGraphics(void);
-void BuyMenuSetListEntry(struct ListMenuItem*, u16, u8*);
-void BuyMenuAddItemIcon(u16, u8);
-void BuyMenuRemoveItemIcon(u16, u8);
-void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet);
-void BuyMenuDrawMapGraphics(void);
-void BuyMenuCopyMenuBgToBg1TilemapBuffer(void);
-void BuyMenuCollectEventObjectData(void);
-void BuyMenuDrawEventObjects(void);
-void BuyMenuDrawMapBg(void);
-bool8 BuyMenuCheckForOverlapWithMenuBg(u16, u16);
-void BuyMenuDrawMapMetatile(s16, s16, u16*, u8);
-
-
-/*static*/ u8 CreateShopMenu(u8 martType)
+static void MapPostLoadHook_ReturnToShopMenu(void);
+static void Task_ReturnToShopMenu(u8 taskId);
+static void ShowShopMenuAfterExitingBuyOrSellMenu(u8 taskId);
+static void BuyMenuDrawGraphics(void);
+static void BuyMenuAddScrollIndicatorArrows(void);
+static void Task_BuyMenu(u8 taskId);
+static void BuyMenuBuildListMenuTemplate(void);
+static void BuyMenuInitBgs(void);
+static void BuyMenuInitWindows(void);
+static void BuyMenuDecompressBgGraphics(void);
+static void BuyMenuSetListEntry(struct ListMenuItem*, u16, u8*);
+static void BuyMenuAddItemIcon(u16, u8);
+static void BuyMenuRemoveItemIcon(u16, u8);
+static void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet);
+static void BuyMenuDrawMapGraphics(void);
+static void BuyMenuCopyMenuBgToBg1TilemapBuffer(void);
+static void BuyMenuCollectEventObjectData(void);
+static void BuyMenuDrawEventObjects(void);
+static void BuyMenuDrawMapBg(void);
+static bool8 BuyMenuCheckForOverlapWithMenuBg(int, int);
+static void BuyMenuDrawMapMetatile(s16, s16, const u16*, u8);
+static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src);
+static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *);
+static void ExitBuyMenu(u8 taskId);
+static void Task_ExitBuyMenu(u8 taskId);
+static void BuyMenuTryMakePurchase(u8 taskId);
+static void BuyMenuReturnToItemList(u8 taskId);
+static void Task_BuyHowManyDialogueInit(u8 taskId);
+static void BuyMenuConfirmPurchase(u8 taskId);
+static void BuyMenuPrintItemQuantityAndPrice(u8 taskId);
+static void Task_BuyHowManyDialogueHandleInput(u8 taskId);
+static void BuyMenuSubtractMoney(u8 taskId);
+static void RecordItemPurchase(u8 taskId);
+static void Task_ReturnToItemListAfterItemPurchase(u8 taskId);
+static void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId);
+static void Task_HandleShopMenuBuy(u8 taskId);
+static void Task_HandleShopMenuSell(u8 taskId);
+static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list);
+static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y);
+
+static const struct YesNoFuncTable sShopPurchaseYesNoFuncs =
+{
+    BuyMenuTryMakePurchase,
+    BuyMenuReturnToItemList
+};
+
+static const struct MenuAction sShopMenuActions_BuySellQuit[] = 
+{
+    { gText_ShopBuy, {.void_u8=Task_HandleShopMenuBuy} },
+    { gText_ShopSell, {.void_u8=Task_HandleShopMenuSell} },
+    { gText_ShopQuit, {.void_u8=Task_HandleShopMenuQuit} }
+};
+
+static const struct MenuAction sShopMenuActions_BuyQuit[] = 
+{
+    { gText_ShopBuy, {.void_u8=Task_HandleShopMenuBuy} },
+    { gText_ShopQuit, {.void_u8=Task_HandleShopMenuQuit} }
+};
+
+static const struct WindowTemplate sShopMenuWindowTemplates[] =
+{
+    {
+        .priority = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 1,
+        .width = 9,
+        .height = 6,
+        .paletteNum = 15,
+        .baseBlock = 0x0008,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 1,
+        .width = 9,
+        .height = 4,
+        .paletteNum = 15,
+        .baseBlock = 0x0008,
+    }
+};
+
+static const struct ListMenuTemplate sShopBuyMenuListTemplate =
+{
+    .items = NULL,
+    .moveCursorFunc = BuyMenuPrintItemDescriptionAndShowItemIcon,
+    .itemPrintFunc = BuyMenuPrintPriceInList,
+    .totalItems = 0,
+    .maxShowed = 0,
+    .windowId = 1,
+    .header_X = 0,
+    .item_X = 8,
+    .cursor_X = 0,
+    .upText_Y = 1,
+    .cursorPal = 2,
+    .fillValue = 0,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = 7,
+    .cursorKind = 0
+};
+
+static const struct BgTemplate sShopBuyMenuBgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 29,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 28,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+static const struct WindowTemplate sShopBuyMenuWindowTemplates[] =
+{
+    {
+        .priority = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 10,
+        .height = 2,
+        .paletteNum = 15,
+        .baseBlock = 0x001E,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 14,
+        .tilemapTop = 2,
+        .width = 15,
+        .height = 16,
+        .paletteNum = 15,
+        .baseBlock = 0x0032,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 13,
+        .width = 14,
+        .height = 6,
+        .paletteNum = 15,
+        .baseBlock = 0x0122,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 11,
+        .width = 12,
+        .height = 2,
+        .paletteNum = 15,
+        .baseBlock = 0x0176,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 18,
+        .tilemapTop = 11,
+        .width = 10,
+        .height = 2,
+        .paletteNum = 15,
+        .baseBlock = 0x018E,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 15,
+        .width = 27,
+        .height = 4,
+        .paletteNum = 15,
+        .baseBlock = 0x01A2,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sShopBuyMenuYesNoWindowTemplates = 
+{
+    .priority = 0,
+    .tilemapLeft = 21,
+    .tilemapTop = 9,
+    .width = 5,
+    .height = 4,
+    .paletteNum = 15,
+    .baseBlock = 0x020E,
+};
+
+static const u8 sShopBuyMenuTextColors[][3] =
+{
+    {1, 2, 3},
+    {0, 2, 3},
+    {0, 3, 2}
+};
+
+static u8 CreateShopMenu(u8 martType)
 {
     int numMenuItems;
 
@@ -84,20 +279,20 @@ void BuyMenuDrawMapMetatile(s16, s16, u16*, u8);
     if (martType == MART_TYPE_0)
     {
         struct WindowTemplate winTemplate;
-        winTemplate = gUnknown_08589A38[0];
-        winTemplate.width = GetMaxWidthInMenuTable(gUnknown_08589A10, ARRAY_COUNT(gUnknown_08589A10));
+        winTemplate = sShopMenuWindowTemplates[0];
+        winTemplate.width = GetMaxWidthInMenuTable(sShopMenuActions_BuySellQuit, ARRAY_COUNT(sShopMenuActions_BuySellQuit));
         gMartInfo.windowId = AddWindow(&winTemplate);
-        gMartInfo.menuActions = gUnknown_08589A10;
-        numMenuItems = ARRAY_COUNT(gUnknown_08589A10);
+        gMartInfo.menuActions = sShopMenuActions_BuySellQuit;
+        numMenuItems = ARRAY_COUNT(sShopMenuActions_BuySellQuit);
     }
     else
     {
         struct WindowTemplate winTemplate;
-        winTemplate = gUnknown_08589A38[1];
-        winTemplate.width = GetMaxWidthInMenuTable(gUnknown_08589A28, ARRAY_COUNT(gUnknown_08589A28));
+        winTemplate = sShopMenuWindowTemplates[1];
+        winTemplate.width = GetMaxWidthInMenuTable(sShopMenuActions_BuyQuit, ARRAY_COUNT(sShopMenuActions_BuyQuit));
         gMartInfo.windowId = AddWindow(&winTemplate);
-        gMartInfo.menuActions = gUnknown_08589A28;
-        numMenuItems = ARRAY_COUNT(gUnknown_08589A28);
+        gMartInfo.menuActions = sShopMenuActions_BuyQuit;
+        numMenuItems = ARRAY_COUNT(sShopMenuActions_BuyQuit);
     }
 
     SetStandardWindowBorderStyle(gMartInfo.windowId, 0);
@@ -109,12 +304,12 @@ void BuyMenuDrawMapMetatile(s16, s16, u16*, u8);
     return CreateTask(Task_ShopMenu, 8);
 }
 
-/*static*/ void SetShopMenuCallback(void (* callback)(void))
+static void SetShopMenuCallback(void (* callback)(void))
 {
     gMartInfo.callback = callback;
 }
 
-/*static*/ void SetShopItemsForSale(const u16 *items)
+static void SetShopItemsForSale(const u16 *items)
 {
     u16 i = 0;
 
@@ -133,11 +328,11 @@ static void Task_ShopMenu(u8 taskId)
     s8 inputCode = Menu_ProcessInputNoWrapAround();
     switch (inputCode)
     {
-    case -2:
+    case LIST_B_PRESSED:
         break;
-    case -1:
+    case LIST_NOTHING_CHOSEN:
         PlaySE(SE_SELECT);
-        HandleShopMenuQuit(taskId);
+        Task_HandleShopMenuQuit(taskId);
         break;
     default:
         gMartInfo.menuActions[inputCode].func.void_u8(taskId);
@@ -145,31 +340,31 @@ static void Task_ShopMenu(u8 taskId)
     }
 }
 
-void HandleShopMenuBuy(u8 taskId)
+static void Task_HandleShopMenuBuy(u8 taskId)
 {
-    s16 *taskData = gTasks[taskId].data;
-    taskData[8] = (u32)CB2_InitBuyMenu >> 16;
-    taskData[9] = (u32)CB2_InitBuyMenu;
+    s16 *data = gTasks[taskId].data;
+    data[8] = (u32)CB2_InitBuyMenu >> 16;
+    data[9] = (u32)CB2_InitBuyMenu;
     gTasks[taskId].func = Task_GoToBuyOrSellMenu;
     FadeScreen(1, 0);
 }
 
-void HandleShopMenuSell(u8 taskId)
+static void Task_HandleShopMenuSell(u8 taskId)
 {
-    s16 *taskData = gTasks[taskId].data;
-    taskData[8] = (u32)CB2_GoToSellMenu >> 16;
-    taskData[9] = (u32)CB2_GoToSellMenu;
+    s16 *data = gTasks[taskId].data;
+    data[8] = (u32)CB2_GoToSellMenu >> 16;
+    data[9] = (u32)CB2_GoToSellMenu;
     gTasks[taskId].func = Task_GoToBuyOrSellMenu;
     FadeScreen(1, 0);
 }
 
 void CB2_ExitSellMenu(void)
 {
-    gFieldCallback = MapPostLoadHook_ExitBuyOrSellMenu;
+    gFieldCallback = MapPostLoadHook_ReturnToShopMenu;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-/*static*/ void HandleShopMenuQuit(u8 taskId)
+static void Task_HandleShopMenuQuit(u8 taskId)
 {
     sub_8198070(gMartInfo.windowId, 2);
     RemoveWindow(gMartInfo.windowId);
@@ -183,38 +378,38 @@ void CB2_ExitSellMenu(void)
 
 static void Task_GoToBuyOrSellMenu(u8 taskId)
 {
-    s16 *taskData = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     if (!gPaletteFade.active)
     {
         DestroyTask(taskId);
-        SetMainCallback2((void *)((u16)taskData[8] << 16 | (u16)taskData[9]));
+        SetMainCallback2((void *)((u16)data[8] << 16 | (u16)data[9]));
     }
 }
 
-void MapPostLoadHook_ExitBuyOrSellMenu(void)
+static void MapPostLoadHook_ReturnToShopMenu(void)
 {
     pal_fill_black();
-    CreateTask(Task_ExitSellMenu, 8);
+    CreateTask(Task_ReturnToShopMenu, 8);
 }
 
-void Task_ExitSellMenu(u8 taskId)
+static void Task_ReturnToShopMenu(u8 taskId)
 {
     if (IsWeatherNotFadingIn() == TRUE)
     {
         if (gMartInfo.martType == MART_TYPE_2)
-            DisplayItemMessageOnField(taskId, gText_CanIHelpWithAnythingElse, ReturnToShopMenuAfterExitingSellMenu);
+            DisplayItemMessageOnField(taskId, gText_CanIHelpWithAnythingElse, ShowShopMenuAfterExitingBuyOrSellMenu);
         else
-            DisplayItemMessageOnField(taskId, gText_AnythingElseICanHelp, ReturnToShopMenuAfterExitingSellMenu);
+            DisplayItemMessageOnField(taskId, gText_AnythingElseICanHelp, ShowShopMenuAfterExitingBuyOrSellMenu);
     }
 }
 
-void ReturnToShopMenuAfterExitingSellMenu(u8 taskId)
+static void ShowShopMenuAfterExitingBuyOrSellMenu(u8 taskId)
 {
     CreateShopMenu(gMartInfo.martType);
     DestroyTask(taskId);
 }
 
-void CB2_BuyMenu(void)
+static void CB2_BuyMenu(void)
 {
     RunTasks();
     AnimateSprites();
@@ -223,14 +418,18 @@ void CB2_BuyMenu(void)
     UpdatePaletteFade();
 }
 
-void VBlankCB_BuyMenu(void)
+static void VBlankCB_BuyMenu(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void CB2_InitBuyMenu(void)
+#define tItemCount data[1]
+#define tItemId data[5]
+#define tListTaskId data[7]
+
+static void CB2_InitBuyMenu(void)
 {
     u8 taskId;
 
@@ -248,8 +447,8 @@ void CB2_InitBuyMenu(void)
         clear_scheduled_bg_copies_to_vram();
         gShopDataPtr = AllocZeroed(sizeof(struct ShopData));
         gShopDataPtr->scrollIndicatorsTaskId = 0xFF;
-        gShopDataPtr->unk200D[0] = -1;
-        gShopDataPtr->unk200D[1] = -1;
+        gShopDataPtr->itemSpriteIds[0] = -1;
+        gShopDataPtr->itemSpriteIds[1] = -1;
         BuyMenuBuildListMenuTemplate();
         BuyMenuInitBgs();
         FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
@@ -268,7 +467,7 @@ void CB2_InitBuyMenu(void)
         BuyMenuDrawGraphics();
         BuyMenuAddScrollIndicatorArrows();
         taskId = CreateTask(Task_BuyMenu, 8);
-        gTasks[taskId].data[7] = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
+        gTasks[taskId].tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
         BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         SetVBlankCallback(VBlankCB_BuyMenu);
@@ -277,7 +476,7 @@ void CB2_InitBuyMenu(void)
     }
 }
 
-void BuyMenuFreeMemory(void)
+static void BuyMenuFreeMemory(void)
 {
     Free(gShopDataPtr);
     Free(gUnknown_02039F74);
@@ -285,7 +484,7 @@ void BuyMenuFreeMemory(void)
     FreeAllWindowBuffers();
 }
 
-void BuyMenuBuildListMenuTemplate(void)
+static void BuyMenuBuildListMenuTemplate(void)
 {
     u16 i;
     u16 itemCount;
@@ -299,7 +498,7 @@ void BuyMenuBuildListMenuTemplate(void)
     gUnknown_02039F74[i].name = gUnknown_02039F78[i];
     gUnknown_02039F74[i].id = -2;
 
-    gMultiuseListMenuTemplate = gUnknown_08589A48;
+    gMultiuseListMenuTemplate = sShopBuyMenuListTemplate;
     gMultiuseListMenuTemplate.items = gUnknown_02039F74;
     gMultiuseListMenuTemplate.totalItems = gMartInfo.itemCount + 1;
     if (gMultiuseListMenuTemplate.totalItems > 8)
@@ -307,10 +506,10 @@ void BuyMenuBuildListMenuTemplate(void)
     else
         gMultiuseListMenuTemplate.maxShowed = gMultiuseListMenuTemplate.totalItems;
 
-    gShopDataPtr->unk2004 = gMultiuseListMenuTemplate.maxShowed;
+    gShopDataPtr->itemsShowed = gMultiuseListMenuTemplate.maxShowed;
 }
 
-void BuyMenuSetListEntry(struct ListMenuItem *menuItem, u16 item, u8 *name)
+static void BuyMenuSetListEntry(struct ListMenuItem *menuItem, u16 item, u8 *name)
 {
     if (gMartInfo.martType == MART_TYPE_0)
         CopyItemName(item, name);
@@ -321,19 +520,19 @@ void BuyMenuSetListEntry(struct ListMenuItem *menuItem, u16 item, u8 *name)
     menuItem->id = item;
 }
 
-void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list)
+static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list)
 {
     const u8 *description;
     if (onInit != TRUE)
         PlaySE(SE_SELECT);
 
     if (item != -2)
-        BuyMenuAddItemIcon(item, gShopDataPtr->unk200C);
+        BuyMenuAddItemIcon(item, gShopDataPtr->iconSlot);
     else
-        BuyMenuAddItemIcon(-1, gShopDataPtr->unk200C);
+        BuyMenuAddItemIcon(-1, gShopDataPtr->iconSlot);
 
-    BuyMenuRemoveItemIcon(item, gShopDataPtr->unk200C ^ 1);
-    gShopDataPtr->unk200C ^= 1;
+    BuyMenuRemoveItemIcon(item, gShopDataPtr->iconSlot ^ 1);
+    gShopDataPtr->iconSlot ^= 1;
     if (item != -2)
     {
         if (gMartInfo.martType == MART_TYPE_0)
@@ -350,7 +549,7 @@ void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct L
     BuyMenuPrint(2, description, 3, 1, 0, 0);
 }
 
-void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y)
+static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y)
 {
     u8 x;
 
@@ -375,11 +574,11 @@ void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y)
 
         StringExpandPlaceholders(gStringVar4, gText_PokedollarVar1);
         x = GetStringRightAlignXOffset(7, gStringVar4, 0x78);
-        AddTextPrinterParameterized4(windowId, 7, x, y, 0, 0, gUnknown_08589AB0[1], -1, gStringVar4);
+        AddTextPrinterParameterized4(windowId, 7, x, y, 0, 0, sShopBuyMenuTextColors[1], -1, gStringVar4);
     }
 }
 
-void BuyMenuAddScrollIndicatorArrows(void)
+static void BuyMenuAddScrollIndicatorArrows(void)
 {
     if (gShopDataPtr->scrollIndicatorsTaskId == 0xFF && gMartInfo.itemCount + 1 > 8)
     {
@@ -389,13 +588,13 @@ void BuyMenuAddScrollIndicatorArrows(void)
             0xC,
             0x94,
             gMartInfo.itemCount - 7,
-            0x834,
-            0x834,
-            &gShopDataPtr->unk2008);
+            2100,
+            2100,
+            &gShopDataPtr->scrollOffset);
     }
 }
 
-void BuyMenuRemoveScrollIndicatorArrows(void)
+static void BuyMenuRemoveScrollIndicatorArrows(void)
 {
     if (gShopDataPtr->scrollIndicatorsTaskId != 0xFF)
     {
@@ -404,22 +603,22 @@ void BuyMenuRemoveScrollIndicatorArrows(void)
     }
 }
 
-void BuyMenuPrintCursor(u8 scrollIndicatorsTaskId, u8 colorSet)
+static void BuyMenuPrintCursor(u8 scrollIndicatorsTaskId, u8 colorSet)
 {
     u8 y = ListMenuGetYCoordForPrintingArrowCursor(scrollIndicatorsTaskId);
     BuyMenuPrint(1, gText_SelectorArrow2, 0, y, 0, colorSet);
 }
 
-void BuyMenuAddItemIcon(u16 item, u8 iconSlot)
+static void BuyMenuAddItemIcon(u16 item, u8 iconSlot)
 {
     u8 spriteId;
-    u8 *spriteIdPtr = &gShopDataPtr->unk200D[iconSlot];
+    u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot];
     if (*spriteIdPtr != 0xFF)
         return;
 
     if (gMartInfo.martType == MART_TYPE_0 || item == 0xFFFF)
     {
-        spriteId = AddItemIconSprite(iconSlot + 0x83E, iconSlot + 0x83E, item);
+        spriteId = AddItemIconSprite(iconSlot + 2110, iconSlot + 2110, item);
         if (spriteId != MAX_SPRITES)
         {
             *spriteIdPtr = spriteId;
@@ -429,28 +628,28 @@ void BuyMenuAddItemIcon(u16 item, u8 iconSlot)
     }
     else
     {
-        spriteId = AddDecorationIconObject(item, 20, 84, 1, iconSlot + 0x83E, iconSlot + 0x83E);
+        spriteId = AddDecorationIconObject(item, 20, 84, 1, iconSlot + 2110, iconSlot + 2110);
         if (spriteId != MAX_SPRITES)
             *spriteIdPtr = spriteId;
     }
 }
 
-void BuyMenuRemoveItemIcon(u16 item, u8 iconSlot)
+static void BuyMenuRemoveItemIcon(u16 item, u8 iconSlot)
 {
-    u8 *spriteIdPtr = &gShopDataPtr->unk200D[iconSlot];
+    u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot];
     if (*spriteIdPtr == 0xFF)
         return;
 
-    FreeSpriteTilesByTag(iconSlot + 0x83E);
-    FreeSpritePaletteByTag(iconSlot + 0x83E);
+    FreeSpriteTilesByTag(iconSlot + 2110);
+    FreeSpritePaletteByTag(iconSlot + 2110);
     DestroySprite(&gSprites[*spriteIdPtr]);
     *spriteIdPtr = 0xFF;
 }
 
-void BuyMenuInitBgs(void)
+static void BuyMenuInitBgs(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_08589A60, ARRAY_COUNT(gUnknown_08589A60));
+    InitBgsFromTemplates(0, sShopBuyMenuBgTemplates, ARRAY_COUNT(sShopBuyMenuBgTemplates));
     SetBgTilemapBuffer(1, gShopDataPtr->tilemapBuffers[1]);
     SetBgTilemapBuffer(2, gShopDataPtr->tilemapBuffers[3]);
     SetBgTilemapBuffer(3, gShopDataPtr->tilemapBuffers[2]);
@@ -470,16 +669,16 @@ void BuyMenuInitBgs(void)
     ShowBg(3);
 }
 
-void BuyMenuDecompressBgGraphics(void)
+static void BuyMenuDecompressBgGraphics(void)
 {
     decompress_and_copy_tile_data_to_vram(1, gBuyMenuFrame_Gfx, 0x3A0, 0x3E3, 0);
     LZDecompressWram(gBuyMenuFrame_Tilemap, gShopDataPtr->tilemapBuffers[0]);
     LoadCompressedPalette(gMenuMoneyPal, 0xC0, 0x20);
 }
 
-void BuyMenuInitWindows(void)
+static void BuyMenuInitWindows(void)
 {
-    InitWindows(gUnknown_08589A70);
+    InitWindows(sShopBuyMenuWindowTemplates);
     DeactivateAllTextPrinters();
     LoadUserWindowBorderGfx(0, 1, 0xD0);
     LoadMessageBoxGfx(0, 0xA, 0xE0);
@@ -488,18 +687,18 @@ void BuyMenuInitWindows(void)
     PutWindowTilemap(2);
 }
 
-void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet)
+static void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet)
 {
-    AddTextPrinterParameterized4(windowId, 1, x, y, 0, 0, gUnknown_08589AB0[colorSet], speed, text);
+    AddTextPrinterParameterized4(windowId, 1, x, y, 0, 0, sShopBuyMenuTextColors[colorSet], speed, text);
 }
 
-void BuyMenuDisplayMessage(u8 taskId, const u8 *text, TaskFunc callback)
+static void BuyMenuDisplayMessage(u8 taskId, const u8 *text, TaskFunc callback)
 {
     DisplayMessageAndContinueTask(taskId, 5, 10, 14, 1, GetPlayerTextSpeed(), text, callback);
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-void BuyMenuDrawGraphics(void)
+static void BuyMenuDrawGraphics(void)
 {
     BuyMenuDrawMapGraphics();
     BuyMenuCopyMenuBgToBg1TilemapBuffer();
@@ -511,24 +710,22 @@ void BuyMenuDrawGraphics(void)
     schedule_bg_copy_tilemap_to_vram(3);
 }
 
-void BuyMenuDrawMapGraphics(void)
+static void BuyMenuDrawMapGraphics(void)
 {
     BuyMenuCollectEventObjectData();
     BuyMenuDrawEventObjects();
     BuyMenuDrawMapBg();
 }
 
-#ifdef NONMATCHING
-// functionally equivalent, but couldn't get the loop variables using the 
-// stack correctly. Might be related to the tileset metatiles type.
-void BuyMenuDrawMapBg(void)
+static void BuyMenuDrawMapBg(void)
 {
     s16 i;
     s16 j;
     s16 x;
     s16 y;
     const struct MapLayout *mapLayout;
-    u16 metatile, metatileLayerType;
+    u16 metatile;
+    u8 metatileLayerType;
 
     mapLayout = gMapHeader.mapLayout;
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
@@ -545,135 +742,491 @@ void BuyMenuDrawMapBg(void)
             else
                 metatileLayerType = 1;
 
-            if (metatile < 0x200)
+            if (metatile < NUM_METATILES_IN_PRIMARY)
             {
                 BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
             }
             else
             {
-                BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->secondaryTileset->metatiles + ((metatile - 0x200) * 8), metatileLayerType);
+                BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
+            }
+        }
+    }
+}
+
+static void BuyMenuDrawMapMetatile(s16 x, s16 y, const u16 *src, u8 metatileLayerType)
+{
+    u16 offset1 = x * 2;
+    u16 offset2 = y * 64;
+
+    switch (metatileLayerType)
+    {
+    case 0:
+        BuyMenuDrawMapMetatileLayer(gShopDataPtr->tilemapBuffers[3], offset1, offset2, src);
+        BuyMenuDrawMapMetatileLayer(gShopDataPtr->tilemapBuffers[1], offset1, offset2, src + 4);
+        break;
+    case 1:
+        BuyMenuDrawMapMetatileLayer(gShopDataPtr->tilemapBuffers[2], offset1, offset2, src);
+        BuyMenuDrawMapMetatileLayer(gShopDataPtr->tilemapBuffers[3], offset1, offset2, src + 4);
+        break;
+    case 2:
+        BuyMenuDrawMapMetatileLayer(gShopDataPtr->tilemapBuffers[2], offset1, offset2, src);
+        BuyMenuDrawMapMetatileLayer(gShopDataPtr->tilemapBuffers[1], offset1, offset2, src + 4);
+        break;
+    }
+}
+
+static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src)
+{
+    // This function draws a whole 2x2 metatile.
+    dest[offset1 + offset2] = src[0]; // top left
+    dest[offset1 + offset2 + 1] = src[1]; // top right
+    dest[offset1 + offset2 + 32] = src[2]; // bottom left
+    dest[offset1 + offset2 + 33] = src[3]; // bottom right
+}
+
+static void BuyMenuCollectEventObjectData(void)
+{
+    s16 facingX;
+    s16 facingY;
+    u8 y;
+    u8 x;
+    u8 r8 = 0;
+
+    GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY);
+    for (y = 0; y < 16; y++)
+        gShopDataPtr->viewportObjects[y][EVENT_OBJ_ID] = 16;
+    for (y = 0; y < 5; y++)
+    {
+        for (x = 0; x < 7; x++)
+        {
+            u8 eventObjId = GetEventObjectIdByXY(facingX - 4 + x, facingY - 2 + y);
+
+            if (eventObjId != 16)
+            {
+                gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = eventObjId;
+                gShopDataPtr->viewportObjects[r8][X_COORD] = x;
+                gShopDataPtr->viewportObjects[r8][Y_COORD] = y;
+                gShopDataPtr->viewportObjects[r8][LAYER_TYPE] = MapGridGetMetatileLayerTypeAt(facingX - 4 + x, facingY - 2 + y);
+                
+                switch (gEventObjects[eventObjId].facingDirection)
+                {
+                    case DIR_SOUTH:
+                        gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 0;
+                        break;
+                    case DIR_NORTH:
+                        gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 1;
+                        break;
+                    case DIR_WEST:
+                        gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 2;
+                        break;
+                    case DIR_EAST:
+                    default:
+                        gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 3;
+                        break;
+                }
+                r8++;
+            }
+        }
+    }
+}
+
+static void BuyMenuDrawEventObjects(void)
+{
+    u8 i;
+    u8 spriteId;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+
+    for (i = 0; i < 16; i++) // max objects?
+    {
+        if (gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID] == 16)
+            continue;
+
+        graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId);
+
+        spriteId = AddPseudoEventObject(
+            gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId,
+            SpriteCallbackDummy,
+            (u16)gShopDataPtr->viewportObjects[i][X_COORD] * 16 + 8,
+            (u16)gShopDataPtr->viewportObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2,
+            2);
+        
+        if (BuyMenuCheckIfEventObjectOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE)
+        {
+            gSprites[spriteId].subspriteTableNum = 4;
+            gSprites[spriteId].subspriteMode = 1;
+        }
+
+        StartSpriteAnim(&gSprites[spriteId], gShopDataPtr->viewportObjects[i][ANIM_NUM]);
+    }
+}
+
+static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *object)
+{
+    if (!BuyMenuCheckForOverlapWithMenuBg(object[X_COORD], object[Y_COORD] + 2) && object[LAYER_TYPE] != MB_SECRET_BASE_WALL)
+    {
+        return TRUE;
+    }
+    else 
+    {
+        return FALSE;
+    }
+}
+
+static void BuyMenuCopyMenuBgToBg1TilemapBuffer(void)
+{
+    s16 i;
+    u16 *dest = gShopDataPtr->tilemapBuffers[1];
+    const u16 *src = gShopDataPtr->tilemapBuffers[0];
+
+    for (i = 0; i < 1024; i++)
+    {
+        if (src[i] != 0)
+        {
+            dest[i] = src[i] + 0xC3E3;
+        }
+    }
+}
+
+static bool8 BuyMenuCheckForOverlapWithMenuBg(int x, int y)
+{
+    const u16 *metatile = gShopDataPtr->tilemapBuffers[0];
+    int offset1 = x * 2;
+    int offset2 = y * 64;
+
+    if (metatile[offset2 + offset1] == 0 &&
+        metatile[offset2 + offset1 + 32] == 0 &&
+        metatile[offset2 + offset1 + 1] == 0 &&
+        metatile[offset2 + offset1 + 33] == 0)
+    {
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static void Task_BuyMenu(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (!gPaletteFade.active)
+    {
+        s32 itemId = ListMenuHandleInputGetItemId(tListTaskId);
+        ListMenuGetScrollAndRow(tListTaskId, &gShopDataPtr->scrollOffset, &gShopDataPtr->selectedRow);
+
+        switch (itemId)
+        {
+        case LIST_NOTHING_CHOSEN:
+            break;
+        case LIST_B_PRESSED:
+            PlaySE(SE_SELECT);
+            ExitBuyMenu(taskId);
+            break;
+        default:
+            PlaySE(SE_SELECT);
+            tItemId = itemId;
+            ClearWindowTilemap(2);
+            BuyMenuRemoveScrollIndicatorArrows();
+            BuyMenuPrintCursor(tListTaskId, 2);
+
+            if (gMartInfo.martType == MART_TYPE_0)
+            {
+                gShopDataPtr->totalCost = (ItemId_GetPrice(itemId) >> GetPriceReduction(1));
+            }
+            else
+            {
+                gShopDataPtr->totalCost = gDecorations[itemId].price;
+            }
+
+            if (!IsEnoughMoney(&gSaveBlock1Ptr->money, gShopDataPtr->totalCost))
+            {
+                BuyMenuDisplayMessage(taskId, gText_YouDontHaveMoney, BuyMenuReturnToItemList);
+            }
+            else
+            {
+                if (gMartInfo.martType == MART_TYPE_0)
+                {
+                    CopyItemName(itemId, gStringVar1);
+                    if (ItemId_GetPocket(itemId) == POCKET_TM_HM)
+                    {
+                        StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]);
+                        BuyMenuDisplayMessage(taskId, gText_Var1CertainlyHowMany2, Task_BuyHowManyDialogueInit);
+                    }
+                    else
+                    {
+                        BuyMenuDisplayMessage(taskId, gText_Var1CertainlyHowMany, Task_BuyHowManyDialogueInit);
+                    }
+                }
+                else
+                {
+                    StringCopy(gStringVar1, gDecorations[itemId].name);
+                    ConvertIntToDecimalStringN(gStringVar2, gShopDataPtr->totalCost, STR_CONV_MODE_LEFT_ALIGN, 6);
+
+                    if (gMartInfo.martType == MART_TYPE_1)
+                        StringExpandPlaceholders(gStringVar4, gText_Var1IsItThatllBeVar2);
+                    else
+                        StringExpandPlaceholders(gStringVar4, gText_YouWantedVar1ThatllBeVar2);
+                    BuyMenuDisplayMessage(taskId, gStringVar4, BuyMenuConfirmPurchase);
+                }
+            }
+            break;
+        }
+    }
+}
+
+static void Task_BuyHowManyDialogueInit(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    u16 quantityInBag = CountTotalItemQuantityInBag(tItemId);
+    u16 maxQuantity;
+
+    SetWindowBorderStyle(3, FALSE, 1, 13);
+    ConvertIntToDecimalStringN(gStringVar1, quantityInBag, STR_CONV_MODE_RIGHT_ALIGN, 4);
+    StringExpandPlaceholders(gStringVar4, gText_InBagVar1);
+    BuyMenuPrint(3, gStringVar4, 0, 1, 0, 0);
+    tItemCount = 1;
+    SetWindowBorderStyle(4, FALSE, 1, 13);
+    BuyMenuPrintItemQuantityAndPrice(taskId);
+    schedule_bg_copy_tilemap_to_vram(0);
+
+    maxQuantity = GetMoney(&gSaveBlock1Ptr->money) / gShopDataPtr->totalCost;
+
+    if (maxQuantity > 99)
+    {
+        gShopDataPtr->maxQuantity = 99;
+    }
+    else
+    {
+        gShopDataPtr->maxQuantity = maxQuantity;
+    }
+    
+    gTasks[taskId].func = Task_BuyHowManyDialogueHandleInput;
+}
+
+static void Task_BuyHowManyDialogueHandleInput(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (AdjustQuantityAccordingToDPadInput(&tItemCount, gShopDataPtr->maxQuantity) == TRUE)
+    {
+        gShopDataPtr->totalCost = (ItemId_GetPrice(tItemId) >> GetPriceReduction(1)) * tItemCount;
+        BuyMenuPrintItemQuantityAndPrice(taskId);
+    }
+    else
+    {
+        if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sub_8198070(4, 0);
+            sub_8198070(3, 0);
+            ClearWindowTilemap(4);
+            ClearWindowTilemap(3);
+            PutWindowTilemap(1);
+            CopyItemName(tItemId, gStringVar1);
+            ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, 2);
+            ConvertIntToDecimalStringN(gStringVar3, gShopDataPtr->totalCost, STR_CONV_MODE_LEFT_ALIGN, 6);
+            BuyMenuDisplayMessage(taskId, gText_Var1AndYouWantedVar2, BuyMenuConfirmPurchase);
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sub_8198070(4, 0);
+            sub_8198070(3, 0);
+            ClearWindowTilemap(4);
+            ClearWindowTilemap(3);
+            BuyMenuReturnToItemList(taskId);
+        }
+    }
+}
+
+static void BuyMenuConfirmPurchase(u8 taskId)
+{
+    CreateYesNoMenuWithCallbacks(taskId, &sShopBuyMenuYesNoWindowTemplates, 1, 0, 0, 1, 13, &sShopPurchaseYesNoFuncs);
+}
+
+static void BuyMenuTryMakePurchase(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    PutWindowTilemap(1);
+
+    if (gMartInfo.martType == MART_TYPE_0)
+    {
+        if (AddBagItem(tItemId, tItemCount) == TRUE)
+        {
+            BuyMenuDisplayMessage(taskId, gText_HereYouGoThankYou, BuyMenuSubtractMoney);
+            RecordItemPurchase(taskId);
+        }
+        else
+        {
+            BuyMenuDisplayMessage(taskId, gText_NoMoreRoomForThis, BuyMenuReturnToItemList);
+        }
+    }
+    else
+    {
+        if (DecorationAdd(tItemId))
+        {
+            if (gMartInfo.martType == MART_TYPE_1)
+            {
+                BuyMenuDisplayMessage(taskId, gText_ThankYouIllSendItHome, BuyMenuSubtractMoney);
+            }
+            else
+            {
+                BuyMenuDisplayMessage(taskId, gText_ThanksIllSendItHome, BuyMenuSubtractMoney);
             }
         }
+        else
+        {
+            BuyMenuDisplayMessage(taskId, gText_SpaceForVar1Full, BuyMenuReturnToItemList);
+        }
+    }
+}
+
+static void BuyMenuSubtractMoney(u8 taskId)
+{
+    IncrementGameStat(GAME_STAT_SHOPPED);
+    RemoveMoney(&gSaveBlock1Ptr->money, gShopDataPtr->totalCost);
+    PlaySE(SE_REGI);
+    PrintMoneyAmountInMoneyBox(0, GetMoney(&gSaveBlock1Ptr->money), 0);
+
+    if (gMartInfo.martType == MART_TYPE_0)
+    {
+        gTasks[taskId].func = Task_ReturnToItemListAfterItemPurchase;
+    }
+    else
+    {
+        gTasks[taskId].func = Task_ReturnToItemListAfterDecorationPurchase;
     }
 }
-#else
-NAKED
-void BuyMenuDrawMapBg(void)
-{
-    asm_unified("\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x4\n\
-    ldr r0, =gMapHeader\n\
-    ldr r0, [r0]\n\
-    mov r9, r0\n\
-    mov r4, sp\n\
-    adds r4, 0x2\n\
-    mov r0, sp\n\
-    adds r1, r4, 0\n\
-    bl GetXYCoordsOneStepInFrontOfPlayer\n\
-    mov r1, sp\n\
-    mov r0, sp\n\
-    ldrh r0, [r0]\n\
-    subs r0, 0x4\n\
-    strh r0, [r1]\n\
-    ldrh r0, [r4]\n\
-    subs r0, 0x4\n\
-    strh r0, [r4]\n\
-    movs r1, 0\n\
-    mov r10, r4\n\
-_080E05B6:\n\
-    movs r4, 0\n\
-    lsls r7, r1, 16\n\
-    asrs r0, r7, 16\n\
-    mov r8, r0\n\
-_080E05BE:\n\
-    mov r0, sp\n\
-    movs r1, 0\n\
-    ldrsh r0, [r0, r1]\n\
-    lsls r4, 16\n\
-    asrs r5, r4, 16\n\
-    adds r0, r5\n\
-    mov r2, r10\n\
-    movs r3, 0\n\
-    ldrsh r1, [r2, r3]\n\
-    add r1, r8\n\
-    bl MapGridGetMetatileIdAt\n\
-    lsls r0, 16\n\
-    lsrs r6, r0, 16\n\
-    adds r0, r5, 0\n\
-    mov r1, r8\n\
-    bl BuyMenuCheckForOverlapWithMenuBg\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    cmp r0, 0x1\n\
-    bne _080E0608\n\
-    mov r0, sp\n\
-    movs r1, 0\n\
-    ldrsh r0, [r0, r1]\n\
-    adds r0, r5\n\
-    mov r2, r10\n\
-    movs r3, 0\n\
-    ldrsh r1, [r2, r3]\n\
-    add r1, r8\n\
-    bl MapGridGetMetatileLayerTypeAt\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    b _080E060A\n\
-    .pool\n\
-_080E0608:\n\
-    movs r5, 0x1\n\
-_080E060A:\n\
-    ldr r0, =0x000001ff\n\
-    cmp r6, r0\n\
-    bhi _080E062C\n\
-    asrs r0, r4, 16\n\
-    mov r2, r9\n\
-    ldr r1, [r2, 0x10]\n\
-    lsls r3, r6, 4\n\
-    ldr r2, [r1, 0xC]\n\
-    adds r2, r3\n\
-    asrs r1, r7, 16\n\
-    adds r3, r5, 0\n\
-    bl BuyMenuDrawMapMetatile\n\
-    b _080E0644\n\
-    .pool\n\
-_080E062C:\n\
-    asrs r0, r4, 16\n\
-    mov r3, r9\n\
-    ldr r2, [r3, 0x14]\n\
-    ldr r3, =0xfffffe00\n\
-    adds r1, r6, r3\n\
-    lsls r1, 4\n\
-    ldr r2, [r2, 0xC]\n\
-    adds r2, r1\n\
-    asrs r1, r7, 16\n\
-    adds r3, r5, 0\n\
-    bl BuyMenuDrawMapMetatile\n\
-_080E0644:\n\
-    movs r1, 0x80\n\
-    lsls r1, 9\n\
-    adds r0, r4, r1\n\
-    lsrs r4, r0, 16\n\
-    asrs r0, 16\n\
-    cmp r0, 0xE\n\
-    ble _080E05BE\n\
-    adds r0, r7, r1\n\
-    lsrs r1, r0, 16\n\
-    asrs r0, 16\n\
-    cmp r0, 0x9\n\
-    ble _080E05B6\n\
-    add sp, 0x4\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\
-    .pool");
-}
-#endif // NONMATCHING
+
+static void Task_ReturnToItemListAfterItemPurchase(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    {
+        PlaySE(SE_SELECT);
+        if (tItemId == ITEM_POKE_BALL && tItemCount > 9 && AddBagItem(ITEM_PREMIER_BALL, 1) == TRUE)
+        {
+            BuyMenuDisplayMessage(taskId, gText_ThrowInPremierBall, BuyMenuReturnToItemList);
+        }
+        else
+        {
+            BuyMenuReturnToItemList(taskId);
+        }
+    }
+}
+
+static void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId)
+{
+    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    {
+        PlaySE(SE_SELECT);
+        BuyMenuReturnToItemList(taskId);
+    }
+}
+
+static void BuyMenuReturnToItemList(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    sub_8197DF8(5, 0);
+    BuyMenuPrintCursor(tListTaskId, 1);
+    PutWindowTilemap(1);
+    PutWindowTilemap(2);
+    schedule_bg_copy_tilemap_to_vram(0);
+    BuyMenuAddScrollIndicatorArrows();
+    gTasks[taskId].func = Task_BuyMenu;
+}
+
+static void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    FillWindowPixelBuffer(4, 0x11);
+    PrintMoneyAmount(4, 38, 1, gShopDataPtr->totalCost, TEXT_SPEED_FF);
+    ConvertIntToDecimalStringN(gStringVar1, tItemCount, 2, 2);
+    StringExpandPlaceholders(gStringVar4, gText_xVar1);
+    BuyMenuPrint(4, gStringVar4, 0, 1, 0, 0);
+}
+
+static void ExitBuyMenu(u8 taskId)
+{
+    gFieldCallback = MapPostLoadHook_ReturnToShopMenu;
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    gTasks[taskId].func = Task_ExitBuyMenu;
+}
+
+static void Task_ExitBuyMenu(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        RemoveMoneyLabelObject();
+        BuyMenuFreeMemory();
+        SetMainCallback2(CB2_ReturnToField);
+        DestroyTask(taskId);
+    }
+}
+
+static void ClearItemPurchases(void)
+{
+    gMartPurchaseHistoryId = 0;
+    memset(gMartPurchaseHistory, 0, sizeof(gMartPurchaseHistory));
+}
+
+static void RecordItemPurchase(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    u16 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (gMartPurchaseHistory[i].itemId == tItemId && gMartPurchaseHistory[i].quantity != 0)
+        {
+            if (gMartPurchaseHistory[i].quantity + tItemCount > 255)
+            {
+                gMartPurchaseHistory[i].quantity = 255;
+            }
+            else
+            {
+                gMartPurchaseHistory[i].quantity += tItemCount;
+            }
+            return;
+        }
+    }
+
+    if (gMartPurchaseHistoryId < 3)
+    {
+        gMartPurchaseHistory[gMartPurchaseHistoryId].itemId = tItemId;
+        gMartPurchaseHistory[gMartPurchaseHistoryId].quantity = tItemCount;
+        gMartPurchaseHistoryId++;
+    }
+}
+
+#undef tItemCount
+#undef tItemId
+#undef tListTaskId
+
+void CreatePokemartMenu(const u16 *itemsForSale)
+{
+    CreateShopMenu(MART_TYPE_0);
+    SetShopItemsForSale(itemsForSale);
+    ClearItemPurchases();
+    SetShopMenuCallback(EnableBothScriptContexts);
+}
+
+void CreateDecorationShop1Menu(const u16 *itemsForSale)
+{
+    CreateShopMenu(MART_TYPE_1);
+    SetShopItemsForSale(itemsForSale);
+    SetShopMenuCallback(EnableBothScriptContexts);
+}
+
+void CreateDecorationShop2Menu(const u16 *itemsForSale)
+{
+    CreateShopMenu(MART_TYPE_2);
+    SetShopItemsForSale(itemsForSale);
+    SetShopMenuCallback(EnableBothScriptContexts);
+}
diff --git a/src/slot_machine.c b/src/slot_machine.c
index ef52b7171..f92ebd168 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -25,8 +25,6 @@
 #include "bg.h"
 #include "window.h"
 
-extern u8 gOamLimit;
-
 // Text
 extern const u8 gText_YouDontHaveThreeCoins[];
 extern const u8 gText_QuitTheGame[];
diff --git a/src/sprite.c b/src/sprite.c
index c133dc73e..4087dd8c4 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -15,15 +15,15 @@
 
 #define ALLOC_SPRITE_TILE(n)                             \
 {                                                        \
-    gSpriteTileAllocBitmap[(n) / 8] |= (1 << ((n) % 8)); \
+    sSpriteTileAllocBitmap[(n) / 8] |= (1 << ((n) % 8)); \
 }
 
 #define FREE_SPRITE_TILE(n)                               \
 {                                                         \
-    gSpriteTileAllocBitmap[(n) / 8] &= ~(1 << ((n) % 8)); \
+    sSpriteTileAllocBitmap[(n) / 8] &= ~(1 << ((n) % 8)); \
 }
 
-#define SPRITE_TILE_IS_ALLOCATED(n) ((gSpriteTileAllocBitmap[(n) / 8] >> ((n) % 8)) & 1)
+#define SPRITE_TILE_IS_ALLOCATED(n) ((sSpriteTileAllocBitmap[(n) / 8] >> ((n) % 8)) & 1)
 
 
 struct SpriteCopyRequest
@@ -295,18 +295,18 @@ u32 gOamMatrixAllocBitmap;
 u8 gReservedSpritePaletteCount;
 
 EWRAM_DATA struct Sprite gSprites[MAX_SPRITES + 1] = {0};
-EWRAM_DATA u16 gSpritePriorities[MAX_SPRITES] = {0};
-EWRAM_DATA u8 gSpriteOrder[MAX_SPRITES] = {0};
-EWRAM_DATA bool8 gShouldProcessSpriteCopyRequests = 0;
-EWRAM_DATA u8 gSpriteCopyRequestCount = 0;
-EWRAM_DATA struct SpriteCopyRequest gSpriteCopyRequests[MAX_SPRITES] = {0};
+EWRAM_DATA static u16 sSpritePriorities[MAX_SPRITES] = {0};
+EWRAM_DATA static u8 sSpriteOrder[MAX_SPRITES] = {0};
+EWRAM_DATA static bool8 sShouldProcessSpriteCopyRequests = 0;
+EWRAM_DATA static u8 sSpriteCopyRequestCount = 0;
+EWRAM_DATA static struct SpriteCopyRequest sSpriteCopyRequests[MAX_SPRITES] = {0};
 EWRAM_DATA u8 gOamLimit = 0;
 EWRAM_DATA u16 gReservedSpriteTileCount = 0;
-EWRAM_DATA u8 gSpriteTileAllocBitmap[128] = {0};
+EWRAM_DATA static u8 sSpriteTileAllocBitmap[128] = {0};
 EWRAM_DATA s16 gSpriteCoordOffsetX = 0;
 EWRAM_DATA s16 gSpriteCoordOffsetY = 0;
 EWRAM_DATA struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT] = {0};
-EWRAM_DATA bool8 gAffineAnimsDisabled = 0;
+EWRAM_DATA bool8 gAffineAnimsDisabled = FALSE;
 
 void ResetSpriteData(void)
 {
@@ -350,7 +350,7 @@ void BuildOamBuffer(void)
     AddSpritesToOamBuffer();
     CopyMatricesToOamBuffer();
     gMain.oamLoadDisabled = temp;
-    gShouldProcessSpriteCopyRequests = TRUE;
+    sShouldProcessSpriteCopyRequests = TRUE;
 }
 
 void UpdateOamCoords(void)
@@ -382,7 +382,7 @@ void BuildSpritePriorities(void)
     {
         struct Sprite *sprite = &gSprites[i];
         u16 priority = sprite->subpriority | (sprite->oam.priority << 8);
-        gSpritePriorities[i] = priority;
+        sSpritePriorities[i] = priority;
     }
 }
 
@@ -392,10 +392,10 @@ void SortSprites(void)
     for (i = 1; i < MAX_SPRITES; i++)
     {
         u8 j = i;
-        struct Sprite *sprite1 = &gSprites[gSpriteOrder[i - 1]];
-        struct Sprite *sprite2 = &gSprites[gSpriteOrder[i]];
-        u16 sprite1Priority = gSpritePriorities[gSpriteOrder[i - 1]];
-        u16 sprite2Priority = gSpritePriorities[gSpriteOrder[i]];
+        struct Sprite *sprite1 = &gSprites[sSpriteOrder[i - 1]];
+        struct Sprite *sprite2 = &gSprites[sSpriteOrder[i]];
+        u16 sprite1Priority = sSpritePriorities[sSpriteOrder[i - 1]];
+        u16 sprite2Priority = sSpritePriorities[sSpriteOrder[i]];
         s16 sprite1Y = sprite1->oam.y;
         s16 sprite2Y = sprite2->oam.y;
 
@@ -431,20 +431,20 @@ void SortSprites(void)
             && ((sprite1Priority > sprite2Priority)
              || (sprite1Priority == sprite2Priority && sprite1Y < sprite2Y)))
         {
-            u8 temp = gSpriteOrder[j];
-            gSpriteOrder[j] = gSpriteOrder[j - 1];
-            gSpriteOrder[j - 1] = temp;
+            u8 temp = sSpriteOrder[j];
+            sSpriteOrder[j] = sSpriteOrder[j - 1];
+            sSpriteOrder[j - 1] = temp;
 
             // UB: If j equals 1, then j-- makes j equal 0.
-            // Then, gSpriteOrder[-1] gets accessed below.
+            // Then, sSpriteOrder[-1] gets accessed below.
             // Although this doesn't result in a bug in the ROM,
             // the behavior is undefined.
             j--;
 
-            sprite1 = &gSprites[gSpriteOrder[j - 1]];
-            sprite2 = &gSprites[gSpriteOrder[j]];
-            sprite1Priority = gSpritePriorities[gSpriteOrder[j - 1]];
-            sprite2Priority = gSpritePriorities[gSpriteOrder[j]];
+            sprite1 = &gSprites[sSpriteOrder[j - 1]];
+            sprite2 = &gSprites[sSpriteOrder[j]];
+            sprite1Priority = sSpritePriorities[sSpriteOrder[j - 1]];
+            sprite2Priority = sSpritePriorities[sSpriteOrder[j]];
             sprite1Y = sprite1->oam.y;
             sprite2Y = sprite2->oam.y;
 
@@ -499,7 +499,7 @@ void AddSpritesToOamBuffer(void)
 
     while (i < MAX_SPRITES)
     {
-        struct Sprite *sprite = &gSprites[gSpriteOrder[i]];
+        struct Sprite *sprite = &gSprites[sSpriteOrder[i]];
         if (sprite->inUse && !sprite->invisible && AddSpriteToOamBuffer(sprite, &oamIndex))
             return;
         i++;
@@ -664,14 +664,14 @@ void ClearSpriteCopyRequests(void)
 {
     u8 i;
 
-    gShouldProcessSpriteCopyRequests = FALSE;
-    gSpriteCopyRequestCount = 0;
+    sShouldProcessSpriteCopyRequests = FALSE;
+    sSpriteCopyRequestCount = 0;
 
     for (i = 0; i < MAX_SPRITE_COPY_REQUESTS; i++)
     {
-        gSpriteCopyRequests[i].src = 0;
-        gSpriteCopyRequests[i].dest = 0;
-        gSpriteCopyRequests[i].size = 0;
+        sSpriteCopyRequests[i].src = 0;
+        sSpriteCopyRequests[i].dest = 0;
+        sSpriteCopyRequests[i].size = 0;
     }
 }
 
@@ -779,17 +779,17 @@ u8 SpriteTileAllocBitmapOp(u16 bit, u8 op)
     if (op == 0)
     {
         val = ~(1 << val);
-        gSpriteTileAllocBitmap[index] &= val;
+        sSpriteTileAllocBitmap[index] &= val;
     }
     else if (op == 1)
     {
         val = (1 << val);
-        gSpriteTileAllocBitmap[index] |= val;
+        sSpriteTileAllocBitmap[index] |= val;
     }
     else
     {
         retVal = 1 << shift;
-        retVal &= gSpriteTileAllocBitmap[index];
+        retVal &= sSpriteTileAllocBitmap[index];
     }
 
     return retVal;
@@ -801,40 +801,40 @@ void SpriteCallbackDummy(struct Sprite *sprite)
 
 void ProcessSpriteCopyRequests(void)
 {
-    if (gShouldProcessSpriteCopyRequests)
+    if (sShouldProcessSpriteCopyRequests)
     {
         u8 i = 0;
 
-        while (gSpriteCopyRequestCount > 0)
+        while (sSpriteCopyRequestCount > 0)
         {
-            CpuCopy16(gSpriteCopyRequests[i].src, gSpriteCopyRequests[i].dest, gSpriteCopyRequests[i].size);
-            gSpriteCopyRequestCount--;
+            CpuCopy16(sSpriteCopyRequests[i].src, sSpriteCopyRequests[i].dest, sSpriteCopyRequests[i].size);
+            sSpriteCopyRequestCount--;
             i++;
         }
 
-        gShouldProcessSpriteCopyRequests = FALSE;
+        sShouldProcessSpriteCopyRequests = FALSE;
     }
 }
 
 void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFrameImage *images)
 {
-    if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS)
+    if (sSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS)
     {
-        gSpriteCopyRequests[gSpriteCopyRequestCount].src = images[index].data;
-        gSpriteCopyRequests[gSpriteCopyRequestCount].dest = (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileNum;
-        gSpriteCopyRequests[gSpriteCopyRequestCount].size = images[index].size;
-        gSpriteCopyRequestCount++;
+        sSpriteCopyRequests[sSpriteCopyRequestCount].src = images[index].data;
+        sSpriteCopyRequests[sSpriteCopyRequestCount].dest = (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileNum;
+        sSpriteCopyRequests[sSpriteCopyRequestCount].size = images[index].size;
+        sSpriteCopyRequestCount++;
     }
 }
 
 void RequestSpriteCopy(const u8 *src, u8 *dest, u16 size)
 {
-    if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS)
+    if (sSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS)
     {
-        gSpriteCopyRequests[gSpriteCopyRequestCount].src = src;
-        gSpriteCopyRequests[gSpriteCopyRequestCount].dest = dest;
-        gSpriteCopyRequests[gSpriteCopyRequestCount].size = size;
-        gSpriteCopyRequestCount++;
+        sSpriteCopyRequests[sSpriteCopyRequestCount].src = src;
+        sSpriteCopyRequests[sSpriteCopyRequestCount].dest = dest;
+        sSpriteCopyRequests[sSpriteCopyRequestCount].size = size;
+        sSpriteCopyRequestCount++;
     }
 }
 
@@ -869,7 +869,7 @@ void ResetAllSprites(void)
     for (i = 0; i < MAX_SPRITES; i++)
     {
         ResetSprite(&gSprites[i]);
-        gSpriteOrder[i] = i;
+        sSpriteOrder[i] = i;
     }
 
     ResetSprite(&gSprites[i]);
@@ -1414,7 +1414,7 @@ void ResetAffineAnimData(void)
 {
     u8 i;
 
-    gAffineAnimsDisabled = 0;
+    gAffineAnimsDisabled = FALSE;
     gOamMatrixAllocBitmap = 0;
 
     ResetOamMatrices();
diff --git a/src/strings.c b/src/strings.c
index cdbbb4468..15c247744 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -349,9 +349,9 @@ const u8 gText_Var1ThrownAway[] = _("The {STR_VAR_1}\nwas thrown away.");
 const u8 gText_Var1AteTheVar2[] = _("{STR_VAR_1} ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
 const u8 gText_Var1HappilyAteVar2[] = _("{STR_VAR_1} happily ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
 const u8 gText_Var1DisdainfullyAteVar2[] = _("{STR_VAR_1} disdainfully ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
-const u8 gUnknown_085E93C7[] = _("BUY");
-const u8 gUnknown_085E93CB[] = _("SELL");
-const u8 gUnknown_085E93D0[] = _("QUIT");
+const u8 gText_ShopBuy[] = _("BUY");
+const u8 gText_ShopSell[] = _("SELL");
+const u8 gText_ShopQuit[] = _("QUIT");
 const u8 gText_InBagVar1[] = _("IN BAG: {STR_VAR_1}");
 const u8 gText_QuitShopping[] = _("Quit shopping.");
 const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?");
diff --git a/src/text.c b/src/text.c
index ec0d26ab1..84964ffbf 100644
--- a/src/text.c
+++ b/src/text.c
@@ -9,11 +9,11 @@
 #include "window.h"
 #include "text.h"
 #include "blit.h"
+#include "dynamic_placeholder_text_util.h"
 
 extern u8 GetKeypadIconWidth(u8 keypadIconId);
 extern u16 Font6Func(struct TextPrinter *textPrinter);
 extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
-extern u8* DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 a1);
 extern int sub_8197964();
 
 EWRAM_DATA struct TextPrinter gTempTextPrinter = {0};
@@ -24,8 +24,6 @@ static u16 gLastTextBgColor;
 static u16 gLastTextFgColor;
 static u16 gLastTextShadowColor;
 
-extern struct MusicPlayerInfo gMPlayInfo_BGM;
-
 const struct FontInfo *gFonts;
 u8 gUnknown_03002F84;
 u8 gUnknown_03002F90[0x20];
@@ -3170,7 +3168,7 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32)
             return gGlyphWidthFuncs[i].func;
     }
 
-    return 0;
+    return NULL;
 }
 
 u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
@@ -3181,7 +3179,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
     s32 result;
     int localLetterSpacing;
     u32 lineWidth;
-    u8 *bufferPointer;
+    const u8 *bufferPointer;
     int glyphWidth;
     u32 width;
 
diff --git a/src/tv.c b/src/tv.c
index af1102c2d..fb309f6e3 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1580,7 +1580,7 @@ void SaveRecordedItemPurchasesForTVShow(void)
         if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE)
         {
             TV_SortPurchasesByQuantity();
-            if (gUnknown_02039F80[0].quantity >= 20)
+            if (gMartPurchaseHistory[0].quantity >= 20)
             {
                 show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
                 show->smartshopperShow.kind = TVSHOW_SMART_SHOPPER;
@@ -1588,8 +1588,8 @@ void SaveRecordedItemPurchasesForTVShow(void)
                 show->smartshopperShow.shopLocation = gMapHeader.regionMapSectionId;
                 for (i = 0; i < 3; i ++)
                 {
-                    show->smartshopperShow.itemIds[i] = gUnknown_02039F80[i].itemId;
-                    show->smartshopperShow.itemAmounts[i] = gUnknown_02039F80[i].quantity;
+                    show->smartshopperShow.itemIds[i] = gMartPurchaseHistory[i].itemId;
+                    show->smartshopperShow.itemAmounts[i] = gMartPurchaseHistory[i].quantity;
                 }
                 show->smartshopperShow.priceReduced = GetPriceReduction(1);
                 StringCopy(show->smartshopperShow.playerName, gSaveBlock2Ptr->playerName);
@@ -2992,14 +2992,14 @@ void TV_SortPurchasesByQuantity(void)
     {
         for (j = i + 1; j < 3; j ++)
         {
-            if (gUnknown_02039F80[i].quantity < gUnknown_02039F80[j].quantity)
-            {
-                tmpId = gUnknown_02039F80[i].itemId;
-                tmpQn = gUnknown_02039F80[i].quantity;
-                gUnknown_02039F80[i].itemId = gUnknown_02039F80[j].itemId;
-                gUnknown_02039F80[i].quantity = gUnknown_02039F80[j].quantity;
-                gUnknown_02039F80[j].itemId = tmpId;
-                gUnknown_02039F80[j].quantity = tmpQn;
+            if (gMartPurchaseHistory[i].quantity < gMartPurchaseHistory[j].quantity)
+            {
+                tmpId = gMartPurchaseHistory[i].itemId;
+                tmpQn = gMartPurchaseHistory[i].quantity;
+                gMartPurchaseHistory[i].itemId = gMartPurchaseHistory[j].itemId;
+                gMartPurchaseHistory[i].quantity = gMartPurchaseHistory[j].quantity;
+                gMartPurchaseHistory[j].itemId = tmpId;
+                gMartPurchaseHistory[j].quantity = tmpQn;
             }
         }
     }
diff --git a/src/window.c b/src/window.c
index 9a52a5a20..e93577e3a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -20,7 +20,7 @@ EWRAM_DATA static u16 sWindowSize = 0;
 static u8 GetNumActiveWindowsOnBg(u8 bgId);
 static u8 GetNumActiveWindowsOnBg8Bit(u8 bgId);
 
-static const struct WindowTemplate sDummyWindowTemplate = {0xFF, 0, 0, 0, 0, 0, 0};
+static const struct WindowTemplate sDummyWindowTemplate = DUMMY_WIN_TEMPLATE;
 
 static void nullsub_8(void)
 {
diff --git a/sym_common.txt b/sym_common.txt
index 282ef7f72..70c6e4871 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -26,9 +26,7 @@ gBGTilemapBuffers3: @ 3005DA4
     .include "overworld.o"
     .include "fieldmap.o"
     .include "field_camera.o"
-
-gSelectedEventObject: @ 3005DF0
-	.space 0x4
+    .include "field_control_avatar.o"
 
 gMenuCallback: @ 3005DF4
 	.space 0x4
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 8ac8871f8..415d3882f 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -209,23 +209,7 @@ gUnknown_020322D5: @ 20322D5
 	.include "src/overworld.o"
 	.include "src/fieldmap.o"
 	.include "src/field_camera.o"
-
-	.align 2
-gUnknown_0203734C: @ 203734C
-	.space 0x4
-
-gEventObjects: @ 2037350
-	.space 0x240
-
-gPlayerAvatar: @ 2037590
-	.space 0x14
-
-gUnknown_020375A4: @ 20375A4
-	.space 0x8
-
-gUnknown_020375AC: @ 20375AC
-	.space 0x8
-
+	.include "src/field_player_avatar.o"
     .include "src/event_object_movement.o"
     .include "src/field_message_box.o"
 
@@ -234,14 +218,7 @@ gUnknown_020375C0: @ 20375C0
 	.space 0x4
 
     .include "src/scrcmd.o"
-
-    .align 2
-gUnknown_020375D4: @ 20375D4
-	.space 0x2
-
-gUnknown_020375D6: @ 20375D6
-	.space 0x2
-
+    .include "src/field_control_avatar.o"
     .include "src/event_data.o"
     .include "src/start_menu.o"
 	.include "src/tileset_anims.o"
@@ -380,27 +357,10 @@ gUnknown_02039F5C: @ 2039F5C
 gUnknown_02039F5D: @ 2039F5D
 	.space 0x3
 
-gMartInfo: @ 2039F60
-	.space 0x10
-
-gShopDataPtr: @ 2039F70
-	.space 0x4
-
-gUnknown_02039F74: @ 2039F74
-	.space 0x4
-
-gUnknown_02039F78: @ 2039F78
-	.space 0x4
-
-gUnknown_02039F7C: @ 2039F7C
-	.space 0x4
-
-gUnknown_02039F80: @ 2039F80
-	.space 0xC
-
-gUnknown_02039F8C: @ 2039F8C
-	.space 0x4
+    .include "src/shop.o"
+    .include "src/fldeff_escalator.o"
 
+	.align 2
 gUnknown_02039F90: @ 2039F90
 	.space 0x4
 
diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile
index c10b258de..339585b92 100644
--- a/tools/gbagfx/Makefile
+++ b/tools/gbagfx/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 
-CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK
+CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK
 
 LIBS = -lpng -lz
 
diff --git a/tools/mid2agb/Makefile b/tools/mid2agb/Makefile
index 4dc2f123f..77f96db5a 100644
--- a/tools/mid2agb/Makefile
+++ b/tools/mid2agb/Makefile
@@ -1,6 +1,6 @@
 CXX := g++
 
-CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror
+CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror
 
 SRCS := agb.cpp error.cpp main.cpp midi.cpp tables.cpp