Merge pull request #130 from PikalaxALT/trainers

Trainers, event flags, mystery_event_msg, map object gfx
2019-10-23 09:05:26 -04:00
parent 4bc284ff2c 3efd2e1210
commit 6e36c22920
852 changed files with 41934 additions and 14224 deletions
@@ -595,7 +595,7 @@ sub_807FB08: @ 807FB08
 	ldr r0, _0807FB3C @ =sub_807FAF8
 	str r0, [r1, 0x8]
 	bl SavePlayerParty
-	bl sub_8159F40
+	bl InitPokedudePartyAndOpponent
 	bl GetWildBattleTransition
 	lsls r0, 24
 	lsrs r0, 24
@@ -2033,8 +2033,8 @@ sub_8080618: @ 8080618
 	bx r0
 	thumb_func_end sub_8080618

-	thumb_func_start sub_8080628
-sub_8080628: @ 8080628
+	thumb_func_start PlayTrainerEncounterMusic
+PlayTrainerEncounterMusic: @ 8080628
 	push {lr}
 	ldr r0, _08080660 @ =gUnknown_203ADFA
 	ldrb r0, [r0]
@@ -2083,15 +2083,18 @@ _08080670:
 	.4byte _080806AE
 	.4byte _080806AE
 _080806A8:
+	@ MUS_SHOUJO
 	movs r0, 0x8E
 	lsls r0, 1
 	b _080806BA
 _080806AE:
+	@ MUS_SHOUNEN
 	ldr r0, _080806B4 @ =0x0000011d
 	b _080806BA
 	.align 2, 0
 _080806B4: .4byte 0x0000011d
 _080806B8:
+	@ MUS_ROCKET
 	ldr r0, _080806C4 @ =0x0000011b
 _080806BA:
 	bl PlayNewMapMusic
@@ -2100,7 +2103,7 @@ _080806BE:
 	bx r0
 	.align 2, 0
 _080806C4: .4byte 0x0000011b
-	thumb_func_end sub_8080628
+	thumb_func_end PlayTrainerEncounterMusic

 	thumb_func_start sub_80806C8
 sub_80806C8: @ 80806C8
@@ -1,867 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start InitEventData
-InitEventData: @ 806E0D0
-	push {r4,lr}
-	ldr r4, _0806E108 @ =gSaveBlock1Ptr
-	ldr r0, [r4]
-	movs r1, 0xEE
-	lsls r1, 4
-	adds r0, r1
-	movs r2, 0x90
-	lsls r2, 1
-	movs r1, 0
-	bl memset
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 5
-	adds r0, r1
-	movs r2, 0x80
-	lsls r2, 2
-	movs r1, 0
-	bl memset
-	ldr r0, _0806E10C @ =gUnknown_20370E0
-	movs r1, 0
-	movs r2, 0x10
-	bl memset
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E108: .4byte gSaveBlock1Ptr
-_0806E10C: .4byte gUnknown_20370E0
-	thumb_func_end InitEventData
-
-	thumb_func_start sub_806E110
-sub_806E110: @ 806E110
-	push {lr}
-	ldr r0, _0806E150 @ =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0xEE
-	lsls r1, 4
-	adds r2, r0, r1
-	movs r1, 0
-	str r1, [r2]
-	movs r1, 0x80
-	lsls r1, 5
-	adds r0, r1
-	movs r1, 0
-	movs r2, 0x20
-	bl memset
-	ldr r0, _0806E154 @ =0x00000803
-	bl FlagClear
-	ldr r0, _0806E158 @ =0x00000804
-	bl FlagClear
-	ldr r0, _0806E15C @ =0x00000805
-	bl FlagClear
-	ldr r0, _0806E160 @ =0x00000807
-	bl FlagClear
-	ldr r0, _0806E164 @ =0x00000842
-	bl FlagClear
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E150: .4byte gSaveBlock1Ptr
-_0806E154: .4byte 0x00000803
-_0806E158: .4byte 0x00000804
-_0806E15C: .4byte 0x00000805
-_0806E160: .4byte 0x00000807
-_0806E164: .4byte 0x00000842
-	thumb_func_end sub_806E110
-
-	thumb_func_start sub_806E168
-sub_806E168: @ 806E168
-	push {lr}
-	ldr r0, _0806E184 @ =0x0000403c
-	bl GetVarPointer
-	ldr r1, _0806E188 @ =gSaveBlock2Ptr
-	ldr r2, [r1]
-	movs r1, 0
-	strb r1, [r2, 0x1A]
-	strh r1, [r0]
-	ldr r0, _0806E18C @ =0x00000838
-	bl FlagClear
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E184: .4byte 0x0000403c
-_0806E188: .4byte gSaveBlock2Ptr
-_0806E18C: .4byte 0x00000838
-	thumb_func_end sub_806E168
-
-	thumb_func_start sub_806E190
-sub_806E190: @ 806E190
-	push {lr}
-	ldr r0, _0806E1B0 @ =0x0000403c
-	bl GetVarPointer
-	ldr r1, _0806E1B4 @ =gSaveBlock2Ptr
-	ldr r2, [r1]
-	movs r1, 0xDA
-	strb r1, [r2, 0x1A]
-	ldr r2, _0806E1B8 @ =0x00000302
-	adds r1, r2, 0
-	strh r1, [r0]
-	ldr r0, _0806E1BC @ =0x00000838
-	bl FlagSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E1B0: .4byte 0x0000403c
-_0806E1B4: .4byte gSaveBlock2Ptr
-_0806E1B8: .4byte 0x00000302
-_0806E1BC: .4byte 0x00000838
-	thumb_func_end sub_806E190
-
-	thumb_func_start sub_806E1C0
-sub_806E1C0: @ 806E1C0
-	push {lr}
-	ldr r0, _0806E1EC @ =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x1A]
-	cmp r0, 0xDA
-	bne _0806E1FC
-	ldr r0, _0806E1F0 @ =0x0000403c
-	bl VarGet
-	lsls r0, 16
-	ldr r1, _0806E1F4 @ =0x03020000
-	cmp r0, r1
-	bne _0806E1FC
-	ldr r0, _0806E1F8 @ =0x00000838
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806E1FC
-	movs r0, 0x1
-	b _0806E1FE
-	.align 2, 0
-_0806E1EC: .4byte gSaveBlock2Ptr
-_0806E1F0: .4byte 0x0000403c
-_0806E1F4: .4byte 0x03020000
-_0806E1F8: .4byte 0x00000838
-_0806E1FC:
-	movs r0, 0
-_0806E1FE:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806E1C0
-
-	thumb_func_start sub_806E204
-sub_806E204: @ 806E204
-	push {lr}
-	ldr r0, _0806E224 @ =0x0000404e
-	bl GetVarPointer
-	ldr r1, _0806E228 @ =gSaveBlock2Ptr
-	ldr r2, [r1]
-	movs r1, 0
-	strb r1, [r2, 0x1B]
-	strh r1, [r0]
-	movs r0, 0x84
-	lsls r0, 4
-	bl FlagClear
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E224: .4byte 0x0000404e
-_0806E228: .4byte gSaveBlock2Ptr
-	thumb_func_end sub_806E204
-
-	thumb_func_start EnableNationalPokedex
-EnableNationalPokedex: @ 806E22C
-	push {lr}
-	ldr r0, _0806E250 @ =0x0000404e
-	bl GetVarPointer
-	ldr r1, _0806E254 @ =gSaveBlock2Ptr
-	ldr r2, [r1]
-	movs r1, 0xB9
-	strb r1, [r2, 0x1B]
-	ldr r2, _0806E258 @ =0x00006258
-	adds r1, r2, 0
-	strh r1, [r0]
-	movs r0, 0x84
-	lsls r0, 4
-	bl FlagSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E250: .4byte 0x0000404e
-_0806E254: .4byte gSaveBlock2Ptr
-_0806E258: .4byte 0x00006258
-	thumb_func_end EnableNationalPokedex
-
-	thumb_func_start IsNationalPokedexEnabled
-IsNationalPokedexEnabled: @ 806E25C
-	push {lr}
-	ldr r0, _0806E288 @ =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x1B]
-	cmp r0, 0xB9
-	bne _0806E294
-	ldr r0, _0806E28C @ =0x0000404e
-	bl VarGet
-	lsls r0, 16
-	ldr r1, _0806E290 @ =0x62580000
-	cmp r0, r1
-	bne _0806E294
-	movs r0, 0x84
-	lsls r0, 4
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806E294
-	movs r0, 0x1
-	b _0806E296
-	.align 2, 0
-_0806E288: .4byte gSaveBlock2Ptr
-_0806E28C: .4byte 0x0000404e
-_0806E290: .4byte 0x62580000
-_0806E294:
-	movs r0, 0
-_0806E296:
-	pop {r1}
-	bx r1
-	thumb_func_end IsNationalPokedexEnabled
-
-	thumb_func_start sub_806E29C
-sub_806E29C: @ 806E29C
-	push {lr}
-	ldr r0, _0806E2A8 @ =0x00000839
-	bl FlagClear
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E2A8: .4byte 0x00000839
-	thumb_func_end sub_806E29C
-
-	thumb_func_start sub_806E2AC
-sub_806E2AC: @ 806E2AC
-	push {lr}
-	ldr r0, _0806E2B8 @ =0x00000839
-	bl FlagSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E2B8: .4byte 0x00000839
-	thumb_func_end sub_806E2AC
-
-	thumb_func_start Flag_0x839_IsSet
-Flag_0x839_IsSet: @ 806E2BC
-	push {lr}
-	ldr r0, _0806E2CC @ =0x00000839
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0806E2CC: .4byte 0x00000839
-	thumb_func_end Flag_0x839_IsSet
-
-	thumb_func_start sub_806E2D0
-sub_806E2D0: @ 806E2D0
-	push {lr}
-	movs r0, 0xF6
-	lsls r0, 2
-	bl FlagClear
-	ldr r0, _0806E340 @ =0x000003d9
-	bl FlagClear
-	ldr r0, _0806E344 @ =0x000003da
-	bl FlagClear
-	ldr r0, _0806E348 @ =0x000003db
-	bl FlagClear
-	movs r0, 0xF7
-	lsls r0, 2
-	bl FlagClear
-	ldr r0, _0806E34C @ =0x000003dd
-	bl FlagClear
-	ldr r0, _0806E350 @ =0x000003de
-	bl FlagClear
-	ldr r0, _0806E354 @ =0x000003df
-	bl FlagClear
-	movs r0, 0xF8
-	lsls r0, 2
-	bl FlagClear
-	ldr r0, _0806E358 @ =0x000003e1
-	bl FlagClear
-	ldr r0, _0806E35C @ =0x000003e2
-	bl FlagClear
-	ldr r0, _0806E360 @ =0x000003e3
-	bl FlagClear
-	movs r0, 0xF9
-	lsls r0, 2
-	bl FlagClear
-	ldr r0, _0806E364 @ =0x000003e5
-	bl FlagClear
-	ldr r0, _0806E368 @ =0x000003e6
-	bl FlagClear
-	ldr r0, _0806E36C @ =0x000003e7
-	bl FlagClear
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E340: .4byte 0x000003d9
-_0806E344: .4byte 0x000003da
-_0806E348: .4byte 0x000003db
-_0806E34C: .4byte 0x000003dd
-_0806E350: .4byte 0x000003de
-_0806E354: .4byte 0x000003df
-_0806E358: .4byte 0x000003e1
-_0806E35C: .4byte 0x000003e2
-_0806E360: .4byte 0x000003e3
-_0806E364: .4byte 0x000003e5
-_0806E368: .4byte 0x000003e6
-_0806E36C: .4byte 0x000003e7
-	thumb_func_end sub_806E2D0
-
-	thumb_func_start sub_806E370
-sub_806E370: @ 806E370
-	push {lr}
-	ldr r0, _0806E3C0 @ =0x000040b5
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3C4 @ =0x000040b6
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3C8 @ =0x000040b7
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3CC @ =0x000040b8
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3D0 @ =0x000040b9
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3D4 @ =0x000040ba
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3D8 @ =0x000040bb
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3DC @ =0x000040bc
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3E0 @ =0x00004024
-	movs r1, 0
-	bl VarSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E3C0: .4byte 0x000040b5
-_0806E3C4: .4byte 0x000040b6
-_0806E3C8: .4byte 0x000040b7
-_0806E3CC: .4byte 0x000040b8
-_0806E3D0: .4byte 0x000040b9
-_0806E3D4: .4byte 0x000040ba
-_0806E3D8: .4byte 0x000040bb
-_0806E3DC: .4byte 0x000040bc
-_0806E3E0: .4byte 0x00004024
-	thumb_func_end sub_806E370
-
-	thumb_func_start DisableResetRTC
-DisableResetRTC: @ 806E3E4
-	push {lr}
-	ldr r0, _0806E3F8 @ =0x00004032
-	movs r1, 0
-	bl VarSet
-	ldr r0, _0806E3FC @ =0x00000837
-	bl FlagClear
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E3F8: .4byte 0x00004032
-_0806E3FC: .4byte 0x00000837
-	thumb_func_end DisableResetRTC
-
-	thumb_func_start EnableResetRTC
-EnableResetRTC: @ 806E400
-	push {lr}
-	ldr r0, _0806E418 @ =0x00004032
-	movs r1, 0x92
-	lsls r1, 4
-	bl VarSet
-	ldr r0, _0806E41C @ =0x00000837
-	bl FlagSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E418: .4byte 0x00004032
-_0806E41C: .4byte 0x00000837
-	thumb_func_end EnableResetRTC
-
-	thumb_func_start CanResetRTC
-CanResetRTC: @ 806E420
-	push {lr}
-	ldr r0, _0806E444 @ =0x00000837
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806E44C
-	ldr r0, _0806E448 @ =0x00004032
-	bl VarGet
-	lsls r0, 16
-	movs r1, 0x92
-	lsls r1, 20
-	cmp r0, r1
-	bne _0806E44C
-	movs r0, 0x1
-	b _0806E44E
-	.align 2, 0
-_0806E444: .4byte 0x00000837
-_0806E448: .4byte 0x00004032
-_0806E44C:
-	movs r0, 0
-_0806E44E:
-	pop {r1}
-	bx r1
-	thumb_func_end CanResetRTC
-
-	thumb_func_start GetVarPointer
-GetVarPointer: @ 806E454
-	push {r4-r6,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r6, r4, 0
-	ldr r0, _0806E468 @ =0x00003fff
-	cmp r4, r0
-	bhi _0806E46C
-	movs r0, 0
-	b _0806E518
-	.align 2, 0
-_0806E468: .4byte 0x00003fff
-_0806E46C:
-	lsls r0, r4, 16
-	cmp r0, 0
-	blt _0806E50C
-	ldr r0, _0806E484 @ =gUnknown_3005E88
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0806E488
-	cmp r0, 0x1
-	ble _0806E4EE
-	cmp r0, 0x2
-	beq _0806E4B8
-	b _0806E4EE
-	.align 2, 0
-_0806E484: .4byte gUnknown_3005E88
-_0806E488:
-	movs r0, 0
-	adds r1, r4, 0
-	bl sub_8112D40
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _0806E4EE
-	ldr r0, _0806E4B0 @ =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r3, _0806E4B4 @ =0xffffc000
-	adds r0, r4, r3
-	lsls r0, 1
-	movs r3, 0x80
-	lsls r3, 5
-	adds r1, r3
-	adds r1, r0
-	ldrh r0, [r2]
-	strh r0, [r1]
-	b _0806E4EE
-	.align 2, 0
-_0806E4B0: .4byte gSaveBlock1Ptr
-_0806E4B4: .4byte 0xffffc000
-_0806E4B8:
-	ldr r0, _0806E4FC @ =0xffffc000
-	adds r5, r4, r0
-	lsls r0, r5, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	bl sub_806E528
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0806E4EE
-	ldr r0, _0806E500 @ =gUnknown_300507C
-	strh r5, [r0]
-	ldr r0, _0806E504 @ =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, _0806E4FC @ =0xffffc000
-	adds r0, r4, r2
-	lsls r0, 1
-	movs r3, 0x80
-	lsls r3, 5
-	adds r1, r3
-	adds r1, r0
-	ldrh r2, [r1]
-	movs r0, 0
-	adds r1, r4, 0
-	bl sub_8112DB0
-_0806E4EE:
-	ldr r0, _0806E504 @ =gSaveBlock1Ptr
-	lsls r1, r6, 1
-	ldr r2, _0806E508 @ =0xffff9000
-	adds r1, r2
-	ldr r0, [r0]
-	adds r0, r1
-	b _0806E518
-	.align 2, 0
-_0806E4FC: .4byte 0xffffc000
-_0806E500: .4byte gUnknown_300507C
-_0806E504: .4byte gSaveBlock1Ptr
-_0806E508: .4byte 0xffff9000
-_0806E50C:
-	ldr r0, _0806E520 @ =gSpecialVars
-	ldr r3, _0806E524 @ =0xffff8000
-	adds r1, r6, r3
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, [r1]
-_0806E518:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0806E520: .4byte gSpecialVars
-_0806E524: .4byte 0xffff8000
-	thumb_func_end GetVarPointer
-
-	thumb_func_start sub_806E528
-sub_806E528: @ 806E528
-	push {lr}
-	lsls r0, 16
-	lsrs r2, r0, 16
-	adds r0, r2, 0
-	lsls r1, 24
-	cmp r1, 0
-	bne _0806E554
-	ldr r0, _0806E54C @ =0x0000022f
-	cmp r2, r0
-	bls _0806E548
-	ldr r1, _0806E550 @ =0xfffff800
-	adds r0, r2, r1
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1F
-	bhi _0806E562
-_0806E548:
-	movs r0, 0
-	b _0806E564
-	.align 2, 0
-_0806E54C: .4byte 0x0000022f
-_0806E550: .4byte 0xfffff800
-_0806E554:
-	cmp r2, 0x2F
-	bls _0806E548
-	subs r0, 0x50
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x63
-	bls _0806E548
-_0806E562:
-	movs r0, 0x1
-_0806E564:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806E528
-
-	thumb_func_start VarGet
-VarGet: @ 806E568
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	bl GetVarPointer
-	cmp r0, 0
-	beq _0806E57C
-	ldrh r0, [r0]
-	b _0806E57E
-_0806E57C:
-	adds r0, r4, 0
-_0806E57E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end VarGet
-
-	thumb_func_start VarSet
-VarSet: @ 806E584
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 16
-	lsrs r4, r1, 16
-	bl GetVarPointer
-	cmp r0, 0
-	beq _0806E59C
-	strh r4, [r0]
-	movs r0, 0x1
-	b _0806E59E
-_0806E59C:
-	movs r0, 0
-_0806E59E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end VarSet
-
-	thumb_func_start VarGetFieldObjectGraphicsId
-VarGetFieldObjectGraphicsId: @ 806E5A4
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 8
-	ldr r1, _0806E5BC @ =0x40100000
-	adds r0, r1
-	lsrs r0, 16
-	bl VarGet
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0806E5BC: .4byte 0x40100000
-	thumb_func_end VarGetFieldObjectGraphicsId
-
-	thumb_func_start sub_806E5C0
-sub_806E5C0: @ 806E5C0
-	push {r4-r6,lr}
-	lsls r5, r0, 16
-	lsrs r4, r5, 16
-	adds r6, r4, 0
-	cmp r4, 0
-	bne _0806E5D0
-	movs r0, 0
-	b _0806E66E
-_0806E5D0:
-	ldr r0, _0806E5E8 @ =0x00003fff
-	cmp r4, r0
-	bhi _0806E65C
-	ldr r0, _0806E5EC @ =gUnknown_3005E88
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0806E5F0
-	cmp r0, 0x1
-	ble _0806E644
-	cmp r0, 0x2
-	beq _0806E618
-	b _0806E644
-	.align 2, 0
-_0806E5E8: .4byte 0x00003fff
-_0806E5EC: .4byte gUnknown_3005E88
-_0806E5F0:
-	movs r0, 0x1
-	adds r1, r4, 0
-	bl sub_8112D40
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _0806E644
-	ldr r0, _0806E614 @ =gSaveBlock1Ptr
-	ldr r0, [r0]
-	lsrs r1, r5, 19
-	movs r3, 0xEE
-	lsls r3, 4
-	adds r0, r3
-	adds r0, r1
-	ldrb r1, [r2]
-	strb r1, [r0]
-	b _0806E644
-	.align 2, 0
-_0806E614: .4byte gSaveBlock1Ptr
-_0806E618:
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_806E528
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0806E644
-	ldr r0, _0806E654 @ =gUnknown_300507C
-	strh r4, [r0]
-	ldr r0, _0806E658 @ =gSaveBlock1Ptr
-	ldr r0, [r0]
-	lsrs r1, r5, 19
-	movs r2, 0xEE
-	lsls r2, 4
-	adds r0, r2
-	adds r0, r1
-	ldrb r2, [r0]
-	movs r0, 0x1
-	adds r1, r4, 0
-	bl sub_8112DB0
-_0806E644:
-	ldr r0, _0806E658 @ =gSaveBlock1Ptr
-	lsrs r1, r6, 3
-	movs r3, 0xEE
-	lsls r3, 4
-	adds r1, r3
-	ldr r0, [r0]
-	b _0806E66C
-	.align 2, 0
-_0806E654: .4byte gUnknown_300507C
-_0806E658: .4byte gSaveBlock1Ptr
-_0806E65C:
-	ldr r1, _0806E674 @ =0xffffc000
-	adds r0, r6, r1
-	cmp r0, 0
-	bge _0806E668
-	ldr r2, _0806E678 @ =0xffffc007
-	adds r0, r6, r2
-_0806E668:
-	asrs r0, 3
-	ldr r1, _0806E67C @ =gUnknown_20370E0
-_0806E66C:
-	adds r0, r1
-_0806E66E:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0806E674: .4byte 0xffffc000
-_0806E678: .4byte 0xffffc007
-_0806E67C: .4byte gUnknown_20370E0
-	thumb_func_end sub_806E5C0
-
-	thumb_func_start FlagSet
-FlagSet: @ 806E680
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	bl sub_806E5C0
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _0806E6A0
-	movs r0, 0x7
-	ands r0, r4
-	movs r1, 0x1
-	lsls r1, r0
-	ldrb r0, [r2]
-	orrs r1, r0
-	strb r1, [r2]
-_0806E6A0:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end FlagSet
-
-	thumb_func_start FlagClear
-FlagClear: @ 806E6A8
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	bl sub_806E5C0
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _0806E6C8
-	movs r0, 0x7
-	ands r0, r4
-	movs r1, 0x1
-	lsls r1, r0
-	ldrb r0, [r2]
-	bics r0, r1
-	strb r0, [r2]
-_0806E6C8:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end FlagClear
-
-	thumb_func_start FlagGet
-FlagGet: @ 806E6D0
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	bl sub_806E5C0
-	cmp r0, 0
-	beq _0806E6F4
-	ldrb r0, [r0]
-	movs r1, 0x7
-	ands r1, r4
-	asrs r0, r1
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0806E6F4
-	movs r0, 0x1
-	b _0806E6F6
-_0806E6F4:
-	movs r0, 0
-_0806E6F6:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end FlagGet
-
-	thumb_func_start sub_806E6FC
-sub_806E6FC: @ 806E6FC
-	ldr r1, _0806E754 @ =gSpecialVar_0x8000
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, _0806E758 @ =gSpecialVar_0x8001
-	strh r0, [r1]
-	ldr r1, _0806E75C @ =gSpecialVar_0x8002
-	strh r0, [r1]
-	ldr r1, _0806E760 @ =gSpecialVar_0x8003
-	strh r0, [r1]
-	ldr r1, _0806E764 @ =gSpecialVar_0x8004
-	strh r0, [r1]
-	ldr r1, _0806E768 @ =gSpecialVar_0x8005
-	strh r0, [r1]
-	ldr r1, _0806E76C @ =gSpecialVar_0x8006
-	strh r0, [r1]
-	ldr r1, _0806E770 @ =gSpecialVar_0x8007
-	strh r0, [r1]
-	ldr r1, _0806E774 @ =gSpecialVar_0x8008
-	strh r0, [r1]
-	ldr r1, _0806E778 @ =gSpecialVar_0x8009
-	strh r0, [r1]
-	ldr r1, _0806E77C @ =gSpecialVar_0x800A
-	strh r0, [r1]
-	ldr r1, _0806E780 @ =gSpecialVar_0x800B
-	strh r0, [r1]
-	ldr r1, _0806E784 @ =gSpecialVar_Facing
-	strh r0, [r1]
-	ldr r1, _0806E788 @ =gSpecialVar_Result
-	strh r0, [r1]
-	ldr r1, _0806E78C @ =gSpecialVar_ItemId
-	strh r0, [r1]
-	ldr r1, _0806E790 @ =gSpecialVar_LastTalked
-	strh r0, [r1]
-	ldr r1, _0806E794 @ =gSpecialVar_MonBoxId
-	strh r0, [r1]
-	ldr r1, _0806E798 @ =gSpecialVar_MonBoxPos
-	strh r0, [r1]
-	ldr r1, _0806E79C @ =gUnknown_20370DA
-	strh r0, [r1]
-	ldr r1, _0806E7A0 @ =gUnknown_20370DC
-	strh r0, [r1]
-	ldr r1, _0806E7A4 @ =gUnknown_20370DE
-	strh r0, [r1]
-	bx lr
-	.align 2, 0
-_0806E754: .4byte gSpecialVar_0x8000
-_0806E758: .4byte gSpecialVar_0x8001
-_0806E75C: .4byte gSpecialVar_0x8002
-_0806E760: .4byte gSpecialVar_0x8003
-_0806E764: .4byte gSpecialVar_0x8004
-_0806E768: .4byte gSpecialVar_0x8005
-_0806E76C: .4byte gSpecialVar_0x8006
-_0806E770: .4byte gSpecialVar_0x8007
-_0806E774: .4byte gSpecialVar_0x8008
-_0806E778: .4byte gSpecialVar_0x8009
-_0806E77C: .4byte gSpecialVar_0x800A
-_0806E780: .4byte gSpecialVar_0x800B
-_0806E784: .4byte gSpecialVar_Facing
-_0806E788: .4byte gSpecialVar_Result
-_0806E78C: .4byte gSpecialVar_ItemId
-_0806E790: .4byte gSpecialVar_LastTalked
-_0806E794: .4byte gSpecialVar_MonBoxId
-_0806E798: .4byte gSpecialVar_MonBoxPos
-_0806E79C: .4byte gUnknown_20370DA
-_0806E7A0: .4byte gUnknown_20370DC
-_0806E7A4: .4byte gUnknown_20370DE
-	thumb_func_end sub_806E6FC
-
-	.align 2, 0 @ Don't pad with nop.
@@ -364,8 +364,8 @@ sub_806CAC8: @ 806CAC8
 	beq _0806CB74
 	movs r0, 0x5
 	bl IncrementGameStat
-	bl sub_8146CA4
-	bl sub_815D8C8
+	bl MENewsJisanStepCounter
+	bl IncrementRenewableHiddenItemStepCounter
 	bl sub_80CC918
 	bl sub_80CB054
 	bl sub_80CCFBC
@@ -1822,11 +1822,11 @@ _0806D6EC:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D704
-	ldr r0, _0806D700 @ =gUnknown_81A8DFD
+	ldr r0, _0806D700 @ =EventScript_PoisonWhiteOut
 	bl ScriptContext1_SetupScript
 	b _0806D730
 	.align 2, 0
-_0806D700: .4byte gUnknown_81A8DFD
+_0806D700: .4byte EventScript_PoisonWhiteOut
 _0806D704:
 	bl ShouldEggHatch
 	lsls r0, 24
@@ -2774,14 +2774,14 @@ _0805F2E0:
 	bls _0805F2E6
 	movs r1, 0x10
 _0805F2E6:
-	ldr r0, _0805F2F4 @ =gUnknown_839FDB0
+	ldr r0, _0805F2F4 @ =gMapObjectGraphicsInfoPointers
 	lsls r1, 2
 	adds r1, r0
 	ldr r0, [r1]
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0805F2F4: .4byte gUnknown_839FDB0
+_0805F2F4: .4byte gMapObjectGraphicsInfoPointers
 	thumb_func_end GetFieldObjectGraphicsInfo

 	thumb_func_start FieldObjectHandleDynamicGraphicsId
@@ -985,25 +985,25 @@ _0807F5B6:
 	bne _0807F5E4
 	adds r0, r6, 0
 	bl DestroyTask
-	ldr r0, _0807F5CC @ =gUnknown_81A8D97
+	ldr r0, _0807F5CC @ =EventScript_AfterWhiteOutHeal
 	bl ScriptContext1_SetupScript
 	b _0807F5E4
 	.align 2, 0
-_0807F5CC: .4byte gUnknown_81A8D97
+_0807F5CC: .4byte EventScript_AfterWhiteOutHeal
 _0807F5D0:
 	bl sub_807E418
 	cmp r0, 0x1
 	bne _0807F5E4
 	adds r0, r6, 0
 	bl DestroyTask
-	ldr r0, _0807F5EC @ =gUnknown_81A8DD8
+	ldr r0, _0807F5EC @ =EventScript_MomHeal
 	bl ScriptContext1_SetupScript
 _0807F5E4:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0807F5EC: .4byte gUnknown_81A8DD8
+_0807F5EC: .4byte EventScript_MomHeal
 	thumb_func_end sub_807F45C

 	thumb_func_start sub_807F5F0
@@ -176,14 +176,14 @@ _080CA744: .4byte gStringVar1
 _080CA748: .4byte gUnknown_8417FCC
 	thumb_func_end sub_80CA714

-	thumb_func_start sub_80CA74C
-sub_80CA74C: @ 80CA74C
+	thumb_func_start Special_GetBattleOutcome
+Special_GetBattleOutcome: @ 80CA74C
 	ldr r0, _080CA754 @ =gBattleOutcome
 	ldrb r0, [r0]
 	bx lr
 	.align 2, 0
 _080CA754: .4byte gBattleOutcome
-	thumb_func_end sub_80CA74C
+	thumb_func_end Special_GetBattleOutcome

 	thumb_func_start Special_SetHiddenItemFlag
 Special_SetHiddenItemFlag: @ 80CA758
@@ -581,8 +581,8 @@ _080CAA2C: .4byte 0x0000028f
 _080CAA30: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_80CA9A8

-	thumb_func_start SpawnScriptFieldObject
-SpawnScriptFieldObject: @ 80CAA34
+	thumb_func_start SpawnCameraObject
+SpawnCameraObject: @ 80CAA34
 	push {lr}
 	sub sp, 0x8
 	ldr r0, _080CAA80 @ =gSaveBlock1Ptr
@@ -621,10 +621,10 @@ SpawnScriptFieldObject: @ 80CAA34
 	.align 2, 0
 _080CAA80: .4byte gSaveBlock1Ptr
 _080CAA84: .4byte gMapObjects
-	thumb_func_end SpawnScriptFieldObject
+	thumb_func_end SpawnCameraObject

-	thumb_func_start RemoveScriptFieldObject
-RemoveScriptFieldObject: @ 80CAA88
+	thumb_func_start RemoveCameraObject
+RemoveCameraObject: @ 80CAA88
 	push {lr}
 	bl GetPlayerAvatarObjectId
 	lsls r0, 24
@@ -640,7 +640,7 @@ RemoveScriptFieldObject: @ 80CAA88
 	bx r0
 	.align 2, 0
 _080CAAA8: .4byte gSaveBlock1Ptr
-	thumb_func_end RemoveScriptFieldObject
+	thumb_func_end RemoveCameraObject

 	thumb_func_start sub_80CAAAC
 sub_80CAAAC: @ 80CAAAC
@@ -1081,8 +1081,8 @@ sub_80CADC4: @ 80CADC4
 	bx r0
 	thumb_func_end sub_80CADC4

-	thumb_func_start sub_80CADEC
-sub_80CADEC: @ 80CADEC
+	thumb_func_start Special_SetVermilionTrashCans
+Special_SetVermilionTrashCans: @ 80CADEC
 	push {r4,r5,lr}
 	bl Random
 	lsls r0, 16
@@ -1377,7 +1377,7 @@ _080CB04C:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80CADEC
+	thumb_func_end Special_SetVermilionTrashCans

 	thumb_func_start sub_80CB054
 sub_80CB054: @ 80CB054
@@ -1591,8 +1591,8 @@ _080CB1FE:
 	bx r1
 	thumb_func_end Special_CheckAddCoins

-	thumb_func_start sub_80CB204
-sub_80CB204: @ 80CB204
+	thumb_func_start Special_GetElevatorFloor
+Special_GetElevatorFloor: @ 80CB204
 	push {r4,lr}
 	movs r3, 0x4
 	ldr r0, _080CB22C @ =gSaveBlock1Ptr
@@ -1742,7 +1742,7 @@ _080CB314:
 	bx r0
 	.align 2, 0
 _080CB324: .4byte 0x0000403a
-	thumb_func_end sub_80CB204
+	thumb_func_end Special_GetElevatorFloor

 	thumb_func_start sub_80CB328
 sub_80CB328: @ 80CB328
@@ -3142,19 +3142,19 @@ sub_80CBDE8: @ 80CBDE8
 	ldr r1, _080CBDF8 @ =gSelectedEventObject
 	movs r0, 0
 	strb r0, [r1]
-	ldr r1, _080CBDFC @ =gUnknown_20370DA
+	ldr r1, _080CBDFC @ =gSpecialVar_TextColor
 	movs r0, 0xFF
 	strh r0, [r1]
 	bx lr
 	.align 2, 0
 _080CBDF8: .4byte gSelectedEventObject
-_080CBDFC: .4byte gUnknown_20370DA
+_080CBDFC: .4byte gSpecialVar_TextColor
 	thumb_func_end sub_80CBDE8

 	thumb_func_start ContextNpcGetTextColor
 ContextNpcGetTextColor: @ 80CBE00
 	push {lr}
-	ldr r0, _080CBE18 @ =gUnknown_20370DA
+	ldr r0, _080CBE18 @ =gSpecialVar_TextColor
 	ldrh r0, [r0]
 	cmp r0, 0xFF
 	bne _080CBE44
@@ -3165,7 +3165,7 @@ ContextNpcGetTextColor: @ 80CBE00
 	movs r0, 0x3
 	b _080CBE48
 	.align 2, 0
-_080CBE18: .4byte gUnknown_20370DA
+_080CBE18: .4byte gSpecialVar_TextColor
 _080CBE1C: .4byte gSelectedEventObject
 _080CBE20:
 	ldr r2, _080CBE4C @ =gMapObjects
@@ -4329,8 +4329,8 @@ _080CC728: .4byte 0x00000808
 _080CC72C: .4byte 0x0000404d
 	thumb_func_end sub_80CC59C

-	thumb_func_start sub_80CC730
-sub_80CC730: @ 80CC730
+	thumb_func_start Special_BattleCardAction
+Special_BattleCardAction: @ 80CC730
 	push {lr}
 	ldr r0, _080CC744 @ =gSpecialVar_Result
 	ldrh r0, [r0]
@@ -4371,6 +4371,7 @@ _080CC772:
 	lsrs r0, 16
 	b _080CC78A
 _080CC77C:
+	@ AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c", 3873)
 	ldr r0, _080CC790 @ =gUnknown_83F5EF0	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c"
 	ldr r1, _080CC794 @ =0x00000f21
 	ldr r2, _080CC798 @ =gUnknown_83F5F24	"0"
@@ -4384,7 +4385,7 @@ _080CC78A:
 _080CC790: .4byte gUnknown_83F5EF0
 _080CC794: .4byte 0x00000f21
 _080CC798: .4byte gUnknown_83F5F24
-	thumb_func_end sub_80CC730
+	thumb_func_end Special_BattleCardAction

 	thumb_func_start set_unknown_box_id
 set_unknown_box_id: @ 80CC79C
@@ -4610,8 +4611,8 @@ _080CC940: .4byte 0x00004025
 _080CC944: .4byte 0x000001f3
 	thumb_func_end sub_80CC918

-	thumb_func_start sub_80CC948
-sub_80CC948: @ 80CC948
+	thumb_func_start Special_DaisyMassageServices
+Special_DaisyMassageServices: @ 80CC948
 	push {lr}
 	ldr r0, _080CC968 @ =gSpecialVar_0x8004
 	ldrh r1, [r0]
@@ -4630,7 +4631,7 @@ sub_80CC948: @ 80CC948
 _080CC968: .4byte gSpecialVar_0x8004
 _080CC96C: .4byte gPlayerParty
 _080CC970: .4byte 0x00004025
-	thumb_func_end sub_80CC948
+	thumb_func_end Special_DaisyMassageServices

 	thumb_func_start sub_80CC974
 sub_80CC974: @ 80CC974
@@ -4952,7 +4953,7 @@ _080CCBEA:
 	cmp r7, 0
 	bne _080CCC34
 	ldr r0, _080CCC24 @ =gStringVar2
-	ldr r1, _080CCC28 @ =gUnknown_82481BE
+	ldr r1, _080CCC28 @ =gMoveNames + 0x112A FRENZY PLANT
 	bl StringCopy
 	ldr r1, _080CCC2C @ =gSpecialVar_0x8005
 	movs r0, 0xF
@@ -4963,14 +4964,14 @@ _080CCBEA:
 _080CCC1C: .4byte gUnknown_83F6203
 _080CCC20: .4byte gPlayerParty
 _080CCC24: .4byte gStringVar2
-_080CCC28: .4byte gUnknown_82481BE
+_080CCC28: .4byte gMoveNames + 0x112A
 _080CCC2C: .4byte gSpecialVar_0x8005
 _080CCC30: .4byte 0x000002de
 _080CCC34:
 	cmp r7, 0x1
 	bne _080CCC5C
 	ldr r0, _080CCC4C @ =gStringVar2
-	ldr r1, _080CCC50 @ =gUnknown_824802B
+	ldr r1, _080CCC50 @ =gMoveNames + 0xF97 BLAST BURN
 	bl StringCopy
 	ldr r1, _080CCC54 @ =gSpecialVar_0x8005
 	movs r0, 0x10
@@ -4979,12 +4980,12 @@ _080CCC34:
 	b _080CCC6E
 	.align 2, 0
 _080CCC4C: .4byte gStringVar2
-_080CCC50: .4byte gUnknown_824802B
+_080CCC50: .4byte gMoveNames + 0xF97
 _080CCC54: .4byte gSpecialVar_0x8005
 _080CCC58: .4byte 0x000002df
 _080CCC5C:
 	ldr r0, _080CCC80 @ =gStringVar2
-	ldr r1, _080CCC84 @ =gUnknown_8248038
+	ldr r1, _080CCC84 @ =gMoveNames + 0xFA4 HYDRO CANNON
 	bl StringCopy
 	ldr r1, _080CCC88 @ =gSpecialVar_0x8005
 	movs r0, 0x11
@@ -5002,7 +5003,7 @@ _080CCC7A:
 	b _080CCCE4
 	.align 2, 0
 _080CCC80: .4byte gStringVar2
-_080CCC84: .4byte gUnknown_8248038
+_080CCC84: .4byte gMoveNames + 0xFA4
 _080CCC88: .4byte gSpecialVar_0x8005
 _080CCC8C:
 	movs r0, 0x64
@@ -5416,7 +5417,7 @@ sub_80CCFBC: @ 80CCFBC
 	ldr r0, _080CCFF0 @ =gSaveBlock1Ptr
 	ldr r0, [r0]
 	ldrh r1, [r0, 0x4]
-	ldr r0, _080CCFF4 @ =0x00003802
+	ldr r0, _080CCFF4 @ =0x00003802 MAP_BIRTH_ISLAND_EXTERIOR
 	cmp r1, r0
 	bne _080CD000
 	adds r0, r2, 0x1
@@ -5615,8 +5616,10 @@ _080CD14C:
 	bx r1
 	thumb_func_end sub_80CD0F4

-	thumb_func_start sub_80CD154
-sub_80CD154: @ 80CD154
+	@ Determines which of Lorelei's doll collection to show
+	@ based on how many times you've entered the Hall of Fame.
+	thumb_func_start Special_ComputeLoreleiDollCollection
+Special_ComputeLoreleiDollCollection: @ 80CD154
 	push {r4,lr}
 	movs r0, 0xA
 	bl GetGameStat
@@ -5663,7 +5666,7 @@ _080CD1AE:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80CD154
+	thumb_func_end Special_ComputeLoreleiDollCollection

 	thumb_func_start sub_80CD1B4
 sub_80CD1B4: @ 80CD1B4
@@ -37,6 +37,13 @@
 	.4byte \destination
 	.endm

+	lt = 0
+	eq = 1
+	gt = 2
+	le = 3
+	ge = 4
+	ne = 5
+
 	@ If the result of the last comparison matches condition (see Comparison operators), calls destination.
 	.macro call_if condition, destination
 	.byte 0x07
@@ -1225,10 +1232,9 @@
 	.byte 0xb7
 	.endm

-	.macro setvaddress long, word
+	.macro setvaddress long
 	.byte 0xb8
 	.4byte \long
-	.2byte \word
 	.endm

 	.macro vgoto pointer
@@ -1406,7 +1412,7 @@
@ Supplementary

 	.macro goto_if_eq dest
-	goto_if 1, \dest
+	goto_if eq, \dest
 	.endm

 	.macro switch var
@@ -1442,3 +1448,14 @@
 	setorcopyvar 0x8002, \fanfare
 	callstd 9
 	.endm
+
+	.macro famechecker person:req, index:req, function=SetFlavorTextFlagFromSpecialVars
+	setvar VAR_0x8004, \person
+	setvar VAR_0x8005, \index
+	special \function
+	.endm
+
+	.macro set_gym_trainers gym:req
+	setvar VAR_0x8008, \gym
+	call EventScript_1A6B18
+	.endm
@@ -55,8 +55,8 @@
 	inc _num_signs
 	.endm

-	.macro bg_hidden_item_event x, y, height, item, flag, unknown
-	bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown
+	.macro bg_hidden_item_event x, y, height, item, flag, quantity, underfoot
+	bg_event \x, \y, \height, 7, 0, \item, \flag, \quantity | (\underfoot << 7)
 	.endm

 	.macro map_events npcs, warps, traps, signs
@@ -15,7 +15,7 @@ sub_8054BC8: @ 8054BC8
 	movs r0, 0xA4
 	lsls r0, 2
 	adds r4, r0
-	bl sub_8054C04
+	bl ComputeWhiteOutMoneyLoss
 	adds r1, r0, 0
 	adds r0, r4, 0
 	bl RemoveMoney
@@ -31,17 +31,17 @@ _08054BFC: .4byte gUnknown_81A654B
 _08054C00: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_8054BC8

-	thumb_func_start sub_8054C04
-sub_8054C04: @ 8054C04
+	thumb_func_start ComputeWhiteOutMoneyLoss
+ComputeWhiteOutMoneyLoss: @ 8054C04
 	push {r4,lr}
-	bl sub_8054C70
+	bl CountBadgesForOverworldWhiteOutLossCalculation
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
 	bl GetPlayerPartyHighestLevel
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, _08054C40 @ =gUnknown_826D294
+	ldr r1, _08054C40 @ =sWhiteOutMoneyLossMultipliers
 	adds r4, r1
 	ldrb r1, [r4]
 	lsls r1, 2
@@ -62,14 +62,14 @@ _08054C38:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08054C40: .4byte gUnknown_826D294
+_08054C40: .4byte sWhiteOutMoneyLossMultipliers
 _08054C44: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_8054C04
+	thumb_func_end ComputeWhiteOutMoneyLoss

-	thumb_func_start sub_8054C48
-sub_8054C48: @ 8054C48
+	thumb_func_start Special_OverworldWhiteOutGetMoneyLoss
+Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
 	push {r4,r5,lr}
-	bl sub_8054C04
+	bl ComputeWhiteOutMoneyLoss
 	adds r4, r0, 0
 	ldr r5, _08054C6C @ =gStringVar1
 	bl CountDigits
@@ -85,14 +85,14 @@ sub_8054C48: @ 8054C48
 	bx r0
 	.align 2, 0
 _08054C6C: .4byte gStringVar1
-	thumb_func_end sub_8054C48
+	thumb_func_end Special_OverworldWhiteOutGetMoneyLoss

-	thumb_func_start sub_8054C70
-sub_8054C70: @ 8054C70
+	thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation
+CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
-	ldr r4, _08054C9C @ =gUnknown_826D29E
+	ldr r4, _08054C9C @ =sWhiteOutMoneyLossBadgeFlagIDs
 _08054C78:
 	ldrh r0, [r4]
 	bl FlagGet
@@ -112,8 +112,8 @@ _08054C8A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08054C9C: .4byte gUnknown_826D29E
-	thumb_func_end sub_8054C70
+_08054C9C: .4byte sWhiteOutMoneyLossBadgeFlagIDs
+	thumb_func_end CountBadgesForOverworldWhiteOutLossCalculation

 	thumb_func_start sub_8054CA0
 sub_8054CA0: @ 8054CA0
@@ -749,7 +749,7 @@ warp_shift: @ 8055198
 	str r0, [r2, 0x4]
 	str r1, [r2, 0x8]
 	ldr r2, _080551D0 @ =gUnknown_2031DC4
-	ldr r0, _080551D4 @ =gUnknown_826D2B0
+	ldr r0, _080551D4 @ =sDummyWarpData
 	ldr r1, [r0, 0x4]
 	ldr r0, [r0]
 	str r0, [r2]
@@ -763,7 +763,7 @@ _080551C4: .4byte gUnknown_2031DB4
 _080551C8: .4byte gSaveBlock1Ptr
 _080551CC: .4byte gUnknown_2031DBC
 _080551D0: .4byte gUnknown_2031DC4
-_080551D4: .4byte gUnknown_826D2B0
+_080551D4: .4byte sDummyWarpData
 _080551D8: .4byte gUnknown_2031DCC
 	thumb_func_end warp_shift

@@ -1717,7 +1717,7 @@ sub_8055864: @ 8055864
 	bl sub_8055CB8
 	bl sav1_reset_battle_music_maybe
 	bl mapheader_run_script_with_tag_x3
-	bl sub_815D8F8
+	bl TryRegenerateRenewableHiddenItems
 	bl not_trainer_hill_battle_pyramid
 	ldr r4, _0805591C @ =gMapHeader
 	ldr r0, [r4]
@@ -1794,7 +1794,7 @@ _08055974:
 	bl sub_8055CB8
 	bl sav1_reset_battle_music_maybe
 	bl mapheader_run_script_with_tag_x3
-	bl sub_815D8F8
+	bl TryRegenerateRenewableHiddenItems
 	bl UpdateLocationHistoryForRoamer
 	bl RoamerMoveToOtherLocationSet
 	bl sub_8110920
@@ -4284,7 +4284,7 @@ _08120B64:
 	lsls r0, 16
 	lsrs r0, 16
 	adds r1, r6, 0
-	bl sub_8120BE8
+	bl IsMonCompatibleWithMoveTutorMove
 	lsls r0, 24
 	cmp r0, 0
 	bne _08120B80
@@ -4293,7 +4293,7 @@ _08120B7C:
 	b _08120B9E
 _08120B80:
 	mov r0, r8
-	bl sub_8120BA8
+	bl GetMoveTutorMove
 _08120B86:
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -4315,8 +4315,8 @@ _08120B9E:
 	bx r1
 	thumb_func_end sub_8120B20

-	thumb_func_start sub_8120BA8
-sub_8120BA8: @ 8120BA8
+	thumb_func_start GetMoveTutorMove
+GetMoveTutorMove: @ 8120BA8
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -4333,19 +4333,19 @@ _08120BBC:
 	b _08120BD6
 _08120BC2:
 	movs r0, 0xA9
-	lsls r0, 1
+	lsls r0, 1 @ MOVE_FRENZY_PLANT
 	b _08120BDE
 _08120BC8:
-	ldr r0, _08120BCC @ =0x00000133
+	ldr r0, _08120BCC @ =0x00000133 @ MOVE_BLAST_BURN
 	b _08120BDE
 	.align 2, 0
 _08120BCC: .4byte 0x00000133
 _08120BD0:
 	movs r0, 0x9A
-	lsls r0, 1
+	lsls r0, 1 @ MOVE_HYDRO_CANNON
 	b _08120BDE
 _08120BD6:
-	ldr r0, _08120BE4 @ =gUnknown_8459B60
+	ldr r0, _08120BE4 @ =gMoveTutorMoves
 	lsls r1, 1
 	adds r1, r0
 	ldrh r0, [r1]
@@ -4353,11 +4353,11 @@ _08120BDE:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08120BE4: .4byte gUnknown_8459B60
-	thumb_func_end sub_8120BA8
+_08120BE4: .4byte gMoveTutorMoves
+	thumb_func_end GetMoveTutorMove

-	thumb_func_start sub_8120BE8
-sub_8120BE8: @ 8120BE8
+	thumb_func_start IsMonCompatibleWithMoveTutorMove
+IsMonCompatibleWithMoveTutorMove: @ 8120BE8
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -4375,19 +4375,19 @@ _08120C00:
 	beq _08120C12
 	b _08120C18
 _08120C06:
-	cmp r0, 0x3
+	cmp r0, 3 @ SPECIES_VENUSAUR
 	beq _08120C34
 	b _08120C2A
 _08120C0C:
-	cmp r0, 0x6
+	cmp r0, 6 @ SPECIES_CHARIZARD
 	beq _08120C34
 	b _08120C2A
 _08120C12:
-	cmp r0, 0x9
+	cmp r0, 9 @ SPECIES_BLASTOISE
 	beq _08120C34
 	b _08120C2A
 _08120C18:
-	ldr r1, _08120C30 @ =gUnknown_8459B7E
+	ldr r1, _08120C30 @ =gMoveTutorMoveCompatibilityTable
 	lsls r0, 1
 	adds r0, r1
 	ldrh r0, [r0]
@@ -4400,13 +4400,13 @@ _08120C2A:
 	movs r0, 0
 	b _08120C36
 	.align 2, 0
-_08120C30: .4byte gUnknown_8459B7E
+_08120C30: .4byte gMoveTutorMoveCompatibilityTable
 _08120C34:
 	movs r0, 0x1
 _08120C36:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8120BE8
+	thumb_func_end IsMonCompatibleWithMoveTutorMove

 	thumb_func_start sub_8120C3C
 sub_8120C3C: @ 8120C3C
@@ -16549,7 +16549,7 @@ sub_8126DC8: @ 8126DC8
 	bl GetMonNickname
 	ldr r4, _08126E5C @ =gSpecialVar_0x8005
 	ldrb r0, [r4]
-	bl sub_8120BA8
+	bl GetMoveTutorMove
 	strh r0, [r7, 0xE]
 	ldr r0, _08126E60 @ =gStringVar2
 	movs r1, 0xE
@@ -5,8 +5,8 @@

 	.text

-	thumb_func_start sub_80BF8FC
-sub_80BF8FC: @ 80BF8FC
+	thumb_func_start Special_ChooseMonFromParty
+Special_ChooseMonFromParty: @ 80BF8FC
 	push {lr}
 	sub sp, 0x4
 	bl ScriptContext2_Enable
@@ -34,7 +34,7 @@ sub_80BF8FC: @ 80BF8FC
 	.align 2, 0
 _080BF934: .4byte sub_80BF97C
 _080BF938: .4byte gTasks
-	thumb_func_end sub_80BF8FC
+	thumb_func_end Special_ChooseMonFromParty

 	thumb_func_start sub_80BF93C
 sub_80BF93C: @ 80BF93C
@@ -100,8 +100,8 @@ _080BF9B4: .4byte gPaletteFade
 _080BF9B8: .4byte gTasks
 	thumb_func_end sub_80BF97C

-	thumb_func_start sub_80BF9BC
-sub_80BF9BC: @ 80BF9BC
+	thumb_func_start Special_ChooseMoveToDelete
+Special_ChooseMoveToDelete: @ 80BF9BC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, _080BF9F0 @ =gPlayerParty
@@ -132,7 +132,7 @@ _080BF9F8: .4byte gPlayerPartyCount
 _080BF9FC: .4byte CB2_ReturnToField
 _080BFA00: .4byte gFieldCallback
 _080BFA04: .4byte FieldCallback_ReturnToEventScript2
-	thumb_func_end sub_80BF9BC
+	thumb_func_end Special_ChooseMoveToDelete

 	thumb_func_start ScrSpecial_CountPokemonMoves
 ScrSpecial_CountPokemonMoves: @ 80BFA08
@@ -333,8 +333,8 @@ sub_80BFAA8: @ 80BFAA8
 _080BFBA4: .4byte gPPUpGetMask
 	thumb_func_end sub_80BFAA8

-	thumb_func_start sub_80BFBA8
-sub_80BFBA8: @ 80BFBA8
+	thumb_func_start Special_DeleteSelectedMove
+Special_DeleteSelectedMove: @ 80BFBA8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -385,7 +385,7 @@ _080BFBFC:
 _080BFC08: .4byte gSpecialVar_0x8004
 _080BFC0C: .4byte gPlayerParty
 _080BFC10: .4byte gSpecialVar_0x8005
-	thumb_func_end sub_80BFBA8
+	thumb_func_end Special_DeleteSelectedMove

 	thumb_func_start sub_80BFC14
 sub_80BFC14: @ 80BFC14
@@ -966,8 +966,8 @@ _08082E48:
 	bx r1
 	thumb_func_end sub_8082CBC

-	thumb_func_start sub_8082E54
-sub_8082E54: @ 8082E54
+	thumb_func_start Special_RockSmashEncounter
+Special_RockSmashEncounter: @ 8082E54
 	push {r4,lr}
 	bl sub_8082934
 	lsls r0, 16
@@ -1018,7 +1018,7 @@ _08082EB6:
 	bx r0
 	.align 2, 0
 _08082EBC: .4byte gSpecialVar_Result
-	thumb_func_end sub_8082E54
+	thumb_func_end Special_RockSmashEncounter

 	thumb_func_start SweetScentWildEncounter
 SweetScentWildEncounter: @ 8082EC0
@@ -0,0 +1 @@
+gLastQuestLogStoredFlagOrVarIdx
@@ -1,51 +1,17 @@
 #include "constants/region_map.h"
 #include "constants/trainer_classes.h"
 #include "constants/songs.h"
+#include "constants/flags.h"
 #include "constants/region_map.h"
+#include "constants/maps.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"

 	.section .rodata
-
-gAnimCmd_8239EBC:: @ 8239EBC
-	.incbin "baserom.gba", 0x239EBC, 0xB8
-
-gTrainerBackAnimsPtrTable:: @ 8239F74
-	.incbin "baserom.gba", 0x239F74, 0x18
-
-gTrainerBackPicCoords:: @ 8239F8C
-	.incbin "baserom.gba", 0x239F8C, 0x18
-
-gTrainerBackPicTable:: @ 8239FA4
-	.incbin "baserom.gba", 0x239FA4, 0x30
-
-gTrainerBackPicPaletteTable:: @ 8239FD4
-	.incbin "baserom.gba", 0x239FD4, 0x30
-
-gEnemyMonElevation:: @ 823A004
-	.incbin "baserom.gba", 0x23A004, 0x4554
-
-gTrainerClassNames:: @ 823E558
-	.include "data/text/trainer_class_names.inc"
-
 	.align 2, 0
-gTrainers:: @ 823EAD8
-	.incbin "baserom.gba", 0x23EAC8, 0x7418

-gSpeciesNames:: @ 8245EE0
-	.include "data/text/species_names.inc"
-
-gMoveNames:: @ 8247094
-	.incbin "baserom.gba", 0x247094, 0xF97
-
-gUnknown_824802B:: @ 824802B
-	.incbin "baserom.gba", 0x24802B, 0xD
-
-gUnknown_8248038:: @ 8248038
-	.incbin "baserom.gba", 0x248038, 0x186
-
-gUnknown_82481BE:: @ 82481BE
-	.incbin "baserom.gba", 0x2481BE, 0x12A
+gUnknown_824829C:: @ 824829C
+	.incbin "baserom.gba", 0x24829C, 0x4c

 gUnknown_82482E8:: @ 82482E8
 	.incbin "baserom.gba", 0x2482E8, 0x18
@@ -400,52 +366,3 @@ gUnknown_826D1E4:: @ 826D1E4

 gUnknown_826D250:: @ 826D250
 	.incbin "baserom.gba", 0x26D250, 0x44
-
-gUnknown_826D294:: @ 826D294
-	.incbin "baserom.gba", 0x26D294, 0xA
-
-gUnknown_826D29E:: @ 826D29E
-	.incbin "baserom.gba", 0x26D29E, 0x12
-
-gUnknown_826D2B0:: @ 826D2B0
-	.incbin "baserom.gba", 0x26D2B0, 0x28
-
-gDirectionToVectors:: @ 826D2D8
-	.4byte  0,  0
-	.4byte  0,  1
-	.4byte  0, -1
-	.4byte -1,  0
-	.4byte  1,  0
-	.4byte -1,  1
-	.4byte  1,  1
-	.4byte -1, -1
-	.4byte  1, -1
-
-gUnknown_826D320:: @ 826D320
-	.incbin "baserom.gba", 0x26D320, 0x10
-
-gUnknown_826D330:: @ 826D330
-	.incbin "baserom.gba", 0x26D330, 0xC
-
-gUnknown_826D33C:: @ 826D33C
-	.4byte sub_8058684
-	.4byte sub_80586A4
-	.4byte sub_80586A8
-
-gUnknown_826D348:: @ 826D348
-	.4byte sub_80586C8
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586C8
-	.4byte sub_80586C8
-	.4byte sub_8058734
-	.4byte sub_8058734
-	.4byte sub_8058734
-	.4byte sub_8058734
-
-gUnknown_826D374:: @ 826D374
-	.4byte sub_805874C
-	.4byte sub_8058754
-
@@ -562,13 +562,467 @@ sBerries:: @ 83DF7E8
 	.incbin "baserom.gba", 0x3DF7E8, 0x4B4

 gUnknown_83DFC9C:: @ 83DFC9C
-	.incbin "baserom.gba", 0x3DFC9C, 0x814
+	.incbin "baserom.gba", 0x3DFC9C, 0xB4
+
+gUnknown_83DFD50:: @ 83DFD50
+	.4byte gUnknown_8417938, NULL
+	.4byte gUnknown_841793C, NULL
+
+gUnknown_83DFD60:: @ 83DFD60
+	.4byte gUnknown_8417ADC, NULL
+	.4byte gUnknown_8417AE3, NULL
+	.4byte gUnknown_8417AE9, NULL
+	.4byte gUnknown_8417AEE, NULL
+
+gUnknown_83DFD80:: @ 83DFD80
+	.4byte gUnknown_84178F0, NULL
+	.4byte gUnknown_8417907, NULL
+
+gUnknown_83DFD90:: @ 83DFD90
+	.4byte gUnknown_84178EB, NULL
+	.4byte gUnknown_8417907, NULL
+
+gUnknown_83DFDA0:: @ 83DFDA0
+	.4byte gUnknown_84178FD, NULL
+	.4byte gUnknown_8417907, NULL
+
+gUnknown_83DFDB0:: @ 83DFDB0
+	.4byte gUnknown_84178F0, NULL
+	.4byte gUnknown_84178EB, NULL
+	.4byte gUnknown_8417907, NULL
+
+gUnknown_83DFDC8:: @ 83DFDC8
+	.4byte gUnknown_84178F0, NULL
+	.4byte gUnknown_84178FD, NULL
+	.4byte gUnknown_8417907, NULL
+
+gUnknown_83DFDE0:: @ 83DFDE0
+	.4byte gUnknown_84178EB, NULL
+	.4byte gUnknown_84178FD, NULL
+	.4byte gUnknown_8417907, NULL
+
+gUnknown_83DFDF8:: @ 83DFDF8
+	.4byte gUnknown_84178F0, NULL
+	.4byte gUnknown_84178EB, NULL
+	.4byte gUnknown_84178FD, NULL
+	.4byte gUnknown_8417907, NULL
+
+gUnknown_83DFE18:: @ 83DFE18
+	.4byte gUnknown_8417914, NULL
+	.4byte gUnknown_841790C, NULL
+	.4byte gUnknown_8417910, NULL
+	.4byte gUnknown_8417918, NULL
+	.4byte gUnknown_841791C, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFE48:: @ 83DFE48
+	.4byte gUnknown_8417938, NULL
+	.4byte gUnknown_841793C, NULL
+	.4byte gUnknown_84178E6, NULL
+
+gUnknown_83DFE60:: @ 83DFE60
+	.4byte gUnknown_8417944, NULL
+	.4byte gUnknown_8417952, NULL
+	.4byte gUnknown_8417960, NULL
+	.4byte gUnknown_84178E6, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFE88:: @ 83DFE88
+	.4byte gUnknown_8417938, NULL
+	.4byte gUnknown_841793C, NULL
+	.4byte gUnknown_84178E6, NULL
+
+gUnknown_83DFEA0:: @ 83DFEA0
+	.4byte gUnknown_841796D, NULL
+	.4byte gUnknown_841797F, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFEB8:: @ 83DFEB8
+	.4byte gUnknown_841806D, NULL
+	.4byte gUnknown_841805D, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFED0:: @ 83DFED0
+	.4byte gUnknown_8417D56, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFEE0:: @ 83DFEE0
+	.4byte gUnknown_8417D63, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFEF0:: @ 83DFEF0
+	.4byte gUnknown_8417D6F, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFF00:: @ 83DFF00
+	.4byte gUnknown_8417D56, NULL
+	.4byte gUnknown_8417D6F, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFF18:: @ 83DFF18
+	.4byte gUnknown_8417D63, NULL
+	.4byte gUnknown_8417D6F, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFF30:: @ 83DFF30
+	.4byte gUnknown_8417984, NULL
+	.4byte gUnknown_841799A, NULL
+	.4byte gUnknown_84179AD, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFF50:: @ 83DFF50
+	.4byte gUnknown_8417A42, NULL
+	.4byte gUnknown_8417A58, NULL
+	.4byte gUnknown_8417A6E, NULL
+	.4byte gUnknown_8417A84, NULL
+	.4byte gUnknown_8417A9A, NULL
+	.4byte gUnknown_8417D4C, NULL
+
+gUnknown_83DFF80:: @ 83DFF80
+	.4byte gUnknown_8417F4D, NULL
+	.4byte gUnknown_8417ED9, NULL
+	.4byte gUnknown_8417EF7, NULL
+	.4byte gUnknown_8417F11, NULL
+	.4byte gUnknown_8417F2F, NULL
+	.4byte gUnknown_8417D4C, NULL
+
+gUnknown_83DFFB0:: @ 83DFFB0
+	.4byte gUnknown_84179C0, NULL
+	.4byte gUnknown_84179D6, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83DFFC8:: @ 83DFFC8
+	.4byte gUnknown_84179ED, NULL
+	.4byte gUnknown_84179F7, NULL
+
+gUnknown_83DFFD8:: @ 83DFFD8
+	.4byte gUnknown_8417A37, NULL
+	.4byte gUnknown_8417A3D, NULL
+
+gUnknown_83DFFE8:: @ 83DFFE8
+	.4byte gUnknown_8417ABC, NULL
+	.4byte gUnknown_8417AB9, NULL
+	.4byte gUnknown_8417AB6, NULL
+	.4byte gUnknown_8417AB3, NULL
+	.4byte gUnknown_8417AB0, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0018:: @ 83E0018
+	.4byte gUnknown_8417C0F, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0028:: @ 83E0028
+	.4byte gUnknown_8417C1B, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0038:: @ 83E0038
+	.4byte gUnknown_8417C0F, NULL
+	.4byte gUnknown_8417C1B, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0050:: @ 83E0050
+	.4byte gUnknown_8417C24, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0060:: @ 83E0060
+	.4byte gUnknown_8417C0F, NULL
+	.4byte gUnknown_8417C24, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0078:: @ 83E0078
+	.4byte gUnknown_8417C1B, NULL
+	.4byte gUnknown_8417C24, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0090:: @ 83E0090
+	.4byte gUnknown_8417C0F, NULL
+	.4byte gUnknown_8417C1B, NULL
+	.4byte gUnknown_8417C24, NULL
+	.4byte gOtherText_Exit, NULL
+	.4byte gUnknown_8417A24, NULL
+	.4byte gOtherText_Exit, NULL
+	.4byte gUnknown_8417A02, NULL
+	.4byte gUnknown_8417A24, NULL
+	.4byte gOtherText_Exit, NULL
+	.4byte gUnknown_8417A0C, NULL
+	.4byte gUnknown_8417A24, NULL
+	.4byte gOtherText_Exit, NULL
+	.4byte gUnknown_8417A02, NULL
+	.4byte gUnknown_8417A0C, NULL
+	.4byte gUnknown_8417A24, NULL
+	.4byte gOtherText_Exit, NULL
+	.4byte gUnknown_8417A19, NULL
+	.4byte gUnknown_8417A24, NULL
+	.4byte gOtherText_Exit, NULL
+	.4byte gUnknown_8417A02, NULL
+	.4byte gUnknown_8417A19, NULL
+	.4byte gUnknown_8417A24, NULL
+	.4byte gOtherText_Exit, NULL
+	.4byte gUnknown_8417A0C, NULL
+	.4byte gUnknown_8417A19, NULL
+	.4byte gUnknown_8417A24, NULL
+	.4byte gOtherText_Exit, NULL
+	.4byte gUnknown_8417A02, NULL
+	.4byte gUnknown_8417A0C, NULL
+	.4byte gUnknown_8417A19, NULL
+	.4byte gUnknown_8417A24, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0190:: @ 83E0190
+	.4byte gUnknown_8417BE2, NULL
+	.4byte gUnknown_8417BE8, NULL
+	.4byte gUnknown_8417BF0, NULL
+	.4byte gUnknown_8417BF8, NULL
+	.4byte gUnknown_8417C01, NULL
+
+gUnknown_83E01B8:: @ 83E01B8
+	.4byte gUnknown_8417C33, NULL
+	.4byte gUnknown_8417C4B, NULL
+
+gUnknown_83E01C8:: @ 83E01C8
+	.4byte gUnknown_8417C55, NULL
+	.4byte gUnknown_8417C6A, NULL
+	.4byte gUnknown_8417C83, NULL
+	.4byte gUnknown_8417C9D, NULL
+	.4byte gUnknown_8417CB7, NULL
+	.4byte gUnknown_8417D4C, NULL
+
+gUnknown_83E01F8:: @ 83E01F8
+	.4byte gUnknown_8417D79, NULL
+	.4byte gUnknown_8417D86, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0210:: @ 83E0210
+	.4byte gUnknown_8417D90, NULL
+	.4byte gUnknown_8417DA0, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0228:: @ 83E0228
+	.4byte gUnknown_841805D, NULL
+	.4byte gUnknown_8418061, NULL
+	.4byte gUnknown_8418069, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0248:: @ 83E0248
+	.4byte gUnknown_841807D, NULL
+	.4byte gUnknown_841808E, NULL
+	.4byte gUnknown_841809C, NULL
+	.4byte gUnknown_8417929, NULL
+
+gUnknown_83E0268:: @ 83E0268
+	.4byte gUnknown_8417DFE, NULL
+	.4byte gUnknown_8417E09, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0280:: @ 83E0280
+	.4byte gUnknown_8417DF3, NULL
+	.4byte gUnknown_8417E09, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0298:: @ 83E0298
+	.4byte gUnknown_8417DF3, NULL
+	.4byte gUnknown_8417DFE, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E02B0:: @ 83E02B0
+	.4byte gUnknown_8417D79, NULL
+	.4byte gUnknown_8417E50, NULL
+	.4byte gUnknown_8417E5A, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E02D0:: @ 83E02D0
+	.4byte gUnknown_8417E66, NULL
+	.4byte gUnknown_8417E67, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E02E8:: @ 83E02E8
+	.4byte gUnknown_8417D79, NULL
+	.4byte gUnknown_8417E50, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0300:: @ 83E0300
+	.4byte gUnknown_8417E72, NULL
+	.4byte gUnknown_8417E7F, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0318:: @ 83E0318
+	.4byte gUnknown_8417E94, NULL
+	.4byte gUnknown_8417EA4, NULL
+
+gUnknown_83E0328:: @ 83E0328
+	.4byte gUnknown_8417D79, NULL
+	.4byte gUnknown_8417E50, NULL
+	.4byte gUnknown_8417E71, NULL
+	.4byte gUnknown_8417E5A, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0350:: @ 83E0350
+	.4byte gUnknown_8417D79, NULL
+	.4byte gUnknown_8417E50, NULL
+	.4byte gUnknown_8417E71, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0370:: @ 83E0370
+	.4byte gUnknown_8417EB3, NULL
+	.4byte gUnknown_8417EC1, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0388:: @ 83E0388
+	.4byte gUnknown_8417EB3, NULL
+	.4byte gUnknown_8417ECC, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E03A0:: @ 83E03A0
+	.4byte gUnknown_8417EB3, NULL
+	.4byte gUnknown_8417EC1, NULL
+	.4byte gUnknown_8417ECC, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E03C0:: @ 83E03C0
+	.4byte gUnknown_8417DF3, NULL
+	.4byte gUnknown_8417DFE, NULL
+	.4byte gUnknown_8417E09, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E03E0:: @ 83E03E0
+	.4byte gUnknown_8417E46, NULL
+	.4byte gUnknown_8417DFE, NULL
+	.4byte gUnknown_8417E09, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0400:: @ 83E0400
+	.4byte gUnknown_8417E46, NULL
+	.4byte gUnknown_8417DF3, NULL
+	.4byte gUnknown_8417E09, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0420:: @ 83E0420
+	.4byte gUnknown_8417E46, NULL
+	.4byte gUnknown_8417DF3, NULL
+	.4byte gUnknown_8417DFE, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0440:: @ 83E0440
+	.4byte gUnknown_8417E46, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0450:: @ 83E0450
+	.4byte gUnknown_8417F68, NULL
+	.4byte gUnknown_8417F67, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0468:: @ 83E0468
+	.4byte gUnknown_8417F77, NULL
+	.4byte gUnknown_8417F69, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E0480:: @ 83E0480
+	.4byte gOtherText_Single, NULL
+	.4byte gOtherText_Double, NULL
+	.4byte gOtherText_Knockout, NULL
+	.4byte gOtherText_Mixed, NULL
+	.4byte gOtherText_Exit, NULL
+
+gUnknown_83E04A8:: @ 83E04A8
+	.4byte gOtherText_Exit, NULL

 gUnknown_83E04B0:: @ 83E04B0
-	.incbin "baserom.gba", 0x3E04B0, 0x208
+	.4byte gUnknown_83DFD50, 2
+	.4byte gUnknown_83E0190, 5
+	.4byte gUnknown_83DFD60, 4
+	.4byte gUnknown_83DFD80, 2
+	.4byte gUnknown_83DFD90, 2
+	.4byte gUnknown_83DFDA0, 2
+	.4byte gUnknown_83DFDB0, 3
+	.4byte gUnknown_83DFDC8, 3
+	.4byte gUnknown_83DFDE0, 3
+	.4byte gUnknown_83DFDF8, 4
+	.4byte gUnknown_83E04A8, 1
+	.4byte gUnknown_83E04A8, 1
+	.4byte gUnknown_83E04A8, 1
+	.4byte gUnknown_83E01B8, 2
+	.4byte gUnknown_83E01C8, 6
+	.4byte gUnknown_83DFE18, 6
+	.4byte gUnknown_83DFE48, 3
+	.4byte gUnknown_83DFE60, 5
+	.4byte gUnknown_83DFE88, 3
+	.4byte gUnknown_83DFEA0, 3
+	.4byte gUnknown_83DFEB8, 3
+	.4byte gUnknown_83DFED0, 2
+	.4byte gUnknown_83DFEE0, 2
+	.4byte gUnknown_83DFEF0, 2
+	.4byte gUnknown_83DFF00, 3
+	.4byte gUnknown_83DFF18, 3
+	.4byte gUnknown_83DFF30, 4
+	.4byte gUnknown_83DFFB0, 3
+	.4byte gUnknown_83DFFC8, 2
+	.4byte gUnknown_83DFFD8, 2
+	.4byte gUnknown_83DFF50, 6
+	.4byte gUnknown_83DFFE8, 6
+	.4byte gUnknown_83E0018, 2
+	.4byte gUnknown_83E0028, 2
+	.4byte gUnknown_83E0038, 3
+	.4byte gUnknown_83E0050, 2
+	.4byte gUnknown_83E0060, 3
+	.4byte gUnknown_83E0078, 3
+	.4byte gUnknown_83E0090, 4
+	.4byte gUnknown_83E01F8, 3
+	.4byte gUnknown_83E0210, 3
+	.4byte gUnknown_83DFF80, 6
+	.4byte gUnknown_83E0228, 4
+	.4byte gUnknown_83E0248, 4
+	.4byte gUnknown_83E0268, 3
+	.4byte gUnknown_83E0280, 3
+	.4byte gUnknown_83E0298, 3
+	.4byte gUnknown_83E02B0, 4
+	.4byte gUnknown_83E02D0, 3
+	.4byte gUnknown_83E0300, 3
+	.4byte gUnknown_83E02E8, 3
+	.4byte gUnknown_83E0318, 2
+	.4byte gUnknown_83E0328, 5
+	.4byte gUnknown_83E0350, 4
+	.4byte gUnknown_83E0370, 3
+	.4byte gUnknown_83E0388, 3
+	.4byte gUnknown_83E03A0, 4
+	.4byte gUnknown_83E03C0, 4
+	.4byte gUnknown_83E03E0, 4
+	.4byte gUnknown_83E0400, 4
+	.4byte gUnknown_83E0420, 4
+	.4byte gUnknown_83E0440, 2
+	.4byte gUnknown_83E0450, 3
+	.4byte gUnknown_83E0468, 3
+	.4byte gUnknown_83E0480, 5

 gStdStringPtrs:: @ 83E06B8
-	.incbin "baserom.gba", 0x3E06B8, 0x74
+	.4byte gUnknown_8417ABF
+	.4byte gUnknown_8417AC4
+	.4byte gUnknown_8417ACB
+	.4byte gUnknown_8417AD0
+	.4byte gUnknown_8417AD6
+	.4byte gUnknown_8417AF4
+	.4byte gUnknown_8417AF9
+	.4byte gUnknown_8417B00
+	.4byte gUnknown_8417B05
+	.4byte gUnknown_8417B0B
+	.4byte gUnknown_8417B11
+	.4byte gUnknown_8417B17
+	.4byte gUnknown_8417B21
+	.4byte gUnknown_8417B2C
+	.4byte gUnknown_8417B36
+	.4byte gUnknown_8417B3E
+	.4byte gUnknown_8417B4B
+	.4byte gUnknown_8417B58
+	.4byte gUnknown_8417B65
+	.4byte gUnknown_8417B72
+	.4byte gUnknown_8417B7C
+	.4byte gUnknown_8417B87
+	.4byte gUnknown_8417B94
+	.4byte gUnknown_8417C2D
+	.4byte gUnknown_8417DA9
+	.4byte gUnknown_8417DB6
+	.4byte gUnknown_8417DC7
+	.4byte gUnknown_8417DD9
+	.4byte gUnknown_8417DE1

 gUnknown_83E072C:: @ 83E072C
 	.incbin "baserom.gba", 0x3E072C, 0xC
@@ -460,13 +460,26 @@ gUnknown_83FE88F:: @ 83FE88F
 	.incbin "baserom.gba", 0x3FE88F, 0xF3

 gUnknown_83FE982:: @ 83FE982
-	.incbin "baserom.gba", 0x3FE982, 0x16
+	.string "TIME BOARD$"
+	.string "CLEAR TIME$"

 gUnknown_83FE998:: @ 83FE998
-	.incbin "baserom.gba", 0x3FE998, 0x2C
+	.string "{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC.$"
+	.string "1F$"
+	.string "2F$"
+	.string "3F$"
+	.string "4F$"
+	.string "5F$"
+	.string "6F$"
+	.string "7F$"
+	.string "8F$"

+	.align 2
 gUnknown_83FE9C4:: @ 83FE9C4
-	.incbin "baserom.gba", 0x3FE9C4, 0x10
+	.4byte gOtherText_Single
+	.4byte gOtherText_Double
+	.4byte gOtherText_Knockout
+	.4byte gOtherText_Mixed

 gUnknown_83FE9D4:: @ 83FE9D4
 	.incbin "baserom.gba", 0x3FE9D4, 0x10
@@ -1,5 +1,6 @@
 #include "constants/region_map.h"
 #include "constants/flags.h"
+#include "constants/moves.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 	.section .rodata
@@ -1089,12 +1090,438 @@ gUnknown_8459B30:: @ 8459B30
 gUnknown_8459B48:: @ 8459B48
 	.incbin "baserom.gba", 0x459B48, 0x18

-gUnknown_8459B60:: @ 8459B60
-	.incbin "baserom.gba", 0x459B60, 0x1E
+gMoveTutorMoves:: @ 8459B60
+	.2byte MOVE_MEGA_PUNCH
+	.2byte MOVE_SWORDS_DANCE
+	.2byte MOVE_MEGA_KICK
+	.2byte MOVE_BODY_SLAM
+	.2byte MOVE_DOUBLE_EDGE
+	.2byte MOVE_COUNTER
+	.2byte MOVE_SEISMIC_TOSS
+	.2byte MOVE_MIMIC
+	.2byte MOVE_METRONOME
+	.2byte MOVE_SOFT_BOILED
+	.2byte MOVE_DREAM_EATER
+	.2byte MOVE_THUNDER_WAVE
+	.2byte MOVE_EXPLOSION
+	.2byte MOVE_ROCK_SLIDE
+	.2byte MOVE_SUBSTITUTE

-gUnknown_8459B7E:: @ 8459B7E
-	.incbin "baserom.gba", 0x459B7E, 0x33A
+gMoveTutorMoveCompatibilityTable:: @ 8459B7E
+	.2byte 0x0000
+	.2byte 0x409a
+	.2byte 0x409a
+	.2byte 0x409a
+	.2byte 0x60ff
+	.2byte 0x60ff
+	.2byte 0x60ff
+	.2byte 0x40fd
+	.2byte 0x40fd
+	.2byte 0x40fd
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x4490
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x4092
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x48b8
+	.2byte 0x48b8
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x48fd
+	.2byte 0x48fd
+	.2byte 0x60fa
+	.2byte 0x60fa
+	.2byte 0x40b8
+	.2byte 0x40b8
+	.2byte 0x60fd
+	.2byte 0x40b8
+	.2byte 0x40b8
+	.2byte 0x60fd
+	.2byte 0x4ffd
+	.2byte 0x4ffd
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4cfd
+	.2byte 0x4cfd
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x4092
+	.2byte 0x4092
+	.2byte 0x409a
+	.2byte 0x40ba
+	.2byte 0x40ba
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x4498
+	.2byte 0x4498
+	.2byte 0x40fd
+	.2byte 0x40fd
+	.2byte 0x61fd
+	.2byte 0x61fd
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x41fd
+	.2byte 0x41fd
+	.2byte 0x4dfd
+	.2byte 0x4dfd
+	.2byte 0x4dfd
+	.2byte 0x61fd
+	.2byte 0x61fd
+	.2byte 0x61fd
+	.2byte 0x4092
+	.2byte 0x4092
+	.2byte 0x409a
+	.2byte 0x4092
+	.2byte 0x4092
+	.2byte 0x71f9
+	.2byte 0x71f9
+	.2byte 0x71fd
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4c98
+	.2byte 0x4cfd
+	.2byte 0x4890
+	.2byte 0x4890
+	.2byte 0x409a
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x5088
+	.2byte 0x5088
+	.2byte 0x5090
+	.2byte 0x5090
+	.2byte 0x5480
+	.2byte 0x5480
+	.2byte 0x55fd
+	.2byte 0x7098
+	.2byte 0x4dfd
+	.2byte 0x4dfd
+	.2byte 0x409a
+	.2byte 0x409a
+	.2byte 0x5880
+	.2byte 0x5880
+	.2byte 0x5490
+	.2byte 0x5490
+	.2byte 0x60ff
+	.2byte 0x60ff
+	.2byte 0x61fd
+	.2byte 0x61fd
+	.2byte 0x64ff
+	.2byte 0x5080
+	.2byte 0x5080
+	.2byte 0x60ba
+	.2byte 0x60ff
+	.2byte 0x4ffd
+	.2byte 0x409a
+	.2byte 0x60fd
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x4890
+	.2byte 0x4c90
+	.2byte 0x4dfd
+	.2byte 0x40b2
+	.2byte 0x45fd
+	.2byte 0x48fd
+	.2byte 0x40fd
+	.2byte 0x60da
+	.2byte 0x4098
+	.2byte 0x0000
+	.2byte 0x4898
+	.2byte 0x4498
+	.2byte 0x0000
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4898
+	.2byte 0x4098
+	.2byte 0x4c90
+	.2byte 0x6098
+	.2byte 0x60d8
+	.2byte 0x6098
+	.2byte 0x60de
+	.2byte 0x6090
+	.2byte 0x61fd
+	.2byte 0x4090
+	.2byte 0x4890
+	.2byte 0x4090
+	.2byte 0x4898
+	.2byte 0x4898
+	.2byte 0x4898
+	.2byte 0x4dfd
+	.2byte 0x7fff
+	.2byte 0x40ba
+	.2byte 0x40ba
+	.2byte 0x40ba
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x60fd
+	.2byte 0x60ff
+	.2byte 0x60ff
+	.2byte 0x60ff
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4490
+	.2byte 0x4490
+	.2byte 0x4093
+	.2byte 0x4093
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4090
+	.2byte 0x4890
+	.2byte 0x4890
+	.2byte 0x48fd
+	.2byte 0x4ffd
+	.2byte 0x4cfd
+	.2byte 0x4ffd
+	.2byte 0x4ffd
+	.2byte 0x4c90
+	.2byte 0x4c90
+	.2byte 0x4898
+	.2byte 0x48fd
+	.2byte 0x48fd
+	.2byte 0x4092
+	.2byte 0x40dd
+	.2byte 0x40dd
+	.2byte 0x70fd
+	.2byte 0x41fd
+	.2byte 0x4092
+	.2byte 0x4092
+	.2byte 0x4092
+	.2byte 0x4dfd
+	.2byte 0x4092
+	.2byte 0x4092
+	.2byte 0x4490
+	.2byte 0x4098
+	.2byte 0x40fd
+	.2byte 0x4498
+	.2byte 0x4498
+	.2byte 0x4c90
+	.2byte 0x4cfd
+	.2byte 0x4c90
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x4c98
+	.2byte 0x70b8
+	.2byte 0x70b8
+	.2byte 0x6cb8
+	.2byte 0x64b2
+	.2byte 0x7098
+	.2byte 0x49fd
+	.2byte 0x69fd
+	.2byte 0x4892
+	.2byte 0x40b2
+	.2byte 0x6098
+	.2byte 0x60fa
+	.2byte 0x44b2
+	.2byte 0x41ff
+	.2byte 0x61ff
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x7098
+	.2byte 0x4890
+	.2byte 0x48d0
+	.2byte 0x40fd
+	.2byte 0x4098
+	.2byte 0x60b0
+	.2byte 0x44b8
+	.2byte 0x44b8
+	.2byte 0x4098
+	.2byte 0x40b8
+	.2byte 0x60b8
+	.2byte 0x4c90
+	.2byte 0x4c98
+	.2byte 0x0000
+	.2byte 0x60fc
+	.2byte 0x60fc
+	.2byte 0x45fd
+	.2byte 0x48fd
+	.2byte 0x40fd
+	.2byte 0x69fd
+	.2byte 0x4ffd
+	.2byte 0x4898
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x68fd
+	.2byte 0x4c98
+	.2byte 0x4c90
+	.2byte 0x4592
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x40ff
+	.2byte 0x40ff
+	.2byte 0x40ff
+	.2byte 0x60ff
+	.2byte 0x60ff
+	.2byte 0x60ff
+	.2byte 0x4098
+	.2byte 0x60fd
+	.2byte 0x60fd
+	.2byte 0x40b8
+	.2byte 0x40b8
+	.2byte 0x4898
+	.2byte 0x4898
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x4090
+	.2byte 0x0000
+	.2byte 0x4090
+	.2byte 0x409a
+	.2byte 0x409a
+	.2byte 0x41ff
+	.2byte 0x509a
+	.2byte 0x509e
+	.2byte 0x509e
+	.2byte 0x4090
+	.2byte 0x4092
+	.2byte 0x4490
+	.2byte 0x40b0
+	.2byte 0x40b0
+	.2byte 0x409a
+	.2byte 0x40ff
+	.2byte 0x65fd
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4c98
+	.2byte 0x4c98
+	.2byte 0x69fd
+	.2byte 0x7490
+	.2byte 0x7490
+	.2byte 0x7898
+	.2byte 0x7098
+	.2byte 0x45fd
+	.2byte 0x4090
+	.2byte 0x6090
+	.2byte 0x4090
+	.2byte 0x40ba
+	.2byte 0x40ba
+	.2byte 0x4090
+	.2byte 0x4098
+	.2byte 0x4090
+	.2byte 0x4090
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x61fd
+	.2byte 0x61fd
+	.2byte 0x4898
+	.2byte 0x4898
+	.2byte 0x6098
+	.2byte 0x7098
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x40fb
+	.2byte 0x40ff
+	.2byte 0x4098
+	.2byte 0x5098
+	.2byte 0x7498
+	.2byte 0x7498
+	.2byte 0x4098
+	.2byte 0x4498
+	.2byte 0x44fd
+	.2byte 0x49fd
+	.2byte 0x49fd
+	.2byte 0x60ff
+	.2byte 0x45fd
+	.2byte 0x65fd
+	.2byte 0x4498
+	.2byte 0x4498
+	.2byte 0x0000
+	.2byte 0x4498
+	.2byte 0x65fd
+	.2byte 0x409a
+	.2byte 0x60fd
+	.2byte 0x60fd
+	.2byte 0x60fd
+	.2byte 0x54b8
+	.2byte 0x54b8
+	.2byte 0x409a
+	.2byte 0x40fd
+	.2byte 0x60fd
+	.2byte 0x60fd
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x4098
+	.2byte 0x6cba
+	.2byte 0x4c98
+	.2byte 0x4d98
+	.2byte 0x4098
+	.2byte 0x68ff
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x68fd
+	.2byte 0x4898
+	.2byte 0x49fd
+	.2byte 0x49fd
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x609a
+	.2byte 0x60da
+	.2byte 0x4c98
+	.2byte 0x4c98
+	.2byte 0x4c98
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x6098
+	.2byte 0x0000
+	.2byte 0x7098
+	.2byte 0x7098
+	.2byte 0x78fd
+	.2byte 0x78fd
+	.2byte 0x78fd
+	.2byte 0x6898
+	.2byte 0x68ff
+	.2byte 0x6898
+	.2byte 0x4c98
+	.2byte 0x4c98
+	.2byte 0x4d98
+	.2byte 0x6cfd
+	.2byte 0x4490

+	.align 2
 gUnknown_8459EB8:: @ 8459EB8
 	.incbin "baserom.gba", 0x459EB8, 0xC

@@ -1,9 +1,12 @@
 #include "constants/species.h"
 #include "constants/items.h"
 #include "constants/moves.h"
+#include "constants/pokemon.h"
 #include "constants/easy_chat.h"
 #include "constants/facility_trainer_classes.h"

+#define MALE 0
+#define FEMALE 1
 #define NULL 0

 	.include "asm/macros.inc"
@@ -210,10 +213,7 @@ gUnknown_84791CC:: @ 84791CC
 	.incbin "baserom.gba", 0x4791CC, 0x1C

 gUnknown_84791E8:: @ 84791E8
-	.incbin "baserom.gba", 0x4791E8, 0xE8
-
-gUnknown_84792D0:: @ 84792D0
-	.incbin "baserom.gba", 0x4792D0, 0x10
+	.incbin "baserom.gba", 0x4791E8, 0x18

 	.section .rodata.8479668

@@ -2589,7 +2589,7 @@ gFile_graphics_battle_anims_sprites_257_palette:: @ 8D2FB94

 	.align 2
 gUnknown_8D2FBB4:: @ 8D2FBB4
-	.incbin "baserom.gba", 0xD2FBB4, 0x20
+	.incbin "graphics/interface/unk_8D2FBB4.gbapal"

 	.align 2
 gMonFrontPic_Bulbasaur:: @ 8D2FBD4
@@ -7724,7 +7724,7 @@ gMonIcon_Heracross:: @ 8DC21A0
 	.incbin "graphics/pokemon/heracross/icon.4bpp"

 gUnknown_heracross_icon:: @ 8DC25A0
-	.incbin "baserom.gba", 0xDC25A0, 0x400
+	.incbin "graphics/pokemon/heracross/unk_icon.4bpp"

 	.align 2
 gMonFootprint_Heracross:: @ 8DC29A0
@@ -13420,11 +13420,11 @@ gTrainerBackPic_RSMay:: @ 8E74EBC
 	.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"

 	.align 2
-gTrainerPalette_LeafBackPic:: @ 8E76EBC
+gTrainerPalette_RedBackPic:: @ 8E76EBC
 	.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"

 	.align 2
-gTrainerPalette_RedBackPic:: @ 8E76EE4
+gTrainerPalette_LeafBackPic:: @ 8E76EE4
 	.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"

 	.align 2
@@ -13936,13 +13936,13 @@ gUnknown_8E83604:: @ 8E83604
 	.incbin "baserom.gba", 0xE83604, 0x28

 gUnknown_8E8362C:: @ 8E8362C
-	.incbin "baserom.gba", 0xE8362C, 0x790
+	.incbin "graphics/interface/unk_8E8362C.4bpp.lz"

 gUnknown_8E83DBC:: @ 8E83DBC
-	.incbin "baserom.gba", 0xE83DBC, 0x7A4
+	.incbin "graphics/interface/unk_8E83DBC.4bpp.lz"

 gUnknown_8E84560:: @ 8E84560
-	.incbin "baserom.gba", 0xE84560, 0x28
+	.incbin "graphics/interface/unk_8E84560.gbapal.lz"
 	
 	.align 2
 gFile_graphics_interface_bag_swap_sheet:: @ 8E84588
@@ -3620,7 +3620,7 @@
      "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin"
    },
    {
-      "id": "LAYOUT_UNUSED_LAYOUT_83453C0",
+      "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2",
      "name": "UnusedLayout_83453C0_Layout",
      "width": 30,
      "height": 7,
@@ -10,6 +10,7 @@
 #include "constants/vars.h"
 #include "constants/weather.h"
@#include "constants/trainer_hill.h"
+#include "constants/map_objects.h"
    .include "asm/macros.inc"
    .include "constants/constants.inc"
    .include "constants/item_data_constants.inc"
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "106",
+      "graphics_id": "MAP_OBJ_GFX_METEORITE",
      "x": 15,
      "y": 12,
      "elevation": 3,
@@ -24,10 +24,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "BirthIsland_Exterior_EventScript_165271",
-      "flag": "154"
+      "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
    },
    {
-      "graphics_id": "240",
+      "graphics_id": "MAP_OBJ_GFX_VAR_0",
      "x": 15,
      "y": 3,
      "elevation": 3,
@@ -37,7 +37,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "0x0",
-      "flag": "153"
+      "flag": "FLAG_HIDE_DEOXYS"
    }
  ],
  "warp_events": [
@@ -10,36 +10,36 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213

 BirthIsland_Exterior_MapScript1_165217:: @ 8165217
 	setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR
-	setvar VAR_0x4010, 150
-	setvar VAR_SECRET_BASE_MAP, 0
-	setvar VAR_ALTERING_CAVE_WILD_SET, 0
-	checkflag FLAG_0x2E4
-	call_if 1, EventScript_16523C
-	checkflag FLAG_0x2E4
-	call_if 0, EventScript_165243
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N
+	setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0
+	setvar VAR_DEOXYS_INTERACTION_NUM, 0
+	checkflag FLAG_FOUGHT_DEOXYS
+	call_if TRUE, EventScript_16523C
+	checkflag FLAG_FOUGHT_DEOXYS
+	call_if FALSE, EventScript_165243
 	end

 EventScript_16523C:: @ 816523C
-	setflag FLAG_0x099
-	setflag FLAG_0x09A
+	setflag FLAG_HIDE_DEOXYS
+	setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
 	return

 EventScript_165243:: @ 8165243
-	checkflag FLAG_0x2F7
-	goto_if_eq EventScript_1A77A9
-	clearflag FLAG_0x09A
-	clearflag FLAG_0x848
+	checkflag FLAG_DEOXYS_FLEW_AWAY
+	goto_if TRUE, EventScript_1A77A9
+	clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
+	clearflag FLAG_SYS_DEOXYS_AWAKENED
 	return

 BirthIsland_Exterior_MapScript2_165253:: @ 8165253
-	checkflag FLAG_0x807
-	call_if 1, EventScript_16525D
+	checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
+	call_if TRUE, EventScript_16525D
 	end

 EventScript_16525D:: @ 816525D
-	specialvar VAR_RESULT, sub_80CA74C
-	compare_var_to_value VAR_RESULT, 7
-	goto_if 5, EventScript_1A77A9
+	specialvar VAR_RESULT, Special_GetBattleOutcome
+	compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
+	goto_if ne, EventScript_1A77A9
 	removeobject 2
 	return

@@ -48,7 +48,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271
 	faceplayer
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
 	special sub_80CCDFC
 	waitstate
@@ -91,23 +91,23 @@ EventScript_1652C0:: @ 81652C0
 	setvar VAR_0x8005, 30
 	setvar VAR_0x8006, 0
 	special CreateObedientEnemyMon
-	setflag FLAG_0x807
+	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special sub_807F9D8
 	waitstate
-	clearflag FLAG_0x807
-	specialvar VAR_RESULT, sub_80CA74C
-	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16533A
-	compare_var_to_value VAR_RESULT, 4
-	goto_if_eq EventScript_165348
-	compare_var_to_value VAR_RESULT, 5
-	goto_if_eq EventScript_165348
-	setflag FLAG_0x2E4
+	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
+	specialvar VAR_RESULT, Special_GetBattleOutcome
+	compare_var_to_value VAR_RESULT, B_OUTCOME_WON
+	goto_if eq, EventScript_16533A
+	compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
+	goto_if eq, EventScript_165348
+	compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
+	goto_if eq, EventScript_165348
+	setflag FLAG_FOUGHT_DEOXYS
 	release
 	end

 EventScript_16533A:: @ 816533A
-	setflag FLAG_0x2F7
+	setflag FLAG_DEOXYS_FLEW_AWAY
 	setvar VAR_0x8004, SPECIES_DEOXYS
 	goto EventScript_1A9236
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "108",
+      "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
      "x": 8,
      "y": 9,
      "elevation": 0,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "62",
+      "graphics_id": "MAP_OBJ_GFX_SAILOR",
      "x": 8,
      "y": 6,
      "elevation": 3,
@@ -6,23 +6,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 10
-	multichoice 20, 8, 61, 0
-	switch VAR_RESULT
-	case 0, EventScript_1A91D5
-	case 1, EventScript_1A90F6
-	case 127, EventScript_1A90F6
-	end
-
-NavelRock_Harbor_MapScripts:: @ 8165420
-	.byte 0
-
-NavelRock_Harbor_EventScript_165421:: @ 8165421
-	lock
-	faceplayer
-	message Text_181726
-	waitmessage
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND
 	multichoice 20, 8, 61, 0
 	switch VAR_RESULT
 	case 0, EventScript_1A91D5
@@ -25,7 +25,7 @@
  ],
  "object_events": [
    {
-      "graphics_id": "49",
+      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
      "x": 48,
      "y": 15,
      "elevation": 3,
@@ -35,10 +35,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_EventScript_166CFA",
-      "flag": "95"
+      "flag": "FLAG_HIDE_CELADON_ROCKETS"
    },
    {
-      "graphics_id": "27",
+      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
      "x": 38,
      "y": 14,
      "elevation": 3,
@@ -51,7 +51,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "112",
+      "graphics_id": "MAP_OBJ_GFX_POLIWRATH",
      "x": 36,
      "y": 14,
      "elevation": 3,
@@ -64,7 +64,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "17",
+      "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
      "x": 11,
      "y": 18,
      "elevation": 3,
@@ -77,7 +77,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
      "x": 18,
      "y": 22,
      "elevation": 3,
@@ -90,7 +90,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "32",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
      "x": 30,
      "y": 24,
      "elevation": 3,
@@ -103,7 +103,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "33",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
      "x": 26,
      "y": 19,
      "elevation": 3,
@@ -116,7 +116,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "49",
+      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
      "x": 38,
      "y": 31,
      "elevation": 3,
@@ -126,10 +126,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_EventScript_166D03",
-      "flag": "95"
+      "flag": "FLAG_HIDE_CELADON_ROCKETS"
    },
    {
-      "graphics_id": "32",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
      "x": 9,
      "y": 30,
      "elevation": 3,
@@ -142,7 +142,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "95",
+      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
      "x": 52,
      "y": 22,
      "elevation": 3,
@@ -151,11 +151,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_1BDF13",
-      "flag": "20"
+      "script": "EventScript_InteractWithCutTreeObject",
+      "flag": "FLAG_TEMP_14"
    },
    {
-      "graphics_id": "95",
+      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
      "x": 40,
      "y": 35,
      "elevation": 0,
@@ -164,11 +164,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_1BDF13",
-      "flag": "19"
+      "script": "EventScript_InteractWithCutTreeObject",
+      "flag": "FLAG_TEMP_13"
    },
    {
-      "graphics_id": "19",
+      "graphics_id": "MAP_OBJ_GFX_BOY",
      "x": 25,
      "y": 10,
      "elevation": 3,
@@ -194,7 +194,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 5,
      "y": 3,
      "elevation": 3,
@@ -204,10 +204,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_EventScript_1BEBC0",
-      "flag": "465"
+      "flag": "FLAG_HIDE_CELADON_CITY_ETHER"
    },
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 47,
      "y": 24,
      "elevation": 3,
@@ -217,7 +217,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_EventScript_166D15",
-      "flag": "95"
+      "flag": "FLAG_HIDE_CELADON_ROCKETS"
    }
  ],
  "warp_events": [
@@ -377,8 +377,9 @@
      "y": 20,
      "elevation": 3,
      "item": "ITEM_PP_UP",
-      "flag": "47",
-      "unknown": 1
+      "flag": "HIDDEN_ITEM_CELADON_CITY_PP_UP",
+      "quantity": 1,
+      "underfoot": false
    }
  ]
 }
@@ -77,9 +77,7 @@ CeladonCity_EventScript_166D27:: @ 8166D27

 CeladonCity_EventScript_166D30:: @ 8166D30
 	lockall
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_ERIKA, 0
 	msgbox gUnknown_81801A2
 	releaseall
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "125",
+      "graphics_id": "MAP_OBJ_GFX_MEOWTH",
      "x": 1,
      "y": 9,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "113",
+      "graphics_id": "MAP_OBJ_GFX_CLEFAIRY",
      "x": 5,
      "y": 13,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "122",
+      "graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
      "x": 5,
      "y": 8,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "35",
+      "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
      "x": 2,
      "y": 9,
      "elevation": 3,
@@ -4,17 +4,17 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320
 CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
 	lock
 	faceplayer
-	checkflag FLAG_0x2F8
-	goto_if_eq EventScript_16C36A
-	checkflag FLAG_0x82C
-	goto_if_eq EventScript_16C374
-	checkflag FLAG_0x2A6
-	goto_if_eq EventScript_16C36A
+	checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
+	goto_if TRUE, EventScript_16C36A
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_if TRUE, EventScript_16C374
+	checkflag FLAG_GOT_TEA
+	goto_if TRUE, EventScript_16C36A
 	msgbox gUnknown_81960C9
-	setflag FLAG_0x2A6
+	setflag FLAG_GOT_TEA
 	giveitem ITEM_TEA
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_1A6BF9
+	goto_if eq, EventScript_1A6BF9
 	msgbox gUnknown_8196109
 	release
 	end
@@ -25,10 +25,8 @@ EventScript_16C36A:: @ 816C36A
 	end

 EventScript_16C374:: @ 816C374
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
-	setflag FLAG_0x2F8
+	famechecker FAMECHECKER_DAISY, 4
+	setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
 	msgbox gUnknown_8196188
 	release
 	end
@@ -24,7 +24,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
-      "flag": "158"
+      "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
    },
    {
      "graphics_id": "0",
@@ -37,7 +37,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
-      "flag": "158"
+      "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
    }
  ],
  "warp_events": [
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "26",
+      "graphics_id": "MAP_OBJ_GFX_ROCKER",
      "x": 0,
      "y": 10,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "25",
+      "graphics_id": "MAP_OBJ_GFX_MAN",
      "x": 3,
      "y": 8,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "52",
+      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
      "x": 4,
      "y": 10,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "27",
+      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
      "x": 0,
      "y": 13,
      "elevation": 3,
@@ -18,7 +18,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
 	faceplayer
 	specialvar VAR_RESULT, HasAllKantoMons
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16C412
+	goto_if eq, EventScript_16C412
 	msgbox gUnknown_8196356
 	release
 	end
@@ -33,7 +33,7 @@ EventScript_16C418:: @ 816C418
 	delay 60
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	special sub_80CA618
 	waitstate
 	release
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "54",
+      "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
      "x": 3,
      "y": 5,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 7,
      "y": 3,
      "elevation": 0,
@@ -37,7 +37,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D",
-      "flag": "87"
+      "flag": "FLAG_HIDE_EEVEE_BALL"
    }
  ],
  "warp_events": [
@@ -11,11 +11,11 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
 	setvar VAR_0x4001, SPECIES_EEVEE
 	givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C4A6
+	goto_if eq, EventScript_16C4A6
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16C4DA
+	goto_if eq, EventScript_16C4DA
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A927C
+	goto_if eq, EventScript_1A927C
 	release
 	end

@@ -28,7 +28,7 @@ EventScript_16C4A6:: @ 816C4A6
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C514
+	goto_if eq, EventScript_16C514
 	call EventScript_1A8C27
 	call EventScript_1A74EB
 	goto EventScript_16C514
@@ -43,7 +43,7 @@ EventScript_16C4DA:: @ 816C4DA
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C509
+	goto_if eq, EventScript_16C509
 	call EventScript_1A8C33
 	goto EventScript_16C509
 	end
@@ -54,7 +54,7 @@ EventScript_16C509:: @ 816C509
 	end

 EventScript_16C514:: @ 816C514
-	setflag FLAG_0x263
+	setflag FLAG_GOT_EEVEE
 	release
 	end

@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "48",
+      "graphics_id": "MAP_OBJ_GFX_WORKER_F",
      "x": 6,
      "y": 10,
      "elevation": 3,
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "22",
+      "graphics_id": "MAP_OBJ_GFX_LASS",
      "x": 5,
      "y": 10,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "68",
+      "graphics_id": "MAP_OBJ_GFX_CLERK",
      "x": 1,
      "y": 8,
      "elevation": 0,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "68",
+      "graphics_id": "MAP_OBJ_GFX_CLERK",
      "x": 1,
      "y": 6,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "23",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
      "x": 11,
      "y": 6,
      "elevation": 3,
@@ -63,7 +63,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053",
-      "flag": "157"
+      "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
    }
  ],
  "warp_events": [
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	lock
 	faceplayer
 	message Text_1A6211
@@ -44,7 +44,7 @@ Items_16BB38:: @ 816BB38
 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	lock
 	faceplayer
 	message Text_1A6211
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "68",
+      "graphics_id": "MAP_OBJ_GFX_CLERK",
      "x": 10,
      "y": 9,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "51",
+      "graphics_id": "MAP_OBJ_GFX_GBA_KID",
      "x": 11,
      "y": 6,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "51",
+      "graphics_id": "MAP_OBJ_GFX_GBA_KID",
      "x": 4,
      "y": 9,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "51",
+      "graphics_id": "MAP_OBJ_GFX_GBA_KID",
      "x": 1,
      "y": 9,
      "elevation": 3,
@@ -66,7 +66,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "17",
+      "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
      "x": 9,
      "y": 14,
      "elevation": 3,
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "25",
+      "graphics_id": "MAP_OBJ_GFX_MAN",
      "x": 6,
      "y": 6,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
      "x": 10,
      "y": 11,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "68",
+      "graphics_id": "MAP_OBJ_GFX_CLERK",
      "x": 3,
      "y": 13,
      "elevation": 0,
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	lock
 	faceplayer
 	message Text_1A6211
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "61",
+      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
      "x": 11,
      "y": 6,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "62",
+      "graphics_id": "MAP_OBJ_GFX_SAILOR",
      "x": 6,
      "y": 8,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "68",
+      "graphics_id": "MAP_OBJ_GFX_CLERK",
      "x": 1,
      "y": 7,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "68",
+      "graphics_id": "MAP_OBJ_GFX_CLERK",
      "x": 1,
      "y": 6,
      "elevation": 3,
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	lock
 	faceplayer
 	message Text_1A6211
@@ -42,7 +42,7 @@ Items_16BC84:: @ 816BC84
 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	lock
 	faceplayer
 	message Text_1A6211
@@ -4,9 +4,9 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
 	lockall
 	setvar VAR_0x8004, 3
-	checkflag FLAG_0x002
-	call_if 0, EventScript_1A7AB9
-	copyvar VAR_0x8005, VAR_0x403A
+	checkflag FLAG_TEMP_2
+	call_if FALSE, EventScript_1A7AB9
+	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special sub_80CB580
 	message Text_1A535C
 	waitmessage
@@ -61,50 +61,50 @@ EventScript_16C1F3:: @ 816C1F3
 EventScript_16C246:: @ 816C246
 	setvar VAR_0x8006, 4
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
-	compare_var_to_value VAR_0x403A, 4
-	goto_if_eq EventScript_16C30E
+	compare_var_to_value VAR_ELEVATOR_FLOOR, 4
+	goto_if eq, EventScript_16C30E
 	call EventScript_16C313
-	setvar VAR_0x403A, 4
+	setvar VAR_ELEVATOR_FLOOR, 4
 	goto EventScript_16C30E
 	end

 EventScript_16C26E:: @ 816C26E
 	setvar VAR_0x8006, 5
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
-	compare_var_to_value VAR_0x403A, 5
-	goto_if_eq EventScript_16C30E
+	compare_var_to_value VAR_ELEVATOR_FLOOR, 5
+	goto_if eq, EventScript_16C30E
 	call EventScript_16C313
-	setvar VAR_0x403A, 5
+	setvar VAR_ELEVATOR_FLOOR, 5
 	goto EventScript_16C30E
 	end

 EventScript_16C296:: @ 816C296
 	setvar VAR_0x8006, 6
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
-	compare_var_to_value VAR_0x403A, 6
-	goto_if_eq EventScript_16C30E
+	compare_var_to_value VAR_ELEVATOR_FLOOR, 6
+	goto_if eq, EventScript_16C30E
 	call EventScript_16C313
-	setvar VAR_0x403A, 6
+	setvar VAR_ELEVATOR_FLOOR, 6
 	goto EventScript_16C30E
 	end

 EventScript_16C2BE:: @ 816C2BE
 	setvar VAR_0x8006, 7
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
-	compare_var_to_value VAR_0x403A, 7
-	goto_if_eq EventScript_16C30E
+	compare_var_to_value VAR_ELEVATOR_FLOOR, 7
+	goto_if eq, EventScript_16C30E
 	call EventScript_16C313
-	setvar VAR_0x403A, 7
+	setvar VAR_ELEVATOR_FLOOR, 7
 	goto EventScript_16C30E
 	end

 EventScript_16C2E6:: @ 816C2E6
 	setvar VAR_0x8006, 8
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
-	compare_var_to_value VAR_0x403A, 8
-	goto_if_eq EventScript_16C30E
+	compare_var_to_value VAR_ELEVATOR_FLOOR, 8
+	goto_if eq, EventScript_16C30E
 	call EventScript_16C313
-	setvar VAR_0x403A, 8
+	setvar VAR_ELEVATOR_FLOOR, 8
 	goto EventScript_16C30E
 	end

@@ -119,5 +119,5 @@ EventScript_16C313:: @ 816C313
 	waitse
 	special sub_80CB498
 	waitstate
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	return
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "41",
+      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
      "x": 9,
      "y": 5,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "17",
+      "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
      "x": 5,
      "y": 4,
      "elevation": 3,
@@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
 CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
 	lock
 	faceplayer
 	call EventScript_16BCF6
 	compare_var_to_value VAR_0x4001, 0
-	goto_if_eq EventScript_16C00E
+	goto_if eq, EventScript_16C00E
 	goto EventScript_16BD3E
 	end

@@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6
 	setvar VAR_0x4001, 0
 	checkitem ITEM_FRESH_WATER, 1
 	compare_var_to_value VAR_RESULT, 1
-	call_if 1, EventScript_16BD2C
+	call_if eq, EventScript_16BD2C
 	checkitem ITEM_SODA_POP, 1
 	compare_var_to_value VAR_RESULT, 1
-	call_if 1, EventScript_16BD32
+	call_if eq, EventScript_16BD32
 	checkitem ITEM_LEMONADE, 1
 	compare_var_to_value VAR_RESULT, 1
-	call_if 1, EventScript_16BD38
+	call_if eq, EventScript_16BD38
 	return

 EventScript_16BD2C:: @ 816BD2C
@@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38
 EventScript_16BD3E:: @ 816BD3E
 	msgbox gUnknown_8195D22, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C00C
+	goto_if eq, EventScript_16C00C
 	textcolor 3
 	message Text_195D5F
 	waitmessage
@@ -121,8 +121,8 @@ EventScript_16BED7:: @ 816BED7
 EventScript_16BF19:: @ 816BF19
 	setvar VAR_0x8008, ITEM_FRESH_WATER
 	setvar VAR_0x8009, ITEM_TM16
-	checkflag FLAG_0x296
-	goto_if_eq EventScript_16C018
+	checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
+	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195D75
 	goto EventScript_16BF7C
 	end
@@ -130,8 +130,8 @@ EventScript_16BF19:: @ 816BF19
 EventScript_16BF3A:: @ 816BF3A
 	setvar VAR_0x8008, ITEM_SODA_POP
 	setvar VAR_0x8009, ITEM_TM20
-	checkflag FLAG_0x295
-	goto_if_eq EventScript_16C018
+	checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
+	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195E33
 	goto EventScript_16BF7C
 	end
@@ -139,8 +139,8 @@ EventScript_16BF3A:: @ 816BF3A
 EventScript_16BF5B:: @ 816BF5B
 	setvar VAR_0x8008, ITEM_LEMONADE
 	setvar VAR_0x8009, ITEM_TM33
-	checkflag FLAG_0x294
-	goto_if_eq EventScript_16C018
+	checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
+	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195EBF
 	goto EventScript_16BF7C
 	end
@@ -151,7 +151,7 @@ EventScript_16BF7C:: @ 816BF7C
 	removeitem VAR_0x8008, 1
 	checkitemspace VAR_0x8009, 1
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C002
+	goto_if eq, EventScript_16C002
 	additem VAR_0x8009, 1
 	textcolor 3
 	playfanfare MUS_FANFA1
@@ -161,26 +161,26 @@ EventScript_16BF7C:: @ 816BF7C
 	giveitem VAR_0x8009, 1, 8
 	call EventScript_1A6675
 	compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER
-	call_if 1, EventScript_16BFDE
+	call_if eq, EventScript_16BFDE
 	compare_var_to_value VAR_0x8008, ITEM_SODA_POP
-	call_if 1, EventScript_16BFEA
+	call_if eq, EventScript_16BFEA
 	compare_var_to_value VAR_0x8008, ITEM_LEMONADE
-	call_if 1, EventScript_16BFF6
+	call_if eq, EventScript_16BFF6
 	release
 	end

 EventScript_16BFDE:: @ 816BFDE
-	setflag FLAG_0x296
+	setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
 	msgbox gUnknown_8195DD4
 	return

 EventScript_16BFEA:: @ 816BFEA
-	setflag FLAG_0x295
+	setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
 	msgbox gUnknown_8195E68
 	return

 EventScript_16BFF6:: @ 816BFF6
-	setflag FLAG_0x294
+	setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
 	msgbox gUnknown_8195EF4
 	return

@@ -262,16 +262,16 @@ EventScript_16C0C4:: @ 816C0C4

 EventScript_16C0CB:: @ 816C0CB
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C131
+	goto_if eq, EventScript_16C131
 	checkitemspace VAR_0x4000, 1
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C13F
+	goto_if eq, EventScript_16C13F
 	compare_var_to_value VAR_0x4001, 0
-	call_if 1, EventScript_16C0B6
+	call_if eq, EventScript_16C0B6
 	compare_var_to_value VAR_0x4001, 1
-	call_if 1, EventScript_16C0BD
+	call_if eq, EventScript_16C0BD
 	compare_var_to_value VAR_0x4001, 2
-	call_if 1, EventScript_16C0C4
+	call_if eq, EventScript_16C0C4
 	updatemoneybox 0, 0, 0
 	getitemname 0, VAR_0x4000
 	playse SE_JIHANKI
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "48",
+      "graphics_id": "MAP_OBJ_GFX_WORKER_F",
      "x": 4,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "47",
+      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
      "x": 6,
      "y": 2,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "30",
+      "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
      "x": 1,
      "y": 6,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
      "x": 1,
      "y": 8,
      "elevation": 3,
@@ -66,7 +66,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "57",
+      "graphics_id": "MAP_OBJ_GFX_FISHER",
      "x": 4,
      "y": 7,
      "elevation": 3,
@@ -79,7 +79,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "91",
+      "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
      "x": 7,
      "y": 10,
      "elevation": 3,
@@ -92,7 +92,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "23",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
      "x": 7,
      "y": 8,
      "elevation": 3,
@@ -105,7 +105,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "33",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
      "x": 10,
      "y": 9,
      "elevation": 3,
@@ -118,7 +118,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 13,
      "y": 7,
      "elevation": 3,
@@ -131,7 +131,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "61",
+      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
      "x": 16,
      "y": 10,
      "elevation": 3,
@@ -144,7 +144,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "49",
+      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
      "x": 11,
      "y": 2,
      "elevation": 3,
@@ -154,7 +154,7 @@
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_GameCorner_EventScript_16CAF5",
-      "flag": "91"
+      "flag": "FLAG_HIDE_GAME_CORNER_ROCKET"
    }
  ],
  "warp_events": [
@@ -195,8 +195,9 @@
      "y": 4,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "51",
-      "unknown": 10
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS",
+      "quantity": 10,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -204,8 +205,9 @@
      "y": 8,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "52",
-      "unknown": 10
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2",
+      "quantity": 10,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -213,8 +215,9 @@
      "y": 11,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "53",
-      "unknown": 20
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3",
+      "quantity": 20,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -222,8 +225,9 @@
      "y": 12,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "54",
-      "unknown": 10
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4",
+      "quantity": 10,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -231,8 +235,9 @@
      "y": 9,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "55",
-      "unknown": 10
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5",
+      "quantity": 10,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -240,8 +245,9 @@
      "y": 5,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "56",
-      "unknown": 20
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6",
+      "quantity": 20,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -249,8 +255,9 @@
      "y": 4,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "57",
-      "unknown": 10
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7",
+      "quantity": 10,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -258,8 +265,9 @@
      "y": 3,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "58",
-      "unknown": 10
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8",
+      "quantity": 10,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -267,8 +275,9 @@
      "y": 5,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "59",
-      "unknown": 10
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9",
+      "quantity": 10,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -276,8 +285,9 @@
      "y": 5,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "60",
-      "unknown": 40
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10",
+      "quantity": 40,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -285,8 +295,9 @@
      "y": 13,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "61",
-      "unknown": 100
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11",
+      "quantity": 100,
+      "underfoot": false
    },
    {
      "type": "hidden_item",
@@ -294,8 +305,9 @@
      "y": 12,
      "elevation": 3,
      "item": "ITEM_NONE",
-      "flag": "62",
-      "unknown": 10
+      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12",
+      "quantity": 10,
+      "underfoot": false
    },
    {
      "type": "bg_event_type_4",
@@ -3,8 +3,8 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646
 	.byte 0

 CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C
-	checkflag FLAG_0x26D
-	call_if 0, EventScript_16C656
+	checkflag FLAG_OPENED_ROCKET_HIDEOUT
+	call_if FALSE, EventScript_16C656
 	end

 EventScript_16C656:: @ 816C656
@@ -22,7 +22,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	lock
 	faceplayer
 	showmoneybox 0, 0, 0
@@ -40,20 +40,20 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D

 EventScript_16C6E6:: @ 816C6E6
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if 0, EventScript_16C790
+	goto_if FALSE, EventScript_16C790
 	compare_var_to_value VAR_0x8009, 0
-	goto_if_eq EventScript_16C734
+	goto_if eq, EventScript_16C734
 	compare_var_to_value VAR_0x8009, 1
-	goto_if_eq EventScript_16C706
+	goto_if eq, EventScript_16C706
 	end

 EventScript_16C706:: @ 816C706
 	checkcoins VAR_0x4001
 	compare_var_to_value VAR_0x4001, 9500
-	goto_if 4, EventScript_16C79E
+	goto_if ge, EventScript_16C79E
 	checkmoney 10000, 0
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C7AC
+	goto_if eq, EventScript_16C7AC
 	givecoins 500
 	takemoney 10000, 0
 	goto EventScript_16C762
@@ -62,10 +62,10 @@ EventScript_16C706:: @ 816C706
 EventScript_16C734:: @ 816C734
 	checkcoins VAR_0x4001
 	compare_var_to_value VAR_0x4001, 9950
-	goto_if 4, EventScript_16C79E
+	goto_if ge, EventScript_16C79E
 	checkmoney 1000, 0
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C7AC
+	goto_if eq, EventScript_16C7AC
 	givecoins 50
 	takemoney 1000, 0
 	goto EventScript_16C762
@@ -131,20 +131,20 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7
 CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
 	lock
 	faceplayer
-	checkflag FLAG_0x26E
-	goto_if_eq EventScript_16C849
+	checkflag FLAG_GOT_10_COINS_FROM_GAMBLER
+	goto_if TRUE, EventScript_16C849
 	msgbox gUnknown_8196AF3
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if 0, EventScript_16C839
+	goto_if FALSE, EventScript_16C839
 	checkcoins VAR_0x4001
 	compare_var_to_value VAR_0x4001, 9990
-	goto_if 4, EventScript_16C82B
+	goto_if ge, EventScript_16C82B
 	givecoins 10
 	textcolor 3
 	msgbox gUnknown_8196B0D
 	playse SE_SHOP
 	waitse
-	setflag FLAG_0x26E
+	setflag FLAG_GOT_10_COINS_FROM_GAMBLER
 	goto EventScript_16C7CA
 	end

@@ -167,8 +167,8 @@ EventScript_16C849:: @ 816C849
 CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
 	lock
 	faceplayer
-	checkflag FLAG_0x4B3
-	goto_if_eq EventScript_16C870
+	checkflag FLAG_DEFEATED_ERIKA
+	goto_if TRUE, EventScript_16C870
 	msgbox gUnknown_8196BAD
 	goto EventScript_16C7CA
 	end
@@ -195,20 +195,20 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E
 CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
 	lock
 	faceplayer
-	checkflag FLAG_0x26F
-	goto_if_eq EventScript_16C8F0
+	checkflag FLAG_GOT_20_COINS_FROM_GAMBLER
+	goto_if TRUE, EventScript_16C8F0
 	msgbox gUnknown_8196D2B
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if 0, EventScript_16C839
+	goto_if FALSE, EventScript_16C839
 	checkcoins VAR_0x4001
 	compare_var_to_value VAR_0x4001, 9980
-	goto_if 4, EventScript_16C8E2
+	goto_if ge, EventScript_16C8E2
 	givecoins 20
 	textcolor 3
 	msgbox gUnknown_8196D47
 	playse SE_SHOP
 	waitse
-	setflag FLAG_0x26F
+	setflag FLAG_GOT_20_COINS_FROM_GAMBLER
 	goto EventScript_16C7CA
 	end

@@ -225,20 +225,20 @@ EventScript_16C8F0:: @ 816C8F0
 CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
 	lock
 	faceplayer
-	checkflag FLAG_0x270
-	goto_if_eq EventScript_16C950
+	checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
+	goto_if TRUE, EventScript_16C950
 	msgbox gUnknown_8196DB7
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if 0, EventScript_16C839
+	goto_if FALSE, EventScript_16C839
 	checkcoins VAR_0x4001
 	compare_var_to_value VAR_0x4001, 9980
-	goto_if 4, EventScript_16C942
+	goto_if ge, EventScript_16C942
 	givecoins 20
 	textcolor 3
 	msgbox gUnknown_8196DF8
 	playse SE_SHOP
 	waitse
-	setflag FLAG_0x270
+	setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
 	goto EventScript_16C7CA
 	end

@@ -264,10 +264,10 @@ EventScript_16C96A:: @ 816C96A

 EventScript_16C96C:: @ 816C96C
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if 0, EventScript_16CAA0
+	goto_if FALSE, EventScript_16CAA0
 	msgbox gUnknown_8196F46, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16C96A
+	goto_if eq, EventScript_16C96A
 	setfieldeffectarg 0, 255
 	setfieldeffectarg 1, 10
 	setfieldeffectarg 2, 14
@@ -412,8 +412,8 @@ EventScript_16CAA0:: @ 816CAA0
 CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
 	lockall
 	msgbox gUnknown_8196EDC
-	checkflag FLAG_0x26D
-	call_if 0, EventScript_16CABE
+	checkflag FLAG_OPENED_ROCKET_HIDEOUT
+	call_if FALSE, EventScript_16CABE
 	releaseall
 	end

@@ -425,11 +425,11 @@ EventScript_16CABE:: @ 816CABE
 	setmetatile 16, 3, 678, 1
 	setmetatile 17, 3, 679, 1
 	special DrawWholeMapView
-	setflag FLAG_0x26D
+	setflag FLAG_OPENED_ROCKET_HIDEOUT
 	return

 CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
-	trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10
+	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10
 	msgbox gUnknown_8196E9B, 6
 	end

@@ -437,9 +437,9 @@ EventScript_16CB10:: @ 816CB10
 	msgbox gUnknown_8196E9B
 	closemessage
 	compare_var_to_value VAR_FACING, 3
-	call_if 1, EventScript_16CB34
+	call_if eq, EventScript_16CB34
 	compare_var_to_value VAR_FACING, 3
-	call_if 5, EventScript_16CB3F
+	call_if ne, EventScript_16CB3F
 	removeobject 11
 	release
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "30",
+      "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
      "x": 2,
      "y": 6,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "33",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
      "x": 6,
      "y": 7,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "47",
+      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
      "x": 4,
      "y": 2,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "47",
+      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
      "x": 6,
      "y": 2,
      "elevation": 3,
@@ -66,7 +66,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "47",
+      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
      "x": 2,
      "y": 2,
      "elevation": 3,
@@ -13,10 +13,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
 	lock
 	faceplayer
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if 0, EventScript_16CD99
+	goto_if FALSE, EventScript_16CD99
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CBB2
@@ -75,10 +75,10 @@ EventScript_16CC65:: @ 816CC65
 	getspeciesname 0, VAR_0x4001
 	msgbox gUnknown_819709D, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16CC10
+	goto_if eq, EventScript_16CC10
 	checkcoins VAR_RESULT
 	compare_var_to_var VAR_RESULT, VAR_0x4002
-	goto_if 0, EventScript_16CDA5
+	goto_if lt, EventScript_16CDA5
 	textcolor 3
 	switch VAR_0x4001
 	case SPECIES_ABRA, EventScript_16CCD4
@@ -121,11 +121,11 @@ EventScript_16CD3D:: @ 816CD3D

 EventScript_16CD52:: @ 816CD52
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16CDB3
+	goto_if eq, EventScript_16CDB3
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16CDE0
+	goto_if eq, EventScript_16CDE0
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_16CD74
+	goto_if eq, EventScript_16CD74
 	end

 EventScript_16CD74:: @ 816CD74
@@ -164,7 +164,7 @@ EventScript_16CDB3:: @ 816CDB3
 	waitfanfare
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16CD83
+	goto_if eq, EventScript_16CD83
 	goto EventScript_16CC10
 	end

@@ -178,7 +178,7 @@ EventScript_16CDE0:: @ 816CDE0
 	waitfanfare
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16CE12
+	goto_if eq, EventScript_16CE12
 	call EventScript_1A8C33
 	goto EventScript_16CE12
 	end
@@ -192,10 +192,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
 	lock
 	faceplayer
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if 0, EventScript_16CD99
+	goto_if FALSE, EventScript_16CD99
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CE47
@@ -253,7 +253,7 @@ EventScript_16CEF5:: @ 816CEF5
 EventScript_16CF09:: @ 816CF09
 	msgbox gUnknown_81970B2, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16CC10
+	goto_if eq, EventScript_16CC10
 	goto EventScript_16CF3F
 	end

@@ -261,7 +261,7 @@ EventScript_16CF22:: @ 816CF22
 	getitemname 0, VAR_0x4001
 	msgbox gUnknown_819709D, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16CC10
+	goto_if eq, EventScript_16CC10
 	goto EventScript_16CF3F
 	end

@@ -269,10 +269,10 @@ EventScript_16CF3F:: @ 816CF3F
 	getitemname 0, VAR_0x4001
 	checkcoins VAR_RESULT
 	compare_var_to_var VAR_RESULT, VAR_0x4002
-	goto_if 0, EventScript_16CDA5
+	goto_if lt, EventScript_16CDA5
 	checkitemspace VAR_0x4001, 1
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16CF79
+	goto_if eq, EventScript_16CF79
 	takecoins VAR_0x4002
 	updatecoinsbox 0, 5
 	giveitem VAR_0x4001
@@ -290,10 +290,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
 	lock
 	faceplayer
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if 0, EventScript_16CD99
+	goto_if FALSE, EventScript_16CD99
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CFB2
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "22",
+      "graphics_id": "MAP_OBJ_GFX_LASS",
      "x": 3,
      "y": 11,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "29",
+      "graphics_id": "MAP_OBJ_GFX_BEAUTY",
      "x": 9,
      "y": 10,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "40",
+      "graphics_id": "MAP_OBJ_GFX_PICNICKER",
      "x": 10,
      "y": 7,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "29",
+      "graphics_id": "MAP_OBJ_GFX_BEAUTY",
      "x": 2,
      "y": 6,
      "elevation": 3,
@@ -66,7 +66,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "29",
+      "graphics_id": "MAP_OBJ_GFX_BEAUTY",
      "x": 5,
      "y": 4,
      "elevation": 3,
@@ -79,7 +79,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "22",
+      "graphics_id": "MAP_OBJ_GFX_LASS",
      "x": 7,
      "y": 4,
      "elevation": 3,
@@ -92,7 +92,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "83",
+      "graphics_id": "MAP_OBJ_GFX_ERIKA",
      "x": 6,
      "y": 4,
      "elevation": 3,
@@ -105,7 +105,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "42",
+      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
      "x": 8,
      "y": 7,
      "elevation": 3,
@@ -118,7 +118,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "95",
+      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
      "x": 6,
      "y": 8,
      "elevation": 3,
@@ -127,11 +127,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Gym_EventScript_1BDF13",
-      "flag": "18"
+      "script": "EventScript_InteractWithCutTreeObject",
+      "flag": "FLAG_TEMP_12"
    },
    {
-      "graphics_id": "95",
+      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
      "x": 3,
      "y": 5,
      "elevation": 3,
@@ -140,11 +140,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Gym_EventScript_1BDF13",
-      "flag": "19"
+      "script": "EventScript_InteractWithCutTreeObject",
+      "flag": "FLAG_TEMP_13"
    },
    {
-      "graphics_id": "95",
+      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
      "x": 9,
      "y": 6,
      "elevation": 3,
@@ -153,8 +153,8 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Gym_EventScript_1BDF13",
-      "flag": "20"
+      "script": "EventScript_InteractWithCutTreeObject",
+      "flag": "FLAG_TEMP_14"
    }
  ],
  "warp_events": [
@@ -2,28 +2,21 @@ CeladonCity_Gym_MapScripts:: @ 816D060
 	.byte 0

 CeladonCity_Gym_EventScript_16D061:: @ 816D061
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 2
-	special UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0
-	checkflag FLAG_0x293
-	goto_if 0, EventScript_16D0C6
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
+	checkflag FLAG_GOT_TM19_FROM_ERIKA
+	goto_if FALSE, EventScript_16D0C6
+	famechecker FAMECHECKER_ERIKA, 4
 	msgbox gUnknown_81972B8
 	release
 	end

 EventScript_16D0A0:: @ 816D0A0
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
-	clearflag FLAG_0x09E
-	setflag FLAG_0x4B3
-	setflag FLAG_0x823
-	setvar VAR_0x8008, 4
-	call EventScript_1A6B18
+	famechecker FAMECHECKER_ERIKA, 1
+	clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS
+	setflag FLAG_DEFEATED_ERIKA
+	setflag FLAG_BADGE04_GET
+	set_gym_trainers 4
 	goto EventScript_16D0C6
 	end

@@ -31,14 +24,10 @@ EventScript_16D0C6:: @ 816D0C6
 	msgbox gUnknown_8197327
 	checkitemspace ITEM_TM19, 1
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16D107
+	goto_if eq, EventScript_16D107
 	additem ITEM_TM19, 1
-	loadword 0, gUnknown_81973BA
-	setorcopyvar VAR_0x8000, ITEM_TM19
-	setorcopyvar VAR_0x8001, 1
-	setorcopyvar VAR_0x8002, MUS_FANFA1
-	callstd 9 @ gStdScript_ItemMessageAndFanfare
-	setflag FLAG_0x293
+	giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19
+	setflag FLAG_GOT_TM19_FROM_ERIKA
 	msgbox gUnknown_81973D7
 	release
 	end
@@ -49,50 +38,46 @@ EventScript_16D107:: @ 816D107
 	end

 CeladonCity_Gym_EventScript_16D111:: @ 816D111
-	trainerbattle 0, 132, 0, Text_19747C, Text_1974C4
+	trainerbattle 0, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4
 	msgbox gUnknown_81974D6, 6
 	end

 CeladonCity_Gym_EventScript_16D128:: @ 816D128
-	trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	trainerbattle 0, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF
+	famechecker FAMECHECKER_ERIKA, 2
 	msgbox gUnknown_8197708, 6
 	end

 CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
-	trainerbattle 0, 160, 0, Text_197595, Text_1975BB
+	trainerbattle 0, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB
 	msgbox gUnknown_81975D1, 6
 	end

 CeladonCity_Gym_EventScript_16D163:: @ 816D163
-	trainerbattle 0, 265, 0, Text_1974FA, Text_19751C
+	trainerbattle 0, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C
 	msgbox gUnknown_8197527, 6
 	end

 CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
-	trainerbattle 0, 266, 0, Text_19760B, Text_197660
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	trainerbattle 0, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660
+	famechecker FAMECHECKER_ERIKA, 3
 	msgbox gUnknown_8197664, 6
 	end

 CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
-	trainerbattle 0, 267, 0, Text_197747, Text_19777A
+	trainerbattle 0, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A
 	msgbox gUnknown_8197788, 6
 	end

 CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
-	trainerbattle 0, 402, 0, Text_1977E5, Text_197832
+	trainerbattle 0, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832
 	msgbox gUnknown_819783E, 6
 	end

 CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC
 	lockall
-	checkflag FLAG_0x823
-	goto_if_eq EventScript_16D1E0
+	checkflag FLAG_BADGE04_GET
+	goto_if TRUE, EventScript_16D1E0
 	msgbox gUnknown_8197874
 	releaseall
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "35",
+      "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
      "x": 5,
      "y": 4,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "29",
+      "graphics_id": "MAP_OBJ_GFX_BEAUTY",
      "x": 3,
      "y": 6,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "25",
+      "graphics_id": "MAP_OBJ_GFX_MAN",
      "x": 9,
      "y": 7,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "16",
+      "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
      "x": 2,
      "y": 6,
      "elevation": 3,
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "33",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
      "x": 5,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "49",
+      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
      "x": 2,
      "y": 4,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "49",
+      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
      "x": 8,
      "y": 4,
      "elevation": 3,
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "64",
+      "graphics_id": "MAP_OBJ_GFX_NURSE",
      "x": 7,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "61",
+      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
      "x": 4,
      "y": 4,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "42",
+      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
      "x": 10,
      "y": 6,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
      "x": 12,
      "y": 5,
      "elevation": 3,
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 6,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 2,
      "y": 2,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 10,
      "y": 2,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "69",
+      "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
      "x": 1,
      "y": 2,
      "elevation": 3,
@@ -63,7 +63,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_HIDE_MG_DELIVERYMEN"
    }
  ],
  "warp_events": [
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "59",
+      "graphics_id": "MAP_OBJ_GFX_CHEF",
      "x": 12,
      "y": 7,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
      "x": 11,
      "y": 4,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "27",
+      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
      "x": 9,
      "y": 4,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "30",
+      "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
      "x": 1,
      "y": 2,
      "elevation": 0,
@@ -66,7 +66,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "47",
+      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
      "x": 3,
      "y": 7,
      "elevation": 0,
@@ -13,11 +13,11 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
 	lock
 	faceplayer
 	checkflag FLAG_GOT_COIN_CASE
-	goto_if_eq EventScript_16D24B
+	goto_if TRUE, EventScript_16D24B
 	msgbox gUnknown_81979C1
 	checkitemspace ITEM_COIN_CASE, 1
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16D241
+	goto_if eq, EventScript_16D241
 	additem ITEM_COIN_CASE, 1
 	giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE
 	setflag FLAG_GOT_COIN_CASE
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 7,
      "y": 3,
      "elevation": 3,
@@ -24,10 +24,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_1F_EventScript_1BEA47",
-      "flag": "434"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET"
    },
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 11,
      "y": 16,
      "elevation": 3,
@@ -37,10 +37,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_1F_EventScript_1BEA54",
-      "flag": "435"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE"
    },
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 25,
      "y": 5,
      "elevation": 4,
@@ -50,10 +50,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_1F_EventScript_1BEA3A",
-      "flag": "433"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 7,
      "y": 21,
      "elevation": 3,
@@ -62,11 +62,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "18"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_12"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 13,
      "y": 21,
      "elevation": 3,
@@ -75,11 +75,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "19"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_13"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 5,
      "y": 20,
      "elevation": 3,
@@ -88,11 +88,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "20"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_14"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 14,
      "y": 20,
      "elevation": 3,
@@ -101,11 +101,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "21"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_15"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 11,
      "y": 21,
      "elevation": 3,
@@ -114,11 +114,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "22"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_16"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 9,
      "y": 18,
      "elevation": 3,
@@ -127,8 +127,8 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_1F_EventScript_1BE00C",
-      "flag": "23"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_17"
    }
  ],
  "warp_events": [
@@ -196,9 +196,10 @@
      "x": 12,
      "y": 2,
      "elevation": 3,
-      "item": "POCKET_KEY_ITEMS",
-      "flag": "39",
-      "unknown": 1
+      "item": "ITEM_ULTRA_BALL",
+      "flag": "HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL",
+      "quantity": 1,
+      "underfoot": false
    }
  ]
 }
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 9,
      "y": 18,
      "elevation": 3,
@@ -24,10 +24,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_2F_EventScript_1BEA6E",
-      "flag": "437"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP"
    },
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 29,
      "y": 16,
      "elevation": 3,
@@ -37,10 +37,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_2F_EventScript_1BEA7B",
-      "flag": "438"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL"
    },
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 33,
      "y": 12,
      "elevation": 3,
@@ -50,10 +50,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_2F_EventScript_1BEA61",
-      "flag": "436"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 33,
      "y": 10,
      "elevation": 3,
@@ -62,11 +62,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "18"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_12"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 33,
      "y": 9,
      "elevation": 3,
@@ -75,11 +75,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "19"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_13"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 25,
      "y": 11,
      "elevation": 3,
@@ -88,11 +88,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "20"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_14"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 28,
      "y": 20,
      "elevation": 3,
@@ -101,11 +101,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "21"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_15"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 30,
      "y": 20,
      "elevation": 3,
@@ -114,11 +114,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "22"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_16"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 9,
      "y": 13,
      "elevation": 3,
@@ -127,11 +127,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "23"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_17"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 23,
      "y": 16,
      "elevation": 3,
@@ -140,11 +140,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "24"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_18"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 13,
      "y": 6,
      "elevation": 3,
@@ -153,11 +153,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "25"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_19"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 4,
      "y": 12,
      "elevation": 3,
@@ -166,11 +166,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "26"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_1A"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 10,
      "y": 20,
      "elevation": 3,
@@ -179,8 +179,8 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_2F_EventScript_1BE00C",
-      "flag": "27"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_1B"
    }
  ],
  "warp_events": [
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 31,
      "y": 9,
      "elevation": 4,
@@ -24,10 +24,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_B1F_EventScript_1BEA95",
-      "flag": "440"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL"
    },
    {
-      "graphics_id": "92",
+      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
      "x": 32,
      "y": 2,
      "elevation": 3,
@@ -37,10 +37,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_B1F_EventScript_1BEA88",
-      "flag": "439"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE"
    },
    {
-      "graphics_id": "139",
+      "graphics_id": "MAP_OBJ_GFX_MEWTWO",
      "x": 7,
      "y": 12,
      "elevation": 3,
@@ -50,10 +50,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCave_B1F_EventScript_1624F5",
-      "flag": "129"
+      "flag": "FLAG_HIDE_MEWTWO"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 37,
      "y": 1,
      "elevation": 3,
@@ -62,11 +62,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "18"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_12"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 38,
      "y": 2,
      "elevation": 3,
@@ -75,11 +75,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "19"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_13"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 35,
      "y": 1,
      "elevation": 3,
@@ -88,11 +88,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "20"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_14"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 37,
      "y": 4,
      "elevation": 3,
@@ -101,11 +101,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "21"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_15"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 35,
      "y": 5,
      "elevation": 3,
@@ -114,11 +114,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "22"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_16"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 2,
      "y": 2,
      "elevation": 3,
@@ -127,11 +127,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "23"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_17"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 4,
      "y": 1,
      "elevation": 3,
@@ -140,11 +140,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "24"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_18"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 6,
      "y": 1,
      "elevation": 3,
@@ -153,11 +153,11 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "25"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_19"
    },
    {
-      "graphics_id": "96",
+      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
      "x": 3,
      "y": 4,
      "elevation": 3,
@@ -166,8 +166,8 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCave_B1F_EventScript_1BE00C",
-      "flag": "26"
+      "script": "EventScript_InteractWithRockSmashRockObject",
+      "flag": "FLAG_TEMP_1A"
    }
  ],
  "warp_events": [
@@ -4,30 +4,30 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE
 	.byte 0

 CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9
-	checkflag FLAG_0x807
-	call_if 1, EventScript_1624D3
+	checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
+	call_if TRUE, EventScript_1624D3
 	end

 EventScript_1624D3:: @ 81624D3
-	specialvar VAR_RESULT, sub_80CA74C
-	compare_var_to_value VAR_RESULT, 7
-	goto_if 5, EventScript_1A77A9
+	specialvar VAR_RESULT, Special_GetBattleOutcome
+	compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
+	goto_if ne, EventScript_1A77A9
 	removeobject VAR_LAST_TALKED
 	return

 CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7
-	checkflag FLAG_0x2BC
-	call_if 0, EventScript_1624F1
+	checkflag FLAG_FOUGHT_MEWTWO
+	call_if FALSE, EventScript_1624F1
 	end

 EventScript_1624F1:: @ 81624F1
-	clearflag FLAG_0x081
+	clearflag FLAG_HIDE_MEWTWO
 	return

 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
 	lock
 	faceplayer
@@ -40,23 +40,23 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
-	setflag FLAG_0x807
+	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special sub_807F9D8
 	waitstate
-	clearflag FLAG_0x807
-	specialvar VAR_RESULT, sub_80CA74C
-	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_162558
-	compare_var_to_value VAR_RESULT, 4
-	goto_if_eq EventScript_162561
-	compare_var_to_value VAR_RESULT, 5
-	goto_if_eq EventScript_162561
-	setflag FLAG_0x2BC
+	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
+	specialvar VAR_RESULT, Special_GetBattleOutcome
+	compare_var_to_value VAR_RESULT, B_OUTCOME_WON
+	goto_if eq, EventScript_162558
+	compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
+	goto_if eq, EventScript_162561
+	compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
+	goto_if eq, EventScript_162561
+	setflag FLAG_FOUGHT_MEWTWO
 	release
 	end

 EventScript_162558:: @ 8162558
-	setflag FLAG_0x2BC
+	setflag FLAG_FOUGHT_MEWTWO
 	goto EventScript_1A922D

 EventScript_162560:: @ 8162560
@@ -1,43 +0,0 @@
-CeruleanCity_EventObjects:
-	object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0
-	object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0
-	object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0
-	object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0
-	object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0
-	object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0
-	object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0
-	object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0
-	object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0
-	object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0
-	object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0
-	object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0
-
-CeruleanCity_MapWarps:
-	warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1
-	warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2
-	warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3
-	warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F
-	warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM
-	warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP
-	warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART
-	warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F
-	warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1
-	warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2
-	warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2
-	warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP
-	warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4
-	warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5
-
-CeruleanCity_MapCoordEvents:
-	coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A
-	coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6
-	coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9
-	coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683
-	coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3
-
-CeruleanCity_MapBGEvents:
-	bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY, 
-
-CeruleanCity_MapEvents::
-	map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents
-
@@ -35,7 +35,7 @@
  ],
  "object_events": [
    {
-      "graphics_id": "60",
+      "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
      "x": 31,
      "y": 12,
      "elevation": 3,
@@ -48,7 +48,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "49",
+      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
      "x": 33,
      "y": 6,
      "elevation": 3,
@@ -58,10 +58,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCity_EventScript_166603",
-      "flag": "59"
+      "flag": "FLAG_HIDE_CERULEAN_ROCKET"
    },
    {
-      "graphics_id": "16",
+      "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
      "x": 16,
      "y": 21,
      "elevation": 3,
@@ -74,7 +74,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "30",
+      "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
      "x": 9,
      "y": 23,
      "elevation": 3,
@@ -87,7 +87,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "129",
+      "graphics_id": "MAP_OBJ_GFX_SLOWBRO",
      "x": 32,
      "y": 29,
      "elevation": 3,
@@ -100,7 +100,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "22",
+      "graphics_id": "MAP_OBJ_GFX_LASS",
      "x": 33,
      "y": 29,
      "elevation": 3,
@@ -113,7 +113,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
      "x": 34,
      "y": 22,
      "elevation": 3,
@@ -126,7 +126,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "72",
+      "graphics_id": "MAP_OBJ_GFX_BLUE",
      "x": 22,
      "y": 0,
      "elevation": 3,
@@ -136,10 +136,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "0x0",
-      "flag": "60"
+      "flag": "FLAG_HIDE_CERULEAN_RIVAL"
    },
    {
-      "graphics_id": "95",
+      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
      "x": 26,
      "y": 32,
      "elevation": 3,
@@ -148,8 +148,8 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeruleanCity_EventScript_1BDF13",
-      "flag": "19"
+      "script": "EventScript_InteractWithCutTreeObject",
+      "flag": "FLAG_TEMP_13"
    },
    {
      "graphics_id": "65375",
@@ -165,7 +165,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "23",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
      "x": 12,
      "y": 30,
      "elevation": 3,
@@ -178,7 +178,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "41",
+      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
      "x": 1,
      "y": 13,
      "elevation": 3,
@@ -188,7 +188,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCity_EventScript_16672F",
-      "flag": "92"
+      "flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD"
    }
  ],
  "warp_events": [
@@ -297,7 +297,7 @@
      "x": 22,
      "y": 6,
      "elevation": 3,
-      "var": "VAR_0x4052",
+      "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
      "var_value": 0,
      "script": "CeruleanCity_EventScript_16649A"
    },
@@ -306,7 +306,7 @@
      "x": 23,
      "y": 6,
      "elevation": 3,
-      "var": "VAR_0x4052",
+      "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
      "var_value": 0,
      "script": "CeruleanCity_EventScript_1664A6"
    },
@@ -315,7 +315,7 @@
      "x": 24,
      "y": 6,
      "elevation": 3,
-      "var": "VAR_0x4052",
+      "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
      "var_value": 0,
      "script": "CeruleanCity_EventScript_1664B9"
    },
@@ -324,7 +324,7 @@
      "x": 33,
      "y": 5,
      "elevation": 3,
-      "var": "VAR_0x407D",
+      "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET",
      "var_value": 0,
      "script": "CeruleanCity_EventScript_166683"
    },
@@ -333,7 +333,7 @@
      "x": 33,
      "y": 7,
      "elevation": 3,
-      "var": "VAR_0x407D",
+      "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET",
      "var_value": 0,
      "script": "CeruleanCity_EventScript_1666A3"
    }
@@ -373,8 +373,9 @@
      "y": 7,
      "elevation": 3,
      "item": "ITEM_RARE_CANDY",
-      "flag": "49",
-      "unknown": 1
+      "flag": "HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY",
+      "quantity": 1,
+      "underfoot": false
    },
    {
      "type": "bg_event_type_0",
@@ -4,8 +4,8 @@ CeruleanCity_MapScripts:: @ 8166471

 CeruleanCity_MapScript1_166477:: @ 8166477
 	setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY
-	checkflag FLAG_0x234
-	call_if 0, EventScript_166484
+	checkflag FLAG_GOT_SS_TICKET
+	call_if FALSE, EventScript_166484
 	end

 EventScript_166484:: @ 8166484
@@ -36,7 +36,7 @@ CeruleanCity_EventScript_1664B9:: @ 81664B9

 EventScript_1664CC:: @ 81664CC
 	textcolor 0
-	setvar VAR_0x4054, 2
+	setvar VAR_MAP_SCENE_ROUTE22, 2
 	playbgm MUS_RIVAL1, 0
 	addobject 8
 	applymovement 8, Movement_1665D3
@@ -44,26 +44,24 @@ EventScript_1664CC:: @ 81664CC
 	msgbox gUnknown_817EAD7
 	setvar VAR_LAST_TALKED, 8
 	compare_var_to_value VAR_STARTER_MON, 2
-	call_if 1, EventScript_166582
+	call_if eq, EventScript_166582
 	compare_var_to_value VAR_STARTER_MON, 1
-	call_if 1, EventScript_16658D
+	call_if eq, EventScript_16658D
 	compare_var_to_value VAR_STARTER_MON, 0
-	call_if 1, EventScript_166598
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	call_if eq, EventScript_166598
+	famechecker FAMECHECKER_BILL, 0
 	msgbox gUnknown_817EB95
 	closemessage
 	playbgm MUS_RIVAL2, 0
 	compare_var_to_value VAR_0x4001, 0
-	call_if 1, EventScript_1665A3
+	call_if eq, EventScript_1665A3
 	compare_var_to_value VAR_0x4001, 1
-	call_if 1, EventScript_1665A3
+	call_if eq, EventScript_1665A3
 	compare_var_to_value VAR_0x4001, 2
-	call_if 1, EventScript_1665B5
+	call_if eq, EventScript_1665B5
 	msgbox gUnknown_817ECD4
-	setvar VAR_0x4052, 1
-	setflag FLAG_0x29B
+	setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
+	setflag FLAG_GOT_FAME_CHECKER
 	giveitem ITEM_FAME_CHECKER
 	msgbox gUnknown_817ED5D
 	closemessage
@@ -75,15 +73,15 @@ EventScript_1664CC:: @ 81664CC
 	end

 EventScript_166582:: @ 8166582
-	trainerbattle 3, 332, 0, Text_17EB71
+	trainerbattle 3, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71
 	return

 EventScript_16658D:: @ 816658D
-	trainerbattle 3, 333, 0, Text_17EB71
+	trainerbattle 3, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71
 	return

 EventScript_166598:: @ 8166598
-	trainerbattle 3, 334, 0, Text_17EB71
+	trainerbattle 3, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71
 	return

 EventScript_1665A3:: @ 81665A3
@@ -173,14 +171,14 @@ Movement_1665FB:: @ 81665FB
 CeruleanCity_EventScript_166603:: @ 8166603
 	lock
 	faceplayer
-	checktrainerflag FLAG_0x163
-	goto_if_eq EventScript_16662E
+	checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5
+	goto_if eq, EventScript_16662E
 	message Text_17EE0E
 	waitmessage
 	playbgm MUS_ROCKET, 0
 	waitbuttonpress
-	trainerbattle 3, 355, 0, Text_17EE70
-	setvar VAR_0x407D, 1
+	trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
+	setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
 	goto EventScript_16662E
 	end

@@ -188,7 +186,7 @@ EventScript_16662E:: @ 816662E
 	msgbox gUnknown_817EE9C
 	checkitemspace ITEM_TM28, 1
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_166677
+	goto_if eq, EventScript_166677
 	additem ITEM_TM28, 1
 	giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28
 	msgbox gUnknown_817EEED
@@ -196,7 +194,7 @@ EventScript_16662E:: @ 816662E
 	fadescreen 1
 	removeobject 2
 	fadescreen 0
-	setflag FLAG_0x23F
+	setflag FLAG_GOT_TM28_FROM_ROCKET
 	release
 	end

@@ -230,8 +228,8 @@ EventScript_1666C3:: @ 81666C3
 	textcolor 0
 	msgbox Text_17EE0E
 	setvar VAR_LAST_TALKED, 2
-	trainerbattle 3, 355, 0, Text_17EE70
-	setvar VAR_0x407D, 1
+	trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
+	setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
 	goto EventScript_16662E
 	end

@@ -248,8 +246,8 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7
 CeruleanCity_EventScript_1666FE:: @ 81666FE
 	lock
 	faceplayer
-	checkflag FLAG_0x234
-	goto_if_eq EventScript_166713
+	checkflag FLAG_GOT_SS_TICKET
+	goto_if TRUE, EventScript_166713
 	msgbox gUnknown_817F01D
 	release
 	end
@@ -286,11 +284,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F
 	random 3
 	copyvar VAR_0x8008, VAR_RESULT
 	compare_var_to_value VAR_0x8008, 0
-	call_if 1, EventScript_1667B0
+	call_if eq, EventScript_1667B0
 	compare_var_to_value VAR_0x8008, 1
-	call_if 1, EventScript_1667B6
+	call_if eq, EventScript_1667B6
 	compare_var_to_value VAR_0x8008, 2
-	call_if 1, EventScript_1667BC
+	call_if eq, EventScript_1667BC
 	waitmessage
 	delay 40
 	playse SE_PIN
@@ -298,11 +296,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F
 	waitmovement 0
 	delay 30
 	compare_var_to_value VAR_0x8008, 0
-	call_if 1, EventScript_1667C2
+	call_if eq, EventScript_1667C2
 	compare_var_to_value VAR_0x8008, 1
-	call_if 1, EventScript_1667CB
+	call_if eq, EventScript_1667CB
 	compare_var_to_value VAR_0x8008, 2
-	call_if 1, EventScript_1667D4
+	call_if eq, EventScript_1667D4
 	release
 	end

@@ -335,13 +333,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD
 	random 4
 	copyvar VAR_0x8008, VAR_RESULT
 	compare_var_to_value VAR_0x8008, 0
-	call_if 1, EventScript_166814
+	call_if eq, EventScript_166814
 	compare_var_to_value VAR_0x8008, 1
-	call_if 1, EventScript_16681D
+	call_if eq, EventScript_16681D
 	compare_var_to_value VAR_0x8008, 2
-	call_if 1, EventScript_166826
+	call_if eq, EventScript_166826
 	compare_var_to_value VAR_0x8008, 3
-	call_if 1, EventScript_16682F
+	call_if eq, EventScript_16682F
 	release
 	end

@@ -375,9 +373,7 @@ CeruleanCity_EventScript_16684A:: @ 816684A

 CeruleanCity_EventScript_166853:: @ 8166853
 	lockall
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MISTY, 0
 	msgbox gUnknown_817F4EF
 	releaseall
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "25",
+      "graphics_id": "MAP_OBJ_GFX_MAN",
      "x": 9,
      "y": 3,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
      "x": 9,
      "y": 7,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
      "x": 5,
      "y": 5,
      "elevation": 3,
@@ -4,10 +4,10 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC
 CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
 	lock
 	faceplayer
-	checkflag FLAG_0x271
-	goto_if_eq EventScript_16AC58
-	checkflag FLAG_0x241
-	goto_if_eq EventScript_16AC22
+	checkflag FLAG_GOT_BICYCLE
+	goto_if TRUE, EventScript_16AC58
+	checkflag FLAG_GOT_BIKE_VOUCHER
+	goto_if TRUE, EventScript_16AC22
 	showmoneybox 0, 0, 0
 	message Text_192755
 	waitmessage
@@ -34,7 +34,7 @@ EventScript_16AC15:: @ 816AC15
 EventScript_16AC22:: @ 816AC22
 	msgbox gUnknown_81927B2
 	giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
-	setflag FLAG_0x271
+	setflag FLAG_GOT_BICYCLE
 	additem ITEM_BICYCLE, 1
 	removeitem ITEM_BIKE_VOUCHER, 1
 	msgbox gUnknown_819280E
@@ -58,8 +58,8 @@ CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C
 CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
 	lock
 	faceplayer
-	checkflag FLAG_0x271
-	goto_if_eq EventScript_16AC8A
+	checkflag FLAG_GOT_BICYCLE
+	goto_if TRUE, EventScript_16AC8A
 	msgbox gUnknown_8192937
 	release
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "43",
+      "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
      "x": 10,
      "y": 12,
      "elevation": 0,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "40",
+      "graphics_id": "MAP_OBJ_GFX_PICNICKER",
      "x": 4,
      "y": 7,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "81",
+      "graphics_id": "MAP_OBJ_GFX_MISTY",
      "x": 8,
      "y": 6,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "91",
+      "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
      "x": 7,
      "y": 16,
      "elevation": 3,
@@ -2,25 +2,20 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0
 	.byte 0

 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
-	checkflag FLAG_0x297
-	goto_if 0, EventScript_16AAF9
+	famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
+	checkflag FLAG_GOT_TM03_FROM_MISTY
+	goto_if FALSE, EventScript_16AAF9
 	msgbox gUnknown_81922BF
 	release
 	end

 EventScript_16AAD3:: @ 816AAD3
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
-	setflag FLAG_0x4B1
-	setflag FLAG_0x821
+	famechecker FAMECHECKER_MISTY, 1
+	setflag FLAG_DEFEATED_MISTY
+	setflag FLAG_BADGE02_GET
 	setrespawn SPAWN_CERULEAN_CITY
-	setvar VAR_0x8008, 2
-	call EventScript_1A6B18
+	set_gym_trainers 2
 	goto EventScript_16AAF9
 	end

@@ -28,10 +23,10 @@ EventScript_16AAF9:: @ 816AAF9
 	msgbox gUnknown_81922F7
 	checkitemspace ITEM_TM03, 1
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16AB3A
+	goto_if eq, EventScript_16AB3A
 	additem ITEM_TM03, 1
 	giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03
-	setflag FLAG_0x297
+	setflag FLAG_GOT_TM03_FROM_MISTY
 	msgbox gUnknown_81922BF
 	release
 	end
@@ -42,23 +37,21 @@ EventScript_16AB3A:: @ 816AB3A
 	end

 CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
-	trainerbattle 0, 150, 0, Text_192481, Text_1924D0
+	trainerbattle 0, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0
 	msgbox gUnknown_81924E4, 6
 	end

 CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
-	trainerbattle 0, 234, 0, Text_192524, Text_192547
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	trainerbattle 0, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547
+	famechecker FAMECHECKER_MISTY, 2
 	msgbox gUnknown_8192556, 6
 	end

 CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F
 	lock
 	faceplayer
-	checkflag FLAG_0x4B1
-	goto_if_eq EventScript_16AB94
+	checkflag FLAG_DEFEATED_MISTY
+	goto_if TRUE, EventScript_16AB94
 	msgbox gUnknown_81925AC
 	release
 	end
@@ -70,8 +63,8 @@ EventScript_16AB94:: @ 816AB94

 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E
 	lockall
-	checkflag FLAG_0x821
-	goto_if_eq EventScript_16ABB2
+	checkflag FLAG_BADGE02_GET
+	goto_if TRUE, EventScript_16ABB2
 	msgbox gUnknown_81926E1
 	releaseall
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "61",
+      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
      "x": 6,
      "y": 5,
      "elevation": 3,
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "56",
+      "graphics_id": "MAP_OBJ_GFX_HIKER",
      "x": 1,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "22",
+      "graphics_id": "MAP_OBJ_GFX_LASS",
      "x": 7,
      "y": 6,
      "elevation": 3,
@@ -4,8 +4,8 @@ CeruleanCity_House2_MapScripts:: @ 816A975
 CeruleanCity_House2_EventScript_16A976:: @ 816A976
 	lock
 	faceplayer
-	checkflag FLAG_0x23F
-	goto_if_eq EventScript_16A98B
+	checkflag FLAG_GOT_TM28_FROM_ROCKET
+	goto_if TRUE, EventScript_16A98B
 	msgbox gUnknown_8191E13
 	release
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "32",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
      "x": 2,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "35",
+      "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
      "x": 7,
      "y": 5,
      "elevation": 3,
@@ -10,20 +10,20 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
 	faceplayer
 	setvar VAR_0x8008, 1
 	call EventScript_1A8CAD
-	checkflag FLAG_0x24A
-	goto_if_eq EventScript_16AA23
+	checkflag FLAG_DID_ZYNX_TRADE
+	goto_if TRUE, EventScript_16AA23
 	msgbox gUnknown_81A59FE, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16AA0B
+	goto_if eq, EventScript_16AA0B
 	call EventScript_1A8CBD
 	compare_var_to_value VAR_0x8004, 6
-	goto_if 4, EventScript_16AA0B
+	goto_if ge, EventScript_16AA0B
 	call EventScript_1A8CC9
 	compare_var_to_var VAR_RESULT, VAR_0x8009
-	goto_if 5, EventScript_16AA15
+	goto_if ne, EventScript_16AA15
 	call EventScript_1A8CD9
 	msgbox gUnknown_81A5A9D
-	setflag FLAG_0x24A
+	setflag FLAG_DID_ZYNX_TRADE
 	release
 	end

@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "32",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
      "x": 5,
      "y": 3,
      "elevation": 3,
@@ -4,83 +4,83 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
 CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
 	lock
-	specialvar VAR_0x8004, sub_8146CE8
+	specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
 	copyvar VAR_0x8008, VAR_RESULT
 	compare_var_to_value VAR_0x8004, 0
-	goto_if_eq EventScript_16AD59
+	goto_if eq, EventScript_CeruleanCity_House4_NoNews
 	compare_var_to_value VAR_0x8004, 1
-	goto_if_eq EventScript_16AD63
+	goto_if eq, EventScript_CeruleanCity_House4_News1
 	compare_var_to_value VAR_0x8004, 2
-	goto_if_eq EventScript_16AD89
+	goto_if eq, EventScript_CeruleanCity_House4_News2
 	compare_var_to_value VAR_0x8004, 3
-	goto_if_eq EventScript_16ADAF
+	goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread
 	compare_var_to_value VAR_0x8004, 4
-	goto_if_eq EventScript_16ADC3
+	goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1
 	compare_var_to_value VAR_0x8004, 5
-	goto_if_eq EventScript_16ADE9
+	goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2
 	compare_var_to_value VAR_0x8004, 6
-	goto_if_eq EventScript_16AE0F
+	goto_if eq, EventScript_CeruleanCity_House4_NewsDone
 	end

-EventScript_16AD59:: @ 816AD59
+EventScript_CeruleanCity_House4_NoNews:: @ 816AD59
 	msgbox gUnknown_8192AF0
 	release
 	end

-EventScript_16AD63:: @ 816AD63
-	call EventScript_16AE23
+EventScript_CeruleanCity_House4_News1:: @ 816AD63
+	call EventScript_CeruleanCity_House4_MovementReactionToNews
 	msgbox gUnknown_8192B43
 	giveitem VAR_0x8008
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16AE45
+	goto_if eq, EventScript_16AE45
 	release
 	end

-EventScript_16AD89:: @ 816AD89
-	call EventScript_16AE23
+EventScript_CeruleanCity_House4_News2:: @ 816AD89
+	call EventScript_CeruleanCity_House4_MovementReactionToNews
 	msgbox gUnknown_8192C07
 	giveitem VAR_0x8008, 4
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16AE45
+	goto_if eq, EventScript_16AE45
 	release
 	end

-EventScript_16ADAF:: @ 816ADAF
+EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF
 	applymovement 1, Movement_1A75E1
 	waitmovement 0
 	msgbox gUnknown_8192CD5
 	release
 	end

-EventScript_16ADC3:: @ 816ADC3
-	call EventScript_16AE23
+EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3
+	call EventScript_CeruleanCity_House4_MovementReactionToNews
 	msgbox gUnknown_8192D4B
 	giveitem VAR_0x8008
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16AE45
+	goto_if eq, EventScript_16AE45
 	release
 	end

-EventScript_16ADE9:: @ 816ADE9
-	call EventScript_16AE23
+EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9
+	call EventScript_CeruleanCity_House4_MovementReactionToNews
 	msgbox gUnknown_8192DE3
 	giveitem VAR_0x8008, 4
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16AE45
+	goto_if eq, EventScript_16AE45
 	release
 	end

-EventScript_16AE0F:: @ 816AE0F
+EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F
 	applymovement 1, Movement_1A75E1
 	waitmovement 0
 	msgbox gUnknown_8192EC5
 	release
 	end

-EventScript_16AE23:: @ 816AE23
+EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23
 	playse SE_PIN
 	applymovement 1, Movement_1A75DB
 	waitmovement 0
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "33",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
      "x": 7,
      "y": 4,
      "elevation": 3,
@@ -4,18 +4,18 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F
 CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
 	lock
 	faceplayer
-	checkflag FLAG_0x2BB
-	goto_if_eq EventScript_16AEB7
+	checkflag FLAG_GOT_POWDER_JAR
+	goto_if TRUE, EventScript_16AEB7
 	msgbox gUnknown_8192F67, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16AEAD
-	checkflag FLAG_0x847
-	goto_if 0, EventScript_16AEA3
+	goto_if eq, EventScript_16AEAD
+	checkflag FLAG_SYS_GOT_BERRY_POUCH
+	goto_if FALSE, EventScript_16AEA3
 	msgbox gUnknown_8193003
-	setflag FLAG_0x2BB
+	setflag FLAG_GOT_POWDER_JAR
 	giveitem ITEM_POWDER_JAR
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_1A6BF9
+	goto_if eq, EventScript_1A6BF9
 	msgbox gUnknown_8193033
 	release
 	end
@@ -144,20 +144,20 @@ EventScript_16B048:: @ 816B048
 EventScript_16B055:: @ 816B055
 	msgbox gUnknown_819331E, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16AEC8
+	goto_if eq, EventScript_16AEC8
 	copyvar VAR_0x8004, VAR_0x8009
 	specialvar VAR_RESULT, sub_815EEB0
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16B0CC
+	goto_if eq, EventScript_16B0CC
 	giveitem VAR_0x8008
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16B0BF
+	goto_if eq, EventScript_16B0BF
 	copyvar VAR_0x8004, VAR_0x8009
 	special sub_815EF5C
 	special sub_815F070
 	msgbox gUnknown_819337A, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16AEC8
+	goto_if eq, EventScript_16AEC8
 	msgbox gUnknown_81933FB
 	special sub_815F114
 	release
@@ -178,7 +178,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA
 	lockall
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	special sub_814EA7C
 	waitstate
 	releaseall
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "68",
+      "graphics_id": "MAP_OBJ_GFX_CLERK",
      "x": 2,
      "y": 3,
      "elevation": 0,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "23",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
      "x": 9,
      "y": 2,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
      "x": 1,
      "y": 7,
      "elevation": 3,
@@ -12,7 +12,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7
 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	lock
 	faceplayer
 	message Text_1A6211
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "64",
+      "graphics_id": "MAP_OBJ_GFX_NURSE",
      "x": 7,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "61",
+      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
      "x": 12,
      "y": 5,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "26",
+      "graphics_id": "MAP_OBJ_GFX_ROCKER",
      "x": 5,
      "y": 4,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
      "x": 4,
      "y": 8,
      "elevation": 3,
@@ -66,7 +66,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "22",
+      "graphics_id": "MAP_OBJ_GFX_LASS",
      "x": 3,
      "y": 3,
      "elevation": 3,
@@ -89,7 +89,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
-      "flag": "157"
+      "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
    },
    {
      "graphics_id": "0",
@@ -102,7 +102,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
-      "flag": "157"
+      "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
    }
  ],
  "warp_events": [
@@ -25,9 +25,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E
 CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
 	lock
 	faceplayer
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BILL, 1
 	msgbox gUnknown_8192116
 	release
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 6,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 2,
      "y": 2,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 10,
      "y": 2,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "69",
+      "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
      "x": 1,
      "y": 2,
      "elevation": 3,
@@ -63,7 +63,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_HIDE_MG_DELIVERYMEN"
    }
  ],
  "warp_events": [
@@ -25,7 +25,7 @@
  ],
  "object_events": [
    {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
      "x": 14,
      "y": 6,
      "elevation": 3,
@@ -38,7 +38,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "32",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
      "x": 11,
      "y": 11,
      "elevation": 3,
@@ -51,7 +51,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "73",
+      "graphics_id": "MAP_OBJ_GFX_BILL",
      "x": 20,
      "y": 7,
      "elevation": 3,
@@ -61,10 +61,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "0x0",
-      "flag": "98"
+      "flag": "FLAG_HIDE_CINNABAR_BILL"
    },
    {
-      "graphics_id": "108",
+      "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
      "x": 23,
      "y": 7,
      "elevation": 1,
@@ -74,7 +74,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "0x0",
-      "flag": "107"
+      "flag": "FLAG_HIDE_CINNABAR_SEAGALLOP"
    }
  ],
  "warp_events": [
@@ -6,17 +6,17 @@ CinnabarIsland_MapScripts:: @ 8166ED6
 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1
 	setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
 	call EventScript_166F5E
-	compare_var_to_value VAR_0x4071, 1
-	call_if 1, EventScript_166F24
-	compare_var_to_value VAR_0x4071, 3
-	call_if 1, EventScript_166F52
 	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1
-	call_if 1, EventScript_166F0B
+	call_if eq, EventScript_166F24
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3
+	call_if eq, EventScript_166F52
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
+	call_if eq, EventScript_166F0B
 	end

 EventScript_166F0B:: @ 8166F0B
 	savebgm MUS_ANNAI
-	setflag FLAG_0x002
+	setflag FLAG_TEMP_2
 	setobjectxyperm 3, 15, 12
 	setobjectmovementtype 3, 9
 	setobjectxyperm 4, 30, 12
@@ -25,8 +25,8 @@ EventScript_166F0B:: @ 8166F0B
 EventScript_166F24:: @ 8166F24
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare_var_to_value VAR_0x8004, 18
-	goto_if 4, EventScript_166F4A
-	setflag FLAG_0x002
+	goto_if ge, EventScript_166F4A
+	setflag FLAG_TEMP_2
 	setobjectxyperm 3, 18, 12
 	setobjectmovementtype 3, 7
 	setobjectxyperm 4, 30, 12
@@ -42,8 +42,8 @@ EventScript_166F52:: @ 8166F52
 	return

 EventScript_166F5E:: @ 8166F5E
-	checkflag FLAG_0x1A8
-	goto_if_eq EventScript_166F68
+	checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY
+	goto_if TRUE, EventScript_166F68
 	return

 EventScript_166F68:: @ 8166F68
@@ -51,9 +51,9 @@ EventScript_166F68:: @ 8166F68
 	return

 CinnabarIsland_MapScript2_166F6E:: @ 8166F6E
-	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166F88
-	map_script_2 VAR_0x4071, 1, EventScript_166FCD
-	map_script_2 VAR_0x4071, 3, EventScript_166FA0
+	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88
+	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD
+	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0
 	.2byte 0

 EventScript_166F88:: @ 8166F88
@@ -61,7 +61,7 @@ EventScript_166F88:: @ 8166F88
 	clearflag FLAG_SPECIAL_FLAG_0x4001
 	savebgm MUS_DUMMY
 	textcolor 0
-	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2
 	delay 20
 	call EventScript_1670E6
 	releaseall
@@ -75,9 +75,9 @@ EventScript_166FA0:: @ 8166FA0
 	applymovement 3, Movement_166FC6
 	waitmovement 0
 	removeobject 3
-	setvar VAR_0x4071, 4
-	setflag FLAG_0x075
-	clearflag FLAG_0x076
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4
+	setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE
+	clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME
 	releaseall
 	end

@@ -93,25 +93,25 @@ Movement_166FC6:: @ 8166FC6
 EventScript_166FCD:: @ 8166FCD
 	lockall
 	textcolor 0
-	checkflag FLAG_0x002
-	call_if 0, EventScript_167032
-	checkflag FLAG_0x002
-	call_if 1, EventScript_16703D
+	checkflag FLAG_TEMP_2
+	call_if FALSE, EventScript_167032
+	checkflag FLAG_TEMP_2
+	call_if TRUE, EventScript_16703D
 	playse SE_PIN
 	applymovement 3, Movement_1A75DB
 	waitmovement 0
 	applymovement 3, Movement_1A75DD
 	waitmovement 0
-	checkflag FLAG_0x002
-	call_if 0, EventScript_167048
-	checkflag FLAG_0x002
-	call_if 1, EventScript_167053
+	checkflag FLAG_TEMP_2
+	call_if FALSE, EventScript_167048
+	checkflag FLAG_TEMP_2
+	call_if TRUE, EventScript_167053
 	msgbox gUnknown_8180C90
 	msgbox gUnknown_8180CAA, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_167068
+	goto_if eq, EventScript_167068
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_167078
+	goto_if eq, EventScript_167078
 	end

 EventScript_167032:: @ 8167032
@@ -146,13 +146,13 @@ EventScript_167068:: @ 8167068
 EventScript_167078:: @ 8167078
 	msgbox gUnknown_8180DF8
 	closemessage
-	checkflag FLAG_0x002
-	call_if 0, EventScript_1670A0
-	checkflag FLAG_0x002
-	call_if 1, EventScript_1670B3
+	checkflag FLAG_TEMP_2
+	call_if FALSE, EventScript_1670A0
+	checkflag FLAG_TEMP_2
+	call_if TRUE, EventScript_1670B3
 	removeobject 3
-	setvar VAR_0x4071, 2
-	clearflag FLAG_0x0A2
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
+	clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
 	releaseall
 	end

@@ -201,26 +201,26 @@ Movement_1670E2:: @ 81670E2
 	step_end

 EventScript_1670E6:: @ 81670E6
-	checkflag FLAG_0x002
-	call_if 1, EventScript_167142
+	checkflag FLAG_TEMP_2
+	call_if TRUE, EventScript_167142
 	addobject 4
-	checkflag FLAG_0x002
-	call_if 0, EventScript_167154
-	checkflag FLAG_0x002
-	call_if 1, EventScript_167166
+	checkflag FLAG_TEMP_2
+	call_if FALSE, EventScript_167154
+	checkflag FLAG_TEMP_2
+	call_if TRUE, EventScript_167166
 	msgbox gUnknown_8180EAD
 	closemessage
-	checkflag FLAG_0x002
-	call_if 0, EventScript_167171
-	checkflag FLAG_0x002
-	call_if 1, EventScript_167183
-	setvar VAR_0x4071, 2
+	checkflag FLAG_TEMP_2
+	call_if FALSE, EventScript_167171
+	checkflag FLAG_TEMP_2
+	call_if TRUE, EventScript_167183
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
 	removeobject 3
 	delay 40
-	setflag FLAG_0x06B
+	setflag FLAG_HIDE_CINNABAR_SEAGALLOP
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8006, 1
+	setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND
+	setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
 	goto EventScript_1A90DA
 	end

@@ -343,9 +343,7 @@ Movement_1671ED:: @ 81671ED
 CinnabarIsland_EventScript_1671EF:: @ 81671EF
 	lock
 	faceplayer
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BLAINE, 3
 	msgbox gUnknown_8180B34
 	release
 	end
@@ -364,9 +362,7 @@ CinnabarIsland_EventScript_16721A:: @ 816721A

 CinnabarIsland_EventScript_167223:: @ 8167223
 	lockall
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BLAINE, 0
 	msgbox gUnknown_8180C4A
 	releaseall
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "52",
+      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
      "x": 25,
      "y": 11,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 25,
      "y": 4,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 17,
      "y": 5,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "52",
+      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
      "x": 16,
      "y": 11,
      "elevation": 3,
@@ -66,7 +66,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 16,
      "y": 18,
      "elevation": 3,
@@ -79,7 +79,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "52",
+      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
      "x": 4,
      "y": 19,
      "elevation": 3,
@@ -92,7 +92,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 4,
      "y": 11,
      "elevation": 3,
@@ -105,7 +105,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "86",
+      "graphics_id": "MAP_OBJ_GFX_BLAINE",
      "x": 5,
      "y": 4,
      "elevation": 3,
@@ -118,7 +118,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "91",
+      "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
      "x": 24,
      "y": 20,
      "elevation": 3,
@@ -3,20 +3,20 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B
 	.byte 0

 CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951
-	checkflag FLAG_0x4B6
-	goto_if_eq EventScript_16D991
-	checkflag FLAG_0x265
-	call_if 1, EventScript_16D9B0
-	checkflag FLAG_0x267
-	call_if 1, EventScript_16D9B6
-	checkflag FLAG_0x268
-	call_if 1, EventScript_16D9BC
-	checkflag FLAG_0x269
-	call_if 1, EventScript_16D9C2
-	checkflag FLAG_0x26A
-	call_if 1, EventScript_16D9C8
-	checkflag FLAG_0x26B
-	call_if 1, EventScript_16D9CE
+	checkflag FLAG_DEFEATED_BLAINE
+	goto_if TRUE, EventScript_16D991
+	checkflag FLAG_CINNABAR_GYM_QUIZ_1
+	call_if TRUE, EventScript_16D9B0
+	checkflag FLAG_CINNABAR_GYM_QUIZ_2
+	call_if TRUE, EventScript_16D9B6
+	checkflag FLAG_CINNABAR_GYM_QUIZ_3
+	call_if TRUE, EventScript_16D9BC
+	checkflag FLAG_CINNABAR_GYM_QUIZ_4
+	call_if TRUE, EventScript_16D9C2
+	checkflag FLAG_CINNABAR_GYM_QUIZ_5
+	call_if TRUE, EventScript_16D9C8
+	checkflag FLAG_CINNABAR_GYM_QUIZ_6
+	call_if TRUE, EventScript_16D9CE
 	end

 EventScript_16D991:: @ 816D991
@@ -53,27 +53,22 @@ EventScript_16D9CE:: @ 816D9CE
 	return

 CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 2
-	special UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06
-	checkflag FLAG_0x24E
-	goto_if 0, EventScript_16DA34
+	famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
+	trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06
+	checkflag FLAG_GOT_TM38_FROM_BLAINE
+	goto_if FALSE, EventScript_16DA34
 	msgbox gUnknown_819971D
 	release
 	end

 EventScript_16DA06:: @ 816DA06
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
-	setflag FLAG_0x4B6
-	setflag FLAG_UNK826
+	famechecker FAMECHECKER_BLAINE, 1
+	setflag FLAG_DEFEATED_BLAINE
+	setflag FLAG_BADGE07_GET
 	setrespawn SPAWN_CINNABAR_ISLAND
-	setvar VAR_0x4071, 1
-	clearflag FLAG_0x062
-	setvar VAR_0x8008, 7
-	call EventScript_1A6B18
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
+	clearflag FLAG_HIDE_CINNABAR_BILL
+	set_gym_trainers 7
 	goto EventScript_16DA34
 	end

@@ -81,10 +76,10 @@ EventScript_16DA34:: @ 816DA34
 	msgbox gUnknown_819969E
 	checkitemspace ITEM_TM38, 1
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16DA75
+	goto_if eq, EventScript_16DA75
 	additem ITEM_TM38, 1
 	giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38
-	setflag FLAG_0x24E
+	setflag FLAG_GOT_TM38_FROM_BLAINE
 	msgbox gUnknown_8199652
 	release
 	end
@@ -95,18 +90,18 @@ EventScript_16DA75:: @ 816DA75
 	end

 CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F
-	trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6
+	trainerbattle 0, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6
 	msgbox gUnknown_81997EA, 6
 	end

 CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96
-	trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
+	trainerbattle 2, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
 	msgbox gUnknown_8199911, 6
 	end

 EventScript_16DAB1:: @ 816DAB1
-	checkflag FLAG_0x267
-	call_if 0, EventScript_16DABC
+	checkflag FLAG_CINNABAR_GYM_QUIZ_2
+	call_if FALSE, EventScript_16DABC
 	release
 	end

@@ -115,16 +110,14 @@ EventScript_16DABC:: @ 816DABC
 	return

 CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
-	trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	trainerbattle 2, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
+	famechecker FAMECHECKER_BLAINE, 2
 	msgbox gUnknown_81999DF, 6
 	end

 EventScript_16DAEA:: @ 816DAEA
-	checkflag FLAG_0x269
-	call_if 0, EventScript_16DAF5
+	checkflag FLAG_CINNABAR_GYM_QUIZ_4
+	call_if FALSE, EventScript_16DAF5
 	release
 	end

@@ -133,13 +126,13 @@ EventScript_16DAF5:: @ 816DAF5
 	return

 CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB
-	trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16
+	trainerbattle 2, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16
 	msgbox gUnknown_8199B27, 6
 	end

 EventScript_16DB16:: @ 816DB16
-	checkflag FLAG_0x26B
-	call_if 0, EventScript_16DB21
+	checkflag FLAG_CINNABAR_GYM_QUIZ_6
+	call_if FALSE, EventScript_16DB21
 	release
 	end

@@ -148,13 +141,13 @@ EventScript_16DB21:: @ 816DB21
 	return

 CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27
-	trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42
+	trainerbattle 2, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42
 	msgbox gUnknown_819987D, 6
 	end

 EventScript_16DB42:: @ 816DB42
-	checkflag FLAG_0x265
-	call_if 0, EventScript_16DB4D
+	checkflag FLAG_CINNABAR_GYM_QUIZ_1
+	call_if FALSE, EventScript_16DB4D
 	release
 	end

@@ -163,13 +156,13 @@ EventScript_16DB4D:: @ 816DB4D
 	return

 CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53
-	trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E
+	trainerbattle 2, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E
 	msgbox gUnknown_8199986, 6
 	end

 EventScript_16DB6E:: @ 816DB6E
-	checkflag FLAG_0x268
-	call_if 0, EventScript_16DB79
+	checkflag FLAG_CINNABAR_GYM_QUIZ_3
+	call_if FALSE, EventScript_16DB79
 	release
 	end

@@ -178,13 +171,13 @@ EventScript_16DB79:: @ 816DB79
 	return

 CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F
-	trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
+	trainerbattle 2, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
 	msgbox gUnknown_8199AC9, 6
 	end

 EventScript_16DB9A:: @ 816DB9A
-	checkflag FLAG_0x26A
-	call_if 0, EventScript_16DBA5
+	checkflag FLAG_CINNABAR_GYM_QUIZ_5
+	call_if FALSE, EventScript_16DBA5
 	release
 	end

@@ -195,8 +188,8 @@ EventScript_16DBA5:: @ 816DBA5
 CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB
 	lock
 	faceplayer
-	checkflag FLAG_0x4B6
-	goto_if_eq EventScript_16DBC0
+	checkflag FLAG_DEFEATED_BLAINE
+	goto_if TRUE, EventScript_16DBC0
 	msgbox gUnknown_8199B81
 	release
 	end
@@ -208,8 +201,8 @@ EventScript_16DBC0:: @ 816DBC0

 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA
 	lockall
-	checkflag FLAG_UNK826
-	goto_if_eq EventScript_16DBDE
+	checkflag FLAG_BADGE07_GET
+	goto_if TRUE, EventScript_16DBDE
 	msgbox gUnknown_8199C29
 	releaseall
 	end
@@ -235,9 +228,9 @@ EventScript_16DC00:: @ 816DC00
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199D5A, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16DC43
+	goto_if eq, EventScript_16DC43
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16DC6A
+	goto_if eq, EventScript_16DC6A
 	end

 EventScript_16DC27:: @ 816DC27
@@ -256,8 +249,8 @@ EventScript_16DC34:: @ 816DC34

 EventScript_16DC43:: @ 816DC43
 	call EventScript_16DC27
-	checkflag FLAG_0x265
-	goto_if_eq EventScript_16DC68
+	checkflag FLAG_CINNABAR_GYM_QUIZ_1
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DC58
 	releaseall
 	end
@@ -267,7 +260,7 @@ EventScript_16DC58:: @ 816DC58
 	waitse
 	call EventScript_16E117
 	special DrawWholeMapView
-	setflag FLAG_0x265
+	setflag FLAG_CINNABAR_GYM_QUIZ_1
 	return

 EventScript_16DC68:: @ 816DC68
@@ -276,21 +269,21 @@ EventScript_16DC68:: @ 816DC68

 EventScript_16DC6A:: @ 816DC6A
 	call EventScript_16DC34
-	checktrainerflag FLAG_0x0D5
-	goto_if 0, EventScript_16DC7A
+	checktrainerflag TRAINER_BURGLAR_QUINN
+	goto_if lt, EventScript_16DC7A
 	releaseall
 	end

 EventScript_16DC7A:: @ 816DC7A
 	compare_var_to_value VAR_0x4001, 0
-	call_if 1, EventScript_16DCB4
+	call_if eq, EventScript_16DCB4
 	compare_var_to_value VAR_0x4001, 1
-	call_if 1, EventScript_16DCC6
+	call_if eq, EventScript_16DCC6
 	textcolor 0
 	msgbox gUnknown_819983F
-	trainerbattle 3, 213, 0, Text_199870
-	checkflag FLAG_0x265
-	goto_if_eq EventScript_16DC68
+	trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870
+	checkflag FLAG_CINNABAR_GYM_QUIZ_1
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DC58
 	releaseall
 	end
@@ -332,15 +325,15 @@ EventScript_16DCF5:: @ 816DCF5
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199D79, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16DD41
+	goto_if eq, EventScript_16DD41
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16DD1C
+	goto_if eq, EventScript_16DD1C
 	end

 EventScript_16DD1C:: @ 816DD1C
 	call EventScript_16DC27
-	checkflag FLAG_0x267
-	goto_if_eq EventScript_16DC68
+	checkflag FLAG_CINNABAR_GYM_QUIZ_2
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DD31
 	releaseall
 	end
@@ -350,26 +343,26 @@ EventScript_16DD31:: @ 816DD31
 	waitse
 	call EventScript_16E157
 	special DrawWholeMapView
-	setflag FLAG_0x267
+	setflag FLAG_CINNABAR_GYM_QUIZ_2
 	return

 EventScript_16DD41:: @ 816DD41
 	call EventScript_16DC34
-	checktrainerflag FLAG_0x0B2
-	goto_if 0, EventScript_16DD51
+	checktrainerflag TRAINER_SUPER_NERD_AVERY
+	goto_if lt, EventScript_16DD51
 	releaseall
 	end

 EventScript_16DD51:: @ 816DD51
 	compare_var_to_value VAR_0x4001, 0
-	call_if 1, EventScript_16DD8B
+	call_if eq, EventScript_16DD8B
 	compare_var_to_value VAR_0x4001, 1
-	call_if 1, EventScript_16DD9D
+	call_if eq, EventScript_16DD9D
 	textcolor 0
 	msgbox gUnknown_81998BD
-	trainerbattle 3, 178, 0, Text_1998ED
-	checkflag FLAG_0x267
-	goto_if_eq EventScript_16DC68
+	trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED
+	checkflag FLAG_CINNABAR_GYM_QUIZ_2
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DD31
 	releaseall
 	end
@@ -420,15 +413,15 @@ EventScript_16DDD3:: @ 816DDD3
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199DA9, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16DE1F
+	goto_if eq, EventScript_16DE1F
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16DDFA
+	goto_if eq, EventScript_16DDFA
 	end

 EventScript_16DDFA:: @ 816DDFA
 	call EventScript_16DC27
-	checkflag FLAG_0x268
-	goto_if_eq EventScript_16DC68
+	checkflag FLAG_CINNABAR_GYM_QUIZ_3
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DE0F
 	releaseall
 	end
@@ -438,26 +431,26 @@ EventScript_16DE0F:: @ 816DE0F
 	waitse
 	call EventScript_16E197
 	special DrawWholeMapView
-	setflag FLAG_0x268
+	setflag FLAG_CINNABAR_GYM_QUIZ_3
 	return

 EventScript_16DE1F:: @ 816DE1F
 	call EventScript_16DC34
-	checktrainerflag FLAG_0x0D6
-	goto_if 0, EventScript_16DE2F
+	checktrainerflag TRAINER_BURGLAR_RAMON
+	goto_if lt, EventScript_16DE2F
 	releaseall
 	end

 EventScript_16DE2F:: @ 816DE2F
 	compare_var_to_value VAR_0x4001, 0
-	call_if 1, EventScript_16DE69
+	call_if eq, EventScript_16DE69
 	compare_var_to_value VAR_0x4001, 1
-	call_if 1, EventScript_16DE7B
+	call_if eq, EventScript_16DE7B
 	textcolor 0
 	msgbox gUnknown_8199948
-	trainerbattle 3, 214, 0, Text_199973
-	checkflag FLAG_0x268
-	goto_if_eq EventScript_16DC68
+	trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973
+	checkflag FLAG_CINNABAR_GYM_QUIZ_3
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DE0F
 	releaseall
 	end
@@ -499,15 +492,15 @@ EventScript_16DEAA:: @ 816DEAA
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199DC6, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16DEF6
+	goto_if eq, EventScript_16DEF6
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16DED1
+	goto_if eq, EventScript_16DED1
 	end

 EventScript_16DED1:: @ 816DED1
 	call EventScript_16DC27
-	checkflag FLAG_0x269
-	goto_if_eq EventScript_16DC68
+	checkflag FLAG_CINNABAR_GYM_QUIZ_4
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DEE6
 	releaseall
 	end
@@ -517,26 +510,26 @@ EventScript_16DEE6:: @ 816DEE6
 	waitse
 	call EventScript_16E1D7
 	special DrawWholeMapView
-	setflag FLAG_0x269
+	setflag FLAG_CINNABAR_GYM_QUIZ_4
 	return

 EventScript_16DEF6:: @ 816DEF6
 	call EventScript_16DC34
-	checktrainerflag FLAG_0x0B3
-	goto_if 0, EventScript_16DF06
+	checktrainerflag TRAINER_SUPER_NERD_DEREK
+	goto_if lt, EventScript_16DF06
 	releaseall
 	end

 EventScript_16DF06:: @ 816DF06
 	compare_var_to_value VAR_0x4001, 0
-	call_if 1, EventScript_16DF40
+	call_if eq, EventScript_16DF40
 	compare_var_to_value VAR_0x4001, 1
-	call_if 1, EventScript_16DF52
+	call_if eq, EventScript_16DF52
 	textcolor 0
 	msgbox gUnknown_81999B7
-	trainerbattle 3, 179, 0, Text_1999DB
-	checkflag FLAG_0x269
-	goto_if_eq EventScript_16DC68
+	trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB
+	checkflag FLAG_CINNABAR_GYM_QUIZ_4
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DEE6
 	releaseall
 	end
@@ -578,15 +571,15 @@ EventScript_16DF81:: @ 816DF81
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199E00, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16DFA8
+	goto_if eq, EventScript_16DFA8
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16DFCD
+	goto_if eq, EventScript_16DFCD
 	end

 EventScript_16DFA8:: @ 816DFA8
 	call EventScript_16DC27
-	checkflag FLAG_0x26A
-	goto_if_eq EventScript_16DC68
+	checkflag FLAG_CINNABAR_GYM_QUIZ_5
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DFBD
 	releaseall
 	end
@@ -596,26 +589,26 @@ EventScript_16DFBD:: @ 816DFBD
 	waitse
 	call EventScript_16E1F3
 	special DrawWholeMapView
-	setflag FLAG_0x26A
+	setflag FLAG_CINNABAR_GYM_QUIZ_5
 	return

 EventScript_16DFCD:: @ 816DFCD
 	call EventScript_16DC34
-	checktrainerflag FLAG_0x0D7
-	goto_if 0, EventScript_16DFDD
+	checktrainerflag TRAINER_BURGLAR_DUSTY
+	goto_if lt, EventScript_16DFDD
 	releaseall
 	end

 EventScript_16DFDD:: @ 816DFDD
 	compare_var_to_value VAR_0x4001, 0
-	call_if 1, EventScript_16E017
+	call_if eq, EventScript_16E017
 	compare_var_to_value VAR_0x4001, 1
-	call_if 1, EventScript_16E029
+	call_if eq, EventScript_16E029
 	textcolor 0
 	msgbox gUnknown_8199A7F
-	trainerbattle 3, 215, 0, Text_199AB9
-	checkflag FLAG_0x26A
-	goto_if_eq EventScript_16DC68
+	trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9
+	checkflag FLAG_CINNABAR_GYM_QUIZ_5
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DFBD
 	releaseall
 	end
@@ -657,15 +650,15 @@ EventScript_16E058:: @ 816E058
 	msgbox gUnknown_8199C9F
 	msgbox gUnknown_8199E36, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E0A4
+	goto_if eq, EventScript_16E0A4
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E07F
+	goto_if eq, EventScript_16E07F
 	end

 EventScript_16E07F:: @ 816E07F
 	call EventScript_16DC27
-	checkflag FLAG_0x26B
-	goto_if_eq EventScript_16DC68
+	checkflag FLAG_CINNABAR_GYM_QUIZ_6
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16E094
 	releaseall
 	end
@@ -675,26 +668,26 @@ EventScript_16E094:: @ 816E094
 	waitse
 	call EventScript_16E233
 	special DrawWholeMapView
-	setflag FLAG_0x26B
+	setflag FLAG_CINNABAR_GYM_QUIZ_6
 	return

 EventScript_16E0A4:: @ 816E0A4
 	call EventScript_16DC34
-	checktrainerflag FLAG_0x0B4
-	goto_if 0, EventScript_16E0B4
+	checktrainerflag TRAINER_SUPER_NERD_ZAC
+	goto_if lt, EventScript_16E0B4
 	releaseall
 	end

 EventScript_16E0B4:: @ 816E0B4
 	compare_var_to_value VAR_0x4001, 0
-	call_if 1, EventScript_16E0EE
+	call_if eq, EventScript_16E0EE
 	compare_var_to_value VAR_0x4001, 1
-	call_if 1, EventScript_16E100
+	call_if eq, EventScript_16E100
 	textcolor 0
 	msgbox gUnknown_8199AFC
-	trainerbattle 3, 180, 0, Text_199B16
-	checkflag FLAG_0x26B
-	goto_if_eq EventScript_16DC68
+	trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16
+	checkflag FLAG_CINNABAR_GYM_QUIZ_6
+	goto_if TRUE, EventScript_16DC68
 	call EventScript_16E094
 	releaseall
 	end
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "68",
+      "graphics_id": "MAP_OBJ_GFX_CLERK",
      "x": 2,
      "y": 3,
      "elevation": 0,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
      "x": 6,
      "y": 2,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 8,
      "y": 2,
      "elevation": 3,
@@ -12,7 +12,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if eq, EventScript_1A7AE0
 	lock
 	faceplayer
 	message Text_1A6211
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "64",
+      "graphics_id": "MAP_OBJ_GFX_NURSE",
      "x": 7,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "42",
+      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
      "x": 2,
      "y": 4,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "61",
+      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
      "x": 9,
      "y": 7,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
      "x": 14,
      "y": 6,
      "elevation": 3,
@@ -76,7 +76,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
-      "flag": "157"
+      "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
    },
    {
      "graphics_id": "0",
@@ -89,10 +89,10 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
-      "flag": "157"
+      "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
    },
    {
-      "graphics_id": "73",
+      "graphics_id": "MAP_OBJ_GFX_BILL",
      "x": 11,
      "y": 5,
      "elevation": 3,
@@ -102,7 +102,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A",
-      "flag": "162"
+      "flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL"
    }
  ],
  "warp_events": [
@@ -31,23 +31,23 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
 	faceplayer
 	msgbox gUnknown_819A725, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E9A5
+	goto_if eq, EventScript_16E9A5
 	msgbox gUnknown_819A785
 	closemessage
 	playbgm MUS_ANNAI, 1
 	savebgm MUS_ANNAI
 	setflag FLAG_SPECIAL_FLAG_0x4001
-	setflag FLAG_0x0A2
+	setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
 	delay 20
 	compare_var_to_value VAR_FACING, 1
-	call_if 1, EventScript_16E96F
+	call_if eq, EventScript_16E96F
 	compare_var_to_value VAR_FACING, 4
-	call_if 1, EventScript_16E981
+	call_if eq, EventScript_16E981
 	compare_var_to_value VAR_FACING, 3
-	call_if 1, EventScript_16E993
+	call_if eq, EventScript_16E993
 	removeobject 7
-	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
-	clearflag FLAG_0x062
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
+	clearflag FLAG_HIDE_CINNABAR_BILL
 	warp MAP_CINNABAR_ISLAND, 255, 14, 11
 	waitstate
 	release
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 6,
      "y": 2,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 2,
      "y": 2,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "65",
+      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
      "x": 10,
      "y": 2,
      "elevation": 3,
@@ -53,7 +53,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "69",
+      "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
      "x": 1,
      "y": 2,
      "elevation": 3,
@@ -63,7 +63,7 @@
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
      "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2",
-      "flag": "112"
+      "flag": "FLAG_HIDE_MG_DELIVERYMEN"
    }
  ],
  "warp_events": [
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 2,
      "y": 4,
      "elevation": 3,
@@ -3,12 +3,12 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273
 	.byte 0

 CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279
-	compare_var_to_value VAR_0x406A, 1
-	call_if 1, EventScript_16E285
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
+	call_if eq, EventScript_16E285
 	end

 EventScript_16E285:: @ 816E285
-	setvar VAR_0x406A, 2
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
 	return

 CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "19",
+      "graphics_id": "MAP_OBJ_GFX_BOY",
      "x": 11,
      "y": 8,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 12,
      "y": 3,
      "elevation": 3,
@@ -6,20 +6,20 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
 	faceplayer
 	setvar VAR_0x8008, 8
 	call EventScript_1A8CAD
-	checkflag FLAG_0x276
-	goto_if_eq EventScript_16E473
+	checkflag FLAG_DID_SEELOR_TRADE
+	goto_if TRUE, EventScript_16E473
 	msgbox gUnknown_81A597B, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E45B
+	goto_if eq, EventScript_16E45B
 	call EventScript_1A8CBD
 	compare_var_to_value VAR_0x8004, 6
-	goto_if 4, EventScript_16E45B
+	goto_if ge, EventScript_16E45B
 	call EventScript_1A8CC9
 	compare_var_to_var VAR_RESULT, VAR_0x8009
-	goto_if 5, EventScript_16E465
+	goto_if ne, EventScript_16E465
 	call EventScript_1A8CD9
 	msgbox gUnknown_81A59DA
-	setflag FLAG_0x276
+	setflag FLAG_DID_SEELOR_TRADE
 	release
 	end

@@ -43,48 +43,48 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
 	lock
 	faceplayer
 	setvar VAR_RESULT, 0
-	checkflag FLAG_0x2EE
-	call_if 1, EventScript_16E8A1
+	checkflag FLAG_REVIVED_AMBER
+	call_if TRUE, EventScript_16E8A1
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E897
-	compare_var_to_value VAR_0x406A, 2
-	goto_if_eq EventScript_16E736
-	compare_var_to_value VAR_0x406A, 1
-	goto_if_eq EventScript_16E72C
+	goto_if eq, EventScript_16E897
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
+	goto_if eq, EventScript_16E736
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
+	goto_if eq, EventScript_16E72C
 	call EventScript_16E4EC
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E544
+	goto_if eq, EventScript_16E544
 	call EventScript_16E504
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E586
+	goto_if eq, EventScript_16E586
 	call EventScript_16E51C
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E5C8
+	goto_if eq, EventScript_16E5C8
 	msgbox gUnknown_819A282
 	goto EventScript_16E53A
 	end

 EventScript_16E4EC:: @ 816E4EC
-	checkflag FLAG_0x273
-	goto_if 0, EventScript_16E534
-	checkflag FLAG_0x2ED
-	goto_if_eq EventScript_16E534
+	checkflag FLAG_GOT_HELIX_FOSSIL
+	goto_if FALSE, EventScript_16E534
+	checkflag FLAG_REVIVED_HELIX
+	goto_if TRUE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return

 EventScript_16E504:: @ 816E504
-	checkflag FLAG_0x272
-	goto_if 0, EventScript_16E534
-	checkflag FLAG_0x2EC
-	goto_if_eq EventScript_16E534
+	checkflag FLAG_GOT_DOME_FOSSIL
+	goto_if FALSE, EventScript_16E534
+	checkflag FLAG_REVIVED_DOME
+	goto_if TRUE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return

 EventScript_16E51C:: @ 816E51C
-	checkflag FLAG_0x25E
-	goto_if 0, EventScript_16E534
-	checkflag FLAG_0x2EE
-	goto_if_eq EventScript_16E534
+	checkflag FLAG_GOT_OLD_AMBER
+	goto_if FALSE, EventScript_16E534
+	checkflag FLAG_REVIVED_AMBER
+	goto_if TRUE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return

@@ -102,7 +102,7 @@ EventScript_16E544:: @ 816E544
 	waitmessage
 	call EventScript_16E51C
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E5FA
+	goto_if eq, EventScript_16E5FA
 	multichoice 0, 0, 21, 0
 	switch VAR_RESULT
 	case 0, EventScript_16E668
@@ -115,7 +115,7 @@ EventScript_16E586:: @ 816E586
 	waitmessage
 	call EventScript_16E51C
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E631
+	goto_if eq, EventScript_16E631
 	multichoice 0, 0, 22, 0
 	switch VAR_RESULT
 	case 0, EventScript_16E6A6
@@ -156,13 +156,13 @@ EventScript_16E668:: @ 816E668
 	getitemname 1, ITEM_HELIX_FOSSIL
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E722
+	goto_if eq, EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
 	removeitem ITEM_HELIX_FOSSIL, 1
 	msgbox gUnknown_819A4AB
-	setvar VAR_0x406A, 1
-	setvar VAR_0x4069, 1
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
 	release
 	end

@@ -171,13 +171,13 @@ EventScript_16E6A6:: @ 816E6A6
 	getitemname 1, ITEM_DOME_FOSSIL
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E722
+	goto_if eq, EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
 	removeitem ITEM_DOME_FOSSIL, 1
 	msgbox gUnknown_819A4AB
-	setvar VAR_0x406A, 1
-	setvar VAR_0x4069, 2
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
 	release
 	end

@@ -186,13 +186,13 @@ EventScript_16E6E4:: @ 816E6E4
 	getitemname 1, ITEM_OLD_AMBER
 	msgbox gUnknown_819A3D4, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E722
+	goto_if eq, EventScript_16E722
 	msgbox gUnknown_819A45D
 	textcolor 0
 	removeitem ITEM_OLD_AMBER, 1
 	msgbox gUnknown_819A4AB
-	setvar VAR_0x406A, 1
-	setvar VAR_0x4069, 3
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
 	release
 	end

@@ -207,54 +207,54 @@ EventScript_16E72C:: @ 816E72C
 	end

 EventScript_16E736:: @ 816E736
-	compare_var_to_value VAR_0x4069, 1
-	goto_if_eq EventScript_16E758
-	compare_var_to_value VAR_0x4069, 2
-	goto_if_eq EventScript_16E79D
-	compare_var_to_value VAR_0x4069, 3
-	goto_if_eq EventScript_16E7E2
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
+	goto_if eq, EventScript_16E758
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
+	goto_if eq, EventScript_16E79D
+	compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
+	goto_if eq, EventScript_16E7E2
 	end

 EventScript_16E758:: @ 816E758
-	setvar VAR_0x4001, 138
+	setvar VAR_0x4001, SPECIES_OMANYTE
 	getspeciesname 0, SPECIES_OMANYTE
 	msgbox gUnknown_819A34F
 	givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A927C
-	setflag FLAG_0x2ED
+	goto_if eq, EventScript_1A927C
+	setflag FLAG_REVIVED_HELIX
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E827
+	goto_if eq, EventScript_16E827
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E85B
+	goto_if eq, EventScript_16E85B
 	end

 EventScript_16E79D:: @ 816E79D
-	setvar VAR_0x4001, 140
+	setvar VAR_0x4001, SPECIES_KABUTO
 	getspeciesname 0, SPECIES_KABUTO
 	msgbox gUnknown_819A34F
 	givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A927C
-	setflag FLAG_0x2EC
+	goto_if eq, EventScript_1A927C
+	setflag FLAG_REVIVED_DOME
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E827
+	goto_if eq, EventScript_16E827
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E85B
+	goto_if eq, EventScript_16E85B
 	end

 EventScript_16E7E2:: @ 816E7E2
-	setvar VAR_0x4001, 142
+	setvar VAR_0x4001, SPECIES_AERODACTYL
 	getspeciesname 0, SPECIES_AERODACTYL
 	msgbox gUnknown_819A34F
 	givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0
 	compare_var_to_value VAR_RESULT, 2
-	goto_if_eq EventScript_1A927C
-	setflag FLAG_0x2EE
+	goto_if eq, EventScript_1A927C
+	setflag FLAG_REVIVED_AMBER
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E827
+	goto_if eq, EventScript_16E827
 	compare_var_to_value VAR_RESULT, 1
-	goto_if_eq EventScript_16E85B
+	goto_if eq, EventScript_16E85B
 	end

 EventScript_16E827:: @ 816E827
@@ -263,10 +263,10 @@ EventScript_16E827:: @ 816E827
 	message Text_19A39E
 	waitmessage
 	waitfanfare
-	setvar VAR_0x406A, 0
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E895
+	goto_if eq, EventScript_16E895
 	call EventScript_1A8C27
 	call EventScript_1A74EB
 	goto EventScript_16E895
@@ -278,10 +278,10 @@ EventScript_16E85B:: @ 816E85B
 	message Text_19A39E
 	waitmessage
 	waitfanfare
-	setvar VAR_0x406A, 0
+	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E88A
+	goto_if eq, EventScript_16E88A
 	call EventScript_1A8C33
 	goto EventScript_16E88A
 	end
@@ -301,21 +301,21 @@ EventScript_16E897:: @ 816E897
 	end

 EventScript_16E8A1:: @ 816E8A1
-	checkflag FLAG_0x273
-	goto_if_eq EventScript_16E8B9
-	checkflag FLAG_0x272
-	goto_if_eq EventScript_16E8C8
+	checkflag FLAG_GOT_HELIX_FOSSIL
+	goto_if TRUE, EventScript_16E8B9
+	checkflag FLAG_GOT_DOME_FOSSIL
+	goto_if TRUE, EventScript_16E8C8
 	goto EventScript_16E534
 	end

 EventScript_16E8B9:: @ 816E8B9
-	checkflag FLAG_0x2ED
-	goto_if 0, EventScript_16E534
+	checkflag FLAG_REVIVED_HELIX
+	goto_if FALSE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return

 EventScript_16E8C8:: @ 816E8C8
-	checkflag FLAG_0x2EC
-	goto_if 0, EventScript_16E534
+	checkflag FLAG_REVIVED_DOME
+	goto_if FALSE, EventScript_16E534
 	setvar VAR_RESULT, 1
 	return
@@ -14,7 +14,7 @@
  "connections": null,
  "object_events": [
    {
-      "graphics_id": "55",
+      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
      "x": 5,
      "y": 3,
      "elevation": 3,
@@ -27,7 +27,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "33",
+      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
      "x": 4,
      "y": 6,
      "elevation": 3,
@@ -40,7 +40,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
      "x": 10,
      "y": 5,
      "elevation": 3,
@@ -10,20 +10,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
 	faceplayer
 	setvar VAR_0x8008, 6
 	call EventScript_1A8CAD
-	checkflag FLAG_0x274
-	goto_if_eq EventScript_16E334
+	checkflag FLAG_DID_ESPHERE_TRADE
+	goto_if TRUE, EventScript_16E334
 	msgbox gUnknown_81A59FE, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E31C
+	goto_if eq, EventScript_16E31C
 	call EventScript_1A8CBD
 	compare_var_to_value VAR_0x8004, 6
-	goto_if 4, EventScript_16E31C
+	goto_if ge, EventScript_16E31C
 	call EventScript_1A8CC9
 	compare_var_to_var VAR_RESULT, VAR_0x8009
-	goto_if 5, EventScript_16E326
+	goto_if ne, EventScript_16E326
 	call EventScript_1A8CD9
 	msgbox gUnknown_81A5A9D
-	setflag FLAG_0x274
+	setflag FLAG_DID_ESPHERE_TRADE
 	release
 	end

@@ -50,28 +50,28 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, sub_8053A9C
 	copyvar VAR_0x8009, VAR_RESULT
-	checkflag FLAG_0x275
-	goto_if_eq EventScript_16E3D4
+	checkflag FLAG_DID_TANGENY_TRADE
+	goto_if TRUE, EventScript_16E3D4
 	msgbox gUnknown_81A5AD6, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
-	goto_if_eq EventScript_16E3BC
-	special sub_80BF8FC
+	goto_if eq, EventScript_16E3BC
+	special Special_ChooseMonFromParty
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
 	compare_var_to_value VAR_0x8004, 6
-	goto_if 4, EventScript_16E3BC
+	goto_if ge, EventScript_16E3BC
 	copyvar VAR_0x8005, VAR_0x800A
 	specialvar VAR_RESULT, sub_8053D2C
 	copyvar VAR_0x800B, VAR_RESULT
 	compare_var_to_var VAR_RESULT, VAR_0x8009
-	goto_if 5, EventScript_16E3C6
+	goto_if ne, EventScript_16E3C6
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
 	special sub_8053D68
 	special sub_8054440
 	waitstate
 	msgbox gUnknown_81A5B4A
-	setflag FLAG_0x275
+	setflag FLAG_DID_TANGENY_TRADE
 	release
 	end

--- a/Show More
+++ b/Show More